From 72ce4ec978724b907795f3dbc0c4bb79de0c689a Mon Sep 17 00:00:00 2001
From: ako-adot <90328748+ako-adot@users.noreply.github.com>
Date: Thu, 7 Jul 2022 16:39:29 +0200
Subject: [PATCH 001/569] ADOT Bid Adapter: fix handle empty refererInfo
 (#8643)

* [DSP-3707] fix: Handle empty refererInfo

[DSP-3707] fix: Handle empty refererInfo

* [DSP-3707] fix: handle empty referer info
---
 modules/adotBidAdapter.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/adotBidAdapter.js b/modules/adotBidAdapter.js
index 75dcef02b59..869cd69a830 100644
--- a/modules/adotBidAdapter.js
+++ b/modules/adotBidAdapter.js
@@ -49,15 +49,15 @@ function tryParse(data) {
  * @returns {Site|null} Formatted Site OpenRtb object or null
  */
 function getOpenRTBSiteObject(bidderRequest) {
-  if (!bidderRequest || !bidderRequest.refererInfo) return null;
+  const refererInfo = (bidderRequest && bidderRequest.refererInfo) || null;
 
-  const domain = bidderRequest.refererInfo.domain;
+  const domain = refererInfo ? refererInfo.domain : window.location.hostname;
   const publisherId = config.getConfig('adot.publisherId');
 
   if (!domain) return null;
 
   return {
-    page: bidderRequest.refererInfo.page,
+    page: refererInfo ? refererInfo.page : window.location.href,
     domain: domain,
     name: domain,
     publisher: {

From 84eca1f2d53ef0dbadf5582ac81db91f146af423 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 7 Jul 2022 15:06:12 +0000
Subject: [PATCH 002/569] Prebid 7.5.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 95e0fb76c78..b464b7d819a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.5.0-pre",
+  "version": "7.5.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index c4a83e22774..c58827099ab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.5.0-pre",
+  "version": "7.5.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 2009048160f94611d0d5440d74857d3e0dd3ad6b Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 7 Jul 2022 15:06:13 +0000
Subject: [PATCH 003/569] Increment version to 7.6.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b464b7d819a..622fff0792f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.5.0",
+  "version": "7.6.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index c58827099ab..1a8e1ff1a98 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.5.0",
+  "version": "7.6.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 1cb69142eba80853f37ef661da23d411846eb443 Mon Sep 17 00:00:00 2001
From: mamatic <52153441+mamatic@users.noreply.github.com>
Date: Thu, 7 Jul 2022 20:00:39 +0200
Subject: [PATCH 004/569] ATS-analytics-adapter - remove envelope source from
 check, should we fire analytics request (#8656)

---
 modules/atsAnalyticsAdapter.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/atsAnalyticsAdapter.js b/modules/atsAnalyticsAdapter.js
index f45d2e80055..390e06366d1 100644
--- a/modules/atsAnalyticsAdapter.js
+++ b/modules/atsAnalyticsAdapter.js
@@ -267,7 +267,7 @@ function sendDataToAnalytic (events) {
 }
 
 // preflight request, to check did publisher have permission to send data to analytics endpoint
-function preflightRequest (envelopeSourceCookieValue, events) {
+function preflightRequest (events) {
   logInfo('ATS Analytics - preflight request!');
   ajax(preflightUrl + atsAnalyticsAdapter.context.pid,
     {
@@ -277,7 +277,7 @@ function preflightRequest (envelopeSourceCookieValue, events) {
         let samplingRate = samplingRateObject.samplingRate;
         atsAnalyticsAdapter.setSamplingCookie(samplingRate);
         let samplingRateNumber = Number(samplingRate);
-        if (data && samplingRate && atsAnalyticsAdapter.shouldFireRequest(samplingRateNumber) && envelopeSourceCookieValue != null) {
+        if (data && samplingRate && atsAnalyticsAdapter.shouldFireRequest(samplingRateNumber)) {
           logInfo('ATS Analytics - events to send: ', events);
           sendDataToAnalytic(events);
         }
@@ -377,12 +377,11 @@ atsAnalyticsAdapter.callHandler = function (evtype, args) {
         }
         // check should we send data to analytics or not, check first cookie value _lr_sampling_rate
         try {
-          let envelopeSourceCookieValue = storage.getCookie('_lr_env_src_ats');
           let samplingRateCookie = storage.getCookie('_lr_sampling_rate');
           if (!samplingRateCookie) {
-            preflightRequest(envelopeSourceCookieValue, events);
+            preflightRequest(events);
           } else {
-            if (atsAnalyticsAdapter.shouldFireRequest(parseInt(samplingRateCookie)) && envelopeSourceCookieValue != null) {
+            if (atsAnalyticsAdapter.shouldFireRequest(parseInt(samplingRateCookie))) {
               logInfo('ATS Analytics - events to send: ', events);
               sendDataToAnalytic(events);
             }

From a29cafd7d0c4a50b3d8529065c92ef1b45f82cfa Mon Sep 17 00:00:00 2001
From: eknis <tem.eknis@gmail.com>
Date: Fri, 8 Jul 2022 04:56:11 +0900
Subject: [PATCH 005/569] imRtdProvider: update ix bidderDefaultFunction
 (#8657)

* remove ix bidder setting

* update test
---
 modules/imRtdProvider.js                | 8 --------
 test/spec/modules/imRtdProvider_spec.js | 1 -
 2 files changed, 9 deletions(-)

diff --git a/modules/imRtdProvider.js b/modules/imRtdProvider.js
index b33e4407b13..0ed239019cf 100644
--- a/modules/imRtdProvider.js
+++ b/modules/imRtdProvider.js
@@ -42,14 +42,6 @@ function setImDataInCookie(value) {
 */
 export function getBidderFunction(bidderName) {
   const biddersFunction = {
-    ix: function (bid, data) {
-      if (data.im_segments && data.im_segments.length) {
-        config.setConfig({
-          ix: {firstPartyData: {im_segments: data.im_segments}},
-        });
-      }
-      return bid
-    },
     pubmatic: function (bid, data) {
       if (data.im_segments && data.im_segments.length) {
         const dctr = deepAccess(bid, 'params.dctr');
diff --git a/test/spec/modules/imRtdProvider_spec.js b/test/spec/modules/imRtdProvider_spec.js
index 6d92440a144..b580e5b6516 100644
--- a/test/spec/modules/imRtdProvider_spec.js
+++ b/test/spec/modules/imRtdProvider_spec.js
@@ -50,7 +50,6 @@ describe('imRtdProvider', function () {
 
   describe('getBidderFunction', function () {
     const assumedBidder = [
-      'ix',
       'pubmatic',
       'fluct'
     ];

From be0e69bd968e55f96bde6f7467b12d56b7d529a8 Mon Sep 17 00:00:00 2001
From: shahinrahbariasl <56240400+shahinrahbariasl@users.noreply.github.com>
Date: Fri, 8 Jul 2022 14:47:10 -0400
Subject: [PATCH 006/569] IX Bid Adapter: Add support for impression level
 transactionId (imp[].ext.tid) (#8641)

* IX Bid Adapter: add imp ext tid support

* fix tid level in imp ext object

Co-authored-by: shahin.rahbariasl <shahin.rahbariasl@indexexchange.com>
---
 modules/ixBidAdapter.js                |  6 +++-
 test/spec/modules/ixBidAdapter_spec.js | 41 ++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 3076dbb6436..c22c0af7f4d 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -1050,6 +1050,7 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
 
     const gpid = impressions[transactionIds[adUnitIndex]].gpid;
     const dfpAdUnitCode = impressions[transactionIds[adUnitIndex]].dfp_ad_unit_code;
+    const tid = impressions[transactionIds[adUnitIndex]].tid
     if (impressionObjects.length && BANNER in impressionObjects[0]) {
       const { id, banner: { topframe } } = impressionObjects[0];
       const _bannerImpression = {
@@ -1060,10 +1061,11 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
         },
       }
 
-      if (dfpAdUnitCode || gpid) {
+      if (dfpAdUnitCode || gpid || tid) {
         _bannerImpression.ext = {};
         _bannerImpression.ext.dfp_ad_unit_code = dfpAdUnitCode;
         _bannerImpression.ext.gpid = gpid;
+        _bannerImpression.ext.tid = tid;
       }
 
       if ('bidfloor' in impressionObjects[0]) {
@@ -1272,6 +1274,7 @@ function createVideoImps(validBidRequest, videoImps) {
     videoImps[validBidRequest.transactionId].ixImps = [];
     videoImps[validBidRequest.transactionId].ixImps.push(imp);
     videoImps[validBidRequest.transactionId].gpid = deepAccess(validBidRequest, 'ortb2Imp.ext.gpid');
+    videoImps[validBidRequest.transactionId].tid = deepAccess(validBidRequest, 'ortb2Imp.ext.tid');
   }
 }
 
@@ -1298,6 +1301,7 @@ function createBannerImps(validBidRequest, missingBannerSizes, bannerImps) {
 
   bannerImps[validBidRequest.transactionId].gpid = deepAccess(validBidRequest, 'ortb2Imp.ext.gpid');
   bannerImps[validBidRequest.transactionId].dfp_ad_unit_code = deepAccess(validBidRequest, 'ortb2Imp.ext.data.adserver.adslot');
+  bannerImps[validBidRequest.transactionId].tid = deepAccess(validBidRequest, 'ortb2Imp.ext.tid');
 
   // Create IX imps from params.size
   if (bannerSizeDefined) {
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index a79b73d34e2..233fac6f426 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -121,6 +121,11 @@ describe('IndexexchangeAdapter', function () {
           playerSize: [[400, 100]]
         }
       },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230'
+        }
+      },
       adUnitCode: 'div-gpt-ad-1460505748562-0',
       transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
       bidId: '1a2b3c4e',
@@ -143,6 +148,11 @@ describe('IndexexchangeAdapter', function () {
           sizes: [[300, 250]]
         }
       },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47229'
+        }
+      },
       adUnitCode: 'div-gpt-ad-1460505748561-0',
       transactionId: '173f49a8-7549-4218-a23c-e7ba59b47229',
       bidId: '1a2b3c4d',
@@ -165,6 +175,11 @@ describe('IndexexchangeAdapter', function () {
           sizes: [[300, 250], [300, 600]]
         }
       },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47229'
+        }
+      },
       adUnitCode: 'div-gpt-ad-1460505748561-0',
       transactionId: '173f49a8-7549-4218-a23c-e7ba59b47229',
       bidId: '1a2b3c4d',
@@ -185,6 +200,11 @@ describe('IndexexchangeAdapter', function () {
           sizes: [[300, 250], [300, 600]]
         }
       },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47229'
+        }
+      },
       adUnitCode: 'div-gpt-ad-1460505748561-0',
       transactionId: '173f49a8-7549-4218-a23c-e7ba59b47229',
       bidId: '1a2b3c4d',
@@ -214,6 +234,11 @@ describe('IndexexchangeAdapter', function () {
           protocols: [2]
         }
       },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230'
+        }
+      },
       adUnitCode: 'div-gpt-ad-1460505748562-0',
       transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
       bidId: '1a2b3c4e',
@@ -247,6 +272,11 @@ describe('IndexexchangeAdapter', function () {
           playerSize: [[400, 100], [200, 400]]
         }
       },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230'
+        }
+      },
       adUnitCode: 'div-gpt-ad-1460505748562-0',
       transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
       bidId: '1a2b3c4e',
@@ -272,6 +302,11 @@ describe('IndexexchangeAdapter', function () {
           sizes: [[300, 250], [300, 600], [400, 500]]
         }
       },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230'
+        }
+      },
       adUnitCode: 'div-gpt-ad-1460505748562-0',
       transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
       bidId: '1a2b3c4e',
@@ -307,6 +342,11 @@ describe('IndexexchangeAdapter', function () {
           sizes: [[300, 250], [300, 600]]
         }
       },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230'
+        }
+      },
       adUnitCode: 'div-gpt-ad-1460505748562-0',
       transactionId: '273f49a8-7549-4218-a23c-e7ba59b47230',
       bidId: '1a2b3c4e',
@@ -1720,6 +1760,7 @@ describe('IndexexchangeAdapter', function () {
       expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
       expect(impression.banner.format).to.be.length(2);
       expect(impression.banner.topframe).to.be.oneOf([0, 1]);
+      expect(impression.ext.tid).to.equal(DEFAULT_BANNER_VALID_BID[0].transactionId);
 
       impression.banner.format.map(({ w, h, ext }, index) => {
         const size = DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[index];

From 0e039881a27a803179fda00904c4d67ef0689c0a Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Mon, 11 Jul 2022 05:20:24 -0700
Subject: [PATCH 007/569] PBjs Core Price Floors Module: improve logging on bid
 rejections to clarify which CPM is being compared with which floor (#8655)

* Price floors module: improve logging on bid rejections to clarify which CPM is being compared with which floor

* Use full precision in log message
---
 modules/priceFloors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/priceFloors.js b/modules/priceFloors.js
index f397e92055e..900276e6b4e 100644
--- a/modules/priceFloors.js
+++ b/modules/priceFloors.js
@@ -751,7 +751,7 @@ export function addBidResponseHook(fn, adUnitCode, bid) {
     flooredBid.status = CONSTANTS.BID_STATUS.BID_REJECTED;
     // if floor not met update bid with 0 cpm so it is not included downstream and marked as no-bid
     flooredBid.cpm = 0;
-    logWarn(`${MODULE_NAME}: ${flooredBid.bidderCode}'s Bid Response for ${adUnitCode} was rejected due to floor not met`, bid);
+    logWarn(`${MODULE_NAME}: ${flooredBid.bidderCode}'s Bid Response for ${adUnitCode} was rejected due to floor not met (adjusted cpm: ${bid?.floorData?.cpmAfterAdjustments}, floor: ${floorInfo?.matchingFloor})`, bid);
     return fn.call(this, adUnitCode, flooredBid);
   }
   return fn.call(this, adUnitCode, bid);

From cae46d65fa78ce5b53af799f0ccbef4882a40cc7 Mon Sep 17 00:00:00 2001
From: Keisuke Kakinuma <keisuke.kakinuma@supership.jp>
Date: Mon, 11 Jul 2022 21:41:59 +0900
Subject: [PATCH 008/569] Adgeneration Bid Adpter: add Criteo system and ID5
 system and update test. (#8642)

* update Adgeneration to add Criteo system and ID5 systems.

* Change method name.

* Correction_of_code_and_test_specs.

* Adding adgext_id5_id_link_type parameter to ID5 object.
---
 modules/adgenerationBidAdapter.js             | 25 ++++++++-
 .../modules/adgenerationBidAdapter_spec.js    | 56 +++++++++++++++++--
 2 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/modules/adgenerationBidAdapter.js b/modules/adgenerationBidAdapter.js
index 94527c5d051..b48d9d350e3 100644
--- a/modules/adgenerationBidAdapter.js
+++ b/modules/adgenerationBidAdapter.js
@@ -25,13 +25,16 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
-    const ADGENE_PREBID_VERSION = '1.3.0';
+    const ADGENE_PREBID_VERSION = '1.4.0';
     let serverRequests = [];
     for (let i = 0, len = validBidRequests.length; i < len; i++) {
       const validReq = validBidRequests[i];
       const DEBUG_URL = 'https://api-test.scaleout.jp/adsv/v1';
       const URL = 'https://d.socdm.com/adsv/v1';
       const url = validReq.params.debug ? DEBUG_URL : URL;
+      const criteoId = getCriteoId(validReq);
+      const id5id = getId5Id(validReq);
+      const id5LinkType = getId5LinkType(validReq);
       let data = ``;
       data = tryAppendQueryString(data, 'posall', 'SSPLOC');
       const id = getBidIdParameter('id', validReq.params);
@@ -45,10 +48,14 @@ export const spec = {
       data = tryAppendQueryString(data, 'pbver', '$prebid.version$');
       data = tryAppendQueryString(data, 'sdkname', 'prebidjs');
       data = tryAppendQueryString(data, 'adapterver', ADGENE_PREBID_VERSION);
+      data = tryAppendQueryString(data, 'adgext_criteo_id', criteoId);
+      data = tryAppendQueryString(data, 'adgext_id5_id', id5id);
+      data = tryAppendQueryString(data, 'adgext_id5_id_link_type', id5LinkType);
       // native以外にvideo等の対応が入った場合は要修正
       if (!validReq.mediaTypes || !validReq.mediaTypes.native) {
         data = tryAppendQueryString(data, 'imark', '1');
       }
+
       // TODO: is 'page' the right value here?
       data = tryAppendQueryString(data, 'tp', bidderRequest.refererInfo.page);
       if (isIos()) {
@@ -275,6 +282,22 @@ function getCurrencyType() {
  * @param validReq request
  * @return {null|string}
  */
+function getCriteoId(validReq) {
+  return (validReq.userId && validReq.userId.criteoId) ? validReq.userId.criteoId : null
+}
+
+function getId5Id(validReq) {
+  return validId5(validReq) ? validReq.userId.id5id.uid : null
+}
+
+function getId5LinkType(validReq) {
+  return validId5(validReq) ? validReq.userId.id5id.ext.linkType : null
+}
+
+function validId5(validReq) {
+  return validReq.userId && validReq.userId.id5id && validReq.userId.id5id.uid && validReq.userId.id5id.ext.linkType
+}
+
 function getHyperId(validReq) {
   if (validReq.userId && validReq.userId.novatiq && validReq.userId.novatiq.snowflake.syncResponse === 1) {
     return validReq.userId.novatiq.snowflake.id;
diff --git a/test/spec/modules/adgenerationBidAdapter_spec.js b/test/spec/modules/adgenerationBidAdapter_spec.js
index ac5ab220880..8583c226e50 100644
--- a/test/spec/modules/adgenerationBidAdapter_spec.js
+++ b/test/spec/modules/adgenerationBidAdapter_spec.js
@@ -101,6 +101,41 @@ describe('AdgenerationAdapter', function () {
             snowflake: {'id': 'novatiqId', syncResponse: 1}
           }
         }
+      },
+      { // bannerWithAdgextCriteoId
+        bidder: 'adg',
+        params: {
+          id: '58278', // banner
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [[320, 100]],
+        bidId: '2f6ac468a9c15e',
+        bidderRequestId: '14a9f773e30243',
+        auctionId: '4aae9f05-18c6-4fcd-80cf-282708cd584a',
+        transactionTd: 'f76f6dfd-d64f-4645-a29f-682bac7f431a',
+        userId: {
+          criteoId: 'criteo-id-test-1234567890'
+        }
+      },
+      { // bannerWithAdgextId5Id
+        bidder: 'adg',
+        params: {
+          id: '58278', // banner
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [[320, 100]],
+        bidId: '2f6ac468a9c15e',
+        bidderRequestId: '14a9f773e30243',
+        auctionId: '4aae9f05-18c6-4fcd-80cf-282708cd584a',
+        transactionTd: 'f76f6dfd-d64f-4645-a29f-682bac7f431a',
+        userId: {
+          id5id: {
+            ext: {
+              linkType: 2
+            },
+            uid: 'id5-id-test-1234567890'
+          }
+        }
       }
     ];
     const bidderRequest = {
@@ -109,10 +144,12 @@ describe('AdgenerationAdapter', function () {
       }
     };
     const data = {
-      banner: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=300x250%2C320x100&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.3.0&imark=1&tp=https%3A%2F%2Fexample.com`,
-      bannerUSD: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=300x250%2C320x100&currency=USD&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.3.0&imark=1&tp=https%3A%2F%2Fexample.com`,
-      native: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=1x1&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.3.0&tp=https%3A%2F%2Fexample.com`,
-      bannerWithHyperId: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=320x100&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.3.0&imark=1&tp=https%3A%2F%2Fexample.com&hyper_id=novatiqId`,
+      banner: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=300x250%2C320x100&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.4.0&imark=1&tp=https%3A%2F%2Fexample.com`,
+      bannerUSD: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=300x250%2C320x100&currency=USD&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.4.0&imark=1&tp=https%3A%2F%2Fexample.com`,
+      native: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=1x1&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.4.0&tp=https%3A%2F%2Fexample.com`,
+      bannerWithHyperId: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=320x100&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.4.0&imark=1&tp=https%3A%2F%2Fexample.com&hyper_id=novatiqId`,
+      bannerWithAdgextCriteoId: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=320x100&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.4.0&adgext_criteo_id=criteo-id-test-1234567890&imark=1&tp=https%3A%2F%2Fexample.com`,
+      bannerWithAdgextId5Id: `posall=SSPLOC&id=58278&sdktype=0&hb=true&t=json3&sizes=320x100&currency=JPY&pbver=${prebid.version}&sdkname=prebidjs&adapterver=1.4.0&adgext_id5_id=id5-id-test-1234567890&adgext_id5_id_link_type=2&imark=1&tp=https%3A%2F%2Fexample.com`,
     };
     it('sends bid request to ENDPOINT via GET', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest)[0];
@@ -149,6 +186,17 @@ describe('AdgenerationAdapter', function () {
       });
       expect(request.data).to.equal(data.bannerWithHyperId);
     });
+
+    it('should attache params to the bannerWithAdgextCriteoId request', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)[3];
+      expect(request.data).to.equal(data.bannerWithAdgextCriteoId);
+    });
+
+    it('should attache params to the bannerWithAdgextId5Id request', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)[4];
+      expect(request.data).to.equal(data.bannerWithAdgextId5Id);
+    });
+
     it('allows setConfig to set bidder currency for JPY', function () {
       config.setConfig({
         currency: {

From b09f9f060ef6cfb55b168c6030e9710c31ece727 Mon Sep 17 00:00:00 2001
From: ako-adot <90328748+ako-adot@users.noreply.github.com>
Date: Mon, 11 Jul 2022 20:26:33 +0200
Subject: [PATCH 009/569] ADOT Bid Adapter: handle schain & pubProvidedId
 (#8670)

* [DSP-3689] feature: add pubProvidedId to user (#6)

[DSP-3689] feature: add pubProvidedId to user

* [DSP-3690] feature: Handle schain object (#7)
---
 modules/adotBidAdapter.js                | 11 ++++++++++-
 test/spec/modules/adotBidAdapter_spec.js | 21 ++++++++++++---------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/modules/adotBidAdapter.js b/modules/adotBidAdapter.js
index 869cd69a830..af9cb8b5008 100644
--- a/modules/adotBidAdapter.js
+++ b/modules/adotBidAdapter.js
@@ -62,6 +62,9 @@ function getOpenRTBSiteObject(bidderRequest) {
     name: domain,
     publisher: {
       id: publisherId
+    },
+    ext: {
+      schain: bidderRequest.schain
     }
   };
 }
@@ -83,7 +86,13 @@ function getOpenRTBDeviceObject() {
  */
 function getOpenRTBUserObject(bidderRequest) {
   if (!bidderRequest || !bidderRequest.gdprConsent || !isStr(bidderRequest.gdprConsent.consentString)) return null;
-  return { ext: { consent: bidderRequest.gdprConsent.consentString } };
+
+  return {
+    ext: {
+      consent: bidderRequest.gdprConsent.consentString,
+      pubProvidedId: bidderRequest.userId && bidderRequest.userId.pubProvidedId,
+    },
+  };
 }
 
 /**
diff --git a/test/spec/modules/adotBidAdapter_spec.js b/test/spec/modules/adotBidAdapter_spec.js
index 8851df37d34..34252e00f9e 100644
--- a/test/spec/modules/adotBidAdapter_spec.js
+++ b/test/spec/modules/adotBidAdapter_spec.js
@@ -28,7 +28,7 @@ describe('Adot Adapter', function () {
     it('should build request (banner)', function () {
       const bidderRequestId = 'bidderRequestId';
       const validBidRequests = [{ bidderRequestId, mediaTypes: {} }, { bidderRequestId, bidId: 'bidId', mediaTypes: { banner: { sizes: [[300, 250]] } }, params: { placementId: 'placementId', adUnitCode: 200 } }];
-      const bidderRequest = { position: 2, refererInfo: { page: 'http://localhost.com', domain: 'localhost.com' }, gdprConsent: { consentString: 'consentString', gdprApplies: true } };
+      const bidderRequest = { position: 2, refererInfo: { page: 'http://localhost.com', domain: 'localhost.com' }, gdprConsent: { consentString: 'consentString', gdprApplies: true }, userId: { pubProvidedId: 'userId' }, schain: { ver: '1.0' } };
 
       const request = spec.buildRequests(validBidRequests, bidderRequest);
       const buildBidRequestResponse = {
@@ -54,10 +54,11 @@ describe('Adot Adapter', function () {
           publisher: {
             // id: 'adot'
             id: undefined
-          }
+          },
+          ext: { schain: { ver: '1.0' } }
         },
         device: { ua: navigator.userAgent, language: navigator.language },
-        user: { ext: { consent: bidderRequest.gdprConsent.consentString } },
+        user: { ext: { consent: bidderRequest.gdprConsent.consentString, pubProvidedId: 'userId' } },
         regs: { ext: { gdpr: bidderRequest.gdprConsent.gdprApplies } },
         ext: {
           adot: { adapter_version: 'v2.0.0' },
@@ -76,7 +77,7 @@ describe('Adot Adapter', function () {
     it('should build request (native)', function () {
       const bidderRequestId = 'bidderRequestId';
       const validBidRequests = [{ bidderRequestId, mediaTypes: {} }, { bidderRequestId, bidId: 'bidId', mediaTypes: { native: { title: { required: true, len: 50, sizes: [[300, 250]] }, wrong: {}, image: {} } }, params: { placementId: 'placementId', adUnitCode: 200 } }];
-      const bidderRequest = { position: 2, refererInfo: { page: 'http://localhost.com', domain: 'localhost.com' }, gdprConsent: { consentString: 'consentString', gdprApplies: true } };
+      const bidderRequest = { position: 2, refererInfo: { page: 'http://localhost.com', domain: 'localhost.com' }, gdprConsent: { consentString: 'consentString', gdprApplies: true }, userId: { pubProvidedId: 'userId' }, schain: { ver: '1.0' } };
 
       const request = spec.buildRequests(validBidRequests, bidderRequest);
       const buildBidRequestResponse = {
@@ -101,10 +102,11 @@ describe('Adot Adapter', function () {
           publisher: {
             // id: 'adot'
             id: undefined
-          }
+          },
+          ext: { schain: { ver: '1.0' } }
         },
         device: { ua: navigator.userAgent, language: navigator.language },
-        user: { ext: { consent: bidderRequest.gdprConsent.consentString } },
+        user: { ext: { consent: bidderRequest.gdprConsent.consentString, pubProvidedId: 'userId' } },
         regs: { ext: { gdpr: bidderRequest.gdprConsent.gdprApplies } },
         ext: {
           adot: { adapter_version: 'v2.0.0' },
@@ -123,7 +125,7 @@ describe('Adot Adapter', function () {
     it('should build request (video)', function () {
       const bidderRequestId = 'bidderRequestId';
       const validBidRequests = [{ bidderRequestId, mediaTypes: {} }, { bidderRequestId, bidId: 'bidId', mediaTypes: { video: { playerSize: [[300, 250]], minduration: 1, maxduration: 2, api: 'api', linearity: 'linearity', mimes: [], placement: 'placement', playbackmethod: 'playbackmethod', protocols: 'protocol', startdelay: 'startdelay' } }, params: { placementId: 'placementId', adUnitCode: 200 } }];
-      const bidderRequest = { position: 2, refererInfo: { page: 'http://localhost.com', domain: 'localhost.com' }, gdprConsent: { consentString: 'consentString', gdprApplies: true } };
+      const bidderRequest = { position: 2, refererInfo: { page: 'http://localhost.com', domain: 'localhost.com' }, gdprConsent: { consentString: 'consentString', gdprApplies: true }, userId: { pubProvidedId: 'userId' }, schain: { ver: '1.0' } };
 
       const request = spec.buildRequests(validBidRequests, bidderRequest);
       const buildBidRequestResponse = {
@@ -160,10 +162,11 @@ describe('Adot Adapter', function () {
           publisher: {
             // id: 'adot'
             id: undefined
-          }
+          },
+          ext: { schain: { ver: '1.0' } }
         },
         device: { ua: navigator.userAgent, language: navigator.language },
-        user: { ext: { consent: bidderRequest.gdprConsent.consentString } },
+        user: { ext: { consent: bidderRequest.gdprConsent.consentString, pubProvidedId: 'userId' } },
         regs: { ext: { gdpr: bidderRequest.gdprConsent.gdprApplies } },
         ext: {
           adot: { adapter_version: 'v2.0.0' },

From 5166dc9e13a7e24c34da6615b342a2bec636c345 Mon Sep 17 00:00:00 2001
From: Prebid-bydata <71428180+Prebid-bydata@users.noreply.github.com>
Date: Tue, 12 Jul 2022 04:25:24 +0530
Subject: [PATCH 010/569] byData Analytics Adapter : send data on bidwon,
 update adunit path, & add some test params (#8621)

* data on bidwon-adunit path-some test paramets added

* update method for query string parameter

* removed unpadded space

* using StorageManager set/get value on local storage

Co-authored-by: Jitendra-quizlet <jitendra.kumar@quizlet.com>
---
 modules/byDataAnalyticsAdapter.js             | 246 ++++++++++++------
 modules/byDataAnalyticsAdapter.md             |  11 +-
 .../modules/byDataAnalyticsAdapter_spec.js    |  98 +++++--
 3 files changed, 251 insertions(+), 104 deletions(-)

diff --git a/modules/byDataAnalyticsAdapter.js b/modules/byDataAnalyticsAdapter.js
index ef6e1a503ee..1bf47cd467f 100644
--- a/modules/byDataAnalyticsAdapter.js
+++ b/modules/byDataAnalyticsAdapter.js
@@ -5,38 +5,80 @@ import enc from 'crypto-js/enc-utf8';
 import adapter from '../src/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { auctionManager } from '../src/auctionManager.js';
 import { ajax } from '../src/ajax.js';
 
-const secretKey = 'bydata@123456';
-const { EVENTS: { NO_BID, BID_TIMEOUT, AUCTION_END } } = CONSTANTS;
-const DEFAULT_EVENT_URL = 'https://pbjs-stream.bydata.com/topics/prebid';
-const analyticsType = 'endpoint';
-var payload = {};
-var bdNbTo = { 'to': [], 'nb': [] };
-let initOptions = {};
+const versionCode = '4.4.1'
+const secretKey = 'bydata@123456'
+const { EVENTS: { NO_BID, BID_TIMEOUT, AUCTION_END, AUCTION_INIT, BID_WON } } = CONSTANTS
+const DEFAULT_EVENT_URL = 'https://pbjs-stream.bydata.com/topics/prebid'
+const analyticsType = 'endpoint'
+const isBydata = isKeyInUrl('bydata_debug')
+const adunitsMap = {}
+const storage = getStorageManager();
+let initOptions = {}
+var payload = {}
+var winPayload = {}
+var isDataSend = window.asc_data || false
+var bdNbTo = { 'to': [], 'nb': [] }
 
+/* method used for testing parameters */
+function isKeyInUrl(name) {
+  const queryString = window.location.search;
+  const urlParams = new URLSearchParams(queryString);
+  const param = urlParams.get(name)
+  return param
+}
+
+/* return ad unit full path wrt custom ad unit code */
+function getAdunitName(code) {
+  var name = code;
+  for (const [key, value] of Object.entries(adunitsMap)) {
+    if (key === code) { name = value; }
+  }
+  return name;
+}
+
+/* EVENT: auction init */
+function onAuctionStart(t) {
+  /* map of ad unit code - ad unit full path */
+  t.adUnits && t.adUnits.length && t.adUnits.forEach((adu) => {
+    const { code, adunit } = adu
+    adunitsMap[code] = adunit
+  });
+}
+
+/* EVENT: bid timeout */
 function onBidTimeout(t) {
   if (payload['visitor_data'] && t && t.length > 0) {
-    bdNbTo['to'] = t;
+    bdNbTo['to'] = t
   }
 }
 
+/* EVENT: no bid */
 function onNoBidData(t) {
   if (payload['visitor_data'] && t) {
-    bdNbTo['nb'].push(t);
+    bdNbTo['nb'].push(t)
+  }
+}
+
+/* EVENT: bid won */
+function onBidWon(t) {
+  const { isCorrectOption } = initOptions
+  if (isCorrectOption && (isDataSend || isBydata)) {
+    ascAdapter.getBidWonData(t)
+    ascAdapter.sendPayload(winPayload)
   }
 }
 
+/* EVENT: auction end */
 function onAuctionEnd(t) {
-  _logInfo('onAuctionEnd', t);
-  const {isCorrectOption, logFrequency} = initOptions;
-  var value = Math.floor(Math.random() * 10000 + 1);
-  _logInfo(' value - frequency ', (value + '-' + logFrequency));
+  const { isCorrectOption } = initOptions;
   setTimeout(() => {
-    if (isCorrectOption && value < logFrequency) {
+    if (isCorrectOption && (isDataSend || isBydata)) {
       ascAdapter.dataProcess(t);
-      addKeyForPrebidWinningAndWinningsBids();
-      ascAdapter.sendPayload();
+      ascAdapter.sendPayload(payload);
     }
   }, 500);
 }
@@ -44,6 +86,9 @@ function onAuctionEnd(t) {
 const ascAdapter = Object.assign(adapter({ url: DEFAULT_EVENT_URL, analyticsType: analyticsType }), {
   track({ eventType, args }) {
     switch (eventType) {
+      case AUCTION_INIT:
+        onAuctionStart(args);
+        break;
       case NO_BID:
         onNoBidData(args);
         break;
@@ -53,6 +98,9 @@ const ascAdapter = Object.assign(adapter({ url: DEFAULT_EVENT_URL, analyticsType
       case AUCTION_END:
         onAuctionEnd(args);
         break;
+      case BID_WON:
+        onBidWon(args);
+        break;
       default:
         break;
     }
@@ -62,9 +110,8 @@ const ascAdapter = Object.assign(adapter({ url: DEFAULT_EVENT_URL, analyticsType
 // save the base class function
 ascAdapter.originEnableAnalytics = ascAdapter.enableAnalytics;
 // override enableAnalytics so we can get access to the config passed in from the page
-ascAdapter.enableAnalytics = function(config) {
+ascAdapter.enableAnalytics = function (config) {
   if (this.initConfig(config)) {
-    _logInfo('initiated:', initOptions);
     initOptions.isCorrectOption && ascAdapter.getVisitorData();
     ascAdapter.originEnableAnalytics(config);
   }
@@ -73,7 +120,7 @@ ascAdapter.enableAnalytics = function(config) {
 ascAdapter.initConfig = function (config) {
   let isCorrectOption = true;
   initOptions = {};
-  _logInfo('initConfig', config);
+  var rndNum = Math.floor(Math.random() * 10000 + 1);
   initOptions.options = deepClone(config.options);
   initOptions.clientId = initOptions.options.clientId || null;
   initOptions.logFrequency = initOptions.options.logFrequency;
@@ -81,13 +128,41 @@ ascAdapter.initConfig = function (config) {
     _logError('"options.clientId" should not empty!!');
     isCorrectOption = false;
   }
+  if (rndNum <= initOptions.logFrequency) { window.asc_data = isDataSend = true; }
   initOptions.isCorrectOption = isCorrectOption;
   this.initOptions = initOptions;
   return isCorrectOption;
 };
 
-ascAdapter.getVisitorData = function(data = {}) {
-  var ua = data.userId ? data : {};
+ascAdapter.getBidWonData = function(t) {
+  const { auctionId, adUnitCode, size, requestId, bidder, timeToRespond, currency, mediaType, cpm } = t
+  const aun = getAdunitName(adUnitCode)
+  winPayload['aid'] = auctionId
+  winPayload['as'] = '';
+  winPayload['auctionData'] = [];
+  var data = {}
+  data['au'] = aun
+  data['auc'] = adUnitCode
+  data['aus'] = size
+  data['bid'] = requestId
+  data['bidadv'] = bidder
+  data['br_pb_mg'] = cpm
+  data['br_tr'] = timeToRespond
+  data['bradv'] = bidder
+  data['brid'] = requestId
+  data['brs'] = size
+  data['cur'] = currency
+  data['inb'] = 0
+  data['ito'] = 0
+  data['ipwb'] = 1
+  data['iwb'] = 1
+  data['mt'] = mediaType
+  winPayload['auctionData'].push(data)
+  return winPayload
+}
+
+ascAdapter.getVisitorData = function (data = {}) {
+  var ua = data.uid ? data : {};
   var module = {
     options: [],
     header: [window.navigator.platform, window.navigator.userAgent, window.navigator.appVersion, window.navigator.vendor, window.opera],
@@ -152,7 +227,7 @@ ascAdapter.getVisitorData = function(data = {}) {
       crypto.getRandomValues(buffer);
       buffer[6] = (buffer[6] & ~176) | 64;
       buffer[8] = (buffer[8] & ~64) | 128;
-      var hex = Array.prototype.map.call(new Uint8Array(buffer), function(x) {
+      var hex = Array.prototype.map.call(new Uint8Array(buffer), function (x) {
         return ('00' + x.toString(16)).slice(-2);
       }).join('');
       return hex.slice(0, 5) + '-' + hex.slice(5, 9) + '-' + hex.slice(9, 13) + '-' + hex.slice(13, 18);
@@ -182,34 +257,46 @@ ascAdapter.getVisitorData = function(data = {}) {
     var signedToken = token + '.' + signature;
     return signedToken;
   }
-  const {clientId} = initOptions;
-  var userId = window.localStorage.getItem('userId');
+  function detectWidth() {
+    return window.screen.width || (window.innerWidth && document.documentElement.clientWidth) ? Math.min(window.innerWidth, document.documentElement.clientWidth) : window.innerWidth || document.documentElement.clientWidth || document.getElementsByTagName('body')[0].clientWidth;
+  }
+  function giveDeviceTypeOnScreenSize() {
+    var _dWidth = detectWidth();
+    return _dWidth > 1024 ? 'Desktop' : (_dWidth <= 1024 && _dWidth >= 768) ? 'Tablet' : 'Mobile';
+  }
+
+  const { clientId } = initOptions;
+  var userId = storage.getDataFromLocalStorage('userId')
   if (!userId) {
     userId = generateUid();
-    window.localStorage.setItem('userId', userId);
+    storage.setDataInLocalStorage('userId', userId);
   }
-  var screenSize = {width: window.screen.width, height: window.screen.height};
-  var deviceType = window.navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i) ? 'Mobile' : 'Desktop';
+  var screenSize = { width: window.screen.width, height: window.screen.height };
+  var deviceType = giveDeviceTypeOnScreenSize();
   var e = module.init();
-  if (!ua['userId']) {
-    ua['userId'] = userId;
-    ua['client_id'] = clientId;
-    ua['plateform_name'] = e.os.name;
-    ua['os_version'] = e.os.version;
-    ua['browser_name'] = e.browser.name;
-    ua['browser_version'] = e.browser.version;
-    ua['screen_size'] = screenSize;
-    ua['device_type'] = deviceType;
-    ua['time_zone'] = window.Intl.DateTimeFormat().resolvedOptions().timeZone;
+  if (!ua['uid']) {
+    ua['uid'] = userId;
+    ua['cid'] = clientId;
+    ua['pid'] = window.location.hostname;
+    ua['os'] = e.os.name;
+    ua['osv'] = e.os.version;
+    ua['br'] = e.browser.name;
+    ua['brv'] = e.browser.version;
+    ua['ss'] = screenSize;
+    ua['de'] = deviceType;
+    ua['tz'] = window.Intl.DateTimeFormat().resolvedOptions().timeZone;
   }
   var signedToken = getJWToken(ua);
   payload['visitor_data'] = signedToken;
+  winPayload['visitor_data'] = signedToken;
   return signedToken;
 }
 
-ascAdapter.dataProcess = function(t) {
-  payload['auction_id'] = t.auctionId;
-  payload['auction_start'] = t.timestamp;
+ascAdapter.dataProcess = function (t) {
+  if (isBydata) { payload['bydata_debug'] = 'true'; }
+  _logInfo('fulldata - ', t);
+  payload['aid'] = t.auctionId;
+  payload['as'] = t.timestamp;
   payload['auctionData'] = [];
   var bidderRequestsData = []; var bidsReceivedData = [];
   t.bidderRequests && t.bidderRequests.forEach(bidReq => {
@@ -228,69 +315,80 @@ ascAdapter.dataProcess = function(t) {
     bidderRequestsData.push(pObj);
   });
   t.bidsReceived && t.bidsReceived.forEach(bid => {
-    const {requestId, bidder, width, height, cpm, currency, timeToRespond, adUnitCode} = bid;
-    bidsReceivedData.push({requestId, bidder, width, height, cpm, currency, timeToRespond, adUnitCode});
+    const { requestId, bidder, width, height, cpm, currency, timeToRespond, adUnitCode } = bid;
+    bidsReceivedData.push({ requestId, bidder, width, height, cpm, currency, timeToRespond, adUnitCode });
   });
   bidderRequestsData.length > 0 && bidderRequestsData.forEach(bdObj => {
     var bdsArray = bdObj['bids'];
     bdsArray.forEach(bid => {
-      const {adUnitCode, sizes, bidder, bidId, mediaTypes} = bid;
+      const { adUnitCode, sizes, bidder, bidId, mediaTypes } = bid;
       sizes.forEach(size => {
         var sstr = size[0] + 'x' + size[1]
-        payload['auctionData'].push({adUnit: adUnitCode, size: sstr, media_type: mediaTypes[0], bids_bidder: bidder, bids_bid_id: bidId});
+        payload['auctionData'].push({ au: getAdunitName(adUnitCode), auc: adUnitCode, aus: sstr, mt: mediaTypes[0], bidadv: bidder, bid: bidId, inb: 0, ito: 0, ipwb: 0, iwb: 0 });
       });
     });
   });
+
   bidsReceivedData.length > 0 && bidsReceivedData.forEach(bdRecived => {
-    const {requestId, bidder, width, height, cpm, currency, timeToRespond} = bdRecived;
+    const { requestId, bidder, width, height, cpm, currency, timeToRespond } = bdRecived;
     payload['auctionData'].forEach(rwData => {
-      if (rwData['bids_bid_id'] === requestId && rwData['size'] === width + 'x' + height) {
-        rwData['br_request_id'] = requestId; rwData['br_bidder'] = bidder; rwData['br_pb_mg'] = cpm;
-        rwData['br_currency'] = currency; rwData['br_time_to_respond'] = timeToRespond; rwData['br_size'] = width + 'x' + height;
+      if (rwData['bid'] === requestId && rwData['aus'] === width + 'x' + height) {
+        rwData['brid'] = requestId; rwData['bradv'] = bidder; rwData['br_pb_mg'] = cpm;
+        rwData['cur'] = currency; rwData['br_tr'] = timeToRespond; rwData['brs'] = width + 'x' + height;
       }
     })
   });
+
+  var prebidWinningBids = auctionManager.getBidsReceived().filter(bid => bid.status === CONSTANTS.BID_STATUS.BID_TARGETING_SET);
+  prebidWinningBids && prebidWinningBids.length > 0 && prebidWinningBids.forEach(pbbid => {
+    payload['auctionData'] && payload['auctionData'].forEach(rwData => {
+      if (rwData['bid'] === pbbid.requestId && rwData['brs'] === pbbid.size) {
+        rwData['ipwb'] = 1;
+      }
+    });
+  })
+
+  var winningBids = auctionManager.getAllWinningBids();
+  winningBids && winningBids.length > 0 && winningBids.forEach(wBid => {
+    payload['auctionData'] && payload['auctionData'].forEach(rwData => {
+      if (rwData['bid'] === wBid.requestId && rwData['brs'] === wBid.size) {
+        rwData['iwb'] = 1;
+      }
+    });
+  })
+
   payload['auctionData'] && payload['auctionData'].length > 0 && payload['auctionData'].forEach(u => {
     bdNbTo['to'].forEach(i => {
-      if (u.bids_bid_id === i.bidId) u.is_timeout = 1;
+      if (u.bid === i.bidId) u.ito = 1;
     });
     bdNbTo['nb'].forEach(i => {
-      if (u.adUnit === i.adUnitCode && u.bids_bidder === i.bidder && u.bids_bid_id === i.bidId) { u.is_nobid = 1; }
+      if (u.bidadv === i.bidder && u.bid === i.bidId) { u.inb = 1; }
     })
   });
   return payload;
 }
 
-ascAdapter.sendPayload = function () {
-  var obj = { 'records': [ { 'value': payload } ] };
+ascAdapter.sendPayload = function (data) {
+  var obj = { 'records': [{ 'value': data }] };
   let strJSON = JSON.stringify(obj);
-  _logInfo(' sendPayload ', JSON.stringify(obj));
-  ajax(DEFAULT_EVENT_URL, undefined, strJSON, {
+  sendDataOnKf(strJSON);
+}
+
+function sendDataOnKf(dataObj) {
+  ajax(DEFAULT_EVENT_URL, {
+    success: function () {
+      _logInfo('send data success');
+    },
+    error: function (e) {
+      _logInfo('send data error', e);
+    }
+  }, dataObj, {
     contentType: 'application/vnd.kafka.json.v2+json',
     method: 'POST',
     withCredentials: true
   });
 }
 
-function addKeyForPrebidWinningAndWinningsBids() {
-  var prebidWinningBids = $$PREBID_GLOBAL$$.getAllPrebidWinningBids();
-  var winningBids = $$PREBID_GLOBAL$$.getAllWinningBids();
-  prebidWinningBids && prebidWinningBids.length > 0 && prebidWinningBids.forEach(pbbid => {
-    payload['auctionData'] && payload['auctionData'].forEach(rwData => {
-      if (rwData['bids_bid_id'] === pbbid.requestId && rwData['br_size'] === pbbid.size) {
-        rwData['is_prebid_winning_bid'] = 1;
-      }
-    });
-  })
-  winningBids && winningBids.length > 0 && winningBids.forEach(wBid => {
-    payload['auctionData'] && payload['auctionData'].forEach(rwData => {
-      if (rwData['bids_bid_id'] === wBid.requestId && rwData['br_size'] === wBid.size) {
-        rwData['is_winning_bid'] = 1;
-      }
-    });
-  })
-}
-
 adapterManager.registerAnalyticsAdapter({
   adapter: ascAdapter,
   code: 'bydata'
@@ -305,7 +403,7 @@ function _logError(message) {
 }
 
 function buildLogMessage(message) {
-  return 'Bydata Prebid Analytics: ' + message;
+  return 'Bydata Prebid Analytics ' + versionCode + ':' + message;
 }
 
 export default ascAdapter;
diff --git a/modules/byDataAnalyticsAdapter.md b/modules/byDataAnalyticsAdapter.md
index 84207d8b3a1..a0780ecb514 100644
--- a/modules/byDataAnalyticsAdapter.md
+++ b/modules/byDataAnalyticsAdapter.md
@@ -1,7 +1,7 @@
 # Overview
 
 layout: Analytics Adapter
-title: Ascendeum Pvt Ltd. (https://ascendeum.com/)
+title: byData. (https://bydata.com/)
 description: Bydata Analytics Adapter
 modulecode: byDataAnalyticsAdapter
 gdpr_supported: false   (EU GDPR support)
@@ -13,11 +13,12 @@ enable_download: false       (in case you don't want users of the website to dow
 
 Module Name: Bydata Analytics Adapter
 Module Type: Analytics Adapter
-Maintainer: Ascendeum
+Maintainer: byData
 
 # Description
 
-Analytics adapter for https://ascendeum.com/. Contact engineering@ascendeum.com for information.
+Analytics adapter for https://bydata.com/. Contact admin@byData.com for information.
+
 
 # Test Parameters
 
@@ -25,10 +26,8 @@ Analytics adapter for https://ascendeum.com/. Contact engineering@ascendeum.com
 {
   provider: 'bydata',
     options : {
-        clientId: "ASCENDEUM_PROVIDED_CLIENT_ID",   
+        clientId: "please contact byData team to get a clientId",   
         logFrequency : 100, // Sample Rate Default - 1%   
     }
 }
 ```
-
-
diff --git a/test/spec/modules/byDataAnalyticsAdapter_spec.js b/test/spec/modules/byDataAnalyticsAdapter_spec.js
index 90b4e1d53a6..1346284695c 100644
--- a/test/spec/modules/byDataAnalyticsAdapter_spec.js
+++ b/test/spec/modules/byDataAnalyticsAdapter_spec.js
@@ -9,18 +9,19 @@ const initOptions = {
   logFrequency: 1,
 };
 let userData = {
-  userId: '5da77-ec87-277b-8e7a5',
-  client_id: 'asc00000',
-  plateform_name: 'Macintosh',
-  os_version: 10.157,
-  browser_name: 'Chrome',
-  browser_version: 92.04515107,
-  screen_size: {
-    width: 1440,
-    height: 900
+  'uid': '271a8-2b86-f4a4-f59bc',
+  'cid': 'asc00000',
+  'pid': 'www.letsrun.com',
+  'os': 'Macintosh',
+  'osv': 10.157,
+  'br': 'Chrome',
+  'brv': 103,
+  'ss': {
+    'width': 1792,
+    'height': 1120
   },
-  device_type: 'Desktop',
-  time_zone: 'Asia/Calcutta'
+  'de': 'Desktop',
+  'tz': 'Asia/Calcutta'
 };
 let bidTimeoutArgs = [{
   auctionId,
@@ -39,6 +40,18 @@ let noBidArgs = {
   src: 'client',
   transactionId: 'c8ee3914-1ee0-4ce6-9126-748d5692188c'
 }
+let bidWonArgs = {
+  auctionId,
+  adUnitCode: 'div-gpt-ad-mrec1',
+  size: '300x250',
+  requestId: '15c86b6c10d3746',
+  bidder: 'appnexus',
+  timeToRespond: 114,
+  currency: 'USD',
+  mediaType: 'display',
+  cpm: 0.50
+}
+
 let auctionEndArgs = {
   adUnitCodes: ['div-gpt-ad-mrec1'],
   adUnits: [{
@@ -74,21 +87,54 @@ let auctionEndArgs = {
   }]
 }
 let expectedDataArgs = {
-  visitor_data: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiI1ZGE3Ny1lYzg3LTI3N2ItOGU3YTUiLCJjbGllbnRfaWQiOiJhc2MwMDAwMCIsInBsYXRlZm9ybV9uYW1lIjoiTWFjaW50b3NoIiwib3NfdmVyc2lvbiI6MTAuMTU3LCJicm93c2VyX25hbWUiOiJDaHJvbWUiLCJicm93c2VyX3ZlcnNpb24iOjkyLjA0NTE1MTA3LCJzY3JlZW5fc2l6ZSI6eyJ3aWR0aCI6MTQ0MCwiaGVpZ2h0Ijo5MDB9LCJkZXZpY2VfdHlwZSI6IkRlc2t0b3AiLCJ0aW1lX3pvbmUiOiJBc2lhL0NhbGN1dHRhIn0.jNKjsb3Q-ZjkVMcbss_dQFOmu_GdkGqd7t9MbRmqlG4YEMorcJHhUVmUuPi-9pKvC9_t4XlgjED90UieCvdxCQ',
-  auction_id: auctionId,
-  auction_start: 1627973484504,
+  visitor_data: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiIyNzFhOC0yYjg2LWY0YTQtZjU5YmMiLCJjaWQiOiJhc2MwMDAwMCIsInBpZCI6Ind3dy5sZXRzcnVuLmNvbSIsIm9zIjoiTWFjaW50b3NoIiwib3N2IjoxMC4xNTcsImJyIjoiQ2hyb21lIiwiYnJ2IjoxMDMsInNzIjp7IndpZHRoIjoxNzkyLCJoZWlnaHQiOjExMjB9LCJkZSI6IkRlc2t0b3AiLCJ0eiI6IkFzaWEvQ2FsY3V0dGEifQ.Oj3qnh--t06XO-foVmrMJCGqFfOBed09A-f7LZX5rtfBf4w1_RNRZ4F3on4TMPLonSa7GgzbcEfJS9G_amnleQ',
+  aid: auctionId,
+  as: 1627973484504,
   auctionData: [ {
-    'adUnit': 'div-gpt-ad-mrec1',
-    'size': '300x250',
-    'media_type': 'display',
-    'bids_bidder': 'appnexus',
-    'bids_bid_id': '14480e9832f2d2b'
+    au: 'div-gpt-ad-mrec1',
+    auc: 'div-gpt-ad-mrec1',
+    aus: '300x250',
+    bidadv: 'appnexus',
+    bid: '14480e9832f2d2b',
+    inb: 0,
+    ito: 0,
+    ipwb: 0,
+    iwb: 0,
+    mt: 'display',
   }, {
-    'adUnit': 'div-gpt-ad-mrec1',
-    'size': '250x250',
-    'media_type': 'display',
-    'bids_bidder': 'appnexus',
-    'bids_bid_id': '14480e9832f2d2b'
+    au: 'div-gpt-ad-mrec1',
+    auc: 'div-gpt-ad-mrec1',
+    aus: '250x250',
+    bidadv: 'appnexus',
+    bid: '14480e9832f2d2b',
+    inb: 0,
+    ito: 0,
+    ipwb: 0,
+    iwb: 0,
+    mt: 'display',
+  }]
+}
+let expectedBidWonArgs = {
+  visitor_data: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiIyNzFhOC0yYjg2LWY0YTQtZjU5YmMiLCJjaWQiOiJhc2MwMDAwMCIsInBpZCI6Ind3dy5sZXRzcnVuLmNvbSIsIm9zIjoiTWFjaW50b3NoIiwib3N2IjoxMC4xNTcsImJyIjoiQ2hyb21lIiwiYnJ2IjoxMDMsInNzIjp7IndpZHRoIjoxNzkyLCJoZWlnaHQiOjExMjB9LCJkZSI6IkRlc2t0b3AiLCJ0eiI6IkFzaWEvQ2FsY3V0dGEifQ.Oj3qnh--t06XO-foVmrMJCGqFfOBed09A-f7LZX5rtfBf4w1_RNRZ4F3on4TMPLonSa7GgzbcEfJS9G_amnleQ',
+  aid: auctionId,
+  as: '',
+  auctionData: [{
+    au: 'div-gpt-ad-mrec1',
+    auc: 'div-gpt-ad-mrec1',
+    aus: '300x250',
+    bid: '15c86b6c10d3746',
+    bidadv: 'appnexus',
+    br_pb_mg: 0.50,
+    br_tr: 114,
+    bradv: 'appnexus',
+    brid: '15c86b6c10d3746',
+    brs: '300x250',
+    cur: 'USD',
+    inb: 0,
+    ito: 0,
+    ipwb: 1,
+    iwb: 1,
+    mt: 'display',
   }]
 }
 
@@ -130,10 +176,14 @@ describe('byData Analytics Adapter ', () => {
     it('sends and formatted auction data ', function () {
       events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeoutArgs);
       events.emit(constants.EVENTS.NO_BID, noBidArgs);
+      events.emit(constants.EVENTS.BID_WON, bidWonArgs)
       var userToken = ascAdapter.getVisitorData(userData);
       var newAuData = ascAdapter.dataProcess(auctionEndArgs);
+      var newBwData = ascAdapter.getBidWonData(bidWonArgs);
       newAuData['visitor_data'] = userToken;
+      newBwData['visitor_data'] = userToken;
       expect(newAuData).to.deep.equal(expectedDataArgs);
+      expect(newBwData).to.deep.equal(expectedBidWonArgs);
     });
   });
 });

From 28d51c6fef9b4cbabb35751152525603e894f1e4 Mon Sep 17 00:00:00 2001
From: TM <tomasz.mielcarz@gmail.com>
Date: Tue, 12 Jul 2022 13:04:53 +0200
Subject: [PATCH 011/569] Adrino Adapter: New config parameter for a custom
 adserver domain (#8667)

* New config parameter for a custom adserver domain

* test fix

* new test

Co-authored-by: Tomasz Mielcarz <tomasz.mielcarz@adrino.pl>
---
 modules/adrinoBidAdapter.js                | 12 ++++++++++--
 modules/adrinoBidAdapter.md                |  6 ++++++
 test/spec/modules/adrinoBidAdapter_spec.js | 22 ++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/modules/adrinoBidAdapter.js b/modules/adrinoBidAdapter.js
index ed898c46cac..e7cac348b3e 100644
--- a/modules/adrinoBidAdapter.js
+++ b/modules/adrinoBidAdapter.js
@@ -1,6 +1,7 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {triggerPixel} from '../src/utils.js';
 import {NATIVE} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
 
 const BIDDER_CODE = 'adrino';
 const REQUEST_METHOD = 'POST';
@@ -12,6 +13,10 @@ export const spec = {
   gvlid: GVLID,
   supportedMediaTypes: [NATIVE],
 
+  getBidderConfig: function (property) {
+    return config.getConfig(`${BIDDER_CODE}.${property}`);
+  },
+
   isBidRequestValid: function (bid) {
     return !!(bid.bidId) &&
       !!(bid.params) &&
@@ -26,6 +31,8 @@ export const spec = {
     const bidRequests = [];
 
     for (let i = 0; i < validBidRequests.length; i++) {
+      let host = this.getBidderConfig('host') || BIDDER_HOST;
+
       let requestData = {
         bidId: validBidRequests[i].bidId,
         nativeParams: validBidRequests[i].nativeParams,
@@ -44,7 +51,7 @@ export const spec = {
 
       bidRequests.push({
         method: REQUEST_METHOD,
-        url: BIDDER_HOST + '/bidder/bid/',
+        url: host + '/bidder/bid/',
         data: requestData,
         options: {
           contentType: 'application/json',
@@ -67,7 +74,8 @@ export const spec = {
 
   onBidWon: function (bid) {
     if (bid['requestId']) {
-      triggerPixel(BIDDER_HOST + '/bidder/won/' + bid['requestId']);
+      let host = this.getBidderConfig('host') || BIDDER_HOST;
+      triggerPixel(host + '/bidder/won/' + bid['requestId']);
     }
   }
 };
diff --git a/modules/adrinoBidAdapter.md b/modules/adrinoBidAdapter.md
index 5ec63a72736..ab655f700fc 100644
--- a/modules/adrinoBidAdapter.md
+++ b/modules/adrinoBidAdapter.md
@@ -13,6 +13,12 @@ Module connects to Adrino bidder to fetch bids. Only native format is supported.
 # Test Parameters
 
 ```
+pbjs.setConfig({
+    adrino: {
+        host: 'https://custom-domain.adrino.io'
+    }
+});
+
 var adUnits = [
     code: '/12345678/prebid_native_example_1',
     mediaTypes: {
diff --git a/test/spec/modules/adrinoBidAdapter_spec.js b/test/spec/modules/adrinoBidAdapter_spec.js
index a7b7007dcf8..a321eb60677 100644
--- a/test/spec/modules/adrinoBidAdapter_spec.js
+++ b/test/spec/modules/adrinoBidAdapter_spec.js
@@ -1,8 +1,13 @@
 import { expect } from 'chai';
 import { spec } from 'modules/adrinoBidAdapter.js';
+import {config} from '../../../src/config.js';
 import * as utils from '../../../src/utils';
 
 describe('adrinoBidAdapter', function () {
+  afterEach(() => {
+    config.resetConfig();
+  });
+
   describe('isBidRequestValid', function () {
     const validBid = {
       bidder: 'adrino',
@@ -72,6 +77,23 @@ describe('adrinoBidAdapter', function () {
       auctionId: '01234567891234',
     };
 
+    it('should build the request correctly with custom domain', function () {
+      config.setConfig({adrino: { host: 'https://stg-prebid-bidder.adrino.io' }});
+      const result = spec.buildRequests(
+        [ bidRequest ],
+        { refererInfo: { page: 'http://example.com/' } }
+      );
+      expect(result.length).to.equal(1);
+      expect(result[0].method).to.equal('POST');
+      expect(result[0].url).to.equal('https://stg-prebid-bidder.adrino.io/bidder/bid/');
+      expect(result[0].data.bidId).to.equal('12345678901234');
+      expect(result[0].data.placementHash).to.equal('abcdef123456');
+      expect(result[0].data.referer).to.equal('http://example.com/');
+      expect(result[0].data.userAgent).to.equal(navigator.userAgent);
+      expect(result[0].data).to.have.property('nativeParams');
+      expect(result[0].data).not.to.have.property('gdprConsent');
+    });
+
     it('should build the request correctly with gdpr', function () {
       const result = spec.buildRequests(
         [ bidRequest ],

From 099a4df48acd82a268e4ef54ce6684c11c640cbd Mon Sep 17 00:00:00 2001
From: Mikael Lundin <mikael-lundin@users.noreply.github.com>
Date: Tue, 12 Jul 2022 13:48:54 +0200
Subject: [PATCH 012/569] Adnuntius Bid Adapter: Video Instream capabilities
 (#8631)

* Added option to pass a user id through ortb2.

* RTD provider added.

* check if use cookie is present in config, and use it accordingly.

* Adding test for no cookie url addition.

* Adnuntius RTD Provider tests added

* Adnuntius RTD Module

* Removed adnuntius RTD provider from this pull request.

* Fix error

* Added video instream capabilities
---
 modules/adnuntiusBidAdapter.js                |  34 ++++-
 package-lock.json                             |   2 +-
 test/spec/modules/adnuntiusBidAdapter_spec.js | 140 ++++++++++++++++--
 3 files changed, 153 insertions(+), 23 deletions(-)

diff --git a/modules/adnuntiusBidAdapter.js b/modules/adnuntiusBidAdapter.js
index fed69c48d18..b9499af7d9d 100644
--- a/modules/adnuntiusBidAdapter.js
+++ b/modules/adnuntiusBidAdapter.js
@@ -1,12 +1,13 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
-import { isStr, deepAccess } from '../src/utils.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { isStr, deepAccess, logInfo } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const BIDDER_CODE = 'adnuntius';
 const ENDPOINT_URL = 'https://ads.adnuntius.delivery/i';
 const GVLID = 855;
+const DEFAULT_VAST_VERSION = 'vast4'
 
 const checkSegment = function (segment) {
   if (isStr(segment)) return segment;
@@ -27,7 +28,7 @@ const getSegmentsFromOrtb = function (ortb2) {
 }
 
 const handleMeta = function () {
-  const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE})
+  const storage = getStorageManager({ gvlid: GVLID, bidderCode: BIDDER_CODE })
   let adnMeta = null
   if (storage.localStorageIsEnabled()) {
     adnMeta = JSON.parse(storage.getDataFromLocalStorage('adn.metaData'))
@@ -45,7 +46,7 @@ const getUsi = function (meta, ortb2, bidderRequest) {
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: function (bid) {
     return !!(bid.bidId || (bid.params.member && bid.params.invCode));
   },
@@ -67,15 +68,20 @@ export const spec = {
 
     request.push('tzo=' + tzo)
     request.push('format=json')
+
     if (gdprApplies !== undefined) request.push('consentString=' + consentString);
     if (segments.length > 0) request.push('segments=' + segments.join(','));
     if (usi) request.push('userId=' + usi);
     if (bidderConfig.useCookie === false) request.push('noCookies=true')
     for (var i = 0; i < validBidRequests.length; i++) {
       const bid = validBidRequests[i]
-      const network = bid.params.network || 'network';
+      let network = bid.params.network || 'network';
       const targeting = bid.params.targeting || {};
 
+      if (bid.mediaTypes && bid.mediaTypes.video && bid.mediaTypes.video.context !== 'outstream') {
+        network += '_video'
+      }
+
       bidRequests[network] = bidRequests[network] || [];
       bidRequests[network].push(bid);
 
@@ -89,9 +95,11 @@ export const spec = {
     const networkKeys = Object.keys(networks)
     for (var j = 0; j < networkKeys.length; j++) {
       const network = networkKeys[j];
+      const networkRequest = [...request]
+      if (network.indexOf('_video') > -1) { networkRequest.push('tt=' + DEFAULT_VAST_VERSION) }
       requests.push({
         method: 'POST',
-        url: ENDPOINT_URL + '?' + request.join('&'),
+        url: ENDPOINT_URL + '?' + networkRequest.join('&'),
         data: JSON.stringify(networks[network]),
         bid: bidRequests[network]
       });
@@ -106,7 +114,7 @@ export const spec = {
       if (adUnit.matchedAdCount >= 1) {
         const ad = adUnit.ads[0];
         const effectiveCpm = (ad.bid) ? ad.bid.amount * 1000 : 0;
-        return {
+        const adResponse = {
           ...response,
           [adUnit.targetId]: {
             requestId: adUnit.targetId,
@@ -122,9 +130,19 @@ export const spec = {
             },
             netRevenue: false,
             ttl: 360,
-            ad: adUnit.html
           }
         }
+
+        if (adUnit.vastXml) {
+          adResponse[adUnit.targetId].vastXml = adUnit.vastXml
+          adResponse[adUnit.targetId].mediaType = 'video'
+        } else {
+          adResponse[adUnit.targetId].ad = adUnit.html
+        }
+
+        logInfo('BID', adResponse)
+
+        return adResponse
       } else return response
     }, {});
 
diff --git a/package-lock.json b/package-lock.json
index 622fff0792f..dfb3c6d93ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "6.28.0-pre",
+      "version": "7.4.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
diff --git a/test/spec/modules/adnuntiusBidAdapter_spec.js b/test/spec/modules/adnuntiusBidAdapter_spec.js
index 817229cd381..307830dd4ef 100644
--- a/test/spec/modules/adnuntiusBidAdapter_spec.js
+++ b/test/spec/modules/adnuntiusBidAdapter_spec.js
@@ -11,7 +11,7 @@ describe('adnuntiusBidAdapter', function () {
   const GVLID = 855;
   const usi = utils.generateUUID()
   const meta = [{ key: 'usi', value: usi }]
-  const storage = getStorageManager({gvlid: GVLID, moduleName: 'adnuntius'})
+  const storage = getStorageManager({ gvlid: GVLID, moduleName: 'adnuntius' })
   storage.setDataInLocalStorage('adn.metaData', JSON.stringify(meta))
 
   beforeEach(function () {
@@ -29,12 +29,13 @@ describe('adnuntiusBidAdapter', function () {
 
   const tzo = new Date().getTimezoneOffset();
   const ENDPOINT_URL = `${URL}${tzo}&format=json&userId=${usi}`;
+  const ENDPOINT_URL_VIDEO = `${URL}${tzo}&format=json&userId=${usi}&tt=vast4`;
   const ENDPOINT_URL_NOCOOKIE = `${URL}${tzo}&format=json&userId=${usi}&noCookies=true`;
   const ENDPOINT_URL_SEGMENTS = `${URL}${tzo}&format=json&segments=segment1,segment2,segment3&userId=${usi}`;
   const ENDPOINT_URL_CONSENT = `${URL}${tzo}&format=json&consentString=consentString&userId=${usi}`;
   const adapter = newBidder(spec);
 
-  const bidRequests = [
+  const bidderRequests = [
     {
       bidId: '123',
       bidder: 'adnuntius',
@@ -46,6 +47,23 @@ describe('adnuntiusBidAdapter', function () {
     }
   ]
 
+  const videoBidderRequest = [
+    {
+      bidId: '123',
+      bidder: 'adnuntius',
+      params: {
+        auId: '8b6bc',
+        network: 'adnuntius',
+      },
+      mediaTypes: {
+        video: {
+          playerSize: [640, 480],
+          context: 'instream'
+        }
+      },
+    }
+  ]
+
   const singleBidRequest = {
     bid: [
       {
@@ -54,6 +72,10 @@ describe('adnuntiusBidAdapter', function () {
     ]
   }
 
+  const videoBidRequest = {
+    bid: videoBidderRequest
+  }
+
   const serverResponse = {
     body: {
       'adUnits': [
@@ -117,6 +139,69 @@ describe('adnuntiusBidAdapter', function () {
       ]
     }
   }
+  const serverVideoResponse = {
+    body: {
+      'adUnits': [
+        {
+          'auId': '000000000008b6bc',
+          'targetId': '123',
+          'html': '<h1>hi!</h1>',
+          'matchedAdCount': 1,
+          'responseId': 'adn-rsp-1460129238',
+          'ads': [
+            {
+              'destinationUrlEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fc%2F52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN%3Fct%3D2501%26r%3Dhttp%253A%252F%252Fgoogle.com',
+              'assets': {
+                'image': {
+                  'cdnId': 'https://assets.adnuntius.com/oEmZa5uYjxENfA1R692FVn6qIveFpO8wUbpyF2xSOCc.jpg',
+                  'width': '980',
+                  'height': '120'
+                }
+              },
+              'clickUrl': 'https://delivery.adnuntius.com/c/52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'urls': {
+                'destination': 'https://delivery.adnuntius.com/c/52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN?ct=2501&r=http%3A%2F%2Fgoogle.com'
+              },
+              'urlsEsc': {
+                'destination': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fc%2F52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN%3Fct%3D2501%26r%3Dhttp%253A%252F%252Fgoogle.com'
+              },
+              'destinationUrls': {
+                'destination': 'http://google.com'
+              },
+              'cpm': { 'amount': 5.0, 'currency': 'NOK' },
+              'bid': { 'amount': 0.005, 'currency': 'NOK' },
+              'cost': { 'amount': 0.005, 'currency': 'NOK' },
+              'impressionTrackingUrls': [],
+              'impressionTrackingUrlsEsc': [],
+              'adId': 'adn-id-1347343135',
+              'selectedColumn': '0',
+              'selectedColumnPosition': '0',
+              'renderedPixel': 'https://delivery.adnuntius.com/b/52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN.html',
+              'renderedPixelEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fb%2F52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN.html',
+              'visibleUrl': 'https://delivery.adnuntius.com/s?rt=52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'visibleUrlEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fs%3Frt%3D52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'viewUrl': 'https://delivery.adnuntius.com/v?rt=52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'viewUrlEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fv%3Frt%3D52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'rt': '52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'creativeWidth': '980',
+              'creativeHeight': '120',
+              'creativeId': 'wgkq587vgtpchsx1',
+              'lineItemId': 'scyjdyv3mzgdsnpf',
+              'layoutId': 'sw6gtws2rdj1kwby',
+              'layoutName': 'Responsive image'
+            },
+
+          ]
+        },
+        {
+          'auId': '000000000008b6bc',
+          'targetId': '456',
+          'matchedAdCount': 0,
+          'responseId': 'adn-rsp-1460129238',
+        }
+      ]
+    }
+  }
 
   describe('inherited functions', function () {
     it('exists and is a function', function () {
@@ -126,13 +211,13 @@ describe('adnuntiusBidAdapter', function () {
 
   describe('isBidRequestValid', function () {
     it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bidRequests[0])).to.equal(true);
+      expect(spec.isBidRequestValid(bidderRequests[0])).to.equal(true);
     });
   });
 
   describe('buildRequests', function () {
     it('Test requests', function () {
-      const request = spec.buildRequests(bidRequests, {});
+      const request = spec.buildRequests(bidderRequests, {});
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('bid');
       const bid = request[0].bid[0]
@@ -143,6 +228,16 @@ describe('adnuntiusBidAdapter', function () {
       expect(request[0].data).to.equal('{\"adUnits\":[{\"auId\":\"8b6bc\",\"targetId\":\"123\"}],\"metaData\":{\"usi\":\"' + usi + '\"}}');
     });
 
+    it('Test Video requests', function () {
+      const request = spec.buildRequests(videoBidderRequest, {});
+      expect(request.length).to.equal(1);
+      expect(request[0]).to.have.property('bid');
+      const bid = request[0].bid[0]
+      expect(bid).to.have.property('bidId');
+      expect(request[0]).to.have.property('url');
+      expect(request[0].url).to.equal(ENDPOINT_URL_VIDEO);
+    });
+
     it('should pass segments if available in config', function () {
       const ortb2 = {
         user: {
@@ -157,7 +252,7 @@ describe('adnuntiusBidAdapter', function () {
         }
       };
 
-      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidRequests, {ortb2}));
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL_SEGMENTS);
@@ -179,7 +274,7 @@ describe('adnuntiusBidAdapter', function () {
         }
       };
 
-      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidRequests, {ortb2}));
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL_SEGMENTS);
@@ -188,14 +283,14 @@ describe('adnuntiusBidAdapter', function () {
 
   describe('user privacy', function () {
     it('should send GDPR Consent data if gdprApplies', function () {
-      let request = spec.buildRequests(bidRequests, { gdprConsent: { gdprApplies: true, consentString: 'consentString' } });
+      let request = spec.buildRequests(bidderRequests, { gdprConsent: { gdprApplies: true, consentString: 'consentString' } });
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL_CONSENT);
     });
 
     it('should not send GDPR Consent data if gdprApplies equals undefined', function () {
-      let request = spec.buildRequests(bidRequests, { gdprConsent: { gdprApplies: undefined, consentString: 'consentString' } });
+      let request = spec.buildRequests(bidderRequests, { gdprConsent: { gdprApplies: undefined, consentString: 'consentString' } });
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL);
@@ -215,7 +310,7 @@ describe('adnuntiusBidAdapter', function () {
         }
       }
 
-      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidRequests, {ortb2}));
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL_SEGMENTS);
@@ -237,7 +332,7 @@ describe('adnuntiusBidAdapter', function () {
         }
       };
 
-      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidRequests, {ortb2}));
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL_SEGMENTS);
@@ -250,7 +345,7 @@ describe('adnuntiusBidAdapter', function () {
         }
       };
 
-      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidRequests, {ortb2}));
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, { ortb2 }));
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL);
@@ -259,14 +354,14 @@ describe('adnuntiusBidAdapter', function () {
 
   describe('user privacy', function () {
     it('should send GDPR Consent data if gdprApplies', function () {
-      let request = spec.buildRequests(bidRequests, { gdprConsent: { gdprApplies: true, consentString: 'consentString' } });
+      let request = spec.buildRequests(bidderRequests, { gdprConsent: { gdprApplies: true, consentString: 'consentString' } });
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL_CONSENT);
     });
 
     it('should not send GDPR Consent data if gdprApplies equals undefined', function () {
-      let request = spec.buildRequests(bidRequests, { gdprConsent: { gdprApplies: undefined, consentString: 'consentString' } });
+      let request = spec.buildRequests(bidderRequests, { gdprConsent: { gdprApplies: undefined, consentString: 'consentString' } });
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL);
@@ -282,7 +377,7 @@ describe('adnuntiusBidAdapter', function () {
         }
       });
 
-      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidRequests, {}));
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidderRequests, {}));
       expect(request.length).to.equal(1);
       expect(request[0]).to.have.property('url')
       expect(request[0].url).to.equal(ENDPOINT_URL_NOCOOKIE);
@@ -307,4 +402,21 @@ describe('adnuntiusBidAdapter', function () {
       expect(interpretedResponse[0].ttl).to.equal(360);
     });
   });
+  describe('interpretVideoResponse', function () {
+    it('should return valid response when passed valid server response', function () {
+      const interpretedResponse = spec.interpretResponse(serverVideoResponse, videoBidRequest);
+      const ad = serverVideoResponse.body.adUnits[0].ads[0]
+      expect(interpretedResponse).to.have.lengthOf(1);
+      expect(interpretedResponse[0].cpm).to.equal(ad.cpm.amount);
+      expect(interpretedResponse[0].width).to.equal(Number(ad.creativeWidth));
+      expect(interpretedResponse[0].height).to.equal(Number(ad.creativeHeight));
+      expect(interpretedResponse[0].creativeId).to.equal(ad.creativeId);
+      expect(interpretedResponse[0].currency).to.equal(ad.bid.currency);
+      expect(interpretedResponse[0].netRevenue).to.equal(false);
+      expect(interpretedResponse[0].meta).to.have.property('advertiserDomains');
+      expect(interpretedResponse[0].meta.advertiserDomains).to.have.lengthOf(1);
+      expect(interpretedResponse[0].meta.advertiserDomains[0]).to.equal('google.com');
+      expect(interpretedResponse[0].vastXml).to.equal(serverVideoResponse.body.adUnits[0].vastXml);
+    });
+  });
 });

From 5681e50c43cf3a38e4bc1f5d391d26cc776beba6 Mon Sep 17 00:00:00 2001
From: Jason Piros <jasonpiros@gmail.com>
Date: Tue, 12 Jul 2022 04:52:23 -0700
Subject: [PATCH 013/569] consumableBidAdapter - add shared ID (#8605)

---
 modules/consumableBidAdapter.js               | 13 +++-
 .../spec/modules/consumableBidAdapter_spec.js | 75 +++++++++++++++++++
 2 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/modules/consumableBidAdapter.js b/modules/consumableBidAdapter.js
index afdf34b72c1..5c34fbe8c64 100644
--- a/modules/consumableBidAdapter.js
+++ b/modules/consumableBidAdapter.js
@@ -1,4 +1,4 @@
-import { logWarn, createTrackPixelHtml } from '../src/utils.js';
+import { logWarn, createTrackPixelHtml, deepAccess, isArray, deepSetValue } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'consumable';
@@ -78,6 +78,8 @@ export const spec = {
       }
     });
 
+    handleEids(data, validBidRequests);
+
     ret.data = JSON.stringify(data);
     ret.bidRequest = validBidRequests;
     ret.bidderRequest = bidderRequest;
@@ -234,4 +236,13 @@ function retrieveAd(decision, unitId, unitName) {
   return ad;
 }
 
+function handleEids(data, validBidRequests) {
+  let bidUserIdAsEids = deepAccess(validBidRequests, '0.userIdAsEids');
+  if (isArray(bidUserIdAsEids) && bidUserIdAsEids.length > 0) {
+    deepSetValue(data, 'user.eids', bidUserIdAsEids);
+  } else {
+    deepSetValue(data, 'user.eids', undefined);
+  }
+}
+
 registerBidder(spec);
diff --git a/test/spec/modules/consumableBidAdapter_spec.js b/test/spec/modules/consumableBidAdapter_spec.js
index b70cd6fe631..23851c0da40 100644
--- a/test/spec/modules/consumableBidAdapter_spec.js
+++ b/test/spec/modules/consumableBidAdapter_spec.js
@@ -1,6 +1,9 @@
 import {expect} from 'chai';
 import {spec} from 'modules/consumableBidAdapter.js';
 import {createBid} from 'src/bidfactory.js';
+import {config} from 'src/config.js';
+import {deepClone} from 'src/utils.js';
+import { createEidsArray } from 'modules/userId/eids.js';
 
 const ENDPOINT = 'https://e.serverbid.com/api/v2';
 const SMARTSYNC_CALLBACK = 'serverbidCallBids';
@@ -425,4 +428,76 @@ describe('Consumable BidAdapter', function () {
       expect(opts.length).to.equal(1);
     });
   });
+  describe('unifiedId from userId module', function() {
+    let sandbox, bidderRequest;
+    beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+      bidderRequest = deepClone(BIDDER_REQUEST_1);
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    it('Request should have unifiedId config params', function() {
+      bidderRequest.bidRequest[0].userId = {};
+      bidderRequest.bidRequest[0].userId.tdid = 'TTD_ID';
+      bidderRequest.bidRequest[0].userIdAsEids = createEidsArray(bidderRequest.bidRequest[0].userId);
+      let request = spec.buildRequests(bidderRequest.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+      expect(data.user.eids).to.deep.equal([{
+        'source': 'adserver.org',
+        'uids': [{
+          'id': 'TTD_ID',
+          'atype': 1,
+          'ext': {
+            'rtiPartner': 'TDID'
+          }
+        }]
+      }]);
+    });
+
+    it('Request should have adsrvrOrgId from UserId Module if config and userId module both have TTD ID', function() {
+      sandbox.stub(config, 'getConfig').callsFake((key) => {
+        var config = {
+          adsrvrOrgId: {
+            'TDID': 'TTD_ID_FROM_CONFIG',
+            'TDID_LOOKUP': 'TRUE',
+            'TDID_CREATED_AT': '2022-06-21T09:47:00'
+          }
+        };
+        return config[key];
+      });
+      bidderRequest.bidRequest[0].userId = {};
+      bidderRequest.bidRequest[0].userId.tdid = 'TTD_ID';
+      bidderRequest.bidRequest[0].userIdAsEids = createEidsArray(bidderRequest.bidRequest[0].userId);
+      let request = spec.buildRequests(bidderRequest.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+      expect(data.user.eids).to.deep.equal([{
+        'source': 'adserver.org',
+        'uids': [{
+          'id': 'TTD_ID',
+          'atype': 1,
+          'ext': {
+            'rtiPartner': 'TDID'
+          }
+        }]
+      }]);
+    });
+
+    it('Request should NOT have adsrvrOrgId params if userId is NOT object', function() {
+      let request = spec.buildRequests(bidderRequest.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+      expect(data.user.eids).to.deep.equal(undefined);
+    });
+
+    it('Request should NOT have adsrvrOrgId params if userId.tdid is NOT string', function() {
+      bidderRequest.bidRequest[0].userId = {
+        tdid: 1234
+      };
+      let request = spec.buildRequests(bidderRequest.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+      expect(data.user.eids).to.deep.equal(undefined);
+    });
+  });
 });

From f2ca64f98c4b2b1e6a136fc3d892155cc2aabab7 Mon Sep 17 00:00:00 2001
From: OronW <41260031+OronW@users.noreply.github.com>
Date: Tue, 12 Jul 2022 16:05:12 +0300
Subject: [PATCH 014/569] add support for loop number. Add test coverage for
 loop number (#8673)

---
 modules/minutemediaBidAdapter.js                | 1 +
 test/spec/modules/minutemediaBidAdapter_spec.js | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/modules/minutemediaBidAdapter.js b/modules/minutemediaBidAdapter.js
index beb6618631d..d953558bf31 100644
--- a/modules/minutemediaBidAdapter.js
+++ b/modules/minutemediaBidAdapter.js
@@ -286,6 +286,7 @@ function generateBidParameters(bid, bidderRequest) {
     sizes: sizesArray,
     floorPrice: Math.max(getFloor(bid, mediaType), params.floorPrice),
     bidId: getBidIdParameter('bidId', bid),
+    loop: getBidIdParameter('bidderRequestsCount', bid),
     bidderRequestId: getBidIdParameter('bidderRequestId', bid),
     transactionId: getBidIdParameter('transactionId', bid),
   };
diff --git a/test/spec/modules/minutemediaBidAdapter_spec.js b/test/spec/modules/minutemediaBidAdapter_spec.js
index cce08e615a3..bbd23918031 100644
--- a/test/spec/modules/minutemediaBidAdapter_spec.js
+++ b/test/spec/modules/minutemediaBidAdapter_spec.js
@@ -53,6 +53,7 @@ describe('minutemediaAdapter', function () {
           'org': 'jdye8weeyirk00000001'
         },
         'bidId': '299ffc8cca0b87',
+        'loop': 1,
         'bidderRequestId': '1144f487e563f9',
         'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
         'mediaTypes': {
@@ -71,6 +72,7 @@ describe('minutemediaAdapter', function () {
           'org': 'jdye8weeyirk00000001'
         },
         'bidId': '299ffc8cca0b87',
+        'loop': 1,
         'bidderRequestId': '1144f487e563f9',
         'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
         'mediaTypes': {
@@ -91,6 +93,7 @@ describe('minutemediaAdapter', function () {
           'testMode': true
         },
         'bidId': '299ffc8cca0b87',
+        'loop': 2,
         'bidderRequestId': '1144f487e563f9',
         'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
       }

From ea29fa16cbea64e85cbbc4c6dab85cea2afb6e0c Mon Sep 17 00:00:00 2001
From: Yohan Boutin <yohan@seedtag.com>
Date: Tue, 12 Jul 2022 15:15:14 +0200
Subject: [PATCH 015/569] Seedtag Bid Adapter: add compliance to usp/ccpa
 (#8602)

* add compliance to usp/ccpa

* add unit test

* typo in the unit test name

* more un it tests
---
 modules/seedtagBidAdapter.js                |  4 ++++
 test/spec/modules/seedtagBidAdapter_spec.js | 25 +++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/modules/seedtagBidAdapter.js b/modules/seedtagBidAdapter.js
index cc76363fc9a..8c5ab41bd6e 100644
--- a/modules/seedtagBidAdapter.js
+++ b/modules/seedtagBidAdapter.js
@@ -236,6 +236,10 @@ export const spec = {
       payload['cd'] = bidderRequest.gdprConsent.consentString;
     }
 
+    if (bidderRequest.uspConsent) {
+      payload['uspConsent'] = bidderRequest.uspConsent
+    }
+
     const payloadString = JSON.stringify(payload)
     return {
       method: 'POST',
diff --git a/test/spec/modules/seedtagBidAdapter_spec.js b/test/spec/modules/seedtagBidAdapter_spec.js
index 958c3066631..092fd3ebf9a 100644
--- a/test/spec/modules/seedtagBidAdapter_spec.js
+++ b/test/spec/modules/seedtagBidAdapter_spec.js
@@ -292,6 +292,31 @@ describe('Seedtag Adapter', function () {
         it('should expose gvlid', function () {
           expect(spec.gvlid).to.equal(157);
         });
+        it('should handle uspConsent', function () {
+          const uspConsent = '1---';
+
+          bidderRequest['uspConsent'] = uspConsent;
+
+          const request = spec.buildRequests(validBidRequests, bidderRequest);
+          const payload = JSON.parse(request.data);
+
+          expect(payload.uspConsent).to.exist;
+          expect(payload.uspConsent).to.equal(uspConsent);
+        });
+
+        it("shouldn't send uspConsent when not available", function () {
+          const uspConsent = undefined;
+
+          bidderRequest['uspConsent'] = uspConsent;
+
+          const request = spec.buildRequests(
+            validBidRequests,
+            bidderRequest
+          );
+          const payload = JSON.parse(request.data);
+
+          expect(payload.uspConsent).to.not.exist;
+        });
       });
     });
 

From cdbc08ab19e1985b4cbd36a77639c70cab9e53f9 Mon Sep 17 00:00:00 2001
From: fndigrazia <digrazia.nicolas@gmail.com>
Date: Tue, 12 Jul 2022 11:20:44 -0300
Subject: [PATCH 016/569] Eplanning Bid Adapter: viewability refactor and fix
 in search the divs (#8610)

* eplanning viewability refactor and fix in search the divs

* change observer configuration name

* unused variable is removed

* kick off circleci tests manually

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/eplanningBidAdapter.js                | 179 ++++++++----------
 test/spec/modules/eplanningBidAdapter_spec.js |  76 ++++++--
 2 files changed, 140 insertions(+), 115 deletions(-)

diff --git a/modules/eplanningBidAdapter.js b/modules/eplanningBidAdapter.js
index ca2cbfd9908..a6adab1e9b9 100644
--- a/modules/eplanningBidAdapter.js
+++ b/modules/eplanningBidAdapter.js
@@ -1,4 +1,4 @@
-import {getWindowSelf, isEmpty, parseSizesInput} from '../src/utils.js';
+import {getWindowSelf, isEmpty, parseSizesInput, isGptPubadsDefined, isSlotMatchingAdUnitCode} from '../src/utils.js';
 import {getGlobal} from '../src/prebidGlobal.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {getStorageManager} from '../src/storageManager.js';
@@ -291,13 +291,25 @@ function getCharset() {
 
 function waitForElementsPresent(elements) {
   const observer = new MutationObserver(function (mutationList, observer) {
+    let index;
+    let adView;
     if (mutationList && Array.isArray(mutationList)) {
       mutationList.forEach(mr => {
         if (mr && mr.addedNodes && Array.isArray(mr.addedNodes)) {
           mr.addedNodes.forEach(ad => {
-            let index = elements.indexOf(ad.id);
+            index = elements.indexOf(ad.id);
+            adView = ad;
+            if (index < 0) {
+              elements.forEach(code => {
+                let div = _getAdSlotHTMLElement(code);
+                if (div && div.contains(ad) && div.getBoundingClientRect().width > 0) {
+                  index = elements.indexOf(div.id);
+                  adView = div;
+                }
+              });
+            }
             if (index >= 0) {
-              registerViewability(ad);
+              registerViewability(adView, elements[index]);
               elements.splice(index, 1);
               if (!elements.length) {
                 observer.disconnect();
@@ -318,19 +330,41 @@ function waitForElementsPresent(elements) {
   });
 }
 
-function registerViewability(div) {
+function registerViewability(div, name) {
   visibilityHandler({
-    name: div.id,
+    name: name,
     div: div
   });
 }
 
+function _mapAdUnitPathToElementId(adUnitCode) {
+  if (isGptPubadsDefined()) {
+    // eslint-disable-next-line no-undef
+    const adSlots = googletag.pubads().getSlots();
+    const isMatchingAdSlot = isSlotMatchingAdUnitCode(adUnitCode);
+
+    for (let i = 0; i < adSlots.length; i++) {
+      if (isMatchingAdSlot(adSlots[i])) {
+        const id = adSlots[i].getSlotElementId();
+        return id;
+      }
+    }
+  }
+
+  return null;
+}
+
+function _getAdSlotHTMLElement(adUnitCode) {
+  return document.getElementById(adUnitCode) ||
+    document.getElementById(_mapAdUnitPathToElementId(adUnitCode));
+}
+
 function registerViewabilityAllBids(bids) {
   let elementsNotPresent = [];
   bids.forEach(bid => {
-    let div = document.getElementById(bid.adUnitCode);
+    let div = _getAdSlotHTMLElement(bid.adUnitCode);
     if (div) {
-      registerViewability(div);
+      registerViewability(div, bid.adUnitCode);
     } else {
       elementsNotPresent.push(bid.adUnitCode);
     }
@@ -345,114 +379,65 @@ function getViewabilityTracker() {
   let VIEWABILITY_TIME = 1000;
   let VIEWABILITY_MIN_RATIO = 0.5;
   let publicApi;
-  let context;
-
-  function segmentIsOutsideTheVisibleRange(visibleRangeEnd, p1, p2) {
-    return p1 > visibleRangeEnd || p2 < 0;
-  }
-
-  function segmentBeginsBeforeTheVisibleRange(p1) {
-    return p1 < 0;
-  }
-
-  function segmentEndsAfterTheVisibleRange(visibleRangeEnd, p2) {
-    return p2 < visibleRangeEnd;
-  }
-
-  function axialVisibilityRatio(visibleRangeEnd, p1, p2) {
-    let visibilityRatio = 0;
-    if (!segmentIsOutsideTheVisibleRange(visibleRangeEnd, p1, p2)) {
-      if (segmentBeginsBeforeTheVisibleRange(p1)) {
-        visibilityRatio = p2 / (p2 - p1);
+  let observer;
+  let visibilityAds = {};
+
+  function intersectionCallback(entries) {
+    entries.forEach(function(entry) {
+      var adBox = entry.target;
+      if (entry.isIntersecting) {
+        if (entry.intersectionRatio >= VIEWABILITY_MIN_RATIO && entry.boundingClientRect && entry.boundingClientRect.height > 0 && entry.boundingClientRect.width > 0) {
+          visibilityAds[adBox.id] = true;
+        }
       } else {
-        visibilityRatio = segmentEndsAfterTheVisibleRange(visibleRangeEnd, p2) ? 1 : (visibleRangeEnd - p1) / (p2 - p1);
+        visibilityAds[adBox.id] = false;
       }
-    }
-    return visibilityRatio;
-  }
-
-  function isNotHiddenByNonFriendlyIframe() {
-    try { return (window === window.top) || window.frameElement; } catch (e) {}
-  }
-
-  function defineContext(e) {
-    try {
-      context = e && window.document.body.contains(e) ? window : (window.top.document.body.contains(e) ? top : undefined);
-    } catch (err) {}
-    return context;
-  }
-
-  function getContext(e) {
-    return context;
-  }
-
-  function verticalVisibilityRatio(position) {
-    return axialVisibilityRatio(getContext().innerHeight, position.top, position.bottom);
-  }
-
-  function horizontalVisibilityRatio(position) {
-    return axialVisibilityRatio(getContext().innerWidth, position.left, position.right);
-  }
-
-  function itIsNotHiddenByBannerAreaPosition(e) {
-    let position = e.getBoundingClientRect();
-    return (verticalVisibilityRatio(position) * horizontalVisibilityRatio(position)) > VIEWABILITY_MIN_RATIO;
-  }
-
-  function itIsNotHiddenByDisplayStyleCascade(e) {
-    return e.offsetHeight > 0 && e.offsetWidth > 0;
-  }
-
-  function itIsNotHiddenByOpacityStyleCascade(e) {
-    let s = e.style;
-    let p = e.parentNode;
-    return !(s && parseFloat(s.opacity) === 0) && (!p || itIsNotHiddenByOpacityStyleCascade(p));
-  }
-
-  function itIsNotHiddenByVisibilityStyleCascade(e) {
-    return getContext().getComputedStyle(e).visibility !== 'hidden';
-  }
-
-  function itIsNotHiddenByTabFocus() {
-    try { return getContext().top.document.hasFocus(); } catch (e) {}
-  }
-
-  function isDefined(e) {
-    return (e !== null) && (typeof e !== 'undefined');
+    });
   }
 
-  function itIsNotHiddenByOrphanBranch() {
-    return isDefined(getContext());
+  function observedElementIsVisible(element) {
+    return visibilityAds[element.id] && document.visibilityState && document.visibilityState === 'visible';
   }
 
-  function isContextInAnIframe() {
-    return isDefined(getContext().frameElement);
+  function defineObserver() {
+    if (!observer) {
+      var observerConfig = {
+        root: null,
+        rootMargin: '0px',
+        threshold: [VIEWABILITY_MIN_RATIO]
+      };
+      observer = new IntersectionObserver(intersectionCallback.bind(this), observerConfig);
+    }
   }
-
   function processIntervalVisibilityStatus(elapsedVisibleIntervals, element, callback) {
-    let visibleIntervals = isVisible(element) ? (elapsedVisibleIntervals + 1) : 0;
+    let visibleIntervals = observedElementIsVisible(element) ? (elapsedVisibleIntervals + 1) : 0;
     if (visibleIntervals === TIME_PARTITIONS) {
+      stopObserveViewability(element)
       callback();
     } else {
       setTimeout(processIntervalVisibilityStatus.bind(this, visibleIntervals, element, callback), VIEWABILITY_TIME / TIME_PARTITIONS);
     }
   }
 
-  function isVisible(element) {
-    defineContext(element);
-    return isNotHiddenByNonFriendlyIframe() &&
-      itIsNotHiddenByOrphanBranch() &&
-      itIsNotHiddenByTabFocus() &&
-      itIsNotHiddenByDisplayStyleCascade(element) &&
-      itIsNotHiddenByVisibilityStyleCascade(element) &&
-      itIsNotHiddenByOpacityStyleCascade(element) &&
-      itIsNotHiddenByBannerAreaPosition(element) &&
-      (!isContextInAnIframe() || isVisible(getContext().frameElement));
+  function stopObserveViewability(element) {
+    delete visibilityAds[element.id];
+    observer.unobserve(element);
+  }
+
+  function observeAds(element) {
+    observer.observe(element);
+  }
+
+  function initAndVerifyVisibility(element, callback) {
+    if (element) {
+      defineObserver();
+      observeAds(element);
+      processIntervalVisibilityStatus(0, element, callback);
+    }
   }
 
   publicApi = {
-    isVisible: isVisible,
-    onView: processIntervalVisibilityStatus.bind(this, 0)
+    onView: initAndVerifyVisibility.bind(this)
   };
 
   return publicApi;
diff --git a/test/spec/modules/eplanningBidAdapter_spec.js b/test/spec/modules/eplanningBidAdapter_spec.js
index 52d2fb76115..db70f7956d7 100644
--- a/test/spec/modules/eplanningBidAdapter_spec.js
+++ b/test/spec/modules/eplanningBidAdapter_spec.js
@@ -6,6 +6,7 @@ import {init, getIds} from 'modules/userId/index.js';
 import * as utils from 'src/utils.js';
 import {hook} from '../../../src/hook.js';
 import {getGlobal} from '../../../src/prebidGlobal.js';
+import { makeSlot } from '../integration/faker/googletag.js';
 
 describe('E-Planning Adapter', function () {
   const adapter = newBidder('spec');
@@ -649,7 +650,24 @@ describe('E-Planning Adapter', function () {
     let element;
     let getBoundingClientRectStub;
     let sandbox = sinon.sandbox.create();
-    let focusStub;
+    let intersectionObserverStub;
+    let intersectionCallback;
+
+    function setIntersectionObserverMock(params) {
+      let fakeIntersectionObserver = (stateChange, options) => {
+        intersectionCallback = stateChange;
+        return {
+          unobserve: (element) => {
+            return element;
+          },
+          observe: (element) => {
+            intersectionCallback([{'target': {'id': element.id}, 'isIntersecting': params[element.id].isIntersecting, 'intersectionRatio': params[element.id].ratio, 'boundingClientRect': {'width': params[element.id].width, 'height': params[element.id].height}}]);
+          },
+        };
+      };
+
+      intersectionObserverStub = sandbox.stub(window, 'IntersectionObserver').callsFake(fakeIntersectionObserver);
+    }
     function createElement(id) {
       element = document.createElement('div');
       element.id = id || ADUNIT_CODE_VIEW;
@@ -741,9 +759,6 @@ describe('E-Planning Adapter', function () {
       hasLocalStorageStub.returns(true);
 
       clock = sandbox.useFakeTimers();
-
-      focusStub = sandbox.stub(window.top.document, 'hasFocus');
-      focusStub.returns(true);
     });
     afterEach(function () {
       $$PREBID_GLOBAL$$.bidderSettings = {};
@@ -786,6 +801,7 @@ describe('E-Planning Adapter', function () {
       let respuesta;
       beforeEach(function () {
         createElementVisible();
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 1, 'isIntersecting': true, 'width': 200, 'height': 200}});
       });
       it('when you have a render', function() {
         respuesta = spec.buildRequests(bidRequests, bidderRequest);
@@ -823,6 +839,7 @@ describe('E-Planning Adapter', function () {
       let respuesta;
       beforeEach(function () {
         createElementOutOfView();
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 0, 'isIntersecting': false, 'width': 200, 'height': 200}});
       });
 
       it('when you have a render', function() {
@@ -848,6 +865,7 @@ describe('E-Planning Adapter', function () {
       let respuesta;
       it('should register visibility with more than 50%', function() {
         createPartiallyVisibleElement();
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 0.6, 'isIntersecting': true, 'width': 200, 'height': 200}});
         respuesta = spec.buildRequests(bidRequests, bidderRequest);
         clock.tick(1005);
 
@@ -856,6 +874,7 @@ describe('E-Planning Adapter', function () {
       });
       it('you should not register visibility with less than 50%', function() {
         createPartiallyInvisibleElement();
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 0.4, 'isIntersecting': true, 'width': 200, 'height': 200}});
         respuesta = spec.buildRequests(bidRequests, bidderRequest);
         clock.tick(1005);
 
@@ -863,12 +882,29 @@ describe('E-Planning Adapter', function () {
         expect(storage.getDataFromLocalStorage(storageIdView)).to.equal(null);
       });
     });
+    context('when element id is not equal to adunitcode', function() {
+      let respuesta;
+      it('should register visibility with more than 50%', function() {
+        const code = ADUNIT_CODE_VIEW;
+        const divId = 'div-gpt-ad-123';
+        createPartiallyVisibleElement(divId);
+        window.googletag.pubads().setSlots([makeSlot({ code, divId })]);
+        setIntersectionObserverMock({[divId]: {'ratio': 0.6, 'isIntersecting': true, 'width': 200, 'height': 200}});
+
+        respuesta = spec.buildRequests(bidRequests, bidderRequest);
+        clock.tick(1005);
+
+        expect(storage.getDataFromLocalStorage(storageIdRender)).to.equal('1');
+        expect(storage.getDataFromLocalStorage(storageIdView)).to.equal('1');
+      });
+    });
     context('when width or height of the element is zero', function() {
       beforeEach(function () {
         createElementVisible();
       });
       it('if the width is zero but the height is within the range', function() {
         element.style.width = '0px';
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 0.4, 'isIntersecting': true, 'width': 200, 'height': 200}});
         spec.buildRequests(bidRequests, bidderRequest)
         clock.tick(1005);
 
@@ -877,6 +913,7 @@ describe('E-Planning Adapter', function () {
       });
       it('if the height is zero but the width is within the range', function() {
         element.style.height = '0px';
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 1, 'isIntersecting': true, 'width': 500, 'height': 0}});
         spec.buildRequests(bidRequests, bidderRequest)
         clock.tick(1005);
 
@@ -886,6 +923,7 @@ describe('E-Planning Adapter', function () {
       it('if both are zero', function() {
         element.style.height = '0px';
         element.style.width = '0px';
+        setIntersectionObserverMock({[ADUNIT_CODE_VIEW]: {'ratio': 1, 'isIntersecting': true, 'width': 0, 'height': 0}});
         spec.buildRequests(bidRequests, bidderRequest)
         clock.tick(1005);
 
@@ -893,16 +931,6 @@ describe('E-Planning Adapter', function () {
         expect(storage.getDataFromLocalStorage(storageIdView)).to.equal(null);
       });
     });
-    context('when tab is inactive', function() {
-      it('I should not register if it is not in focus', function() {
-        createElementVisible();
-        focusStub.returns(false);
-        spec.buildRequests(bidRequests, bidderRequest);
-        clock.tick(1005);
-        expect(storage.getDataFromLocalStorage(storageIdRender)).to.equal('1');
-        expect(storage.getDataFromLocalStorage(storageIdView)).to.equal(null);
-      });
-    });
     context('segmentBeginsBeforeTheVisibleRange', function() {
       it('segmentBeginsBeforeTheVisibleRange', function() {
         createElementOutOfRange();
@@ -933,7 +961,11 @@ describe('E-Planning Adapter', function () {
         createElementVisible(ADUNIT_CODE_VIEW);
         createElementVisible(ADUNIT_CODE_VIEW2);
         createElementVisible(ADUNIT_CODE_VIEW3);
-
+        setIntersectionObserverMock({
+          [ADUNIT_CODE_VIEW]: {'ratio': 1, 'isIntersecting': true, 'width': 200, 'height': 200},
+          [ADUNIT_CODE_VIEW2]: {'ratio': 1, 'isIntersecting': true, 'width': 200, 'height': 200},
+          [ADUNIT_CODE_VIEW3]: {'ratio': 1, 'isIntersecting': true, 'width': 200, 'height': 200}
+        });
         respuesta = spec.buildRequests(bidRequestMultiple, bidderRequest);
         clock.tick(1005);
         [ADUNIT_CODE_VIEW, ADUNIT_CODE_VIEW2, ADUNIT_CODE_VIEW3].forEach(ac => {
@@ -946,7 +978,11 @@ describe('E-Planning Adapter', function () {
         createElementOutOfView(ADUNIT_CODE_VIEW);
         createElementOutOfView(ADUNIT_CODE_VIEW2);
         createElementOutOfView(ADUNIT_CODE_VIEW3);
-
+        setIntersectionObserverMock({
+          [ADUNIT_CODE_VIEW]: {'ratio': 0, 'isIntersecting': false, 'width': 200, 'height': 200},
+          [ADUNIT_CODE_VIEW2]: {'ratio': 0, 'isIntersecting': false, 'width': 200, 'height': 200},
+          [ADUNIT_CODE_VIEW3]: {'ratio': 0, 'isIntersecting': false, 'width': 200, 'height': 200}
+        });
         respuesta = spec.buildRequests(bidRequestMultiple, bidderRequest);
         clock.tick(1005);
         [ADUNIT_CODE_VIEW, ADUNIT_CODE_VIEW2, ADUNIT_CODE_VIEW3].forEach(ac => {
@@ -960,7 +996,11 @@ describe('E-Planning Adapter', function () {
         createElementVisible(ADUNIT_CODE_VIEW);
         createElementOutOfView(ADUNIT_CODE_VIEW2);
         createElementOutOfView(ADUNIT_CODE_VIEW3);
-
+        setIntersectionObserverMock({
+          [ADUNIT_CODE_VIEW]: {'ratio': 1, 'isIntersecting': true, 'width': 200, 'height': 200},
+          [ADUNIT_CODE_VIEW2]: {'ratio': 0.3, 'isIntersecting': true, 'width': 200, 'height': 200},
+          [ADUNIT_CODE_VIEW3]: {'ratio': 0, 'isIntersecting': false, 'width': 200, 'height': 200}
+        });
         respuesta = spec.buildRequests(bidRequestMultiple, bidderRequest);
         clock.tick(1005);
         expect(storage.getDataFromLocalStorage('pbsr_' + ADUNIT_CODE_VIEW)).to.equal('6');
@@ -989,7 +1029,7 @@ describe('E-Planning Adapter', function () {
       sandbox.restore();
     })
 
-    it('should add eids to the request', function() {
+    it('should add eids to the request ', function() {
       let bidRequests = [validBidView];
       const expected_id5id = encodeURIComponent(JSON.stringify({ uid: 'ID5-ZHMOL_IfFSt7_lVYX8rBZc6GH3XMWyPQOBUfr4bm0g!', ext: { linkType: 1 } }));
       const request = spec.buildRequests(bidRequests, bidderRequest);

From c09108bc14fa51be82936c44e755d6bf0ac85942 Mon Sep 17 00:00:00 2001
From: Phaneendra Hegde <pnhegde@users.noreply.github.com>
Date: Tue, 12 Jul 2022 20:06:08 +0530
Subject: [PATCH 017/569] PubxaiAnalyticsAdapter: Added extra fields to winning
 bid object (#8644)

* Added extra fields to winning bid object

* Update: Picking specific fields from floorDetail instead of including the entire object

Co-authored-by: Phaneendra Hegde <phaneendra@pubx.ai>
---
 modules/pubxaiAnalyticsAdapter.js                | 7 ++++++-
 test/spec/modules/pubxaiAnalyticsAdapter_spec.js | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/pubxaiAnalyticsAdapter.js b/modules/pubxaiAnalyticsAdapter.js
index 669bd062206..3f35cd8ff79 100644
--- a/modules/pubxaiAnalyticsAdapter.js
+++ b/modules/pubxaiAnalyticsAdapter.js
@@ -91,7 +91,12 @@ function mapBidResponse(bidResponse, status) {
     } else {
       Object.assign(bid, {
         bidId: bidResponse.requestId,
-        floorProvider: events.floorDetail ? events.floorDetail.floorProvider : null,
+        floorProvider: events.floorDetail?.floorProvider || null,
+        floorFetchStatus: events.floorDetail?.fetchStatus || null,
+        floorLocation: events.floorDetail?.location || null,
+        floorModelVersion: events.floorDetail?.modelVersion || null,
+        floorSkipRate: events.floorDetail?.skipRate || 0,
+        isFloorSkipped: events.floorDetail?.skipped || false,
         isWinningBid: true,
         placementId: bidResponse.params ? deepAccess(bidResponse, 'params.0.placementId') : null,
         renderedSize: bidResponse.size,
diff --git a/test/spec/modules/pubxaiAnalyticsAdapter_spec.js b/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
index 63364b867be..1ad23b9a41e 100644
--- a/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
@@ -624,6 +624,11 @@ describe('pubxai analytics adapter', function() {
           }
         },
         'floorProvider': 'PubXFloorProvider',
+        'floorFetchStatus': 'success',
+        'floorLocation': 'fetch',
+        'floorModelVersion': 'test model 1.0',
+        'floorSkipRate': 0,
+        'isFloorSkipped': false,
         'isWinningBid': true,
         'mediaType': 'banner',
         'netRevenue': true,

From a2462cc1f968af4f7ddd3e28dfdc32160109f4a5 Mon Sep 17 00:00:00 2001
From: newspassid-prebid <107485317+newspassid-prebid@users.noreply.github.com>
Date: Tue, 12 Jul 2022 20:14:05 +0100
Subject: [PATCH 018/569] Newspassid Bid Adapter: initial release (#8567)

* New bid adapter: newspassid spec test

spec test file for new bid adapter with biddercode: newspassid

* New Bid Adapter: newspassid

newspassid prebid JS bid adapter

* fixed tests

fixed tests

* Rename newspassBidAdapter.js to newspassidBidAdapter.js

renamed to correct bidder code

* Update newspassidBidAdapter_spec.js

* Deleted duplicate spec file

moved bidAdapter.js file to correct folder (modules) and deleted duplicate spec file

* fixes

* Update newspassidBidAdapter.js

* Create newspassid.md

adding md file to modules folder as requested.

* updated dev doc to modules filder

fixes error in test params

* Update newspassidBidAdapter.js

fixing latest feedback from prebid.org review

* Update newspassidBidAdapter.js

fixing latest feedback

* Update newspassidBidAdapter.js

* updates per feedback

* Update newspassidBidAdapter.js

updating version number - re-committing to see if circle CI tests now pass

* fixing location of files

should fix circleCi failures!
---
 modules/newspassidBidAdapter.js               |  649 ++++++
 .../spec/modules/newspassidBidAdapter_spec.js | 1793 +++++++++++++++++
 2 files changed, 2442 insertions(+)
 create mode 100644 modules/newspassidBidAdapter.js
 create mode 100644 test/spec/modules/newspassidBidAdapter_spec.js

diff --git a/modules/newspassidBidAdapter.js b/modules/newspassidBidAdapter.js
new file mode 100644
index 00000000000..ee6ece2b033
--- /dev/null
+++ b/modules/newspassidBidAdapter.js
@@ -0,0 +1,649 @@
+import { logInfo, logError, deepAccess, logWarn, deepSetValue, isArray, contains, parseUrl } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import {getPriceBucketString} from '../src/cpmBucketManager.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+const BIDDER_CODE = 'newspassid';
+const ORIGIN = 'https://bidder.newspassid.com' // applies only to auction & cookie
+const AUCTIONURI = '/openrtb2/auction';
+const NEWSPASSCOOKIESYNC = '/static/load-cookie.html';
+const NEWSPASSVERSION = '1.0.1';
+export const spec = {
+  version: NEWSPASSVERSION,
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  cookieSyncBag: {publisherId: null, siteId: null, userIdObject: {}}, // variables we want to make available to cookie sync
+  propertyBag: {config: null, pageId: null, buildRequestsStart: 0, buildRequestsEnd: 0, endpointOverride: null}, /* allow us to store vars in instance scope - needs to be an object to be mutable */
+  config_defaults: {
+    'logId': 'NEWSPASSID',
+    'bidder': 'newspassid',
+    'auctionUrl': ORIGIN + AUCTIONURI,
+    'cookieSyncUrl': ORIGIN + NEWSPASSCOOKIESYNC
+  },
+  loadConfiguredData(bid) {
+    if (this.propertyBag.config) { return; }
+    this.propertyBag.config = JSON.parse(JSON.stringify(this.config_defaults));
+    let bidder = bid.bidder || 'newspassid';
+    this.propertyBag.config.logId = bidder.toUpperCase();
+    this.propertyBag.config.bidder = bidder;
+    let bidderConfig = config.getConfig(bidder) || {};
+    logInfo('got bidderConfig: ', JSON.parse(JSON.stringify(bidderConfig)));
+    let arrGetParams = this.getGetParametersAsObject();
+    if (bidderConfig.endpointOverride) {
+      if (bidderConfig.endpointOverride.origin) {
+        this.propertyBag.endpointOverride = bidderConfig.endpointOverride.origin;
+        this.propertyBag.config.auctionUrl = bidderConfig.endpointOverride.origin + AUCTIONURI;
+        this.propertyBag.config.cookieSyncUrl = bidderConfig.endpointOverride.origin + NEWSPASSCOOKIESYNC;
+      }
+      if (bidderConfig.endpointOverride.cookieSyncUrl) {
+        this.propertyBag.config.cookieSyncUrl = bidderConfig.endpointOverride.cookieSyncUrl;
+      }
+      if (bidderConfig.endpointOverride.auctionUrl) {
+        this.propertyBag.endpointOverride = bidderConfig.endpointOverride.auctionUrl;
+        this.propertyBag.config.auctionUrl = bidderConfig.endpointOverride.auctionUrl;
+      }
+    }
+    try {
+      if (arrGetParams.hasOwnProperty('auction')) {
+        logInfo('GET: setting auction endpoint to: ' + arrGetParams.auction);
+        this.propertyBag.config.auctionUrl = arrGetParams.auction;
+      }
+      if (arrGetParams.hasOwnProperty('cookiesync')) {
+        logInfo('GET: setting cookiesync to: ' + arrGetParams.cookiesync);
+        this.propertyBag.config.cookieSyncUrl = arrGetParams.cookiesync;
+      }
+    } catch (e) {}
+    logInfo('set propertyBag.config to', this.propertyBag.config);
+  },
+  getAuctionUrl() {
+    return this.propertyBag.config.auctionUrl;
+  },
+  getCookieSyncUrl() {
+    return this.propertyBag.config.cookieSyncUrl;
+  },
+  isBidRequestValid(bid) {
+    this.loadConfiguredData(bid);
+    logInfo('isBidRequestValid : ', config.getConfig(), bid);
+    let adUnitCode = bid.adUnitCode; // adunit[n].code
+    let err1 = 'VALIDATION FAILED : missing {param} : siteId, placementId and publisherId are REQUIRED'
+    if (!(bid.params.hasOwnProperty('placementId'))) {
+      logError(err1.replace('{param}', 'placementId'), adUnitCode);
+      return false;
+    }
+    if (!this.isValidPlacementId(bid.params.placementId)) {
+      logError('VALIDATION FAILED : placementId must be exactly 10 numeric characters', adUnitCode);
+      return false;
+    }
+    if (!(bid.params.hasOwnProperty('publisherId'))) {
+      logError(err1.replace('{param}', 'publisherId'), adUnitCode);
+      return false;
+    }
+    if (!(bid.params.publisherId).toString().match(/^[a-zA-Z0-9\-]{12}$/)) {
+      logError('VALIDATION FAILED : publisherId must be exactly 12 alphanumeric characters including hyphens', adUnitCode);
+      return false;
+    }
+    if (!(bid.params.hasOwnProperty('siteId'))) {
+      logError(err1.replace('{param}', 'siteId'), adUnitCode);
+      return false;
+    }
+    if (!(bid.params.siteId).toString().match(/^[0-9]{10}$/)) {
+      logError('VALIDATION FAILED : siteId must be exactly 10 numeric characters', adUnitCode);
+      return false;
+    }
+    if (bid.params.hasOwnProperty('customParams')) {
+      logError('VALIDATION FAILED : customParams should be renamed to customData', adUnitCode);
+      return false;
+    }
+    if (bid.params.hasOwnProperty('customData')) {
+      if (!Array.isArray(bid.params.customData)) {
+        logError('VALIDATION FAILED : customData is not an Array', adUnitCode);
+        return false;
+      }
+      if (bid.params.customData.length < 1) {
+        logError('VALIDATION FAILED : customData is an array but does not contain any elements', adUnitCode);
+        return false;
+      }
+      if (!(bid.params.customData[0]).hasOwnProperty('targeting')) {
+        logError('VALIDATION FAILED : customData[0] does not contain "targeting"', adUnitCode);
+        return false;
+      }
+      if (typeof bid.params.customData[0]['targeting'] != 'object') {
+        logError('VALIDATION FAILED : customData[0] targeting is not an object', adUnitCode);
+        return false;
+      }
+    }
+    return true;
+  },
+  isValidPlacementId(placementId) {
+    return placementId.toString().match(/^[0-9]{10}$/);
+  },
+  buildRequests(validBidRequests, bidderRequest) {
+    this.loadConfiguredData(validBidRequests[0]);
+    this.propertyBag.buildRequestsStart = new Date().getTime();
+    logInfo(`buildRequests time: ${this.propertyBag.buildRequestsStart} v ${NEWSPASSVERSION} validBidRequests`, JSON.parse(JSON.stringify(validBidRequests)), 'bidderRequest', JSON.parse(JSON.stringify(bidderRequest)));
+    if (this.blockTheRequest()) {
+      return [];
+    }
+    let htmlParams = {'publisherId': '', 'siteId': ''};
+    if (validBidRequests.length > 0) {
+      this.cookieSyncBag.userIdObject = Object.assign(this.cookieSyncBag.userIdObject, this.findAllUserIds(validBidRequests[0]));
+      this.cookieSyncBag.siteId = deepAccess(validBidRequests[0], 'params.siteId');
+      this.cookieSyncBag.publisherId = deepAccess(validBidRequests[0], 'params.publisherId');
+      htmlParams = validBidRequests[0].params;
+    }
+    logInfo('cookie sync bag', this.cookieSyncBag);
+    let singleRequest = config.getConfig('newspassid.singleRequest');
+    singleRequest = singleRequest !== false; // undefined & true will be true
+    logInfo(`config newspassid.singleRequest : `, singleRequest);
+    let npRequest = {}; // we only want to set specific properties on this, not validBidRequests[0].params
+    logInfo('going to get ortb2 from bidder request...');
+    let fpd = deepAccess(bidderRequest, 'ortb2', null);
+    logInfo('got fpd: ', fpd);
+    if (fpd && deepAccess(fpd, 'user')) {
+      logInfo('added FPD user object');
+      npRequest.user = fpd.user;
+    }
+    const getParams = this.getGetParametersAsObject();
+    const isTestMode = getParams['nptestmode'] || null; // this can be any string, it's used for testing ads
+    npRequest.device = {'w': window.innerWidth, 'h': window.innerHeight};
+    let placementIdOverrideFromGetParam = this.getPlacementIdOverrideFromGetParam(); // null or string
+    let schain = null;
+    let tosendtags = validBidRequests.map(npBidRequest => {
+      var obj = {};
+      let placementId = placementIdOverrideFromGetParam || this.getPlacementId(npBidRequest); // prefer to use a valid override param, else the bidRequest placement Id
+      obj.id = npBidRequest.bidId; // this causes an error if we change it to something else, even if you update the bidRequest object: "WARNING: Bidder newspass made bid for unknown request ID: mb7953.859498327448. Ignoring."
+      obj.tagid = placementId;
+      let parsed = parseUrl(getRefererInfo().page);
+      obj.secure = parsed.protocol === 'https' ? 1 : 0;
+      let arrBannerSizes = [];
+      if (!npBidRequest.hasOwnProperty('mediaTypes')) {
+        if (npBidRequest.hasOwnProperty('sizes')) {
+          logInfo('no mediaTypes detected - will use the sizes array in the config root');
+          arrBannerSizes = npBidRequest.sizes;
+        } else {
+          logInfo('Cannot set sizes for banner type');
+        }
+      } else {
+        if (npBidRequest.mediaTypes.hasOwnProperty(BANNER)) {
+          arrBannerSizes = npBidRequest.mediaTypes[BANNER].sizes; /* Note - if there is a sizes element in the config root it will be pushed into here */
+          logInfo('setting banner size from the mediaTypes.banner element for bidId ' + obj.id + ': ', arrBannerSizes);
+        }
+        if (npBidRequest.mediaTypes.hasOwnProperty(NATIVE)) {
+          obj.native = npBidRequest.mediaTypes[NATIVE];
+          logInfo('setting native object from the mediaTypes.native element: ' + obj.id + ':', obj.native);
+        }
+      }
+      if (arrBannerSizes.length > 0) {
+        obj.banner = {
+          topframe: 1,
+          w: arrBannerSizes[0][0] || 0,
+          h: arrBannerSizes[0][1] || 0,
+          format: arrBannerSizes.map(s => {
+            return {w: s[0], h: s[1]};
+          })
+        };
+      }
+      obj.placementId = placementId;
+      deepSetValue(obj, 'ext.prebid', {'storedrequest': {'id': placementId}});
+      obj.ext['newspassid'] = {};
+      obj.ext['newspassid'].adUnitCode = npBidRequest.adUnitCode; // eg. 'mpu'
+      obj.ext['newspassid'].transactionId = npBidRequest.transactionId; // this is the transactionId PER adUnit, common across bidders for this unit
+      if (npBidRequest.params.hasOwnProperty('customData')) {
+        obj.ext['newspassid'].customData = npBidRequest.params.customData;
+      }
+      logInfo(`obj.ext.newspassid is `, obj.ext['newspassid']);
+      if (isTestMode != null) {
+        logInfo('setting isTestMode to ', isTestMode);
+        if (obj.ext['newspassid'].hasOwnProperty('customData')) {
+          for (let i = 0; i < obj.ext['newspassid'].customData.length; i++) {
+            obj.ext['newspassid'].customData[i]['targeting']['nptestmode'] = isTestMode;
+          }
+        } else {
+          obj.ext['newspassid'].customData = [{'settings': {}, 'targeting': {}}];
+          obj.ext['newspassid'].customData[0].targeting['nptestmode'] = isTestMode;
+        }
+      }
+      if (fpd && deepAccess(fpd, 'site')) {
+        logInfo('adding fpd.site');
+        if (deepAccess(obj, 'ext.newspassid.customData.0.targeting', false)) {
+          obj.ext.newspassid.customData[0].targeting = Object.assign(obj.ext.newspassid.customData[0].targeting, fpd.site);
+        } else {
+          deepSetValue(obj, 'ext.newspassid.customData.0.targeting', fpd.site);
+        }
+      }
+      if (!schain && deepAccess(npBidRequest, 'schain')) {
+        schain = npBidRequest.schain;
+      }
+      return obj;
+    });
+    let extObj = {};
+    extObj['newspassid'] = {};
+    extObj['newspassid']['np_pb_v'] = NEWSPASSVERSION;
+    extObj['newspassid']['np_rw'] = placementIdOverrideFromGetParam ? 1 : 0;
+    if (validBidRequests.length > 0) {
+      let userIds = this.cookieSyncBag.userIdObject; // 2021-01-06 - slight optimisation - we've already found this info
+      if (userIds.hasOwnProperty('pubcid')) {
+        extObj['newspassid'].pubcid = userIds.pubcid;
+      }
+    }
+    extObj['newspassid'].pv = this.getPageId(); // attach the page ID that will be common to all auction calls for this page if refresh() is called
+    let whitelistAdserverKeys = config.getConfig('newspassid.np_whitelist_adserver_keys');
+    let useWhitelistAdserverKeys = isArray(whitelistAdserverKeys) && whitelistAdserverKeys.length > 0;
+    extObj['newspassid']['np_kvp_rw'] = useWhitelistAdserverKeys ? 1 : 0;
+    if (getParams.hasOwnProperty('npf')) { extObj['newspassid']['npf'] = getParams.npf === 'true' || getParams.npf === '1' ? 1 : 0; }
+    if (getParams.hasOwnProperty('nppf')) { extObj['newspassid']['nppf'] = getParams.nppf === 'true' || getParams.nppf === '1' ? 1 : 0; }
+    if (getParams.hasOwnProperty('nprp') && getParams.nprp.match(/^[0-3]$/)) { extObj['newspassid']['nprp'] = parseInt(getParams.nprp); }
+    if (getParams.hasOwnProperty('npip') && getParams.npip.match(/^\d+$/)) { extObj['newspassid']['npip'] = parseInt(getParams.npip); }
+    if (this.propertyBag.endpointOverride != null) { extObj['newspassid']['origin'] = this.propertyBag.endpointOverride; }
+    let userExtEids = deepAccess(validBidRequests, '0.userIdAsEids', []); // generate the UserIDs in the correct format for UserId module
+    npRequest.site = {
+      'publisher': {'id': htmlParams.publisherId},
+      'page': getRefererInfo().page,
+      'id': htmlParams.siteId
+    };
+    npRequest.test = config.getConfig('debug') ? 1 : 0;
+    if (bidderRequest && bidderRequest.uspConsent) {
+      logInfo('ADDING USP consent info');
+      deepSetValue(npRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    } else {
+      logInfo('WILL NOT ADD USP consent info; no bidderRequest.uspConsent.');
+    }
+    if (schain) { // we set this while iterating over the bids
+      logInfo('schain found');
+      deepSetValue(npRequest, 'source.ext.schain', schain);
+    }
+    if (config.getConfig('coppa') === true) {
+      deepSetValue(npRequest, 'regs.coppa', 1);
+    }
+    if (singleRequest) {
+      logInfo('buildRequests starting to generate response for a single request');
+      npRequest.id = bidderRequest.auctionId; // Unique ID of the bid request, provided by the exchange.
+      npRequest.auctionId = bidderRequest.auctionId; // not sure if this should be here?
+      npRequest.imp = tosendtags;
+      npRequest.ext = extObj;
+      deepSetValue(npRequest, 'source.tid', bidderRequest.auctionId);// RTB 2.5 : tid is Transaction ID that must be common across all participants in this bid request (e.g., potentially multiple exchanges).
+      deepSetValue(npRequest, 'user.ext.eids', userExtEids);
+      var ret = {
+        method: 'POST',
+        url: this.getAuctionUrl(),
+        data: JSON.stringify(npRequest),
+        bidderRequest: bidderRequest
+      };
+      logInfo('buildRequests request data for single = ', JSON.parse(JSON.stringify(npRequest)));
+      this.propertyBag.buildRequestsEnd = new Date().getTime();
+      logInfo(`buildRequests going to return for single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, ret);
+      return ret;
+    }
+    let arrRet = tosendtags.map(imp => {
+      logInfo('buildRequests starting to generate non-single response, working on imp : ', imp);
+      let npRequestSingle = Object.assign({}, npRequest);
+      imp.ext['newspassid'].pageAuctionId = bidderRequest['auctionId']; // make a note in the ext object of what the original auctionId was, in the bidderRequest object
+      npRequestSingle.id = imp.ext['newspassid'].transactionId; // Unique ID of the bid request, provided by the exchange.
+      npRequestSingle.auctionId = imp.ext['newspassid'].transactionId; // not sure if this should be here?
+      npRequestSingle.imp = [imp];
+      npRequestSingle.ext = extObj;
+      deepSetValue(npRequestSingle, 'source.tid', imp.ext['newspassid'].transactionId);// RTB 2.5 : tid is Transaction ID that must be common across all participants in this bid request (e.g., potentially multiple exchanges).
+      deepSetValue(npRequestSingle, 'user.ext.eids', userExtEids);
+      logInfo('buildRequests RequestSingle (for non-single) = ', npRequestSingle);
+      return {
+        method: 'POST',
+        url: this.getAuctionUrl(),
+        data: JSON.stringify(npRequestSingle),
+        bidderRequest: bidderRequest
+      };
+    });
+    this.propertyBag.buildRequestsEnd = new Date().getTime();
+    logInfo(`buildRequests going to return for non-single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, arrRet);
+    return arrRet;
+  },
+  interpretResponse(serverResponse, request) {
+    if (request && request.bidderRequest && request.bidderRequest.bids) { this.loadConfiguredData(request.bidderRequest.bids[0]); }
+    let startTime = new Date().getTime();
+    logInfo(`interpretResponse time: ${startTime}. buildRequests done -> interpretResponse start was ${startTime - this.propertyBag.buildRequestsEnd}ms`);
+    logInfo(`serverResponse, request`, JSON.parse(JSON.stringify(serverResponse)), JSON.parse(JSON.stringify(request)));
+    serverResponse = serverResponse.body || {};
+    if (!serverResponse.hasOwnProperty('seatbid')) {
+      return [];
+    }
+    if (typeof serverResponse.seatbid !== 'object') {
+      return [];
+    }
+    let arrAllBids = [];
+    let enhancedAdserverTargeting = config.getConfig('newspassid.enhancedAdserverTargeting');
+    logInfo('enhancedAdserverTargeting', enhancedAdserverTargeting);
+    if (typeof enhancedAdserverTargeting == 'undefined') {
+      enhancedAdserverTargeting = true;
+    }
+    logInfo('enhancedAdserverTargeting', enhancedAdserverTargeting);
+    serverResponse.seatbid = injectAdIdsIntoAllBidResponses(serverResponse.seatbid); // we now make sure that each bid in the bidresponse has a unique (within page) adId attribute.
+    serverResponse.seatbid = this.removeSingleBidderMultipleBids(serverResponse.seatbid);
+    let whitelistAdserverKeys = config.getConfig('newspassid.np_whitelist_adserver_keys');
+    let useWhitelistAdserverKeys = isArray(whitelistAdserverKeys) && whitelistAdserverKeys.length > 0;
+    for (let i = 0; i < serverResponse.seatbid.length; i++) {
+      let sb = serverResponse.seatbid[i];
+      for (let j = 0; j < sb.bid.length; j++) {
+        let thisRequestBid = this.getBidRequestForBidId(sb.bid[j].impid, request.bidderRequest.bids);
+        logInfo(`seatbid:${i}, bid:${j} Going to set default w h for seatbid/bidRequest`, sb.bid[j], thisRequestBid);
+        const {defaultWidth, defaultHeight} = defaultSize(thisRequestBid);
+        let thisBid = this.addStandardProperties(sb.bid[j], defaultWidth, defaultHeight);
+        thisBid.meta = {advertiserDomains: thisBid.adomain || []};
+        let bidType = deepAccess(thisBid, 'ext.prebid.type');
+        logInfo(`this bid type is : ${bidType}`, j);
+        let adserverTargeting = {};
+        if (enhancedAdserverTargeting) {
+          let allBidsForThisBidid = this.getAllBidsForBidId(thisBid.bidId, serverResponse.seatbid);
+          logInfo('Going to iterate allBidsForThisBidId', allBidsForThisBidid);
+          Object.keys(allBidsForThisBidid).forEach((bidderName, index, ar2) => {
+            logInfo(`adding adserverTargeting for ${bidderName} for bidId ${thisBid.bidId}`);
+            adserverTargeting['np_' + bidderName] = bidderName;
+            adserverTargeting['np_' + bidderName + '_crid'] = String(allBidsForThisBidid[bidderName].crid);
+            adserverTargeting['np_' + bidderName + '_adv'] = String(allBidsForThisBidid[bidderName].adomain);
+            adserverTargeting['np_' + bidderName + '_adId'] = String(allBidsForThisBidid[bidderName].adId);
+            adserverTargeting['np_' + bidderName + '_pb_r'] = getRoundedBid(allBidsForThisBidid[bidderName].price, allBidsForThisBidid[bidderName].ext.prebid.type);
+            if (allBidsForThisBidid[bidderName].hasOwnProperty('dealid')) {
+              adserverTargeting['np_' + bidderName + '_dealid'] = String(allBidsForThisBidid[bidderName].dealid);
+            }
+          });
+        } else {
+          logInfo(`newspassid.enhancedAdserverTargeting is set to false, no per-bid keys will be sent to adserver.`);
+        }
+        let {seat: winningSeat, bid: winningBid} = this.getWinnerForRequestBid(thisBid.bidId, serverResponse.seatbid);
+        adserverTargeting['np_auc_id'] = String(request.bidderRequest.auctionId);
+        adserverTargeting['np_winner'] = String(winningSeat);
+        adserverTargeting['np_bid'] = 'true';
+        if (enhancedAdserverTargeting) {
+          adserverTargeting['np_imp_id'] = String(winningBid.impid);
+          adserverTargeting['np_pb_r'] = getRoundedBid(winningBid.price, bidType);
+          adserverTargeting['np_adId'] = String(winningBid.adId);
+          adserverTargeting['np_size'] = `${winningBid.width}x${winningBid.height}`;
+        }
+        if (useWhitelistAdserverKeys) { // delete any un-whitelisted keys
+          logInfo('Going to filter out adserver targeting keys not in the whitelist: ', whitelistAdserverKeys);
+          Object.keys(adserverTargeting).forEach(function(key) { if (whitelistAdserverKeys.indexOf(key) === -1) { delete adserverTargeting[key]; } });
+        }
+        thisBid.adserverTargeting = adserverTargeting;
+        arrAllBids.push(thisBid);
+      }
+    }
+    let endTime = new Date().getTime();
+    logInfo(`interpretResponse going to return at time ${endTime} (took ${endTime - startTime}ms) Time from buildRequests Start -> interpretRequests End = ${endTime - this.propertyBag.buildRequestsStart}ms`, arrAllBids);
+    return arrAllBids;
+  },
+  removeSingleBidderMultipleBids(seatbid) {
+    var ret = [];
+    for (let i = 0; i < seatbid.length; i++) {
+      let sb = seatbid[i];
+      var retSeatbid = {'seat': sb.seat, 'bid': []};
+      var bidIds = [];
+      for (let j = 0; j < sb.bid.length; j++) {
+        var candidate = sb.bid[j];
+        if (contains(bidIds, candidate.impid)) {
+          continue; // we've already fully assessed this impid, found the highest bid from this seat for it
+        }
+        bidIds.push(candidate.impid);
+        for (let k = j + 1; k < sb.bid.length; k++) {
+          if (sb.bid[k].impid === candidate.impid && sb.bid[k].price > candidate.price) {
+            candidate = sb.bid[k];
+          }
+        }
+        retSeatbid.bid.push(candidate);
+      }
+      ret.push(retSeatbid);
+    }
+    return ret;
+  },
+  getUserSyncs(optionsType, serverResponse, gdprConsent, usPrivacy) {
+    logInfo('getUserSyncs optionsType', optionsType, 'serverResponse', serverResponse, 'usPrivacy', usPrivacy, 'cookieSyncBag', this.cookieSyncBag);
+    if (!serverResponse || serverResponse.length === 0) {
+      return [];
+    }
+    if (optionsType.iframeEnabled) {
+      var arrQueryString = [];
+      if (config.getConfig('debug')) {
+        arrQueryString.push('pbjs_debug=true');
+      }
+      arrQueryString.push('usp_consent=' + (usPrivacy || ''));
+      for (let keyname in this.cookieSyncBag.userIdObject) {
+        arrQueryString.push(keyname + '=' + this.cookieSyncBag.userIdObject[keyname]);
+      }
+      arrQueryString.push('publisherId=' + this.cookieSyncBag.publisherId);
+      arrQueryString.push('siteId=' + this.cookieSyncBag.siteId);
+      arrQueryString.push('cb=' + Date.now());
+      arrQueryString.push('bidder=' + this.propertyBag.config.bidder);
+      var strQueryString = arrQueryString.join('&');
+      if (strQueryString.length > 0) {
+        strQueryString = '?' + strQueryString;
+      }
+      logInfo('getUserSyncs going to return cookie sync url : ' + this.getCookieSyncUrl() + strQueryString);
+      return [{
+        type: 'iframe',
+        url: this.getCookieSyncUrl() + strQueryString
+      }];
+    }
+  },
+  getBidRequestForBidId(bidId, arrBids) {
+    for (let i = 0; i < arrBids.length; i++) {
+      if (arrBids[i].bidId === bidId) { // bidId in the request comes back as impid in the seatbid bids
+        return arrBids[i];
+      }
+    }
+    return null;
+  },
+  findAllUserIds(bidRequest) {
+    var ret = {};
+    let searchKeysSingle = ['pubcid', 'tdid', 'idl_env', 'criteoId', 'lotamePanoramaId', 'fabrickId'];
+    if (bidRequest.hasOwnProperty('userId')) {
+      for (let arrayId in searchKeysSingle) {
+        let key = searchKeysSingle[arrayId];
+        if (bidRequest.userId.hasOwnProperty(key)) {
+          if (typeof (bidRequest.userId[key]) == 'string') {
+            ret[key] = bidRequest.userId[key];
+          } else if (typeof (bidRequest.userId[key]) == 'object') {
+            logError(`WARNING: findAllUserIds had to use first key in user object to get value for bid.userId key: ${key}. Prebid adapter should be updated.`);
+            ret[key] = bidRequest.userId[key][Object.keys(bidRequest.userId[key])[0]]; // cannot use Object.values
+          } else {
+            logError(`failed to get string key value for userId : ${key}`);
+          }
+        }
+      }
+      let lipbid = deepAccess(bidRequest.userId, 'lipb.lipbid');
+      if (lipbid) {
+        ret['lipb'] = {'lipbid': lipbid};
+      }
+      let id5id = deepAccess(bidRequest.userId, 'id5id.uid');
+      if (id5id) {
+        ret['id5id'] = id5id;
+      }
+      let parrableId = deepAccess(bidRequest.userId, 'parrableId.eid');
+      if (parrableId) {
+        ret['parrableId'] = parrableId;
+      }
+      let sharedid = deepAccess(bidRequest.userId, 'sharedid.id');
+      if (sharedid) {
+        ret['sharedid'] = sharedid;
+      }
+    }
+    if (!ret.hasOwnProperty('pubcid')) {
+      let pubcid = deepAccess(bidRequest, 'crumbs.pubcid');
+      if (pubcid) {
+        ret['pubcid'] = pubcid; // if built with old pubCommonId module
+      }
+    }
+    return ret;
+  },
+  getPlacementId(bidRequest) {
+    return (bidRequest.params.placementId).toString();
+  },
+  getPlacementIdOverrideFromGetParam() {
+    let arr = this.getGetParametersAsObject();
+    if (arr.hasOwnProperty('npstoredrequest')) {
+      if (this.isValidPlacementId(arr['npstoredrequest'])) {
+        logInfo(`using GET npstoredrequest ` + arr['npstoredrequest'] + ' to replace placementId');
+        return arr['npstoredrequest'];
+      } else {
+        logError(`GET npstoredrequest FAILED VALIDATION - will not use it`);
+      }
+    }
+    return null;
+  },
+  getGetParametersAsObject() {
+    let parsed = parseUrl(getRefererInfo().page);
+    logInfo('getGetParametersAsObject found:', parsed.search);
+    return parsed.search;
+  },
+  blockTheRequest() {
+    let npRequest = config.getConfig('newspassid.np_request');
+    if (typeof npRequest == 'boolean' && !npRequest) {
+      logWarn(`Will not allow auction : np_request is set to false`);
+      return true;
+    }
+    return false;
+  },
+  getPageId: function() {
+    if (this.propertyBag.pageId == null) {
+      let randPart = '';
+      let allowable = '0123456789abcdefghijklmnopqrstuvwxyz';
+      for (let i = 20; i > 0; i--) {
+        randPart += allowable[Math.floor(Math.random() * 36)];
+      }
+      this.propertyBag.pageId = new Date().getTime() + '_' + randPart;
+    }
+    return this.propertyBag.pageId;
+  },
+  addStandardProperties(seatBid, defaultWidth, defaultHeight) {
+    seatBid.cpm = seatBid.price;
+    seatBid.bidId = seatBid.impid;
+    seatBid.requestId = seatBid.impid;
+    seatBid.width = seatBid.w || defaultWidth;
+    seatBid.height = seatBid.h || defaultHeight;
+    seatBid.ad = seatBid.adm;
+    seatBid.netRevenue = true;
+    seatBid.creativeId = seatBid.crid;
+    seatBid.currency = 'USD';
+    seatBid.ttl = 300;
+    return seatBid;
+  },
+  getWinnerForRequestBid(requestBidId, serverResponseSeatBid) {
+    let thisBidWinner = null;
+    let winningSeat = null;
+    for (let j = 0; j < serverResponseSeatBid.length; j++) {
+      let theseBids = serverResponseSeatBid[j].bid;
+      let thisSeat = serverResponseSeatBid[j].seat;
+      for (let k = 0; k < theseBids.length; k++) {
+        if (theseBids[k].impid === requestBidId) {
+          if ((thisBidWinner == null) || (thisBidWinner.price < theseBids[k].price)) {
+            thisBidWinner = theseBids[k];
+            winningSeat = thisSeat;
+            break;
+          }
+        }
+      }
+    }
+    return {'seat': winningSeat, 'bid': thisBidWinner};
+  },
+  getAllBidsForBidId(matchBidId, serverResponseSeatBid) {
+    let objBids = {};
+    for (let j = 0; j < serverResponseSeatBid.length; j++) {
+      let theseBids = serverResponseSeatBid[j].bid;
+      let thisSeat = serverResponseSeatBid[j].seat;
+      for (let k = 0; k < theseBids.length; k++) {
+        if (theseBids[k].impid === matchBidId) {
+          if (objBids.hasOwnProperty(thisSeat)) { // > 1 bid for an adunit from a bidder - only use the one with the highest bid
+            if (objBids[thisSeat]['price'] < theseBids[k].price) {
+              objBids[thisSeat] = theseBids[k];
+            }
+          } else {
+            objBids[thisSeat] = theseBids[k];
+          }
+        }
+      }
+    }
+    return objBids;
+  }
+};
+export function injectAdIdsIntoAllBidResponses(seatbid) {
+  logInfo('injectAdIdsIntoAllBidResponses', seatbid);
+  for (let i = 0; i < seatbid.length; i++) {
+    let sb = seatbid[i];
+    for (let j = 0; j < sb.bid.length; j++) {
+      sb.bid[j]['adId'] = `${sb.bid[j]['impid']}-${i}-np-${j}`;
+    }
+  }
+  return seatbid;
+}
+export function checkDeepArray(Arr) {
+  if (Array.isArray(Arr)) {
+    if (Array.isArray(Arr[0])) {
+      return Arr[0];
+    } else {
+      return Arr;
+    }
+  } else {
+    return Arr;
+  }
+}
+export function defaultSize(thebidObj) {
+  if (!thebidObj) {
+    logInfo('defaultSize received empty bid obj! going to return fixed default size');
+    return {
+      'defaultHeight': 250,
+      'defaultWidth': 300
+    };
+  }
+  const {sizes} = thebidObj;
+  const returnObject = {};
+  returnObject.defaultWidth = checkDeepArray(sizes)[0];
+  returnObject.defaultHeight = checkDeepArray(sizes)[1];
+  return returnObject;
+}
+export function getRoundedBid(price, mediaType) {
+  const mediaTypeGranularity = config.getConfig(`mediaTypePriceGranularity.${mediaType}`); // might be string or object or nothing; if set then this takes precedence over 'priceGranularity'
+  let objBuckets = config.getConfig('customPriceBucket'); // this is always an object - {} if strBuckets is not 'custom'
+  let strBuckets = config.getConfig('priceGranularity'); // priceGranularity value, always a string ** if priceGranularity is set to an object then it's always 'custom' **
+  let theConfigObject = getGranularityObject(mediaType, mediaTypeGranularity, strBuckets, objBuckets);
+  let theConfigKey = getGranularityKeyName(mediaType, mediaTypeGranularity, strBuckets);
+  logInfo('getRoundedBid. price:', price, 'mediaType:', mediaType, 'configkey:', theConfigKey, 'configObject:', theConfigObject, 'mediaTypeGranularity:', mediaTypeGranularity, 'strBuckets:', strBuckets);
+  let priceStringsObj = getPriceBucketString(
+    price,
+    theConfigObject,
+    config.getConfig('currency.granularityMultiplier')
+  );
+  logInfo('priceStringsObj', priceStringsObj);
+  let granularityNamePriceStringsKeyMapping = {
+    'medium': 'med',
+    'custom': 'custom',
+    'high': 'high',
+    'low': 'low',
+    'dense': 'dense'
+  };
+  if (granularityNamePriceStringsKeyMapping.hasOwnProperty(theConfigKey)) {
+    let priceStringsKey = granularityNamePriceStringsKeyMapping[theConfigKey];
+    logInfo('getRoundedBid: looking for priceStringsKey:', priceStringsKey);
+    return priceStringsObj[priceStringsKey];
+  }
+  return priceStringsObj['auto'];
+}
+export function getGranularityKeyName(mediaType, mediaTypeGranularity, strBuckets) {
+  if (typeof mediaTypeGranularity === 'string') {
+    return mediaTypeGranularity;
+  }
+  if (typeof mediaTypeGranularity === 'object') {
+    return 'custom';
+  }
+  if (typeof strBuckets === 'string') {
+    return strBuckets;
+  }
+  return 'auto'; // fall back to a default key - should literally never be needed.
+}
+export function getGranularityObject(mediaType, mediaTypeGranularity, strBuckets, objBuckets) {
+  if (typeof mediaTypeGranularity === 'object') {
+    return mediaTypeGranularity;
+  }
+  if (strBuckets === 'custom') {
+    return objBuckets;
+  }
+  return '';
+}
+registerBidder(spec);
+logInfo(`*BidAdapter ${NEWSPASSVERSION} was loaded`);
diff --git a/test/spec/modules/newspassidBidAdapter_spec.js b/test/spec/modules/newspassidBidAdapter_spec.js
new file mode 100644
index 00000000000..bec6eea7bf2
--- /dev/null
+++ b/test/spec/modules/newspassidBidAdapter_spec.js
@@ -0,0 +1,1793 @@
+import { expect } from 'chai';
+import { spec, defaultSize } from 'modules/newspassidBidAdapter.js';
+import { config } from 'src/config.js';
+import {getGranularityKeyName, getGranularityObject} from '../../../modules/newspassidBidAdapter.js';
+import * as utils from '../../../src/utils.js';
+const NEWSPASSURI = 'https://bidder.newspassid.com/openrtb2/auction';
+const BIDDER_CODE = 'newspassid';
+var validBidRequests = [
+  {
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsNoCustomData = [
+  {
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsMulti = [
+  {
+    testId: 1,
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  },
+  {
+    testId: 2,
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff0',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c0',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsWithUserIdData = [
+  {
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87',
+    userId: {
+      'pubcid': '12345678',
+      'tdid': '1111tdid',
+      'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
+      'criteoId': '1111criteoId',
+      'idl_env': 'liverampId',
+      'lipb': {'lipbid': 'lipbidId123'},
+      'parrableId': {'eid': '01.5678.parrableid'},
+      'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
+    },
+    userIdAsEids: [
+      {
+        'source': 'pubcid.org',
+        'uids': [
+          {
+            'id': '12345678',
+            'atype': 1
+          }
+        ]
+      },
+      {
+        'source': 'adserver.org',
+        'uids': [{
+          'id': '1111tdid',
+          'atype': 1,
+          'ext': {
+            'rtiPartner': 'TDID'
+          }
+        }]
+      },
+      {
+        'source': 'id5-sync.com',
+        'uids': [{
+          'id': 'ID5-someId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'criteoId',
+        'uids': [{
+          'id': '1111criteoId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'idl_env',
+        'uids': [{
+          'id': 'liverampId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'lipb',
+        'uids': [{
+          'id': {'lipbid': 'lipbidId123'},
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'parrableId',
+        'uids': [{
+          'id': {'eid': '01.5678.parrableid'},
+          'atype': 1,
+        }]
+      }
+    ]
+  }
+];
+var validBidRequestsMinimal = [
+  {
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    params: { publisherId: '9876abcd12-3', placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsNoSizes = [
+  {
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsWithBannerMediaType = [
+  {
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    mediaTypes: {banner: {sizes: [[300, 250], [300, 600]]}},
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsIsThisCamelCaseEnough = [
+  {
+    'bidder': 'newspassid',
+    'testname': 'validBidRequestsIsThisCamelCaseEnough',
+    'params': {
+      'publisherId': 'newspassRUP0001',
+      'placementId': '8000000009',
+      'siteId': '4204204201',
+      'customData': [
+        {
+          'settings': {},
+          'targeting': {
+            'sens': 'f',
+            'pt1': '/uk',
+            'pt2': 'uk',
+            'pt3': 'network-front',
+            'pt4': 'ng',
+            'pt5': [
+              'uk'
+            ],
+            'pt7': 'desktop',
+            'pt8': [
+              'tfmqxwj7q',
+              'penl4dfdk',
+              'sek9ghqwi'
+            ],
+            'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+          }
+        }
+      ],
+      'userId': {
+        'pubcid': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56'
+      },
+      'userIdAsEids': [
+        {
+          'source': 'pubcid.org',
+          'uids': [
+            {
+              'id': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56',
+              'atype': 1
+            }
+          ]
+        }
+      ]
+    },
+    mediaTypes: {banner: {sizes: [[300, 250], [300, 600]]}},
+    'adUnitCode': 'some-ad',
+    'transactionId': '02c1ea7d-0bf2-451b-a122-1420040d1cf8',
+    'bidId': '2899ec066a91ff8',
+    'bidderRequestId': '1c1586b27a1b5c8',
+    'auctionId': '0456c9b7-5ab2-4fec-9e10-f418d3d1f04c',
+    'src': 'client',
+    'bidRequestsCount': 1,
+    'bidderRequestsCount': 1,
+    'bidderWinsCount': 0
+  }
+];
+var validBidderRequest = {
+  auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+  auctionStart: 1536838908986,
+  bidderCode: 'newspassid',
+  bidderRequestId: '1c1586b27a1b5c8',
+  bids: [{
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
+    auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'newspassid',
+    bidderRequestId: '1c1586b27a1b5c8',
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }],
+  doneCbCallCount: 1,
+  start: 1536838908987,
+  timeout: 3000
+};
+var emptyObject = {};
+var validResponse = {
+  'body': {
+    'id': 'd6198807-7a53-4141-b2db-d2cb754d68ba',
+    'seatbid': [
+      {
+        'bid': [
+          {
+            'id': '677903815252395017',
+            'impid': '2899ec066a91ff8',
+            'price': 0.5,
+            'adm': '<script src="https://fra1-ib.adnxs.com/ab?e=wqT_3QLXB6DXAwAAAwDWAAUBCNDh6dwFENjt4vTs9Y6bWhjxtI3siuOTmREqNgkAAAECCOA_EQEHNAAA4D8ZAAAAgOtR4D8hERIAKREJADERG6gwsqKiBjjtSEDtSEgCUI3J-y5YnPFbYABotc95eMuOBYABAYoBA1VTRJIBAQbwUpgBrAKgAdgEqAEBsAEAuAECwAEDyAEC0AEA2AEA4AEA8AEAigI7dWYoJ2EnLCAyNTI5ODg1LCAxNTM2ODQ4MDgwKTt1ZigncicsIDk4NDkzNTgxNh4A8JySAv0BIWJ6YWpPQWl1c0s0S0VJM0oteTRZQUNDYzhWc3dBRGdBUUFSSTdVaFFzcUtpQmxnQVlQX19fXzhQYUFCd0FYZ0JnQUVCaUFFQmtBRUJtQUVCb0FFQnFBRURzQUVBdVFFcGk0aURBQURnUDhFQktZdUlnd0FBNERfSkFUMDR0TTFxYXZFXzJRRUFBQUFBQUFEd1AtQUJBUFVCBQ8oSmdDQUtBQ0FMVUMFEARMMAkI8FBNQUNBY2dDQWRBQ0FkZ0NBZUFDQU9nQ0FQZ0NBSUFEQVpBREFKZ0RBYWdEcnJDdUNyb0RDVVpTUVRFNk16WTROT0FER2cuLpoCPSFLQXVvRkE2AAFwblBGYklBUW9BRG9KUmxKQk1Ub3pOamcwUUJwSkENAfBAOEQ4LsICL2h0dHA6Ly9wcmViaWQub3JnL2Rldi1kb2NzL2dldHRpbmctc3RhcnRlZC5odG1s2AIA4AKtmEjqAiINOthkZW1vLnRnpS1vem9uZS1wcm9qZWN0LmNvbS_yAhMKD0NVU1RPTV9NT0RFTF9JRBIA8gIaChZDLhYAIExFQUZfTkFNRQEdCB4KGjIzAPCHTEFTVF9NT0RJRklFRBIAgAMAiAMBkAMAmAMUoAMBqgMAwAOsAsgDANgDAOADAOgDAPgDA4AEAJIECS9vcGVucnRiMpgEAKIECTEyNy4wLjAuMagEALIEDAgAEAAYACAAMAA4ALgEAMAEAMgEANIEDjkzMjUjRlJBMTnpNjg02gQCCAHgBADwBEHvIIgFAZgFAKAF_xEBsAGqBSRkNjE5ODgwNy03YTUzLTQxNDEtYjJkYi1kMmNiNzU0ZDY4YmHABQDJBWlQFPA_0gUJCQkMpAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYAmAYAuAYAwQYAAAAAAAAAAMgGAA..&s=ab84b182eef7d9b4e58c74fe8987705c25ed803c&referrer=http%3A%2F%2Fdemo.the-some-project.com%2F&pp=${AUCTION_PRICE}"></script>',
+            'adid': '98493581',
+            'adomain': [
+              'http://prebid.org'
+            ],
+            'iurl': 'https://fra1-ib.adnxs.com/cr?id=98493581',
+            'cid': '9325',
+            'crid': '98493581',
+            'cat': [
+              'IAB3-1'
+            ],
+            'w': 300,
+            'h': 600,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'appnexus': {
+                  'brand_id': 555545,
+                  'auction_id': 6500448734132353000,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            }
+          }
+        ],
+        'seat': 'appnexus'
+      }
+    ],
+    'cur': 'GBP', /* NOTE - this is where cur is, not in the seatbids. */
+    'ext': {
+      'responsetimemillis': {
+        'appnexus': 47,
+        'openx': 30
+      }
+    },
+    'timing': {
+      'start': 1536848078.089177,
+      'end': 1536848078.142203,
+      'TimeTaken': 0.05302619934082031
+    }
+  },
+  'headers': {}
+};
+var validResponse2BidsSameAdunit = {
+  'body': {
+    'id': 'd6198807-7a53-4141-b2db-d2cb754d68ba',
+    'seatbid': [
+      {
+        'bid': [
+          {
+            'id': '677903815252395017',
+            'impid': '2899ec066a91ff8',
+            'price': 0.5,
+            'adm': '<script src="src-1"></script>',
+            'adid': '98493581',
+            'adomain': [
+              'http://prebid.org'
+            ],
+            'iurl': 'https://fra1-ib.adnxs.com/cr?id=98493581',
+            'cid': '9325',
+            'crid': '98493581',
+            'cat': [
+              'IAB3-1'
+            ],
+            'w': 300,
+            'h': 600,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'appnexus': {
+                  'brand_id': 555545,
+                  'auction_id': 6500448734132353000,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            }
+          },
+          {
+            'id': '677903815252395010',
+            'impid': '2899ec066a91ff8',
+            'price': 0.9,
+            'adm': '<script src="src-2"></script>',
+            'adid': '98493580',
+            'adomain': [
+              'http://prebid.org'
+            ],
+            'iurl': 'https://fra1-ib.adnxs.com/cr?id=98493581',
+            'cid': '9320',
+            'crid': '98493580',
+            'cat': [
+              'IAB3-1'
+            ],
+            'w': 300,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'appnexus': {
+                  'brand_id': 555540,
+                  'auction_id': 6500448734132353000,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            }
+          } ],
+        'seat': 'npappnexus'
+      }
+    ],
+    'cur': 'GBP', /* NOTE - this is where cur is, not in the seatbids. */
+    'ext': {
+      'responsetimemillis': {
+        'appnexus': 47,
+        'openx': 30
+      }
+    },
+    'timing': {
+      'start': 1536848078.089177,
+      'end': 1536848078.142203,
+      'TimeTaken': 0.05302619934082031
+    }
+  },
+  'headers': {}
+};
+var validBidResponse1adWith2Bidders = {
+  'body': {
+    'id': '91221f96-b931-4acc-8f05-c2a1186fa5ac',
+    'seatbid': [
+      {
+        'bid': [
+          {
+            'id': 'd6198807-7a53-4141-b2db-d2cb754d68ba',
+            'impid': '2899ec066a91ff8',
+            'price': 0.36754,
+            'adm': '<script>removed</script>',
+            'adid': '134928661',
+            'adomain': [
+              'somecompany.com'
+            ],
+            'iurl': 'https:\/\/ams1-ib.adnxs.com\/cr?id=134928661',
+            'cid': '8825',
+            'crid': '134928661',
+            'cat': [
+              'IAB8-15',
+              'IAB8-16',
+              'IAB8-4',
+              'IAB8-1',
+              'IAB8-14',
+              'IAB8-6',
+              'IAB8-13',
+              'IAB8-3',
+              'IAB8-17',
+              'IAB8-12',
+              'IAB8-8',
+              'IAB8-7',
+              'IAB8-2',
+              'IAB8-9',
+              'IAB8',
+              'IAB8-11'
+            ],
+            'w': 300,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'appnexus': {
+                  'brand_id': 14640,
+                  'auction_id': 1.8369641905139e+18,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            }
+          }
+        ],
+        'seat': 'appnexus'
+      },
+      {
+        'bid': [
+          {
+            'id': '75665207-a1ca-49db-ba0e-a5e9c7d26f32',
+            'impid': '37fff511779365a',
+            'price': 1.046,
+            'adm': '<div>removed</div>',
+            'adomain': [
+              'kx.com'
+            ],
+            'crid': '13005',
+            'w': 300,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              }
+            }
+          }
+        ],
+        'seat': 'openx'
+      }
+    ],
+    'ext': {
+      'responsetimemillis': {
+        'appnexus': 91,
+        'openx': 109,
+        'npappnexus': 46,
+        'npbeeswax': 2,
+        'pangaea': 91
+      }
+    }
+  },
+  'headers': {}
+};
+var multiRequest1 = [
+  {
+    'bidder': 'newspassid',
+    'params': {
+      'publisherId': 'newspassRUP0001',
+      'siteId': '4204204201',
+      'placementId': '0420420421',
+      'customData': [
+        {
+          'settings': {},
+          'targeting': {
+            'sens': 'f',
+            'pt1': '/uk',
+            'pt2': 'uk',
+            'pt3': 'network-front',
+            'pt4': 'ng',
+            'pt5': [
+              'uk'
+            ],
+            'pt7': 'desktop',
+            'pt8': [
+              'tfmqxwj7q',
+              'penl4dfdk',
+              'uayf5jmv3',
+              't8nyiude5',
+              'sek9ghqwi'
+            ],
+            'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+          }
+        }
+      ]
+    },
+    'mediaTypes': {
+      'banner': {
+        'sizes': [
+          [
+            300,
+            250
+          ],
+          [
+            300,
+            600
+          ]
+        ]
+      }
+    },
+    'adUnitCode': 'mpu',
+    'transactionId': '6480bac7-31b5-4723-9145-ad8966660651',
+    'sizes': [
+      [
+        300,
+        250
+      ],
+      [
+        300,
+        600
+      ]
+    ],
+    'bidId': '2d30e86db743a8',
+    'bidderRequestId': '1d03a1dfc563fc',
+    'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+    'src': 'client',
+    'bidRequestsCount': 1,
+    'bidderRequestsCount': 1,
+    'bidderWinsCount': 0
+  },
+  {
+    'bidder': 'newspassid',
+    'params': {
+      'publisherId': 'newspassRUP0001',
+      'siteId': '4204204201',
+      'placementId': '0420420421',
+      'customData': [
+        {
+          'settings': {},
+          'targeting': {
+            'sens': 'f',
+            'pt1': '/uk',
+            'pt2': 'uk',
+            'pt3': 'network-front',
+            'pt4': 'ng',
+            'pt5': [
+              'uk'
+            ],
+            'pt7': 'desktop',
+            'pt8': [
+              'tfmqxwj7q',
+              'penl4dfdk',
+              't8nxz6qzd',
+              't8nyiude5',
+              'sek9ghqwi'
+            ],
+            'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+          }
+        }
+      ]
+    },
+    'mediaTypes': {
+      'banner': {
+        'sizes': [
+          [
+            728,
+            90
+          ],
+          [
+            970,
+            250
+          ]
+        ]
+      }
+    },
+    'adUnitCode': 'leaderboard',
+    'transactionId': 'a49988e6-ae7c-46c4-9598-f18db49892a0',
+    'sizes': [
+      [
+        728,
+        90
+      ],
+      [
+        970,
+        250
+      ]
+    ],
+    'bidId': '3025f169863b7f8',
+    'bidderRequestId': '1d03a1dfc563fc',
+    'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+    'src': 'client',
+    'bidRequestsCount': 1,
+    'bidderRequestsCount': 1,
+    'bidderWinsCount': 0
+  }
+];
+var multiBidderRequest1 = {
+  bidderRequest: {
+    'bidderCode': 'newspassid',
+    'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+    'bidderRequestId': '1d03a1dfc563fc',
+    'bids': [
+      {
+        'bidder': 'newspassid',
+        'params': {
+          'publisherId': 'newspassRUP0001',
+          'siteId': '4204204201',
+          'placementId': '0420420421',
+          'customData': [
+            {
+              'settings': {},
+              'targeting': {
+                'sens': 'f',
+                'pt1': '/uk',
+                'pt2': 'uk',
+                'pt3': 'network-front',
+                'pt4': 'ng',
+                'pt5': [
+                  'uk'
+                ],
+                'pt7': 'desktop',
+                'pt8': [
+                  'tfmqxwj7q',
+                  'txeh7uyo0',
+                  't8nxz6qzd',
+                  't8nyiude5',
+                  'sek9ghqwi'
+                ],
+                'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+              }
+            }
+          ]
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                250
+              ],
+              [
+                300,
+                600
+              ]
+            ]
+          }
+        },
+        'adUnitCode': 'mpu',
+        'transactionId': '6480bac7-31b5-4723-9145-ad8966660651',
+        'sizes': [
+          [
+            300,
+            250
+          ],
+          [
+            300,
+            600
+          ]
+        ],
+        'bidId': '2d30e86db743a8',
+        'bidderRequestId': '1d03a1dfc563fc',
+        'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+        'src': 'client',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 1,
+        'bidderWinsCount': 0
+      },
+      {
+        'bidder': 'newspassid',
+        'params': {
+          'publisherId': 'newspassRUP0001',
+          'siteId': '4204204201',
+          'placementId': '0420420421',
+          'customData': [
+            {
+              'settings': {},
+              'targeting': {
+                'sens': 'f',
+                'pt1': '/uk',
+                'pt2': 'uk',
+                'pt3': 'network-front',
+                'pt4': 'ng',
+                'pt5': [
+                  'uk'
+                ],
+                'pt7': 'desktop',
+                'pt8': [
+                  'tfmqxwj7q',
+                  'penl4dfdk',
+                  't8nxz6qzd',
+                  't8nyiude5',
+                  'sek9ghqwi'
+                ],
+                'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+              }
+            }
+          ]
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                728,
+                90
+              ],
+              [
+                970,
+                250
+              ]
+            ]
+          }
+        },
+        'adUnitCode': 'leaderboard',
+        'transactionId': 'a49988e6-ae7c-46c4-9598-f18db49892a0',
+        'sizes': [
+          [
+            728,
+            90
+          ],
+          [
+            970,
+            250
+          ]
+        ],
+        'bidId': '3025f169863b7f8',
+        'bidderRequestId': '1d03a1dfc563fc',
+        'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+        'src': 'client',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 1,
+        'bidderWinsCount': 0
+      }
+    ],
+    'auctionStart': 1592918645574,
+    'timeout': 3000,
+    'refererInfo': {
+      'referer': 'http://some.referrer.com',
+      'reachedTop': true,
+      'numIframes': 0,
+      'stack': [
+        'http://some.referrer.com'
+      ]
+    },
+    'start': 1592918645578
+  }
+};
+var multiResponse1 = {
+  'body': {
+    'id': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+    'seatbid': [
+      {
+        'bid': [
+          {
+            'id': '4419718600113204943',
+            'impid': '2d30e86db743a8',
+            'price': 0.2484,
+            'adm': '<scr .. .iv>',
+            'adid': '119683582',
+            'adomain': [
+              'https://someurl.com'
+            ],
+            'iurl': 'https://ams1-ib.adnxs.com/cr?id=119683582',
+            'cid': '9979',
+            'crid': '119683582',
+            'cat': [
+              'IAB3'
+            ],
+            'w': 300,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'newspassid': {},
+                'appnexus': {
+                  'brand_id': 734921,
+                  'auction_id': 2995348111857539600,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            },
+            'cpm': 0.2484,
+            'bidId': '2d30e86db743a8',
+            'requestId': '2d30e86db743a8',
+            'width': 300,
+            'height': 250,
+            'ad': '<scr...iv>',
+            'netRevenue': true,
+            'creativeId': '119683582',
+            'currency': 'USD',
+            'ttl': 300,
+            'originalCpm': 0.2484,
+            'originalCurrency': 'USD'
+          },
+          {
+            'id': '18552976939844681',
+            'impid': '3025f169863b7f8',
+            'price': 0.0621,
+            'adm': '<sc..this ad will lose to the next one.div>',
+            'adid': '120179216',
+            'adomain': [
+              'appnexus.com'
+            ],
+            'iurl': 'https://ams1-ib.adnxs.com/cr?id=120179216',
+            'cid': '9979',
+            'crid': '120179216',
+            'w': 970,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'newspassid': {},
+                'appnexus': {
+                  'brand_id': 1,
+                  'auction_id': 3449036134472542700,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            },
+            'cpm': 0.0621,
+            'bidId': '3025f169863b7f8',
+            'requestId': '3025f169863b7f8',
+            'width': 970,
+            'height': 250,
+            'ad': '<scr...iv>',
+            'netRevenue': true,
+            'creativeId': '120179216',
+            'currency': 'USD',
+            'ttl': 300,
+            'originalCpm': 0.0621,
+            'originalCurrency': 'USD'
+          },
+          {
+            'id': '18552976939844999',
+            'impid': '3025f169863b7f8',
+            'price': 0.521,
+            'adm': '<sc. second bid for bidId 3025f169863b7f8 ..div>',
+            'adid': '120179216',
+            'adomain': [
+              'appnexus.com'
+            ],
+            'iurl': 'https://ams1-ib.adnxs.com/cr?id=120179216',
+            'cid': '9999',
+            'crid': '120179299',
+            'w': 728,
+            'h': 90,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'newspassid': {},
+                'appnexus': {
+                  'brand_id': 1,
+                  'auction_id': 3449036134472542700,
+                  'bidder_id': 2,
+                  'bid_ad_type': 0
+                }
+              }
+            },
+            'cpm': 0.521,
+            'bidId': '3025f169863b7f8',
+            'requestId': '3025f169863b7f8',
+            'width': 728,
+            'height': 90,
+            'ad': '<scr...iv>',
+            'netRevenue': true,
+            'creativeId': '120179299',
+            'currency': 'USD',
+            'ttl': 300,
+            'originalCpm': 0.0621,
+            'originalCurrency': 'USD'
+          }
+        ],
+        'seat': 'npappnexus'
+      },
+      {
+        'bid': [
+          {
+            'id': '1c605e8a-4992-4ec6-8a5c-f82e2938c2db',
+            'impid': '2d30e86db743a8',
+            'price': 0.01,
+            'adm': '<div  ... div>',
+            'crid': '540463358',
+            'w': 300,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'newspassid': {}
+              }
+            },
+            'cpm': 0.01,
+            'bidId': '2d30e86db743a8',
+            'requestId': '2d30e86db743a8',
+            'width': 300,
+            'height': 250,
+            'ad': '<div ...div>',
+            'netRevenue': true,
+            'creativeId': '540463358',
+            'currency': 'USD',
+            'ttl': 300,
+            'originalCpm': 0.01,
+            'originalCurrency': 'USD'
+          },
+          {
+            'id': '3edeb4f7-d91d-44e2-8aeb-4a2f6d295ce5',
+            'impid': '3025f169863b7f8',
+            'price': 0.01,
+            'adm': '<div ... div>',
+            'crid': '540221061',
+            'w': 970,
+            'h': 250,
+            'ext': {
+              'prebid': {
+                'type': 'banner'
+              },
+              'bidder': {
+                'newspassid': {}
+              }
+            },
+            'cpm': 0.01,
+            'bidId': '3025f169863b7f8',
+            'requestId': '3025f169863b7f8',
+            'width': 970,
+            'height': 250,
+            'ad': '<div ... div>',
+            'netRevenue': true,
+            'creativeId': '540221061',
+            'currency': 'USD',
+            'ttl': 300,
+            'originalCpm': 0.01,
+            'originalCurrency': 'USD'
+          }
+        ],
+        'seat': 'openx'
+      }
+    ],
+    'ext': {
+      'debug': {},
+      'responsetimemillis': {
+        'beeswax': 6,
+        'openx': 91,
+        'npappnexus': 40,
+        'npbeeswax': 6
+      }
+    }
+  },
+  'headers': {}
+};
+describe('newspassid Adapter', function () {
+  describe('isBidRequestValid', function () {
+    let validBidReq = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1310000099',
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890'
+      }
+    };
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(validBidReq)).to.equal(true);
+    });
+    var validBidReq2 = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1310000099',
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890',
+        customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}]
+      },
+      siteId: 1234567890
+    }
+    it('should return true when required params found and all optional params are valid', function () {
+      expect(spec.isBidRequestValid(validBidReq2)).to.equal(true);
+    });
+    var xEmptyPlacement = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '',
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate empty placementId', function () {
+      expect(spec.isBidRequestValid(xEmptyPlacement)).to.equal(false);
+    });
+    var xMissingPlacement = {
+      bidder: BIDDER_CODE,
+      params: {
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate missing placementId', function () {
+      expect(spec.isBidRequestValid(xMissingPlacement)).to.equal(false);
+    });
+    var xBadPlacement = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '123X45',
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate placementId with a non-numeric value', function () {
+      expect(spec.isBidRequestValid(xBadPlacement)).to.equal(false);
+    });
+    var xBadPlacementTooShort = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: 123456789, /* should be exactly 10 chars */
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate placementId with a numeric value of wrong length', function () {
+      expect(spec.isBidRequestValid(xBadPlacementTooShort)).to.equal(false);
+    });
+    var xBadPlacementTooLong = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: 12345678901, /* should be exactly 10 chars */
+        publisherId: '9876abcd12-3',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate placementId with a numeric value of wrong length', function () {
+      expect(spec.isBidRequestValid(xBadPlacementTooLong)).to.equal(false);
+    });
+    var xMissingPublisher = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1234567890',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate missing publisherId', function () {
+      expect(spec.isBidRequestValid(xMissingPublisher)).to.equal(false);
+    });
+    var xMissingSiteId = {
+      bidder: BIDDER_CODE,
+      params: {
+        publisherId: '9876abcd12-3',
+        placementId: '1234567890',
+      }
+    };
+    it('should not validate missing sitetId', function () {
+      expect(spec.isBidRequestValid(xMissingSiteId)).to.equal(false);
+    });
+    var xBadPublisherTooShort = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1234567890',
+        publisherId: '9876abcd12a',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate publisherId being too short', function () {
+      expect(spec.isBidRequestValid(xBadPublisherTooShort)).to.equal(false);
+    });
+    var xBadPublisherTooLong = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1234567890',
+        publisherId: '9876abcd12abc',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate publisherId being too long', function () {
+      expect(spec.isBidRequestValid(xBadPublisherTooLong)).to.equal(false);
+    });
+    var publisherNumericOk = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1234567890',
+        publisherId: 123456789012,
+        siteId: '1234567890'
+      }
+    };
+    it('should validate publisherId being 12 digits', function () {
+      expect(spec.isBidRequestValid(publisherNumericOk)).to.equal(true);
+    });
+    var xEmptyPublisher = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1234567890',
+        publisherId: '',
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate empty publisherId', function () {
+      expect(spec.isBidRequestValid(xEmptyPublisher)).to.equal(false);
+    });
+    var xBadSite = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: '1234567890',
+        publisherId: '9876abcd12-3',
+        siteId: '12345Z'
+      }
+    };
+    it('should not validate bad siteId', function () {
+      expect(spec.isBidRequestValid(xBadSite)).to.equal(false);
+    });
+    it('should not validate siteId too long', function () {
+      expect(spec.isBidRequestValid(xBadSite)).to.equal(false);
+    });
+    it('should not validate siteId too short', function () {
+      expect(spec.isBidRequestValid(xBadSite)).to.equal(false);
+    });
+    var allNonStrings = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: 1234567890,
+        publisherId: '9876abcd12-3',
+        siteId: 1234567890
+      }
+    };
+    it('should validate all numeric values being sent as non-string numbers', function () {
+      expect(spec.isBidRequestValid(allNonStrings)).to.equal(true);
+    });
+    var emptySiteId = {
+      bidder: BIDDER_CODE,
+      params: {
+        placementId: 1234567890,
+        publisherId: '9876abcd12-3',
+        siteId: ''
+      }
+    };
+    it('should not validate siteId being empty string (it is required now)', function () {
+      expect(spec.isBidRequestValid(emptySiteId)).to.equal(false);
+    });
+    var xBadCustomData = {
+      bidder: BIDDER_CODE,
+      params: {
+        'placementId': '1234567890',
+        'publisherId': '9876abcd12-3',
+        'siteId': '1234567890',
+        'customData': 'this aint gonna work'
+      }
+    };
+    it('should not validate customData not being an array', function () {
+      expect(spec.isBidRequestValid(xBadCustomData)).to.equal(false);
+    });
+    var xBadCustomDataOldCustomdataValue = {
+      bidder: BIDDER_CODE,
+      params: {
+        'placementId': '1234567890',
+        'publisherId': '9876abcd12-3',
+        'siteId': '1234567890',
+        'customData': {'gender': 'bart', 'age': 'low'}
+      }
+    };
+    it('should not validate customData being an object, not an array', function () {
+      expect(spec.isBidRequestValid(xBadCustomDataOldCustomdataValue)).to.equal(false);
+    });
+    var xBadCustomDataZerocd = {
+      bidder: BIDDER_CODE,
+      params: {
+        'placementId': '1111111110',
+        'publisherId': '9876abcd12-3',
+        'siteId': '1234567890',
+        'customData': []
+      }
+    };
+    it('should not validate customData array having no elements', function () {
+      expect(spec.isBidRequestValid(xBadCustomDataZerocd)).to.equal(false);
+    });
+    var xBadCustomDataNotargeting = {
+      bidder: BIDDER_CODE,
+      params: {
+        'placementId': '1234567890',
+        'publisherId': '9876abcd12-3',
+        'customData': [{'settings': {}, 'xx': {'gender': 'bart', 'age': 'low'}}],
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate customData[] having no "targeting"', function () {
+      expect(spec.isBidRequestValid(xBadCustomDataNotargeting)).to.equal(false);
+    });
+    var xBadCustomDataTgtNotObj = {
+      bidder: BIDDER_CODE,
+      params: {
+        'placementId': '1234567890',
+        'publisherId': '9876abcd12-3',
+        'customData': [{'settings': {}, 'targeting': 'this should be an object'}],
+        siteId: '1234567890'
+      }
+    };
+    it('should not validate customData[0].targeting not being an object', function () {
+      expect(spec.isBidRequestValid(xBadCustomDataTgtNotObj)).to.equal(false);
+    });
+    var xBadCustomParams = {
+      bidder: BIDDER_CODE,
+      params: {
+        'placementId': '1234567890',
+        'publisherId': '9876abcd12-3',
+        'siteId': '1234567890',
+        'customParams': 'this key is no longer valid'
+      }
+    };
+    it('should not validate customParams - this is a renamed key', function () {
+      expect(spec.isBidRequestValid(xBadCustomParams)).to.equal(false);
+    });
+  });
+  describe('buildRequests', function () {
+    it('sends bid request to NEWSPASSURI via POST', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.url).to.equal(NEWSPASSURI);
+      expect(request.method).to.equal('POST');
+    });
+    it('sends data as a string', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.data).to.be.a('string');
+    });
+    it('sends all bid parameters', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
+    });
+    it('adds all parameters inside the ext object only', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.data).to.be.a('string');
+      var data = JSON.parse(request.data);
+      expect(data.imp[0].ext.newspassid.customData).to.be.an('array');
+      expect(request).not.to.have.key('lotameData');
+      expect(request).not.to.have.key('customData');
+    });
+    it('adds all parameters inside the ext object only - lightning', function () {
+      let localBidReq = JSON.parse(JSON.stringify(validBidRequests));
+      const request = spec.buildRequests(localBidReq, validBidderRequest);
+      expect(request.data).to.be.a('string');
+      var data = JSON.parse(request.data);
+      expect(data.imp[0].ext.newspassid.customData).to.be.an('array');
+      expect(request).not.to.have.key('lotameData');
+      expect(request).not.to.have.key('customData');
+    });
+    it('has correct bidder', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.bidderRequest.bids[0].bidder).to.equal(BIDDER_CODE);
+    });
+    it('handles mediaTypes element correctly', function () {
+      const request = spec.buildRequests(validBidRequestsWithBannerMediaType, validBidderRequest);
+      expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
+    });
+    it('handles no newspassid or custom data', function () {
+      const request = spec.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
+    });
+    it('should not crash when there is no sizes element at all', function () {
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
+      expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
+    });
+    it('should be able to handle non-single requests', function () {
+      config.setConfig({'newspassid': {'singleRequest': false}});
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
+      expect(request).to.be.a('array');
+      expect(request[0]).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
+      config.setConfig({'newspassid': {'singleRequest': true}});
+    });
+    it('should not have imp[N].ext.newspassid.userId', function () {
+      let bidderRequest = validBidderRequest;
+      let bidRequests = validBidRequests;
+      bidRequests[0]['userId'] = {
+        'digitrustid': {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
+        'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
+        'idl_env': '3333',
+        'parrableid': 'eidVersion.encryptionKeyReference.encryptedValue',
+        'pubcid': '5555',
+        'tdid': '6666',
+        'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
+      };
+      bidRequests[0]['userIdAsEids'] = validBidRequestsWithUserIdData[0]['userIdAsEids'];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      let firstBid = payload.imp[0].ext.newspassid;
+      expect(firstBid).to.not.have.property('userId');
+      delete validBidRequests[0].userId; // tidy up now, else it will screw with other tests
+    });
+    it('should pick up the value of pubcid when built using the pubCommonId module (not userId)', function () {
+      let bidRequests = validBidRequests;
+      bidRequests[0]['userId'] = {
+        'digitrustid': {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
+        'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
+        'idl_env': '3333',
+        'parrableid': 'eidVersion.encryptionKeyReference.encryptedValue',
+        'tdid': '6666',
+        'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
+      };
+      bidRequests[0]['userIdAsEids'] = validBidRequestsWithUserIdData[0]['userIdAsEids'];
+      const request = spec.buildRequests(bidRequests, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.ext.newspassid.pubcid).to.equal(bidRequests[0]['crumbs']['pubcid']);
+      delete validBidRequests[0].userId; // tidy up now, else it will screw with other tests
+    });
+    it('should add a user.ext.eids object to contain user ID data in the new location (Nov 2019) Updated Aug 2020', function() {
+      const request = spec.buildRequests(validBidRequestsWithUserIdData, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.user).to.exist;
+      expect(payload.user.ext).to.exist;
+      expect(payload.user.ext.eids).to.exist;
+      expect(payload.user.ext.eids[0]['source']).to.equal('pubcid.org');
+      expect(payload.user.ext.eids[0]['uids'][0]['id']).to.equal('12345678');
+      expect(payload.user.ext.eids[1]['source']).to.equal('adserver.org');
+      expect(payload.user.ext.eids[1]['uids'][0]['id']).to.equal('1111tdid');
+      expect(payload.user.ext.eids[2]['source']).to.equal('id5-sync.com');
+      expect(payload.user.ext.eids[2]['uids'][0]['id']).to.equal('ID5-someId');
+      expect(payload.user.ext.eids[3]['source']).to.equal('criteoId');
+      expect(payload.user.ext.eids[3]['uids'][0]['id']).to.equal('1111criteoId');
+      expect(payload.user.ext.eids[4]['source']).to.equal('idl_env');
+      expect(payload.user.ext.eids[4]['uids'][0]['id']).to.equal('liverampId');
+      expect(payload.user.ext.eids[5]['source']).to.equal('lipb');
+      expect(payload.user.ext.eids[5]['uids'][0]['id']['lipbid']).to.equal('lipbidId123');
+      expect(payload.user.ext.eids[6]['source']).to.equal('parrableId');
+      expect(payload.user.ext.eids[6]['uids'][0]['id']['eid']).to.equal('01.5678.parrableid');
+    });
+    it('replaces the auction url for a config override', function () {
+      spec.propertyBag.config = null;
+      let fakeOrigin = 'http://sometestendpoint';
+      config.setConfig({'newspassid': {'endpointOverride': {'origin': fakeOrigin}}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.url).to.equal(fakeOrigin + '/openrtb2/auction');
+      expect(request.method).to.equal('POST');
+      const data = JSON.parse(request.data);
+      expect(data.ext.newspassid.origin).to.equal(fakeOrigin);
+      config.setConfig({'newspassid': {'kvpPrefix': null, 'endpointOverride': null}});
+    });
+    it('replaces the FULL auction url for a config override', function () {
+      spec.propertyBag.config = null;
+      let fakeurl = 'http://sometestendpoint/myfullurl';
+      config.setConfig({'newspassid': {'endpointOverride': {'auctionUrl': fakeurl}}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      expect(request.url).to.equal(fakeurl);
+      expect(request.method).to.equal('POST');
+      const data = JSON.parse(request.data);
+      expect(data.ext.newspassid.origin).to.equal(fakeurl);
+      config.setConfig({'newspassid': {'kvpPrefix': null, 'endpointOverride': null}});
+    });
+    it('should ignore kvpPrefix', function () {
+      spec.propertyBag.config = null;
+      config.setConfig({'newspassid': {'kvpPrefix': 'np'}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result[0].adserverTargeting).to.have.own.property('np_appnexus_crid');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_crid')).to.equal('98493581');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_adId')).to.equal('2899ec066a91ff8-0-np-0');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_size')).to.equal('300x600');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_pb_r')).to.equal('0.50');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_bid')).to.equal('true');
+      config.resetConfig();
+    });
+    it('should create a meta object on each bid returned', function () {
+      spec.propertyBag.config = null;
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result[0]).to.have.own.property('meta');
+      expect(result[0].meta.advertiserDomains[0]).to.equal('http://prebid.org');
+      config.resetConfig();
+    });
+    it('should use nptestmode GET value if set', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'nptestmode': 'mytestvalue_123'};
+      };
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.imp[0].ext.newspassid.customData).to.be.an('array');
+      expect(data.imp[0].ext.newspassid.customData[0].targeting.nptestmode).to.equal('mytestvalue_123');
+    });
+    it('should pass through GET params if present: npf, nppf, nprp, npip', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {npf: '1', nppf: '0', nprp: '2', npip: '123'};
+      };
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.newspassid.npf).to.equal(1);
+      expect(data.ext.newspassid.nppf).to.equal(0);
+      expect(data.ext.newspassid.nprp).to.equal(2);
+      expect(data.ext.newspassid.npip).to.equal(123);
+    });
+    it('should pass through GET params if present: npf, nppf, nprp, npip with alternative values', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {npf: 'false', nppf: 'true', nprp: 'xyz', npip: 'hello'};
+      };
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.newspassid.npf).to.equal(0);
+      expect(data.ext.newspassid.nppf).to.equal(1);
+      expect(data.ext.newspassid).to.not.haveOwnProperty('nprp');
+      expect(data.ext.newspassid).to.not.haveOwnProperty('npip');
+    });
+    it('should use nptestmode GET value if set, even if there is no customdata in config', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'nptestmode': 'mytestvalue_123'};
+      };
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.imp[0].ext.newspassid.customData).to.be.an('array');
+      expect(data.imp[0].ext.newspassid.customData[0].targeting.nptestmode).to.equal('mytestvalue_123');
+    });
+    it('should use GET values auction=[encoded URL] & cookiesync=[encoded url] if set', function() {
+      spec.propertyBag.config = null;
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {};
+      };
+      let request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      let url = request.url;
+      expect(url).to.equal('https://bidder.newspassid.com/openrtb2/auction');
+      let cookieUrl = specMock.getCookieSyncUrl();
+      expect(cookieUrl).to.equal('https://bidder.newspassid.com/static/load-cookie.html');
+      specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'auction': 'https://www.someurl.com/auction', 'cookiesync': 'https://www.someurl.com/sync'};
+      };
+      request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      url = request.url;
+      expect(url).to.equal('https://www.someurl.com/auction');
+      cookieUrl = specMock.getCookieSyncUrl();
+      expect(cookieUrl).to.equal('https://www.someurl.com/sync');
+    });
+    it('should use a valid npstoredrequest GET value if set to override the placementId values, and set np_rw if we find it', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'npstoredrequest': '1122334455'}; // 10 digits are valid
+      };
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.newspassid.np_rw).to.equal(1);
+      expect(data.imp[0].ext.prebid.storedrequest.id).to.equal('1122334455');
+    });
+    it('should NOT use an invalid npstoredrequest GET value if set to override the placementId values, and set np_rw to 0', function() {
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'npstoredrequest': 'BADVAL'}; // 10 digits are valid
+      };
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.newspassid.np_rw).to.equal(0);
+      expect(data.imp[0].ext.prebid.storedrequest.id).to.equal('1310000099');
+    });
+    it('should pick up the config value of coppa & set it in the request', function () {
+      config.setConfig({'coppa': true});
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.regs).to.include.keys('coppa');
+      expect(payload.regs.coppa).to.equal(1);
+      config.resetConfig();
+    });
+    it('should pick up the config value of coppa & only set it in the request if its true', function () {
+      config.setConfig({'coppa': false});
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(utils.deepAccess(payload, 'regs.coppa')).to.be.undefined;
+      config.resetConfig();
+    });
+    it('should should contain a unique page view id in the auction request which persists across calls', function () {
+      let request = spec.buildRequests(validBidRequests, validBidderRequest);
+      let payload = JSON.parse(request.data);
+      expect(utils.deepAccess(payload, 'ext.newspassid.pv')).to.be.a('string');
+      request = spec.buildRequests(validBidRequestsIsThisCamelCaseEnough, validBidderRequest);
+      let payload2 = JSON.parse(request.data);
+      expect(utils.deepAccess(payload2, 'ext.newspassid.pv')).to.be.a('string');
+      expect(utils.deepAccess(payload2, 'ext.newspassid.pv')).to.equal(utils.deepAccess(payload, 'ext.newspassid.pv'));
+    });
+    it('should indicate that the whitelist was used when it contains valid data', function () {
+      config.setConfig({'newspassid': {'np_whitelist_adserver_keys': ['np_appnexus_pb', 'np_appnexus_imp_id']}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.ext.newspassid.np_kvp_rw).to.equal(1);
+      config.resetConfig();
+    });
+    it('should indicate that the whitelist was not used when it contains no data', function () {
+      config.setConfig({'newspassid': {'np_whitelist_adserver_keys': []}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.ext.newspassid.np_kvp_rw).to.equal(0);
+      config.resetConfig();
+    });
+    it('should indicate that the whitelist was not used when it is not set in the config', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.ext.newspassid.np_kvp_rw).to.equal(0);
+    });
+    it('should handle ortb2 site data', function () {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      bidderRequest.ortb2 = {
+        'site': {
+          'name': 'example_ortb2_name',
+          'domain': 'page.example.com',
+          'cat': ['IAB2'],
+          'sectioncat': ['IAB2-2'],
+          'pagecat': ['IAB2-2'],
+          'page': 'https://page.example.com/here.html',
+          'ref': 'https://ref.example.com',
+          'keywords': 'power tools, drills',
+          'search': 'drill'
+        }
+      };
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.imp[0].ext.newspassid.customData[0].targeting.name).to.equal('example_ortb2_name');
+      expect(payload.user.ext).to.not.have.property('gender');
+    });
+    it('should add ortb2 site data when there is no customData already created', function () {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      bidderRequest.ortb2 = {
+        'site': {
+          'name': 'example_ortb2_name',
+          'domain': 'page.example.com',
+          'cat': ['IAB2'],
+          'sectioncat': ['IAB2-2'],
+          'pagecat': ['IAB2-2'],
+          'page': 'https://page.example.com/here.html',
+          'ref': 'https://ref.example.com',
+          'keywords': 'power tools, drills',
+          'search': 'drill'
+        }
+      };
+      const request = spec.buildRequests(validBidRequestsNoCustomData, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.imp[0].ext.newspassid.customData[0].targeting.name).to.equal('example_ortb2_name');
+      expect(payload.imp[0].ext.newspassid.customData[0].targeting).to.not.have.property('gender')
+    });
+    it('should add ortb2 user data to the user object', function () {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      bidderRequest.ortb2 = {
+        'user': {
+          'gender': 'I identify as a box of rocks'
+        }
+      };
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.user.gender).to.equal('I identify as a box of rocks');
+    });
+    it('handles schain object in each bidrequest (will be the same in each br)', function () {
+      let br = JSON.parse(JSON.stringify(validBidRequests));
+      let schainConfigObject = {
+        'ver': '1.0',
+        'complete': 1,
+        'nodes': [
+          {
+            'asi': 'bidderA.com',
+            'sid': '00001',
+            'hp': 1
+          }
+        ]
+      };
+      br[0]['schain'] = schainConfigObject;
+      const request = spec.buildRequests(br, validBidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.source.ext).to.haveOwnProperty('schain');
+      expect(data.source.ext.schain).to.deep.equal(schainConfigObject); // .deep.equal() : Target object deeply (but not strictly) equals `{a: 1}`
+    });
+  });
+  describe('interpretResponse', function () {
+    it('should build bid array', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result.length).to.equal(1);
+    });
+    it('should have all relevant fields', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      const bid = result[0];
+      expect(bid.cpm).to.equal(validResponse.body.seatbid[0].bid[0].cpm);
+      expect(bid.width).to.equal(validResponse.body.seatbid[0].bid[0].width);
+      expect(bid.height).to.equal(validResponse.body.seatbid[0].bid[0].height);
+    });
+    it('should build bid array with usp/CCPA', function () {
+      let validBR = JSON.parse(JSON.stringify(validBidderRequest));
+      validBR.uspConsent = '1YNY';
+      const request = spec.buildRequests(validBidRequests, validBR);
+      const payload = JSON.parse(request.data);
+      expect(payload.user.ext.uspConsent).not.to.exist;
+      expect(payload.regs.ext.us_privacy).to.equal('1YNY');
+    });
+    it('should fail ok if no seatbid in server response', function () {
+      const result = spec.interpretResponse({}, {});
+      expect(result).to.be.an('array');
+      expect(result).to.be.empty;
+    });
+    it('should fail ok if seatbid is not an array', function () {
+      const result = spec.interpretResponse({'body': {'seatbid': 'nothing_here'}}, {});
+      expect(result).to.be.an('array');
+      expect(result).to.be.empty;
+    });
+    it('should correctly parse response where there are more bidders than ad slots', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validBidResponse1adWith2Bidders, request);
+      expect(result.length).to.equal(2);
+    });
+    it('should have a ttl of 600', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result[0].ttl).to.equal(300);
+    });
+    it('should handle a valid whitelist, removing items not on the list & leaving others', function () {
+      config.setConfig({'newspassid': {'np_whitelist_adserver_keys': ['np_appnexus_crid', 'np_appnexus_adId']}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_adv')).to.be.undefined;
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_adId')).to.equal('2899ec066a91ff8-0-np-0');
+      config.resetConfig();
+    });
+    it('should ignore a whitelist if enhancedAdserverTargeting is false', function () {
+      config.setConfig({'newspassid': {'np_whitelist_adserver_keys': ['np_appnexus_crid', 'np_appnexus_imp_id'], 'enhancedAdserverTargeting': false}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_adv')).to.be.undefined;
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_imp_id')).to.be.undefined;
+      config.resetConfig();
+    });
+    it('should correctly handle enhancedAdserverTargeting being false', function () {
+      config.setConfig({'newspassid': {'enhancedAdserverTargeting': false}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_adv')).to.be.undefined;
+      expect(utils.deepAccess(result[0].adserverTargeting, 'np_appnexus_imp_id')).to.be.undefined;
+      config.resetConfig();
+    });
+    it('should add unique adId values to each bid', function() {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      let validres = JSON.parse(JSON.stringify(validResponse2BidsSameAdunit));
+      const result = spec.interpretResponse(validres, request);
+      expect(result.length).to.equal(1);
+      expect(result[0]['price']).to.equal(0.9);
+      expect(result[0]['adserverTargeting']['np_npappnexus_adId']).to.equal('2899ec066a91ff8-0-np-1');
+    });
+    it('should correctly process an auction with 2 adunits & multiple bidders one of which bids for both adslots', function() {
+      let validres = JSON.parse(JSON.stringify(multiResponse1));
+      let request = spec.buildRequests(multiRequest1, multiBidderRequest1.bidderRequest);
+      let result = spec.interpretResponse(validres, request);
+      expect(result.length).to.equal(4); // one of the 5 bids will have been removed
+      expect(result[1]['price']).to.equal(0.521);
+      expect(result[1]['impid']).to.equal('3025f169863b7f8');
+      expect(result[1]['id']).to.equal('18552976939844999');
+      expect(result[1]['adserverTargeting']['np_npappnexus_adId']).to.equal('3025f169863b7f8-0-np-2');
+      validres = JSON.parse(JSON.stringify(multiResponse1));
+      validres.body.seatbid[0].bid[1].price = 1.1;
+      validres.body.seatbid[0].bid[1].cpm = 1.1;
+      request = spec.buildRequests(multiRequest1, multiBidderRequest1.bidderRequest);
+      result = spec.interpretResponse(validres, request);
+      expect(result[1]['price']).to.equal(1.1);
+      expect(result[1]['impid']).to.equal('3025f169863b7f8');
+      expect(result[1]['id']).to.equal('18552976939844681');
+      expect(result[1]['adserverTargeting']['np_npappnexus_adId']).to.equal('3025f169863b7f8-0-np-1');
+    });
+  });
+  describe('userSyncs', function () {
+    it('should fail gracefully if no server response', function () {
+      const result = spec.getUserSyncs('bad', false, emptyObject);
+      expect(result).to.be.empty;
+    });
+    it('should fail gracefully if server response is empty', function () {
+      const result = spec.getUserSyncs('bad', [], emptyObject);
+      expect(result).to.be.empty;
+    });
+    it('should append the various values if they exist', function() {
+      spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', emptyObject);
+      expect(result).to.be.an('array');
+      expect(result[0].url).to.include('publisherId=9876abcd12-3');
+      expect(result[0].url).to.include('siteId=1234567890');
+    });
+    it('should append ccpa (usp data)', function() {
+      spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', emptyObject, '1YYN');
+      expect(result).to.be.an('array');
+      expect(result[0].url).to.include('usp_consent=1YYN');
+    });
+    it('should use "" if no usp is sent to cookieSync', function() {
+      spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', emptyObject);
+      expect(result).to.be.an('array');
+      expect(result[0].url).to.include('usp_consent=&');
+    });
+  });
+  describe('default size', function () {
+    it('should should return default sizes if no obj is sent', function () {
+      let obj = '';
+      const result = defaultSize(obj);
+      expect(result.defaultHeight).to.equal(250);
+      expect(result.defaultWidth).to.equal(300);
+    });
+  });
+  describe('getGranularityKeyName', function() {
+    it('should return a string granularity as-is', function() {
+      const result = getGranularityKeyName('', 'this is it', '');
+      expect(result).to.equal('this is it');
+    });
+    it('should return "custom" for a mediaTypeGranularity object', function() {
+      const result = getGranularityKeyName('', {}, '');
+      expect(result).to.equal('custom');
+    });
+    it('should return "custom" for a mediaTypeGranularity object', function() {
+      const result = getGranularityKeyName('', false, 'string buckets');
+      expect(result).to.equal('string buckets');
+    });
+  });
+  describe('getGranularityObject', function() {
+    it('should return an object as-is', function() {
+      const result = getGranularityObject('', {'name': 'mark'}, '', '');
+      expect(result.name).to.equal('mark');
+    });
+    it('should return an object as-is', function() {
+      const result = getGranularityObject('', false, 'custom', {'name': 'rupert'});
+      expect(result.name).to.equal('rupert');
+    });
+  });
+  describe('blockTheRequest', function() {
+    it('should return true if np_request is false', function() {
+      config.setConfig({'newspassid': {'np_request': false}});
+      let result = spec.blockTheRequest();
+      expect(result).to.be.true;
+      config.resetConfig();
+    });
+    it('should return false if np_request is true', function() {
+      config.setConfig({'newspassid': {'np_request': true}});
+      let result = spec.blockTheRequest();
+      expect(result).to.be.false;
+      config.resetConfig();
+    });
+  });
+  describe('getPageId', function() {
+    it('should return the same Page ID for multiple calls', function () {
+      let result = spec.getPageId();
+      expect(result).to.be.a('string');
+      let result2 = spec.getPageId();
+      expect(result2).to.equal(result);
+    });
+  });
+  describe('getBidRequestForBidId', function() {
+    it('should locate a bid inside a bid array', function () {
+      let result = spec.getBidRequestForBidId('2899ec066a91ff8', validBidRequestsMulti);
+      expect(result.testId).to.equal(1);
+      result = spec.getBidRequestForBidId('2899ec066a91ff0', validBidRequestsMulti);
+      expect(result.testId).to.equal(2);
+    });
+  });
+  describe('removeSingleBidderMultipleBids', function() {
+    it('should remove the multi bid by npappnexus for adslot 2d30e86db743a8', function() {
+      let validres = JSON.parse(JSON.stringify(multiResponse1));
+      expect(validres.body.seatbid[0].bid.length).to.equal(3);
+      expect(validres.body.seatbid[0].seat).to.equal('npappnexus');
+      let response = spec.removeSingleBidderMultipleBids(validres.body.seatbid);
+      expect(response.length).to.equal(2);
+      expect(response[0].bid.length).to.equal(2);
+      expect(response[0].seat).to.equal('npappnexus');
+      expect(response[1].bid.length).to.equal(2);
+    });
+  });
+});

From 6f7f56b73374c44e0a6704bcb6bc61b9df644790 Mon Sep 17 00:00:00 2001
From: Muki Seiler <muuki88@users.noreply.github.com>
Date: Tue, 12 Jul 2022 21:14:59 +0200
Subject: [PATCH 019/569] Add gvlid to ogury (#8680)

---
 modules/oguryBidAdapter.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/oguryBidAdapter.js b/modules/oguryBidAdapter.js
index 746fc1eec03..932d0d43f0e 100644
--- a/modules/oguryBidAdapter.js
+++ b/modules/oguryBidAdapter.js
@@ -6,6 +6,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { ajax } from '../src/ajax.js'
 
 const BIDDER_CODE = 'ogury';
+const GVLID = 31;
 const DEFAULT_TIMEOUT = 1000;
 const BID_HOST = 'https://mweb-hb.presage.io/api/header-bidding-request';
 const TIMEOUT_MONITORING_HOST = 'https://ms-ads-monitoring-events.presage.io';
@@ -198,6 +199,7 @@ function onTimeout(timeoutData) {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER],
   isBidRequestValid,
   getUserSyncs,

From 9af6d0cf34dc032f42619113267e4a43f1b0346e Mon Sep 17 00:00:00 2001
From: Gena <wertixvost@gmail.com>
Date: Wed, 13 Jul 2022 15:49:56 +0200
Subject: [PATCH 020/569] Update select media gvlid (#8684)

---
 modules/adtelligentBidAdapter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/adtelligentBidAdapter.js b/modules/adtelligentBidAdapter.js
index 5269b1224c1..6c6fca13d7b 100644
--- a/modules/adtelligentBidAdapter.js
+++ b/modules/adtelligentBidAdapter.js
@@ -37,7 +37,8 @@ const syncsCache = {};
 export const spec = {
   code: BIDDER_CODE,
   gvlid: 410,
-  aliases: ['onefiftytwomedia', 'selectmedia', 'appaloosa', 'bidsxchange', 'streamkey', 'janet',
+  aliases: ['onefiftytwomedia', 'appaloosa', 'bidsxchange', 'streamkey', 'janet',
+    { code: 'selectmedia', gvlid: 775 },
     { code: 'navelix', gvlid: 380 },
     'pgam'
   ],

From 0be4560e182e46c121c283f763cdef74b5ff9db9 Mon Sep 17 00:00:00 2001
From: JacobKlein26 <42449375+JacobKlein26@users.noreply.github.com>
Date: Wed, 13 Jul 2022 09:53:37 -0400
Subject: [PATCH 021/569] NextMillennium Bid Adapter: Add ortb and element
 offsets (#8671)

* ortb2 and el offsets

* return empty object

* ortb2 and el offsets

* IX Bid Adapter: Add support for impression level transactionId (imp[].ext.tid) (#8641)

* IX Bid Adapter: add imp ext tid support

* fix tid level in imp ext object

Co-authored-by: shahin.rahbariasl <shahin.rahbariasl@indexexchange.com>

* PBjs Core Price Floors Module: improve logging on bid rejections to clarify which CPM is being compared with which floor (#8655)

* Price floors module: improve logging on bid rejections to clarify which CPM is being compared with which floor

* Use full precision in log message

* Adgeneration Bid Adpter: add Criteo system and ID5 system and update test. (#8642)

* update Adgeneration to add Criteo system and ID5 systems.

* Change method name.

* Correction_of_code_and_test_specs.

* Adding adgext_id5_id_link_type parameter to ID5 object.

* return empty object

* fix ortb location (not in ext)

* add unit testing

Co-authored-by: shahinrahbariasl <56240400+shahinrahbariasl@users.noreply.github.com>
Co-authored-by: shahin.rahbariasl <shahin.rahbariasl@indexexchange.com>
Co-authored-by: Demetrio Girardi <dgirardi@prebid.org>
Co-authored-by: Keisuke Kakinuma <keisuke.kakinuma@supership.jp>
---
 modules/nextMillenniumBidAdapter.js           | 18 ++++++++++++++++-
 .../modules/nextMillenniumBidAdapter_spec.js  | 20 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index 91508d38ca0..375258176da 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -35,8 +35,11 @@ export const spec = {
 
           'nextMillennium': {
             'refresh_count': window.nmmRefreshCounts[bid.adUnitCode]++,
+            'elOffsets': getBoundingClient(bid),
+            'scrollTop': window.pageYOffset || document.documentElement.scrollTop
           }
-        }
+        },
+        ...bid.ortb2
       }
 
       const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
@@ -132,6 +135,19 @@ export const spec = {
     }];
   },
 };
+function getAdEl(bid) {
+  // best way I could think of to get El, is by matching adUnitCode to google slots...
+  const slot = window.googletag && window.googletag.pubads && window.googletag.pubads().getSlots().find(slot => slot.getAdUnitPath() === bid.adUnitCode);
+  const slotElementId = slot && slot.getSlotElementId();
+  if (!slotElementId) return null;
+  return document.querySelector('#' + slotElementId);
+}
+function getBoundingClient(bid) {
+  // console.log(bid)
+  const el = getAdEl(bid)
+  if (!el) return {}
+  return el.getBoundingClientRect();
+}
 
 function getPlacementId(bid) {
   const groupId = getBidIdParameter('group_id', bid.params)
diff --git a/test/spec/modules/nextMillenniumBidAdapter_spec.js b/test/spec/modules/nextMillenniumBidAdapter_spec.js
index a8aa62f24d1..9362388b539 100644
--- a/test/spec/modules/nextMillenniumBidAdapter_spec.js
+++ b/test/spec/modules/nextMillenniumBidAdapter_spec.js
@@ -14,6 +14,16 @@ describe('nextMillenniumBidAdapterTests', function() {
       gdprConsent: {
         consentString: 'kjfdniwjnifwenrif3',
         gdprApplies: true
+      },
+      ortb2: {
+        device: {
+          w: 1500,
+          h: 1000
+        },
+        site: {
+          domain: 'example.com',
+          page: 'http://example.com'
+        }
       }
     }
   ];
@@ -94,6 +104,16 @@ describe('nextMillenniumBidAdapterTests', function() {
     expect(JSON.parse(request[0].data).ext.nextMillennium.refresh_count).to.equal(3);
   });
 
+  it('Check if ORTB was added', function() {
+    const request = spec.buildRequests(bidRequestData)
+    expect(JSON.parse(request[0].data).site.domain).to.equal('example.com')
+  })
+
+  it('Check if elOffsets was added', function() {
+    const request = spec.buildRequests(bidRequestData)
+    expect(JSON.parse(request[0].data).ext.nextMillennium.elOffsets).to.be.an('object')
+  })
+
   it('Test getUserSyncs function', function () {
     const syncOptions = {
       'iframeEnabled': true

From c99e849756f4e6ba88f3417d2ba878d570670539 Mon Sep 17 00:00:00 2001
From: wsusrasp <106743463+wsusrasp@users.noreply.github.com>
Date: Thu, 14 Jul 2022 15:54:04 +0200
Subject: [PATCH 022/569] Ras Bid Adapter: Initial release (#8551)

* Ras Bid Adapter: Initial release

* * Ras Bid Adapter: "du" and "pos" params

* * Ras Bid Adapter: "pos" param is not supported

* switch to new refererInfo format

* * Ras Bid Adapter: "du" and "dr" params

Co-authored-by: skoklowski <slawomir.koklowski@dreamlab.pl>
---
 modules/rasBidAdapter.js                | 149 +++++++++++++++++++
 modules/rasBidAdapter.md                |  50 +++++++
 test/spec/modules/rasBidAdapter_spec.js | 190 ++++++++++++++++++++++++
 3 files changed, 389 insertions(+)
 create mode 100644 modules/rasBidAdapter.js
 create mode 100644 modules/rasBidAdapter.md
 create mode 100644 test/spec/modules/rasBidAdapter_spec.js

diff --git a/modules/rasBidAdapter.js b/modules/rasBidAdapter.js
new file mode 100644
index 00000000000..d9e6b6a9126
--- /dev/null
+++ b/modules/rasBidAdapter.js
@@ -0,0 +1,149 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { isEmpty, getAdUnitSizes, parseSizesInput, deepAccess } from '../src/utils.js';
+
+const BIDDER_CODE = 'ras';
+const VERSION = '1.0';
+
+const getEndpoint = (network) => `https://csr.onet.pl/${encodeURIComponent(network)}/csr-006/csr.json?`;
+
+function parseParams(params, bidderRequest) {
+  const newParams = {};
+  const du = deepAccess(bidderRequest, 'refererInfo.page');
+  const dr = deepAccess(bidderRequest, 'refererInfo.ref');
+
+  if (du) {
+    newParams.du = du;
+  }
+  if (dr) {
+    newParams.dr = dr;
+  }
+  const pageContext = params.pageContext;
+  if (!pageContext) {
+    return newParams;
+  }
+  if (pageContext.du) {
+    newParams.du = pageContext.du;
+  }
+  if (pageContext.dr) {
+    newParams.dr = pageContext.dr;
+  }
+  if (pageContext.dv) {
+    newParams.DV = pageContext.dv;
+  }
+  if (pageContext.keyWords && Array.isArray(pageContext.keyWords)) {
+    newParams.kwrd = pageContext.keyWords.join('+');
+  }
+  if (pageContext.capping) {
+    newParams.local_capping = pageContext.capping;
+  }
+  if (pageContext.keyValues && typeof pageContext.keyValues === 'object') {
+    for (const param in pageContext.keyValues) {
+      if (pageContext.keyValues.hasOwnProperty(param)) {
+        const kvName = 'kv' + param;
+        newParams[kvName] = pageContext.keyValues[param];
+      }
+    }
+  }
+  return newParams;
+}
+
+const buildBid = (ad) => {
+  if (ad.type === 'empty') {
+    return null;
+  }
+  return {
+    requestId: ad.id,
+    cpm: ad.bid_rate ? ad.bid_rate.toFixed(2) : 0,
+    width: ad.width || 0,
+    height: ad.height || 0,
+    ttl: 300,
+    creativeId: ad.adid ? parseInt(ad.adid.split(',')[2], 10) : 0,
+    netRevenue: true,
+    currency: ad.currency || 'USD',
+    dealId: null,
+    meta: {
+      mediaType: BANNER
+    },
+    ad: ad.html || null
+  };
+};
+
+const getContextParams = (bidRequests, bidderRequest) => {
+  const bid = bidRequests[0];
+  const { params } = bid;
+  const requestParams = {
+    site: params.site,
+    area: params.area,
+    cre_format: 'html',
+    systems: 'das',
+    kvprver: VERSION,
+    ems_url: 1,
+    bid_rate: 1,
+    ...parseParams(params, bidderRequest)
+  };
+  return Object.keys(requestParams).map((key) => encodeURIComponent(key) + '=' + encodeURIComponent(requestParams[key])).join('&');
+};
+
+const getSlots = (bidRequests) => {
+  let queryString = '';
+  const batchSize = bidRequests.length;
+  for (let i = 0; i < batchSize; i++) {
+    const adunit = bidRequests[i];
+    const sizes = parseSizesInput(getAdUnitSizes(adunit)).join(',');
+    queryString += `&slot${i}=${encodeURIComponent(adunit.params.slot)}&id${i}=${encodeURIComponent(adunit.bidId)}&composition${i}=CHILD`;
+    if (sizes.length) {
+      queryString += `&iusizes${i}=${encodeURIComponent(sizes)}`;
+    }
+  }
+  return queryString;
+};
+
+const getGdprParams = (bidderRequest) => {
+  const gdprApplies = deepAccess(bidderRequest, 'gdprConsent.gdprApplies');
+  let consentString = deepAccess(bidderRequest, 'gdprConsent.consentString');
+  let queryString = '';
+  if (gdprApplies !== undefined) {
+    queryString += `&gdpr_applies=${encodeURIComponent(gdprApplies)}`;
+  }
+  if (consentString !== undefined) {
+    queryString += `&euconsent=${encodeURIComponent(consentString)}`;
+  }
+  return queryString;
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bidRequest) {
+    if (!bidRequest || !bidRequest.params || typeof bidRequest.params !== 'object') {
+      return;
+    }
+    const { params } = bidRequest;
+    return Boolean(params.network && params.site && params.area && params.slot);
+  },
+
+  buildRequests: function (bidRequests, bidderRequest) {
+    const slotsQuery = getSlots(bidRequests);
+    const contextQuery = getContextParams(bidRequests, bidderRequest);
+    const gdprQuery = getGdprParams(bidderRequest);
+    const bidIds = bidRequests.map((bid) => ({ slot: bid.params.slot, bidId: bid.bidId }));
+    const network = bidRequests[0].params.network;
+    return [{
+      method: 'GET',
+      url: getEndpoint(network) + contextQuery + slotsQuery + gdprQuery,
+      bidIds: bidIds
+    }];
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    const response = serverResponse.body;
+    if (!response || !response.ads || response.ads.length === 0) {
+      return [];
+    }
+    return response.ads.map(buildBid).filter((bid) => !isEmpty(bid));
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/rasBidAdapter.md b/modules/rasBidAdapter.md
new file mode 100644
index 00000000000..5cf75c3446d
--- /dev/null
+++ b/modules/rasBidAdapter.md
@@ -0,0 +1,50 @@
+# Overview
+
+```
+Module Name: Ringier Axel Springer Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@ringpublishing.com
+```
+
+# Description
+
+Module that connects to Ringer Axel Springer demand sources.
+Only banner format is supported.
+
+# Test Parameters
+```js
+var adUnits = [{
+  code: 'test-div-ad',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250], [300, 600]]
+    }
+  },
+  bids: [{
+    bidder: 'ras',
+    params: {
+      network: '4178463',
+      site: 'test',
+      area: 'areatest',
+      slot: 'slot'
+    }
+  }]
+}];
+```
+
+# Parameters
+
+| Name | Scope | Type | Description | Example
+| --- | --- | --- | --- | ---
+| network | required | String | Specific identifier provided by RAS | `"4178463"`
+| site | required | String | Specific identifier name (case-insensitive) that is associated with this ad unit and provided by RAS | `"example_com"`
+| area | required | String | Ad unit category name; only case-insensitive alphanumeric with underscores and hyphens are allowed | `"sport"`
+| slot | required | String | Ad unit placement name (case-insensitive) provided by RAS | `"slot"`
+| pageContext | optional | Object | Web page context data | `{}`
+| pageContext.dr | optional | String | Document referrer URL address | `"https://example.com/"`
+| pageContext.du | optional | String | Document URL address | `"https://example.com/sport/football/article.html?id=932016a5-02fc-4d5c-b643-fafc2f270f06"`
+| pageContext.dv | optional | String | Document virtual address as slash-separated path that may consist of any number of parts (case-insensitive alphanumeric with underscores and hyphens); first part should be the same as `site` value and second as `area` value; next parts may reflect website navigation | `"example_com/sport/football"`
+| pageContext.keyWords | optional | String[] | List of keywords associated with this ad unit; only case-insensitive alphanumeric with underscores and hyphens are allowed | `["euro", "lewandowski"]`
+| pageContext.keyValues | optional | Object | Key-values associated with this ad unit (case-insensitive); following characters are not allowed in the values: `" ' = ! + # * ~ ; ^ ( ) < > [ ] & @` | `{}`
+| pageContext.keyValues.ci | optional | String | Content unique identifier | `"932016a5-02fc-4d5c-b643-fafc2f270f06"`
+| pageContext.keyValues.adunit | optional | String | Ad unit name | `"example_com/sport"`
diff --git a/test/spec/modules/rasBidAdapter_spec.js b/test/spec/modules/rasBidAdapter_spec.js
new file mode 100644
index 00000000000..e3f41566c99
--- /dev/null
+++ b/test/spec/modules/rasBidAdapter_spec.js
@@ -0,0 +1,190 @@
+import { expect } from 'chai';
+import { spec } from 'modules/rasBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+
+const CSR_ENDPOINT = 'https://csr.onet.pl/4178463/csr-006/csr.json?';
+
+describe('rasBidAdapter', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      const bid = {
+        sizes: [[300, 250], [300, 600]],
+        bidder: 'ras',
+        params: {
+          slot: 'slot',
+          area: 'areatest',
+          site: 'test',
+          network: '4178463'
+        }
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params not found', function () {
+      const failBid = {
+        sizes: [[300, 250], [300, 300]],
+        bidder: 'ras',
+        params: {
+          site: 'test',
+          network: '4178463'
+        }
+      };
+      expect(spec.isBidRequestValid(failBid)).to.equal(false);
+    });
+
+    it('should return nothing when bid request is malformed', function () {
+      const failBid = {
+        sizes: [[300, 250], [300, 300]],
+        bidder: 'ras',
+      };
+      expect(spec.isBidRequestValid(failBid)).to.equal(undefined);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bid = {
+      sizes: [[300, 250], [300, 600]],
+      bidder: 'ras',
+      bidId: 1,
+      params: {
+        slot: 'test',
+        area: 'areatest',
+        site: 'test',
+        network: '4178463'
+      }
+    };
+    const bid2 = {
+      sizes: [[750, 300]],
+      bidder: 'ras',
+      bidId: 2,
+      params: {
+        slot: 'test2',
+        area: 'areatest',
+        site: 'test',
+        network: '4178463'
+      }
+    };
+
+    it('should parse bids to request', function () {
+      const requests = spec.buildRequests([bid], {
+        'gdprConsent': {
+          'gdprApplies': true,
+          'consentString': 'some-consent-string'
+        },
+        'refererInfo': {
+          'ref': 'https://example.org/',
+          'page': 'https://example.com/'
+        }
+      });
+      expect(requests[0].url).to.have.string(CSR_ENDPOINT);
+      expect(requests[0].url).to.have.string('slot0=test');
+      expect(requests[0].url).to.have.string('id0=1');
+      expect(requests[0].url).to.have.string('site=test');
+      expect(requests[0].url).to.have.string('area=areatest');
+      expect(requests[0].url).to.have.string('cre_format=html');
+      expect(requests[0].url).to.have.string('systems=das');
+      expect(requests[0].url).to.have.string('ems_url=1');
+      expect(requests[0].url).to.have.string('bid_rate=1');
+      expect(requests[0].url).to.have.string('gdpr_applies=true');
+      expect(requests[0].url).to.have.string('euconsent=some-consent-string');
+      expect(requests[0].url).to.have.string('du=https%3A%2F%2Fexample.com%2F');
+      expect(requests[0].url).to.have.string('dr=https%3A%2F%2Fexample.org%2F');
+    });
+
+    it('should return empty consent string when undefined', function () {
+      const requests = spec.buildRequests([bid]);
+      const gdpr = requests[0].url.search('gdpr_applies');
+      const euconsent = requests[0].url.search('euconsent=');
+      expect(gdpr).to.equal(-1);
+      expect(euconsent).to.equal(-1);
+    });
+
+    it('should parse bids to request from pageContext', function () {
+      const bidCopy = { ...bid };
+      bidCopy.params = {
+        ...bid.params,
+        pageContext: {
+          dv: 'test/areatest',
+          du: 'https://example.com/',
+          dr: 'https://example.org/',
+          keyWords: ['val1', 'val2'],
+          keyValues: {
+            adunit: 'test/areatest'
+          }
+        }
+      };
+      const requests = spec.buildRequests([bidCopy, bid2]);
+      expect(requests[0].url).to.have.string(CSR_ENDPOINT);
+      expect(requests[0].url).to.have.string('slot0=test');
+      expect(requests[0].url).to.have.string('id0=1');
+      expect(requests[0].url).to.have.string('iusizes0=300x250%2C300x600');
+      expect(requests[0].url).to.have.string('slot1=test2');
+      expect(requests[0].url).to.have.string('id1=2');
+      expect(requests[0].url).to.have.string('iusizes1=750x300');
+      expect(requests[0].url).to.have.string('site=test');
+      expect(requests[0].url).to.have.string('area=areatest');
+      expect(requests[0].url).to.have.string('cre_format=html');
+      expect(requests[0].url).to.have.string('systems=das');
+      expect(requests[0].url).to.have.string('ems_url=1');
+      expect(requests[0].url).to.have.string('bid_rate=1');
+      expect(requests[0].url).to.have.string('du=https%3A%2F%2Fexample.com%2F');
+      expect(requests[0].url).to.have.string('dr=https%3A%2F%2Fexample.org%2F');
+      expect(requests[0].url).to.have.string('DV=test%2Fareatest');
+      expect(requests[0].url).to.have.string('kwrd=val1%2Bval2');
+      expect(requests[0].url).to.have.string('kvadunit=test%2Fareatest');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {
+      'adsCheck': 'ok',
+      'geoloc': {},
+      'ir': '92effd60-0c84-4dac-817e-763ea7b8ac65',
+      'ads': [
+        {
+          'id': 'flat-belkagorna',
+          'slot': 'flat-belkagorna',
+          'prio': 10,
+          'type': 'html',
+          'bid_rate': 0.321123,
+          'adid': 'das,50463,152276',
+          'id_3': '12734',
+          'html': '<script type=\"text/javascript\">test</script>'
+        }
+      ],
+      'iv': '202003191334467636346500'
+    };
+
+    it('should get correct bid response', function () {
+      const resp = spec.interpretResponse({ body: response }, { bidIds: [{ slot: 'flat-belkagorna', bidId: 1 }] });
+      expect(resp[0]).to.have.all.keys('cpm', 'currency', 'netRevenue', 'requestId', 'ttl', 'width', 'height', 'creativeId', 'dealId', 'ad', 'meta');
+      expect(resp.length).to.equal(1);
+    });
+
+    it('should handle empty ad', function () {
+      let res = {
+        'ads': [{
+          type: 'empty'
+        }]
+      };
+      const resp = spec.interpretResponse({ body: res }, {});
+      expect(resp).to.deep.equal([]);
+    });
+
+    it('should handle empty server response', function () {
+      let res = {
+        'ads': []
+      };
+      const resp = spec.interpretResponse({ body: res }, {});
+      expect(resp).to.deep.equal([]);
+    });
+  });
+});

From 6d8303b4477979cf207c2383c06fcf45332c4bee Mon Sep 17 00:00:00 2001
From: TheMediaGrid <44166371+TheMediaGrid@users.noreply.github.com>
Date: Thu, 14 Jul 2022 17:07:36 +0300
Subject: [PATCH 023/569] TheMediaGrid: added ortb2.user.data to
 gridNMBidAdapter (#8652)

---
 modules/gridNMBidAdapter.js                | 49 ++++++++++++++++++++--
 test/spec/modules/gridNMBidAdapter_spec.js | 32 ++++++++++++++
 2 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/modules/gridNMBidAdapter.js b/modules/gridNMBidAdapter.js
index 63c42f60933..b44f94f0495 100644
--- a/modules/gridNMBidAdapter.js
+++ b/modules/gridNMBidAdapter.js
@@ -1,4 +1,13 @@
-import { isStr, deepAccess, isArray, isNumber, logError, logWarn, parseGPTSingleSizeArrayToRtbSize } from '../src/utils.js';
+import {
+  isStr,
+  deepAccess,
+  isArray,
+  isNumber,
+  logError,
+  logWarn,
+  parseGPTSingleSizeArrayToRtbSize,
+  mergeDeep
+} from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { Renderer } from '../src/Renderer.js';
 import { VIDEO } from '../src/mediaTypes.js';
@@ -153,9 +162,7 @@ export const spec = {
         user = {
           data: [{
             name: 'iow_labs_pub_data',
-            segment: jwpseg.map((seg) => {
-              return {name: 'jwpseg', value: seg};
-            })
+            segment: segmentProcessing(jwpseg, 'jwpseg'),
           }]
         };
       }
@@ -174,9 +181,27 @@ export const spec = {
         user.ext = userExt;
       }
 
+      const ortb2UserData = deepAccess(bidderRequest, 'ortb2.user.data');
+      if (ortb2UserData && ortb2UserData.length) {
+        if (!user) {
+          user = { data: [] };
+        }
+        user = mergeDeep(user, {
+          data: [...ortb2UserData]
+        });
+      }
+
       if (user) {
         request.user = user;
       }
+      const site = deepAccess(bidderRequest, 'ortb2.site');
+      if (site) {
+        const data = deepAccess(site, 'content.data');
+        if (data && data.length) {
+          const siteContent = request.site.content || {};
+          request.site.content = mergeDeep(siteContent, { data });
+        }
+      }
 
       if (gdprConsent && gdprConsent.gdprApplies) {
         request.regs = {
@@ -408,4 +433,20 @@ export function getSyncUrl() {
   return SYNC_URL;
 }
 
+function segmentProcessing(segment, forceSegName) {
+  return segment
+    .map((seg) => {
+      const value = seg && (seg.value || seg.id || seg);
+      if (typeof value === 'string' || typeof value === 'number') {
+        return {
+          value: value.toString(),
+          ...(forceSegName && { name: forceSegName }),
+          ...(seg.name && { name: seg.name }),
+        };
+      }
+      return null;
+    })
+    .filter((seg) => !!seg);
+}
+
 registerBidder(spec);
diff --git a/test/spec/modules/gridNMBidAdapter_spec.js b/test/spec/modules/gridNMBidAdapter_spec.js
index c09aca07cc3..b400ef3394d 100644
--- a/test/spec/modules/gridNMBidAdapter_spec.js
+++ b/test/spec/modules/gridNMBidAdapter_spec.js
@@ -226,6 +226,38 @@ describe('TheMediaGridNM Adapter', function () {
       }
     ];
 
+    it('if content and segment is present in jwTargeting, payload must have right params', function () {
+      const jsContent = {id: 'test_jw_content_id'};
+      const jsSegments = ['test_seg_1', 'test_seg_2'];
+      const bidRequestsWithJwTargeting = bidRequests.map((bid) => {
+        return Object.assign({
+          rtd: {
+            jwplayer: {
+              targeting: {
+                segments: jsSegments,
+                content: jsContent
+              }
+            }
+          }
+        }, bid);
+      });
+      const requests = spec.buildRequests(bidRequestsWithJwTargeting, bidderRequest);
+      requests.forEach((req, i) => {
+        const payload = req.data;
+        expect(req).to.have.property('data');
+        expect(payload).to.have.property('user');
+        expect(payload.user.data).to.deep.equal([{
+          name: 'iow_labs_pub_data',
+          segment: [
+            {name: 'jwpseg', value: jsSegments[0]},
+            {name: 'jwpseg', value: jsSegments[1]}
+          ]
+        }]);
+        expect(payload).to.have.property('site');
+        expect(payload.site.content).to.deep.equal(jsContent);
+      });
+    });
+
     it('should attach valid params to the tag', function () {
       const requests = spec.buildRequests(bidRequests, bidderRequest);
       const requestsSizes = ['300x250,300x600', '728x90'];

From 995a010f409e613093a0561b27068f01efd58016 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 14 Jul 2022 14:57:51 +0000
Subject: [PATCH 024/569] Prebid 7.6.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dfb3c6d93ae..e361117106c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.6.0-pre",
+  "version": "7.6.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 1a8e1ff1a98..67686017111 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.6.0-pre",
+  "version": "7.6.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From a7d93318c6e1e2a58d7b33312258d8f98ecb9086 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 14 Jul 2022 14:57:51 +0000
Subject: [PATCH 025/569] Increment version to 7.7.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e361117106c..6b0a939a173 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.6.0",
+  "version": "7.7.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 67686017111..33dca05273f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.6.0",
+  "version": "7.7.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From b613039e1062d807d11f1d5cea85e8fd6f53a4a1 Mon Sep 17 00:00:00 2001
From: Anass Seddiki <bwh.anass@gmail.com>
Date: Thu, 14 Jul 2022 19:05:50 +0200
Subject: [PATCH 026/569] 1plusX RTD submodule: New RTD Module (#8614)

* Empty shell for 1plusX RTD submodule (#1)

* Submodule initialization & functions (init; getBidRequestData) skeletons (#2)

* Testing for init function (#3)

* Requesting Profile API for Data (#4)

* Extract PAPI response & implementation example

* Transmitting targeting data to bidder adapters

* Markdown file documentation

* Code cleaned & jsDoc completed

* Change contact email + beautify parameters table + fix type in param name

* Change customerId param type to string in doc

* Add 1plusXRtdProvider as submodule of rtdModule

* Add more tests on extractConfig amongst others

* Remove SUPPORTED_BIDDERS limitation

* Remove supported bidders from docs

* Write to site.content.data.segment.id & keep legacy support for appnexus

* Change location of googleTagServices

* Add segtax for site.content.data

* Handle audiences for appNexus by putting them in config.appnexusAuctionKeywords
---
 .../gpt/1plusXRtdProviderExample.html         | 112 +++++
 modules/.submodules.json                      |   3 +-
 modules/1plusXRtdProvider.js                  | 251 ++++++++++
 modules/1plusXRtdProvider.md                  |  67 +++
 test/spec/modules/1plusXRtdProvider_spec.js   | 430 ++++++++++++++++++
 5 files changed, 862 insertions(+), 1 deletion(-)
 create mode 100644 integrationExamples/gpt/1plusXRtdProviderExample.html
 create mode 100644 modules/1plusXRtdProvider.js
 create mode 100644 modules/1plusXRtdProvider.md
 create mode 100644 test/spec/modules/1plusXRtdProvider_spec.js

diff --git a/integrationExamples/gpt/1plusXRtdProviderExample.html b/integrationExamples/gpt/1plusXRtdProviderExample.html
new file mode 100644
index 00000000000..2eb75063df1
--- /dev/null
+++ b/integrationExamples/gpt/1plusXRtdProviderExample.html
@@ -0,0 +1,112 @@
+<html>
+
+<head>
+
+  <script>
+    var FAILSAFE_TIMEOUT = 2000;
+
+    var adUnits = [
+      {
+        code: 'test-div',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600], [728, 90]]
+          }
+        },
+        bids: [
+          {
+            bidder: 'appnexus',
+            params: {
+              placementId: 13144370
+            }
+          }
+        ]
+      }
+    ];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+  </script>
+  <script src="../../build/dev/prebid.js" async></script>
+
+  <script>
+    var googletag = googletag || {};
+    var testAuctionDelay = 2000;
+    googletag.cmd = googletag.cmd || [];
+    googletag.cmd.push(function () {
+      googletag.pubads().disableInitialLoad();
+    });
+
+    pbjs.que.push(function () {
+      pbjs.setConfig({
+        debug: true,
+        realTimeData: {
+          auctionDelay: testAuctionDelay, // lower in real scenario to meet publisher spec
+          dataProviders: [
+            {
+              name: "1plusX",
+              waitForIt: true,
+              params: {
+                customerId: 'acme',
+                bidders: ['appnexus'],
+                timeout: 1000
+              }
+
+            }
+          ]
+        }
+      });
+      pbjs.addAdUnits(adUnits);
+      pbjs.requestBids({ bidsBackHandler: sendAdserverRequest });
+    });
+
+    function sendAdserverRequest() {
+      if (pbjs.adserverRequestSent) return;
+      pbjs.adserverRequestSent = true;
+
+      googletag.cmd.push(function () {
+        pbjs.que.push(function () {
+          pbjs.setTargetingForGPTAsync();
+          googletag.pubads().refresh();
+        });
+      });
+    }
+
+    setTimeout(function () {
+      sendAdserverRequest();
+    }, FAILSAFE_TIMEOUT);
+  </script>
+
+  <script>
+    (function () {
+      var gads = document.createElement('script');
+      gads.async = true;
+      gads.type = 'text/javascript';
+      var useSSL = 'https:' == document.location.protocol;
+      gads.src = (useSSL ? 'https:' : 'http:') +
+        '//securepubads.g.doubleclick.net/tag/js/gpt.js';
+      var node = document.getElementsByTagName('script')[0];
+      node.parentNode.insertBefore(gads, node);
+    })();
+  </script>
+
+  <script>
+    googletag.cmd.push(function () {
+      googletag.defineSlot('/112115922/FL_PB_MedRect', [[300, 250], [300, 600]], 'test-div').addService(googletag.pubads());
+      googletag.pubads().enableSingleRequest();
+      googletag.enableServices();
+    });
+  </script>
+</head>
+
+<body>
+  <h2>1plusX RTD Module for Prebid</h2>
+
+  <div id='test-div'>
+    <script>
+      googletag.cmd.push(function () { googletag.display('test-div'); });
+    </script>
+  </div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/modules/.submodules.json b/modules/.submodules.json
index d808b10051b..d24e7ff96f5 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -49,6 +49,7 @@
       "dfpAdServerVideo"
     ],
     "rtdModule": [
+      "1plusXRtdProvider",
       "airgridRtdProvider",
       "akamaiDapRtdProvider",
       "blueconicRtdProvider",
@@ -84,4 +85,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/modules/1plusXRtdProvider.js b/modules/1plusXRtdProvider.js
new file mode 100644
index 00000000000..5affafcf9d3
--- /dev/null
+++ b/modules/1plusXRtdProvider.js
@@ -0,0 +1,251 @@
+import { submodule } from '../src/hook.js';
+import { config } from '../src/config.js';
+import { ajax } from '../src/ajax.js';
+import {
+  logMessage, logError,
+  deepAccess, mergeDeep,
+  isNumber, isArray, deepSetValue
+} from '../src/utils.js';
+
+// Constants
+const REAL_TIME_MODULE = 'realTimeData';
+const MODULE_NAME = '1plusX';
+const ORTB2_NAME = '1plusX.com'
+const PAPI_VERSION = 'v1.0';
+const LOG_PREFIX = '[1plusX RTD Module]: ';
+const LEGACY_SITE_KEYWORDS_BIDDERS = ['appnexus'];
+export const segtaxes = {
+  // cf. https://github.com/InteractiveAdvertisingBureau/openrtb/pull/108
+  AUDIENCE: 526,
+  CONTENT: 527,
+};
+// Functions
+/**
+ * Extracts the parameters for 1plusX RTD module from the config object passed at instanciation
+ * @param {Object} moduleConfig Config object passed to the module
+ * @param {Object} reqBidsConfigObj Config object for the bidders; each adapter has its own entry
+ * @returns {Object} Extracted configuration parameters for the module
+ */
+export const extractConfig = (moduleConfig, reqBidsConfigObj) => {
+  // CustomerId
+  const customerId = deepAccess(moduleConfig, 'params.customerId');
+  if (!customerId) {
+    throw new Error('Missing parameter customerId in moduleConfig');
+  }
+  // Timeout
+  const tempTimeout = deepAccess(moduleConfig, 'params.timeout');
+  const timeout = isNumber(tempTimeout) && tempTimeout > 300 ? tempTimeout : 1000;
+
+  // Bidders
+  const biddersTemp = deepAccess(moduleConfig, 'params.bidders');
+  if (!isArray(biddersTemp) || !biddersTemp.length) {
+    throw new Error('Missing parameter bidders in moduleConfig');
+  }
+
+  const adUnitBidders = reqBidsConfigObj.adUnits
+    .flatMap(({ bids }) => bids.map(({ bidder }) => bidder))
+    .filter((e, i, a) => a.indexOf(e) === i);
+  if (!isArray(adUnitBidders) || !adUnitBidders.length) {
+    throw new Error('Missing parameter bidders in bidRequestConfig');
+  }
+
+  const bidders = biddersTemp.filter(bidder => adUnitBidders.includes(bidder));
+  if (!bidders.length) {
+    throw new Error('No bidRequestConfig bidder found in moduleConfig bidders');
+  }
+
+  return { customerId, timeout, bidders };
+}
+
+/**
+ * Gets the URL of Profile Api from which targeting data will be fetched
+ * @param {Object} config
+ * @param {string} config.customerId
+ * @returns {string} URL to access 1plusX Profile API
+ */
+const getPapiUrl = ({ customerId }) => {
+  // https://[yourClientId].profiles.tagger.opecloud.com/[VERSION]/targeting?url=
+  const currentUrl = encodeURIComponent(window.location.href);
+  const papiUrl = `https://${customerId}.profiles.tagger.opecloud.com/${PAPI_VERSION}/targeting?url=${currentUrl}`;
+  return papiUrl;
+}
+
+/**
+ * Fetches targeting data. It contains the audience segments & the contextual topics
+ * @param {string} papiUrl URL of profile API
+ * @returns {Promise} Promise object resolving with data fetched from Profile API
+ */
+const getTargetingDataFromPapi = (papiUrl) => {
+  return new Promise((resolve, reject) => {
+    const requestOptions = {
+      customHeaders: {
+        'Accept': 'application/json'
+      }
+    }
+    const callbacks = {
+      success(responseText, response) {
+        resolve(JSON.parse(response.response));
+      },
+      error(error) {
+        reject(error);
+      }
+    };
+    ajax(papiUrl, callbacks, null, requestOptions)
+  })
+}
+
+/**
+ * Prepares the update for the ORTB2 object
+ * @param {Object} targetingData Targeting data fetched from Profile API
+ * @param {string[]} segments Represents the audience segments of the user
+ * @param {string[]} topics Represents the topics of the page
+ * @returns {Object} Object describing the updates to make on bidder configs
+ */
+export const buildOrtb2Updates = ({ segments = [], topics = [] }, bidder) => {
+  // Currently appnexus bidAdapter doesn't support topics in `site.content.data.segment`
+  // Therefore, writing them in `site.keywords` until it's supported
+  // Other bidAdapters do fine with `site.content.data.segment`
+  const writeToLegacySiteKeywords = LEGACY_SITE_KEYWORDS_BIDDERS.includes(bidder);
+  if (writeToLegacySiteKeywords) {
+    const site = {
+      keywords: topics.join(',')
+    };
+    return { site };
+  }
+
+  const userData = {
+    name: ORTB2_NAME,
+    segment: segments.map((segmentId) => ({ id: segmentId }))
+  };
+  const siteContentData = {
+    name: ORTB2_NAME,
+    segment: topics.map((topicId) => ({ id: topicId })),
+    ext: { segtax: segtaxes.CONTENT }
+  }
+  return { userData, siteContentData };
+}
+
+/**
+ * Merges the targeting data with the existing config for bidder and updates
+ * @param {string} bidder Bidder for which to set config
+ * @param {Object} ortb2Updates Updates to be applied to bidder config
+ * @param {Object} bidderConfigs All current bidder configs
+ * @returns {Object} Updated bidder config
+ */
+export const updateBidderConfig = (bidder, ortb2Updates, bidderConfigs) => {
+  const { site, siteContentData, userData } = ortb2Updates;
+  const bidderConfigCopy = mergeDeep({}, bidderConfigs[bidder]);
+
+  if (site) {
+    // Legacy : cf. comment on buildOrtb2Updates first lines
+    const currentSite = deepAccess(bidderConfigCopy, 'ortb2.site')
+    const updatedSite = mergeDeep(currentSite, site);
+    deepSetValue(bidderConfigCopy, 'ortb2.site', updatedSite);
+  }
+
+  if (siteContentData) {
+    const siteDataPath = 'ortb2.site.content.data';
+    const currentSiteContentData = deepAccess(bidderConfigCopy, siteDataPath) || [];
+    const updatedSiteContentData = [
+      ...currentSiteContentData.filter(({ name }) => name != siteContentData.name),
+      siteContentData
+    ];
+    deepSetValue(bidderConfigCopy, siteDataPath, updatedSiteContentData);
+  }
+
+  if (userData) {
+    const userDataPath = 'ortb2.user.data';
+    const currentUserData = deepAccess(bidderConfigCopy, userDataPath) || [];
+    const updatedUserData = [
+      ...currentUserData.filter(({ name }) => name != userData.name),
+      userData
+    ];
+    deepSetValue(bidderConfigCopy, userDataPath, updatedUserData);
+  }
+
+  return bidderConfigCopy;
+};
+
+const setAppnexusAudiences = (audiences) => {
+  config.setConfig({
+    appnexusAuctionKeywords: {
+      '1plusX': audiences,
+    },
+  });
+}
+
+/**
+ * Updates bidder configs with the targeting data retreived from Profile API
+ * @param {Object} papiResponse Response from Profile API
+ * @param {Object} config Module configuration
+ * @param {string[]} config.bidders Bidders specified in module's configuration
+ */
+export const setTargetingDataToConfig = (papiResponse, { bidders }) => {
+  const bidderConfigs = config.getBidderConfig();
+  const { s: segments, t: topics } = papiResponse;
+
+  for (const bidder of bidders) {
+    const ortb2Updates = buildOrtb2Updates({ segments, topics }, bidder);
+    const updatedBidderConfig = updateBidderConfig(bidder, ortb2Updates, bidderConfigs);
+    if (updatedBidderConfig) {
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: updatedBidderConfig
+      });
+    }
+    if (bidder === 'appnexus') {
+      // Do the legacy stuff for appnexus with segments
+      setAppnexusAudiences(segments);
+    }
+  }
+}
+
+// Functions exported in submodule object
+/**
+ * Init
+ * @param {Object} config Module configuration
+ * @param {boolean} userConsent
+ * @returns true
+ */
+const init = (config, userConsent) => {
+  return true;
+}
+
+/**
+ *
+ * @param {Object} reqBidsConfigObj Bid request configuration object
+ * @param {Function} callback Called on completion
+ * @param {Object} moduleConfig Configuration for 1plusX RTD module
+ * @param {boolean} userConsent
+ */
+const getBidRequestData = (reqBidsConfigObj, callback, moduleConfig, userConsent) => {
+  try {
+    // Get the required config
+    const { customerId, bidders } = extractConfig(moduleConfig, reqBidsConfigObj);
+    // Get PAPI URL
+    const papiUrl = getPapiUrl({ customerId })
+    // Call PAPI
+    getTargetingDataFromPapi(papiUrl)
+      .then((papiResponse) => {
+        logMessage(LOG_PREFIX, 'Get targeting data request successful');
+        setTargetingDataToConfig(papiResponse, { bidders });
+        callback();
+      })
+      .catch((error) => {
+        throw error;
+      })
+  } catch (error) {
+    logError(LOG_PREFIX, error);
+    callback();
+  }
+}
+
+// The RTD submodule object to be exported
+export const onePlusXSubmodule = {
+  name: MODULE_NAME,
+  init,
+  getBidRequestData
+}
+
+// Register the onePlusXSubmodule as submodule of realTimeData
+submodule(REAL_TIME_MODULE, onePlusXSubmodule);
diff --git a/modules/1plusXRtdProvider.md b/modules/1plusXRtdProvider.md
new file mode 100644
index 00000000000..75ad3b966d1
--- /dev/null
+++ b/modules/1plusXRtdProvider.md
@@ -0,0 +1,67 @@
+# 1plusX Real-time Data Submodule
+
+## Overview
+
+    Module Name: 1plusX Rtd Provider
+    Module Type: Rtd Provider
+    Maintainer: dc-team-1px@triplelift.com
+
+## Description
+
+RTD provider for 1plusX. 
+Enriches the bidding object with Audience & Targeting data
+Contact dc-team-1px@triplelift.com for information.
+
+## Usage
+
+### Build
+```
+gulp build --modules="rtdModule,1plusXRtdProvider,appnexusBidAdapter,..."  
+```
+
+> Note that the global RTD module, `rtdModule`, is a prerequisite of the 1plusX RTD module.
+
+### Configuration
+
+Use `setConfig` to instruct Prebid.js to initilize the 1plusX RTD module, as specified below. 
+
+This module is configured as part of the `realTimeData.dataProviders`
+
+```javascript
+var TIMEOUT = 1000;
+pbjs.setConfig({
+    realTimeData: {
+        auctionDelay: TIMEOUT,
+        dataProviders: [{
+            name: '1plusX',
+            waitForIt: true,
+            params: {
+                customerId: 'acme',
+                bidders: ['appnexus', 'rubicon'],
+                timeout: TIMEOUT
+            }
+        }]
+    }
+});
+```
+
+### Parameters 
+
+| Name              | Type          | Description                                                      | Notes                                                    |
+| :---------------- | :------------ | :--------------------------------------------------------------- |:-------------------------------------------------------- |
+| name              | String        | Real time data module name                                       | Always '1plusX'                                          |
+| waitForIt         | Boolean       | Should be `true` if there's an `auctionDelay` defined (optional) | `false`                                                  |
+| params            | Object        |                                                                  |                                                          |
+| params.customerId | String        | Your 1plusX customer id                                          |                                                          |
+| params.bidders    | Array<string> | List of bidders for which you would like data to be set          |                                                          |
+| params.timeout    | Integer       | timeout (ms)                                                     | 1000ms                                                   |
+
+## Testing 
+
+To view an example of how the 1plusX RTD module works :
+
+`gulp serve --modules=rtdModule,1plusXRtdProvider,appnexusBidAdapter,rubiconBidAdapter`
+
+and then point your browser at:
+
+`http://localhost:9999/integrationExamples/gpt/1plusXRtdProvider_example.html`
diff --git a/test/spec/modules/1plusXRtdProvider_spec.js b/test/spec/modules/1plusXRtdProvider_spec.js
new file mode 100644
index 00000000000..9682e4b62f8
--- /dev/null
+++ b/test/spec/modules/1plusXRtdProvider_spec.js
@@ -0,0 +1,430 @@
+import { config } from 'src/config';
+import {
+  onePlusXSubmodule,
+  segtaxes,
+  extractConfig,
+  buildOrtb2Updates,
+  updateBidderConfig,
+  setTargetingDataToConfig
+} from 'modules/1plusXRtdProvider';
+
+describe('1plusXRtdProvider', () => {
+  // Fake server config
+  let fakeServer;
+  const fakeResponseHeaders = {
+    'Content-Type': 'application/json',
+    'Access-Control-Allow-Origin': '*'
+  };
+  const fakeResponse = {
+    s: ['segment1', 'segment2', 'segment3'],
+    t: ['targeting1', 'targeting2', 'targeting3']
+  };
+
+  // Bid request config
+  const reqBidsConfigObj = {
+    adUnits: [{
+      bids: [
+        { bidder: 'appnexus' }
+      ]
+    }]
+  };
+
+  // Bidder configs
+  const bidderConfigInitial = {
+    ortb2: {
+      user: { keywords: '' },
+      site: { ext: {} }
+    }
+  }
+  const bidderConfigInitialWith1plusXUserData = {
+    ortb2: {
+      user: {
+        data: [{ name: '1plusX.com', segment: [{ id: 'initial' }] }]
+      },
+      site: { content: { data: [] } }
+    }
+  }
+  const bidderConfigInitialWithUserData = {
+    ortb2: {
+      user: {
+        data: [{ name: 'hello.world', segment: [{ id: 'initial' }] }]
+      },
+      site: { content: { data: [] } }
+    }
+  }
+  const bidderConfigInitialWith1plusXSiteContent = {
+    ortb2: {
+      user: { data: [] },
+      site: {
+        content: {
+          data: [{
+            name: '1plusX.com', segment: [{ id: 'initial' }], ext: { segtax: 525 }
+          }]
+        }
+      },
+    }
+  }
+  const bidderConfigInitialWithSiteContent = {
+    ortb2: {
+      user: { data: [] },
+      site: {
+        content: {
+          data: [{ name: 'hello.world', segment: [{ id: 'initial' }] }]
+        }
+      },
+    }
+  }
+  // Util functions
+  const randomBidder = (len = 5) => Math.random().toString(36).replace(/[^a-z]+/g, '').substring(0, len);
+
+  before(() => {
+    config.resetConfig();
+  })
+
+  after(() => { })
+
+  beforeEach(() => {
+    fakeServer = sinon.createFakeServer();
+    fakeServer.respondWith('GET', '*', [200, fakeResponseHeaders, JSON.stringify(fakeResponse)]);
+    fakeServer.respondImmediately = true;
+    fakeServer.autoRespond = true;
+  })
+
+  describe('onePlusXSubmodule', () => {
+    it('init is successfull', () => {
+      const initResult = onePlusXSubmodule.init();
+      expect(initResult).to.be.true;
+    })
+
+    it('callback is called after getBidRequestData', () => {
+      // Nice case; everything runs as expected
+      {
+        const callbackSpy = sinon.spy();
+        const config = { params: { customerId: 'test', bidders: ['appnexus'] } };
+        onePlusXSubmodule.getBidRequestData(reqBidsConfigObj, callbackSpy, config);
+        setTimeout(() => {
+          expect(callbackSpy.calledOnce).to.be.true
+        }, 100)
+      }
+      // No customer id in config => error but still callback called
+      {
+        const callbackSpy = sinon.spy();
+        const config = {}
+        onePlusXSubmodule.getBidRequestData(reqBidsConfigObj, callbackSpy, config);
+        setTimeout(() => {
+          expect(callbackSpy.calledOnce).to.be.true
+        }, 100);
+      }
+      // No bidders in config => error but still callback called
+      {
+        const callbackSpy = sinon.spy();
+        const config = { customerId: 'test' }
+        onePlusXSubmodule.getBidRequestData(reqBidsConfigObj, callbackSpy, config);
+        setTimeout(() => {
+          expect(callbackSpy.calledOnce).to.be.true
+        }, 100);
+      }
+    })
+  })
+
+  describe('extractConfig', () => {
+    const customerId = 'test';
+    const timeout = 1000;
+    const bidders = ['appnexus'];
+
+    it('Throws an error if no customerId is specified', () => {
+      const moduleConfig = { params: { timeout, bidders } };
+      expect(() => extractConfig(moduleConfig, reqBidsConfigObj)).to.throw();
+    })
+    it('Throws an error if no bidder is specified', () => {
+      const moduleConfig = { params: { customerId, timeout } };
+      expect(() => extractConfig(moduleConfig, reqBidsConfigObj)).to.throw();
+    })
+    it("Throws an error if there's no bidder in reqBidsConfigObj", () => {
+      const moduleConfig = { params: { customerId, timeout, bidders } };
+      const reqBidsConfigEmpty = { adUnits: [{ bids: [] }] };
+      expect(() => extractConfig(moduleConfig, reqBidsConfigEmpty)).to.throw();
+    })
+    it('Returns an object containing the parameters specified', () => {
+      const moduleConfig = { params: { customerId, timeout, bidders } };
+      const expectedKeys = ['customerId', 'timeout', 'bidders']
+      const extractedConfig = extractConfig(moduleConfig, reqBidsConfigObj);
+      expect(extractedConfig).to.be.an('object').and.to.have.all.keys(expectedKeys);
+      expect(extractedConfig.customerId).to.equal(customerId);
+      expect(extractedConfig.timeout).to.equal(timeout);
+      expect(extractedConfig.bidders).to.deep.equal(bidders);
+    })
+    /* 1plusX RTD module may only use bidders that are both specified in :
+        - the bid request configuration
+        - AND in the 1plusX RTD module configuration
+      Below 2 tests are enforcing those rules
+    */
+    it('Returns the intersection of bidders found in bid request config & module config', () => {
+      const bidders = ['appnexus', 'rubicon'];
+      const moduleConfig = { params: { customerId, timeout, bidders } };
+      const { bidders: extractedBidders } = extractConfig(moduleConfig, reqBidsConfigObj);
+      expect(extractedBidders).to.be.an('array').and.to.have.length(1); 7
+      expect(extractedBidders[0]).to.equal('appnexus');
+    })
+    it('Throws an error if no bidder can be used by the module', () => {
+      const bidders = ['rubicon'];
+      const moduleConfig = { params: { customerId, timeout, bidders } };
+      expect(() => extractConfig(moduleConfig, reqBidsConfigObj)).to.throw();
+    })
+  })
+
+  describe('buildOrtb2Updates', () => {
+    it('fills site.content.data & user.data in the ortb2 config', () => {
+      const rtdData = { segments: fakeResponse.s, topics: fakeResponse.t };
+      const ortb2Updates = buildOrtb2Updates(rtdData, randomBidder());
+
+      const expectedOutput = {
+        siteContentData: {
+          name: '1plusX.com',
+          segment: rtdData.topics.map((topicId) => ({ id: topicId })),
+          ext: { segtax: segtaxes.CONTENT }
+        },
+        userData: {
+          name: '1plusX.com',
+          segment: rtdData.segments.map((segmentId) => ({ id: segmentId }))
+        }
+      }
+      expect([ortb2Updates]).to.deep.include.members([expectedOutput]);
+    });
+    it('fills site.keywords in the ortb2 config (appnexus specific)', () => {
+      const rtdData = { segments: fakeResponse.s, topics: fakeResponse.t };
+      const ortb2Updates = buildOrtb2Updates(rtdData, 'appnexus');
+
+      const expectedOutput = {
+        site: {
+          keywords: rtdData.topics.join(','),
+        }
+      }
+      expect([ortb2Updates]).to.deep.include.members([expectedOutput]);
+    });
+
+    it('defaults to empty array if no segment is given', () => {
+      const rtdData = { topics: fakeResponse.t };
+      const ortb2Updates = buildOrtb2Updates(rtdData, randomBidder());
+
+      const expectedOutput = {
+        siteContentData: {
+          name: '1plusX.com',
+          segment: rtdData.topics.map((topicId) => ({ id: topicId })),
+          ext: { segtax: segtaxes.CONTENT }
+        },
+        userData: {
+          name: '1plusX.com',
+          segment: []
+        }
+      }
+      expect(ortb2Updates).to.deep.include(expectedOutput);
+    })
+
+    it('defaults to empty array if no topic is given', () => {
+      const rtdData = { segments: fakeResponse.s };
+      const ortb2Updates = buildOrtb2Updates(rtdData, randomBidder());
+
+      const expectedOutput = {
+        siteContentData: {
+          name: '1plusX.com',
+          segment: [],
+          ext: { segtax: segtaxes.CONTENT }
+        },
+        userData: {
+          name: '1plusX.com',
+          segment: rtdData.segments.map((segmentId) => ({ id: segmentId }))
+        }
+      }
+      expect(ortb2Updates).to.deep.include(expectedOutput);
+    })
+    it('defaults to empty string if no topic is given (appnexus specific)', () => {
+      const rtdData = { segments: fakeResponse.s };
+      const ortb2Updates = buildOrtb2Updates(rtdData, 'appnexus');
+
+      const expectedOutput = {
+        site: {
+          keywords: '',
+        }
+      }
+      expect(ortb2Updates).to.deep.include(expectedOutput);
+    })
+  })
+
+  describe('updateBidderConfig', () => {
+    const ortb2UpdatesAppNexus = {
+      site: {
+        keywords: fakeResponse.t.join(','),
+      },
+      userData: {
+        name: '1plusX.com',
+        segment: fakeResponse.s.map((segmentId) => ({ id: segmentId }))
+      }
+    }
+    const ortb2Updates = {
+      siteContentData: {
+        name: '1plusX.com',
+        segment: fakeResponse.t.map((topicId) => ({ id: topicId })),
+        ext: { segtax: segtaxes.CONTENT }
+      },
+      userData: {
+        name: '1plusX.com',
+        segment: fakeResponse.s.map((segmentId) => ({ id: segmentId }))
+      }
+    }
+
+    it('merges fetched data in bidderConfig for configured bidders', () => {
+      const bidder = randomBidder();
+      // Set initial config
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: bidderConfigInitial
+      });
+      // Call submodule's setBidderConfig
+      const newBidderConfig = updateBidderConfig(bidder, ortb2Updates, config.getBidderConfig());
+      // Check that the targeting data has been set in the config
+      expect(newBidderConfig).not.to.be.null;
+      expect(newBidderConfig.ortb2.site.content.data).to.deep.include(ortb2Updates.siteContentData);
+      expect(newBidderConfig.ortb2.user.data).to.deep.include(ortb2Updates.userData);
+      // Check that existing config didn't get erased
+      expect(newBidderConfig.ortb2.site).to.deep.include(bidderConfigInitial.ortb2.site);
+      expect(newBidderConfig.ortb2.user).to.deep.include(bidderConfigInitial.ortb2.user);
+    })
+
+    it('merges fetched data in bidderConfig for configured bidders (appnexus specific)', () => {
+      const bidder = 'appnexus';
+      // Set initial config
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: bidderConfigInitial
+      });
+      // Call submodule's setBidderConfig
+      const newBidderConfig = updateBidderConfig(bidder, ortb2UpdatesAppNexus, config.getBidderConfig());
+
+      // Check that the targeting data has been set in the config
+      expect(newBidderConfig).not.to.be.null;
+      expect(newBidderConfig.ortb2.site).to.deep.include(ortb2UpdatesAppNexus.site);
+      // Check that existing config didn't get erased
+      expect(newBidderConfig.ortb2.site).to.deep.include(bidderConfigInitial.ortb2.site);
+      expect(newBidderConfig.ortb2.user).to.deep.include(bidderConfigInitial.ortb2.user);
+    })
+
+    it('overwrites an existing 1plus.com entry in ortb2.user.data', () => {
+      const bidder = randomBidder();
+      // Set initial config
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: bidderConfigInitialWith1plusXUserData
+      });
+      // Save previous user.data entry
+      const previousUserData = bidderConfigInitialWith1plusXUserData.ortb2.user.data[0];
+      // Call submodule's setBidderConfig
+      const newBidderConfig = updateBidderConfig(bidder, ortb2Updates, config.getBidderConfig());
+      // Check that the targeting data has been set in the config
+      expect(newBidderConfig).not.to.be.null;
+      expect(newBidderConfig.ortb2.user.data).to.deep.include(ortb2Updates.userData);
+      expect(newBidderConfig.ortb2.user.data).not.to.include(previousUserData);
+    })
+    it("doesn't overwrite entries in ortb2.user.data that aren't 1plusx.com", () => {
+      const bidder = randomBidder();
+      // Set initial config
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: bidderConfigInitialWithUserData
+      });
+      // Save previous user.data entry
+      const previousUserData = bidderConfigInitialWithUserData.ortb2.user.data[0];
+      // Call submodule's setBidderConfig
+      const newBidderConfig = updateBidderConfig(bidder, ortb2Updates, config.getBidderConfig());
+      // Check that the targeting data has been set in the config
+      expect(newBidderConfig).not.to.be.null;
+      expect(newBidderConfig.ortb2.user.data).to.deep.include(ortb2Updates.userData);
+      expect(newBidderConfig.ortb2.user.data).to.deep.include(previousUserData);
+    })
+
+    it('overwrites an existing 1plus.com entry in ortb2.site.content.data', () => {
+      const bidder = randomBidder();
+      // Set initial config
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: bidderConfigInitialWith1plusXSiteContent
+      });
+      // Save previous user.data entry
+      const previousSiteContent = bidderConfigInitialWith1plusXSiteContent.ortb2.site.content.data[0];
+      // Call submodule's setBidderConfig
+      const newBidderConfig = updateBidderConfig(bidder, ortb2Updates, config.getBidderConfig());
+      // Check that the targeting data has been set in the config
+      expect(newBidderConfig).not.to.be.null;
+      expect(newBidderConfig.ortb2.site.content.data).to.deep.include(ortb2Updates.siteContentData);
+      expect(newBidderConfig.ortb2.site.content.data).not.to.include(previousSiteContent);
+    })
+    it("doesn't overwrite entries in ortb2.site.content.data that aren't 1plusx.com", () => {
+      const bidder = randomBidder();
+      // Set initial config
+      config.setBidderConfig({
+        bidders: [bidder],
+        config: bidderConfigInitialWithSiteContent
+      });
+      // Save previous user.data entry
+      const previousSiteContent = bidderConfigInitialWithSiteContent.ortb2.site.content.data[0];
+      // Call submodule's setBidderConfig
+      const newBidderConfig = updateBidderConfig(bidder, ortb2Updates, config.getBidderConfig());
+      // Check that the targeting data has been set in the config
+      expect(newBidderConfig).not.to.be.null;
+      expect(newBidderConfig.ortb2.site.content.data).to.deep.include(ortb2Updates.siteContentData);
+      expect(newBidderConfig.ortb2.site.content.data).to.deep.include(previousSiteContent);
+    })
+  })
+
+  describe('setTargetingDataToConfig', () => {
+    const expectedKeywords = fakeResponse.t.join(',');
+    const expectedSiteContentObj = {
+      data: [{
+        name: '1plusX.com',
+        segment: fakeResponse.t.map((topicId) => ({ id: topicId })),
+        ext: { segtax: segtaxes.CONTENT }
+      }]
+    }
+    const expectedUserObj = {
+      data: [{
+        name: '1plusX.com',
+        segment: fakeResponse.s.map((segmentId) => ({ id: segmentId }))
+      }]
+    }
+    const expectedOrtb2 = {
+      appnexus: {
+        site: { keywords: expectedKeywords }
+      },
+      rubicon: {
+        site: { content: expectedSiteContentObj },
+        user: expectedUserObj
+      }
+    }
+
+    it('sets the config for the selected bidders', () => {
+      const bidders = ['appnexus', 'rubicon'];
+      // setting initial config for those bidders
+      config.setBidderConfig({
+        bidders,
+        config: bidderConfigInitial
+      })
+      // call setTargetingDataToConfig
+      setTargetingDataToConfig(fakeResponse, { bidders });
+
+      // Check that the targeting data has been set in both configs
+      for (const bidder of bidders) {
+        const newConfig = config.getBidderConfig()[bidder];
+        // Check that we got what we expect
+        const expectedConfErr = (prop) => `New config for ${bidder} doesn't comply with expected at ${prop}`;
+        expect(newConfig.ortb2.site, expectedConfErr('site')).to.deep.include(expectedOrtb2[bidder].site);
+        if (expectedOrtb2[bidder].user) {
+          expect(newConfig.ortb2.user, expectedConfErr('user')).to.deep.include(expectedOrtb2[bidder].user);
+        }
+        // Check that existing config didn't get erased
+        const existingConfErr = (prop) => `Existing config for ${bidder} got unlawfully overwritten at ${prop}`;
+        expect(newConfig.ortb2.site, existingConfErr('site')).to.deep.include(bidderConfigInitial.ortb2.site);
+        expect(newConfig.ortb2.user, existingConfErr('user')).to.deep.include(bidderConfigInitial.ortb2.user);
+      }
+    })
+  })
+})

From 4e1ed0c527c0e9dfcf1ef2642349df7b9454c16e Mon Sep 17 00:00:00 2001
From: shahinrahbariasl <56240400+shahinrahbariasl@users.noreply.github.com>
Date: Thu, 14 Jul 2022 13:07:34 -0400
Subject: [PATCH 027/569] IX Bid Adapter: add inventory identifiers info to
 ixDiag (#8683)

Co-authored-by: shahin.rahbariasl <shahin.rahbariasl@indexexchange.com>
---
 modules/ixBidAdapter.js                | 43 +++++++++++++++++++++++++-
 test/spec/modules/ixBidAdapter_spec.js | 15 +++++++--
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index c22c0af7f4d..136cf6f25f0 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -244,6 +244,8 @@ function bidToVideoImp(bid) {
   }
 
   imp.video = videoParamRef ? deepClone(bid.params.video) : {};
+  // populate imp level transactionId
+  imp.ext.tid = deepAccess(bid, 'ortb2Imp.ext.tid');
 
   // copy all video properties to imp object
   for (const adUnitProperty in videoAdUnitRef) {
@@ -355,6 +357,9 @@ function bidToNativeImp(bid) {
     ver: '1.2'
   };
 
+  // populate imp level transactionId
+  imp.ext.tid = deepAccess(bid, 'ortb2Imp.ext.tid');
+
   _applyFloor(bid, imp, NATIVE);
 
   return imp;
@@ -1126,6 +1131,22 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
       }
     }
 
+    // add identifiers info to ixDiag
+    const pbaAdSlot = impressions[transactionIds[adUnitIndex]].pbadslot
+    const tagId = impressions[transactionIds[adUnitIndex]].tagId
+    const adUnitCode = impressions[transactionIds[adUnitIndex]].adUnitCode
+    const divId = impressions[transactionIds[adUnitIndex]].divId
+    if (pbaAdSlot || tagId || adUnitCode || divId) {
+      const clonedRObject = deepClone(r);
+      const requestSize = `${baseUrl}${parseQueryStringParameters({ ...payload, r: JSON.stringify(clonedRObject) })}`.length;
+      if (requestSize < MAX_REQUEST_SIZE) {
+        r.ext.ixdiag.pbadslot = pbaAdSlot;
+        r.ext.ixdiag.tagid = tagId;
+        r.ext.ixdiag.adunitcode = adUnitCode;
+        r.ext.ixdiag.divId = divId;
+      }
+    }
+
     const isLastAdUnit = adUnitIndex === transactionIds.length - 1;
 
     if (wasAdUnitImpressionsTrimmed || isLastAdUnit) {
@@ -1259,6 +1280,13 @@ function createNativeImps(validBidRequest, nativeImps) {
     nativeImps[validBidRequest.transactionId].ixImps = [];
     nativeImps[validBidRequest.transactionId].ixImps.push(imp);
     nativeImps[validBidRequest.transactionId].gpid = deepAccess(validBidRequest, 'ortb2Imp.ext.gpid')
+    nativeImps[validBidRequest.transactionId].pbadslot = deepAccess(validBidRequest, 'ortb2Imp.ext.data.pbadslot');
+    nativeImps[validBidRequest.transactionId].tagId = deepAccess(validBidRequest, 'params.tagId');
+
+    const adUnitCode = validBidRequest.adUnitCode;
+    const divId = document.getElementById(adUnitCode) ? adUnitCode : getGptSlotInfoForAdUnitCode(adUnitCode).divId;
+    nativeImps[validBidRequest.transactionId].adUnitCode = adUnitCode;
+    nativeImps[validBidRequest.transactionId].divId = divId;
   }
 }
 
@@ -1274,7 +1302,13 @@ function createVideoImps(validBidRequest, videoImps) {
     videoImps[validBidRequest.transactionId].ixImps = [];
     videoImps[validBidRequest.transactionId].ixImps.push(imp);
     videoImps[validBidRequest.transactionId].gpid = deepAccess(validBidRequest, 'ortb2Imp.ext.gpid');
-    videoImps[validBidRequest.transactionId].tid = deepAccess(validBidRequest, 'ortb2Imp.ext.tid');
+    videoImps[validBidRequest.transactionId].pbadslot = deepAccess(validBidRequest, 'ortb2Imp.ext.data.pbadslot');
+    videoImps[validBidRequest.transactionId].tagId = deepAccess(validBidRequest, 'params.tagId');
+
+    const adUnitCode = validBidRequest.adUnitCode;
+    const divId = document.getElementById(adUnitCode) ? adUnitCode : getGptSlotInfoForAdUnitCode(adUnitCode).divId;
+    videoImps[validBidRequest.transactionId].adUnitCode = adUnitCode;
+    videoImps[validBidRequest.transactionId].divId = divId;
   }
 }
 
@@ -1302,6 +1336,13 @@ function createBannerImps(validBidRequest, missingBannerSizes, bannerImps) {
   bannerImps[validBidRequest.transactionId].gpid = deepAccess(validBidRequest, 'ortb2Imp.ext.gpid');
   bannerImps[validBidRequest.transactionId].dfp_ad_unit_code = deepAccess(validBidRequest, 'ortb2Imp.ext.data.adserver.adslot');
   bannerImps[validBidRequest.transactionId].tid = deepAccess(validBidRequest, 'ortb2Imp.ext.tid');
+  bannerImps[validBidRequest.transactionId].pbadslot = deepAccess(validBidRequest, 'ortb2Imp.ext.data.pbadslot');
+  bannerImps[validBidRequest.transactionId].tagId = deepAccess(validBidRequest, 'params.tagId');
+
+  const adUnitCode = validBidRequest.adUnitCode;
+  const divId = document.getElementById(adUnitCode) ? adUnitCode : getGptSlotInfoForAdUnitCode(adUnitCode).divId;
+  bannerImps[validBidRequest.transactionId].adUnitCode = adUnitCode;
+  bannerImps[validBidRequest.transactionId].divId = divId;
 
   // Create IX imps from params.size
   if (bannerSizeDefined) {
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index 233fac6f426..a25e6b1c6a0 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -290,6 +290,7 @@ describe('IndexexchangeAdapter', function () {
     {
       bidder: 'ix',
       params: {
+        tagId: '123',
         siteId: '123',
         size: [300, 250],
       },
@@ -304,7 +305,10 @@ describe('IndexexchangeAdapter', function () {
       },
       ortb2Imp: {
         ext: {
-          tid: '173f49a8-7549-4218-a23c-e7ba59b47230'
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230',
+          data: {
+            pbadslot: 'div-gpt-ad-1460505748562-0'
+          }
         }
       },
       adUnitCode: 'div-gpt-ad-1460505748562-0',
@@ -320,6 +324,7 @@ describe('IndexexchangeAdapter', function () {
     {
       bidder: 'ix',
       params: {
+        tagId: '123',
         siteId: '456',
         video: {
           skippable: false,
@@ -344,7 +349,10 @@ describe('IndexexchangeAdapter', function () {
       },
       ortb2Imp: {
         ext: {
-          tid: '173f49a8-7549-4218-a23c-e7ba59b47230'
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230',
+          data: {
+            pbadslot: 'div-gpt-ad-1460505748562-0'
+          }
         }
       },
       adUnitCode: 'div-gpt-ad-1460505748562-0',
@@ -2614,6 +2622,9 @@ describe('IndexexchangeAdapter', function () {
         expect(diagObj.allu).to.equal(2);
         expect(diagObj.version).to.equal('$prebid.version$');
         expect(diagObj.url).to.equal('http://localhost:9876/context.html')
+        expect(diagObj.pbadslot).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].ortb2Imp.ext.data.pbadslot)
+        expect(diagObj.tagid).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.tagId)
+        expect(diagObj.adunitcode).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].adUnitCode)
       });
     });
   });

From d73091c53673c243f86006299c5f8035436f8d81 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.dseao@gmail.com>
Date: Fri, 15 Jul 2022 19:55:08 +0200
Subject: [PATCH 028/569] Impactify Bid Adapter: Remove use of local storage
 debugging flag (#8693)

* Remove use of local storage

As requested, we remove the use of local storage.
https://github.com/prebid/Prebid.js/issues/8689

* Update impactifyBidAdapter.js
---
 modules/impactifyBidAdapter.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/impactifyBidAdapter.js b/modules/impactifyBidAdapter.js
index a4010772db0..bb3ad63085c 100644
--- a/modules/impactifyBidAdapter.js
+++ b/modules/impactifyBidAdapter.js
@@ -37,9 +37,13 @@ const createOpenRtbRequest = (validBidRequests, bidderRequest) => {
     source: {tid: bidderRequest.auctionId}
   };
 
+  // Get the url parameters
+  const queryString = window.location.search;
+  const urlParams = new URLSearchParams(queryString);
+  const checkPrebid = urlParams.get('_checkPrebid');
   // Force impactify debugging parameter
-  if (window.localStorage.getItem('_im_db_bidder') != null) {
-    request.test = Number(window.localStorage.getItem('_im_db_bidder'));
+  if (checkPrebid != null) {
+    request.test = Number(checkPrebid);
   }
 
   // Set Schain in request

From cd91429609c28eff4dec0c4037aa2fb19bad281a Mon Sep 17 00:00:00 2001
From: sag-jonhil <78849369+sag-jonhil@users.noreply.github.com>
Date: Mon, 18 Jul 2022 14:29:55 +0200
Subject: [PATCH 029/569] Seeding Alliance Bid Adapter: Add GVLID (#8697)

* add seedingAlliance Adapter

* add two native default params

* ...

* ...

* seedingAlliance Adapter: add two more default native params

* updating seedingAlliance Adapter

* seedingAlliance Adapter

* quickfix no bids + net revenue

* bugfix replace auction price

* change URL  and add versioning

* add vendorId to seedingAllianceAdapter

Co-authored-by: SeedingAllianceTech <55976067+SeedingAllianceTech@users.noreply.github.com>
Co-authored-by: Hendrick Musche <107099114+sag-henmus@users.noreply.github.com>
Co-authored-by: Hendrick Musche <musche@seeding-alliance.de>
---
 modules/seedingAllianceBidAdapter.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/seedingAllianceBidAdapter.js b/modules/seedingAllianceBidAdapter.js
index 98b27de678c..1b178b59728 100755
--- a/modules/seedingAllianceBidAdapter.js
+++ b/modules/seedingAllianceBidAdapter.js
@@ -7,6 +7,7 @@ import { _map, deepSetValue, isEmpty, deepAccess } from '../src/utils.js';
 import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'seedingAlliance';
+const GVL_ID = 371;
 const DEFAULT_CUR = 'EUR';
 const ENDPOINT_URL = 'https://b.nativendo.de/cds/rtb/bid?format=openrtb2.5&ssp=pb';
 
@@ -52,6 +53,8 @@ const NATIVE_PARAMS = {
 export const spec = {
   code: BIDDER_CODE,
 
+  gvlid: GVL_ID,
+
   supportedMediaTypes: [NATIVE],
 
   isBidRequestValid: function(bid) {

From 00436fb5bd8e52a6969a3068b88cdeb0c17b7b3c Mon Sep 17 00:00:00 2001
From: jxdeveloper1 <71084096+jxdeveloper1@users.noreply.github.com>
Date: Mon, 18 Jul 2022 20:40:37 +0800
Subject: [PATCH 030/569] Jixie Bid Adapter: change cookie ls names (#8695)

* Adapter does not seem capable of supporting advertiserDomains #6650
added response comment and some trivial code.

* removed a blank line at the end of file
added a space behind the // in comments

* in response to comment from reviewer. add the aspect of advertiserdomain in unit tests

* added the code to get the keywords from the meta tags if available.

* changed cookie ls names
---
 modules/jixieBidAdapter.js                | 20 ++++++++++----------
 test/spec/modules/jixieBidAdapter_spec.js | 16 ++++++++--------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/jixieBidAdapter.js b/modules/jixieBidAdapter.js
index 2de2de6b481..f6f58883990 100644
--- a/modules/jixieBidAdapter.js
+++ b/modules/jixieBidAdapter.js
@@ -28,14 +28,14 @@ function setIds_(clientId, sessionId) {
     let expC = (new Date(new Date().setFullYear(new Date().getFullYear() + 1))).toUTCString();
     let expS = (new Date(new Date().setMinutes(new Date().getMinutes() + sidTTLMins_))).toUTCString();
 
-    storage.setCookie('_jx', clientId, expC, 'None', null);
-    storage.setCookie('_jx', clientId, expC, 'None', dd);
+    storage.setCookie('_jxx', clientId, expC, 'None', null);
+    storage.setCookie('_jxx', clientId, expC, 'None', dd);
 
-    storage.setCookie('_jxs', sessionId, expS, 'None', null);
-    storage.setCookie('_jxs', sessionId, expS, 'None', dd);
+    storage.setCookie('_jxxs', sessionId, expS, 'None', null);
+    storage.setCookie('_jxxs', sessionId, expS, 'None', dd);
 
-    storage.setDataInLocalStorage('_jx', clientId);
-    storage.setDataInLocalStorage('_jxs', sessionId);
+    storage.setDataInLocalStorage('_jxx', clientId);
+    storage.setDataInLocalStorage('_jxxs', sessionId);
   } catch (error) {}
 }
 
@@ -47,14 +47,14 @@ function fetchIds_() {
     session_id_ls: ''
   };
   try {
-    let tmp = storage.getCookie('_jx');
+    let tmp = storage.getCookie('_jxx');
     if (tmp) ret.client_id_c = tmp;
-    tmp = storage.getCookie('_jxs');
+    tmp = storage.getCookie('_jxxs');
     if (tmp) ret.session_id_c = tmp;
 
-    tmp = storage.getDataFromLocalStorage('_jx');
+    tmp = storage.getDataFromLocalStorage('_jxx');
     if (tmp) ret.client_id_ls = tmp;
-    tmp = storage.getDataFromLocalStorage('_jxs');
+    tmp = storage.getDataFromLocalStorage('_jxxs');
     if (tmp) ret.session_id_ls = tmp;
   } catch (error) {}
   return ret;
diff --git a/test/spec/modules/jixieBidAdapter_spec.js b/test/spec/modules/jixieBidAdapter_spec.js
index bc44e594864..0c999f1cd51 100644
--- a/test/spec/modules/jixieBidAdapter_spec.js
+++ b/test/spec/modules/jixieBidAdapter_spec.js
@@ -199,16 +199,16 @@ describe('jixie Adapter', function () {
       let getCookieStub = sinon.stub(storage, 'getCookie');
       let getLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
       getCookieStub
-        .withArgs('_jx')
+        .withArgs('_jxx')
         .returns(clientIdTest1_);
       getCookieStub
-        .withArgs('_jxs')
+        .withArgs('_jxxs')
         .returns(sessionIdTest1_);
       getLocalStorageStub
-        .withArgs('_jx')
+        .withArgs('_jxx')
         .returns(clientIdTest1_);
       getLocalStorageStub
-        .withArgs('_jxs')
+        .withArgs('_jxxs')
         .returns(sessionIdTest1_
         );
       let miscDimsStub = sinon.stub(jixieaux, 'getMiscDims');
@@ -528,10 +528,10 @@ describe('jixie Adapter', function () {
       let setCookieSpy = sinon.spy(storage, 'setCookie');
       let setLocalStorageSpy = sinon.spy(storage, 'setDataInLocalStorage');
       const result = spec.interpretResponse({body: responseBody_}, requestObj_)
-      expect(setLocalStorageSpy.calledWith('_jx', '43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
-      expect(setLocalStorageSpy.calledWith('_jxs', '1600057934-43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
-      expect(setCookieSpy.calledWith('_jxs', '1600057934-43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
-      expect(setCookieSpy.calledWith('_jx', '43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
+      expect(setLocalStorageSpy.calledWith('_jxx', '43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
+      expect(setLocalStorageSpy.calledWith('_jxxs', '1600057934-43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
+      expect(setCookieSpy.calledWith('_jxxs', '1600057934-43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
+      expect(setCookieSpy.calledWith('_jxx', '43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
 
       // video ad with vastUrl returned by adserver
       expect(result[0].requestId).to.equal('62847e4c696edcb')

From 3fd47e278af345876640bcc26225092f67f3787f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ven=C3=A2ncio?=
 <45434454+jvnnc@users.noreply.github.com>
Date: Mon, 18 Jul 2022 13:21:10 -0300
Subject: [PATCH 031/569] removed localstorage bypass. (#8702)

Co-authored-by: Jose <jose.silva@navegg.com>
---
 modules/naveggIdSystem.js | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/modules/naveggIdSystem.js b/modules/naveggIdSystem.js
index d7f5f712252..a292b42f144 100644
--- a/modules/naveggIdSystem.js
+++ b/modules/naveggIdSystem.js
@@ -34,17 +34,6 @@ function readnavIDFromCookie() {
   return storage.cookiesAreEnabled ? (storage.findSimilarCookies('nav') ? storage.findSimilarCookies('nav')[0] : null) : null;
 }
 
-function readnvgnavFromLocalStorage() {
-  var i;
-  const query = /[nvga]{3}\d+/;
-  for (i in window.localStorage) {
-    if (i.match(query) || (!query && typeof i === 'string')) {
-      const naveggId = storage.getDataFromLocalStorage(i.match(query).input).split('|')[0]
-      return naveggId.split('_')[0];
-    }
-  }
-}
-
 /** @type {Submodule} */
 export const naveggIdSubmodule = {
   /**
@@ -73,7 +62,7 @@ export const naveggIdSubmodule = {
   getId() {
     let naveggIdStringFromLocalStorage = null;
     if (storage.localStorageIsEnabled) {
-      naveggIdStringFromLocalStorage = readnaveggIdFromLocalStorage() || readnvgnavFromLocalStorage();
+      naveggIdStringFromLocalStorage = readnaveggIdFromLocalStorage();
     }
 
     const naveggIdString = naveggIdStringFromLocalStorage || readnaveggIDFromCookie() || readoldnaveggIDFromCookie() || readnvgIDFromCookie() || readnavIDFromCookie();

From a51ee4a51a92331f4335695b73cf327e156eba1b Mon Sep 17 00:00:00 2001
From: rimaburder-index <55195208+rimaburder-index@users.noreply.github.com>
Date: Mon, 18 Jul 2022 12:31:29 -0400
Subject: [PATCH 032/569] Updated TTL for banner and video (#8704)

---
 modules/ixBidAdapter.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/ixBidAdapter.md b/modules/ixBidAdapter.md
index 54bbf9ade40..790e895bedf 100644
--- a/modules/ixBidAdapter.md
+++ b/modules/ixBidAdapter.md
@@ -502,11 +502,8 @@ to `'ix'` across all ad units that bids are being requested for does not exceed
 
 ### Time-To-Live (TTL)
 
-Banner bids from IX have a TTL of 300 seconds while video bids have a TTL of 1 hour, after which time they become
-invalid.
-
-If an invalid bid wins, and its associated ad is rendered, it will not count
-towards total impressions on IX's side.
+Banner bids from Index have a TTL of 600 seconds while video bids have a TTL of three hours, after which time they become invalid.
+**Note:** Index supports the `bid.exp` attribute in the bid response which allows our adapter to specify the maximum number of seconds allowed between the auction and billing notice. In the absence of the `bid.exp` attribute, the TTL provided above applies.
 
 FAQs
 ====

From fff550ca2b0dd0cf0c1fdd0dfce7c35667dc42a9 Mon Sep 17 00:00:00 2001
From: Jason Piros <jasonpiros@gmail.com>
Date: Mon, 18 Jul 2022 10:21:34 -0700
Subject: [PATCH 033/569] consumableBidAdapter - add schain and coppa support
 (#8703)

---
 modules/consumableBidAdapter.js               |  9 ++++
 .../spec/modules/consumableBidAdapter_spec.js | 48 ++++++++++++++++++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/modules/consumableBidAdapter.js b/modules/consumableBidAdapter.js
index 5c34fbe8c64..9a5f5f4675b 100644
--- a/modules/consumableBidAdapter.js
+++ b/modules/consumableBidAdapter.js
@@ -1,4 +1,5 @@
 import { logWarn, createTrackPixelHtml, deepAccess, isArray, deepSetValue } from '../src/utils.js';
+import {config} from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'consumable';
@@ -66,6 +67,14 @@ export const spec = {
       data.ccpa = bidderRequest.uspConsent;
     }
 
+    if (bidderRequest && bidderRequest.schain) {
+      data.schain = bidderRequest.schain;
+    }
+
+    if (config.getConfig('coppa')) {
+      data.coppa = true;
+    }
+
     validBidRequests.map(bid => {
       const sizes = (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) || bid.sizes || [];
       const placement = Object.assign({
diff --git a/test/spec/modules/consumableBidAdapter_spec.js b/test/spec/modules/consumableBidAdapter_spec.js
index 23851c0da40..4e860cb771d 100644
--- a/test/spec/modules/consumableBidAdapter_spec.js
+++ b/test/spec/modules/consumableBidAdapter_spec.js
@@ -33,6 +33,22 @@ const BIDDER_REQUEST_1 = {
       transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
     }
   ],
+  schain: {
+    'ver': '1.0',
+    'complete': 1,
+    'nodes': [
+      {
+        'asi': 'indirectseller.com',
+        'sid': '00001',
+        'hp': 1
+      },
+      {
+        'asi': 'indirectseller-2.com',
+        'sid': '00002',
+        'hp': 2
+      },
+    ]
+  },
   gdprConsent: {
     consentString: 'consent-test',
     gdprApplies: false
@@ -335,7 +351,37 @@ describe('Consumable BidAdapter', function () {
       let request = spec.buildRequests(BIDDER_REQUEST_1.bidRequest, BIDDER_REQUEST_1);
 
       expect(request.bidderRequest).to.equal(BIDDER_REQUEST_1);
-    })
+    });
+
+    it('should contain schain if it exists in the bidRequest', function () {
+      let request = spec.buildRequests(BIDDER_REQUEST_1.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+
+      expect(data.schain).to.deep.equal(BIDDER_REQUEST_1.schain)
+    });
+
+    it('should not contain schain if it does not exist in the bidRequest', function () {
+      let request = spec.buildRequests(BIDDER_REQUEST_2.bidRequest, BIDDER_REQUEST_2);
+      let data = JSON.parse(request.data);
+
+      expect(data.schain).to.be.undefined;
+    });
+
+    it('should contain coppa if configured', function () {
+      config.setConfig({ coppa: true });
+      let request = spec.buildRequests(BIDDER_REQUEST_1.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+
+      expect(data.coppa).to.be.true;
+    });
+
+    it('should not contain coppa if not configured', function () {
+      config.setConfig({ coppa: false });
+      let request = spec.buildRequests(BIDDER_REQUEST_1.bidRequest, BIDDER_REQUEST_1);
+      let data = JSON.parse(request.data);
+
+      expect(data.coppa).to.be.undefined;
+    });
   });
   describe('interpretResponse validation', function () {
     it('response should have valid bidderCode', function () {

From cd0529a6d8d307ba74bedac0cfcbd1dd2b267842 Mon Sep 17 00:00:00 2001
From: ccorbo <ccorbo2013@gmail.com>
Date: Mon, 18 Jul 2022 13:26:08 -0400
Subject: [PATCH 034/569] IX Bid Adapter : GPID and Bug Fix (#8698)

* beginning work

* wip

* Build GPID manually when dp_ad_unit_code is present and gpid doesnt already exist

* resolve conflict

* remove pb ad slot

* merge conflict resolved

* fixed video warning

Co-authored-by: Chris Corbo <chris.corbo@indexexchange.com>
Co-authored-by: Love Sharma <love.sharma@indexexchange.com>
---
 modules/ixBidAdapter.js                | 34 ++++++++------
 test/spec/modules/ixBidAdapter_spec.js | 64 ++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 14 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 136cf6f25f0..7d3b3a33a7d 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -1053,9 +1053,14 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
       currentImpressionSize = encodeURIComponent(JSON.stringify({ impressionObjects })).length;
     }
 
-    const gpid = impressions[transactionIds[adUnitIndex]].gpid;
+    let gpid = impressions[transactionIds[adUnitIndex]].gpid;
     const dfpAdUnitCode = impressions[transactionIds[adUnitIndex]].dfp_ad_unit_code;
-    const tid = impressions[transactionIds[adUnitIndex]].tid
+    const tid = impressions[transactionIds[adUnitIndex]].tid;
+    const divId = impressions[transactionIds[adUnitIndex]].divId;
+
+    if (!gpid && dfpAdUnitCode && divId) {
+      gpid = `${dfpAdUnitCode}#${divId}`
+    }
     if (impressionObjects.length && BANNER in impressionObjects[0]) {
       const { id, banner: { topframe } } = impressionObjects[0];
       const _bannerImpression = {
@@ -1135,7 +1140,6 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     const pbaAdSlot = impressions[transactionIds[adUnitIndex]].pbadslot
     const tagId = impressions[transactionIds[adUnitIndex]].tagId
     const adUnitCode = impressions[transactionIds[adUnitIndex]].adUnitCode
-    const divId = impressions[transactionIds[adUnitIndex]].divId
     if (pbaAdSlot || tagId || adUnitCode || divId) {
       const clonedRObject = deepClone(r);
       const requestSize = `${baseUrl}${parseQueryStringParameters({ ...payload, r: JSON.stringify(clonedRObject) })}`.length;
@@ -1279,7 +1283,8 @@ function createNativeImps(validBidRequest, nativeImps) {
     nativeImps[validBidRequest.transactionId] = {};
     nativeImps[validBidRequest.transactionId].ixImps = [];
     nativeImps[validBidRequest.transactionId].ixImps.push(imp);
-    nativeImps[validBidRequest.transactionId].gpid = deepAccess(validBidRequest, 'ortb2Imp.ext.gpid')
+    nativeImps[validBidRequest.transactionId].gpid = deepAccess(validBidRequest, 'ortb2Imp.ext.gpid');
+    nativeImps[validBidRequest.transactionId].dfp_ad_unit_code = deepAccess(validBidRequest, 'ortb2Imp.ext.data.adserver.adslot');
     nativeImps[validBidRequest.transactionId].pbadslot = deepAccess(validBidRequest, 'ortb2Imp.ext.data.pbadslot');
     nativeImps[validBidRequest.transactionId].tagId = deepAccess(validBidRequest, 'params.tagId');
 
@@ -1302,6 +1307,7 @@ function createVideoImps(validBidRequest, videoImps) {
     videoImps[validBidRequest.transactionId].ixImps = [];
     videoImps[validBidRequest.transactionId].ixImps.push(imp);
     videoImps[validBidRequest.transactionId].gpid = deepAccess(validBidRequest, 'ortb2Imp.ext.gpid');
+    videoImps[validBidRequest.transactionId].dfp_ad_unit_code = deepAccess(validBidRequest, 'ortb2Imp.ext.data.adserver.adslot');
     videoImps[validBidRequest.transactionId].pbadslot = deepAccess(validBidRequest, 'ortb2Imp.ext.data.pbadslot');
     videoImps[validBidRequest.transactionId].tagId = deepAccess(validBidRequest, 'params.tagId');
 
@@ -1651,7 +1657,17 @@ export const spec = {
     }
 
     if (mediaTypeVideoRef && paramsVideoRef) {
+      const videoImp = bidToVideoImp(bid).video;
       const errorList = checkVideoParams(mediaTypeVideoRef, paramsVideoRef);
+      if (deepAccess(bid, 'mediaTypes.video.context') === OUTSTREAM && isIndexRendererPreferred(bid) && videoImp) {
+        const outstreamPlayerSize = [deepAccess(videoImp, 'w'), deepAccess(videoImp, 'h')];
+        const isValidSize = outstreamPlayerSize[0] >= OUTSTREAM_MINIMUM_PLAYER_SIZE[0] && outstreamPlayerSize[1] >= OUTSTREAM_MINIMUM_PLAYER_SIZE[1];
+        if (!isValidSize) {
+          logError(`IX Bid Adapter: ${outstreamPlayerSize} is an invalid size for IX outstream renderer`);
+          return false;
+        }
+      }
+
       if (errorList.length) {
         errorList.forEach((err) => {
           logError(err, { bidder: BIDDER_CODE, code: ERROR_CODES.PROPERTY_NOT_INCLUDED });
@@ -1660,16 +1676,6 @@ export const spec = {
       }
     }
 
-    const videoImp = bidToVideoImp(bid).video;
-    if (deepAccess(bid, 'mediaTypes.video.context') === OUTSTREAM && isIndexRendererPreferred(bid) && videoImp) {
-      const outstreamPlayerSize = [deepAccess(videoImp, 'w'), deepAccess(videoImp, 'h')];
-      const isValidSize = outstreamPlayerSize[0] >= OUTSTREAM_MINIMUM_PLAYER_SIZE[0] && outstreamPlayerSize[1] >= OUTSTREAM_MINIMUM_PLAYER_SIZE[1];
-      if (!isValidSize) {
-        logError(`IX Bid Adapter: ${outstreamPlayerSize} is an invalid size for IX outstream renderer`);
-        return false;
-      }
-    }
-
     return nativeMediaTypeValid(mediaTypeNativeRef);
   },
 
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index a25e6b1c6a0..086ec305ccc 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -1657,6 +1657,70 @@ describe('IndexexchangeAdapter', function () {
       expect(gpid).to.equal(GPID);
     });
 
+    it('should still build gpid in request if ortb2Imp.ext.gpid does not exist', function () {
+      const AD_UNIT_CODE = '/1111/home';
+      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      sinon.stub(utils, 'getGptSlotInfoForAdUnitCode')
+        .returns({ gptSlot: AD_UNIT_CODE, divId: 'adunit-code-3-div-id' });
+      validBids[0].ortb2Imp = {
+        ext: {
+          data: {
+            adserver: {
+              name: 'gam',
+              adslot: AD_UNIT_CODE
+            }
+          }
+        }
+      }
+      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
+      const { ext: { gpid } } = JSON.parse(requests[0].data.r).imp[0];
+      utils.getGptSlotInfoForAdUnitCode.restore();
+      expect(gpid).to.equal(`${AD_UNIT_CODE}#adunit-code-3-div-id`);
+    });
+
+    it('should not build gpid if divid doesnt exist when ortb2Imp.ext.gpid does not exist', function () {
+      const AD_UNIT_CODE = '/1111/home';
+      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      sinon.stub(utils, 'getGptSlotInfoForAdUnitCode')
+        .returns({ gptSlot: AD_UNIT_CODE });
+      validBids[0].ortb2Imp = {
+        ext: {
+          data: {
+            adserver: {
+              name: 'gam',
+              adslot: AD_UNIT_CODE
+            }
+          }
+        }
+      }
+      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
+      const imp = JSON.parse(requests[0].data.r).imp[0];
+      utils.getGptSlotInfoForAdUnitCode.restore();
+      expect(imp.ext.gpid).to.be.undefined;
+      expect(imp.ext.dfp_ad_unit_code).to.equal(AD_UNIT_CODE)
+    });
+
+    it('should not build gpid if dfp ad unit code / divid doesnt exist when ortb2Imp.ext.gpid does not exist', function () {
+      const AD_UNIT_CODE = '/1111/home';
+      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      sinon.stub(utils, 'getGptSlotInfoForAdUnitCode')
+        .returns({});
+      validBids[0].ortb2Imp = {
+        ext: {
+          data: {
+            adserver: {
+              name: 'gam',
+            }
+          }
+        }
+      }
+      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
+
+      const imp = JSON.parse(requests[0].data.r).imp[0];
+      utils.getGptSlotInfoForAdUnitCode.restore();
+      expect(imp.ext).to.be.undefined;
+    });
+
     it('should send gpid in request if ortb2Imp.ext.gpid exists when no size present', function () {
       const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID_PARAM_NO_SIZE);
       validBids[0].ortb2Imp = {

From 34e5b70deab0b0a0cfd9adb509de951255706bba Mon Sep 17 00:00:00 2001
From: Marcin Muras <47107445+mmuras@users.noreply.github.com>
Date: Mon, 18 Jul 2022 20:50:25 +0200
Subject: [PATCH 035/569] AdOcean Bid Adapter: send slave ids which are taking
 part in auction. (#8694)

---
 modules/adoceanBidAdapter.js                | 13 ++++++++++---
 test/spec/modules/adoceanBidAdapter_spec.js |  5 ++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/adoceanBidAdapter.js b/modules/adoceanBidAdapter.js
index bf5596ab22a..d74a78270b2 100644
--- a/modules/adoceanBidAdapter.js
+++ b/modules/adoceanBidAdapter.js
@@ -2,11 +2,15 @@ import { _each, parseSizesInput, isStr, isArray } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'adocean';
+const URL_SAFE_FIELDS = {
+  schain: true,
+  slaves: true
+};
 
 function buildEndpointUrl(emiter, payloadMap) {
   const payload = [];
   _each(payloadMap, function(v, k) {
-    payload.push(k + '=' + (k === 'schain' ? v : encodeURIComponent(v)));
+    payload.push(k + '=' + (URL_SAFE_FIELDS[k] ? v : encodeURIComponent(v)));
   });
 
   const randomizedPart = Math.random().toString().slice(2);
@@ -17,7 +21,8 @@ function buildRequest(masterBidRequests, masterId, gdprConsent) {
   let emiter;
   const payload = {
     id: masterId,
-    aosspsizes: []
+    aosspsizes: [],
+    slaves: []
   };
   if (gdprConsent) {
     payload.gdpr_consent = gdprConsent.consentString || undefined;
@@ -29,7 +34,7 @@ function buildRequest(masterBidRequests, masterId, gdprConsent) {
   }
 
   const bidIdMap = {};
-
+  const uniquePartLength = 10;
   _each(masterBidRequests, function(bid, slaveId) {
     if (!emiter) {
       emiter = bid.params.emiter;
@@ -38,11 +43,13 @@ function buildRequest(masterBidRequests, masterId, gdprConsent) {
     const slaveSizes = parseSizesInput(bid.mediaTypes.banner.sizes).join('_');
     const rawSlaveId = bid.params.slaveId.replace('adocean', '');
     payload.aosspsizes.push(rawSlaveId + '~' + slaveSizes);
+    payload.slaves.push(rawSlaveId.slice(-uniquePartLength));
 
     bidIdMap[slaveId] = bid.bidId;
   });
 
   payload.aosspsizes = payload.aosspsizes.join('-');
+  payload.slaves = payload.slaves.join(',');
 
   return {
     method: 'GET',
diff --git a/test/spec/modules/adoceanBidAdapter_spec.js b/test/spec/modules/adoceanBidAdapter_spec.js
index ba691825112..080b5bd5d1d 100644
--- a/test/spec/modules/adoceanBidAdapter_spec.js
+++ b/test/spec/modules/adoceanBidAdapter_spec.js
@@ -136,10 +136,12 @@ describe('AdoceanAdapter', function () {
       expect(request.url).to.include('gdpr_consent=' + bidderRequest.gdprConsent.consentString);
     });
 
-    it('should attach sizes information to url', function () {
+    it('should attach sizes and slaves information to url', function () {
       let requests = spec.buildRequests(bidRequests, bidderRequest);
       expect(requests[0].url).to.include('aosspsizes=myaozpniqismex~300x250_300x600');
+      expect(requests[0].url).to.include('slaves=zpniqismex');
       expect(requests[1].url).to.include('aosspsizes=myaozpniqismex~300x200_600x250');
+      expect(requests[1].url).to.include('slaves=zpniqismex');
 
       const differentSlavesBids = deepClone(bidRequests);
       differentSlavesBids[1].params.slaveId = 'adoceanmyaowafpdwlrks';
@@ -147,6 +149,7 @@ describe('AdoceanAdapter', function () {
       expect(requests.length).to.equal(1);
       expect(requests[0].url).to.include('aosspsizes=myaozpniqismex~300x250_300x600-myaowafpdwlrks~300x200_600x250');
       expect((requests[0].url.match(/aosspsizes=/g) || []).length).to.equal(1);
+      expect(requests[0].url).to.include('slaves=zpniqismex,wafpdwlrks');
     });
 
     it('should attach schain parameter if available', function() {

From 809c3799336ef8bd9bc65fa1f3f8a2b0c14e077f Mon Sep 17 00:00:00 2001
From: samous <samuel.kerboeuf@gmail.com>
Date: Mon, 18 Jul 2022 23:57:34 +0200
Subject: [PATCH 036/569] BLIINK Bid Adapter: new api endpoint & ccpa support
 (#8625)

* feat(multibid) add iframe cookie sync and multibid response

* feat(multibid) change url endpoint

* feat(multibid) replace requestId by transactionId

* feat(multibid) add schain to request

* refactor: bid request & response

* feat(multibid) rename var and update tests

* feat(multibid) update cookie sync url

* feat(multibid) add uspConsent

* feat(multibid) update readMe

* feat(multibid) update tests

* fix(refacto) changes after review

* fix(refacto) use deepAcces if necessary

* fix(refacto) use deepAcces

* fix(refacto) refacto & use deepAcces

* fix(refacto) fix default

Co-authored-by: Niass <cheroubawan@hotmail.fr>
Co-authored-by: Samous <samuel@bliink.io>
---
 modules/bliinkBidAdapter.js                | 313 ++++++--------
 modules/bliinkBidAdapter.md                |   7 +-
 test/spec/modules/bliinkBidAdapter_spec.js | 459 +++++++++++++++------
 3 files changed, 445 insertions(+), 334 deletions(-)

diff --git a/modules/bliinkBidAdapter.js b/modules/bliinkBidAdapter.js
index 962a61efad5..495862013de 100644
--- a/modules/bliinkBidAdapter.js
+++ b/modules/bliinkBidAdapter.js
@@ -1,10 +1,12 @@
 // eslint-disable-next-line prebid/validate-imports
 // eslint-disable-next-line prebid/validate-imports
-import {registerBidder} from '../src/adapters/bidderFactory.js'
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+import { config } from '../src/config.js'
+import {_each, deepAccess, deepSetValue} from '../src/utils.js'
 export const BIDDER_CODE = 'bliink'
-export const BLIINK_ENDPOINT_ENGINE = 'https://engine.bliink.io/delivery'
-export const BLIINK_ENDPOINT_ENGINE_VAST = 'https://engine.bliink.io/vast'
-export const BLIINK_ENDPOINT_COOKIE_SYNC = 'https://cookiesync.api.bliink.io'
+export const BLIINK_ENDPOINT_ENGINE = 'https://engine.bliink.io/prebid'
+
+export const BLIINK_ENDPOINT_COOKIE_SYNC_IFRAME = 'https://tag.bliink.io/usersync.html'
 export const META_KEYWORDS = 'keywords'
 export const META_DESCRIPTION = 'description'
 
@@ -14,6 +16,13 @@ const BANNER = 'banner'
 const supportedMediaTypes = [BANNER, VIDEO]
 const aliasBidderCode = ['bk']
 
+/**
+ * @description get coppa value from config
+ */
+function getCoppa() {
+  return config.getConfig('coppa') === true ? 1 : 0;
+}
+
 export function getMetaList(name) {
   if (!name || name.length === 0) return []
 
@@ -52,7 +61,7 @@ export function getOneMetaValue(query) {
     return metaEl.content
   }
 
-  return null
+  return null;
 }
 
 export function getMetaValue(name) {
@@ -75,79 +84,51 @@ export function getKeywords() {
     ]
 
     if (keywords && keywords.length > 0) {
-      return keywords
-        .filter((value) => value)
-        .map((value) => value.trim())
+      return keywords.filter((value) => value).map((value) => value.trim());
     }
   }
 
-  return []
-}
-
-export const parseXML = (content) => {
-  if (typeof content !== 'string' || content.length === 0) return null
-
-  const parser = new DOMParser()
-  let xml;
-
-  try {
-    xml = parser.parseFromString(content, 'text/xml')
-  } catch (e) {}
-
-  if (xml &&
-    xml.getElementsByTagName('VAST')[0] &&
-    xml.getElementsByTagName('VAST')[0].tagName === 'VAST') {
-    return xml
-  }
-
-  return null
+  return [];
 }
 
 /**
  * @param bidRequest
- * @param bliinkCreative
- * @return {{cpm, netRevenue: boolean, requestId, width: (*|number), currency, ttl: number, creativeId, height: (*|number)} & {mediaType: string, vastXml}}
+ * @return {({cpm, netRevenue: boolean, requestId, width: number, currency, ttl: number, creativeId, height: number}&{mediaType: string, vastXml})|null}
  */
-export const buildBid = (bidRequest, bliinkCreative) => {
-  if (!bidRequest && !bliinkCreative) return null
-
-  const body = {
-    requestId: bidRequest.bidId,
-    currency: bliinkCreative.currency,
-    cpm: bliinkCreative.price,
-    creativeId: bliinkCreative.creativeId,
-    width: (bidRequest.sizes && bidRequest.sizes[0][0]) || 1,
-    height: (bidRequest.sizes && bidRequest.sizes[0][1]) || 1,
-    netRevenue: false,
-    ttl: 3600,
-  }
-
-  // eslint-disable-next-line no-mixed-operators
-  if ((bliinkCreative) && bidRequest &&
-    // eslint-disable-next-line no-mixed-operators
-    !bidRequest.bidId ||
-    !bidRequest.sizes ||
-    !bidRequest.params ||
-    !(bidRequest.params.placement)
-  ) return null
-
-  delete bidRequest['bids']
+export const buildBid = (bidResponse) => {
+  const mediaType = deepAccess(bidResponse, 'creative.media_type')
+  if (!mediaType) return null;
 
-  switch (bliinkCreative.media_type) {
+  let bid;
+  switch (mediaType) {
     case VIDEO:
-      return Object.assign(body, {
-        mediaType: VIDEO,
-        vastXml: bliinkCreative.content,
-      })
+      const vastXml = deepAccess(bidResponse, 'creative.video.content');
+      bid = {
+        vastXml,
+        mediaType: 'video',
+        vastUrl: 'data:text/xml;charset=utf-8;base64,' + btoa(vastXml.replace(/\\"/g, '"'))
+      };
+      break;
     case BANNER:
-      return Object.assign(body, {
-        mediaType: BANNER,
-        ad: (bliinkCreative && bliinkCreative.content && bliinkCreative.content.creative && bliinkCreative.content.creative.adm) || '',
-      })
-    default:
+      bid = {
+        ad: deepAccess(bidResponse, 'creative.banner.adm'),
+        mediaType: 'banner',
+      };
       break;
+    default:
+      return null;
   }
-}
+  return Object.assign(bid, {
+    cpm: bidResponse.price,
+    currency: bidResponse.currency || 'EUR',
+    creativeId: deepAccess(bidResponse, 'extras.deal_id'),
+    requestId: deepAccess(bidResponse, 'extras.transaction_id'),
+    width: deepAccess(bidResponse, `creative.${bid.mediaType}.width`) || 1,
+    height: deepAccess(bidResponse, `creative.${bid.mediaType}.height`) || 1,
+    ttl: 3600,
+    netRevenue: true,
+  });
+};
 
 /**
  * @description Verify the the AdUnits.bids, respond with true (valid) or false (invalid).
@@ -156,61 +137,58 @@ export const buildBid = (bidRequest, bliinkCreative) => {
  * @return boolean
  */
 export const isBidRequestValid = (bid) => {
-  return !(!bid || !bid.params || !bid.params.placement || !bid.params.tagId)
-}
+  return !!deepAccess(bid, 'params.tagId');
+};
 
 /**
  * @description Takes an array of valid bid requests, all of which are guaranteed to have passed the isBidRequestValid() test.
  *
- * @param _[]
+ * @param validBidRequests
  * @param bidderRequest
- * @return {{ method: string, url: string } | null}
+ * @returns {null|{method: string, data: {gdprConsent: string, keywords: string, pageTitle: string, pageDescription: (*|string), pageUrl, gdpr: boolean, tags: *}, url: string}}
  */
-export const buildRequests = (_, bidderRequest) => {
-  if (!bidderRequest) return null
+export const buildRequests = (validBidRequests, bidderRequest) => {
+  if (!validBidRequests || !bidderRequest || !bidderRequest.bids) return null
 
-  let data = {
-    pageUrl: bidderRequest.refererInfo.page,
+  const tags = bidderRequest.bids.map((bid) => {
+    return {
+      sizes: bid.sizes.map((size) => ({ w: size[0], h: size[1] })),
+      id: bid.params.tagId,
+      transactionId: bid.bidId,
+      mediaTypes: Object.keys(bid.mediaTypes),
+      imageUrl: deepAccess(bid, 'params.imageUrl', ''),
+    };
+  });
+
+  let request = {
+    tags,
+    pageTitle: document.title,
+    pageUrl: deepAccess(bidderRequest, 'refererInfo.page'),
     pageDescription: getMetaValue(META_DESCRIPTION),
     keywords: getKeywords().join(','),
-    gdpr: false,
-    gdpr_consent: '',
-    pageTitle: document.title,
+  };
+  const schain = deepAccess(validBidRequests[0], 'schain')
+  if (schain) {
+    request.schain = schain
   }
-
-  const endPoint = bidderRequest.bids[0].params.placement === VIDEO ? BLIINK_ENDPOINT_ENGINE_VAST : BLIINK_ENDPOINT_ENGINE
-
-  const params = {
-    bidderRequestId: bidderRequest.bidderRequestId,
-    bidderCode: bidderRequest.bidderCode,
-    bids: bidderRequest.bids,
-    // TODO: please do not send internal data structures over the network
-    refererInfo: bidderRequest.refererInfo.legacy,
+  const gdprConsent = deepAccess(bidderRequest, 'gdprConsent');
+  if (!!gdprConsent && gdprConsent.gdprApplies) {
+    request.gdpr = true
+    deepSetValue(request, 'gdprConsent', gdprConsent.consentString);
   }
-
-  if (bidderRequest.gdprConsent) {
-    data = Object.assign(data, {
-      gdpr: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies,
-      gdpr_consent: bidderRequest.gdprConsent.consentString
-    })
+  if (config.getConfig('coppa')) {
+    request.coppa = 1
   }
-
-  if (bidderRequest.bids && bidderRequest.bids.length > 0 && bidderRequest.bids[0].sizes && bidderRequest.bids[0].sizes[0]) {
-    data = Object.assign(data, {
-      width: bidderRequest.bids[0].sizes[0][0],
-      height: bidderRequest.bids[0].sizes[0][1]
-    })
-
-    return {
-      method: 'GET',
-      url: `${endPoint}/${bidderRequest.bids[0].params.tagId}`,
-      data: data,
-      params: params,
-    }
+  if (bidderRequest.uspConsent) {
+    deepSetValue(request, 'uspConsent', bidderRequest.uspConsent);
   }
 
-  return null
-}
+  return {
+    method: 'POST',
+    url: BLIINK_ENDPOINT_ENGINE,
+    data: request,
+  };
+};
 
 /**
  * @description Parse the response (from buildRequests) and generate one or more bid objects.
@@ -219,51 +197,15 @@ export const buildRequests = (_, bidderRequest) => {
  * @param request
  * @return
  */
-const interpretResponse = (serverResponse, request) => {
-  if ((serverResponse && serverResponse.mode === 'no-ad')) {
-    return []
-  }
-
-  const body = serverResponse.body
-  const serverBody = request.params
-
-  const xml = parseXML(body)
-
-  let creative;
-
-  switch (serverBody.bids[0].params.placement) {
-    case xml && VIDEO:
-      const price = xml.getElementsByTagName('Price') && xml.getElementsByTagName('Price')[0]
-      const currency = xml.getElementsByTagName('Currency') && xml.getElementsByTagName('Currency')[0]
-      const creativeId = xml.getElementsByTagName('CreativeId') && xml.getElementsByTagName('CreativeId')[0]
-
-      creative = {
-        content: body,
-        price: (price && price.textContent) || 0,
-        currency: (currency && currency.textContent) || 'EUR',
-        creativeId: creativeId || 0,
-        media_type: 'video',
-      }
-
-      return buildBid(serverBody.bids[0], creative)
-    case BANNER:
-      if (body) {
-        creative = {
-          content: body,
-          price: body.price,
-          currency: body.currency,
-          creativeId: 0,
-          media_type: 'banner',
-        }
-
-        return buildBid(serverBody.bids[0], creative)
-      }
-
-      break
-    default:
-      break
-  }
-}
+const interpretResponse = (serverResponse) => {
+  const bodyResponse = deepAccess(serverResponse, 'body.bids')
+  if (!serverResponse.body || !bodyResponse) return []
+  const bidResponses = [];
+  _each(bodyResponse, function (response) {
+    return bidResponses.push(buildBid(response));
+  });
+  return bidResponses.filter(bid => !!bid)
+};
 
 /**
  * @description  If the publisher allows user-sync activity, the platform will call this function and the adapter may register pixels and/or iframe user syncs. For more information, see Registering User Syncs below
@@ -272,54 +214,39 @@ const interpretResponse = (serverResponse, request) => {
  * @param gdprConsent
  * @return {[{type: string, url: string}]|*[]}
  */
-const getUserSyncs = (syncOptions, serverResponses, gdprConsent) => {
-  let syncs = []
-
+const getUserSyncs = (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+  let syncs = [];
   if (syncOptions.pixelEnabled && serverResponses.length > 0) {
+    let gdprParams = ''
+    let uspConsentStr = ''
+    let apiVersion
+    let gdpr = false
     if (gdprConsent) {
-      const gdprParams = `consentString=${gdprConsent.consentString}`
-      const smartCallbackURL = encodeURIComponent(`${BLIINK_ENDPOINT_COOKIE_SYNC}/cookiesync?partner=smart&uid=[sas_uid]`)
-      const azerionCallbackURL = encodeURIComponent(`${BLIINK_ENDPOINT_COOKIE_SYNC}/cookiesync?partner=azerion&uid={PUB_USER_ID}`)
-      const appnexusCallbackURL = encodeURIComponent(`${BLIINK_ENDPOINT_COOKIE_SYNC}/cookiesync?partner=azerion&uid=$UID`)
-      return [
-        {
-          type: 'script',
-          url: 'https://prg.smartadserver.com/ac?out=js&nwid=3392&siteid=305791&pgname=rg&fmtid=81127&tgt=[sas_target]&visit=m&tmstp=[timestamp]&clcturl=[countgo]'
-        },
-        {
-          type: 'image',
-          url: `https://sync.smartadserver.com/getuid?nwid=3392&${gdprParams}&url=${smartCallbackURL}`,
-        },
-        {
-          type: 'image',
-          url: `https://ad.360yield.com/server_match?partner_id=1531&${gdprParams}&r=${azerionCallbackURL}`,
-        },
-        {
-          type: 'image',
-          url: `https://ads.stickyadstv.com/auto-user-sync?${gdprParams}`,
-        },
-        {
-          type: 'image',
-          url: `https://cookiesync.api.bliink.io/getuid?url=https%3A%2F%2Fvisitor.omnitagjs.com%2Fvisitor%2Fsync%3Fuid%3D1625272249969090bb9d544bd6d8d645%26name%3DBLIINK%26visitor%3D%24UID%26external%3Dtrue&${gdprParams}`,
-        },
-        {
-          type: 'image',
-          url: `https://cookiesync.api.bliink.io/getuid?url=https://pixel.advertising.com/ups/58444/sync?&gdpr=1&gdpr_consent=${gdprConsent.consentString}&redir=true&uid=$UID`,
-        },
-        {
-          type: 'image',
-          url: `https://ups.analytics.yahoo.com/ups/58499/occ?gdpr=1&gdpr_consent=${gdprConsent.consentString}`,
-        },
+      gdprParams = `&gdprConsent=${gdprConsent.consentString}`;
+      apiVersion = `&apiVersion=${gdprConsent.apiVersion}`
+      gdpr = Number(
+        gdprConsent.gdprApplies)
+    }
+    if (uspConsent) {
+      uspConsentStr = `&uspConsent=${uspConsent}`;
+    }
+    let sync;
+    if (syncOptions.iframeEnabled) {
+      sync = [
         {
-          type: 'image',
-          url: `https://secure.adnxs.com/getuid?${appnexusCallbackURL}`,
+          type: 'iframe',
+          url: `${BLIINK_ENDPOINT_COOKIE_SYNC_IFRAME}?gdpr=${gdpr}&coppa=${getCoppa()}${uspConsentStr}${gdprParams}${apiVersion}`,
         },
-      ]
+      ];
+    } else {
+      sync = deepAccess(serverResponses[0], 'body.userSyncs');
     }
+
+    return sync;
   }
 
   return syncs;
-}
+};
 
 /**
  * @type {{interpretResponse: interpretResponse, code: string, aliases: string[], getUserSyncs: getUserSyncs, buildRequests: buildRequests, onTimeout: onTimeout, onSetTargeting: onSetTargeting, isBidRequestValid: isBidRequestValid, onBidWon: onBidWon}}
@@ -332,6 +259,6 @@ export const spec = {
   buildRequests,
   interpretResponse,
   getUserSyncs,
-}
+};
 
-registerBidder(spec)
+registerBidder(spec);
diff --git a/modules/bliinkBidAdapter.md b/modules/bliinkBidAdapter.md
index af7aee3a1ae..48b95a10ebb 100644
--- a/modules/bliinkBidAdapter.md
+++ b/modules/bliinkBidAdapter.md
@@ -3,10 +3,10 @@
 ```
 Module Name: BLIINK Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: samuel@bliink.io | jonathan@bliink.io
+Maintainer: samuel@bliink.io | ibrahima@bliink.io
 gdpr_supported: true
 tcf2_supported: true
-media_types: banner, native, video
+media_types: banner, video
 ```
 
 # Description
@@ -30,7 +30,6 @@ const adUnits = [
       {
         bidder: 'bliink',
         params: {
-          placement: 'banner',
           tagId: '41'
         }
       }
@@ -58,7 +57,6 @@ const adUnits = [
         bidder: 'bliink',
         params: {
           tagId: '41',
-          placement: 'video',
         }
       }
     ]
@@ -85,7 +83,6 @@ const adUnits = [
         bidder: 'bliink',
         params: {
           tagId: '41',
-          placement: 'video',
         }
       }
     ]
diff --git a/test/spec/modules/bliinkBidAdapter_spec.js b/test/spec/modules/bliinkBidAdapter_spec.js
index 748ed2c8279..b8994b86847 100644
--- a/test/spec/modules/bliinkBidAdapter_spec.js
+++ b/test/spec/modules/bliinkBidAdapter_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai'
-import { spec, buildBid, BLIINK_ENDPOINT_ENGINE, parseXML, getMetaList } from 'modules/bliinkBidAdapter.js'
+import { spec, buildBid, BLIINK_ENDPOINT_ENGINE, getMetaList, BLIINK_ENDPOINT_COOKIE_SYNC_IFRAME } from 'modules/bliinkBidAdapter.js'
 
 /**
  * @description Mockup bidRequest
@@ -33,6 +33,7 @@ const getConfigBid = (placement) => {
     crumbs: {
       pubcid: '55ffadc5-051f-428d-8ecc-dc585e0bde0d'
     },
+    sizes: [[300, 250]],
     mediaTypes: {
       banner: {
         sizes: [
@@ -51,13 +52,55 @@ const getConfigBid = (placement) => {
       placement: placement,
       tagId: '14f30eca-85d2-11e8-9eed-0242ac120007'
     },
-    sizes: [
-      [300, 250]
-    ],
     src: 'client',
     transactionId: 'cc6678c4-9746-4082-b9e2-d8065d078ebf'
   }
 }
+const getConfigBannerBid = () => {
+  return {
+    creative: {
+      banner: {
+        adm: '',
+        height: 250,
+        width: 300,
+      },
+      media_type: 'banner',
+      creativeId: 125,
+    },
+    price: 1,
+    id: '810',
+    token: 'token',
+    mode: 'rtb',
+    extras: {
+      deal_id: '34567erty',
+      transaction_id: '2def0c5b2a7f6e',
+    },
+    currency: 'EUR',
+  }
+}
+const getConfigVideoBid = () => {
+  return {
+    creative: {
+      video: {
+        content:
+          '<VAST></VAST>',
+        height: 250,
+        width: 300,
+      },
+      media_type: 'video',
+      creativeId: 0,
+    },
+    price: 1,
+    id: '8121',
+    token: 'token',
+    mode: 'rtb',
+    extras: {
+      deal_id: '34567ertyRTY',
+      transaction_id: '2def0c5b2a7f6e',
+    },
+    currency: 'EUR',
+  }
+}
 
 /**
  * @description Mockup response from engine.bliink.io/xxxx
@@ -80,33 +123,30 @@ const getConfigBid = (placement) => {
  */
 const getConfigCreative = () => {
   return {
-    ad_id: 5648,
-    price: 1,
+    ad: '<iframe src="https://creative-stg.bliink.io/test-preview-jonathan/index.html?cb=54545&cb=1653984833&gdpr=1&gdpr_consent=#click=https://e-stg.api.bliink.io/c?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NTY0MTMzMzgsImlhdCI6MTY1NTgwODUzOCwiaXNzIjoiYmxpaW5rIiwiZGF0YSI6eyJ0eXBlIjoiYWQtc2VydmVyIiwidHJhbnNhY3Rpb25JZCI6IjQ3ZmQyMmY1LThiM2MtNGI4Zi05MzgyLTAzNGEwNGJmNGNmZSIsIm5ldHdvcmtJZCI6MjEsInNpdGVJZCI6NDgsInRhZ0lkIjo4MSwiY29va2llSWQiOiI4NjkwZDEzMDkyNjM5YThhMDliM2MwZDgzMDFlMTBkNmM5MWRhMzBlZWY3NTA2OTRkNTQ5Y2ExYWEwN2M0OTU2IiwiZXZlbnRJZCI6MywidGFyZ2V0aW5nIjp7InBsYXRmb3JtIjoiV2Vic2l0ZSIsInJlZmVycmVyIjoiaHR0cDovL2xvY2FsaG9zdDo5OTk5L2ludGVncmF0aW9uRXhhbXBsZXMvZ3B0L2dkcHJfaGVsbG9fd29ybGQuaHRtbCIsInBhZ2VVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojk5OTkvaW50ZWdyYXRpb25FeGFtcGxlcy9ncHQvZ2Rwcl9oZWxsb193b3JsZC5odG1sIiwidGltZSI6MTY1NTgwODUzOCwibG9jYXRpb24iOnsibGF0aXR1ZGUiOjQ4LjgzMjMsImxvbmdpdHVkZSI6Mi40MDc1LCJyZWdpb24iOiJJREYiLCJjb3VudHJ5IjoiRlIiLCJjaXR5IjoiUGFyaXMiLCJ6aXBDb2RlIjoiNzUwMTUiLCJkZXBhcnRtZW50IjoiNzUifSwiY2l0eSI6IlBhcmlzIiwiY291bnRyeSI6IkZSIiwiZGV2aWNlT3MiOiJtYWNPUyIsImRldmljZVBsYXRmb3JtIjoiV2Vic2l0ZSIsInJhd1VzZXJBZ2VudCI6Ik1vemlsbGEvNS4wIChNYWNpbnRvc2g7IEludGVsIE1hYyBPUyBYIDEwXzE1XzcpIEFwcGxlV2ViS2l0LzUzNy4zNiAoS0hUTUwsIGxpa2UgR2Vja28pIENocm9tZS8xMDIuMC4wLjAgU2FmYXJpLzUzNy4zNiJ9LCJnZHByIjp7Imhhc0NvbnNlbnQiOmZhbHNlLCJjb25zZW50U3RyaW5nIjoiQlBhbzY5dVBhNHd2WkFBQUJBRlJBQkFBQUFBQUFBIn0sIm5wIjoiNGNCNHVhQW5ncFliZ0RRYXliUGFnUT09IiwiZ3AiOiI3K05UVjErK0ttWndkcDhuTVd3NGl3PT0iLCJjdXJyZW5jeSI6IkVVUiIsIndpbiI6ZmFsc2UsImZvcm1hdCI6MywiZGlzcGxheVR5cGUiOiJzdGlja3kiLCJhZElkIjoxNjgsImFkdmVydGlzZXJJZCI6MjEsImNhbXBhaWduSWQiOjUzNSwiY3JlYXRpdmVJZCI6NzEsImVycm9yIjpmYWxzZX19.8hkPblKo1y1hftESf7e0GN9EzJ1LNVposv_a0TS4h_8&redirect=" style="height: 100%; width: 100%; border: 0;"></iframe><script src="https://tag-stg.bliink.io/creative.min.js?cb=0.0.0"></script>',
+    mediaType: 'banner',
+    cpm: 4,
     currency: 'EUR',
-    media_type: 'banner',
-    category: 1,
-    id: 2825,
-    creativeId: 2825,
-    type: 1,
-    viewability_duration: 1,
-    viewability_percent_in_view: 30,
-    content: {
-      creative: {
-        adm: '<html lang="en"></html>',
-      }
-    }
+    creativeId: '34567erty',
+    width: 300,
+    height: 250,
+    ttl: 3600,
+    netRevenue: true,
   }
 }
 
-const getConfigCreativeVideo = () => {
+const getConfigCreativeVideo = (isNoVast) => {
   return {
-    ad_id: 5648,
-    price: 1,
+    mediaType: 'video',
+    vastXml: isNoVast ? '' : '<VAST></VAST>',
+    cpm: 0,
     currency: 'EUR',
-    media_type: 'video',
-    category: 1,
-    creativeId: 2825,
-    content: '<VAST></VAST>'
+    creativeId: '34567ertyaza',
+    requestId: '6a204ce130280d',
+    width: 300,
+    height: 250,
+    ttl: 3600,
+    netRevenue: true,
   }
 }
 
@@ -120,14 +160,11 @@ const getConfigBuildRequest = (placement) => {
     bidderCode: 'bliink',
     bids: [getConfigBid(placement)],
     refererInfo: {
+      canonicalUrl: null,
+      isAmp: false,
+      numIframes: 0,
+      reachedTop: true,
       page: 'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
-      legacy: {
-        canonicalUrl: null,
-        isAmp: false,
-        numIframes: 0,
-        reachedTop: true,
-        referer: 'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
-      }
     },
   }
 
@@ -158,8 +195,9 @@ const getConfigInterpretResponse = (noAd = false) => {
 
   return {
     body: {
-      creative: getConfigCreative(),
+      ...getConfigCreative(),
       mode: 'ad',
+      transactionId: '2def0c5b2a7f6e',
       token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MjgxNzA4MzEsImlhdCI6MTYyNzU2NjAzMSwiaXNzIjoiYmxpaW5rIiwiZGF0YSI6eyJ0eXBlIjoiYWQtc2VydmVyIiwidHJhbnNhY3Rpb25JZCI6IjM1YmU1NDNjLTNkZTQtNGQ1Yy04N2NjLWIzYzEyOGZiYzU0MCIsIm5ldHdvcmtJZCI6MjEsInNpdGVJZCI6NTksInRhZ0lkIjo1OSwiY29va2llSWQiOiJjNGU4MWVhOS1jMjhmLTQwZDItODY1ZC1hNjQzZjE1OTcyZjUiLCJldmVudElkIjozLCJ0YXJnZXRpbmciOnsicGxhdGZvcm0iOiJXZWJzaXRlIiwiaXAiOiI3OC4xMjIuNzUuNzIiLCJ0aW1lIjoxNjI3NTY2MDMxLCJsb2NhdGlvbiI6eyJsYXRpdHVkZSI6NDguOTczOSwibG9uZ2l0dWRlIjozLjMxMTMsInJlZ2lvbiI6IkhERiIsImNvdW50cnkiOiJGUiIsImNpdHkiOiJTYXVsY2hlcnkiLCJ6aXBDb2RlIjoiMDIzMTAiLCJkZXBhcnRtZW50IjoiMDIifSwiY2l0eSI6IlNhdWxjaGVyeSIsImNvdW50cnkiOiJGUiIsImRldmljZU9zIjoibWFjT1MiLCJkZXZpY2VQbGF0Zm9ybSI6IldlYnNpdGUiLCJyYXdVc2VyQWdlbnQiOiJNb3ppbGxhLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xNV83KSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvOTEuMC40NDcyLjEyNCBTYWZhcmkvNTM3LjM2In0sImdkcHIiOnsiaGFzQ29uc2VudCI6dHJ1ZX0sIndpbiI6ZmFsc2UsImFkSWQiOjU2NDgsImFkdmVydGlzZXJJZCI6MSwiY2FtcGFpZ25JZCI6MSwiY3JlYXRpdmVJZCI6MjgyNSwiZXJyb3IiOmZhbHNlfX0.-UefQH4G0k-RJGemBYffs-KL7EEwma2Wuwgk2xnpij8'
     },
     headers: {},
@@ -171,7 +209,7 @@ const getConfigInterpretResponse = (noAd = false) => {
  * @param noAd
  * @return {{body: string} | {mode: string, message: string}}
  */
-const getConfigInterpretResponseRTB = (noAd = false) => {
+const getConfigInterpretResponseRTB = (noAd = false, isInvalidVast = false) => {
   if (noAd) {
     return {
       message: 'invalid tag',
@@ -179,20 +217,51 @@ const getConfigInterpretResponseRTB = (noAd = false) => {
     }
   }
 
+  const validVast = `
+  <VAST version="3">
+    <Ad>
+      <Wrapper>
+        <AdSystem>BLIINK</AdSystem>
+        <VASTAdTagURI>https://vast.bliink.io/p/508379d0-9f65-4198-8ba5-f61f2b51224f.xml</VASTAdTagURI>
+        <Error>https://e.api.bliink.io/e?name=vast-error&token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MzQwMzA1MjcsImlhdCI6MTYzMzQyNTcyNywiaXNzIjoiYmxpaW5rIiwiZGF0YSI6eyJ0eXBlIjoiYWQtc2VydmVyIiwidHJhbnNhY3Rpb25JZCI6ImE2NjJjZGJmLTkzNDYtNDI0MS1iMTU0LTJhOTc2OTg0NjNmOSIsIm5ldHdvcmtJZCI6MjUsInNpdGVJZCI6MTQzLCJ0YWdJZCI6MTI3MSwiY29va2llSWQiOiIwNWFhN2UwMi05MzgzLTQ1NGYtOTJmZC1jOTE2YWNlMmUyZjYiLCJldmVudElkIjozLCJ0YXJnZXRpbmciOnsicGxhdGZvcm0iOiJXZWJzaXRlIiwicmVmZXJyZXIiOiJodHRwOi8vbG9jYWxob3N0OjgxODEvaW50ZWdyYXRpb25FeGFtcGxlcy9ncHQvYmxpaW5rLWluc3RyZWFtLmh0bWwiLCJwYWdlVXJsIjoiaHR0cDovL2xvY2FsaG9zdDo4MTgxL2ludGVncmF0aW9uRXhhbXBsZXMvZ3B0L2JsaWluay1pbnN0cmVhbS5odG1sIiwiaXAiOiIzMS4zOS4xNDEuMTQwIiwidGltZSI6MTYzMzQyNTcyNywibG9jYXRpb24iOnsibGF0aXR1ZGUiOjQ4Ljk0MjIsImxvbmdpdHVkZSI6Mi41MDM5LCJyZWdpb24iOiJJREYiLCJjb3VudHJ5IjoiRlIiLCJjaXR5IjoiQXVsbmF5LXNvdXMtQm9pcyIsInppcENvZGUiOiI5MzYwMCIsImRlcGFydG1lbnQiOiI5MyJ9LCJjaXR5IjoiQXVsbmF5LXNvdXMtQm9pcyIsImNvdW50cnkiOiJGUiIsImRldmljZU9zIjoibWFjT1MiLCJkZXZpY2VQbGF0Zm9ybSI6IldlYnNpdGUiLCJyYXdVc2VyQWdlbnQiOiJNb3ppbGxhLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xNV83KSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvOTMuMC40NTc3LjYzIFNhZmFyaS81MzcuMzYiLCJjb250ZW50Q2xhc3NpZmljYXRpb24iOnsiYnJhbmRzYWZlIjpmYWxzZX19LCJnZHByIjp7Imhhc0NvbnNlbnQiOnRydWV9LCJ3aW4iOmZhbHNlLCJhZElkIjo1NzkzLCJhZHZlcnRpc2VySWQiOjEsImNhbXBhaWduSWQiOjEsImNyZWF0aXZlSWQiOjExOTQsImVycm9yIjpmYWxzZX19.nJSJPKovg0_jSHtLdrMPDqesAIlFKCuXPXYxpsyWBDw</Error>
+        <Impression>https://e.api.bliink.io/e?name=impression&token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MzQwMzA1MjcsImlhdCI6MTYzMzQyNTcyNywiaXNzIjoiYmxpaW5rIiwiZGF0YSI6eyJ0eXBlIjoiYWQtc2VydmVyIiwidHJhbnNhY3Rpb25JZCI6ImE2NjJjZGJmLTkzNDYtNDI0MS1iMTU0LTJhOTc2OTg0NjNmOSIsIm5ldHdvcmtJZCI6MjUsInNpdGVJZCI6MTQzLCJ0YWdJZCI6MTI3MSwiY29va2llSWQiOiIwNWFhN2UwMi05MzgzLTQ1NGYtOTJmZC1jOTE2YWNlMmUyZjYiLCJldmVudElkIjozLCJ0YXJnZXRpbmciOnsicGxhdGZvcm0iOiJXZWJzaXRlIiwicmVmZXJyZXIiOiJodHRwOi8vbG9jYWxob3N0OjgxODEvaW50ZWdyYXRpb25FeGFtcGxlcy9ncHQvYmxpaW5rLWluc3RyZWFtLmh0bWwiLCJwYWdlVXJsIjoiaHR0cDovL2xvY2FsaG9zdDo4MTgxL2ludGVncmF0aW9uRXhhbXBsZXMvZ3B0L2JsaWluay1pbnN0cmVhbS5odG1sIiwiaXAiOiIzMS4zOS4xNDEuMTQwIiwidGltZSI6MTYzMzQyNTcyNywibG9jYXRpb24iOnsibGF0aXR1ZGUiOjQ4Ljk0MjIsImxvbmdpdHVkZSI6Mi41MDM5LCJyZWdpb24iOiJJREYiLCJjb3VudHJ5IjoiRlIiLCJjaXR5IjoiQXVsbmF5LXNvdXMtQm9pcyIsInppcENvZGUiOiI5MzYwMCIsImRlcGFydG1lbnQiOiI5MyJ9LCJjaXR5IjoiQXVsbmF5LXNvdXMtQm9pcyIsImNvdW50cnkiOiJGUiIsImRldmljZU9zIjoibWFjT1MiLCJkZXZpY2VQbGF0Zm9ybSI6IldlYnNpdGUiLCJyYXdVc2VyQWdlbnQiOiJNb3ppbGxhLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xNV83KSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvOTMuMC40NTc3LjYzIFNhZmFyaS81MzcuMzYiLCJjb250ZW50Q2xhc3NpZmljYXRpb24iOnsiYnJhbmRzYWZlIjpmYWxzZX19LCJnZHByIjp7Imhhc0NvbnNlbnQiOnRydWV9LCJ3aW4iOmZhbHNlLCJhZElkIjo1NzkzLCJhZHZlcnRpc2VySWQiOjEsImNhbXBhaWduSWQiOjEsImNyZWF0aXZlSWQiOjExOTQsImVycm9yIjpmYWxzZX19.nJSJPKovg0_jSHtLdrMPDqesAIlFKCuXPXYxpsyWBDw</Impression>
+        <Extensions><Price>1</Price><Currency>EUR</Currency>
+      </Wrapper>
+    </Ad>
+  </VAST>
+  `
+  const invalidVast = `
+  <VASTZ version="3">
+    <Ad>
+
+    </Ad>
+  </VAST>
+  `
+
   return {
-    body: `
-    <VAST version="3">
-      <Ad>
-        <Wrapper>
-          <AdSystem>BLIINK</AdSystem>
-          <VASTAdTagURI>https://vast.bliink.io/p/508379d0-9f65-4198-8ba5-f61f2b51224f.xml</VASTAdTagURI>
-          <Error>https://e.api.bliink.io/e?name=vast-error&token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MzQwMzA1MjcsImlhdCI6MTYzMzQyNTcyNywiaXNzIjoiYmxpaW5rIiwiZGF0YSI6eyJ0eXBlIjoiYWQtc2VydmVyIiwidHJhbnNhY3Rpb25JZCI6ImE2NjJjZGJmLTkzNDYtNDI0MS1iMTU0LTJhOTc2OTg0NjNmOSIsIm5ldHdvcmtJZCI6MjUsInNpdGVJZCI6MTQzLCJ0YWdJZCI6MTI3MSwiY29va2llSWQiOiIwNWFhN2UwMi05MzgzLTQ1NGYtOTJmZC1jOTE2YWNlMmUyZjYiLCJldmVudElkIjozLCJ0YXJnZXRpbmciOnsicGxhdGZvcm0iOiJXZWJzaXRlIiwicmVmZXJyZXIiOiJodHRwOi8vbG9jYWxob3N0OjgxODEvaW50ZWdyYXRpb25FeGFtcGxlcy9ncHQvYmxpaW5rLWluc3RyZWFtLmh0bWwiLCJwYWdlVXJsIjoiaHR0cDovL2xvY2FsaG9zdDo4MTgxL2ludGVncmF0aW9uRXhhbXBsZXMvZ3B0L2JsaWluay1pbnN0cmVhbS5odG1sIiwiaXAiOiIzMS4zOS4xNDEuMTQwIiwidGltZSI6MTYzMzQyNTcyNywibG9jYXRpb24iOnsibGF0aXR1ZGUiOjQ4Ljk0MjIsImxvbmdpdHVkZSI6Mi41MDM5LCJyZWdpb24iOiJJREYiLCJjb3VudHJ5IjoiRlIiLCJjaXR5IjoiQXVsbmF5LXNvdXMtQm9pcyIsInppcENvZGUiOiI5MzYwMCIsImRlcGFydG1lbnQiOiI5MyJ9LCJjaXR5IjoiQXVsbmF5LXNvdXMtQm9pcyIsImNvdW50cnkiOiJGUiIsImRldmljZU9zIjoibWFjT1MiLCJkZXZpY2VQbGF0Zm9ybSI6IldlYnNpdGUiLCJyYXdVc2VyQWdlbnQiOiJNb3ppbGxhLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xNV83KSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvOTMuMC40NTc3LjYzIFNhZmFyaS81MzcuMzYiLCJjb250ZW50Q2xhc3NpZmljYXRpb24iOnsiYnJhbmRzYWZlIjpmYWxzZX19LCJnZHByIjp7Imhhc0NvbnNlbnQiOnRydWV9LCJ3aW4iOmZhbHNlLCJhZElkIjo1NzkzLCJhZHZlcnRpc2VySWQiOjEsImNhbXBhaWduSWQiOjEsImNyZWF0aXZlSWQiOjExOTQsImVycm9yIjpmYWxzZX19.nJSJPKovg0_jSHtLdrMPDqesAIlFKCuXPXYxpsyWBDw</Error>
-          <Impression>https://e.api.bliink.io/e?name=impression&token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MzQwMzA1MjcsImlhdCI6MTYzMzQyNTcyNywiaXNzIjoiYmxpaW5rIiwiZGF0YSI6eyJ0eXBlIjoiYWQtc2VydmVyIiwidHJhbnNhY3Rpb25JZCI6ImE2NjJjZGJmLTkzNDYtNDI0MS1iMTU0LTJhOTc2OTg0NjNmOSIsIm5ldHdvcmtJZCI6MjUsInNpdGVJZCI6MTQzLCJ0YWdJZCI6MTI3MSwiY29va2llSWQiOiIwNWFhN2UwMi05MzgzLTQ1NGYtOTJmZC1jOTE2YWNlMmUyZjYiLCJldmVudElkIjozLCJ0YXJnZXRpbmciOnsicGxhdGZvcm0iOiJXZWJzaXRlIiwicmVmZXJyZXIiOiJodHRwOi8vbG9jYWxob3N0OjgxODEvaW50ZWdyYXRpb25FeGFtcGxlcy9ncHQvYmxpaW5rLWluc3RyZWFtLmh0bWwiLCJwYWdlVXJsIjoiaHR0cDovL2xvY2FsaG9zdDo4MTgxL2ludGVncmF0aW9uRXhhbXBsZXMvZ3B0L2JsaWluay1pbnN0cmVhbS5odG1sIiwiaXAiOiIzMS4zOS4xNDEuMTQwIiwidGltZSI6MTYzMzQyNTcyNywibG9jYXRpb24iOnsibGF0aXR1ZGUiOjQ4Ljk0MjIsImxvbmdpdHVkZSI6Mi41MDM5LCJyZWdpb24iOiJJREYiLCJjb3VudHJ5IjoiRlIiLCJjaXR5IjoiQXVsbmF5LXNvdXMtQm9pcyIsInppcENvZGUiOiI5MzYwMCIsImRlcGFydG1lbnQiOiI5MyJ9LCJjaXR5IjoiQXVsbmF5LXNvdXMtQm9pcyIsImNvdW50cnkiOiJGUiIsImRldmljZU9zIjoibWFjT1MiLCJkZXZpY2VQbGF0Zm9ybSI6IldlYnNpdGUiLCJyYXdVc2VyQWdlbnQiOiJNb3ppbGxhLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xNV83KSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvOTMuMC40NTc3LjYzIFNhZmFyaS81MzcuMzYiLCJjb250ZW50Q2xhc3NpZmljYXRpb24iOnsiYnJhbmRzYWZlIjpmYWxzZX19LCJnZHByIjp7Imhhc0NvbnNlbnQiOnRydWV9LCJ3aW4iOmZhbHNlLCJhZElkIjo1NzkzLCJhZHZlcnRpc2VySWQiOjEsImNhbXBhaWduSWQiOjEsImNyZWF0aXZlSWQiOjExOTQsImVycm9yIjpmYWxzZX19.nJSJPKovg0_jSHtLdrMPDqesAIlFKCuXPXYxpsyWBDw</Impression>
-          <Extensions><Price>1</Price><Currency>EUR</Currency>
-        </Wrapper>
-      </Ad>
-    </VAST>
-    `
+    body: { bids: [
+      {
+        'creative': {
+          'video': {
+            'content': isInvalidVast ? invalidVast : validVast,
+            'height': 250,
+            'width': 300
+          },
+          'media_type': 'video',
+          'creativeId': 0,
+        },
+        'price': 0,
+        'id': '8121',
+        'token': 'token',
+        'mode': 'rtb',
+        'extras': {
+          'deal_id': '34567ertyaza',
+          'transaction_id': '2def0c5b2a7f6e'
+        },
+        'currency': 'EUR'
+      }
+    ],
+    userSyncs: []}
   }
 }
 
@@ -261,31 +330,6 @@ describe('BLIINK Adapter getMetaList', function() {
  * @description Array of tests used in describe function below
  * @type {[{args: {fn: (string|Document)}, want: string, title: string}, {args: {fn: (string|Document)}, want: string, title: string}]}
  */
-const testsParseXML = [
-  {
-    title: 'Should return null, if content length equal to 0',
-    args: {
-      fn: parseXML('')
-    },
-    want: null,
-  },
-  {
-    title: 'Should return null, if content isnt string',
-    args: {
-      fn: parseXML({})
-    },
-    want: null,
-  },
-]
-
-describe('BLIINK Adapter parseXML', function() {
-  for (const test of testsParseXML) {
-    it(test.title, () => {
-      const res = test.args.fn
-      expect(res).to.eql(test.want)
-    })
-  }
-})
 
 /**
  *
@@ -334,29 +378,67 @@ describe('BLIINK Adapter isBidRequestValid', function() {
   }
 })
 
+const vastXml = getConfigInterpretResponseRTB().body.bids[0].creative.video.content
+
 const testsInterpretResponse = [
   {
     title: 'Should construct bid for video instream',
     args: {
-      fn: spec.interpretResponse(getConfigInterpretResponseRTB(false), getConfigBuildRequest('video'))
+      fn: spec.interpretResponse(getConfigInterpretResponseRTB(false))
     },
-    want: {
+    want: [{
       cpm: 0,
       currency: 'EUR',
       height: 250,
       width: 300,
-      creativeId: 0,
+      creativeId: '34567ertyaza',
       mediaType: 'video',
-      netRevenue: false,
+      netRevenue: true,
       requestId: '2def0c5b2a7f6e',
       ttl: 3600,
-      vastXml: getConfigInterpretResponseRTB().body,
-    }
+      vastXml,
+      vastUrl: 'data:text/xml;charset=utf-8;base64,' + btoa(vastXml.replace(/\\"/g, '"'))
+    }]
   },
   {
     title: 'ServerResponse with message: invalid tag, return empty array',
     args: {
-      fn: spec.interpretResponse(getConfigInterpretResponse(true), getConfigBuildRequest('banner'))
+      fn: spec.interpretResponse(getConfigInterpretResponse(true))
+    },
+    want: []
+  },
+  {
+    title: 'ServerResponse with mediaType banner',
+    args: {
+      fn: spec.interpretResponse({body: {bids: [getConfigBannerBid()]}}),
+    },
+    want: [{
+      ad: '',
+      cpm: 1,
+      creativeId: '34567erty',
+      currency: 'EUR',
+      height: 250,
+      mediaType: 'banner',
+      netRevenue: true,
+      requestId: '2def0c5b2a7f6e',
+      ttl: 3600,
+      width: 300
+    }]
+  },
+  {
+    title: 'ServerResponse with unhandled mediaType, return empty array',
+    args: {
+      fn: spec.interpretResponse({body: {bids: [{...getConfigBannerBid(),
+        creative: {
+          unknown: {
+            adm: '',
+            height: 250,
+            width: 300,
+          },
+          media_type: 'unknown',
+          creativeId: 125,
+          requestId: '2def0c5b2a7f6e',
+        }}]}}),
     },
     want: []
   },
@@ -391,6 +473,7 @@ describe('BLIINK Adapter interpretResponse', function() {
  *      }
  *    }, want, title: string}]}
  */
+
 const testsBuildBid = [
   {
     title: 'Should return null if no bid passed in parameters',
@@ -409,7 +492,7 @@ const testsBuildBid = [
   {
     title: 'input data respect the output model for video',
     args: {
-      fn: buildBid(getConfigBid('video'), getConfigCreativeVideo())
+      fn: buildBid(getConfigVideoBid('video'), getConfigCreativeVideo())
     },
     want: {
       requestId: getConfigBid('video').bidId,
@@ -418,16 +501,47 @@ const testsBuildBid = [
       mediaType: 'video',
       width: 300,
       height: 250,
-      creativeId: getConfigCreativeVideo().creativeId,
-      netRevenue: false,
-      vastXml: getConfigCreativeVideo().content,
+      creativeId: getConfigVideoBid().extras.deal_id,
+      netRevenue: true,
+      vastXml: getConfigCreativeVideo().vastXml,
+      vastUrl: 'data:text/xml;charset=utf-8;base64,' + btoa(getConfigCreativeVideo().vastXml.replace(/\\"/g, '"')),
+      ttl: 3600,
+    }
+  },
+  {
+    title: 'use default height width output model for video',
+    args: {
+      fn: buildBid({...getConfigVideoBid('video'),
+        creative: {
+          video: {
+            content:
+            '<VAST></VAST>',
+            height: null,
+            width: null,
+          },
+          media_type: 'video',
+          creativeId: getConfigVideoBid().extras.deal_id,
+          requestId: '2def0c5b2a7f6e',
+        }}, getConfigCreativeVideo())
+    },
+    want: {
+      requestId: getConfigBid('video').bidId,
+      cpm: 1,
+      currency: 'EUR',
+      mediaType: 'video',
+      width: 1,
+      height: 1,
+      creativeId: getConfigVideoBid().extras.deal_id,
+      netRevenue: true,
+      vastXml: getConfigCreativeVideo().vastXml,
+      vastUrl: 'data:text/xml;charset=utf-8;base64,' + btoa(getConfigCreativeVideo().vastXml.replace(/\\"/g, '"')),
       ttl: 3600,
     }
   },
   {
     title: 'input data respect the output model for banner',
     args: {
-      fn: buildBid(getConfigBid('banner'), getConfigCreative())
+      fn: buildBid(getConfigBannerBid())
     },
     want: {
       requestId: getConfigBid('banner').bidId,
@@ -436,10 +550,10 @@ const testsBuildBid = [
       mediaType: 'banner',
       width: 300,
       height: 250,
-      creativeId: getConfigCreative().id,
-      ad: getConfigCreative().content.creative.adm,
+      creativeId: getConfigCreative().creativeId,
+      ad: getConfigBannerBid().creative.banner.adm,
       ttl: 3600,
-      netRevenue: false,
+      netRevenue: true,
     }
   }
 ]
@@ -471,23 +585,27 @@ const testsBuildRequests = [
       fn: spec.buildRequests([], getConfigBuildRequest('banner'))
     },
     want: {
-      method: 'GET',
-      url: `${BLIINK_ENDPOINT_ENGINE}/${getConfigBuildRequest('banner').bids[0].params.tagId}`,
-      params: {
-        bidderRequestId: getConfigBuildRequest('banner').bidderRequestId,
-        bidderCode: getConfigBuildRequest('banner').bidderCode,
-        bids: getConfigBuildRequest('banner').bids,
-        refererInfo: getConfigBuildRequest('banner').refererInfo.legacy
-      },
+      method: 'POST',
+      url: BLIINK_ENDPOINT_ENGINE,
       data: {
-        gdpr: false,
-        gdpr_consent: '',
-        height: 250,
-        width: 300,
         keywords: '',
         pageDescription: '',
         pageTitle: '',
         pageUrl: 'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
+        tags: [
+          {
+            transactionId: '2def0c5b2a7f6e',
+            id: '14f30eca-85d2-11e8-9eed-0242ac120007',
+            imageUrl: '',
+            mediaTypes: ['banner'],
+            sizes: [
+              {
+                h: 250,
+                w: 300,
+              },
+            ],
+          },
+        ]
       }
     }
   },
@@ -502,23 +620,83 @@ const testsBuildRequests = [
       }))
     },
     want: {
-      method: 'GET',
-      url: `${BLIINK_ENDPOINT_ENGINE}/${getConfigBuildRequest('banner').bids[0].params.tagId}`,
-      params: {
-        bidderRequestId: getConfigBuildRequest('banner').bidderRequestId,
-        bidderCode: getConfigBuildRequest('banner').bidderCode,
-        bids: getConfigBuildRequest('banner').bids,
-        refererInfo: getConfigBuildRequest('banner').refererInfo.legacy
-      },
+      method: 'POST',
+      url: BLIINK_ENDPOINT_ENGINE,
       data: {
         gdpr: true,
-        gdpr_consent: 'XXXX',
+        gdprConsent: 'XXXX',
         pageDescription: '',
         pageTitle: '',
         keywords: '',
         pageUrl: 'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
-        height: 250,
-        width: 300,
+        tags: [
+          {
+            transactionId: '2def0c5b2a7f6e',
+            id: '14f30eca-85d2-11e8-9eed-0242ac120007',
+            imageUrl: '',
+            mediaTypes: ['banner'],
+            sizes: [
+              {
+                h: 250,
+                w: 300,
+              },
+            ],
+          },
+        ]
+      }
+    }
+  },
+  {
+    title: 'Should build request width schain if exists',
+    args: {
+      fn: spec.buildRequests([{schain: {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{
+          asi: 'ssp.test',
+          sid: '00001',
+          hp: 1
+        }]
+      }}], Object.assign(getConfigBuildRequest('banner'), {
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: 'XXXX'
+        },
+      }))
+    },
+    want: {
+      method: 'POST',
+      url: BLIINK_ENDPOINT_ENGINE,
+      data: {
+        gdpr: true,
+        gdprConsent: 'XXXX',
+        pageDescription: '',
+        pageTitle: '',
+        keywords: '',
+        pageUrl: 'http://localhost:9999/integrationExamples/gpt/bliink-adapter.html?pbjs_debug=true',
+        schain: {
+          ver: '1.0',
+          complete: 1,
+          nodes: [{
+            asi: 'ssp.test',
+            sid: '00001',
+            hp: 1
+          }]
+        },
+        tags: [
+          {
+            transactionId: '2def0c5b2a7f6e',
+            id: '14f30eca-85d2-11e8-9eed-0242ac120007',
+            imageUrl: '',
+            mediaTypes: ['banner'],
+            sizes: [
+              {
+                h: 250,
+                w: 300,
+              },
+            ],
+          },
+        ]
       }
     }
   }
@@ -533,7 +711,7 @@ describe('BLIINK Adapter buildRequests', function() {
   }
 })
 
-const getSyncOptions = (pixelEnabled = true, iframeEnabled = 'false') => {
+const getSyncOptions = (pixelEnabled = true, iframeEnabled = false) => {
   return {
     pixelEnabled,
     iframeEnabled
@@ -543,7 +721,15 @@ const getSyncOptions = (pixelEnabled = true, iframeEnabled = 'false') => {
 const getServerResponses = () => {
   return [
     {
-      body: '<VAST></VAST>',
+      body: {bids: [],
+        userSyncs: [ {
+          type: 'script',
+          url: 'https://prg.smartadserver.com/ac?out=js&nwid=3392&siteid=305791&pgname=rg&fmtid=81127&tgt=[sas_target]&visit=m&tmstp=[timestamp]&clcturl=[countgo]'
+        },
+        {
+          type: 'image',
+          url: 'https://sync.smartadserver.com/getuid?nwid=3392&consentString=XXX&url=https%3A%2F%2Fcookiesync.api.bliink.io%2Fcookiesync%3Fpartner%3Dsmart%26uid%3D%5Bsas_uid%5D'
+        }]},
     }
   ]
 }
@@ -551,7 +737,8 @@ const getServerResponses = () => {
 const getGdprConsent = () => {
   return {
     gdprApplies: 1,
-    consentString: 'XXX'
+    consentString: 'XXX',
+    apiVersion: 2
   }
 }
 
@@ -569,39 +756,39 @@ const testsGetUserSyncs = [
       {
         type: 'image',
         url: 'https://sync.smartadserver.com/getuid?nwid=3392&consentString=XXX&url=https%3A%2F%2Fcookiesync.api.bliink.io%2Fcookiesync%3Fpartner%3Dsmart%26uid%3D%5Bsas_uid%5D'
-      },
-      {
-        type: 'image',
-        url: 'https://ad.360yield.com/server_match?partner_id=1531&consentString=XXX&r=https%3A%2F%2Fcookiesync.api.bliink.io%2Fcookiesync%3Fpartner%3Dazerion%26uid%3D%7BPUB_USER_ID%7D',
-      },
-      {
-        type: 'image',
-        url: 'https://ads.stickyadstv.com/auto-user-sync?consentString=XXX',
-      },
-      {
-        type: 'image',
-        url: 'https://cookiesync.api.bliink.io/getuid?url=https%3A%2F%2Fvisitor.omnitagjs.com%2Fvisitor%2Fsync%3Fuid%3D1625272249969090bb9d544bd6d8d645%26name%3DBLIINK%26visitor%3D%24UID%26external%3Dtrue&consentString=XXX',
-      },
-      {
-        type: 'image',
-        url: 'https://cookiesync.api.bliink.io/getuid?url=https://pixel.advertising.com/ups/58444/sync?&gdpr=1&gdpr_consent=XXX&redir=true&uid=$UID',
-      },
+      }
+    ]
+  },
+  {
+    title: 'Should return iframe cookie sync if iframeEnabled',
+    args: {
+      fn: spec.getUserSyncs(getSyncOptions(true, true), getServerResponses(), getGdprConsent())
+    },
+    want: [
       {
-        type: 'image',
-        url: 'https://ups.analytics.yahoo.com/ups/58499/occ?gdpr=1&gdpr_consent=XXX',
+        type: 'iframe',
+        url: `${BLIINK_ENDPOINT_COOKIE_SYNC_IFRAME}?gdpr=${getGdprConsent().gdprApplies}&coppa=0&gdprConsent=${getGdprConsent().consentString}&apiVersion=${getGdprConsent().apiVersion}`
       },
+    ]
+  },
+  {
+    title: 'ccpa',
+    args: {
+      fn: spec.getUserSyncs(getSyncOptions(true, true), getServerResponses(), getGdprConsent(), 'ccpa-consent')
+    },
+    want: [
       {
-        type: 'image',
-        url: 'https://secure.adnxs.com/getuid?https%3A%2F%2Fcookiesync.api.bliink.io%2Fcookiesync%3Fpartner%3Dazerion%26uid%3D%24UID',
+        type: 'iframe',
+        url: `${BLIINK_ENDPOINT_COOKIE_SYNC_IFRAME}?gdpr=${getGdprConsent().gdprApplies}&coppa=0&uspConsent=ccpa-consent&gdprConsent=${getGdprConsent().consentString}&apiVersion=${getGdprConsent().apiVersion}`
       },
     ]
   },
   {
-    title: 'Should not have gdpr consent',
+    title: 'Should output sync if no gdprConsent',
     args: {
       fn: spec.getUserSyncs(getSyncOptions(), getServerResponses())
     },
-    want: []
+    want: getServerResponses()[0].body.userSyncs
   }
 ]
 

From 99e38773bbd5171cb8d58f69c7410d12211bb0d6 Mon Sep 17 00:00:00 2001
From: Dejan Grbavcic <grajzer@users.noreply.github.com>
Date: Tue, 19 Jul 2022 12:33:50 +0200
Subject: [PATCH 037/569] TargetVideo Bid Adapter: Add GDPR/USP support (#8589)

* TargetVideo bid adapter

* TargetVideo bid adapter

* TargetVideo bid adapter

* TargetVideo Bid Adapter: Add GDPR/USP support

* TargetVideo Bid Adapter: Add GDPR/USP support tests
---
 modules/targetVideoBidAdapter.js              | 18 ++++++++
 .../modules/targetVideoBidAdapter_spec.js     | 43 +++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/modules/targetVideoBidAdapter.js b/modules/targetVideoBidAdapter.js
index 4deb63b6426..f8cb58218cd 100644
--- a/modules/targetVideoBidAdapter.js
+++ b/modules/targetVideoBidAdapter.js
@@ -42,6 +42,24 @@ export const spec = {
       },
       schain: schain
     };
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      payload.gdpr_consent = {
+        consent_string: bidderRequest.gdprConsent.consentString,
+        consent_required: bidderRequest.gdprConsent.gdprApplies
+      };
+
+      if (bidderRequest.gdprConsent.addtlConsent && bidderRequest.gdprConsent.addtlConsent.indexOf('~') !== -1) {
+        let ac = bidderRequest.gdprConsent.addtlConsent;
+        let acStr = ac.substring(ac.indexOf('~') + 1);
+        payload.gdpr_consent.addtl_consent = acStr.split('.').map(id => parseInt(id, 10));
+      }
+    }
+
+    if (bidderRequest && bidderRequest.uspConsent) {
+      payload.us_privacy = bidderRequest.uspConsent
+    }
+
     return formatRequest(payload, bidderRequest);
   },
 
diff --git a/test/spec/modules/targetVideoBidAdapter_spec.js b/test/spec/modules/targetVideoBidAdapter_spec.js
index 0ce6f0fb70d..adbc982e509 100644
--- a/test/spec/modules/targetVideoBidAdapter_spec.js
+++ b/test/spec/modules/targetVideoBidAdapter_spec.js
@@ -93,4 +93,47 @@ describe('TargetVideo Bid Adapter', function() {
     expect(bid.ad).to.include('<script src="https://player.target-video.com/custom/targetvideo-banner.js"></script>')
     expect(bid.ad).to.include('initPlayer')
   });
+
+  it('Test GDPR consent information is present in the request', function () {
+    let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+    let bidderRequest = {
+      'bidderCode': 'targetVideo',
+      'auctionId': '1d1a030790a475',
+      'bidderRequestId': '22edbae2733bf6',
+      'timeout': 3000,
+      'gdprConsent': {
+        consentString: consentString,
+        gdprApplies: true,
+        addtlConsent: '1~7.12.35.62.66.70.89.93.108'
+      }
+    };
+    bidderRequest.bids = bannerRequest;
+
+    const request = spec.buildRequests(bannerRequest, bidderRequest);
+    expect(request.options).to.deep.equal({withCredentials: true});
+    const payload = JSON.parse(request.data);
+
+    expect(payload.gdpr_consent).to.exist;
+    expect(payload.gdpr_consent.consent_string).to.exist.and.to.equal(consentString);
+    expect(payload.gdpr_consent.consent_required).to.exist.and.to.be.true;
+    expect(payload.gdpr_consent.addtl_consent).to.exist.and.to.deep.equal([7, 12, 35, 62, 66, 70, 89, 93, 108]);
+  });
+
+  it('Test US Privacy string is present in the request', function() {
+    let consentString = '1YA-';
+    let bidderRequest = {
+      'bidderCode': 'targetVideo',
+      'auctionId': '1d1a030790a475',
+      'bidderRequestId': '22edbae2733bf6',
+      'timeout': 3000,
+      'uspConsent': consentString
+    };
+    bidderRequest.bids = bannerRequest;
+
+    const request = spec.buildRequests(bannerRequest, bidderRequest);
+    const payload = JSON.parse(request.data);
+
+    expect(payload.us_privacy).to.exist;
+    expect(payload.us_privacy).to.exist.and.to.equal(consentString);
+  });
 });

From 1a9f4c0629384d865dce981edd26f98b1f829cfa Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 19 Jul 2022 11:06:35 -0700
Subject: [PATCH 038/569] Core & multiple modules: refactor usage of Promise to
 avoid deferrals when possible (#8626)

* Core & multiple modules: refactor usage of Promise to avoid deferrals when possible

* Unhandled rejection handling

* Improve tests
---
 modules/currency.js                        |   4 +-
 modules/userId/index.js                    |  60 ++--
 src/auction.js                             |  11 +-
 src/consentHandler.js                      |  22 +-
 src/debugging.js                           |   8 +-
 src/hook.js                                |   4 +-
 src/utils.js                               |   5 +-
 src/utils/promise.js                       | 117 ++++++--
 test/helpers/consentData.js                |   3 +-
 test/helpers/syncPromise.js                |  71 -----
 test/spec/auctionmanager_spec.js           |   7 +-
 test/spec/debugging_spec.js                |   4 +-
 test/spec/modules/idxIdSystem_spec.js      |   2 +-
 test/spec/modules/parrableIdSystem_spec.js |   3 +-
 test/spec/modules/userId_spec.js           |  17 +-
 test/spec/unit/pbjs_api_spec.js            |   6 +-
 test/spec/unit/utils/promise_spec.js       | 321 ++++++++++++++++++---
 17 files changed, 471 insertions(+), 194 deletions(-)
 delete mode 100644 test/helpers/syncPromise.js

diff --git a/modules/currency.js b/modules/currency.js
index 289ec8fbf69..392817b5822 100644
--- a/modules/currency.js
+++ b/modules/currency.js
@@ -5,7 +5,7 @@ import CONSTANTS from '../src/constants.json';
 import { ajax } from '../src/ajax.js';
 import { config } from '../src/config.js';
 import { getHook } from '../src/hook.js';
-import {promiseControls} from '../src/utils/promise.js';
+import {defer} from '../src/utils/promise.js';
 
 const DEFAULT_CURRENCY_RATE_URL = 'https://cdn.jsdelivr.net/gh/prebid/currency-file@1/latest.json?date=$$TODAY$$';
 const CURRENCY_RATE_PRECISION = 4;
@@ -24,7 +24,7 @@ var defaultRates;
 export const ready = (() => {
   let ctl;
   function reset() {
-    ctl = promiseControls();
+    ctl = defer();
   }
   reset();
   return {done: () => ctl.resolve(), reset, promise: () => ctl.promise}
diff --git a/modules/userId/index.js b/modules/userId/index.js
index 7edc2862b57..ecc494846ee 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -152,7 +152,7 @@ import {
   isEmpty
 } from '../../src/utils.js';
 import {getPPID as coreGetPPID} from '../../src/adserver.js';
-import {promiseControls} from '../../src/utils/promise.js';
+import {defer, GreedyPromise} from '../../src/utils/promise.js';
 import {hasPurpose1Consent} from '../../src/utils/gpdr.js';
 
 const MODULE_NAME = 'User ID';
@@ -504,15 +504,11 @@ function addIdDataToAdUnitBids(adUnits, submodules) {
   });
 }
 
-function delayFor(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 const INIT_CANCELED = {};
 
-function idSystemInitializer({delay = delayFor} = {}) {
-  const startInit = promiseControls();
-  const startCallbacks = promiseControls();
+function idSystemInitializer({delay = GreedyPromise.timeout} = {}) {
+  const startInit = defer();
+  const startCallbacks = defer();
   let cancel;
   let initialized = false;
 
@@ -520,8 +516,8 @@ function idSystemInitializer({delay = delayFor} = {}) {
     if (cancel != null) {
       cancel.reject(INIT_CANCELED);
     }
-    cancel = promiseControls();
-    return Promise.race([promise, cancel.promise]);
+    cancel = defer();
+    return GreedyPromise.race([promise, cancel.promise]);
   }
 
   // grab a reference to global vars so that the promise chains remain isolated;
@@ -540,7 +536,7 @@ function idSystemInitializer({delay = delayFor} = {}) {
   }
 
   let done = cancelAndTry(
-    Promise.all([hooksReady, startInit.promise])
+    GreedyPromise.all([hooksReady, startInit.promise])
       .then(() => gdprDataHandler.promise)
       .then(checkRefs((consentData) => {
         initSubmodules(initModules, allModules, consentData);
@@ -549,7 +545,7 @@ function idSystemInitializer({delay = delayFor} = {}) {
       .then(checkRefs(() => {
         const modWithCb = initModules.filter(item => isFn(item.callback));
         if (modWithCb.length) {
-          return new Promise((resolve) => processSubmoduleCallbacks(modWithCb, resolve));
+          return new GreedyPromise((resolve) => processSubmoduleCallbacks(modWithCb, resolve));
         }
       }))
   );
@@ -573,7 +569,7 @@ function idSystemInitializer({delay = delayFor} = {}) {
         });
       }
     }
-    if (refresh) {
+    if (refresh && initialized) {
       done = cancelAndTry(
         done
           .catch(() => null)
@@ -588,7 +584,7 @@ function idSystemInitializer({delay = delayFor} = {}) {
               return sm.callback != null;
             });
             if (cbModules.length) {
-              return new Promise((resolve) => processSubmoduleCallbacks(cbModules, resolve));
+              return new GreedyPromise((resolve) => processSubmoduleCallbacks(cbModules, resolve));
             }
           }))
       );
@@ -621,8 +617,8 @@ function getPPID() {
  * @param {Object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
  * @param {function} fn required; The next function in the chain, used by hook.js
  */
-export function requestBidsHook(fn, reqBidsConfigObj, {delay = delayFor} = {}) {
-  Promise.race([
+export function requestBidsHook(fn, reqBidsConfigObj, {delay = GreedyPromise.timeout} = {}) {
+  GreedyPromise.race([
     getUserIdsAsync(),
     delay(auctionDelay)
   ]).then(() => {
@@ -767,7 +763,16 @@ function refreshUserIds({submoduleNames} = {}, callback) {
  */
 
 function getUserIdsAsync() {
-  return initIdSystem().then(() => getUserIds(), (e) => e === INIT_CANCELED ? getUserIdsAsync() : Promise.reject(e));
+  return initIdSystem().then(
+    () => getUserIds(),
+    (e) =>
+      e === INIT_CANCELED
+        // there's a pending refresh - because GreedyPromise runs this synchronously, we are now in the middle
+        // of canceling the previous init, before the refresh logic has had a chance to run.
+        // Use a "normal" Promise to clear the stack and let it complete (or this will just recurse infinitely)
+        ? Promise.resolve().then(getUserIdsAsync)
+        : GreedyPromise.reject(e)
+  );
 }
 
 /**
@@ -914,6 +919,8 @@ function updateSubmodules() {
     return;
   }
   // do this to avoid reprocessing submodules
+  // TODO: the logic does not match the comment - addedSubmodules is always a copy of submoduleRegistry
+  // (if it did it would not be correct - it's not enough to find new modules, as others may have been removed or changed)
   const addedSubmodules = submoduleRegistry.filter(i => !find(submodules, j => j.name === i.name));
 
   submodules.splice(0, submodules.length);
@@ -949,6 +956,17 @@ export function attachIdSystem(submodule) {
   if (!find(submoduleRegistry, i => i.name === submodule.name)) {
     submoduleRegistry.push(submodule);
     updateSubmodules();
+    // TODO: a test case wants this to work even if called after init (the setConfig({userId}))
+    // so we trigger a refresh. But is that even possible outside of tests?
+    initIdSystem({refresh: true, submoduleNames: [submodule.name]});
+  }
+}
+
+function normalizePromise(fn) {
+  // for public methods that return promises, make sure we return a "normal" one - to avoid
+  // exposing confusing stack traces
+  return function() {
+    return Promise.resolve(fn.apply(this, arguments));
   }
 }
 
@@ -957,7 +975,7 @@ export function attachIdSystem(submodule) {
  * so a callback is added to fire after the consentManagement module.
  * @param {{getConfig:function}} config
  */
-export function init(config, {delay = delayFor} = {}) {
+export function init(config, {delay = GreedyPromise.timeout} = {}) {
   ppidSource = undefined;
   submodules = [];
   configRegistry = [];
@@ -1002,10 +1020,10 @@ export function init(config, {delay = delayFor} = {}) {
   // exposing getUserIds function in global-name-space so that userIds stored in Prebid can be used by external codes.
   (getGlobal()).getUserIds = getUserIds;
   (getGlobal()).getUserIdsAsEids = getUserIdsAsEids;
-  (getGlobal()).getEncryptedEidsForSource = getEncryptedEidsForSource;
+  (getGlobal()).getEncryptedEidsForSource = normalizePromise(getEncryptedEidsForSource);
   (getGlobal()).registerSignalSources = registerSignalSources;
-  (getGlobal()).refreshUserIds = refreshUserIds;
-  (getGlobal()).getUserIdsAsync = getUserIdsAsync;
+  (getGlobal()).refreshUserIds = normalizePromise(refreshUserIds);
+  (getGlobal()).getUserIdsAsync = normalizePromise(getUserIdsAsync);
   (getGlobal()).getUserIdsAsEidBySource = getUserIdsAsEidBySource;
 }
 
diff --git a/src/auction.js b/src/auction.js
index fb9c6302e74..a1d6261201f 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -76,6 +76,7 @@ import {bidderSettings} from './bidderSettings.js';
 import * as events from './events.js'
 import adapterManager from './adapterManager.js';
 import CONSTANTS from './constants.json';
+import {GreedyPromise} from './utils/promise.js';
 
 const { syncUsers } = userSync;
 
@@ -384,9 +385,9 @@ export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionM
 
   function waitFor(requestId, result) {
     if (ready[requestId] == null) {
-      ready[requestId] = Promise.resolve();
+      ready[requestId] = GreedyPromise.resolve();
     }
-    ready[requestId] = ready[requestId].then(() => Promise.resolve(result).catch(() => {}))
+    ready[requestId] = ready[requestId].then(() => GreedyPromise.resolve(result).catch(() => {}))
   }
 
   function guard(bidderRequest, fn) {
@@ -398,9 +399,9 @@ export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionM
     const wait = ready[bidderRequest.bidderRequestId];
     const orphanWait = ready['']; // also wait for "orphan" responses that are not associated with any request
     if ((wait != null || orphanWait != null) && timeRemaining > 0) {
-      Promise.race([
-        new Promise((resolve) => setTimeout(resolve, timeRemaining)),
-        Promise.resolve(orphanWait).then(() => wait)
+      GreedyPromise.race([
+        GreedyPromise.timeout(timeRemaining),
+        GreedyPromise.resolve(orphanWait).then(() => wait)
       ]).then(fn);
     } else {
       fn();
diff --git a/src/consentHandler.js b/src/consentHandler.js
index a56d06c8c90..861a9894a2c 100644
--- a/src/consentHandler.js
+++ b/src/consentHandler.js
@@ -1,10 +1,10 @@
 import {isStr, timestamp} from './utils.js';
+import {defer, GreedyPromise} from './utils/promise.js';
 
 export class ConsentHandler {
   #enabled;
   #data;
-  #promise;
-  #resolve;
+  #defer;
   #ready;
   generatedTime;
 
@@ -12,17 +12,17 @@ export class ConsentHandler {
     this.reset();
   }
 
+  #resolve(data) {
+    this.#ready = true;
+    this.#data = data;
+    this.#defer.resolve(data);
+  }
+
   /**
    * reset this handler (mainly for tests)
    */
   reset() {
-    this.#promise = new Promise((resolve) => {
-      this.#resolve = (data) => {
-        this.#ready = true;
-        this.#data = data;
-        resolve(data);
-      };
-    });
+    this.#defer = defer();
     this.#enabled = false;
     this.#data = null;
     this.#ready = false;
@@ -56,12 +56,12 @@ export class ConsentHandler {
    */
   get promise() {
     if (this.#ready) {
-      return Promise.resolve(this.#data);
+      return GreedyPromise.resolve(this.#data);
     }
     if (!this.#enabled) {
       this.#resolve(null);
     }
-    return this.#promise;
+    return this.#defer.promise;
   }
 
   setConsentData(data, time = timestamp()) {
diff --git a/src/debugging.js b/src/debugging.js
index aae92197096..817ec66e320 100644
--- a/src/debugging.js
+++ b/src/debugging.js
@@ -4,6 +4,7 @@ import {getGlobal} from './prebidGlobal.js';
 import {logMessage, prefixLog} from './utils.js';
 import {createBid} from './bidfactory.js';
 import {loadExternalScript} from './adloader.js';
+import {GreedyPromise} from './utils/promise.js';
 
 export const DEBUG_KEY = '__$$PREBID_GLOBAL$$_debugging__';
 
@@ -12,7 +13,7 @@ function isDebuggingInstalled() {
 }
 
 function loadScript(url) {
-  return new Promise((resolve) => {
+  return new GreedyPromise((resolve) => {
     loadExternalScript(url, 'debugging', resolve);
   });
 }
@@ -21,7 +22,8 @@ export function debuggingModuleLoader({alreadyInstalled = isDebuggingInstalled,
   let loading = null;
   return function () {
     if (loading == null) {
-      loading = new Promise((resolve, reject) => {
+      loading = new GreedyPromise((resolve, reject) => {
+        // run this in a 0-delay timeout to give installedModules time to be populated
         setTimeout(() => {
           if (alreadyInstalled()) {
             resolve();
@@ -44,7 +46,7 @@ export function debuggingControls({load = debuggingModuleLoader(), hook = getHoo
   let promise = null;
   let enabled = false;
   function waitForDebugging(next, ...args) {
-    return (promise || Promise.resolve()).then(() => next.apply(this, args))
+    return (promise || GreedyPromise.resolve()).then(() => next.apply(this, args))
   }
   function enable() {
     if (!enabled) {
diff --git a/src/hook.js b/src/hook.js
index c3f897a6bca..226c49daeae 100644
--- a/src/hook.js
+++ b/src/hook.js
@@ -1,11 +1,11 @@
 import funHooks from 'fun-hooks/no-eval/index.js';
-import {promiseControls} from './utils/promise.js';
+import {defer} from './utils/promise.js';
 
 export let hook = funHooks({
   ready: funHooks.SYNC | funHooks.ASYNC | funHooks.QUEUE
 });
 
-const readyCtl = promiseControls();
+const readyCtl = defer();
 hook.ready = (() => {
   const ready = hook.ready;
   return function () {
diff --git a/src/utils.js b/src/utils.js
index ede171936cc..b53475af912 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -2,6 +2,7 @@ import { config } from './config.js';
 import clone from 'just-clone';
 import {find, includes} from './polyfill.js';
 import CONSTANTS from './constants.json';
+import {GreedyPromise} from './utils/promise.js';
 export { default as deepAccess } from 'dlv/index.js';
 export { default as deepSetValue } from 'dset';
 
@@ -487,7 +488,7 @@ export function hasOwn(objectToCheck, propertyToCheckFor) {
 * @param {HTMLElement} [doc]
 * @param {HTMLElement} [target]
 * @param {Boolean} [asLastChildChild]
-* @return {HTMLElement}
+* @return {HTML Element}
 */
 export function insertElement(elm, doc, target, asLastChildChild) {
   doc = doc || document;
@@ -517,7 +518,7 @@ export function insertElement(elm, doc, target, asLastChildChild) {
  */
 export function waitForElementToLoad(element, timeout) {
   let timer = null;
-  return new Promise((resolve) => {
+  return new GreedyPromise((resolve) => {
     const onLoad = function() {
       element.removeEventListener('load', onLoad);
       element.removeEventListener('error', onLoad);
diff --git a/src/utils/promise.js b/src/utils/promise.js
index 8b7f9d9d40d..229056786d2 100644
--- a/src/utils/promise.js
+++ b/src/utils/promise.js
@@ -1,36 +1,111 @@
 const SUCCESS = 0;
 const FAIL = 1;
-const RESULT = 2;
 
 /**
- * @returns a {promise, resolve, reject} trio where `promise` is resolved by calling `resolve` or `reject`.
+ * A version of Promise that runs callbacks synchronously when it can (i.e. after it's been fulfilled or rejected).
  */
-export function promiseControls({promiseFactory = (resolver) => new Promise(resolver)} = {}) {
-  const status = {};
+export class GreedyPromise extends Promise {
+  #result;
+  #callbacks;
+  #parent = null;
+
+  /**
+   * Convenience wrapper for setTimeout; takes care of returning an already fulfilled GreedyPromise when the delay is zero.
+   *
+   * @param {Number} delayMs delay in milliseconds
+   * @returns {GreedyPromise} a promise that resolves (to undefined) in `delayMs` milliseconds
+   */
+  static timeout(delayMs = 0) {
+    return new GreedyPromise((resolve) => {
+      delayMs === 0 ? resolve() : setTimeout(resolve, delayMs);
+    });
+  }
 
-  function finisher(slot) {
-    return function (val) {
-      if (typeof status[slot] === 'function') {
-        status[slot](val);
-      } else if (!status[slot]) {
-        status[slot] = true;
-        status[RESULT] = val;
+  constructor(resolver) {
+    const result = [];
+    const callbacks = [];
+    function handler(type, resolveFn) {
+      return function (value) {
+        if (!result.length) {
+          result.push(type, value);
+          while (callbacks.length) callbacks.shift()();
+          resolveFn(value);
+        }
+      }
+    }
+    super(
+      typeof resolver !== 'function'
+        ? resolver // let super throw an error
+        : (resolve, reject) => {
+          const rejectHandler = handler(FAIL, reject);
+          const resolveHandler = (() => {
+            const done = handler(SUCCESS, resolve);
+            return value =>
+              typeof value?.then === 'function' ? value.then(done, rejectHandler) : done(value);
+          })();
+          try {
+            resolver(resolveHandler, rejectHandler);
+          } catch (e) {
+            rejectHandler(e);
+          }
+        }
+    );
+    this.#result = result;
+    this.#callbacks = callbacks;
+  }
+  then(onSuccess, onError) {
+    if (typeof onError === 'function') {
+      // if an error handler is provided, attach a dummy error handler to super,
+      // and do the same for all promises without an error handler that precede this one in a chain.
+      // This is to avoid unhandled rejection events / warnings for errors that were, in fact, handled;
+      // since we are not using super's callback mechanisms we need to make it aware of this separately.
+      let node = this;
+      while (node) {
+        super.then.call(node, null, () => null);
+        const next = node.#parent;
+        node.#parent = null; // since we attached a handler already, we are no longer interested in what will happen later in the chain
+        node = next;
       }
     }
+    const result = this.#result;
+    const res = new GreedyPromise((resolve, reject) => {
+      const continuation = () => {
+        let value = result[1];
+        let [handler, resolveFn] = result[0] === SUCCESS ? [onSuccess, resolve] : [onError, reject];
+        if (typeof handler === 'function') {
+          try {
+            value = handler(value);
+          } catch (e) {
+            reject(e);
+            return;
+          }
+          resolveFn = resolve;
+        }
+        resolveFn(value);
+      }
+      result.length ? continuation() : this.#callbacks.push(continuation);
+    });
+    res.#parent = this;
+    return res;
   }
+}
+
+/**
+ * @returns a {promise, resolve, reject} trio where `promise` is resolved by calling `resolve` or `reject`.
+ */
+export function defer({promiseFactory = (resolver) => new GreedyPromise(resolver)} = {}) {
+  function invoker(delegate) {
+    return (val) => delegate(val);
+  }
+
+  let resolveFn, rejectFn;
 
   return {
     promise: promiseFactory((resolve, reject) => {
-      if (status[SUCCESS] != null) {
-        resolve(status[RESULT]);
-      } else if (status[FAIL] != null) {
-        reject(status[RESULT]);
-      } else {
-        status[SUCCESS] = resolve;
-        status[FAIL] = reject;
-      }
+      resolveFn = resolve;
+      rejectFn = reject;
     }),
-    resolve: finisher(SUCCESS),
-    reject: finisher(FAIL)
+    resolve: invoker(resolveFn),
+    reject: invoker(rejectFn)
   }
 }
diff --git a/test/helpers/consentData.js b/test/helpers/consentData.js
index 17ddc583f88..b59388d67f2 100644
--- a/test/helpers/consentData.js
+++ b/test/helpers/consentData.js
@@ -1,6 +1,7 @@
 import {gdprDataHandler} from 'src/adapterManager.js';
+import {GreedyPromise} from '../../src/utils/promise.js';
 
 export function mockGdprConsent(sandbox, getConsentData = () => null) {
-  sandbox.stub(gdprDataHandler, 'promise').get(() => Promise.resolve(getConsentData()));
+  sandbox.stub(gdprDataHandler, 'promise').get(() => GreedyPromise.resolve(getConsentData()));
   sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(getConsentData)
 }
diff --git a/test/helpers/syncPromise.js b/test/helpers/syncPromise.js
deleted file mode 100644
index 99361bd716e..00000000000
--- a/test/helpers/syncPromise.js
+++ /dev/null
@@ -1,71 +0,0 @@
-const orig = {};
-['resolve', 'reject', 'all', 'race', 'allSettled'].forEach((k) => orig[k] = Promise[k].bind(Promise))
-
-// Callbacks attached through Promise.resolve(value).then(...) will usually
-// not execute immediately even if `value` is immediately available. This
-// breaks tests that were written before promises even though they are semantically still valid.
-// They can be made to work by making promises quasi-synchronous.
-
-export function SyncPromise(value, fail = false) {
-  if (value instanceof SyncPromise) {
-    return value;
-  } else if (typeof value === 'object' && typeof value.then === 'function') {
-    return orig.resolve(value);
-  } else {
-    Object.assign(this, {
-      then: function (cb, err) {
-        const handler = fail ? err : cb;
-        if (handler != null) {
-          return new SyncPromise(handler(value));
-        } else {
-          return this;
-        }
-      },
-      catch: function (cb) {
-        if (fail) {
-          return new SyncPromise(cb(value))
-        } else {
-          return this;
-        }
-      },
-      finally: function (cb) {
-        cb();
-        return this;
-      },
-      __value: fail ? {status: 'rejected', reason: value} : {status: 'fulfilled', value}
-    })
-  }
-}
-
-Object.assign(SyncPromise, {
-  resolve: (val) => new SyncPromise(val),
-  reject: (val) => new SyncPromise(val, true),
-  race: (promises) => promises.find((p) => p instanceof SyncPromise) || orig.race(promises),
-  allSettled: (promises) => {
-    if (promises.every((p) => p instanceof SyncPromise)) {
-      return new SyncPromise(promises.map((p) => p.__value))
-    } else {
-      return orig.allSettled(promises);
-    }
-  },
-  all: (promises) => {
-    if (promises.every((p) => p instanceof SyncPromise)) {
-      return SyncPromise.allSettled(promises).then((result) => {
-        const err = result.find((r) => r.status === 'rejected');
-        if (err != null) {
-          return new SyncPromise(err.reason, true);
-        } else {
-          return new SyncPromise(result.map((r) => r.value))
-        }
-      })
-    } else {
-      return orig.all(promises);
-    }
-  }
-})
-
-export function synchronizePromise(sandbox) {
-  Object.keys(orig).forEach((k) => {
-    sandbox.stub(window.Promise, k).callsFake(SyncPromise[k]);
-  })
-}
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index 48b915c77f6..49ae13c43cc 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -21,7 +21,6 @@ import {auctionManager} from '../../src/auctionManager.js';
 import 'modules/debugging/index.js' // some tests look for debugging side effects
 import {AuctionIndex} from '../../src/auctionIndex.js';
 import {expect} from 'chai';
-import {synchronizePromise} from '../helpers/syncPromise.js';
 
 var assert = require('assert');
 
@@ -134,7 +133,7 @@ function mockAjaxBuilder() {
 }
 
 describe('auctionmanager.js', function () {
-  let indexAuctions, indexStub, promiseSandbox;
+  let indexAuctions, indexStub
 
   before(() => {
     // hooks are global and their side effects depend on what has been loaded
@@ -150,13 +149,10 @@ describe('auctionmanager.js', function () {
     indexAuctions = [];
     indexStub = sinon.stub(auctionManager, 'index');
     indexStub.get(() => new AuctionIndex(() => indexAuctions));
-    promiseSandbox = sinon.createSandbox();
-    synchronizePromise(promiseSandbox);
   });
 
   afterEach(() => {
     indexStub.restore();
-    promiseSandbox.restore();
   });
 
   describe('getKeyValueTargetingPairs', function () {
@@ -1458,7 +1454,6 @@ describe('auctionmanager.js', function () {
       }
 
       beforeEach(() => {
-        promiseSandbox.restore();
         bids = [
           mockBid({bidderCode: BIDDER_CODE1}),
           mockBid({bidderCode: BIDDER_CODE})
diff --git a/test/spec/debugging_spec.js b/test/spec/debugging_spec.js
index 34eafbda61a..8408ceec367 100644
--- a/test/spec/debugging_spec.js
+++ b/test/spec/debugging_spec.js
@@ -1,6 +1,6 @@
 import {ready, loadSession, getConfig, reset, debuggingModuleLoader, debuggingControls} from '../../src/debugging.js';
 import {getGlobal} from '../../src/prebidGlobal.js';
-import {promiseControls} from '../../src/utils/promise.js';
+import {defer} from '../../src/utils/promise.js';
 import funHooks from 'fun-hooks/no-eval/index.js';
 
 describe('Debugging', () => {
@@ -67,7 +67,7 @@ describe('Debugging', () => {
     let debugging, loader, hook, hookRan;
 
     beforeEach(() => {
-      loader = promiseControls();
+      loader = defer();
       hookRan = false;
       hook = funHooks()('sync', () => { hookRan = true });
       debugging = debuggingControls({load: sinon.stub().returns(loader.promise), hook});
diff --git a/test/spec/modules/idxIdSystem_spec.js b/test/spec/modules/idxIdSystem_spec.js
index 7d008ef0d28..56e1c709c8b 100644
--- a/test/spec/modules/idxIdSystem_spec.js
+++ b/test/spec/modules/idxIdSystem_spec.js
@@ -94,8 +94,8 @@ describe('IDx ID System', () => {
       adUnits = [getAdUnitMock()];
       init(config);
       setSubmoduleRegistry([idxIdSubmodule]);
-      config.setConfig(getConfigMock());
       getCookieStub.withArgs(IDX_COOKIE_NAME).returns(IDX_COOKIE_STORED);
+      config.setConfig(getConfigMock());
     });
 
     afterEach(() => {
diff --git a/test/spec/modules/parrableIdSystem_spec.js b/test/spec/modules/parrableIdSystem_spec.js
index 506aa4914c5..55287e0bfec 100644
--- a/test/spec/modules/parrableIdSystem_spec.js
+++ b/test/spec/modules/parrableIdSystem_spec.js
@@ -655,7 +655,6 @@ describe('Parrable ID System', function() {
       writeParrableCookie({ eid: P_COOKIE_EID, ibaOptout: true });
       init(config);
       setSubmoduleRegistry([parrableIdSubmodule]);
-      config.setConfig(getConfigMock());
     });
 
     afterEach(function() {
@@ -665,6 +664,7 @@ describe('Parrable ID System', function() {
     });
 
     it('when a stored Parrable ID exists it is added to bids', function(done) {
+      config.setConfig(getConfigMock());
       requestBidsHook(function() {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
@@ -691,6 +691,7 @@ describe('Parrable ID System', function() {
     it('supplies an optout reason when the EID is missing due to CCPA non-consent', function(done) {
       // the ID system itself will not write a cookie with an EID when CCPA=true
       writeParrableCookie({ ccpaOptout: true });
+      config.setConfig(getConfigMock());
 
       requestBidsHook(function() {
         adUnits.forEach(unit => {
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 49c07bb1334..486018d41c4 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -466,6 +466,7 @@ describe('User ID', function () {
     describe('refreshing before init is complete', () => {
       const MOCK_ID = {'MOCKID': '1111'};
       let mockIdCallback;
+      let startInit;
 
       beforeEach(() => {
         mockIdCallback = sinon.stub();
@@ -480,7 +481,7 @@ describe('User ID', function () {
         };
         init(config);
         setSubmoduleRegistry([mockIdSystem]);
-        config.setConfig({
+        startInit = () => config.setConfig({
           userSync: {
             auctionDelay: 10,
             userIds: [{
@@ -492,6 +493,7 @@ describe('User ID', function () {
       });
 
       it('should still resolve promises returned by getUserIdsAsync', () => {
+        startInit();
         let result = null;
         getGlobal().getUserIdsAsync().then((val) => { result = val; });
         return clearStack().then(() => {
@@ -506,6 +508,7 @@ describe('User ID', function () {
       it('should not stop auctions', (done) => {
         // simulate an infinite `auctionDelay`; refreshing should still allow the auction to continue
         // as soon as ID submodules have completed init
+        startInit();
         requestBidsHook(() => {
           done();
         }, {adUnits: [getAdUnitMock()]}, {delay: delay()});
@@ -519,6 +522,7 @@ describe('User ID', function () {
       it('should not get stuck when init fails', () => {
         const err = new Error();
         mockIdCallback.callsFake(() => { throw err; });
+        startInit();
         return getGlobal().getUserIdsAsync().catch((e) =>
           expect(e).to.equal(err)
         );
@@ -2531,7 +2535,6 @@ describe('User ID', function () {
 
         // init id system
         attachIdSystem(mockIdSystem);
-        config.setConfig(userIdConfig);
       });
 
       afterEach(function () {
@@ -2542,6 +2545,8 @@ describe('User ID', function () {
         coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
         coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 1 * 1000).toUTCString()), expStr);
 
+        config.setConfig(userIdConfig);
+
         let innerAdUnits;
         return runBidsHook((config) => {
           innerAdUnits = config.adUnits
@@ -2556,6 +2561,8 @@ describe('User ID', function () {
         coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
         coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 60 * 1000).toUTCString()), expStr);
 
+        config.setConfig(userIdConfig);
+
         let innerAdUnits;
         return runBidsHook((config) => {
           innerAdUnits = config.adUnits
@@ -2572,6 +2579,8 @@ describe('User ID', function () {
 
         setStoredConsentData();
 
+        config.setConfig(userIdConfig);
+
         let innerAdUnits;
         return runBidsHook((config) => {
           innerAdUnits = config.adUnits
@@ -2588,6 +2597,8 @@ describe('User ID', function () {
 
         setStoredConsentData({...consentData, consentString: 'different'});
 
+        config.setConfig(userIdConfig);
+
         let innerAdUnits;
         return runBidsHook((config) => {
           innerAdUnits = config.adUnits
@@ -2604,6 +2615,8 @@ describe('User ID', function () {
 
         setStoredConsentData({...consentData});
 
+        config.setConfig(userIdConfig);
+
         let innerAdUnits;
         return runBidsHook((config) => {
           innerAdUnits = config.adUnits
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index 1abb89f3d24..ca646743147 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -16,7 +16,6 @@ import * as auctionModule from 'src/auction.js';
 import { registerBidder } from 'src/adapters/bidderFactory.js';
 import { _sendAdToCreative } from 'src/secureCreatives.js';
 import {find} from 'src/polyfill.js';
-import {synchronizePromise} from '../../helpers/syncPromise.js';
 import * as pbjsModule from 'src/prebid.js';
 import {hook} from '../../../src/hook.js';
 import {reset as resetDebugging} from '../../../src/debugging.js';
@@ -195,7 +194,7 @@ window.apntag = {
 }
 
 describe('Unit: Prebid Module', function () {
-  let bidExpiryStub, promiseSandbox;
+  let bidExpiryStub
 
   before(() => {
     hook.ready();
@@ -204,15 +203,12 @@ describe('Unit: Prebid Module', function () {
   });
 
   beforeEach(function () {
-    promiseSandbox = sinon.createSandbox();
-    synchronizePromise(promiseSandbox);
     bidExpiryStub = sinon.stub(filters, 'isBidNotExpired').callsFake(() => true);
     configObj.setConfig({ useBidCache: true });
     resetAuctionState();
   });
 
   afterEach(function() {
-    promiseSandbox.restore();
     $$PREBID_GLOBAL$$.adUnits = [];
     bidExpiryStub.restore();
     configObj.setConfig({ useBidCache: false });
diff --git a/test/spec/unit/utils/promise_spec.js b/test/spec/unit/utils/promise_spec.js
index ee2d55bf9a5..a931b8bc9c4 100644
--- a/test/spec/unit/utils/promise_spec.js
+++ b/test/spec/unit/utils/promise_spec.js
@@ -1,49 +1,294 @@
-import {promiseControls} from '../../../../src/utils/promise.js';
+import {GreedyPromise, defer} from '../../../../src/utils/promise.js';
 
-describe('promiseControls', () => {
-  function lazyControls() {
-    // NOTE: here we are testing that calling resolve / reject works correctly regardless of whether the
-    // browser runs promise resolvers before / after returning control to the code; e.g. with the following:
-    //
-    // new Promise(() => console.log('1')); console.log('2')
-    //
-    // it seems that the browser will output '1', then '2' - but is it always guaranteed to do so?
-    // it's not clear from MDN (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/Promise)
-    // so here we make sure it works in both cases.
-
-    return promiseControls({
-      promiseFactory: (r) => ({
-        then: function () {
-          const p = new Promise(r);
-          return p.then.apply(p, arguments);
+describe('GreedyPromise', () => {
+  it('throws when resolver is not a function', () => {
+    expect(() => new GreedyPromise()).to.throw();
+  })
+
+  Object.entries({
+    'resolved': (use) => new GreedyPromise((resolve) => use(resolve)),
+    'rejected': (use) => new GreedyPromise((_, reject) => use(reject))
+  }).forEach(([t, makePromise]) => {
+    it(`runs callbacks immediately when ${t}`, () => {
+      let cbRan = false;
+      const cb = () => { cbRan = true };
+      let resolver;
+      makePromise((fn) => { resolver = fn }).then(cb, cb);
+      resolver();
+      expect(cbRan).to.be.true;
+    })
+  });
+
+  describe('unhandled rejections', () => {
+    let unhandled, done, stop;
+
+    function reset(expectUnhandled) {
+      let pending = expectUnhandled;
+      let resolver;
+      unhandled.reset();
+      unhandled.callsFake(() => {
+        pending--;
+        if (pending === 0) {
+          resolver();
         }
       })
-    })
-  }
+      done = new Promise((resolve) => {
+        resolver = resolve;
+        stop = function () {
+          if (expectUnhandled === 0) {
+            resolve()
+          } else {
+            resolver = resolve;
+          }
+        }
+      })
+    }
+
+    before(() => {
+      unhandled = sinon.stub();
+      window.addEventListener('unhandledrejection', unhandled);
+    });
+
+    after(() => {
+      window.removeEventListener('unhandledrejection', unhandled);
+    });
+
+    function getUnhandledErrors() {
+      return unhandled.args.map((args) => args[0].reason);
+    }
+
+    Object.entries({
+      'simple reject': [1, (P) => { P.reject('err'); stop() }],
+      'caught reject': [0, (P) => P.reject('err').catch((e) => { stop(); return e })],
+      'unhandled reject with finally': [1, (P) => P.reject('err').finally(() => 'finally')],
+      'error handler that throws': [1, (P) => P.reject('err').catch((e) => { stop(); throw e })],
+      'rejection handled later in the chain': [0, (P) => P.reject('err').then((v) => v).catch((e) => { stop(); return e })],
+      'multiple errors in one chain': [1, (P) => P.reject('err').then((v) => v).catch((e) => e).then((v) => { stop(); return P.reject(v) })],
+      'multiple errors in one chain, all handled': [0, (P) => P.reject('err').then((v) => v).catch((e) => e).then((v) => P.reject(v)).catch((e) => { stop(); return e })],
+      'separate chains for rejection and handling': [1, (P) => {
+        const p = P.reject('err');
+        p.catch((e) => { stop(); return e; })
+        p.then((v) => v);
+      }],
+      'separate rejections merged without handling': [2, (P) => {
+        const p1 = P.reject('err1');
+        const p2 = P.reject('err2');
+        p1.then(() => p2).finally(stop);
+      }],
+      'separate rejections merged for handling': [0, (P) => {
+        const p1 = P.reject('err1');
+        const p2 = P.reject('err2');
+        P.all([p1, p2]).catch((e) => { stop(); return e });
+      }],
+      // eslint-disable-next-line no-throw-literal
+      'exception in resolver': [1, (P) => new P(() => { stop(); throw 'err'; })],
+      // eslint-disable-next-line no-throw-literal
+      'exception in resolver, caught': [0, (P) => new P(() => { throw 'err' }).catch((e) => { stop(); return e })],
+      'errors from nested promises': [1, (P) => new P((resolve) => setTimeout(() => { resolve(P.reject('err')); stop(); }))],
+      'errors from nested promises, caught': [0, (P) => new P((resolve) => setTimeout(() => resolve(P.reject('err')))).catch((e) => { stop(); return e })],
+    }).forEach(([t, [expectUnhandled, op]]) => {
+      describe(`on ${t}`, () => {
+        it('should match vanilla Promises', () => {
+          let vanillaUnhandled;
+          reset(expectUnhandled);
+          op(Promise);
+          return done.then(() => {
+            vanillaUnhandled = getUnhandledErrors();
+            reset(expectUnhandled);
+            op(GreedyPromise);
+            return done;
+          }).then(() => {
+            const actualUnhandled = getUnhandledErrors();
+            expect(actualUnhandled.length).to.eql(expectUnhandled);
+            expect(actualUnhandled).to.eql(vanillaUnhandled);
+          })
+        })
+      })
+    });
+  });
+
+  describe('idioms', () => {
+    let makePromise, pendingFailure, pendingSuccess;
+
+    Object.entries({
+      // eslint-disable-next-line no-throw-literal
+      'resolver that throws': (P) => new P(() => { throw 'error' }),
+      'resolver that resolves multiple times': (P) => new P((resolve) => { resolve('first'); resolve('second'); }),
+      'resolver that rejects multiple times': (P) => new P((resolve, reject) => { reject('first'); reject('second') }),
+      'resolver that resolves and rejects': (P) => new P((resolve, reject) => { reject('first'); resolve('second') }),
+      'resolver that resolves with multiple arguments': (P) => new P((resolve) => resolve('one', 'two')),
+      'resolver that rejects with multiple arguments': (P) => new P((resolve, reject) => reject('one', 'two')),
+      'resolver that resolves to a promise': (P) => new P((resolve) => resolve(makePromise(P, 'val'))),
+      'resolver that resolves to a promise that resolves to a promise': (P) => new P((resolve) => resolve(makePromise(P, makePromise(P, 'val')))),
+      'resolver that resolves to a rejected promise': (P) => new P((resolve) => resolve(makePromise(P, 'err', true))),
+      'simple .then': (P) => makePromise(P, 'value').then((v) => `${v} and then`),
+      'chained .then': (P) => makePromise(P, 'value').then((v) => makePromise(P, `${v} and then`)),
+      '.then with error handler': (P) => makePromise(P, 'err', true).then(null, (e) => `${e} and then`),
+      '.then with chained error handler': (P) => makePromise(P, 'err', true).then(null, (e) => makePromise(P, `${e} and then`)),
+      '.then that throws': (P) => makePromise(P, 'value').then((v) => { throw v }),
+      '.then that throws in error handler': (P) => makePromise(P, 'err', true).then(null, (e) => { throw e }),
+      '.then with no args': (P) => makePromise(P, 'value').then(),
+      '.then that rejects': (P) => makePromise(P, 'value').then((v) => P.reject(v)),
+      '.then that rejects in error handler': (P) => makePromise(P, 'err', true).then(null, (err) => P.reject(err)),
+      '.then with no error handler on a rejection': (P) => makePromise(P, 'err', true).then((v) => `resolved ${v}`),
+      '.then with no success handler on a resolution': (P) => makePromise(P, 'value').then(null, (e) => `caught ${e}`),
+      'simple .catch': (P) => makePromise(P, 'err', true).catch((err) => `caught ${err}`),
+      'identity .catch': (P) => makePromise(P, 'err', true).catch((err) => err).then((v) => v),
+      '.catch that throws': (P) => makePromise(P, 'err', true).catch((err) => { throw err }),
+      'chained .catch': (P) => makePromise(P, 'err', true).catch((err) => makePromise(P, err)),
+      'chained .catch that rejects': (P) => makePromise(P, 'err', true).catch((err) => P.reject(`reject with ${err}`)),
+      'simple .finally': (P) => {
+        let fval;
+        return makePromise(P, 'value')
+          .finally(() => fval = 'finally ran')
+          .then((val) => `${val} ${fval}`)
+      },
+      'chained .finally': (P) => {
+        let fval;
+        return makePromise(P, 'value')
+          .finally(() => pendingSuccess.then(() => { fval = 'finally ran' }))
+          .then((val) => `${val} ${fval}`)
+      },
+      '.finally on a rejection': (P) => {
+        let fval;
+        return makePromise(P, 'error', true)
+          .finally(() => { fval = 'finally' })
+          .catch((err) => `${err} ${fval}`)
+      },
+      'chained .finally on a rejection': (P) => {
+        let fval;
+        return makePromise(P, 'error', true)
+          .finally(() => pendingSuccess.then(() => { fval = 'finally' }))
+          .catch((err) => `${err} ${fval}`)
+      },
+      // eslint-disable-next-line no-throw-literal
+      '.finally that throws': (P) => makePromise(P, 'value').finally(() => { throw 'error' }),
+      'chained .finally that rejects': (P) => makePromise(P, 'value').finally(() => P.reject('error')),
+      'scalar Promise.resolve': (P) => P.resolve('scalar'),
+      'null Promise.resolve': (P) => P.resolve(null),
+      'chained Promise.resolve': (P) => P.resolve(pendingSuccess),
+      'chained Promise.resolve on failure': (P) => P.resolve(pendingFailure),
+      'scalar Promise.reject': (P) => P.reject('scalar'),
+      'chained Promise.reject': (P) => P.reject(pendingSuccess),
+      'chained Promise.reject on failure': (P) => P.reject(pendingFailure),
+      'simple Promise.all': (P) => P.all([makePromise(P, 'one'), makePromise(P, 'two')]),
+      'Promise.all with scalars': (P) => P.all([makePromise(P, 'one'), 'two']),
+      'Promise.all with errors': (P) => P.all([makePromise(P, 'one'), makePromise(P, 'two'), makePromise(P, 'err', true)]),
+      'Promise.allSettled': (P) => P.allSettled([makePromise(P, 'one', true), makePromise(P, 'two'), makePromise(P, 'three', true)]),
+      'Promise.allSettled with scalars': (P) => P.allSettled([makePromise(P, 'value'), 'scalar']),
+      'Promise.race that succeeds': (P) => P.race([makePromise(P, 'error', true, 10), makePromise(P, 'success')]),
+      'Promise.race that fails': (P) => P.race([makePromise(P, 'success', false, 10), makePromise(P, 'error', true)]),
+      'Promise.race with scalars': (P) => P.race(['scalar', makePromise(P, 'success')]),
+    }).forEach(([t, op]) => {
+      describe(t, () => {
+        describe('when mixed with deferrals', () => {
+          beforeEach(() => {
+            makePromise = function(ctor, value, fail = false, delay = 0) {
+              // eslint-disable-next-line new-cap
+              return new ctor((resolve, reject) => {
+                setTimeout(() => fail ? reject(value) : resolve(value), delay)
+              })
+            };
+            pendingSuccess = makePromise(Promise, 'pending result', false, 10);
+            pendingFailure = makePromise(Promise, 'pending failure', true, 10);
+          });
+
+          it(`behaves like vanilla promises`, () => {
+            const vanilla = op(Promise);
+            const greedy = op(GreedyPromise);
+            // note that we are not using `allSettled` & co to resolve our promises,
+            // to avoid transformations those methods do under the hood
+            const {actual = {}, expected = {}} = {};
+            return new Promise((resolve) => {
+              let pending = 2;
+              function collect(dest, slot) {
+                return function (value) {
+                  dest[slot] = value;
+                  pending--;
+                  if (pending === 0) {
+                    resolve()
+                  }
+                }
+              }
+              vanilla.then(collect(expected, 'success'), collect(expected, 'failure'));
+              greedy.then(collect(actual, 'success'), collect(actual, 'failure'));
+            }).then(() => {
+              expect(actual).to.eql(expected);
+            });
+          });
+
+          it(`once resolved, runs callbacks immediately`, () => {
+            const promise = op(GreedyPromise).catch(() => null);
+            return promise.then(() => {
+              let cbRan = false;
+              promise.then(() => { cbRan = true });
+              expect(cbRan).to.be.true;
+            });
+          });
+        });
+
+        describe('when all promises involved are greedy', () => {
+          beforeEach(() => {
+            makePromise = function(ctor, value, fail = false, delay = 0) {
+              // eslint-disable-next-line new-cap
+              return new ctor((resolve, reject) => {
+                const run = () => fail ? reject(value) : resolve(value);
+                delay === 0 ? run() : setTimeout(run, delay);
+              })
+            };
+            pendingSuccess = makePromise(GreedyPromise, 'pending result');
+            pendingFailure = makePromise(GreedyPromise, 'pending failure', true);
+          });
+
+          it('resolves immediately', () => {
+            let cbRan = false;
+            op(GreedyPromise).catch(() => null).then(() => { cbRan = true });
+            expect(cbRan).to.be.true;
+          });
+        });
+      });
+    });
+  });
+
+  describe('.timeout', () => {
+    const timeout = GreedyPromise.timeout;
+
+    it('should resolve immediately when ms is 0', () => {
+      let cbRan = false;
+      timeout(0.0).then(() => { cbRan = true });
+      expect(cbRan).to.be.true;
+    });
+
+    it('should schedule timeout on ms > 0', (done) => {
+      let cbRan = false;
+      timeout(5).then(() => { cbRan = true });
+      expect(cbRan).to.be.false;
+      setTimeout(() => {
+        expect(cbRan).to.be.true;
+        done();
+      }, 10)
+    });
+  });
+});
+
+describe('promiseControls', () => {
   Object.entries({
     'resolve': (p) => p,
     'reject': (p) => p.then(() => 'wrong', (v) => v)
   }).forEach(([method, transform]) => {
     describe(method, () => {
-      Object.entries({
-        'before the resolver': lazyControls,
-        'after the resolver': promiseControls,
-      }).forEach(([t, controls]) => {
-        describe(`when called ${t}`, () => {
-          it(`should ${method} the promise`, () => {
-            const ctl = controls();
-            ctl[method]('result');
-            return transform(ctl.promise).then((res) => expect(res).to.equal('result'));
-          });
+      it(`should ${method} the promise`, () => {
+        const ctl = defer();
+        ctl[method]('result');
+        return transform(ctl.promise).then((res) => expect(res).to.equal('result'));
+      });
 
-          it('should ignore calls after the first', () => {
-            const ctl = controls();
-            ctl[method]('result');
-            ctl[method]('other');
-            return transform(ctl.promise).then((res) => expect(res).to.equal('result'));
-          });
-        })
-      })
-    })
+      it('should ignore calls after the first', () => {
+        const ctl = defer();
+        ctl[method]('result');
+        ctl[method]('other');
+        return transform(ctl.promise).then((res) => expect(res).to.equal('result'));
+      });
+    });
   });
 });

From aa0fce8f8929ae93d7a5f4d49582c32bbba79d15 Mon Sep 17 00:00:00 2001
From: bretg <bgorsline@gmail.com>
Date: Wed, 20 Jul 2022 05:49:20 -0400
Subject: [PATCH 039/569] nextmillennium: update maintainer contact info
 (#8711)

Got a group that can help with maintenance questions instead of an individual
---
 modules/nextMillenniumBidAdapter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nextMillenniumBidAdapter.md b/modules/nextMillenniumBidAdapter.md
index 136f97d94d5..5374accfe35 100644
--- a/modules/nextMillenniumBidAdapter.md
+++ b/modules/nextMillenniumBidAdapter.md
@@ -2,7 +2,7 @@
 ```
 Module Name: NextMillennium Bid Adapter
 Module Type: Bidder Adapter
-Maintainer: mihail.ivanchenko@nextmillennium.io
+Maintainer: accountmanagers@nextmillennium.io
 ```
 
 # Description

From 8e945b40e1b3276d0be34b39293e84590ecbb57b Mon Sep 17 00:00:00 2001
From: JulieLorin <julie@hubvisor.io>
Date: Wed, 20 Jul 2022 11:52:44 +0200
Subject: [PATCH 040/569] Big Richemedia Adapter : fix Creative size (#8713)

---
 modules/big-richmediaBidAdapter.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/big-richmediaBidAdapter.js b/modules/big-richmediaBidAdapter.js
index 2ee31e8cfd6..8a03aac1ace 100644
--- a/modules/big-richmediaBidAdapter.js
+++ b/modules/big-richmediaBidAdapter.js
@@ -8,7 +8,7 @@ const BIDDER_CODE = 'big-richmedia';
 const metadataByRequestId = {};
 
 export const spec = {
-  version: '1.5.0',
+  version: '1.5.1',
   code: BIDDER_CODE,
   gvlid: baseAdapter.GVLID, // use base adapter gvlid
   supportedMediaTypes: [ BANNER, VIDEO ],
@@ -82,8 +82,8 @@ export const spec = {
       // This is a workaround needed for the rendering step (so that the adserver iframe does not get resized to 1800x1000
       // when there is skin demand
       if (format === 'skin') {
-        renderParams.width = 1
-        renderParams.height = 1
+        bid.width = 1
+        bid.height = 1
       }
 
       const encoded = window.btoa(JSON.stringify(renderParams));

From cb7c5101ecf981aec178c0b17d6a1a1adb69e5f3 Mon Sep 17 00:00:00 2001
From: Anass Seddiki <anass.seddiki@1plusx.com>
Date: Wed, 20 Jul 2022 17:29:09 +0200
Subject: [PATCH 041/569] Update 1plusX RTD Provider doc (#8714)

---
 modules/1plusXRtdProvider.md | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/1plusXRtdProvider.md b/modules/1plusXRtdProvider.md
index 75ad3b966d1..6a6211b37cc 100644
--- a/modules/1plusXRtdProvider.md
+++ b/modules/1plusXRtdProvider.md
@@ -8,9 +8,7 @@
 
 ## Description
 
-RTD provider for 1plusX. 
-Enriches the bidding object with Audience & Targeting data
-Contact dc-team-1px@triplelift.com for information.
+The 1plusX RTD module appends User and Contextual segments to the bidding object.
 
 ## Usage
 
@@ -47,14 +45,14 @@ pbjs.setConfig({
 
 ### Parameters 
 
-| Name              | Type          | Description                                                      | Notes                                                    |
-| :---------------- | :------------ | :--------------------------------------------------------------- |:-------------------------------------------------------- |
-| name              | String        | Real time data module name                                       | Always '1plusX'                                          |
-| waitForIt         | Boolean       | Should be `true` if there's an `auctionDelay` defined (optional) | `false`                                                  |
-| params            | Object        |                                                                  |                                                          |
-| params.customerId | String        | Your 1plusX customer id                                          |                                                          |
-| params.bidders    | Array<string> | List of bidders for which you would like data to be set          |                                                          |
-| params.timeout    | Integer       | timeout (ms)                                                     | 1000ms                                                   |
+| Name              | Type          | Description                                                      | Default           |
+| :---------------- | :------------ | :--------------------------------------------------------------- |:----------------- |
+| name              | String        | Real time data module name                                       | Always '1plusX'   |
+| waitForIt         | Boolean       | Should be `true` if there's an `auctionDelay` defined (optional) | `false`           |
+| params            | Object        |                                                                  |                   |
+| params.customerId | String        | Your 1plusX customer id                                          |                   |
+| params.bidders    | Array<string> | List of bidders for which you would like data to be set          |                   |
+| params.timeout    | Integer       | timeout (ms)                                                     | 1000ms            |
 
 ## Testing 
 

From 453ece28189c3851c07933e0e7eb17a653c7348b Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Wed, 20 Jul 2022 17:13:02 -0700
Subject: [PATCH 042/569] Rubicon Bid Adapter: Do not send storedrequests
 (#8717)

* do NOT send stored requests!

* set to undefined not delete faster?
---
 modules/rubiconBidAdapter.js                |  5 ++++
 test/spec/modules/rubiconBidAdapter_spec.js | 27 +++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index c551f8909cf..b08db65a6b6 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -320,6 +320,11 @@ export const spec = {
       // set ext.prebid.auctiontimestamp using auction time
       deepSetValue(data.imp[0], 'ext.prebid.auctiontimestamp', bidderRequest.auctionStart);
 
+      // set storedrequests to undefined so not sent to PBS
+      // top level and imp level both 'ext.prebid' objects are set above so no exception thrown here
+      data.ext.prebid.storedrequest = undefined;
+      data.imp[0].ext.prebid.storedrequest = undefined;
+
       return {
         method: 'POST',
         url: `https://${rubiConf.videoHost || 'prebid-server'}.rubiconproject.com/openrtb2/auction`,
diff --git a/test/spec/modules/rubiconBidAdapter_spec.js b/test/spec/modules/rubiconBidAdapter_spec.js
index ebfe6689a3e..fb1b336ef92 100644
--- a/test/spec/modules/rubiconBidAdapter_spec.js
+++ b/test/spec/modules/rubiconBidAdapter_spec.js
@@ -2139,6 +2139,33 @@ describe('the rubicon adapter', function () {
           expect(request.data.imp[0].ext.data.pbadslot).to.equal('1234567890');
         });
 
+        it('should NOT include storedrequests in pbs payload', function () {
+          createVideoBidderRequest();
+          bidderRequest.bids[0].ortb2 = {
+            ext: {
+              prebid: {
+                storedrequest: 'no-send-top-level-sr'
+              }
+            }
+          }
+
+          bidderRequest.bids[0].ortb2Imp = {
+            ext: {
+              prebid: {
+                storedrequest: 'no-send-imp-sr'
+              }
+            }
+          }
+
+          sandbox.stub(Date, 'now').callsFake(() =>
+            bidderRequest.auctionStart + 100
+          );
+
+          const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          expect(request.data.ext.prebid.storedrequest).to.be.undefined;
+          expect(request.data.imp[0].ext.prebid.storedrequest).to.be.undefined;
+        });
+
         it('should include GAM ad unit in bid request', function () {
           createVideoBidderRequest();
           bidderRequest.bids[0].ortb2Imp = {

From d86712fd171b5af1c4da50513eb10955a6b1622f Mon Sep 17 00:00:00 2001
From: pm-azhar-mulla <75726247+pm-azhar-mulla@users.noreply.github.com>
Date: Thu, 21 Jul 2022 15:41:20 +0530
Subject: [PATCH 043/569] PBS Bid Adapter: Setting bidderCode and adapterCode
 for a bid (#8696)

* Changed net revenue to True

* Added bidderCode and adapterCode to bidObject

* setting seat as default adapterCode

* removed bidderCode

* Added unit test cases

* cloned the test object

Co-authored-by: Azhar <azhar@L1119.local>
---
 modules/prebidServerBidAdapter/index.js       |  7 +++++++
 .../modules/prebidServerBidAdapter_spec.js    | 20 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index dcc39c75715..4007c67c82f 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -984,6 +984,13 @@ Object.assign(ORTB2.prototype, {
           });
           bidObject.requestTimestamp = this.requestTimestamp;
           bidObject.cpm = cpm;
+          if (bid?.ext?.prebid?.meta?.adaptercode) {
+            bidObject.adapterCode = bid.ext.prebid.meta.adaptercode;
+          } else if (bidRequest?.bidder) {
+            bidObject.adapterCode = bidRequest.bidder;
+          } else {
+            bidObject.adapterCode = seatbid.seat;
+          }
 
           // temporarily leaving attaching it to each bidResponse so no breaking change
           // BUT: this is a flat map, so it should be only attached to bidderRequest, a the change above does
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 6793bb988bf..1e81abda57e 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -2692,6 +2692,26 @@ describe('S2S Adapter', function () {
       sinon.assert.match(actual.imp[0], sinon.match(ortb2Imp));
     });
 
+    it('setting adapterCode for default bidder', function () {
+      config.setConfig({ CONFIG });
+      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB));
+
+      const response = addBidResponse.firstCall.args[1];
+      expect(response).to.have.property('adapterCode', 'appnexus');
+    });
+
+    it('setting adapterCode for alternate bidder', function () {
+      config.setConfig({ CONFIG });
+      let RESPONSE_OPENRTB2 = deepClone(RESPONSE_OPENRTB);
+      RESPONSE_OPENRTB2.seatbid[0].bid[0].ext.prebid.meta.adaptercode = 'appnexus2'
+      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB2));
+
+      const response = addBidResponse.firstCall.args[1];
+      expect(response).to.have.property('adapterCode', 'appnexus2');
+    });
+
     describe('on sync requested with no cookie', () => {
       let cfg, req, csRes;
 

From 9f9f58978ae5e0521b27fc382fb3ee0d50e10f20 Mon Sep 17 00:00:00 2001
From: onetag-dev <38786435+onetag-dev@users.noreply.github.com>
Date: Thu, 21 Jul 2022 12:22:15 +0200
Subject: [PATCH 044/569] onetag Bid Adapter : add support for price floors,
 supply chain, and gpid (#8675)

* Adds support for price floor, supply chain, GPID

* Removes unused import

* Updates onetag test file

* Remove trailing space

* Add unit tests for schain validation function

Co-authored-by: federico <f.liccione@onetag.com>
---
 modules/onetagBidAdapter.js                | 51 ++++++++++++++++---
 test/spec/modules/onetagBidAdapter_spec.js | 57 ++++++++++++++++++++--
 2 files changed, 97 insertions(+), 11 deletions(-)

diff --git a/modules/onetagBidAdapter.js b/modules/onetagBidAdapter.js
index 89c614dba23..0364acd5d21 100644
--- a/modules/onetagBidAdapter.js
+++ b/modules/onetagBidAdapter.js
@@ -1,13 +1,13 @@
 'use strict';
 
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import {INSTREAM, OUTSTREAM} from '../src/video.js';
-import {Renderer} from '../src/Renderer.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { INSTREAM, OUTSTREAM } from '../src/video.js';
+import { Renderer } from '../src/Renderer.js';
 import {find} from '../src/polyfill.js';
-import {getStorageManager} from '../src/storageManager.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {createEidsArray} from './userId/eids.js';
-import {deepClone} from '../src/utils.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { createEidsArray } from './userId/eids.js';
+import { deepClone, logError, deepAccess } from '../src/utils.js';
 
 const ENDPOINT = 'https://onetag-sys.com/prebid-request';
 const USER_SYNC_ENDPOINT = 'https://onetag-sys.com/usync/';
@@ -68,6 +68,9 @@ function buildRequests(validBidRequests, bidderRequest) {
   if (validBidRequests && validBidRequests.length !== 0 && validBidRequests[0].userId) {
     payload.userId = createEidsArray(validBidRequests[0].userId);
   }
+  if (validBidRequests && validBidRequests.length !== 0 && validBidRequests[0].schain && isSchainValid(validBidRequests[0].schain)) {
+    payload.schain = validBidRequests[0].schain;
+  }
   try {
     if (storage.hasLocalStorage()) {
       payload.onetagSid = storage.getDataFromLocalStorage('onetag_sid');
@@ -245,6 +248,7 @@ function requestsToBids(bidRequests) {
     // Other params
     videoObj['mediaTypeInfo'] = deepClone(bidRequest.mediaTypes.video);
     videoObj['type'] = VIDEO;
+    videoObj['priceFloors'] = getBidFloor(bidRequest, VIDEO, videoObj['playerSize']);
     return videoObj;
   });
   const bannerBidRequests = bidRequests.filter(bidRequest => isValid(BANNER, bidRequest)).map(bidRequest => {
@@ -253,6 +257,7 @@ function requestsToBids(bidRequests) {
     bannerObj['sizes'] = parseSizes(bidRequest);
     bannerObj['type'] = BANNER;
     bannerObj['mediaTypeInfo'] = deepClone(bidRequest.mediaTypes.banner);
+    bannerObj['priceFloors'] = getBidFloor(bidRequest, BANNER, bannerObj['sizes']);
     return bannerObj;
   });
   return videoBidRequests.concat(bannerBidRequests);
@@ -265,6 +270,7 @@ function setGeneralInfo(bidRequest) {
   this['bidderRequestId'] = bidRequest.bidderRequestId;
   this['auctionId'] = bidRequest.auctionId;
   this['transactionId'] = bidRequest.transactionId;
+  this['gpid'] = deepAccess(bidRequest, 'ortb2Imp.ext.gpid') || deepAccess(bidRequest, 'ortb2Imp.ext.data.pbadslot');
   this['pubId'] = params.pubId;
   this['ext'] = params.ext;
   if (params.pubClick) {
@@ -373,6 +379,37 @@ function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
   return syncs;
 }
 
+function getBidFloor(bidRequest, mediaType, sizes) {
+  const priceFloors = [];
+  if (typeof bidRequest.getFloor === 'function') {
+    sizes.forEach(size => {
+      const floor = bidRequest.getFloor({
+        currency: 'EUR',
+        mediaType: mediaType || '*',
+        size: [size.width, size.height]
+      });
+      floor.size = deepClone(size);
+      if (!floor.floor) { floor.floor = null; }
+      priceFloors.push(floor);
+    });
+  }
+  return priceFloors;
+}
+
+export function isSchainValid(schain) {
+  let isValid = false;
+  const requiredFields = ['asi', 'sid', 'hp'];
+  if (!schain || !schain.nodes) return isValid;
+  isValid = schain.nodes.reduce((status, node) => {
+    if (!status) return status;
+    return requiredFields.every(field => node.hasOwnProperty(field));
+  }, true);
+  if (!isValid) {
+    logError('OneTag: required schain params missing');
+  }
+  return isValid;
+}
+
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
diff --git a/test/spec/modules/onetagBidAdapter_spec.js b/test/spec/modules/onetagBidAdapter_spec.js
index f335f2ec62a..2dc0a43bbb0 100644
--- a/test/spec/modules/onetagBidAdapter_spec.js
+++ b/test/spec/modules/onetagBidAdapter_spec.js
@@ -1,4 +1,4 @@
-import { spec, isValid, hasTypeVideo } from 'modules/onetagBidAdapter.js';
+import { spec, isValid, hasTypeVideo, isSchainValid } from 'modules/onetagBidAdapter.js';
 import { expect } from 'chai';
 import {find} from 'src/polyfill.js';
 import { BANNER, VIDEO } from 'src/mediaTypes.js';
@@ -15,7 +15,21 @@ describe('onetag', function () {
       'bidId': '30b31c1838de1e',
       'bidderRequestId': '22edbae2733bf6',
       'auctionId': '1d1a030790a475',
-      'transactionId': 'qwerty123'
+      'transactionId': 'qwerty123',
+      'schain': {
+        'validation': 'off',
+        'config': {
+          'ver': '1.0',
+          'complete': 1,
+          'nodes': [
+            {
+              'asi': 'indirectseller.com',
+              'sid': '00001',
+              'hp': 1
+            }
+          ]
+        }
+      },
     };
   }
 
@@ -193,7 +207,8 @@ describe('onetag', function () {
               'context',
               'playerSize',
               'mediaTypeInfo',
-              'type'
+              'type',
+              'priceFloors'
             );
           } else if (isValid(BANNER, bid)) {
             expect(bid).to.have.all.keys(
@@ -205,9 +220,13 @@ describe('onetag', function () {
               'transactionId',
               'mediaTypeInfo',
               'sizes',
-              'type'
+              'type',
+              'priceFloors'
             );
           }
+          if (bid.schain && isSchainValid(bid.schain)) {
+            expect(data).to.have.all.keys('schain');
+          }
           expect(bid.bidId).to.be.a('string');
           expect(bid.pubId).to.be.a('string');
         }
@@ -358,6 +377,36 @@ describe('onetag', function () {
       expect(syncs[0].url).to.match(/(?:[?&](?:us_privacy=us_foo(?:[&][^&]*)*))+$/);
     });
   });
+  describe('isSchainValid', function () {
+    it('Should return false when schain is null or undefined', function () {
+      expect(isSchainValid(null)).to.be.false;
+      expect(isSchainValid(undefined)).to.be.false;
+    });
+    it('Should return false when schain is missing nodes key', function () {
+      const schain = {'otherKey': 'otherValue'};
+      expect(isSchainValid(schain)).to.be.false;
+    });
+    it('Should return false when schain is missing one of the required SupplyChainNode attribute', function () {
+      const missingAsiNode = {'sid': '00001', 'hp': 1};
+      const missingSidNode = {'asi': 'indirectseller.com', 'hp': 1};
+      const missingHpNode = {'asi': 'indirectseller.com', 'sid': '00001'};
+      expect(isSchainValid({'config': {'nodes': [missingAsiNode]}})).to.be.false;
+      expect(isSchainValid({'config': {'nodes': [missingSidNode]}})).to.be.false;
+      expect(isSchainValid({'config': {'nodes': [missingHpNode]}})).to.be.false;
+    });
+    it('Should return true when schain contains all required attributes', function () {
+      const validSchain = {
+        'nodes': [
+          {
+            'asi': 'indirectseller.com',
+            'sid': '00001',
+            'hp': 1
+          }
+        ]
+      };
+      expect(isSchainValid(validSchain)).to.be.true;
+    })
+  });
 });
 
 function getBannerVideoResponse() {

From f0596c4366fc3cb5b12b28ea44af8b54c9b6bbc9 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 21 Jul 2022 14:32:10 +0000
Subject: [PATCH 045/569] Prebid 7.7.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6b0a939a173..2f4ac5e0caf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.7.0-pre",
+  "version": "7.7.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 33dca05273f..e28267cd150 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.7.0-pre",
+  "version": "7.7.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From bef135eed895dadab0072a86afa291b7c1c6bc99 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 21 Jul 2022 14:32:10 +0000
Subject: [PATCH 046/569] Increment version to 7.8.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2f4ac5e0caf..19a4ed0770d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.7.0",
+  "version": "7.8.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index e28267cd150..5a4a3abdb10 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.7.0",
+  "version": "7.8.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From c4c621ab8e3b531b9c4866cbf1e01abef8dcb4e4 Mon Sep 17 00:00:00 2001
From: vfourny <109095331+vfourny-ogury@users.noreply.github.com>
Date: Thu, 21 Jul 2022 17:19:34 +0200
Subject: [PATCH 047/569] update ogury adapter (#8722)

---
 modules/oguryBidAdapter.js                | 2 +-
 test/spec/modules/oguryBidAdapter_spec.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/oguryBidAdapter.js b/modules/oguryBidAdapter.js
index 932d0d43f0e..e0630c7e412 100644
--- a/modules/oguryBidAdapter.js
+++ b/modules/oguryBidAdapter.js
@@ -11,7 +11,7 @@ const DEFAULT_TIMEOUT = 1000;
 const BID_HOST = 'https://mweb-hb.presage.io/api/header-bidding-request';
 const TIMEOUT_MONITORING_HOST = 'https://ms-ads-monitoring-events.presage.io';
 const MS_COOKIE_SYNC_DOMAIN = 'https://ms-cookie-sync.presage.io';
-const ADAPTER_VERSION = '1.2.12';
+const ADAPTER_VERSION = '1.2.13';
 
 function getClientWidth() {
   const documentElementClientWidth = window.top.document.documentElement.clientWidth
diff --git a/test/spec/modules/oguryBidAdapter_spec.js b/test/spec/modules/oguryBidAdapter_spec.js
index 028c780d9fb..8871d2d0886 100644
--- a/test/spec/modules/oguryBidAdapter_spec.js
+++ b/test/spec/modules/oguryBidAdapter_spec.js
@@ -279,7 +279,7 @@ describe('OguryBidAdapter', function () {
       },
       ext: {
         prebidversion: '$prebid.version$',
-        adapterversion: '1.2.12'
+        adapterversion: '1.2.13'
       },
       device: {
         w: stubbedWidth,
@@ -659,7 +659,7 @@ describe('OguryBidAdapter', function () {
           advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[0].adomain
         },
         nurl: openRtbBidResponse.body.seatbid[0].bid[0].nurl,
-        adapterVersion: '1.2.12',
+        adapterVersion: '1.2.13',
         prebidVersion: '$prebid.version$'
       }, {
         requestId: openRtbBidResponse.body.seatbid[0].bid[1].impid,
@@ -676,7 +676,7 @@ describe('OguryBidAdapter', function () {
           advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[1].adomain
         },
         nurl: openRtbBidResponse.body.seatbid[0].bid[1].nurl,
-        adapterVersion: '1.2.12',
+        adapterVersion: '1.2.13',
         prebidVersion: '$prebid.version$'
       }]
 

From 45b4dafc65555b4eca0a1251135f2f5d175179eb Mon Sep 17 00:00:00 2001
From: Michele Nasti <musikele@users.noreply.github.com>
Date: Thu, 21 Jul 2022 17:39:48 +0200
Subject: [PATCH 048/569] Rubicon Bid Adapter: remove fpd warning (#8688)

* remove fpd warning

* return undefined instead of skipping the if

Co-authored-by: Michele Nasti <michele@rtk.io>
---
 modules/rubiconBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index b08db65a6b6..192d5406b86 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -1032,7 +1032,7 @@ function applyFPD(bidRequest, mediaType, data) {
         if (segments.length > 0) return segments.toString();
       }).toString();
     } else if (typeof prop === 'object' && !Array.isArray(prop)) {
-      logWarn('Rubicon: Filtered FPD key: ', key, ': Expected value to be string, integer, or an array of strings/ints');
+      return undefined;
     } else if (typeof prop !== 'undefined') {
       return (Array.isArray(prop)) ? prop.filter(value => {
         if (typeof value !== 'object' && typeof value !== 'undefined') return value.toString();

From 16b74a7f275d12c9011e105b6cdb1243a6b13525 Mon Sep 17 00:00:00 2001
From: yieldlift <61510052+yieldlift@users.noreply.github.com>
Date: Thu, 21 Jul 2022 17:47:01 +0200
Subject: [PATCH 049/569] Yieldlift Bid Adapter: improve adomain (#8708)

* added meta.adomain

* Changing adomain parameter to advertiserDomains

* Merging master into branch

Co-authored-by: Danijel Predarski <danijel.p@whitecitysoft.com>
---
 modules/yieldliftBidAdapter.js                | 4 +---
 test/spec/modules/yieldliftBidAdapter_spec.js | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/yieldliftBidAdapter.js b/modules/yieldliftBidAdapter.js
index 9fe1bfe84fc..fddc9a0d50b 100644
--- a/modules/yieldliftBidAdapter.js
+++ b/modules/yieldliftBidAdapter.js
@@ -96,9 +96,7 @@ export const spec = {
           creativeId: bid.crid,
           netRevenue: DEFAULT_NET_REVENUE,
           currency: DEFAULT_CURRENCY,
-          meta: {
-            adomain: bid.adomain
-          }
+          meta: { advertiserDomains: bid && bid.advertiserDomains ? bid.advertiserDomains : [] }
         })
       })
     } else {
diff --git a/test/spec/modules/yieldliftBidAdapter_spec.js b/test/spec/modules/yieldliftBidAdapter_spec.js
index 86a7b83e2c6..abb5a868c77 100644
--- a/test/spec/modules/yieldliftBidAdapter_spec.js
+++ b/test/spec/modules/yieldliftBidAdapter_spec.js
@@ -45,7 +45,7 @@ const RESPONSE = {
             'price': 0.18,
             'adm': '<script>adm</script>',
             'adid': '144762342',
-            'adomain': [
+            'advertiserDomains': [
               'https://dummydomain.com'
             ],
             'iurl': 'iurl',
@@ -74,7 +74,7 @@ const RESPONSE = {
             'price': 0.1,
             'adm': '<script>adm2</script>',
             'adid': '144762342',
-            'adomain': [
+            'advertiserDomains': [
               'https://dummydomain.com'
             ],
             'iurl': 'iurl',
@@ -208,7 +208,7 @@ describe('YieldLift', function () {
         expect(bids[index]).to.have.property('height', RESPONSE.body.seatbid[0].bid[index].h);
         expect(bids[index]).to.have.property('ad', RESPONSE.body.seatbid[0].bid[index].adm);
         expect(bids[index]).to.have.property('creativeId', RESPONSE.body.seatbid[0].bid[index].crid);
-        expect(bids[index].meta).to.have.property('adomain', RESPONSE.body.seatbid[0].bid[index].adomain);
+        expect(bids[index].meta).to.have.property('advertiserDomains', RESPONSE.body.seatbid[0].bid[index].advertiserDomains);
         expect(bids[index]).to.have.property('ttl', 30);
         expect(bids[index]).to.have.property('netRevenue', true);
       }

From 2684aa35ce97ab04279bbe426891ac6b95e84186 Mon Sep 17 00:00:00 2001
From: Gabriel Chicoye <gabriel.chicoye@gmail.com>
Date: Thu, 21 Jul 2022 19:31:48 +0200
Subject: [PATCH 050/569] Prisma Bid Adapter: initial bid adapter release
 (#8681)

* prisma adapter added

* bidResponses.meta.advertiserDomains update

bidResponses.meta.advertiserDomains defaulted to []

* VideoExt removed from buildRequest

Not necessary for now

* Price floor removed

* Floor and keyword tests removed
---
 modules/prismaBidAdapter.js                | 199 ++++++++++++++++
 modules/prismaBidAdapter.md                |  59 +++++
 test/spec/modules/prismaBidAdapter_spec.js | 261 +++++++++++++++++++++
 3 files changed, 519 insertions(+)
 create mode 100644 modules/prismaBidAdapter.js
 create mode 100644 modules/prismaBidAdapter.md
 create mode 100644 test/spec/modules/prismaBidAdapter_spec.js

diff --git a/modules/prismaBidAdapter.js b/modules/prismaBidAdapter.js
new file mode 100644
index 00000000000..52a8c18a6fd
--- /dev/null
+++ b/modules/prismaBidAdapter.js
@@ -0,0 +1,199 @@
+import {ajax} from '../src/ajax.js';
+import {config} from '../src/config.js';
+import { transformBidderParamKeywords } from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'prisma';
+const BIDDER_URL = 'https://prisma.nexx360.io/prebid';
+const CACHE_URL = 'https://prisma.nexx360.io/cache';
+const METRICS_TRACKER_URL = 'https://prisma.nexx360.io/track-imp';
+
+const GVLID = 965;
+
+function getConnectionType() {
+  const connection = navigator.connection || navigator.webkitConnection;
+  if (!connection) {
+    return 0;
+  }
+  switch (connection.type) {
+    case 'ethernet':
+      return 1;
+    case 'wifi':
+      return 2;
+    case 'cellular':
+      switch (connection.effectiveType) {
+        case 'slow-2g':
+        case '2g':
+          return 4;
+        case '3g':
+          return 5;
+        case '4g':
+          return 6;
+        default:
+          return 3;
+      }
+    default:
+      return 0;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  aliases: ['prismadirect'], // short code
+  supportedMediaTypes: [BANNER, VIDEO],
+  /**
+         * Determines whether or not the given bid request is valid.
+         *
+         * @param {BidRequest} bid The bid params to validate.
+         * @return boolean True if this is a valid bid, and false otherwise.
+         */
+  isBidRequestValid: function(bid) {
+    return !!(bid.params.account && bid.params.tagId);
+  },
+  /**
+         * Make a server request from the list of BidRequests.
+         *
+         * @param {validBidRequests[]} - an array of bids
+         * @return ServerRequest Info describing the request to the server.
+         */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const adUnits = [];
+    const test = config.getConfig('debug') ? 1 : 0;
+    let adunitValue = null;
+    let userEids = null;
+    Object.keys(validBidRequests).forEach(key => {
+      adunitValue = validBidRequests[key];
+      const foo = {
+        account: adunitValue.params.account,
+        tagId: adunitValue.params.tagId,
+        label: adunitValue.adUnitCode,
+        bidId: adunitValue.bidId,
+        auctionId: adunitValue.auctionId,
+        transactionId: adunitValue.transactionId,
+        mediatypes: adunitValue.mediaTypes,
+        bidfloor: 0,
+        bidfloorCurrency: 'USD',
+        keywords: adunitValue.params.keywords ? transformBidderParamKeywords(adunitValue.params.keywords) : [],
+      }
+      adUnits.push(foo);
+      if (adunitValue.userIdAsEids) userEids = adunitValue.userIdAsEids;
+    });
+    const payload = {
+      adUnits,
+      // TODO: does the fallback make sense here?
+      href: encodeURIComponent(bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation)
+    };
+    if (bidderRequest) { // modules informations (gdpr, ccpa, schain, userId)
+      if (bidderRequest.gdprConsent) {
+        payload.gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
+        payload.gdprConsent = bidderRequest.gdprConsent.consentString;
+      } else {
+        payload.gdpr = 0;
+        payload.gdprConsent = '';
+      }
+      if (bidderRequest.uspConsent) { payload.uspConsent = bidderRequest.uspConsent; }
+      if (bidderRequest.schain) { payload.schain = bidderRequest.schain; }
+      if (userEids !== null) payload.userEids = userEids;
+    };
+    payload.connectionType = getConnectionType();
+
+    if (test) payload.test = 1;
+    const payloadString = JSON.stringify(payload);
+    return {
+      method: 'POST',
+      url: BIDDER_URL,
+      data: payloadString,
+    };
+  },
+  /**
+         * Unpack the response from the server into a list of bids.
+         *
+         * @param {ServerResponse} serverResponse A successful response from the server.
+         * @return {Bid[]} An array of bids which were nested inside the server.
+         */
+  interpretResponse: function(serverResponse, bidRequest) {
+    const serverBody = serverResponse.body;
+    const bidResponses = [];
+    let bidResponse = null;
+    let value = null;
+    if (serverBody.hasOwnProperty('responses')) {
+      Object.keys(serverBody['responses']).forEach(key => {
+        value = serverBody['responses'][key];
+        const url = `${CACHE_URL}?uuid=${value['uuid']}`;
+        bidResponse = {
+          requestId: value['bidId'],
+          cpm: value['cpm'],
+          currency: value['currency'],
+          width: value['width'],
+          height: value['height'],
+          ttl: value['ttl'],
+          creativeId: value['creativeId'],
+          netRevenue: true,
+          prisma: {
+            'ssp': value['bidder'],
+            'consent': value['consent'],
+            'tagId': value['tagId']
+          },
+          meta: {
+            'advertiserDomains': value['adomain'] || []
+          }
+        };
+        if (value.type === 'banner') bidResponse.adUrl = url;
+        if (value.type === 'video') {
+          const params = {
+            type: 'prebid',
+            mediatype: 'video',
+            ssp: value.bidder,
+            tag_id: value.tagId,
+            consent: value.consent,
+            price: value.cpm,
+          };
+          bidResponse.cpm = value.cpm;
+          bidResponse.mediaType = 'video';
+          bidResponse.vastUrl = url;
+          bidResponse.vastImpUrl = `${METRICS_TRACKER_URL}?${new URLSearchParams(params).toString()}`;
+        }
+        bidResponses.push(bidResponse);
+      });
+    }
+    return bidResponses;
+  },
+
+  /**
+     * Register the user sync pixels which should be dropped after the auction.
+     *
+     * @param {SyncOptions} syncOptions Which user syncs are allowed?
+     * @param {ServerResponse[]} serverResponses List of server's responses.
+     * @return {UserSync[]} The user syncs which should be dropped.
+     */
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    if (typeof serverResponses === 'object' && serverResponses != null && serverResponses.length > 0 && serverResponses[0].hasOwnProperty('body') &&
+        serverResponses[0].body.hasOwnProperty('cookies') && typeof serverResponses[0].body.cookies === 'object') {
+      return serverResponses[0].body.cookies.slice(0, 5);
+    } else {
+      return [];
+    }
+  },
+
+  /**
+     * Register bidder specific code, which will execute if a bid from this bidder won the auction
+     * @param {Bid} The bid that won the auction
+     */
+  onBidWon: function(bid) {
+    // fires a pixel to confirm a winning bid
+    const params = { type: 'prebid', mediatype: 'banner' };
+    if (bid.hasOwnProperty('prisma')) {
+      if (bid.prisma.hasOwnProperty('ssp')) params.ssp = bid.prisma.ssp;
+      if (bid.prisma.hasOwnProperty('tagId')) params.tag_id = bid.prisma.tagId;
+      if (bid.prisma.hasOwnProperty('consent')) params.consent = bid.prisma.consent;
+    };
+    params.price = bid.cpm;
+    const url = `${METRICS_TRACKER_URL}?${new URLSearchParams(params).toString()}`;
+    ajax(url, null, undefined, {method: 'GET', withCredentials: true});
+    return true;
+  }
+
+}
+registerBidder(spec);
diff --git a/modules/prismaBidAdapter.md b/modules/prismaBidAdapter.md
new file mode 100644
index 00000000000..a400183cec6
--- /dev/null
+++ b/modules/prismaBidAdapter.md
@@ -0,0 +1,59 @@
+# Overview
+
+```
+Module Name:  Prisma Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: gabriel@nexx360.io
+```
+
+# Description
+
+Connects to Prisma network for bids.
+
+To use us as a bidder you must have an account and an active "tagId" on our platform.
+
+# Test Parameters
+
+## Web
+
+### Display
+```
+var adUnits = [
+   // Banner adUnit
+   {
+      code: 'banner-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300,600]]
+        }
+      },
+      bids: [{
+         bidder: 'prisma',
+         params: {
+            account: '1067',
+            tagId: 'luvxjvgn'
+         }
+       }]
+   },
+];
+```
+
+### Video Instream
+```
+    var videoAdUnit = {
+        code: 'video1',
+        mediaTypes: {
+            video: {
+                playerSize: [640, 480],
+                context: 'instream'
+            }
+        },
+        bids: [{
+            bidder: 'prisma',
+            params: {
+               account: '1067',
+               tagId: 'luvxjvgn'
+            }
+        }]
+    };
+```
diff --git a/test/spec/modules/prismaBidAdapter_spec.js b/test/spec/modules/prismaBidAdapter_spec.js
new file mode 100644
index 00000000000..be1c16c9059
--- /dev/null
+++ b/test/spec/modules/prismaBidAdapter_spec.js
@@ -0,0 +1,261 @@
+import {expect} from 'chai';
+import {spec} from 'modules/prismaBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+import {config} from 'src/config.js';
+import * as utils from 'src/utils.js';
+import { requestBidsHook } from 'modules/consentManagement.js';
+
+describe('Prisma bid adapter tests', function () {
+  const DISPLAY_BID_REQUEST = [{
+    'bidder': 'prisma',
+    'params': {
+      'account': '1067',
+      'tagId': 'luvxjvgn'
+    },
+    'userId': {
+      'id5id': {
+        'uid': 'ID5*hQ5WobYI9Od4u52qpaXVKHhxUa4DsOWRAlvaFajm8gINfI1oVAe3UK59416dT4TqDX1pj4MBJ5TYwir6x3JgBw1-avYHSnmvQDdRMbxmC2sNf3ggIRTbyQBdI1RjvHyeDYCsistnTXF_iKF1nutYeQ2BZ4P5d5muZTG7C2PXVFgNg-18io9dCiSjzJXx93KPDYRiuIwtsGGsp51rojlpFw2Fp_dUkjXl4CAblk58DvwNhobwQ27bnBP8F2-Pcs88DYcvKn4r6dm3Vi7ILttxDQ2IgZ2X44ClgjoWh-vRf6ANis8Z7uL16vO8q0P5C21eDYuc4v_KaZqN-p9YWEeEZQ2OpkbRL7n5NieVJExHM6ANkAlLZhVf2T-1906TAIHKDZFm_xMCa1jJfpBqZB2agw2TjfbK6wMtJeHiZaipSuUNlM_CSH0HVXtfMj9yfzjzDZZnltZQ9lvc4JhXye5AwA2X1f9Dhk8VURTvVdfEUlU',
+        'ext': {
+          'linkType': 2
+        }
+      }
+    },
+    'userIdAsEids': [
+      {
+        'source': 'id5-sync.com',
+        'uids': [
+          {
+            'id': 'ID5*hQ5WobYI9Od4u52qpaXVKHhxUa4DsOWRAlvaFajm8gINfI1oVAe3UK59416dT4TqDX1pj4MBJ5TYwir6x3JgBw1-avYHSnmvQDdRMbxmC2sNf3ggIRTbyQBdI1RjvHyeDYCsistnTXF_iKF1nutYeQ2BZ4P5d5muZTG7C2PXVFgNg-18io9dCiSjzJXx93KPDYRiuIwtsGGsp51rojlpFw2Fp_dUkjXl4CAblk58DvwNhobwQ27bnBP8F2-Pcs88DYcvKn4r6dm3Vi7ILttxDQ2IgZ2X44ClgjoWh-vRf6ANis8Z7uL16vO8q0P5C21eDYuc4v_KaZqN-p9YWEeEZQ2OpkbRL7n5NieVJExHM6ANkAlLZhVf2T-1906TAIHKDZFm_xMCa1jJfpBqZB2agw2TjfbK6wMtJeHiZaipSuUNlM_CSH0HVXtfMj9yfzjzDZZnltZQ9lvc4JhXye5AwA2X1f9Dhk8VURTvVdfEUlU',
+            'atype': 1,
+            'ext': {
+              'linkType': 2
+            }
+          }
+        ]
+      }
+    ],
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 250], [300, 600]]
+      }
+    },
+    'adUnitCode': 'banner-div',
+    'transactionId': '9ad89d90-eb73-41b9-bf5f-7a8e2eecff27',
+    'sizes': [[300, 250], [300, 600]],
+    'bidId': '4d9e29504f8af6',
+    'bidderRequestId': '3423b6bd1a922c',
+    'auctionId': '05e0a3a1-9f57-41f6-bbcb-2ba9c9e3d2d5',
+    'src': 'client',
+    'bidRequestsCount': 1,
+    'bidderRequestsCount': 1,
+    'bidderWinsCount': 0
+  }];
+
+  const DISPLAY_BID_RESPONSE = {'body': {
+    'responses': [
+      {
+        'bidId': '4d9e29504f8af6',
+        'cpm': 0.437245,
+        'width': 300,
+        'height': 250,
+        'creativeId': '98493581',
+        'currency': 'EUR',
+        'netRevenue': true,
+        'type': 'banner',
+        'ttl': 360,
+        'uuid': 'ce6d1ee3-2a05-4d7c-b97a-9e62097798ec',
+        'bidder': 'appnexus',
+        'consent': 1,
+        'tagId': 'luvxjvgn'
+      }
+    ],
+  }};
+
+  const VIDEO_BID_REQUEST = [
+    {
+      'bidder': 'prisma',
+      'params': {
+        'account': '1067',
+        'tagId': 'yqsc1tfj'
+      },
+      'mediaTypes': {
+        'video': {
+          'context': 'instream',
+          'playerSize': [[640, 480]],
+          'mimes': ['video/mp4'],
+          'protocols': [1, 2, 3, 4, 5, 6],
+          'playbackmethod': [2],
+          'skip': 1
+        }
+      },
+      'adUnitCode': 'video1',
+      'transactionId': '5434c81c-7210-44ae-9014-67c75dee48d0',
+      'sizes': [[640, 480]],
+      'bidId': '22f90541e576a3',
+      'bidderRequestId': '1d4549243f3bfd',
+      'auctionId': 'ed21b528-bcab-47e2-8605-ec9b71000c89',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
+    }
+  ]
+
+  const VIDEO_BID_RESPONSE = {'body': {
+    'responses': [
+      {
+        'bidId': '2c129e8e01859a',
+        'type': 'video',
+        'uuid': 'b8e7b2f0-c378-479f-aa4f-4f55d5d7d1d5',
+        'cpm': 4.5421,
+        'width': 1,
+        'height': 1,
+        'creativeId': '97517771',
+        'currency': 'EUR',
+        'netRevenue': true,
+        'ttl': 360,
+        'bidder': 'appnexus',
+        'consent': 1,
+        'tagId': 'yqsc1tfj'
+      }
+    ]
+  }};
+
+  const DEFAULT_OPTIONS = {
+    gdprConsent: {
+      gdprApplies: true,
+      consentString: 'BOzZdA0OzZdA0AGABBENDJ-AAAAvh7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__79__3z3_9pxP78k89r7337Mw_v-_v-b7JCPN_Y3v-8Kg',
+      vendorData: {}
+    },
+    refererInfo: {
+      referer: 'https://www.prebid.org',
+      canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+    },
+    uspConsent: '111222333',
+    userId: { 'id5id': { uid: '1111' } },
+    schain: {
+      'ver': '1.0',
+      'complete': 1,
+      'nodes': [{
+        'asi': 'exchange1.com',
+        'sid': '1234',
+        'hp': 1,
+        'rid': 'bid-request-1',
+        'name': 'publisher',
+        'domain': 'publisher.com'
+      }]
+    },
+  };
+
+  it('Verify banner build request', function () {
+    const request = spec.buildRequests(DISPLAY_BID_REQUEST, DEFAULT_OPTIONS);
+    expect(request).to.have.property('url').and.to.equal('https://prisma.nexx360.io/prebid');
+    expect(request).to.have.property('method').and.to.equal('POST');
+    const requestContent = JSON.parse(request.data);
+    expect(requestContent.userEids.length).to.be.eql(1);
+    expect(requestContent.userEids[0]).to.have.property('source').and.to.equal('id5-sync.com');
+    expect(requestContent.userEids[0]).to.have.property('uids');
+    expect(requestContent.userEids[0].uids[0]).to.have.property('id').and.to.equal('ID5*hQ5WobYI9Od4u52qpaXVKHhxUa4DsOWRAlvaFajm8gINfI1oVAe3UK59416dT4TqDX1pj4MBJ5TYwir6x3JgBw1-avYHSnmvQDdRMbxmC2sNf3ggIRTbyQBdI1RjvHyeDYCsistnTXF_iKF1nutYeQ2BZ4P5d5muZTG7C2PXVFgNg-18io9dCiSjzJXx93KPDYRiuIwtsGGsp51rojlpFw2Fp_dUkjXl4CAblk58DvwNhobwQ27bnBP8F2-Pcs88DYcvKn4r6dm3Vi7ILttxDQ2IgZ2X44ClgjoWh-vRf6ANis8Z7uL16vO8q0P5C21eDYuc4v_KaZqN-p9YWEeEZQ2OpkbRL7n5NieVJExHM6ANkAlLZhVf2T-1906TAIHKDZFm_xMCa1jJfpBqZB2agw2TjfbK6wMtJeHiZaipSuUNlM_CSH0HVXtfMj9yfzjzDZZnltZQ9lvc4JhXye5AwA2X1f9Dhk8VURTvVdfEUlU');
+    expect(requestContent.adUnits[0]).to.have.property('account').and.to.equal('1067');
+    expect(requestContent.adUnits[0]).to.have.property('tagId').and.to.equal('luvxjvgn');
+    expect(requestContent.adUnits[0]).to.have.property('label').and.to.equal('banner-div');
+    expect(requestContent.adUnits[0]).to.have.property('bidId').and.to.equal('4d9e29504f8af6');
+    expect(requestContent.adUnits[0]).to.have.property('auctionId').and.to.equal('05e0a3a1-9f57-41f6-bbcb-2ba9c9e3d2d5');
+    expect(requestContent.adUnits[0]).to.have.property('mediatypes').exist;
+    expect(requestContent.adUnits[0].mediatypes).to.have.property('banner').exist;
+    expect(requestContent.adUnits[0]).to.have.property('bidfloor').and.to.equal(0);
+    expect(requestContent.adUnits[0]).to.have.property('bidfloorCurrency').and.to.equal('USD');
+    expect(requestContent.adUnits[0]).to.have.property('keywords');
+    expect(requestContent.adUnits[0].keywords.length).to.be.eql(0);
+  });
+
+  it('Verify banner parse response', function () {
+    const request = spec.buildRequests(DISPLAY_BID_REQUEST, DEFAULT_OPTIONS);
+    const response = spec.interpretResponse(DISPLAY_BID_RESPONSE, request);
+    expect(response).to.have.lengthOf(1);
+    const bid = response[0];
+    expect(bid.cpm).to.equal(0.437245);
+    expect(bid.adUrl).to.equal('https://prisma.nexx360.io/cache?uuid=ce6d1ee3-2a05-4d7c-b97a-9e62097798ec');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.creativeId).to.equal('98493581');
+    expect(bid.currency).to.equal('EUR');
+    expect(bid.netRevenue).to.equal(true);
+    expect(bid.ttl).to.equal(360);
+    expect(bid.requestId).to.equal('4d9e29504f8af6');
+    expect(bid.prisma).to.exist;
+    expect(bid.prisma.ssp).to.equal('appnexus');
+  });
+
+  it('Verify video build request', function () {
+    const request = spec.buildRequests(VIDEO_BID_REQUEST, DEFAULT_OPTIONS);
+    expect(request).to.have.property('url').and.to.equal('https://prisma.nexx360.io/prebid');
+    expect(request).to.have.property('method').and.to.equal('POST');
+    const requestContent = JSON.parse(request.data);
+    expect(requestContent.adUnits[0]).to.have.property('account').and.to.equal('1067');
+    expect(requestContent.adUnits[0]).to.have.property('tagId').and.to.equal('yqsc1tfj');
+    expect(requestContent.adUnits[0]).to.have.property('label').and.to.equal('video1');
+    expect(requestContent.adUnits[0]).to.have.property('bidId').and.to.equal('22f90541e576a3');
+    expect(requestContent.adUnits[0]).to.have.property('auctionId').and.to.equal('ed21b528-bcab-47e2-8605-ec9b71000c89');
+    expect(requestContent.adUnits[0]).to.have.property('mediatypes').exist;
+    expect(requestContent.adUnits[0].mediatypes).to.have.property('video').exist;
+  });
+
+  it('Verify video parse response', function () {
+    const request = spec.buildRequests(VIDEO_BID_REQUEST, DEFAULT_OPTIONS);
+    const response = spec.interpretResponse(VIDEO_BID_RESPONSE, request);
+    expect(response).to.have.lengthOf(1);
+    const bid = response[0];
+    expect(bid.cpm).to.equal(4.5421);
+    expect(bid.vastUrl).to.equal('https://prisma.nexx360.io/cache?uuid=b8e7b2f0-c378-479f-aa4f-4f55d5d7d1d5');
+    expect(bid.vastImpUrl).to.equal('https://prisma.nexx360.io/track-imp?type=prebid&mediatype=video&ssp=appnexus&tag_id=yqsc1tfj&consent=1&price=4.5421');
+    expect(bid.width).to.equal(1);
+    expect(bid.height).to.equal(1);
+    expect(bid.creativeId).to.equal('97517771');
+    expect(bid.currency).to.equal('EUR');
+    expect(bid.netRevenue).to.equal(true);
+    expect(bid.ttl).to.equal(360);
+    expect(bid.requestId).to.equal('2c129e8e01859a');
+    expect(bid.prisma).to.exist;
+    expect(bid.prisma.ssp).to.equal('appnexus');
+  });
+
+  it('Verifies bidder code', function () {
+    expect(spec.code).to.equal('prisma');
+  });
+
+  it('Verifies bidder aliases', function () {
+    expect(spec.aliases).to.have.lengthOf(1);
+    expect(spec.aliases[0]).to.eql('prismadirect');
+  });
+  it('Verifies if bid request valid', function () {
+    expect(spec.isBidRequestValid(DISPLAY_BID_REQUEST[0])).to.equal(true);
+  });
+  it('Verifies bid won', function () {
+    const request = spec.buildRequests(DISPLAY_BID_REQUEST, DEFAULT_OPTIONS);
+    const response = spec.interpretResponse(DISPLAY_BID_RESPONSE, request);
+    const won = spec.onBidWon(response[0]);
+    expect(won).to.equal(true);
+  });
+  it('Verifies user sync without cookie in bid response', function () {
+    var syncs = spec.getUserSyncs({}, [DISPLAY_BID_RESPONSE], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.lengthOf(0);
+  });
+  it('Verifies user sync with cookies in bid response', function () {
+    DISPLAY_BID_RESPONSE.body.cookies = [{'type': 'image', 'url': 'http://www.cookie.sync.org/'}];
+    var syncs = spec.getUserSyncs({}, [DISPLAY_BID_RESPONSE], DEFAULT_OPTIONS.gdprConsent);
+    expect(syncs).to.have.lengthOf(1);
+    expect(syncs[0]).to.have.property('type').and.to.equal('image');
+    expect(syncs[0]).to.have.property('url').and.to.equal('http://www.cookie.sync.org/');
+  });
+  it('Verifies user sync with no bid response', function() {
+    var syncs = spec.getUserSyncs({}, null, DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.lengthOf(0);
+  });
+  it('Verifies user sync with no bid body response', function() {
+    var syncs = spec.getUserSyncs({}, [], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.lengthOf(0);
+    var syncs = spec.getUserSyncs({}, [{}], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.lengthOf(0);
+  });
+});

From f39c698b57a0df7fbd8f12524b46884cac9c7051 Mon Sep 17 00:00:00 2001
From: Kenan Gillet <1706856+kenan-gillet@users.noreply.github.com>
Date: Thu, 21 Jul 2022 11:41:23 -0700
Subject: [PATCH 051/569] openxOrtbBidAdapter: avoid error logging when
 response body is null (#8725)

```
prebid.js:5 Prebid openx ERROR: Bidder openx failed to interpret the server's response. Continuing without bids null TypeError: Cannot use 'in' operator to search for 'nbr' in at prebid.js:12:4571
```
Thanks @piotrj-rtbh
---
 modules/openxOrtbBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openxOrtbBidAdapter.js b/modules/openxOrtbBidAdapter.js
index 1885f5122eb..a7a8d53a624 100644
--- a/modules/openxOrtbBidAdapter.js
+++ b/modules/openxOrtbBidAdapter.js
@@ -263,7 +263,7 @@ function interpretResponse(resp, req) {
   }
 
   const respBody = resp.body;
-  if ('nbr' in respBody) {
+  if (!respBody || 'nbr' in respBody) {
     return [];
   }
 

From f7196dc30f62a15825bc811c0d17f344b5be7750 Mon Sep 17 00:00:00 2001
From: Jason Lydon <95770514+ftxmoJason@users.noreply.github.com>
Date: Thu, 21 Jul 2022 14:41:44 -0400
Subject: [PATCH 052/569] Ftrack Id Module: adding parameter to callback in
 getId return object (#8678)

* Adding cb to the callback

* Delete package-lock.json

Removing package-lock.json because it has conflicts and its not on ftrack to change it either way

* Un conflicting the package-lock

* ftrack: getting data to return in the EIDS

* ftrack: getting data to return in the EIDS lint

* ftrack: making the eids return all IDs

* ftrack: making the eids return all IDs

* ftrack: tweaking the EID schema per MediaGrid's requests

* Added tests for getUserIdsAsEids method

* Updated the ftrack decode function with suggested code and updated related tests

* Updated getUserIdsAsEids tests to match value directly

Co-authored-by: Jason Lydon <jason.lydon@flashtalking.com>
Co-authored-by: Jared <jared.montalbo@flashtalking.com>
---
 modules/ftrackIdSystem.js                |  21 +++-
 modules/ftrackIdSystem.md                |  16 ++-
 modules/userId/eids.js                   |  23 +++-
 modules/userId/eids.md                   |   2 +-
 test/spec/modules/ftrackIdSystem_spec.js | 131 +++++++++++++++++++++--
 5 files changed, 173 insertions(+), 20 deletions(-)

diff --git a/modules/ftrackIdSystem.js b/modules/ftrackIdSystem.js
index 17e210d5358..55f04e6b1d3 100644
--- a/modules/ftrackIdSystem.js
+++ b/modules/ftrackIdSystem.js
@@ -48,9 +48,20 @@ export const ftrackIdSubmodule = {
    *   similar to the module name and ending in id or Id
    */
   decode (value, config) {
+    if (!value) { return }
+    const ext = {}
+
+    for (var key in value) {
+      /** unpack the strings from the arrays */
+      ext[key] = value[key][0]
+    }
+
     return {
-      ftrackId: value
-    };
+      ftrackId: {
+        uid: value.DeviceID && value.DeviceID[0],
+        ext
+      }
+    }
   },
 
   /**
@@ -60,13 +71,13 @@ export const ftrackIdSubmodule = {
    * @param {SubmoduleConfig} config
    * @param {ConsentData} consentData
    * @param {(Object|undefined)} cacheIdObj
-   * @returns {IdResponse|undefined}
+   * @returns {IdResponse|undefined} A response object that contains id and/or callback.
    */
   getId (config, consentData, cacheIdObj) {
     if (this.isConfigOk(config) === false || this.isThereConsent(consentData) === false) return undefined;
 
     return {
-      callback: function () {
+      callback: function (cb) {
         window.D9v = {
           UserID: '99999999999999',
           CampID: '3175',
@@ -82,6 +93,8 @@ export const ftrackIdSubmodule = {
               storage.setDataInLocalStorage(`${FTRACK_PRIVACY_STORAGE_NAME}`, JSON.stringify(consentInfo));
             };
 
+            if (typeof cb === 'function') cb(response);
+
             return response;
           }
         };
diff --git a/modules/ftrackIdSystem.md b/modules/ftrackIdSystem.md
index 0c92f5afab1..24a8dbd08b6 100644
--- a/modules/ftrackIdSystem.md
+++ b/modules/ftrackIdSystem.md
@@ -80,4 +80,18 @@ You may request by emailing [mailto:privacy@flashtalking.com](privacy@flashtalki
 
 #### GDPR
 
-In its current state, Flashtalking’s FTrack Identity Framework User ID Module does not create an ID if a user's consentData is "truthy" (true, 1). In other words, if GDPR applies in any way to a user, FTrack does not create an ID. 
\ No newline at end of file
+In its current state, Flashtalking’s FTrack Identity Framework User ID Module does not create an ID if a user's consentData is "truthy" (true, 1). In other words, if GDPR applies in any way to a user, FTrack does not create an ID. 
+
+---
+
+### If you are using pbjs.getUserIdsAsEids():
+
+Please note that the `uids` value is a stringified object of the IDs so publishers will need to `JSON.parse()` the value in order to use it:
+
+```
+{
+    "HHID": ["<USERS HH ID>"],
+    "DeviceID": ["<USERS DEVICE ID>"],
+    "SingleDeviceID": ["USERS SINGLE DEVICE ID"]
+}
+```
\ No newline at end of file
diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index 2649292b895..4b5fd55aa21 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -68,12 +68,14 @@ export const USER_IDS_CONFIG = {
     source: 'flashtalking.com',
     atype: 1,
     getValue: function(data) {
-      return data.uid
+      let value = '';
+      if (data.DeviceID) {
+        value = data.DeviceID.join(',');
+      }
+      return value;
     },
     getUidExt: function(data) {
-      if (data.ext) {
-        return data.ext;
-      }
+      return 'DeviceID';
     }
   },
 
@@ -332,7 +334,6 @@ function createEidObject(userIdData, subModuleKey) {
   if (conf && userIdData) {
     let eid = {};
     eid.source = isFn(conf['getSource']) ? conf['getSource'](userIdData) : conf['source'];
-
     const value = isFn(conf['getValue']) ? conf['getValue'](userIdData) : userIdData;
     if (isStr(value)) {
       const uid = { id: value, atype: conf['atype'] };
@@ -367,6 +368,18 @@ export function createEidsArray(bidRequestUserId) {
     if (bidRequestUserId.hasOwnProperty(subModuleKey)) {
       if (subModuleKey === 'pubProvidedId') {
         eids = eids.concat(bidRequestUserId['pubProvidedId']);
+      } else if (subModuleKey === 'ftrackId') {
+        // ftrack has multiple IDs so we add each one that exists
+        let eid = {
+          'atype': 1,
+          'id': (bidRequestUserId[subModuleKey]['DeviceID'] || []).join('|'),
+          'ext': {}
+        }
+        for (let id in bidRequestUserId[subModuleKey]) {
+          eid.ext[id] = (bidRequestUserId[subModuleKey][id] || []).join('|');
+        }
+
+        eids.push(eid);
       } else if (Array.isArray(bidRequestUserId[subModuleKey])) {
         bidRequestUserId[subModuleKey].forEach((config, index, arr) => {
           const eid = createEidObject(config, subModuleKey);
diff --git a/modules/userId/eids.md b/modules/userId/eids.md
index 2372bb4b6fd..83414cbe295 100644
--- a/modules/userId/eids.md
+++ b/modules/userId/eids.md
@@ -75,7 +75,7 @@ userIdAsEids = [
     {
         source: 'flashtalking.com',
         uids: [{
-            id: 'some-random-id-value',
+            id: 'the-ids-object-stringified',
             atype: 1
     },
 
diff --git a/test/spec/modules/ftrackIdSystem_spec.js b/test/spec/modules/ftrackIdSystem_spec.js
index f2b0456a849..333a8cce624 100644
--- a/test/spec/modules/ftrackIdSystem_spec.js
+++ b/test/spec/modules/ftrackIdSystem_spec.js
@@ -2,6 +2,10 @@ import { ftrackIdSubmodule } from 'modules/ftrackIdSystem.js';
 import * as utils from 'src/utils.js';
 import { uspDataHandler } from 'src/adapterManager.js';
 import { loadExternalScript } from 'src/adloader.js';
+import { getGlobal } from 'src/prebidGlobal.js';
+import { init, setSubmoduleRegistry } from 'modules/userId/index.js';
+import {createEidsArray} from 'modules/userId/eids.js';
+import {config} from 'src/config.js';
 let expect = require('chai').expect;
 
 let server;
@@ -147,7 +151,7 @@ describe('FTRACK ID System', () => {
     });
 
     it(`should be the only method that gets a new ID aka hits the D9 endpoint`, () => {
-      ftrackIdSubmodule.getId(configMock, null, null).callback();
+      ftrackIdSubmodule.getId(configMock, null, null).callback(() => {});
       expect(loadExternalScript.called).to.be.ok;
       expect(loadExternalScript.args[0][0]).to.deep.equal('https://d9.flashtalking.com/d9core');
       loadExternalScript.resetHistory();
@@ -168,7 +172,7 @@ describe('FTRACK ID System', () => {
       it(`should use default IDs if config.params.id is not populated`, () => {
         let configMock1 = JSON.parse(JSON.stringify(configMock));
         delete configMock1.params.ids;
-        ftrackIdSubmodule.getId(configMock1, null, null).callback();
+        ftrackIdSubmodule.getId(configMock1, null, null).callback(() => {});
 
         expect(window.D9r).to.have.property('DeviceID', true);
         expect(window.D9r).to.have.property('SingleDeviceID', true);
@@ -181,7 +185,7 @@ describe('FTRACK ID System', () => {
           configMock1.params.ids['device id'] = 'test device ID';
           configMock1.params.ids['single device id'] = 'test single device ID';
           configMock1.params.ids['household id'] = 'test household ID';
-          ftrackIdSubmodule.getId(configMock1, null, null).callback();
+          ftrackIdSubmodule.getId(configMock1, null, null).callback(() => {});
 
           expect(window.D9r).to.not.have.property('DeviceID');
           expect(window.D9r).to.not.have.property('SingleDeviceID');
@@ -193,7 +197,7 @@ describe('FTRACK ID System', () => {
           configMock1.params.ids['device id'] = false;
           configMock1.params.ids['single device id'] = false;
           configMock1.params.ids['household id'] = false;
-          ftrackIdSubmodule.getId(configMock1, null, null).callback();
+          ftrackIdSubmodule.getId(configMock1, null, null).callback(() => {});
 
           expect(window.D9r).to.not.have.property('DeviceID');
           expect(window.D9r).to.not.have.property('SingleDeviceID');
@@ -203,7 +207,7 @@ describe('FTRACK ID System', () => {
         it(`- only device id`, () => {
           let configMock1 = JSON.parse(JSON.stringify(configMock));
           delete configMock1.params.ids['single device id'];
-          ftrackIdSubmodule.getId(configMock1, null, null).callback();
+          ftrackIdSubmodule.getId(configMock1, null, null).callback(() => {});
 
           expect(window.D9r).to.have.property('DeviceID', true);
           expect(window.D9r).to.not.have.property('SingleDeviceID');
@@ -213,7 +217,7 @@ describe('FTRACK ID System', () => {
         it(`- only single device id`, () => {
           let configMock1 = JSON.parse(JSON.stringify(configMock));
           delete configMock1.params.ids['device id'];
-          ftrackIdSubmodule.getId(configMock1, null, null).callback();
+          ftrackIdSubmodule.getId(configMock1, null, null).callback(() => {});
 
           expect(window.D9r).to.not.have.property('DeviceID');
           expect(window.D9r).to.have.property('SingleDeviceID', true);
@@ -225,7 +229,7 @@ describe('FTRACK ID System', () => {
           delete configMock1.params.ids['device id'];
           delete configMock1.params.ids['single device id'];
           configMock1.params.ids['household id'] = true;
-          ftrackIdSubmodule.getId(configMock1, null, null).callback();
+          ftrackIdSubmodule.getId(configMock1, null, null).callback(() => {});
 
           expect(window.D9r).to.not.have.property('DeviceID');
           expect(window.D9r).to.not.have.property('SingleDeviceID');
@@ -243,7 +247,7 @@ describe('FTRACK ID System', () => {
       expect(window.localStorage.getItem('ftrack-rtd')).to.not.be.ok;
       expect(window.localStorage.getItem('ftrack-rtd_exp')).to.not.be.ok;
 
-      ftrackIdSubmodule.getId(configMock, consentDataMock, null).callback();
+      ftrackIdSubmodule.getId(configMock, consentDataMock, null).callback(() => {});
       return new Promise(function(resolve, reject) {
         window.testTimer = function () {
           // Sinon fake server is NOT changing the readyState to 4, so instead
@@ -271,7 +275,12 @@ describe('FTRACK ID System', () => {
 
   describe(`decode() method`, () => {
     it(`should respond with an object with the key 'ftrackId'`, () => {
-      expect(ftrackIdSubmodule.decode('value', configMock)).to.deep.equal({ftrackId: 'value'});
+      expect(ftrackIdSubmodule.decode('value', configMock)).to.deep.equal({
+        ftrackId: {
+          ext: { 0: 'v', 1: 'a', 2: 'l', 3: 'u', 4: 'e' },
+          uid: undefined,
+        },
+      });
     });
 
     it(`should not be making requests to retrieve a new ID, it should just be decoding a response`, () => {
@@ -298,4 +307,108 @@ describe('FTRACK ID System', () => {
       expect(ftrackIdSubmodule.extendId(configMock, null, {cache: {id: ''}})).to.deep.equal({cache: {id: ''}});
     });
   });
+
+  describe('Uses ftrack getUserIdsAsEids() method', () => {
+    it('getUserIdsAsEids using the ftrack submodule and gets three ids (HHID, DeviceId, SingleDeviceId)', () => {
+      init(config);
+      setSubmoduleRegistry([ftrackIdSubmodule]);
+
+      const ids = {
+        ftrackId: {
+          HHID: ['household_test_id'],
+          DeviceID: ['device_test_id'],
+          SingleDeviceID: ['single_device_test_id']
+        }
+      };
+      config.setConfig({
+        userSync: {
+          auctionDelay: 10,
+          userIds: [{
+            name: 'ftrack', value: ids,
+          }]
+        }
+      });
+
+      getGlobal().getUserIdsAsync().then((ids) => {
+        expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
+          id: 'device_test_id',
+          atype: 1,
+          ext: {
+            HHID: 'household_test_id',
+            DeviceID: 'device_test_id',
+            SingleDeviceID: 'single_device_test_id',
+          }
+        }]);
+      });
+    });
+
+    it('gets only the deviceId', () => {
+      init(config);
+      setSubmoduleRegistry([ftrackIdSubmodule]);
+
+      const ids = { ftrackId: { DeviceID: ['device_test_id'] } };
+      config.setConfig({
+        userSync: {
+          auctionDelay: 10,
+          userIds: [{
+            name: 'ftrack', value: ids,
+          }]
+        }
+      });
+
+      getGlobal().getUserIdsAsync().then((ids) => {
+        expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
+          id: 'device_test_id',
+          atype: 1,
+          ext: { DeviceID: 'device_test_id' }
+        }]);
+      });
+    });
+
+    it('gets only the user household id', () => {
+      init(config);
+      setSubmoduleRegistry([ftrackIdSubmodule]);
+
+      const ids = { ftrackId: { HHID: ['household_test_id'], } };
+      config.setConfig({
+        userSync: {
+          auctionDelay: 10,
+          userIds: [{
+            name: 'ftrack', value: ids,
+          }]
+        }
+      });
+
+      getGlobal().getUserIdsAsync().then((ids) => {
+        expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
+          id: '',
+          atype: 1,
+          ext: { HHID: 'household_test_id' }
+        }]);
+      });
+    });
+
+    it('gets only the deviceId', () => {
+      init(config);
+      setSubmoduleRegistry([ftrackIdSubmodule]);
+
+      const ids = { ftrackId: { SingleDeviceID: ['single_device_test_id'] } };
+      config.setConfig({
+        userSync: {
+          auctionDelay: 10,
+          userIds: [{
+            name: 'ftrack', value: ids,
+          }]
+        }
+      });
+
+      getGlobal().getUserIdsAsync().then((ids) => {
+        expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
+          id: '',
+          atype: 1,
+          ext: { SingleDeviceID: 'single_device_test_id' }
+        }]);
+      });
+    });
+  });
 });

From b5479d9acf73705753ffaa0c506e9b05e06e47d5 Mon Sep 17 00:00:00 2001
From: Skylinar <53079123+Skylinar@users.noreply.github.com>
Date: Thu, 21 Jul 2022 20:42:59 +0200
Subject: [PATCH 053/569] Smartx Bid Adapter: update to newest smartclip
 outstream player version 6 (#8721)

* Add smartclipBidAdapter

* smartxBidAdapter.js - removed unused variables, removed debug, added window before the outstream related functions

* - made outstream player configurable

* remove wrong named files

* camelcase

* fix

* Out-Stream render update to SmartPlay 5.2

* ESlint fix

* ESlint fix

* ESlint fix

* adjust tests, fixes

* ESlint

* adjusted desired bitrate examples

* added bid.meta.advertiserDomains support

* bug fix for numeric elementID outstream render

* fix renderer url

* support for floors module

* bugfixes to be openRTB 2.5 compliant

* update internal renderer usage

* remove unused outstream_function logic

* bugfix outstream options for default outstream renderer configuration

* [PREB-10] fix empty title not configurable

* add pbjs version

* testing with outstream 5.3.0

* pbjs version into content.ext

* made visibilityThreshold configurable

* adjust position of pbjs version

* Merge branch 'master' of https://github.com/prebid/Prebid.js into HEAD

* update smartclip outstream player version to support outstream 6 release along with necessary config changes

Co-authored-by: smartclip AdTechnology <adtech@smartclip.com>
Co-authored-by: Gino Cirlini <adtech@smartclip.tv>
---
 modules/smartxBidAdapter.js                | 58 ++++++++++++----------
 test/spec/modules/smartxBidAdapter_spec.js |  6 +--
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/modules/smartxBidAdapter.js b/modules/smartxBidAdapter.js
index 5b36e17be11..f3188c1f110 100644
--- a/modules/smartxBidAdapter.js
+++ b/modules/smartxBidAdapter.js
@@ -303,7 +303,7 @@ export const spec = {
             const playersize = deepAccess(currentBidRequest, 'mediaTypes.video.playerSize');
             const renderer = Renderer.install({
               id: 0,
-              url: 'https://dco.smartclip.net/?plc=7777778',
+              url: 'https://dco.smartclip.net/?plc=7777779',
               config: {
                 adText: 'SmartX Outstream Video Ad via Prebid.js',
                 player_width: playersize[0][0],
@@ -353,65 +353,73 @@ function createOutstreamConfig(bid) {
 
   logMessage('[SMARTX][renderer] Handle SmartX outstream renderer');
 
-  var smartPlayObj = {
+  var playerConfig = {
     minAdWidth: confMinAdWidth,
     maxAdWidth: confMaxAdWidth,
-    onStartCallback: function (m, n) {
+    coreSetup: {},
+    layoutSettings: {},
+    onCappedCallback: function() {
       try {
-        window.sc_smartIntxtStart(n);
-      } catch (f) {}
-    },
-    onCappedCallback: function (m, n) {
-      try {
-        window.sc_smartIntxtNoad(n);
-      } catch (f) {}
-    },
-    onEndCallback: function (m, n) {
-      try {
-        window.sc_smartIntxtEnd(n);
+        window.sc_smartIntxtNoad();
       } catch (f) {}
     },
   };
 
   if (confStartOpen == 'true') {
-    smartPlayObj.startOpen = true;
+    playerConfig.startOpen = true;
   } else if (confStartOpen == 'false') {
-    smartPlayObj.startOpen = false;
+    playerConfig.startOpen = false;
   }
 
   if (confEndingScreen == 'true') {
-    smartPlayObj.endingScreen = true;
+    playerConfig.endingScreen = true;
   } else if (confEndingScreen == 'false') {
-    smartPlayObj.endingScreen = false;
+    playerConfig.endingScreen = false;
   }
 
   if (confTitle || (typeof bid.renderer.config.outstream_options.title == 'string' && bid.renderer.config.outstream_options.title == '')) {
-    smartPlayObj.title = confTitle;
+    playerConfig.layoutSettings.advertisingLabel = confTitle;
   }
 
   if (confSkipOffset) {
-    smartPlayObj.skipOffset = confSkipOffset;
+    playerConfig.coreSetup.skipOffset = confSkipOffset;
   }
 
   if (confDesiredBitrate) {
-    smartPlayObj.desiredBitrate = confDesiredBitrate;
+    playerConfig.coreSetup.desiredBitrate = confDesiredBitrate;
   }
 
   if (confVisibilityThreshold) {
-    smartPlayObj.visibilityThreshold = confVisibilityThreshold;
+    playerConfig.visibilityThreshold = confVisibilityThreshold;
   }
 
-  smartPlayObj.adResponse = bid.vastContent;
+  playerConfig.adResponse = bid.vastContent;
 
   const divID = '[id="' + elementId + '"]';
 
+  var playerListener = function callback(event) {
+    switch (event) {
+      case 'AdSlotStarted':
+        try {
+          window.sc_smartIntxtStart();
+        } catch (f) {}
+        break;
+
+      case 'AdSlotComplete':
+        try {
+          window.sc_smartIntxtEnd();
+        } catch (f) {}
+        break;
+    }
+  };
+
   try {
     // eslint-disable-next-line
-    let _outstreamPlayer = new OutstreamPlayer(divID, smartPlayObj);
+    outstreamplayer.connect(divID).setup(playerConfig, playerListener)
   } catch (e) {
     logError('[SMARTX][renderer] Error caught: ' + e);
   }
-  return smartPlayObj;
+  return playerConfig;
 }
 
 /**
diff --git a/test/spec/modules/smartxBidAdapter_spec.js b/test/spec/modules/smartxBidAdapter_spec.js
index b7235eee878..58ce50efb8e 100644
--- a/test/spec/modules/smartxBidAdapter_spec.js
+++ b/test/spec/modules/smartxBidAdapter_spec.js
@@ -514,7 +514,7 @@ describe('The smartx adapter', function () {
 
       responses[0].renderer.render(responses[0]);
 
-      expect(responses[0].renderer.url).to.equal('https://dco.smartclip.net/?plc=7777778');
+      expect(responses[0].renderer.url).to.equal('https://dco.smartclip.net/?plc=7777779');
 
       window.document.getElementById.restore();
     });
@@ -542,7 +542,7 @@ describe('The smartx adapter', function () {
 
       responses[0].renderer.render(responses[0]);
 
-      expect(responses[0].renderer.url).to.equal('https://dco.smartclip.net/?plc=7777778');
+      expect(responses[0].renderer.url).to.equal('https://dco.smartclip.net/?plc=7777779');
 
       window.document.getElementById.restore();
     });
@@ -560,7 +560,7 @@ describe('The smartx adapter', function () {
 
       responses[0].renderer.render(responses[0]);
 
-      expect(responses[0].renderer.url).to.equal('https://dco.smartclip.net/?plc=7777778');
+      expect(responses[0].renderer.url).to.equal('https://dco.smartclip.net/?plc=7777779');
 
       window.document.getElementById.restore();
     });

From a838c8f2f9b7d3ec3965439bc8f7094ab37a1ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Kok=C5=82owski?=
 <38455696+skoklowski@users.noreply.github.com>
Date: Thu, 21 Jul 2022 20:43:33 +0200
Subject: [PATCH 054/569] rasBidAdapter - enpoint bugfix (#8726)

---
 modules/rasBidAdapter.js                | 4 +++-
 test/spec/modules/rasBidAdapter_spec.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/rasBidAdapter.js b/modules/rasBidAdapter.js
index d9e6b6a9126..909b6a7b795 100644
--- a/modules/rasBidAdapter.js
+++ b/modules/rasBidAdapter.js
@@ -5,7 +5,9 @@ import { isEmpty, getAdUnitSizes, parseSizesInput, deepAccess } from '../src/uti
 const BIDDER_CODE = 'ras';
 const VERSION = '1.0';
 
-const getEndpoint = (network) => `https://csr.onet.pl/${encodeURIComponent(network)}/csr-006/csr.json?`;
+const getEndpoint = (network) => {
+  return `https://csr.onet.pl/${encodeURIComponent(network)}/csr-006/csr.json?nid=${encodeURIComponent(network)}&`;
+};
 
 function parseParams(params, bidderRequest) {
   const newParams = {};
diff --git a/test/spec/modules/rasBidAdapter_spec.js b/test/spec/modules/rasBidAdapter_spec.js
index e3f41566c99..324bf782672 100644
--- a/test/spec/modules/rasBidAdapter_spec.js
+++ b/test/spec/modules/rasBidAdapter_spec.js
@@ -2,7 +2,7 @@ import { expect } from 'chai';
 import { spec } from 'modules/rasBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 
-const CSR_ENDPOINT = 'https://csr.onet.pl/4178463/csr-006/csr.json?';
+const CSR_ENDPOINT = 'https://csr.onet.pl/4178463/csr-006/csr.json?nid=4178463&';
 
 describe('rasBidAdapter', function () {
   const adapter = newBidder(spec);

From 213ea7192793bbcf0a25c036e36e6e5e83436557 Mon Sep 17 00:00:00 2001
From: haruka-yamashita2 <39541428+haruka-yamashita2@users.noreply.github.com>
Date: Fri, 22 Jul 2022 03:44:17 +0900
Subject: [PATCH 055/569] support for ID5 (#8712)

---
 modules/yieldoneBidAdapter.js                |  6 ++++
 test/spec/modules/yieldoneBidAdapter_spec.js | 33 ++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/modules/yieldoneBidAdapter.js b/modules/yieldoneBidAdapter.js
index 95c0a5b787a..98a95b6758e 100644
--- a/modules/yieldoneBidAdapter.js
+++ b/modules/yieldoneBidAdapter.js
@@ -80,6 +80,12 @@ export const spec = {
         payload.fuuid = dacId;
       }
 
+      // ID5
+      const id5id = deepAccess(bidRequest, 'userId.id5id.uid');
+      if (isStr(id5id) && !isEmpty(id5id)) {
+        payload.id5Id = id5id;
+      }
+
       return {
         method: 'GET',
         url: ENDPOINT_URL,
diff --git a/test/spec/modules/yieldoneBidAdapter_spec.js b/test/spec/modules/yieldoneBidAdapter_spec.js
index eef25649a02..e41764b2876 100644
--- a/test/spec/modules/yieldoneBidAdapter_spec.js
+++ b/test/spec/modules/yieldoneBidAdapter_spec.js
@@ -436,6 +436,39 @@ describe('yieldoneBidAdapter', function() {
         expect(request[0].data.fuuid).to.equal('dacId_sample');
       });
     });
+
+    describe('ID5', function () {
+      it('dont send ID5 if undefined', function () {
+        const bidRequests = [
+          {
+            params: {placementId: '0'},
+          },
+          {
+            params: {placementId: '1'},
+            userId: {},
+          },
+          {
+            params: {placementId: '2'},
+            userId: undefined,
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request[0].data).to.not.have.property('id5Id');
+        expect(request[1].data).to.not.have.property('id5Id');
+        expect(request[2].data).to.not.have.property('id5Id');
+      });
+
+      it('should send ID5 if available', function () {
+        const bidRequests = [
+          {
+            params: {placementId: '0'},
+            userId: {id5id: {uid: 'id5id_sample'}},
+          },
+        ];
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request[0].data.id5Id).to.equal('id5id_sample');
+      });
+    });
   });
 
   describe('interpretResponse', function () {

From 6536b3525016548b6af4f55cdb4d1978766b312c Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Fri, 22 Jul 2022 13:00:42 -0400
Subject: [PATCH 056/569] Various adapters: remove use of storageManager
 bypasses (#8690)

* Update sspBCBidAdapter.js

* Update fintezaAnalyticsAdapter.js

* Update widespaceBidAdapter.js

* Update kargoBidAdapter.js

* Update fintezaAnalyticsAdapter.js

* Update kargoBidAdapter.js

* Update kargoBidAdapter.js

* Update kargoBidAdapter.js

* Update kargoBidAdapter_spec.js

* Update kargoBidAdapter.js

* Update sspBCBidAdapter.js

* Update sspBCBidAdapter.js

* Update kargoBidAdapter.js

* Update pubwiseAnalyticsAdapter.js

* Update pubwiseAnalyticsAdapter.js

* Update invibesBidAdapter.js

* Update insticatorBidAdapter.js

* Update pubwiseAnalyticsAdapter.js

* Update pubwiseAnalyticsAdapter.js

* Update insticatorBidAdapter.js

* Update insticatorBidAdapter_spec.js

* Update invibesBidAdapter.js

* Update insticatorBidAdapter_spec.js

* Update widespaceBidAdapter.js

* Update kargoBidAdapter.js

* Kargo: URL-decoding test strings (#8727)

Co-authored-by: Jeremy Sadwith <jeremy@kargo.com>
---
 modules/fintezaAnalyticsAdapter.js            | 10 +------
 modules/insticatorBidAdapter.js               |  4 +--
 modules/invibesBidAdapter.js                  |  2 +-
 modules/kargoBidAdapter.js                    | 28 ++-----------------
 modules/pubwiseAnalyticsAdapter.js            |  2 +-
 modules/sspBCBidAdapter.js                    |  6 ++--
 modules/widespaceBidAdapter.js                | 22 ---------------
 .../spec/modules/insticatorBidAdapter_spec.js |  7 ++++-
 test/spec/modules/kargoBidAdapter_spec.js     | 15 ++++++----
 9 files changed, 27 insertions(+), 69 deletions(-)

diff --git a/modules/fintezaAnalyticsAdapter.js b/modules/fintezaAnalyticsAdapter.js
index 7ecc7e963b5..10b59de1838 100644
--- a/modules/fintezaAnalyticsAdapter.js
+++ b/modules/fintezaAnalyticsAdapter.js
@@ -35,16 +35,8 @@ function getPageInfo() {
 }
 
 function getUniqId() {
-  let cookies;
-
-  try {
-    cookies = parseCookies(document.cookie);
-  } catch (a) {
-    cookies = {};
-  }
-
   let isUniqFromLS;
-  let uniq = cookies[ UNIQ_ID_KEY ];
+  let uniq = storage.getCookie(UNIQ_ID_KEY);
   if (!uniq) {
     try {
       if (storage.hasLocalStorage()) {
diff --git a/modules/insticatorBidAdapter.js b/modules/insticatorBidAdapter.js
index 71815f058e7..5b7a64bc102 100644
--- a/modules/insticatorBidAdapter.js
+++ b/modules/insticatorBidAdapter.js
@@ -25,7 +25,7 @@ function getUserId() {
   let uid;
 
   if (storage.localStorageIsEnabled()) {
-    uid = localStorage.getItem(USER_ID_KEY);
+    uid = storage.getDataFromLocalStorage(USER_ID_KEY);
   } else {
     uid = storage.getCookie(USER_ID_KEY);
   }
@@ -39,7 +39,7 @@ function getUserId() {
 
 function setUserId(userId) {
   if (storage.localStorageIsEnabled()) {
-    localStorage.setItem(USER_ID_KEY, userId);
+    storage.setDataInLocalStorage(USER_ID_KEY, userId);
   }
 
   if (storage.cookiesAreEnabled()) {
diff --git a/modules/invibesBidAdapter.js b/modules/invibesBidAdapter.js
index 717a886a1f6..99434e18adb 100644
--- a/modules/invibesBidAdapter.js
+++ b/modules/invibesBidAdapter.js
@@ -381,7 +381,7 @@ function getUserIds(bidUserId) {
 function parseQueryStringParams() {
   let params = {};
   try {
-    params = JSON.parse(localStorage.ivbs);
+    params = JSON.parse(readFromLocalStorage('ivbs'));
   } catch (e) {
   }
   let re = /[\\?&]([^=]+)=([^\\?&#]+)/g;
diff --git a/modules/kargoBidAdapter.js b/modules/kargoBidAdapter.js
index 3027a8e75b8..72342903d87 100644
--- a/modules/kargoBidAdapter.js
+++ b/modules/kargoBidAdapter.js
@@ -9,7 +9,7 @@ const HOST = 'https://krk.kargo.com';
 const SYNC = 'https://crb.kargo.com/api/v1/initsyncrnd/{UUID}?seed={SEED}&idx={INDEX}&gdpr={GDPR}&gdpr_consent={GDPR_CONSENT}&us_privacy={US_PRIVACY}';
 const SYNC_COUNT = 5;
 const GVLID = 972;
-const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO]
+const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO];
 const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
 
 let sessionId,
@@ -146,31 +146,9 @@ export const spec = {
     });
   },
 
-  // PRIVATE
-  _readCookie(name) {
-    if (!storage.cookiesAreEnabled()) {
-      return null;
-    }
-    let nameEquals = `${name}=`;
-    let cookies = document.cookie.split(';');
-
-    for (let i = 0; i < cookies.length; i++) {
-      let cookie = cookies[i];
-      while (cookie.charAt(0) === ' ') {
-        cookie = cookie.substring(1, cookie.length);
-      }
-
-      if (cookie.indexOf(nameEquals) === 0) {
-        return cookie.substring(nameEquals.length, cookie.length);
-      }
-    }
-
-    return null;
-  },
-
   _getCrbFromCookie() {
     try {
-      const crb = JSON.parse(decodeURIComponent(spec._readCookie('krg_crb')));
+      const crb = JSON.parse(storage.getCookie('krg_crb'));
       if (crb && crb.v) {
         let vParsed = JSON.parse(atob(crb.v));
         if (vParsed) {
@@ -242,7 +220,7 @@ export const spec = {
       userIDs: spec._getUserIds(tdid, usp, gdpr),
       // TODO: this should probably look at refererInfo
       pageURL: window.location.href,
-      rawCRB: spec._readCookie('krg_crb'),
+      rawCRB: storage.getCookie('krg_crb'),
       rawCRBLocalStorage: spec._getLocalStorageSafely('krg_crb')
     };
   },
diff --git a/modules/pubwiseAnalyticsAdapter.js b/modules/pubwiseAnalyticsAdapter.js
index a3061eb1c99..9b40d45542c 100644
--- a/modules/pubwiseAnalyticsAdapter.js
+++ b/modules/pubwiseAnalyticsAdapter.js
@@ -157,7 +157,7 @@ function extendUserSessionTimeout() {
 }
 
 function userSessionID() {
-  return storage.getDataFromLocalStorage(localStorageSessName()) ? localStorage.getItem(localStorageSessName()) : '';
+  return storage.getDataFromLocalStorage(localStorageSessName()) || '';
 }
 
 function sessionExpired() {
diff --git a/modules/sspBCBidAdapter.js b/modules/sspBCBidAdapter.js
index 89bf4bb331d..01de23f7590 100644
--- a/modules/sspBCBidAdapter.js
+++ b/modules/sspBCBidAdapter.js
@@ -4,6 +4,7 @@ import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {includes as strIncludes} from '../src/polyfill.js';
+import { getStorageManager } from '../src/storageManager.js';
 
 const BIDDER_CODE = 'sspBC';
 const BIDDER_URL = 'https://ssp.wp.pl/bidder/';
@@ -11,6 +12,7 @@ const SYNC_URL = 'https://ssp.wp.pl/bidder/usersync';
 const NOTIFY_URL = 'https://ssp.wp.pl/bidder/notify';
 const TRACKER_URL = 'https://bdr.wpcdn.pl/tag/jstracker.js';
 const GVLID = 676;
+const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
 const TMAX = 450;
 const BIDDER_VERSION = '5.6';
 const DEFAULT_CURRENCY = 'PLN';
@@ -101,9 +103,7 @@ const getNotificationPayload = bidData => {
 
 const cookieSupport = () => {
   const isSafari = /^((?!chrome|android|crios|fxios).)*safari/i.test(navigator.userAgent);
-  const useCookies = navigator.cookieEnabled || !!document.cookie.length;
-
-  return !isSafari && useCookies;
+  return !isSafari && storage.cookiesAreEnabled();
 };
 
 const applyClientHints = ortbRequest => {
diff --git a/modules/widespaceBidAdapter.js b/modules/widespaceBidAdapter.js
index ba94f90f9c9..ea6f1bce793 100644
--- a/modules/widespaceBidAdapter.js
+++ b/modules/widespaceBidAdapter.js
@@ -185,28 +185,6 @@ function storeData(data, name, stringify = true) {
 
 function getData(name, remove = true) {
   let data = [];
-  if (storage.hasLocalStorage()) {
-    Object.keys(localStorage).filter((key) => {
-      if (key.indexOf(name) > -1) {
-        data.push(storage.getDataFromLocalStorage(key));
-        if (remove) {
-          storage.removeDataFromLocalStorage(key);
-        }
-      }
-    });
-  }
-
-  if (storage.cookiesAreEnabled()) {
-    document.cookie.split(';').forEach((item) => {
-      let value = item.split('=');
-      if (value[0].indexOf(name) > -1) {
-        data.push(value[1]);
-        if (remove) {
-          storage.setCookie(value[0], '', 'Thu, 01 Jan 1970 00:00:01 GMT');
-        }
-      }
-    });
-  }
   return data;
 }
 
diff --git a/test/spec/modules/insticatorBidAdapter_spec.js b/test/spec/modules/insticatorBidAdapter_spec.js
index 7d14742db85..fc7ed1833ac 100644
--- a/test/spec/modules/insticatorBidAdapter_spec.js
+++ b/test/spec/modules/insticatorBidAdapter_spec.js
@@ -183,6 +183,11 @@ describe('InsticatorBidAdapter', function () {
     let sandbox;
 
     beforeEach(() => {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        insticator: {
+          storageAllowed: true
+        }
+      };
       getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
       localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
       getCookieStub = sinon.stub(storage, 'getCookie');
@@ -198,6 +203,7 @@ describe('InsticatorBidAdapter', function () {
       localStorageIsEnabledStub.restore();
       getCookieStub.restore();
       cookiesAreEnabledStub.restore();
+      $$PREBID_GLOBAL$$.bidderSettings = {};
     });
 
     const serverRequests = spec.buildRequests([bidRequest], bidderRequest);
@@ -270,7 +276,6 @@ describe('InsticatorBidAdapter', function () {
       expect(data.regs.ext.gdpr).to.equal(1);
       expect(data.regs.ext.gdprConsentString).to.equal(bidderRequest.gdprConsent.consentString);
       expect(data.user).to.be.an('object');
-      expect(data.user.id).to.equal(USER_ID_DUMMY_VALUE);
       expect(data.user).to.have.property('yob');
       expect(data.user.yob).to.equal(1984);
       expect(data.user).to.have.property('gender');
diff --git a/test/spec/modules/kargoBidAdapter_spec.js b/test/spec/modules/kargoBidAdapter_spec.js
index c7a14b3d5aa..e900b91ed11 100644
--- a/test/spec/modules/kargoBidAdapter_spec.js
+++ b/test/spec/modules/kargoBidAdapter_spec.js
@@ -161,7 +161,7 @@ describe('kargo adapter tests', function () {
     }
 
     function getKrgCrbOldStyle() {
-      return '%7B%22v%22%3A%22eyJzeW5jSWRzIjp7IjIiOiI4MmZhMjU1NS01OTY5LTQ2MTQtYjRjZS00ZGNmMTA4MGU5ZjkiLCIxNiI6IlZveElrOEFvSnowQUFFZENleUFBQUFDMiY1MDIiLCIyMyI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjI0IjoiVm94SWs4QW9KejBBQUVkQ2V5QUFBQUMyJjUwMiIsIjI1IjoiNWVlMjQxMzgtNWUwMy00YjlkLWE5NTMtMzhlODMzZjI4NDlmIiwiMl84MCI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjJfOTMiOiI1ZWUyNDEzOC01ZTAzLTRiOWQtYTk1My0zOGU4MzNmMjg0OWYifSwibGV4SWQiOiI1ZjEwODgzMS0zMDJkLTExZTctYmY2Yi00NTk1YWNkM2JmNmMiLCJjbGllbnRJZCI6IjI0MTBkOGYyLWMxMTEtNDgxMS04OGE1LTdiNWUxOTBlNDc1ZiIsIm9wdE91dCI6ZmFsc2UsImV4cGlyZVRpbWUiOjE0OTc0NDkzODI2NjgsImxhc3RTeW5jZWRBdCI6MTQ5NzM2Mjk3OTAxMn0=%22%7D';
+      return '{"v":"eyJzeW5jSWRzIjp7IjIiOiI4MmZhMjU1NS01OTY5LTQ2MTQtYjRjZS00ZGNmMTA4MGU5ZjkiLCIxNiI6IlZveElrOEFvSnowQUFFZENleUFBQUFDMiY1MDIiLCIyMyI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjI0IjoiVm94SWs4QW9KejBBQUVkQ2V5QUFBQUMyJjUwMiIsIjI1IjoiNWVlMjQxMzgtNWUwMy00YjlkLWE5NTMtMzhlODMzZjI4NDlmIiwiMl84MCI6ImQyYTg1NWE1LTFiMWMtNDMwMC05NDBlLWE3MDhmYTFmMWJkZSIsIjJfOTMiOiI1ZWUyNDEzOC01ZTAzLTRiOWQtYTk1My0zOGU4MzNmMjg0OWYifSwibGV4SWQiOiI1ZjEwODgzMS0zMDJkLTExZTctYmY2Yi00NTk1YWNkM2JmNmMiLCJjbGllbnRJZCI6IjI0MTBkOGYyLWMxMTEtNDgxMS04OGE1LTdiNWUxOTBlNDc1ZiIsIm9wdE91dCI6ZmFsc2UsImV4cGlyZVRpbWUiOjE0OTc0NDkzODI2NjgsImxhc3RTeW5jZWRBdCI6MTQ5NzM2Mjk3OTAxMn0="}';
     }
 
     function initializeKrgCrb(cookieOnly) {
@@ -188,7 +188,7 @@ describe('kargo adapter tests', function () {
     }
 
     function getInvalidKrgCrbType2OldStyle() {
-      return '%7B%22v%22%3A%22%26%26%26%26%26%26%22%7D';
+      return '{"v":"&&&&&&"}';
     }
 
     function initializeInvalidKrgCrbType2() {
@@ -200,7 +200,7 @@ describe('kargo adapter tests', function () {
     }
 
     function getInvalidKrgCrbType3OldStyle() {
-      return '%7B%22v%22%3A%22Ly8v%22%7D';
+      return '{"v":"Ly8v"}';
     }
 
     function initializeInvalidKrgCrbType3Cookie() {
@@ -208,7 +208,7 @@ describe('kargo adapter tests', function () {
     }
 
     function getInvalidKrgCrbType4OldStyle() {
-      return '%7B%22v%22%3A%22bnVsbA%3D%3D%22%7D';
+      return '{"v":"bnVsbA=="}';
     }
 
     function initializeInvalidKrgCrbType4Cookie() {
@@ -220,7 +220,7 @@ describe('kargo adapter tests', function () {
     }
 
     function getEmptyKrgCrbOldStyle() {
-      return '%7B%22v%22%3A%22eyJleHBpcmVUaW1lIjoxNDk3NDQ5MzgyNjY4LCJsYXN0U3luY2VkQXQiOjE0OTczNjI5NzkwMTJ9%22%7D';
+      return '{"v":"eyJleHBpcmVUaW1lIjoxNDk3NDQ5MzgyNjY4LCJsYXN0U3luY2VkQXQiOjE0OTczNjI5NzkwMTJ9"}';
     }
 
     function initializeEmptyKrgCrb() {
@@ -593,6 +593,11 @@ describe('kargo adapter tests', function () {
     var shouldSimulateOutdatedBrowser, crb, isActuallyOutdatedBrowser;
 
     beforeEach(() => {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        kargo: {
+          storageAllowed: true
+        }
+      };
       crb = {};
       shouldSimulateOutdatedBrowser = false;
       isActuallyOutdatedBrowser = false;

From 32f257abf82c90f1409383513b93e1f688cf7b27 Mon Sep 17 00:00:00 2001
From: Andrew Slagle <42588549+spotxslagle@users.noreply.github.com>
Date: Fri, 22 Jul 2022 12:09:04 -0600
Subject: [PATCH 057/569] Prebid Core: allows immediate rendering (#8633)

* Renderer allows immediate rendering

* Add unit test for immediate rendering
---
 src/Renderer.js            | 16 +++++++++-------
 test/spec/renderer_spec.js | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/Renderer.js b/src/Renderer.js
index f26a5a377c0..3375edcd6c3 100644
--- a/src/Renderer.js
+++ b/src/Renderer.js
@@ -14,7 +14,7 @@ const moduleCode = 'outstream';
  */
 
 export function Renderer(options) {
-  const { url, config, id, callback, loaded, adUnitCode } = options;
+  const { url, config, id, callback, loaded, adUnitCode, renderNow } = options;
   this.url = url;
   this.config = config;
   this.handlers = {};
@@ -50,19 +50,21 @@ export function Renderer(options) {
       }
     }
 
-    if (!isRendererPreferredFromAdUnit(adUnitCode)) {
+    if (isRendererPreferredFromAdUnit(adUnitCode)) {
+      logWarn(`External Js not loaded by Renderer since renderer url and callback is already defined on adUnit ${adUnitCode}`);
+      runRender();
+    } else if (renderNow) {
+      runRender();
+    } else {
       // we expect to load a renderer url once only so cache the request to load script
       this.cmd.unshift(runRender) // should render run first ?
       loadExternalScript(url, moduleCode, this.callback, this.documentContext);
-    } else {
-      logWarn(`External Js not loaded by Renderer since renderer url and callback is already defined on adUnit ${adUnitCode}`);
-      runRender()
     }
   }.bind(this) // bind the function to this object to avoid 'this' errors
 }
 
-Renderer.install = function({ url, config, id, callback, loaded, adUnitCode }) {
-  return new Renderer({ url, config, id, callback, loaded, adUnitCode });
+Renderer.install = function({ url, config, id, callback, loaded, adUnitCode, renderNow }) {
+  return new Renderer({ url, config, id, callback, loaded, adUnitCode, renderNow });
 };
 
 Renderer.prototype.getConfig = function() {
diff --git a/test/spec/renderer_spec.js b/test/spec/renderer_spec.js
index 6de06606136..c41334f916a 100644
--- a/test/spec/renderer_spec.js
+++ b/test/spec/renderer_spec.js
@@ -107,6 +107,21 @@ describe('Renderer', function () {
       sinon.assert.calledOnce(func2);
       expect(testRenderer1.cmd.length).to.equal(0);
     });
+
+    it('renders immediately when requested', function () {
+      const testRenderer3 = Renderer.install({
+        url: 'https://httpbin.org/post',
+        config: { test: 'config2' },
+        id: 2,
+        renderNow: true
+      });
+      const func1 = sinon.spy();
+      const testArg = 'testArgument';
+
+      testRenderer3.setRender(func1);
+      testRenderer3.render(testArg);
+      func1.calledWith(testArg).should.be.ok;
+    });
   });
 
   describe('3rd party renderer', function () {

From 8dccf2b447998457edd79e4c2a18ad1f928e0d48 Mon Sep 17 00:00:00 2001
From: Andrew Slagle <42588549+spotxslagle@users.noreply.github.com>
Date: Sat, 23 Jul 2022 09:57:19 -0600
Subject: [PATCH 058/569] Prebid Core : add setScriptAttributes to adloader in
 Utils (#8624)

* Allow SpotX module to load script without appendChild

* Fix SpotX spec to no longer use appendChild

* Restore spotx files

* Formatting fixes

* Unit test for setScriptAttributes

* Unit test and formatting fix

* Formatting fix

* Comment that attributes are added once only
---
 src/adloader.js            | 14 ++++++++++----
 src/utils.js               | 13 +++++++++++++
 test/spec/adloader_spec.js | 23 +++++++++++++++++++++++
 test/spec/utils_spec.js    | 16 ++++++++++++++++
 4 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/src/adloader.js b/src/adloader.js
index 28acec136f6..1e7995a9dc6 100644
--- a/src/adloader.js
+++ b/src/adloader.js
@@ -1,5 +1,5 @@
 import {includes} from './polyfill.js';
-import { logError, logWarn, insertElement } from './utils.js';
+import { logError, logWarn, insertElement, setScriptAttributes } from './utils.js';
 
 const _requestCache = new WeakMap();
 // The below list contains modules or vendors whom Prebid allows to load external JS.
@@ -9,6 +9,7 @@ const _approvedLoadExternalJSList = [
   'criteo',
   'outstream',
   'adagio',
+  'spotx',
   'browsi',
   'brandmetrics',
   'justtag',
@@ -27,8 +28,9 @@ const _approvedLoadExternalJSList = [
  * @param {string} moduleCode bidderCode or module code of the module requesting this resource
  * @param {function} [callback] callback function to be called after the script is loaded
  * @param {Document} [doc] the context document, in which the script will be loaded, defaults to loaded document
+ * @param {object} an object of attributes to be added to the script with setAttribute by [key] and [value]; Only the attributes passed in the first request of a url will be added.
  */
-export function loadExternalScript(url, moduleCode, callback, doc) {
+export function loadExternalScript(url, moduleCode, callback, doc, attributes) {
   if (!moduleCode || !url) {
     logError('cannot load external script without url and moduleCode');
     return;
@@ -77,9 +79,9 @@ export function loadExternalScript(url, moduleCode, callback, doc) {
     } catch (e) {
       logError('Error executing callback', 'adloader.js:loadExternalScript', e);
     }
-  }, doc);
+  }, doc, attributes);
 
-  function requestResource(tagSrc, callback, doc) {
+  function requestResource(tagSrc, callback, doc, attributes) {
     if (!doc) {
       doc = document;
     }
@@ -107,6 +109,10 @@ export function loadExternalScript(url, moduleCode, callback, doc) {
 
     jptScript.src = tagSrc;
 
+    if (attributes) {
+      setScriptAttributes(jptScript, attributes);
+    }
+
     // add the new script tag to the page
     insertElement(jptScript, doc);
 
diff --git a/src/utils.js b/src/utils.js
index b53475af912..9434a163133 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1368,3 +1368,16 @@ export function safeJSONParse(data) {
     return JSON.parse(data);
   } catch (e) {}
 }
+
+/**
+ * Sets dataset attributes on a script
+ * @param {Script} script
+ * @param {object} attributes
+ */
+export function setScriptAttributes(script, attributes) {
+  for (let key in attributes) {
+    if (attributes.hasOwnProperty(key)) {
+      script.setAttribute(key, attributes[key]);
+    }
+  }
+}
diff --git a/test/spec/adloader_spec.js b/test/spec/adloader_spec.js
index 0c50e66c63c..b775ec76e9b 100644
--- a/test/spec/adloader_spec.js
+++ b/test/spec/adloader_spec.js
@@ -69,4 +69,27 @@ describe('adLoader', function () {
       expect(utilsinsertElementStub.callCount).to.equal(2);
     });
   });
+
+  it('attaches passed attributes to a script', function () {
+    const doc = {
+        createElement: function () {
+          return {
+            setAttribute: function (key, value) {
+              this[key] = value;
+            }
+          }
+        },
+        getElementsByTagName: function() {
+          return {
+            firstChild: {
+              insertBefore: function() {}
+            }
+          }
+        }
+      },
+      attrs = {'z': 'A', 'y': 2};
+    let script = adLoader.loadExternalScript('someUrl', 'criteo', undefined, doc, attrs);
+    expect(script.z).to.equal('A');
+    expect(script.y).to.equal(2);
+  });
 });
diff --git a/test/spec/utils_spec.js b/test/spec/utils_spec.js
index 50a95b079c9..500f479355d 100644
--- a/test/spec/utils_spec.js
+++ b/test/spec/utils_spec.js
@@ -1243,4 +1243,20 @@ describe('Utils', function () {
       });
     });
   });
+
+  describe('setScriptAttributes', () => {
+    it('correctly adds attributes from an object', () => {
+      const script = document.createElement('script'),
+        attrs = {
+          'data-first_prop': '1',
+          'data-second_prop': 'b',
+          'id': 'newId'
+        };
+      script.id = 'oldId';
+      utils.setScriptAttributes(script, attrs);
+      expect(script.dataset['first_prop']).to.equal('1');
+      expect(script.dataset.second_prop).to.equal('b');
+      expect(script.id).to.equal('newId');
+    });
+  });
 });

From 4603f96b36bd915e2f1054addb93b7281b4914e0 Mon Sep 17 00:00:00 2001
From: Andrew Slagle <42588549+spotxslagle@users.noreply.github.com>
Date: Sat, 23 Jul 2022 09:57:59 -0600
Subject: [PATCH 059/569] SpotX Adapter: Render immediately (#8731)

* Render spotx ads immediately

* Formatting fix
---
 modules/spotxBidAdapter.js                |  2 +-
 test/spec/modules/spotxBidAdapter_spec.js | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/spotxBidAdapter.js b/modules/spotxBidAdapter.js
index 86a37e97e2f..bcc65c85791 100644
--- a/modules/spotxBidAdapter.js
+++ b/modules/spotxBidAdapter.js
@@ -379,7 +379,7 @@ export const spec = {
             const playersize = deepAccess(currentBidRequest, 'mediaTypes.video.playerSize');
             const renderer = Renderer.install({
               id: 0,
-              url: '/',
+              renderNow: true,
               config: {
                 adText: 'SpotX Outstream Video Ad via Prebid.js',
                 player_width: playersize[0][0],
diff --git a/test/spec/modules/spotxBidAdapter_spec.js b/test/spec/modules/spotxBidAdapter_spec.js
index 9d961657ac2..274ef60471b 100644
--- a/test/spec/modules/spotxBidAdapter_spec.js
+++ b/test/spec/modules/spotxBidAdapter_spec.js
@@ -442,6 +442,7 @@ describe('the spotx adapter', function () {
             },
             bidId: 123,
             params: {
+              ad_unit: 'outstream',
               player_width: 400,
               player_height: 300,
               content_page_url: 'prebid.js',
@@ -533,6 +534,17 @@ describe('the spotx adapter', function () {
       expect(responses[1].videoCacheKey).to.equal('cache124');
       expect(responses[1].width).to.equal(200);
     });
+
+    it('should set the renderer attached to the bid to render immediately', function () {
+      var renderer = spec.interpretResponse(serverResponse, bidderRequestObj)[0].renderer,
+        hasRun = false;
+      expect(renderer._render).to.be.a('function');
+      renderer._render = () => {
+        hasRun = true;
+      }
+      renderer.render();
+      expect(hasRun).to.equal(true);
+    });
   });
 
   describe('outstreamRender', function() {

From 2eee4f13951b66a731fb146aa077b62e9de6c2c1 Mon Sep 17 00:00:00 2001
From: OronW <41260031+OronW@users.noreply.github.com>
Date: Mon, 25 Jul 2022 14:52:48 +0300
Subject: [PATCH 060/569] added logic to detect the loop number (#8733)

---
 modules/kueezBidAdapter.js                | 1 +
 test/spec/modules/kueezBidAdapter_spec.js | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/modules/kueezBidAdapter.js b/modules/kueezBidAdapter.js
index f1156376ff5..4e0278603fd 100644
--- a/modules/kueezBidAdapter.js
+++ b/modules/kueezBidAdapter.js
@@ -244,6 +244,7 @@ function generateBidParameters(bid, bidderRequest) {
   const bidObject = {
     adUnitCode: getBidIdParameter('adUnitCode', bid),
     bidId: getBidIdParameter('bidId', bid),
+    loop: getBidIdParameter('bidderRequestsCount', bid),
     bidderRequestId: getBidIdParameter('bidderRequestId', bid),
     floorPrice: Math.max(getFloorPrice(bid, mediaType), paramsFloorPrice),
     mediaType,
diff --git a/test/spec/modules/kueezBidAdapter_spec.js b/test/spec/modules/kueezBidAdapter_spec.js
index 16440965765..cd95a9ebdc6 100644
--- a/test/spec/modules/kueezBidAdapter_spec.js
+++ b/test/spec/modules/kueezBidAdapter_spec.js
@@ -53,6 +53,7 @@ describe('kueezBidAdapter', function () {
           'org': 'test-publisher-id'
         },
         'bidId': '5wfg9887sd5478',
+        'loop': 1,
         'bidderRequestId': 'op87952ewq8567',
         'auctionId': '87se98rt-5789-8735-2546-t98yh5678231',
         'mediaTypes': {
@@ -71,6 +72,7 @@ describe('kueezBidAdapter', function () {
           'org': 'test-publisher-id'
         },
         'bidId': '5wfg9887sd5478',
+        'loop': 1,
         'bidderRequestId': 'op87952ewq8567',
         'auctionId': '87se98rt-5789-8735-2546-t98yh5678231',
         'mediaTypes': {
@@ -91,6 +93,7 @@ describe('kueezBidAdapter', function () {
           'testMode': true
         },
         'bidId': '5wfg9887sd5478',
+        'loop': 2,
         'bidderRequestId': 'op87952ewq8567',
         'auctionId': '87se98rt-5789-8735-2546-t98yh5678231',
       }

From 40e5747b746b79939a98dce2f21c7cb09e5da0c4 Mon Sep 17 00:00:00 2001
From: mmprebid <67095277+mmprebid@users.noreply.github.com>
Date: Mon, 25 Jul 2022 17:25:58 +0530
Subject: [PATCH 061/569] Truereach Bid adapter: update url (#8728)

* Added Trureach Prebid Adapter

* cleaned up truereach bidder adapter for release

* truereach bidder adapter md file for release

* [truereach] bidder adapter and md files update. bidderUrl no more configurable.

* [Prebid] supporting nurl

* [Prebid] changes required due to code style

* [Prebid] prebid unit test

* [Prebid] added advertiserDomains in response object

* [Prebid] Secure Bidder Url.

* Added usersync support

* changes in bidder url

* add singapore region for bidder url & handle https in usersync url

* add singapore region in usersync url

Co-authored-by: Nitin Kumar <nitin.kumar@momagic.com>
Co-authored-by: arnav <arnav.mishra@momagic.com>
Co-authored-by: arnav <arnav.mishra@momgaic.com>
Co-authored-by: nawedita.keshari@momagic.com-at-143515221912 <nawedita.keshari@momagic.com>
---
 modules/truereachBidAdapter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/truereachBidAdapter.js b/modules/truereachBidAdapter.js
index a0244e3a349..46774275bba 100755
--- a/modules/truereachBidAdapter.js
+++ b/modules/truereachBidAdapter.js
@@ -5,7 +5,7 @@ import { BANNER } from '../src/mediaTypes.js';
 
 const SUPPORTED_AD_TYPES = [BANNER];
 const BIDDER_CODE = 'truereach';
-const BIDDER_URL = 'https://ads.momagic.com/exchange/openrtb25/';
+const BIDDER_URL = 'https://ads-sg.momagic.com/exchange/openrtb25/';
 
 export const spec = {
   code: BIDDER_CODE,
@@ -94,7 +94,7 @@ export const spec = {
     if (syncOptions.iframeEnabled) {
       syncs.push({
         type: 'iframe',
-        url: 'http://ads.momagic.com/jsp/usersync.jsp' + gdprParams
+        url: 'https://ads-sg.momagic.com/jsp/usersync.jsp' + gdprParams
       });
     }
     return syncs;

From 6e3b732b9a26ef9786fcca84c5b07fa7fd9c9cae Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Mon, 25 Jul 2022 05:27:05 -0700
Subject: [PATCH 062/569] Truereach Bid Adapter: update unit test url (#8735)

* update test url

* https update
---
 test/spec/modules/truereachBidAdapter_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/spec/modules/truereachBidAdapter_spec.js b/test/spec/modules/truereachBidAdapter_spec.js
index 3c78c4b848d..cd7d0873569 100644
--- a/test/spec/modules/truereachBidAdapter_spec.js
+++ b/test/spec/modules/truereachBidAdapter_spec.js
@@ -83,7 +83,7 @@ describe('truereachBidAdapterTests', function () {
   });
 
   describe('user_sync', function() {
-    const user_sync_url = 'http://ads.momagic.com/jsp/usersync.jsp';
+    const user_sync_url = 'https://ads-sg.momagic.com/jsp/usersync.jsp';
     it('register_iframe_pixel_if_iframeEnabled_is_true', function() {
       let syncs = spec.getUserSyncs(
         {iframeEnabled: true}

From 25aa858e570ab30a7aeb6ebd3176de32133f6673 Mon Sep 17 00:00:00 2001
From: adquery <89853721+adquery@users.noreply.github.com>
Date: Mon, 25 Jul 2022 15:51:58 +0200
Subject: [PATCH 063/569] Adquery Bid Adapter: bugfix local uuid (#8734)

* adquery - bugfix local uuid

* adquery - bugfix local uuid

Co-authored-by: m.czerwiak <marcin.czerwiak@azagroup.eu>
---
 modules/adqueryBidAdapter.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/adqueryBidAdapter.js b/modules/adqueryBidAdapter.js
index e449adce1a1..048e43641f0 100644
--- a/modules/adqueryBidAdapter.js
+++ b/modules/adqueryBidAdapter.js
@@ -58,6 +58,7 @@ export const spec = {
     logInfo(request);
     logInfo(response);
 
+    let qid = null;
     const res = response && response.body && response.body.data;
     let bidResponses = [];
 
@@ -86,6 +87,17 @@ export const spec = {
     bidResponses.push(bidResponse);
     logInfo('bidResponses', bidResponses);
 
+    if (res && res.qid) {
+      if (storage.getDataFromLocalStorage('qid')) {
+        qid = storage.getDataFromLocalStorage('qid');
+        if (qid && qid.includes('%7B%22')) {
+          storage.setDataInLocalStorage('qid', res.qid);
+        }
+      } else {
+        storage.setDataInLocalStorage('qid', res.qid);
+      }
+    }
+
     return bidResponses;
   },
 
@@ -178,25 +190,13 @@ export const spec = {
 
 };
 function buildRequest(validBidRequests, bidderRequest) {
-  let gnerateQid = (Math.random().toString(36).substring(2)) + ((new Date().getTime()).toString(36));
   let bid = validBidRequests;
-  let qid = gnerateQid;
-
-  if (storage.getDataFromLocalStorage('qid')) {
-    qid = storage.getDataFromLocalStorage('qid');
-    if (qid && qid.includes('%7B%22')) {
-      qid = gnerateQid;
-    }
-  } else {
-    storage.setDataInLocalStorage('qid', qid);
-  }
-
   return {
     placementCode: bid.params.placementId,
     auctionId: bid.auctionId,
-    qid: qid,
     type: bid.params.type,
     adUnitCode: bid.adUnitCode,
+    bidQid: storage.getDataFromLocalStorage('qid') || null,
     bidId: bid.bidId,
     bidder: bid.bidder,
     bidderRequestId: bid.bidderRequestId,

From b11951206833cd4f50eb6622405e35b6e4a5e643 Mon Sep 17 00:00:00 2001
From: azuryo <108641852+azuryo@users.noreply.github.com>
Date: Tue, 26 Jul 2022 00:19:58 +0900
Subject: [PATCH 064/569] Miocroad Bid Adapter: Added Support for Audience IDs
 (#8662)

* Microad Bid Adapter: Add IM-UID

* Microad Bid Adapter: Add ID5 ID

* Microad Bid Adapter: Add Unified ID

* Microad Bid Adapter: Add Novatiq Hyper ID

* Microad Bid Adapter: Add Parrable ID

* Microad Bid Adapter: Add AudienceOne User ID

* Microad BidAdapter: Add Audience ID spec

* Microad BidAdapter: Add Ramp ID in params

* Microad BidAdapter: Fix Audience ID

* Microad BidAdapter: Add Criteo ID and Shared ID

* Microad BidAdapter: Fix typo

* Microad BidAdapter: Fix variable name
---
 modules/microadBidAdapter.js                | 26 +++++++-
 test/spec/modules/microadBidAdapter_spec.js | 71 +++++++++++++++------
 2 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/modules/microadBidAdapter.js b/modules/microadBidAdapter.js
index 77710584f41..d5116b1dcb0 100644
--- a/modules/microadBidAdapter.js
+++ b/modules/microadBidAdapter.js
@@ -22,6 +22,18 @@ const BANNER_CODE = 1;
 const NATIVE_CODE = 2;
 const VIDEO_CODE = 4;
 
+const AUDIENCE_IDS = [
+  {type: 6, bidKey: 'userId.imuid'},
+  {type: 8, bidKey: 'userId.id5id.uid'},
+  {type: 9, bidKey: 'userId.tdid'},
+  {type: 10, bidKey: 'userId.novatiq.snowflake'},
+  {type: 11, bidKey: 'userId.parrableId.eid'},
+  {type: 12, bidKey: 'userId.dacId.id'},
+  {type: 13, bidKey: 'userId.idl_env'},
+  {type: 14, bidKey: 'userId.criteoId'},
+  {type: 15, bidKey: 'userId.pubcid'}
+]
+
 function createCBT() {
   const randomValue = Math.floor(Math.random() * Math.pow(10, 18)).toString(16);
   const date = new Date().getTime().toString(16);
@@ -83,9 +95,17 @@ export const spec = {
         }
       }
 
-      const idlEnv = deepAccess(bid, 'userId.idl_env')
-      if (!isEmpty(idlEnv) && isStr(idlEnv)) {
-        params['idl_env'] = idlEnv
+      const aidsParams = []
+      AUDIENCE_IDS.forEach((audienceId) => {
+        const bidAudienceId = deepAccess(bid, audienceId.bidKey);
+        if (!isEmpty(bidAudienceId) && isStr(bidAudienceId)) {
+          aidsParams.push({ type: audienceId.type, id: bidAudienceId });
+          // Set Ramp ID
+          if (audienceId.type === 13) params['idl_env'] = bidAudienceId;
+        }
+      })
+      if (aidsParams.length > 0) {
+        params['aids'] = JSON.stringify(aidsParams)
       }
 
       requests.push({
diff --git a/test/spec/modules/microadBidAdapter_spec.js b/test/spec/modules/microadBidAdapter_spec.js
index ff0b705594b..cca337c83f2 100644
--- a/test/spec/modules/microadBidAdapter_spec.js
+++ b/test/spec/modules/microadBidAdapter_spec.js
@@ -266,35 +266,70 @@ describe('microadBidAdapter', () => {
       });
     });
 
-    it('should add Liveramp identity link if it is available in request parameters', () => {
-      const bidRequestWithLiveramp = Object.assign({}, bidRequestTemplate, {
-        userId: {idl_env: 'idl-env-sample'}
+    it('should not add Liveramp identity link and Audience ID if it is not available in request parameters', () => {
+      const bidRequestWithOutLiveramp = Object.assign({}, bidRequestTemplate, {
+        userId: {}
       });
-      const requests = spec.buildRequests([bidRequestWithLiveramp], bidderRequest)
+      const requests = spec.buildRequests([bidRequestWithOutLiveramp], bidderRequest)
       requests.forEach(request => {
         expect(request.data).to.deep.equal(
           Object.assign({}, expectedResultTemplate, {
-            cbt: request.data.cbt,
-            idl_env: 'idl-env-sample'
+            cbt: request.data.cbt
           })
         );
       })
     });
 
-    it('should not add Liveramp identity link if it is not available in request parameters', () => {
-      const bidRequestWithLiveramp = Object.assign({}, bidRequestTemplate, {
-        userId: {}
-      });
-      const requests = spec.buildRequests([bidRequestWithLiveramp], bidderRequest)
-      const expectedResult = Object.assign({}, expectedResultTemplate)
-      requests.forEach(request => {
-        expect(request.data).to.deep.equal(
-          Object.assign({}, expectedResultTemplate, {
-            cbt: request.data.cbt
+    Object.entries({
+      'IM-UID': {
+        userId: {imuid: 'imuid-sample'},
+        expected: {aids: JSON.stringify([{type: 6, id: 'imuid-sample'}])}
+      },
+      'ID5 ID': {
+        userId: {id5id: {uid: 'id5id-sample'}},
+        expected: {aids: JSON.stringify([{type: 8, id: 'id5id-sample'}])}
+      },
+      'Unified ID': {
+        userId: {tdid: 'unified-sample'},
+        expected: {aids: JSON.stringify([{type: 9, id: 'unified-sample'}])}
+      },
+      'Novatiq Snowflake ID': {
+        userId: {novatiq: {snowflake: 'novatiq-sample'}},
+        expected: {aids: JSON.stringify([{type: 10, id: 'novatiq-sample'}])}
+      },
+      'Parrable ID': {
+        userId: {parrableId: {eid: 'parrable-sample'}},
+        expected: {aids: JSON.stringify([{type: 11, id: 'parrable-sample'}])}
+      },
+      'AudienceOne User ID': {
+        userId: {dacId: {id: 'audience-one-sample'}},
+        expected: {aids: JSON.stringify([{type: 12, id: 'audience-one-sample'}])}
+      },
+      'Ramp ID and Liveramp identity': {
+        userId: {idl_env: 'idl-env-sample'},
+        expected: {idl_env: 'idl-env-sample', aids: JSON.stringify([{type: 13, id: 'idl-env-sample'}])}
+      },
+      'Criteo ID': {
+        userId: {criteoId: 'criteo-id-sample'},
+        expected: {aids: JSON.stringify([{type: 14, id: 'criteo-id-sample'}])}
+      },
+      'Shared ID': {
+        userId: {pubcid: 'shared-id-sample'},
+        expected: {aids: JSON.stringify([{type: 15, id: 'shared-id-sample'}])}
+      }
+    }).forEach(([test, arg]) => {
+      it(`should add ${test} if it is available in request parameters`, () => {
+        const bidRequestWithUserId = { ...bidRequestTemplate, userId: arg.userId }
+        const requests = spec.buildRequests([bidRequestWithUserId], bidderRequest)
+        requests.forEach((request) => {
+          expect(request.data).to.deep.equal({
+            ...expectedResultTemplate,
+            cbt: request.data.cbt,
+            ...arg.expected
           })
-        );
+        })
       })
-    });
+    })
   });
 
   describe('interpretResponse', () => {

From 715a1f5fc07ac273a729dc3a6d6625a05468b502 Mon Sep 17 00:00:00 2001
From: SKOCHERI <37454420+SKOCHERI@users.noreply.github.com>
Date: Mon, 25 Jul 2022 09:02:06 -0700
Subject: [PATCH 065/569] Data Controller Module: initial release (#8484)

* Data Controller Module

* Data Controller Module

* Correcting typo

* Setting hook based on data controller configuration

* Setting hook based on data controller configuration

* Updating to filter data before startAuction event

* Updating to filter data before startAuction event

* Review comment fixes

* Review comment fixes

Co-authored-by: skocheri <skocheri@rubiconproject.com>
---
 modules/dataControllerModule/index.js    | 195 +++++++++++++++++++++
 modules/dataControllerModule/index.md    |  29 ++++
 test/spec/modules/dataController_spec.js | 210 +++++++++++++++++++++++
 3 files changed, 434 insertions(+)
 create mode 100644 modules/dataControllerModule/index.js
 create mode 100644 modules/dataControllerModule/index.md
 create mode 100644 test/spec/modules/dataController_spec.js

diff --git a/modules/dataControllerModule/index.js b/modules/dataControllerModule/index.js
new file mode 100644
index 00000000000..c9d15457c3d
--- /dev/null
+++ b/modules/dataControllerModule/index.js
@@ -0,0 +1,195 @@
+/**
+ * This module validates the configuration and filters data accordingly
+ * @module modules/dataController
+ */
+import {config} from '../../src/config.js';
+import {getHook, module} from '../../src/hook.js';
+import {deepAccess, deepSetValue, prefixLog} from '../../src/utils.js';
+import {startAuction} from '../../src/prebid.js';
+
+const LOG_PRE_FIX = 'Data_Controller : ';
+const ALL = '*';
+const MODULE_NAME = 'dataController';
+const GLOBAL = {};
+let _dataControllerConfig;
+
+const _logger = prefixLog(LOG_PRE_FIX);
+
+/**
+ * BidderRequests hook to intiate module and reset data object
+ */
+export function filterBidData(fn, req) {
+  if (_dataControllerConfig.filterEIDwhenSDA) {
+    filterEIDs(req.adUnits, req.ortb2Fragments);
+  }
+
+  if (_dataControllerConfig.filterSDAwhenEID) {
+    filterSDA(req.adUnits, req.ortb2Fragments);
+  }
+  fn.call(this, req);
+  return req;
+}
+
+function containsConfiguredEIDS(eidSourcesMap, bidderCode) {
+  if (_dataControllerConfig.filterSDAwhenEID.includes(ALL)) {
+    return true;
+  }
+  let bidderEIDs = eidSourcesMap.get(bidderCode);
+  if (bidderEIDs == undefined) {
+    return false;
+  }
+  let containsEIDs = false;
+  _dataControllerConfig.filterSDAwhenEID.some(source => {
+    if (bidderEIDs.has(source)) {
+      containsEIDs = true;
+    }
+  });
+  return containsEIDs;
+}
+
+function containsConfiguredSDA(segementMap, bidderCode) {
+  if (_dataControllerConfig.filterEIDwhenSDA.includes(ALL)) {
+    return true;
+  }
+  return hasValue(segementMap.get(bidderCode)) || hasValue(segementMap.get(GLOBAL))
+}
+
+function hasValue(bidderSegement) {
+  let containsSDA = false;
+  if (bidderSegement == undefined) {
+    return false;
+  }
+  _dataControllerConfig.filterEIDwhenSDA.some(segment => {
+    if (bidderSegement.has(segment)) {
+      containsSDA = true;
+    }
+  });
+  return containsSDA;
+}
+
+function getSegmentConfig(ortb2Fragments) {
+  let bidderSDAMap = new Map();
+  let globalObject = deepAccess(ortb2Fragments, 'global') || {};
+
+  collectSegments(bidderSDAMap, GLOBAL, globalObject);
+  if (ortb2Fragments.bidder) {
+    for (const [key, value] of Object.entries(ortb2Fragments.bidder)) {
+      collectSegments(bidderSDAMap, key, value);
+    }
+  }
+  return bidderSDAMap;
+}
+
+function collectSegments(bidderSDAMap, key, data) {
+  let segmentSet = constructSegment(deepAccess(data, 'user.data') || []);
+  if (segmentSet && segmentSet.size > 0) bidderSDAMap.set(key, segmentSet);
+}
+
+function constructSegment(userData) {
+  let segmentSet;
+  if (userData) {
+    segmentSet = new Set();
+    for (let i = 0; i < userData.length; i++) {
+      let segments = userData[i].segment;
+      let segmentPrefix = '';
+      if (userData[i].name) {
+        segmentPrefix = userData[i].name + ':';
+      }
+
+      if (userData[i].ext && userData[i].ext.segtax) {
+        segmentPrefix += userData[i].ext.segtax + ':';
+      }
+      for (let j = 0; j < segments.length; j++) {
+        segmentSet.add(segmentPrefix + segments[j].id);
+      }
+    }
+  }
+
+  return segmentSet;
+}
+
+function getEIDsSource(adUnits) {
+  let bidderEIDSMap = new Map();
+  adUnits.forEach(adUnit => {
+    adUnit.bids.forEach(bid => {
+      let userEIDs = deepAccess(bid, 'userIdAsEids') || [];
+
+      if (userEIDs) {
+        let sourceSet = new Set();
+        for (let i = 0; i < userEIDs.length; i++) {
+          let source = userEIDs[i].source;
+          sourceSet.add(source);
+        }
+        bidderEIDSMap.set(bid.bidder, sourceSet);
+      }
+    });
+  });
+
+  return bidderEIDSMap;
+}
+
+function filterSDA(adUnits, ortb2Fragments) {
+  let bidderEIDSMap = getEIDsSource(adUnits);
+  let resetGlobal = false;
+  for (const [key, value] of Object.entries(ortb2Fragments.bidder)) {
+    let resetSDA = containsConfiguredEIDS(bidderEIDSMap, key);
+    if (resetSDA) {
+      deepSetValue(value, 'user.data', []);
+      resetGlobal = true;
+    }
+  }
+  if (resetGlobal) {
+    deepSetValue(ortb2Fragments, 'global.user.data', [])
+  }
+}
+
+function filterEIDs(adUnits, ortb2Fragments) {
+  let segementMap = getSegmentConfig(ortb2Fragments);
+  let globalEidUpdate = false;
+  adUnits.forEach(adUnit => {
+    adUnit.bids.forEach(bid => {
+      let resetEID = containsConfiguredSDA(segementMap, bid.bidder);
+      if (resetEID) {
+        globalEidUpdate = true;
+        bid.userIdAsEids = [];
+        bid.userId = {};
+        if (ortb2Fragments.bidder) {
+          let bidderFragment = ortb2Fragments.bidder[bid.bidder];
+          let userExt = deepAccess(bidderFragment, 'user.ext.eids') || [];
+          if (userExt) {
+            deepSetValue(bidderFragment, 'user.ext.eids', [])
+          }
+        }
+      }
+    });
+  });
+
+  if (globalEidUpdate) {
+    deepSetValue(ortb2Fragments, 'global.user.ext.eids', [])
+  }
+  return adUnits;
+}
+
+export function init() {
+  const confListener = config.getConfig(MODULE_NAME, dataControllerConfig => {
+    const dataController = dataControllerConfig && dataControllerConfig.dataController;
+    if (!dataController) {
+      _logger.logInfo(`Data Controller is not configured`);
+      startAuction.getHooks({hook: filterBidData}).remove();
+      return;
+    }
+
+    if (dataController.filterEIDwhenSDA && dataController.filterSDAwhenEID) {
+      _logger.logInfo(`Data Controller can be configured with either filterEIDwhenSDA or filterSDAwhenEID`);
+      startAuction.getHooks({hook: filterBidData}).remove();
+      return;
+    }
+    confListener(); // unsubscribe config listener
+    _dataControllerConfig = dataController;
+
+    getHook('startAuction').before(filterBidData);
+  });
+}
+
+init();
+module(MODULE_NAME, init);
diff --git a/modules/dataControllerModule/index.md b/modules/dataControllerModule/index.md
new file mode 100644
index 00000000000..8714b886b0e
--- /dev/null
+++ b/modules/dataControllerModule/index.md
@@ -0,0 +1,29 @@
+# Overview
+
+```
+Module Name: Data Controller Module
+```
+
+# Description
+
+This module will filter EIDs and SDA based on the configurations.
+
+Sub module object with the following keys:
+
+|  param name | type  | Scope | Description | Params |
+| :------------ | :------------ | :------ | :------ | :------ |
+|  filterEIDwhenSDA  | function | optional | Filters user EIDs based on SDA | bidrequest |
+|  filterSDAwhenEID  | function | optional | Filters SDA based on configured EIDs | bidrequest  |
+
+# Module Control Configuration
+
+```
+
+pbjs.setConfig({
+    dataController: {
+       filterEIDwhenSDA: ['*']
+       filterSDAwhenEID: ['id5-sync.com'] 
+    }
+});
+
+```
diff --git a/test/spec/modules/dataController_spec.js b/test/spec/modules/dataController_spec.js
new file mode 100644
index 00000000000..25f55047377
--- /dev/null
+++ b/test/spec/modules/dataController_spec.js
@@ -0,0 +1,210 @@
+import {expect} from 'chai';
+import {config} from 'src/config.js';
+import {filterBidData, init} from 'modules/dataControllerModule/index.js';
+import {startAuction} from 'src/prebid.js';
+
+describe('data controller', function () {
+  let spyFn;
+
+  beforeEach(function () {
+    spyFn = sinon.spy();
+  });
+
+  afterEach(function () {
+    config.resetConfig();
+  });
+
+  describe('data controller', function () {
+    let result;
+    let callbackFn;
+    let req;
+
+    beforeEach(function () {
+      init();
+      result = null;
+      req = {
+        'adUnits': [{
+          'bids': [
+            {
+              'bidder': 'ix',
+              'userId': {
+                'id5id': {
+                  'uid': 'ID5*19RudTU8mWiRdKfG-0E9oyyJCdbgb8MvcaEtPAxM29QZYT5DW9r01vBozMD93UZy',
+                  'ext': {
+                    'linkType': 2
+                  }
+                }
+              },
+              'userIdAsEids': [
+                {
+                  'source': 'id5-sync.com',
+                  'uids': [
+                    {
+                      'id': 'ID5*UJzjz7J0FNIWPCp8fAmwGavBhGxnJ06V9umghosEVm4ZPjpn2iWahAoiPal59yKa',
+                      'atype': 1,
+                      'ext': {
+                        'linkType': 2
+                      }
+                    }
+                  ]
+                }
+              ],
+
+            }
+          ]
+        }],
+        'ortb2Fragments': {
+          'bidder': {
+            'ix': {
+              'user': {
+                'data': [
+                  {
+                    'name': 'permutive.com',
+                    'ext': {
+                      'segtax': 4
+                    },
+                    'segment': [
+                      {
+                        'id': '777777'
+                      },
+                      {
+                        'id': '888888'
+                      }
+                    ]
+                  }
+                ]
+              }
+            }
+          }
+        }
+      };
+      callbackFn = function (request) {
+        result = request;
+      };
+    });
+
+    afterEach(function () {
+      config.resetConfig();
+      startAuction.getHooks({hook: filterBidData}).remove();
+    });
+
+    it('filterEIDwhenSDA for All SDA ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterEIDwhenSDA: ['*']
+        }
+      };
+      config.setConfig(dataControllerConfiguration);
+      filterBidData(callbackFn, req);
+      expect(req.adUnits[0].bids[0].userIdAsEids).that.is.empty;
+      expect(req.adUnits[0].bids[0].userId).that.is.empty;
+      expect(req.ortb2Fragments.bidder.ix.user.ext.eids).that.is.empty;
+      expect(req.ortb2Fragments.global.user.ext.eids).that.is.empty;
+    });
+
+    it('filterEIDwhenSDA for available SAD permutive.com:4:777777 ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterEIDwhenSDA: ['permutive.com:4:777777']
+        }
+
+      };
+      config.setConfig(dataControllerConfiguration);
+      filterBidData(callbackFn, req);
+      expect(req.adUnits[0].bids[0].userIdAsEids).that.is.empty;
+      expect(req.adUnits[0].bids[0].userId).that.is.empty;
+
+      expect(req.ortb2Fragments.bidder.ix.user.ext.eids).that.is.empty;
+      expect(req.ortb2Fragments.global.user.ext.eids).that.is.empty;
+    });
+
+    it('filterEIDwhenSDA for unavailable SAD test.com:4:9999 ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterEIDwhenSDA: ['test.com:4:99999']
+        }
+      };
+      config.setConfig(dataControllerConfiguration);
+      filterBidData(callbackFn, req);
+      expect(req.adUnits[0].bids[0].userIdAsEids).that.is.not.empty;
+      expect(req.adUnits[0].bids[0].userId).that.is.not.empty;
+    });
+    // Test for global
+    it('filterEIDwhenSDA for available global SAD test.com:4:777777 ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterEIDwhenSDA: ['test.com:5:11111']
+        }
+
+      };
+      config.setConfig(dataControllerConfiguration);
+      let globalObject = {
+        'ortb2Fragments': {
+          'global': {
+            'user': {
+              'yob': 1985,
+              'gender': 'm',
+              'keywords': 'a,b',
+              'data': [
+                {
+                  'name': 'test.com',
+                  'ext': {
+                    'segtax': 5
+                  },
+                  'segment': [
+                    {
+                      'id': '11111'
+                    },
+                    {
+                      'id': '22222'
+                    }
+                  ]
+                }
+              ]
+            }
+          }
+        }
+      };
+      let globalRequest = Object.assign({}, req, globalObject);
+      filterBidData(callbackFn, globalRequest);
+      expect(globalRequest.adUnits[0].bids[0].userIdAsEids).that.is.empty;
+      expect(globalRequest.adUnits[0].bids[0].userId).that.is.empty;
+    });
+
+    it('filterSDAwhenEID for id5-sync.com EID ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterSDAwhenEID: ['id5-sync.com']
+        }
+      };
+      config.setConfig(dataControllerConfiguration);
+      filterBidData(callbackFn, req);
+      expect(req.ortb2Fragments.bidder.ix.user.data).that.is.empty;
+    });
+
+    it('filterSDAwhenEID for All EID ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterSDAwhenEID: ['*']
+        }
+      };
+      config.setConfig(dataControllerConfiguration);
+
+      filterBidData(callbackFn, req);
+      expect(req.ortb2Fragments.bidder.ix.user.data).that.is.empty;
+      expect(req.ortb2Fragments.global.user.data).that.is.empty;
+    });
+
+    it('filterSDAwhenEID for unavailable source test-sync.com EID ', function () {
+      let dataControllerConfiguration = {
+        'dataController': {
+          filterSDAwhenEID: ['test-sync.com']
+        }
+      };
+      config.setConfig(dataControllerConfiguration);
+      filterBidData(callbackFn, req);
+      expect(req.ortb2Fragments.bidder.ix.user.data).that.is.not.empty;
+    });
+  }
+  );
+});

From e84e58c7072619ed9917960c800fa9397ac17638 Mon Sep 17 00:00:00 2001
From: Tachfine <t.elbelky@criteo.com>
Date: Mon, 25 Jul 2022 18:07:22 +0200
Subject: [PATCH 066/569] Criteo - Implement user sync iframe (#8577)

Co-authored-by: le.labat <le.labat@criteo.com>
---
 modules/criteoBidAdapter.js                | 142 ++++++++++++++++
 test/spec/modules/criteoBidAdapter_spec.js | 180 ++++++++++++++++++++-
 2 files changed, 321 insertions(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 70c4e15da04..fea77bbe462 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -6,6 +6,8 @@ import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { find } from '../src/polyfill.js';
 import { verify } from 'criteo-direct-rsa-validate/build/verify.js'; // ref#2
 import { getStorageManager } from '../src/storageManager.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import { hasPurpose1Consent } from '../src/utils/gpdr.js';
 
 const GVLID = 91;
 export const ADAPTER_VERSION = 34;
@@ -31,12 +33,111 @@ const PUBLISHER_TAG_URL_TEMPLATE = 'https://static.criteo.net/js/ld/publishertag
 const FAST_BID_PUBKEY_E = 65537;
 const FAST_BID_PUBKEY_N = 'ztQYwCE5BU7T9CDM5he6rKoabstXRmkzx54zFPZkWbK530dwtLBDeaWBMxHBUT55CYyboR/EZ4efghPi3CoNGfGWezpjko9P6p2EwGArtHEeS4slhu/SpSIFMjG6fdrpRoNuIAMhq1Z+Pr/+HOd1pThFKeGFr2/NhtAg+TXAzaU=';
 
+const SID_COOKIE_NAME = 'cto_sid';
+const IDCPY_COOKIE_NAME = 'cto_idcpy';
+const LWID_COOKIE_NAME = 'cto_lwid';
+const OPTOUT_COOKIE_NAME = 'cto_optout';
+const BUNDLE_COOKIE_NAME = 'cto_bundle';
+const GUID_RETENTION_TIME_HOUR = 24 * 30 * 13; // 13 months
+const OPTOUT_RETENTION_TIME_HOUR = 5 * 12 * 30 * 24; // 5 years
+
 /** @type {BidderSpec} */
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
+  getUserSyncs: function (syncOptions, _, gdprConsent, uspConsent) {
+    const fastBidVersion = config.getConfig('criteo.fastBidVersion');
+    if (canFastBid(fastBidVersion)) {
+      return [];
+    }
+
+    const refererInfo = getRefererInfo();
+    const origin = 'criteoPrebidAdapter';
+
+    if (syncOptions.iframeEnabled && hasPurpose1Consent(gdprConsent)) {
+      const queryParams = [];
+      queryParams.push(`origin=${origin}`);
+      queryParams.push(`topUrl=${refererInfo.domain}`);
+      if (gdprConsent) {
+        if (gdprConsent.gdprApplies) {
+          queryParams.push(`gdpr=${gdprConsent.gdprApplies == true ? 1 : 0}`);
+        }
+        if (gdprConsent.consentString) {
+          queryParams.push(`gdpr_consent=${gdprConsent.consentString}`);
+        }
+      }
+      if (uspConsent) {
+        queryParams.push(`us_privacy=${uspConsent}`);
+      }
+
+      const requestId = Math.random().toString();
+
+      const jsonHash = {
+        bundle: readFromAllStorages(BUNDLE_COOKIE_NAME),
+        cw: storage.cookiesAreEnabled(),
+        localWebId: readFromAllStorages(LWID_COOKIE_NAME),
+        lsw: storage.localStorageIsEnabled(),
+        optoutCookie: readFromAllStorages(OPTOUT_COOKIE_NAME),
+        origin: origin,
+        requestId: requestId,
+        secureIdCookie: readFromAllStorages(SID_COOKIE_NAME),
+        tld: refererInfo.domain,
+        topUrl: refererInfo.domain,
+        uid: readFromAllStorages(IDCPY_COOKIE_NAME),
+        version: '$prebid.version$'.replace(/\./g, '_'),
+      };
+
+      window.addEventListener('message', function handler(event) {
+        if (!event.data || event.origin != 'https://gum.criteo.com') {
+          return;
+        }
+
+        if (event.data.requestId !== requestId) {
+          return;
+        }
+
+        this.removeEventListener('message', handler);
+
+        event.stopImmediatePropagation();
+
+        const response = event.data;
+
+        if (response.optout) {
+          deleteFromAllStorages(IDCPY_COOKIE_NAME);
+          deleteFromAllStorages(SID_COOKIE_NAME);
+          deleteFromAllStorages(BUNDLE_COOKIE_NAME);
+          deleteFromAllStorages(LWID_COOKIE_NAME);
+
+          saveOnAllStorages(OPTOUT_COOKIE_NAME, true, OPTOUT_RETENTION_TIME_HOUR);
+        } else {
+          if (response.uid) {
+            saveOnAllStorages(IDCPY_COOKIE_NAME, response.uid, GUID_RETENTION_TIME_HOUR);
+          }
+
+          if (response.bundle) {
+            saveOnAllStorages(BUNDLE_COOKIE_NAME, response.bundle, GUID_RETENTION_TIME_HOUR);
+          }
+
+          if (response.removeSid) {
+            deleteFromAllStorages(SID_COOKIE_NAME);
+          } else if (response.sid) {
+            saveOnAllStorages(SID_COOKIE_NAME, response.sid, GUID_RETENTION_TIME_HOUR);
+          }
+        }
+      }, true);
+
+      const jsonHashSerialized = JSON.stringify(jsonHash).replace(/"/g, '%22');
+
+      return [{
+        type: 'iframe',
+        url: `https://gum.criteo.com/syncframe?${queryParams.join('&')}#${jsonHashSerialized}`
+      }];
+    }
+    return [];
+  },
+
   /** f
    * @param {object} bid
    * @return {boolean}
@@ -209,6 +310,27 @@ export const spec = {
   },
 };
 
+function readFromAllStorages(name) {
+  const fromCookie = storage.getCookie(name);
+  const fromLocalStorage = storage.getDataFromLocalStorage(name);
+
+  return fromCookie || fromLocalStorage || undefined;
+}
+
+function saveOnAllStorages(name, value, expirationTimeHours) {
+  const date = new Date();
+  date.setTime(date.getTime() + (expirationTimeHours * 60 * 60 * 1000));
+  const expires = `expires=${date.toUTCString()}`;
+
+  storage.setCookie(name, value, expires);
+  storage.setDataInLocalStorage(name, value);
+}
+
+function deleteFromAllStorages(name) {
+  storage.setCookie(name, '', 0);
+  storage.removeDataFromLocalStorage(name);
+}
+
 /**
  * @return {boolean}
  */
@@ -271,6 +393,26 @@ function buildCdbUrl(context) {
     url += '&nolog=1';
   }
 
+  const bundle = readFromAllStorages(BUNDLE_COOKIE_NAME);
+  if (bundle) {
+    url += `&bundle=${bundle}`;
+  }
+
+  const optout = readFromAllStorages(OPTOUT_COOKIE_NAME);
+  if (optout) {
+    url += `&optout=1`;
+  }
+
+  const sid = readFromAllStorages(SID_COOKIE_NAME);
+  if (sid) {
+    url += `&sid=${sid}`;
+  }
+
+  const idcpy = readFromAllStorages(IDCPY_COOKIE_NAME);
+  if (idcpy) {
+    url += `&idcpy=${idcpy}`;
+  }
+
   return url;
 }
 
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index c2f19fc3f78..58f8e1ad871 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -10,9 +10,10 @@ import {
 import { createBid } from 'src/bidfactory.js';
 import CONSTANTS from 'src/constants.json';
 import * as utils from 'src/utils.js';
+import * as refererDetection from 'src/refererDetection.js';
 import { config } from '../../../src/config.js';
-import { NATIVE, VIDEO } from '../../../src/mediaTypes.js';
 import * as storageManager from 'src/storageManager.js';
+import { NATIVE, VIDEO } from '../../../src/mediaTypes.js';
 
 describe('The Criteo bidding adapter', function () {
   let utilsMock, sandbox;
@@ -37,6 +38,183 @@ describe('The Criteo bidding adapter', function () {
     sandbox.restore();
   });
 
+  describe('getUserSyncs', function () {
+    const syncOptionsIframeEnabled = {
+      iframeEnabled: true
+    };
+
+    const expectedHash = {
+      cw: true,
+      lsw: true,
+      origin: 'criteoPrebidAdapter',
+      requestId: '123456',
+      tld: 'www.abc.com',
+      topUrl: 'www.abc.com',
+      version: '$prebid.version$'.replace(/\./g, '_'),
+    };
+
+    let randomStub,
+      getConfigStub,
+      getRefererInfoStub,
+      cookiesAreEnabledStub,
+      localStorageIsEnabledStub,
+      getCookieStub,
+      getDataFromLocalStorageStub;
+
+    beforeEach(function () {
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('criteo.fastBidVersion').returns('none');
+
+      randomStub = sinon.stub(Math, 'random');
+      randomStub.returns(123456);
+
+      getRefererInfoStub = sinon.stub(refererDetection, 'getRefererInfo');
+      getRefererInfoStub.returns({
+        domain: 'www.abc.com'
+      });
+
+      cookiesAreEnabledStub = sinon.stub(storage, 'cookiesAreEnabled');
+      cookiesAreEnabledStub.returns(true);
+      localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+      localStorageIsEnabledStub.returns(true);
+
+      getCookieStub = sinon.stub(storage, 'getCookie')
+      getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    });
+
+    afterEach(function () {
+      randomStub.restore();
+      getConfigStub.restore();
+      getRefererInfoStub.restore();
+      cookiesAreEnabledStub.restore();
+      localStorageIsEnabledStub.restore();
+      getCookieStub.restore();
+      getDataFromLocalStorageStub.restore();
+    });
+
+    it('should not trigger sync if publisher is using fast bid', function () {
+      getConfigStub.withArgs('criteo.fastBidVersion').returns('latest');
+
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, undefined, undefined);
+
+      expect(userSyncs).to.eql([]);
+    });
+
+    it('should not trigger sync if publisher did not enable iframe based syncs', function () {
+      const userSyncs = spec.getUserSyncs({
+        iframeEnabled: false
+      }, undefined, undefined, undefined);
+
+      expect(userSyncs).to.eql([]);
+    });
+
+    it('should not trigger sync if purpose one is not granted', function () {
+      const gdprConsent = {
+        gdprApplies: true,
+        consentString: 'ABC',
+        vendorData: {
+          purpose: {
+            consents: {
+              1: false
+            }
+          }
+        }
+      };
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, gdprConsent, undefined);
+
+      expect(userSyncs).to.eql([]);
+    });
+
+    it('forwards ids from cookies', function () {
+      const cookieData = {
+        'cto_bundle': 'a',
+        'cto_sid': 'b',
+        'cto_lwid': 'c',
+        'cto_idcpy': 'd',
+        'cto_optout': 'e'
+      };
+
+      const expectedHashWithCookieData = {
+        ...expectedHash,
+        ...{
+          bundle: cookieData['cto_bundle'],
+          localWebId: cookieData['cto_lwid'],
+          secureIdCookie: cookieData['cto_sid'],
+          uid: cookieData['cto_idcpy'],
+          optoutCookie: cookieData['cto_optout']
+        }
+      };
+
+      getCookieStub.callsFake(cookieName => cookieData[cookieName]);
+
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, undefined, undefined);
+
+      expect(userSyncs).to.eql([{
+        type: 'iframe',
+        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com#${JSON.stringify(expectedHashWithCookieData, Object.keys(expectedHashWithCookieData).sort()).replace(/"/g, '%22')}`
+      }]);
+    });
+
+    it('forwards ids from local storage', function () {
+      const localStorageData = {
+        'cto_bundle': 'a',
+        'cto_sid': 'b',
+        'cto_lwid': 'c',
+        'cto_idcpy': 'd',
+        'cto_optout': 'e'
+      };
+
+      const expectedHashWithLocalStorageData = {
+        ...expectedHash,
+        ...{
+          bundle: localStorageData['cto_bundle'],
+          localWebId: localStorageData['cto_lwid'],
+          secureIdCookie: localStorageData['cto_sid'],
+          uid: localStorageData['cto_idcpy'],
+          optoutCookie: localStorageData['cto_optout']
+        }
+      };
+
+      getDataFromLocalStorageStub.callsFake(localStorageName => localStorageData[localStorageName]);
+
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, undefined, undefined);
+
+      expect(userSyncs).to.eql([{
+        type: 'iframe',
+        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com#${JSON.stringify(expectedHashWithLocalStorageData, Object.keys(expectedHashWithLocalStorageData).sort()).replace(/"/g, '%22')}`
+      }]);
+    });
+
+    it('forwards gdpr data', function () {
+      const gdprConsent = {
+        gdprApplies: true,
+        consentString: 'ABC',
+        vendorData: {
+          purpose: {
+            consents: {
+              1: true
+            }
+          }
+        }
+      };
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, gdprConsent, undefined);
+
+      expect(userSyncs).to.eql([{
+        type: 'iframe',
+        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com&gdpr=1&gdpr_consent=ABC#${JSON.stringify(expectedHash).replace(/"/g, '%22')}`
+      }]);
+    });
+
+    it('forwards usp data', function () {
+      const userSyncs = spec.getUserSyncs(syncOptionsIframeEnabled, undefined, undefined, 'ABC');
+
+      expect(userSyncs).to.eql([{
+        type: 'iframe',
+        url: `https://gum.criteo.com/syncframe?origin=criteoPrebidAdapter&topUrl=www.abc.com&us_privacy=ABC#${JSON.stringify(expectedHash).replace(/"/g, '%22')}`
+      }]);
+    });
+  });
+
   describe('isBidRequestValid', function () {
     it('should return false when given an invalid bid', function () {
       const bid = {

From 8d0f10a23743d65005611c8a3fbecb885c31ca78 Mon Sep 17 00:00:00 2001
From: Jason Quaccia <jlquaccia@gmail.com>
Date: Mon, 25 Jul 2022 09:09:42 -0700
Subject: [PATCH 067/569] PBS Adapter: Support Bidder-Specific Schains (#8594)

* implementation for issue 8561

* removed eslint disable comment

* added tests

* removed unecessary comments

* addressed feedback

* reverted a few changes that were used for dev on my local

* addressed feedback and refactored code

* reverted changes to the prebidServer_example file

Co-authored-by: Jason Quaccia <jasonquaccia@RWC-WS233.local>
---
 modules/prebidServerBidAdapter/index.js       |  37 +++++
 .../modules/prebidServerBidAdapter_spec.js    | 157 ++++++++++++++++++
 2 files changed, 194 insertions(+)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 4007c67c82f..bc90fe149de 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -861,6 +861,43 @@ Object.assign(ORTB2.prototype, {
       request.ext.prebid = mergeDeep(request.ext.prebid, s2sConfig.extPrebid);
     }
 
+    // get reference to pbs config schain bidder names (if any exist)
+    const pbsSchainBidderNamesArr = request.ext.prebid?.schains ? request.ext.prebid.schains.flatMap(s => s.bidders) : [];
+    // create an schains object
+    const schains = Object.fromEntries(
+      (request.ext.prebid?.schains || []).map(({bidders, schain}) => [JSON.stringify(schain), {bidders: new Set(bidders), schain}])
+    );
+
+    // compare bidder specific schains with pbs specific schains
+    request.ext.prebid.schains = Object.values(
+      bidRequests
+        .map((req) => [req.bidderCode, req.bids[0].schain])
+        .reduce((chains, [bidder, chain]) => {
+          const chainKey = JSON.stringify(chain);
+
+          switch (true) {
+            // if pbjs bidder name is same as pbs bidder name, pbs bidder name always wins
+            case chainKey && pbsSchainBidderNamesArr.indexOf(bidder) !== -1:
+              logInfo(`bidder-specific schain for ${bidder} skipped due to existing entry`);
+              break;
+            // if a pbjs schain obj is equal to an schain obj that exists on the pbs side, add the bidder name on the pbs side
+            case chainKey && chains.hasOwnProperty(chainKey) && pbsSchainBidderNamesArr.indexOf(bidder) === -1:
+              chains[chainKey].bidders.add(bidder);
+              break;
+            // if a pbjs schain obj is not on the pbs side, add a new schain entry on the pbs side
+            case chainKey && !chains.hasOwnProperty(chainKey):
+              chains[chainKey] = {bidders: new Set(), schain: chain};
+              chains[chainKey].bidders.add(bidder);
+              break;
+            default:
+          }
+
+          return chains;
+        }, schains)
+    ).map(({bidders, schain}) => ({bidders: Array.from(bidders), schain}));
+    // if schains evaluates to an empty array, remove it from the prebid object
+    if (request.ext.prebid.schains.length === 0) delete request.ext.prebid.schains;
+
     /**
      * @type {(string[]|string|undefined)} - OpenRTB property 'cur', currencies available for bids
      */
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 1e81abda57e..b1bbb02a115 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -1875,6 +1875,163 @@ describe('S2S Adapter', function () {
       });
     });
 
+    it('should have extPrebid.schains present on req object if bidder specific schains were configured with pbjs', function () {
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+      bidRequest[0].bids[0].schain = {
+        complete: 1,
+        nodes: [{
+          asi: 'test.com',
+          hp: 1,
+          sid: '11111'
+        }],
+        ver: '1.0'
+      };
+
+      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.ext.prebid.schains).to.deep.equal([
+        {
+          bidders: ['appnexus'],
+          schain: {
+            complete: 1,
+            nodes: [
+              {
+                asi: 'test.com',
+                hp: 1,
+                sid: '11111'
+              }
+            ],
+            ver: '1.0'
+          }
+        }
+      ]);
+    });
+
+    it('should skip over adding any bid specific schain entries that already exist on extPrebid.schains', function () {
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+      bidRequest[0].bids[0].schain = {
+        complete: 1,
+        nodes: [{
+          asi: 'pbjs.com',
+          hp: 1,
+          sid: '22222'
+        }],
+        ver: '1.0'
+      };
+
+      const s2sConfig = Object.assign({}, CONFIG, {
+        extPrebid: {
+          schains: [
+            {
+              bidders: ['appnexus'],
+              schain: {
+                complete: 1,
+                nodes: [
+                  {
+                    asi: 'pbs.com',
+                    hp: 1,
+                    sid: '11111'
+                  }
+                ],
+                ver: '1.0'
+              }
+            }
+          ]
+        }
+      });
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
+
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.ext.prebid.schains).to.deep.equal([
+        {
+          bidders: ['appnexus'],
+          schain: {
+            complete: 1,
+            nodes: [
+              {
+                asi: 'pbs.com',
+                hp: 1,
+                sid: '11111'
+              }
+            ],
+            ver: '1.0'
+          }
+        }
+      ]);
+    });
+
+    it('should add a bidder name to pbs schain if the schain is equal to a pbjs one but the pbjs bidder name is not in the bidder array on the pbs side', function () {
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+      bidRequest[0].bids[0].schain = {
+        complete: 1,
+        nodes: [{
+          asi: 'test.com',
+          hp: 1,
+          sid: '11111'
+        }],
+        ver: '1.0'
+      };
+
+      bidRequest[0].bids[1] = {
+        bidder: 'rubicon',
+        params: {
+          accountId: 14062,
+          siteId: 70608,
+          zoneId: 498816
+        }
+      };
+
+      const s2sConfig = Object.assign({}, CONFIG, {
+        bidders: ['rubicon', 'appnexus'],
+        extPrebid: {
+          schains: [
+            {
+              bidders: ['rubicon'],
+              schain: {
+                complete: 1,
+                nodes: [
+                  {
+                    asi: 'test.com',
+                    hp: 1,
+                    sid: '11111'
+                  }
+                ],
+                ver: '1.0'
+              }
+            }
+          ]
+        }
+      });
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
+
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.ext.prebid.schains).to.deep.equal([
+        {
+          bidders: ['rubicon', 'appnexus'],
+          schain: {
+            complete: 1,
+            nodes: [
+              {
+                asi: 'test.com',
+                hp: 1,
+                sid: '11111'
+              }
+            ],
+            ver: '1.0'
+          }
+        }
+      ]);
+    });
+
     it('passes schain object in request', function () {
       const bidRequests = utils.deepClone(BID_REQUESTS);
       const schainObject = {

From 252d9d4f82068f452dc9de6f3ac816190d61b4dd Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Mon, 25 Jul 2022 09:48:03 -0700
Subject: [PATCH 068/569] Prebid core: fix adUnits for auctoin at the time
 requestBids is called (#8637)

---
 src/hook.js                     | 11 ++++++++
 src/prebid.js                   | 36 ++++++++++++++++----------
 test/spec/unit/pbjs_api_spec.js | 45 +++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/src/hook.js b/src/hook.js
index 226c49daeae..3f01114935d 100644
--- a/src/hook.js
+++ b/src/hook.js
@@ -48,3 +48,14 @@ export function submodule(name, ...args) {
     next(modules);
   });
 }
+
+/**
+ * Copy hook methods (.before, .after, etc) from a given hook to a given wrapper object.
+ */
+export function wrapHook(hook, wrapper) {
+  Object.defineProperties(
+    wrapper,
+    Object.fromEntries(['before', 'after', 'getHooks', 'removeAll'].map((m) => [m, {get: () => hook[m]}]))
+  );
+  return wrapper;
+}
diff --git a/src/prebid.js b/src/prebid.js
index ab336af08b6..a87c5a27f70 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -12,7 +12,7 @@ import { userSync } from './userSync.js';
 import { config } from './config.js';
 import { auctionManager } from './auctionManager.js';
 import { filters, targeting } from './targeting.js';
-import { hook } from './hook.js';
+import {hook, wrapHook} from './hook.js';
 import { loadSession } from './debugging.js';
 import {includes} from './polyfill.js';
 import { adunitCounter } from './adUnits.js';
@@ -573,18 +573,28 @@ $$PREBID_GLOBAL$$.removeAdUnit = function (adUnitCode) {
  * @param {String} requestOptions.auctionId
  * @alias module:pbjs.requestBids
  */
-$$PREBID_GLOBAL$$.requestBids = hook('async', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels, auctionId, ortb2 } = {}) {
-  events.emit(REQUEST_BIDS);
-  const cbTimeout = timeout || config.getConfig('bidderTimeout');
-  adUnits = adUnits || $$PREBID_GLOBAL$$.adUnits;
-  adUnits = (isArray(adUnits) ? adUnits : [adUnits]);
-  logInfo('Invoking $$PREBID_GLOBAL$$.requestBids', arguments);
-  const ortb2Fragments = {
-    global: mergeDeep({}, config.getAnyConfig('ortb2') || {}, ortb2 || {}),
-    bidder: Object.fromEntries(Object.entries(config.getBidderConfig()).map(([bidder, cfg]) => [bidder, cfg.ortb2]).filter(([_, ortb2]) => ortb2 != null))
-  }
-  return startAuction({bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ortb2Fragments});
-}, 'requestBids');
+$$PREBID_GLOBAL$$.requestBids = (function() {
+  const delegate = hook('async', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels, auctionId, ortb2 } = {}) {
+    events.emit(REQUEST_BIDS);
+    const cbTimeout = timeout || config.getConfig('bidderTimeout');
+    logInfo('Invoking $$PREBID_GLOBAL$$.requestBids', arguments);
+    const ortb2Fragments = {
+      global: mergeDeep({}, config.getAnyConfig('ortb2') || {}, ortb2 || {}),
+      bidder: Object.fromEntries(Object.entries(config.getBidderConfig()).map(([bidder, cfg]) => [bidder, cfg.ortb2]).filter(([_, ortb2]) => ortb2 != null))
+    }
+    return startAuction({bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ortb2Fragments});
+  }, 'requestBids');
+
+  return wrapHook(delegate, function requestBids(req = {}) {
+    // if the request does not specify adUnits, clone the global adUnit array - before
+    // any hook has a chance to run.
+    // otherwise, if the caller goes on to use addAdUnits/removeAdUnits, any asynchronous logic
+    // in any hook might see their effects.
+    let adUnits = req.adUnits || $$PREBID_GLOBAL$$.adUnits;
+    req.adUnits = (isArray(adUnits) ? adUnits.slice() : [adUnits]);
+    return delegate.call(this, req);
+  });
+})();
 
 export const startAuction = hook('async', function ({ bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ortb2Fragments } = {}) {
   const s2sBidders = getS2SBidderSet(config.getConfig('s2sConfig') || []);
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index ca646743147..5c0391f96bf 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -218,6 +218,51 @@ describe('Unit: Prebid Module', function () {
     auctionManager.clearAllAuctions();
   });
 
+  describe('and global adUnits', () => {
+    const startingAdUnits = [
+      {
+        code: 'one',
+      },
+      {
+        code: 'two',
+      }
+    ];
+    let actualAdUnits, hookRan, done;
+
+    function deferringHook(next, req) {
+      setTimeout(() => {
+        actualAdUnits = req.adUnits || $$PREBID_GLOBAL$$.adUnits;
+        done();
+      });
+    }
+
+    beforeEach(() => {
+      $$PREBID_GLOBAL$$.requestBids.before(deferringHook, 99);
+      $$PREBID_GLOBAL$$.adUnits.splice(0, $$PREBID_GLOBAL$$.adUnits.length, ...startingAdUnits);
+      hookRan = new Promise((resolve) => {
+        done = resolve;
+      });
+    });
+
+    afterEach(() => {
+      $$PREBID_GLOBAL$$.requestBids.getHooks({hook: deferringHook}).remove();
+      $$PREBID_GLOBAL$$.adUnits.splice(0, $$PREBID_GLOBAL$$.adUnits.length);
+    })
+
+    Object.entries({
+      'addAdUnits': (g) => g.addAdUnits({code: 'three'}),
+      'removeAdUnit': (g) => g.removeAdUnit('one')
+    }).forEach(([method, op]) => {
+      it(`once called, should not be affected by ${method}`, () => {
+        $$PREBID_GLOBAL$$.requestBids({});
+        op($$PREBID_GLOBAL$$);
+        return hookRan.then(() => {
+          expect(actualAdUnits).to.eql(startingAdUnits);
+        })
+      });
+    });
+  });
+
   describe('getAdserverTargetingForAdUnitCodeStr', function () {
     beforeEach(function () {
       resetAuction();

From 51dd9bd8fae4221197e58383939a5da2cb14bc1b Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Mon, 25 Jul 2022 09:57:04 -0700
Subject: [PATCH 069/569] Concert Bid Adapter: adding referer (Resubmit of Pr
 #8580) (#8676)

* Concert Bid Adapter refererInfo update

* fix linting

* update with purpose1consent
---
 modules/concertBidAdapter.js | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/modules/concertBidAdapter.js b/modules/concertBidAdapter.js
index 398248bfeab..fc6fc23c26d 100644
--- a/modules/concertBidAdapter.js
+++ b/modules/concertBidAdapter.js
@@ -1,6 +1,7 @@
 import { logWarn, logMessage, debugTurnedOn, generateUUID } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { getStorageManager } from '../src/storageManager.js'
+import { getStorageManager } from '../src/storageManager.js';
+import { hasPurpose1Consent } from '../src/utils/gpdr.js';
 
 const BIDDER_CODE = 'concert';
 const CONCERT_ENDPOINT = 'https://bids.concert.io';
@@ -45,7 +46,7 @@ export const spec = {
         uspConsent: bidderRequest.uspConsent,
         gdprConsent: bidderRequest.gdprConsent
       }
-    }
+    };
 
     payload.slots = validBidRequests.map(bidRequest => {
       let slot = {
@@ -57,8 +58,9 @@ export const spec = {
         slotType: bidRequest.params.slotType,
         adSlot: bidRequest.params.slot || bidRequest.adUnitCode,
         placementId: bidRequest.params.placementId || '',
-        site: bidRequest.params.site || bidderRequest.refererInfo.page
-      }
+        site: bidRequest.params.site || bidderRequest.refererInfo.page,
+        ref: bidderRequest.refererInfo.ref
+      };
 
       return slot;
     });
@@ -69,7 +71,7 @@ export const spec = {
       method: 'POST',
       url: `${CONCERT_ENDPOINT}/bids/prebid`,
       data: JSON.stringify(payload)
-    }
+    };
   },
   /**
    * Unpack the response from the server into a list of bids.
@@ -101,7 +103,7 @@ export const spec = {
         creativeId: bid.creativeId,
         netRevenue: bid.netRevenue,
         currency: bid.currency
-      }
+      };
     });
 
     if (debugTurnedOn() && serverBody.debug) {
@@ -122,7 +124,7 @@ export const spec = {
    * @return {UserSync[]} The user syncs which should be dropped.
    */
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
-    const syncs = []
+    const syncs = [];
     if (syncOptions.iframeEnabled && !hasOptedOutOfPersonalization()) {
       let params = [];
 
@@ -203,9 +205,14 @@ function hasOptedOutOfPersonalization() {
  * @param {BidderRequest} bidderRequest Object which contains any data consent signals
  */
 function consentAllowsPpid(bidderRequest) {
-  /* NOTE: We cannot easily test GDPR consent, without the
+  /* NOTE: We can't easily test GDPR consent, without the
    * `consent-string` npm module; so will have to rely on that
    * happening on the bid-server. */
-  return !(bidderRequest.uspConsent === 'string' &&
-           bidderRequest.uspConsent.toUpperCase().substring(0, 2) === '1YY')
+  const uspConsent = !(bidderRequest?.uspConsent === 'string' &&
+    bidderRequest?.uspConsent[0] === '1' &&
+    bidderRequest?.uspConsent[2].toUpperCase() === 'Y');
+
+  const gdprConsent = bidderRequest?.gdprConsent && hasPurpose1Consent(bidderRequest?.gdprConsent);
+
+  return (uspConsent || gdprConsent);
 }

From 599a8ddb23a87ac0dfd1af47e90d028e2d4bf4a9 Mon Sep 17 00:00:00 2001
From: Philip Watson <philip.watson@adscale.co.nz>
Date: Tue, 26 Jul 2022 05:00:51 +1200
Subject: [PATCH 070/569] StroeerCore Bid Adapter: use page & ref from
 refererInfo, add schain support (#8705)

---
 modules/stroeerCoreBidAdapter.js              | 13 ++-----
 .../modules/stroeerCoreBidAdapter_spec.js     | 36 +++++++++++++++----
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/modules/stroeerCoreBidAdapter.js b/modules/stroeerCoreBidAdapter.js
index 614dbdf6ef6..8e617eb24f8 100644
--- a/modules/stroeerCoreBidAdapter.js
+++ b/modules/stroeerCoreBidAdapter.js
@@ -13,14 +13,6 @@ const USER_SYNC_IFRAME_URL = 'https://js.adscale.de/pbsync.html';
 const isSecureWindow = () => getWindowSelf().location.protocol === 'https:';
 const isMainPageAccessible = () => getMostAccessibleTopWindow() === getWindowTop();
 
-function getTopWindowReferrer() {
-  try {
-    return getWindowTop().document.referrer;
-  } catch (e) {
-    return '';
-  }
-}
-
 function getMostAccessibleTopWindow() {
   let res = getWindowSelf();
 
@@ -124,11 +116,12 @@ export const spec = {
     const payload = {
       id: bidderRequest.auctionId,
       bids: [],
-      ref: getTopWindowReferrer(),
+      ref: refererInfo.ref,
       ssl: isSecureWindow(),
       mpa: isMainPageAccessible(),
       timeout: bidderRequest.timeout - (Date.now() - bidderRequest.auctionStart),
-      url: refererInfo && (refererInfo.canonicalUrl || refererInfo.referer)
+      url: refererInfo.page,
+      schain: anyBid.schain
     };
 
     const userIds = anyBid.userId;
diff --git a/test/spec/modules/stroeerCoreBidAdapter_spec.js b/test/spec/modules/stroeerCoreBidAdapter_spec.js
index 625bb4ac6b7..5b43b78280b 100644
--- a/test/spec/modules/stroeerCoreBidAdapter_spec.js
+++ b/test/spec/modules/stroeerCoreBidAdapter_spec.js
@@ -59,7 +59,8 @@ describe('stroeerCore bid adapter', function () {
     timeout: 5000,
     auctionStart: 10000,
     refererInfo: {
-      referer: 'https://www.example.com/index.html'
+      page: 'https://www.example.com/monkey/index.html',
+      ref: 'https://www.example.com/?search=monkey'
     },
     bids: [{
       bidId: 'bid1',
@@ -109,7 +110,7 @@ describe('stroeerCore bid adapter', function () {
   });
 
   const createWindow = (href, params = {}) => {
-    let {parent, referrer, top, frameElement, placementElements = []} = params;
+    let {parent, top, frameElement, placementElements = []} = params;
 
     const protocol = (href.indexOf('https') === 0) ? 'https:' : 'http:';
     const win = {
@@ -126,7 +127,6 @@ describe('stroeerCore bid adapter', function () {
             }
           }
         },
-        referrer,
         getElementById: id => find(placementElements, el => el.id === id)
       }
     };
@@ -169,7 +169,7 @@ describe('stroeerCore bid adapter', function () {
   }
 
   function setupNestedWindows(sandBox, placementElements = [createElement('div-1', 17), createElement('div-2', 54)]) {
-    const topWin = createWindow('http://www.abc.org/', {referrer: 'http://www.google.com/?query=monkey'});
+    const topWin = createWindow('http://www.abc.org/');
     topWin.innerHeight = 800;
 
     const midWin = createWindow('http://www.abc.org/', {parent: topWin, top: topWin, frameElement: createElement()});
@@ -310,10 +310,10 @@ describe('stroeerCore bid adapter', function () {
         const expectedJsonPayload = {
           'id': AUCTION_ID,
           'timeout': expectedTimeout,
-          'ref': topWin.document.referrer,
+          'ref': 'https://www.example.com/?search=monkey',
           'mpa': true,
           'ssl': false,
-          'url': 'https://www.example.com/index.html',
+          'url': 'https://www.example.com/monkey/index.html',
           'bids': [{
             'sid': 'NDA=', 'bid': 'bid1', 'siz': [[300, 600], [160, 60]], 'viz': true
           }, {
@@ -403,6 +403,30 @@ describe('stroeerCore bid adapter', function () {
           assert.lengthOf(serverRequestInfo.data.bids, 2);
           assert.notProperty(serverRequestInfo, 'uids');
         });
+
+        it('should add schain if available', () => {
+          const schain = Object.freeze({
+            ver: '1.0',
+            complete: 1,
+            'nodes': [
+              {
+                asi: 'exchange1.com',
+                sid: 'ABC',
+                hp: 1,
+                rid: 'bid-request-1',
+                name: 'publisher',
+                domain: 'publisher.com'
+              }
+            ]
+          });
+
+          const bidReq = buildBidderRequest();
+          bidReq.bids.forEach(bid => bid.schain = schain);
+
+          const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
+
+          assert.deepEqual(serverRequestInfo.data.schain, schain);
+        });
       });
     });
   });

From 37eabf5a73693affdeda7d34d2a3f1a3e3d00936 Mon Sep 17 00:00:00 2001
From: yieldlift <61510052+yieldlift@users.noreply.github.com>
Date: Mon, 25 Jul 2022 19:01:52 +0200
Subject: [PATCH 071/569] Yieldlift Bid Adapter: add support for eids (#8707)

* Added eids parameter

* Added eids parameter test

* Fixing utils

Co-authored-by: Danijel Predarski <danijel.p@whitecitysoft.com>
---
 modules/yieldliftBidAdapter.js                |  8 +++++++-
 test/spec/modules/yieldliftBidAdapter_spec.js | 20 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/modules/yieldliftBidAdapter.js b/modules/yieldliftBidAdapter.js
index fddc9a0d50b..160d7e9a009 100644
--- a/modules/yieldliftBidAdapter.js
+++ b/modules/yieldliftBidAdapter.js
@@ -1,4 +1,4 @@
-import { deepSetValue, logInfo, deepAccess } from '../src/utils.js';
+import {deepSetValue, logInfo, deepAccess} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 
@@ -72,6 +72,12 @@ export const spec = {
       deepSetValue(openrtbRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
     }
 
+    // EIDS
+    const eids = deepAccess(validBidRequests[0], 'userIdAsEids');
+    if (Array.isArray(eids) && eids.length > 0) {
+      deepSetValue(openrtbRequest, 'user.ext.eids', eids);
+    }
+
     const payloadString = JSON.stringify(openrtbRequest);
     return {
       method: 'POST',
diff --git a/test/spec/modules/yieldliftBidAdapter_spec.js b/test/spec/modules/yieldliftBidAdapter_spec.js
index abb5a868c77..c2379ed7778 100644
--- a/test/spec/modules/yieldliftBidAdapter_spec.js
+++ b/test/spec/modules/yieldliftBidAdapter_spec.js
@@ -191,6 +191,26 @@ describe('YieldLift', function () {
       expect(payload.user.ext).to.have.property('consent', req.gdprConsent.consentString);
       expect(payload.regs.ext).to.have.property('gdpr', 1);
     });
+
+    it('should properly forward eids parameters', function () {
+      const req = Object.assign({}, REQUEST);
+      req.bidRequest[0].userIdAsEids = [
+        {
+          source: 'dummy.com',
+          uids: [
+            {
+              id: 'd6d0a86c-20c6-4410-a47b-5cba383a698a',
+              atype: 1
+            }
+          ]
+        }];
+      let request = spec.buildRequests(req.bidRequest, req);
+
+      const payload = JSON.parse(request.data);
+      expect(payload.user.ext.eids[0].source).to.equal('dummy.com');
+      expect(payload.user.ext.eids[0].uids[0].id).to.equal('d6d0a86c-20c6-4410-a47b-5cba383a698a');
+      expect(payload.user.ext.eids[0].uids[0].atype).to.equal(1);
+    });
   });
 
   describe('interpretResponse', function () {

From 18306dcfba68dff1b8d8bbb659887c898be7c761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Udi=20Talias=20=E2=9A=9B=EF=B8=8F?= <udi.talias@gmail.com>
Date: Mon, 25 Jul 2022 20:03:59 +0300
Subject: [PATCH 072/569] Vidazoo Bid Adapter: send page query params to server
 (#8715)

* feat(module): multi size request

* fix getUserSyncs
added tests

* update(module): package-lock.json from master

* feat(module): VidazooBidAdapter - send top query params to server

Co-authored-by: roman <shmoop207@gmail.com>
---
 modules/vidazooBidAdapter.js                | 14 ++++++++++++--
 test/spec/modules/vidazooBidAdapter_spec.js | 10 ++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index 3933d7632b6..7e2000e455a 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -1,4 +1,4 @@
-import { _each, deepAccess, parseSizesInput } from '../src/utils.js';
+import { _each, deepAccess, parseSizesInput, parseUrl } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
@@ -23,7 +23,16 @@ export const SUPPORTED_ID_SYSTEMS = {
   'pubcid': 1,
   'tdid': 1,
 };
-const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
+const storage = getStorageManager({ gvlid: GVLID, bidderCode: BIDDER_CODE });
+
+function getTopWindowQueryParams() {
+  try {
+    const parsedUrl = parseUrl(window.top.document.URL, { decodeSearchAsString: true });
+    return parsedUrl.search;
+  } catch (e) {
+    return '';
+  }
+}
 
 export function createDomain(subDomain = DEFAULT_SUB_DOMAIN) {
   return `https://${subDomain}.cootlogix.com`;
@@ -59,6 +68,7 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
 
   let data = {
     url: encodeURIComponent(topWindowUrl),
+    uqs: getTopWindowQueryParams(),
     cb: Date.now(),
     bidFloor: bidFloor,
     bidId: bidId,
diff --git a/test/spec/modules/vidazooBidAdapter_spec.js b/test/spec/modules/vidazooBidAdapter_spec.js
index 9e61768264f..dc178a9c485 100644
--- a/test/spec/modules/vidazooBidAdapter_spec.js
+++ b/test/spec/modules/vidazooBidAdapter_spec.js
@@ -81,6 +81,15 @@ const REQUEST = {
   }
 };
 
+function getTopWindowQueryParams() {
+  try {
+    const parsedUrl = utils.parseUrl(window.top.document.URL, { decodeSearchAsString: true });
+    return parsedUrl.search;
+  } catch (e) {
+    return '';
+  }
+}
+
 describe('VidazooBidAdapter', function () {
   describe('validtae spec', function () {
     it('exists and is a function', function () {
@@ -171,6 +180,7 @@ describe('VidazooBidAdapter', function () {
           prebidVersion: version,
           schain: BID.schain,
           res: `${window.top.screen.width}x${window.top.screen.height}`,
+          uqs: getTopWindowQueryParams(),
           'ext.param1': 'loremipsum',
           'ext.param2': 'dolorsitamet',
         }

From 852d0eeafe930f249cd85760b9d31d4c03b166b1 Mon Sep 17 00:00:00 2001
From: Bill Newman <huddled.masses1650@gmail.com>
Date: Mon, 25 Jul 2022 20:12:08 +0300
Subject: [PATCH 073/569] Colossusssp Bid Adapter: fix traffic param (#8724)

* add video&native traffic colossus ssp

* Native obj validation

* Native obj validation #2

* Added size field in requests

* fixed test

* fix merge conflicts

* move to 3.0

* move to 3.0

* fix IE11 new URL issue

* fix IE11 new URL issue

* fix IE11 new URL issue

* https for 3.0

* add https test

* add ccp and schain features

* fix test

* sync with upstream, fix conflicts

* Update colossussspBidAdapter.js

remove commented code

* Update colossussspBidAdapter.js

lint fix

* identity extensions

* identity extensions

* fix

* fix

* fix

* fix

* fix

* add tests for user ids

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* add gdpr support

* add gdpr support

* id5id support

* Update colossussspBidAdapter.js

add bidfloor parameter

* Update colossussspBidAdapter.js

check bidfloor

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter_spec.js

* use floor module

* Revert "use floor module"

This reverts commit f0c5c248627567e669d8eed4f2bb9a26a857e2ad.

* use floor module

* update to 5v

* fix

* add uid2 and bidFloor support

* fix

* add pbadslot support

* fix conflicts

* add onBidWon

* refactor

* add test for onBidWon()

* fix

* add group_id

* Trigger circleci

* fix

* update user sync

* fix window.location

* fix test

* updates

* fix conflict

* fix

* updates

* remove traffic param

Co-authored-by: Vladislav Isaiko <vladis@smartyads.com>
Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>
Co-authored-by: Mykhailo Yaremchuk <m.yaremchuk@smartyads.com>
---
 modules/colossussspBidAdapter.js              | 50 +++++++++++--------
 modules/colossussspBidAdapter.md              | 35 ++++++++++---
 .../modules/colossussspBidAdapter_spec.js     |  1 -
 3 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/modules/colossussspBidAdapter.js b/modules/colossussspBidAdapter.js
index cd0721fa80f..eb6215765e1 100644
--- a/modules/colossussspBidAdapter.js
+++ b/modules/colossussspBidAdapter.js
@@ -108,12 +108,11 @@ export const spec = {
 
     for (let i = 0; i < validBidRequests.length; i++) {
       let bid = validBidRequests[i];
-      let traff = bid.params.traffic || BANNER;
+      const { mediaTypes } = bid;
       let placement = {
         placementId: bid.params.placement_id,
         groupId: bid.params.group_id,
         bidId: bid.bidId,
-        traffic: traff,
         eids: [],
         floor: {}
       };
@@ -134,32 +133,39 @@ export const spec = {
           rtiPartner: 'TDID'
         });
       }
-      if (traff === BANNER) {
-        placement.sizes = bid.mediaTypes[BANNER].sizes
-      } else if (traff === VIDEO) {
-        placement.sizes = bid.mediaTypes[VIDEO].playerSize;
-        placement.playerSize = bid.mediaTypes[VIDEO].playerSize;
-        placement.minduration = bid.mediaTypes[VIDEO].minduration;
-        placement.maxduration = bid.mediaTypes[VIDEO].maxduration;
-        placement.mimes = bid.mediaTypes[VIDEO].mimes;
-        placement.protocols = bid.mediaTypes[VIDEO].protocols;
-        placement.startdelay = bid.mediaTypes[VIDEO].startdelay;
-        placement.placement = bid.mediaTypes[VIDEO].placement;
-        placement.skip = bid.mediaTypes[VIDEO].skip;
-        placement.skipafter = bid.mediaTypes[VIDEO].skipafter;
-        placement.minbitrate = bid.mediaTypes[VIDEO].minbitrate;
-        placement.maxbitrate = bid.mediaTypes[VIDEO].maxbitrate;
-        placement.delivery = bid.mediaTypes[VIDEO].delivery;
-        placement.playbackmethod = bid.mediaTypes[VIDEO].playbackmethod;
-        placement.api = bid.mediaTypes[VIDEO].api;
-        placement.linearity = bid.mediaTypes[VIDEO].linearity;
+
+      if (mediaTypes && mediaTypes[BANNER]) {
+        placement.traffic = BANNER;
+        placement.sizes = mediaTypes[BANNER].sizes;
+      } else if (mediaTypes && mediaTypes[VIDEO]) {
+        placement.traffic = VIDEO;
+        placement.sizes = mediaTypes[VIDEO].playerSize;
+        placement.playerSize = mediaTypes[VIDEO].playerSize;
+        placement.minduration = mediaTypes[VIDEO].minduration;
+        placement.maxduration = mediaTypes[VIDEO].maxduration;
+        placement.mimes = mediaTypes[VIDEO].mimes;
+        placement.protocols = mediaTypes[VIDEO].protocols;
+        placement.startdelay = mediaTypes[VIDEO].startdelay;
+        placement.placement = mediaTypes[VIDEO].placement;
+        placement.skip = mediaTypes[VIDEO].skip;
+        placement.skipafter = mediaTypes[VIDEO].skipafter;
+        placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+        placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+        placement.delivery = mediaTypes[VIDEO].delivery;
+        placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+        placement.api = mediaTypes[VIDEO].api;
+        placement.linearity = mediaTypes[VIDEO].linearity;
+      } else if (mediaTypes && mediaTypes[NATIVE]) {
+        placement.traffic = NATIVE;
+        placement.native = mediaTypes[NATIVE];
       }
+
       if (typeof bid.getFloor === 'function') {
         let tmpFloor = {};
         for (let size of placement.sizes) {
           tmpFloor = bid.getFloor({
             currency: 'USD',
-            mediaType: traff,
+            mediaType: placement.traffic,
             size: size
           });
           if (tmpFloor) {
diff --git a/modules/colossussspBidAdapter.md b/modules/colossussspBidAdapter.md
index 4187dfbf36e..45af89580c1 100644
--- a/modules/colossussspBidAdapter.md
+++ b/modules/colossussspBidAdapter.md
@@ -22,22 +22,45 @@ Module that connects to Colossus SSP demand sources
         bids: [{
             bidder: 'colossusssp',
             params: {
-                placement_id: 0,
-                traffic: 'banner'
+                placement_id: 0
             }
         }]
     }, {
         code: 'placementid_1',
         mediaTypes: {
-            banner: {
-                sizes: [[300, 250], [300,600]]
+            video: {
+                playerSize: [ [640, 480] ],
+                context: 'instream',
+                minduration: 5,
+                maxduration: 60,
             }
         },
         bids: [{
             bidder: 'colossusssp',
             params: {
-                group_id: 0,
-                traffic: 'banner'
+                group_id: 0
+            }
+        }]
+    }, {
+        code: 'placementid_2',
+        mediaTypes: {
+            native: {
+                title: {
+                    required: true
+                },
+                body: {
+                    required: true
+                },
+                icon: {
+                    required: true,
+                    size: [64, 64]
+                }
+            }
+        },
+        bids: [{
+            bidder: 'colossusssp',
+            params: {
+                placement_id: 0,
             }
         }]
     }];
diff --git a/test/spec/modules/colossussspBidAdapter_spec.js b/test/spec/modules/colossussspBidAdapter_spec.js
index da050b3af90..f32a0bf4ebe 100644
--- a/test/spec/modules/colossussspBidAdapter_spec.js
+++ b/test/spec/modules/colossussspBidAdapter_spec.js
@@ -118,7 +118,6 @@ describe('ColossussspAdapter', function () {
         ...bid,
         params: {
           placement_id: 0,
-          traffic: 'video',
         },
         mediaTypes: {
           video: {

From 4bdad207cb8fa579930031d8b75be065f2e170c1 Mon Sep 17 00:00:00 2001
From: Federico Bartolomei <github@bartholomews.io>
Date: Tue, 26 Jul 2022 14:11:56 +0100
Subject: [PATCH 074/569] Permutive rtd module: update dev docs (#8736)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Pull upstream (#24)

* BidWatch Analytics Adapter: add new analytics adapter (#8302)

* New Analytics Adapter bidwatch

* test for bidwatch Analytics Adapter

* change maintainer address

* Update bidwatchAnalyticsAdapter.js

* Update bidwatchAnalyticsAdapter.js

* Update bidwatchAnalyticsAdapter.md

* Update bidwatchAnalyticsAdapter.md

* Native ads: change asset param (#8371)

* TPMN  Bidder Adapter: write id in first party domain; force syncs with various parties (#8341)

* add TPMN UserSync Bidder Adapter(Test Modify)
Updating the source code that was forked in the past.
make test case more.
- add pb7 bidderSettings option
- userSync fix.

* fix indentation from CircleCI error report

* fix indentation from CircleCI error report

* fix indentation from CircleCI error report

* fix user sync. static user sync without checking uuid.

* fix user sync. static user sync without checking uuid.

* fix user sync. static user sync without checking uuid.

* fix user sync. static user sync without checking uuid.

Co-authored-by: changjun <changjun@tpmn.io>

* Jixie Bid Adapter: send device info (#8397)

* Adapter does not seem capable of supporting advertiserDomains #6650
added response comment and some trivial code.

* removed a blank line at the end of file
added a space behind the // in comments

* in response to comment from reviewer. add the aspect of advertiserdomain in unit tests

* added the code to get the keywords from the meta tags if available.

* to support sending object of device info to backend.
yes the backend can handle it even though device was a string so far

* LKQD Bid Adapter: remove device ip bug (#8400)

* LKQD: remove device ip from request

* LKQD: remove device IP test

* cpex Id System: initial release (#8364)

* Adds cpexIdSystem

* Fixes cpexIdSystem tests

* Added markdown document

* Remove unnecessary storage config

* UserID module: graceful handling of exceptions from ID submodules (#8401)

* Do not error out when malformed JSON is set in cookies

* UserID module: graceful handling of exceptions from ID submodules

* removing floor field from bid request when not defined (#8398)

* passing floors signal to PBS (#8392)

* add adunit floor min price floors (#8396)

* AirGrid RTD  module: Support for xandr / appnexus auction level keywords. (#8388)

* chore: update docs page to match official docs

* feat: add support for appnexus / xandr auction level keywords

* Alkimi Bid Adapter: change maintainer email (#8405)

* Alkimi bid adapter

* Alkimi bid adapter

* Alkimi bid adapter

* alkimi adapter

* onBidWon change

* sign utils

* auction ID as bid request ID

* unit test fixes

* change maintainer info

Co-authored-by: Alexander Bogdanov <akascheev@asteriosoft.com>

* TheMediaGrid: support ortb2.site.content.data (#8404)

* PubMatic Bid Adapter : Remove GroupM as alias (#8386)

* Changed net revenue to True

* Removed groupm as alias

* Pasing the alternateBidder values to translator

Co-authored-by: Azhar <azhar@L1119.local>

* Intentiq module: adding dynamic ttl and rtt and storing data in localstorate (#8384)

* Intentiq module: adding dynamic ttl and data to LS

* Fixing Useless conditional alerts

Co-authored-by: Julian <julian.rassolov@gmail.com>

* Floc ID Module: remove call for floc (#8402)

* Update flocIdSystem.js

* Update flocIdSystem.js

* Multiple modules: replace all usage of `require` with `import` (#8379)

We had multiple reports of an elusive issue that seems to be related to use of `require` (https://github.com/prebid/Prebid.js/issues/8374).

Since mixed use of `require` and `import`s is not great anyway, this is a good opportunity to clean it up.

* Sirdata RTD Module: bug fixes & add new bidders (#8406)

* - bug fixes
- new bidders supported: yahoo, pubmatic, openx

* fix invalid indentation

* Revert "fix invalid indentation"

This reverts commit 6ed9f9116b86c484b1d3b895315a77e03651369d.

* manually update indentation

* AdagioBidAdapter: fix site information detection (use refererInfo) (#8407)

* Criteo : Add support of PAF response model (#8359)

* JwPlayer RTD Module: Set Ortb content to config (#8354)

* sets to config

* updates unit tests

* clears obsolete data

* typo

* replaces duplicate strings

* Audigent analytics adapter: add new analytics adapter (#8347)

* adding logic and tests for hadronAnalyticsAdapter

* increasing coverage

* typo in partnerId procedence

* Sspbc Bid Adapter: Gather language in payload; various formatting changes (#8395)

* Update tests for sspBC adapter

Update tests for sspBC adapter:
- change userSync test (due to tcf param appended in v4.6)
- add tests for onBidWon and onTimeout

* [sspbc-adapter] 5.3 updates: content-type for notifications

* [sspbc-adapter] pass CTA to native bid

* [sspbc-5.3] keep pbsize for detected adunits

* [sspbc-5.3] increment adaptor ver

* [sspbc-adapter] maintenance update to sspBCBidAdapter

* remove yarn.lock

* Delete package-lock.json

* remove package-lock.jsonfrom pull request

* [sspbc-adapter] send pageViewId in request

* [sspbc-adapter] update pageViewId test

* [sspbc-adapter] add viewabiility tracker to native ads

* [sspbc-adapter] add support for bid.admNative property

* [sspbc-adapter] ensure that placement id length is always 3 (improves matching response to request)

* [sspbc-adapter] read publisher id and custom ad label, then send them to banner creative

* [sspbc-adapter] adlabel and pubid are set as empty strings, if not present in bid response

* [sspbc-adapter] jstracker data fix

* [sspbc-adapter] jstracker data fix

* [sspbc-adapter] send tagid in notifications

* [sspbc-adapter] add gvlid to spec; prepare getUserSyncs for iframe + image sync

* [sspbc-adapter] fix notification payload

* [sspbc-adapter] fix notification payload, fix tests

* [sspbc-adapter] add userIds to ortb request

* [sspbc-adapter] update to 4.1, change request to be ortb 2.6 compliant

* [sspbc-adapter] update tests

* [ssbc-adapter] bid cache for video ads

* [sspbc-adapter] add PageView.id to banner ad; update tests

* [sspbc-adapter] fix window.gam not being added to banner html

* [sspbc-adapter] send device / content language

* [sspbc-adapter] send pageview and site ids to user sync frame

* [sspbc-adapter] add ES6 version of common ad library (for banner creatives)

* [sspbc-adapter] move content property

* [sspbc-adapter] reorganize notification payload creator

* [sspbc-adapter] store PLN price in meta; send in bidWon notification

* [sspbc-adapter] add playbackmethod to supporten video params; allow overridinbg video settngs via  bid.params.video

* [sspbc-adapter] update md

* [sspbc-adapter] fix error in mapVideo method (Object assign merror when mediaTypes do not contain video)

Co-authored-by: Wojciech Biały <wb@WojciechBialy.local>

* Prebid 6.24.0 release

* Increment version to 6.25.0-pre

* fix(deps): declare required deps for webpack build (#8411)

When using Prebid.js as a NPM dependency and built with webpack, the
instructions are to use the babel configuration and plugins that are
provided by Prebid.

```
      {
        test: /.js$/,
        include: new RegExp(`\\${path.sep}prebid\\.js`),
        use: {
          loader: 'babel-loader',
          // presets and plugins for Prebid.js must be manually specified separate from your other babel rule.
          // this can be accomplished by requiring prebid's .babelrc.js file (requires Babel 7 and Node v8.9.0+)
          // as of Prebid 6, babelrc.js only targets modern browsers. One can change the targets and build for
          // older browsers if they prefer, but integration tests on ie11 were removed in Prebid.js 6.0
          options: require('prebid.js/.babelrc.js')
        }
      }
```

This seems to work just fine when using NPM or Yarn 1. However it is not
possible when using stricter settings or package managers that require
strict dependency declarations.

```
[webpack-cli] Failed to load '/Users/john.wright/Workspace/mung-app/webpack.config.js'
config [webpack-cli] Error: prebid.js tried to access
@babel/preset-env, but it isn't declared in its dependencies;
this makes the require call ambiguous and unsound.
```

* Multiple modules: automatically fill in PPID for DFP video URLs (#8365)

https://github.com/prebid/Prebid.js/issues/8151

* Prebid 6.24.1 release

* Increment version to 6.25.0-pre

* Invibes Bid Adapter: write id to first party from bid adapter (#8202)

* Invibes Bid Adapter: added support for LiD generation on Invibes servers

* Invibes Bid Adapter: replaced all cookies storing with local storage
removed cookie storing logic

* invibesBidAdapter: applied lint formatting  updated unit tests to reflect reading from localStorage

* Update invibesBidAdapter_spec.js

updated Invibes Bid Adapter unit tests to pass for when the default storage allowed will be changed.

* Weborama RTD submodule: specify list of bidders to share data (#8350)

* update .submodules.json to include weborama rtd

update .submodules.json to include weborama rtd submodule

* add support to pubmatic

* improve test format

* improve test format ~

* add support to appnexus/xandr bidder

* fix issue when split set target in two steps: site and user centric data

* add support to rubicon old style

* fix code, update docs

* add support to global and bid ortb2

* remove unused code

* refactor code

* update bidder list

* add global level parameters

* change error to warning

* update doc

* refactor

* add field accountId

* update example

* refactor js concat string

* refactor js concat string 2

* update jsdoc

* correct jsdoc

* add support to pubmatic

* improve test format

* improve test format ~

* add support to appnexus/xandr bidder

* fix issue when split set target in two steps: site and user centric data

* add support to rubicon old style

* fix code, update docs

* add support to global and bid ortb2

* remove unused code

* refactor code

* update bidder list

* add global level parameters

* change error to warning

* update doc

* refactor

* add field accountId

* update example

* refactor js concat string

* refactor js concat string 2

* update jsdoc

* correct jsdoc

* fix log

* update example

* remove todo

* refactor duplicated code in config normalization

* fix jsdoc

* add main feature

* update jstag

* improve callback

* improve doc

* improve doc about ortb2

* refactor code

* refactor tests to use one adunit

* fix unit tests

* prepare to add support to webo lite

* refactor code

* reorder code to handle bid data

* finish unit test

* improve copy of data

* improve unit test by checking callbacks that alter bid data

* format source

* fix doc

* specify webo lite as site-centric data

* add check for profile format

* update doc and code

* update sendToBidder callback signature

* fix doc

* fix doc 2

* fix js example

* update doc

* improve doc

* fix doc for LiTE

* update code and tests

* update doc

* update unit test

* improve doc

* fix sfbx lite code, add isDefault flag on metadata

* remove unused imports in tests

* refactor code using ?. operator

* improve deep clone usage

* keep code less dinamic

* refactor thinking in the prebid 7

* format source

* format tests

* suppress mention to lite

* Revert "suppress mention to lite"

This reverts commit 43fa65804446c4a6acf18dd48897f971c5d85683.

* small fix

* refactor init submodule functions

* add new constants

* update example

* simplify code

* rename function, rewrite callbacks into () => notation

* update sfbx lite name

* fix doc

* TrustP ID Module: Refactor acronyms handler (#8228)

* feature: Add trustpid user id module

* refactor: Update trustpidSystem module, comments and md file

* refactor: Update trustpidSystem file to handle domain setting regardless of message events

* refactor: Update trustpidSystem module and dependent tests and docs

* refactor: Update trustpid undefined checks and returns

* tests: Update trustpid tests

* docs: Update trustpid docs typo

* refactor: Update trustpid acronyms logic

* refactor: Remove unused import

* refactor: Trustpid documentation update

Co-authored-by: Tomasz Januszek <tomasz@teavaro.com>

* appnexus bid adapter - fix in psp keywords logic (#8382)

* UserID module: do not start initialization until `pbjs.processQueue()` has been called (#8408)

* Extract controllable promise into utils function

* Do not start init of userId until processQueue is called

* Add PGAM client side (#8418)

* IX Bid Adapter: Outstream Support Update (#8412)

* outstream player update

* documentation update

Co-authored-by: Love Sharma <love.sharma@indexexchange.com>

* Alkimi Bid Adapter: Markdown file example update (#8422)

* Alkimi bid adapter

* Alkimi bid adapter

* Alkimi bid adapter

* alkimi adapter

* onBidWon change

* sign utils

* auction ID as bid request ID

* unit test fixes

* change maintainer info

* Updated the ad unit params

Co-authored-by: Alexander <32703851+pro-nsk@users.noreply.github.com>
Co-authored-by: Alexander Bogdanov <akascheev@asteriosoft.com>
Co-authored-by: Alexander Bogdanov <abogdanov@asteriosoft.com>
Co-authored-by: motors <motors@live.ru>

* BeOp Bid Adapter: prefer canonical URL when present & prepend protocol (#8391)

* [BeOp] prefer canonical URL when present & prepend protocol

* [BeOp] get the right page url in tracking events too

* [BeOp] improve page url resolver

* BeOp Bid Adapter: 'top.location.protocol' can also throw

* feat: add detected page url to ixdiag [PB-978] (#8425)

Co-authored-by: shahin.rahbariasl <shahin.rahbariasl@indexexchange.com>

* LiveIntent Id Submodule: Update live-connect to 2.3.3; better consent processing (#8423)

* Update live-connect to 2.3.3

* Update package-lock.json

* Fix tests

* Adjust test cases

Co-authored-by: Viktor Dreiling <viktor@Viktors-MacBook-Pro.fritz.box>
Co-authored-by: Viktor Dreiling <viktor@Viktors-MBP.fritz.box>

* support cta and privacyLink (#8403)

* Kargo Bid Adapter: adding media type to bid response, supporting vastXml response (#8426)

* kargo adapter - adding mediaType to bid response, conditionally set vastXml field

* kargo adapter - updating tests

* Improve Digital adapter: adding Extend mode (#8399)

Co-authored-by: iosfaisal <100519197+iosfaisal@users.noreply.github.com>
Co-authored-by: Jozef Bartek <j.bartek@improvedigital.com>
Co-authored-by: Jozef Bartek <31618107+jbartek25@users.noreply.github.com>

Co-authored-by: Faisal Islam <93644923+faisalvs@users.noreply.github.com>
Co-authored-by: iosfaisal <100519197+iosfaisal@users.noreply.github.com>

* Update sync URLs (#8431)

We are updating sync URLs to our current partners.

* AdagioBidAdapter: remove useless data in bid request. (#8434)

* Prebid 6.25.0 release

* Increment version to 6.26.0-pre

* Ogury Bid Adapter: Add device infos with size in bidrequest (#8416)

* Add device infos with size in bidrequest

* trigger rebuild on CI to fix tests

* restore sinon stubbed methods after all tests

* restore stub correctly at end of tests

* trigger rebuild on CI to fix tests

* Video Heroes Bid Adapter: add new bid adapter (#8310)

* added Brave bidder adapter with test and docs

Commit has standard bidder adapter 2 new files adapter js, adapter md

* added test spec file witch covered code least 80 %

* adding videoHeroes bidder adapter

* added videoHeroes test spec

* Update braveBidAdapter.js

* Update braveBidAdapter.js

* Update videoheroesBidAdapter.md

* upd import of utils lib to load only certain fnc

* cpex Id module: Remove window reference (#8440)

* Remove window reference

* Changed version to string

* Jixie Bid Adapter: add schain (#8439)

* Adapter does not seem capable of supporting advertiserDomains #6650
added response comment and some trivial code.

* removed a blank line at the end of file
added a space behind the // in comments

* in response to comment from reviewer. add the aspect of advertiserdomain in unit tests

* added the code to get the keywords from the meta tags if available.

* jixie sending schain info to jixie backend

* support of schain info sent to jixie endpoint, fixing some indentation complaints from auto build check

* Gravito User Id submodule: initial release (#8414)

* gravitompId user module for integrating gravito first party cookie with prebid js

* fixed eslint issues raised by circleci

* fixed trailing spaces error raised by circleci

* Rename id to aoneId from dacId (#8453)

* Akamai RTD: fixed bugs on rtd module and added the entropy values (#8284)

* Fixed bugs on rtd module and added the entropy values required by Akamai DAP

* Fixed the timeout issue in build browserstack tests

* Fixing review comments

* Fixing review comments - using storage manager for managing localStorage

* Fixing review comments - using loadExternalScript method to load the script

* Fixed unit test case

* Fixing review comments - Added consent handling

* Zeta global ssp bid adapter: add shortname param (#8454)

* zeta_global_sspBidAdapter shortname was added

* remove the trash

Co-authored-by: Surovenko Alexey <surovenko.alexey@gmail.com>

* Remove medianetRtdProvider tests (#8463)

* Revert "Akamai RTD: fixed bugs on rtd module and added the entropy values (#8284)" (#8464)

This reverts commit c4348892b5d3425d21373e1dcf4d67da04fed622.

* Prebid 6.26.0 release

* Increment version to 6.27.0-pre

* Update fintezaAnalyticsAdapter_spec.js (#8467)

* Hadron analytics adapter: fix cross-origin exception on init (#8472)

* Pulling the URL check out from the logic. Whatever the user passes will be used (#8473)

Co-authored-by: Jason Lydon <jason.lydon@flashtalking.com>

* Update conversant adapter to accept position from the AdUnit (#8477)

* NovatiqId User Module - Include IAB Vendor ID (#8479)

* Novatiq snowflake userId submodule

Novatiq snowflake userId submodule initial release

* change request updates

added novatiq info /modules/userId/userId.md
added novatiq info /modules/userId/eids.md
added novatiq eids /modules/userId/eids.js
added novatiq module in /modules/.submodules.json
removed unnecessary value from getId response

* Update novatiqIdSystem_spec.js

removed unnecessary srcid value

* Update novatiqIdSystem.md

Novatiq ID System: updated novatiq snowflake ID description

* use the sharedId if available and configured

* updated docs

* test changes

* defensive code not required

* Use the prebid storage manager instead of using native functions

* doc changes

* trailing spaces

* Allow configuration of the sync URL and to allow callbacks for specific custom partner integrations

* update documentation

* attempt to fix firefox test timeout

* include the AIB Vendor Id

Co-authored-by: novatiq <79258366+novatiq@users.noreply.github.com>

* Multiple modules: attempt to reduce test flakiness, improved logging for XHR mock race conditions (#8466)

* Datablocks bid adapter: do not send metrics during tests

* Log contents of XHR mock on test failure

* Disable ajax for analytics adapters during tests

* Do not assume that test setup did not fail

* Update to move floors logic after placement.sizes are defined (#8476)

* Adloox Analytics/RTD: prefer gpid over pbadslot (#8455)

* Adloox Analytics: use CSS.escape when possible

* Adloox Analytics/RTD: support GPID

* Akamai RTD: fixed bugs on rtd module and added the entropy values (#8470)

* Fixed bugs on rtd module and added the entropy values required by Akamai DAP

* Fixed the timeout issue in build browserstack tests

* Fixing review comments

* Fixing review comments - using storage manager for managing localStorage

* Fixing review comments - using loadExternalScript method to load the script

* Fixed unit test case

* Fixing review comments - Added consent handling

* SOVRN Bid Adapter: refactor old test code (#8430)

* feat: [EX-3265] format tests for prebid.js adapter

* feat: [EX-3265] add tests for video media type

* feat: [EX-3265] fix test for interpretResponse

* feat: [EX-3265] fix test for interpretResponse

* feat: [EX-3265] fix test for interpretResponse

Co-authored-by: Maxim Pakhomov <maxim_pakhomov@lineate.com>
Co-authored-by: Maxim Pakhomov <70204615+maximpakhomov@users.noreply.github.com>

* Tests: remove console.log (#8481)

Co-authored-by: Surovenko Alexey <surovenko.alexey@gmail.com>

* Kobler adapter: remove outdated parameters, simplify testing (#8445)

* Removed position parameter.

* Removed zip parameter.

* Removed placementId parameter and make sizes required instead.

* Updated price-related macros.

* Fixed error when params is not provided.

* Removed last occurrence of placementId.

* Read currency.adServerCurrency as publisherCurrency.

* Use DEV endpoint for testing.

* Use config.pageUrl when test is set to true.

* Added more details about page URL.

* `config.pageUrl`.

* Added a comment explaining why pageUrl is considered only when testing.

* Fixed double quotes in tests.

* NaveggId module: fixed regex used to get naveggId from LocalStorage (#8441)

* fixed regex used to get naveggId from LocalStorage

* added unit tests

Co-authored-by: Jose <jose.silva@navegg.com>

* Taboola bid adapter: initial release (#8483)

* create taboola adapter

* create taboola adapter md

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* update the md

* update the Maintainer email

* * update MD page
* refactor code for better readability
* small fix in UT

* * add privacy to the request builder
* add relevant Ut
* small fixes in UT

* * code refactoring + add more accurate way to get page url and referer
* add relevant Ut
* small fixes in md

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * update end point url
* update UT
* Update banner End point structure

* small fixes + update epi url

* remove the destruction from the bidResponse property

* (update the unit tests) remove the destruction from the bidResponse property

* fix tests

* fix tests - run stubs on each test

* rerun because of another adapter flaky test

* rerun because of another adapter flaky test

* fix cors issue, switch between height, width position

* update badv, bcat to be based in the ortb2 to support prebid 7 new protocols + update Ut

* retry run circleci

* retry run circleci

* pull from upstream
update md (placement + pub )

* update badv, bcat UT

* rerun build

* rerun build

* support storageAllowed restriction on unit tests for prebid 7

* add it also to the aftereach

* add it also to the aftereach

* Prebid 6.27.0 release

* Increment version to 6.28.0-pre

* Ftrack Id Module: replace native appendChild with Prebid's loadExternalScript (#8432)

* JDB-533: replacing appendChild in the ftrack prebid module

* JDB-533: working on switching over to AJAX/CDN

* JDB-533: removing some commented out code

* JDB-533: removing redundant conditions

Co-authored-by: Jason Lydon <jason.lydon@flashtalking.com>

* IncrementX Bid Adapter: Initial Release (#8316)

* IncrementX Bid Adapter: vertoz adapter renamed to IncrementX

* IncrementX Bid Adapter: vertoz adapter renamed to IncrementX
- document updated

* IncrementX Bid Adapter: vertoz adapter renamed to IncrementX
- vertozBidAdapter.md removed

Co-authored-by: Mohit Patil <mohitpatil546@gmail.com>

* added tests for medianet rtd without loading js (#8485)

Co-authored-by: monis.q <monis.q@media.net>

* Adyoulike Bidder Adapter - schain support (#8486)

* add schain data to the bid request

* add unit test with schain data

* ZetaGlobalSsp BidAdapter: shortname to url (#8471)

* ZetaGlobalSsp bid adapter: shortname param into url param

* fix tests

Co-authored-by: Surovenko Alexey <surovenko.alexey@gmail.com>

* Akamai RTD Module: Fixed randomly failing test cases and updated the variable names (#8487)

* Fixed the randomly failing test cases and updated the variable names

* Improving code quality

* Adriver ID system: fix spurious test failure (#8489)

* Inskin bid adapter: use loadExternalScript utility instead of appendChild() to insert the ad tag (#8490)

* TheMediaGrid: support bid.ortb2.site.content.id (#8492)

* Added TheMediaGridNM Bid Adapter

* Updated required params for TheMediaGridNM Bid Adapter

* Update TheMediGridNM Bid Adapter

* Fix tests for TheMediaGridNM Bid Adapter

* Fixes after review for TheMediaGridNM Bid Adapter

* Add support of multi-format in TheMediaGrid Bid Adapter

* Update sync url for grid and gridNM Bid Adapters

* TheMediaGrid Bid Adapter: added keywords adUnit parameter

* Update TheMediaGrid Bid Adapter to support keywords from config

* Implement new request format for TheMediaGrid Bid Adapter

* Fix jwpseg params for TheMediaGrid Bid Adapter

* Update unit tests for The Media Grid Bid Adapter

* Fix typo in TheMediaGrid Bid Adapter

* Added test for jwTargeting in TheMediaGrid Bid Adapter

* The new request format was made by default in TheMediaGrid Bid Adapter

* Update userId format in ad request for TheMediaGrid Bid Adapter

* Added bidFloor parameter for TheMediaGrid Bid Adapter

* Fix for review TheMediaGrid Bid Adapter

* Support floorModule in TheMediaGrid Bid Adapter

* Fix empty bidfloor for TheMediaGrid Bid Adapter

* Some change to restart autotests

* Fix userIds format for TheMediaGrid Bid Adapter

* Remove digitrust userId from TheMediaGrid Bid Adapter

* Protocols was added in video section in ad request for TheMediaGrid Bid Adapter

* TheMediaGrid: fix trouble with alias using

* TheMediaGridNM: fix trouble with alias

* TheMediaGrid Bid Adapter: added support of PBAdSlot module

* TheMediaGrid Bid Adapter: fix typo

* GridNM Bid Adapter: use absent in params data from mediaTypes

* GridNM Bid Adapter: fix md file + add advertiserDomains support

* TheMediaGrid and gridNM Bid Adapter: minor netRevenue fixes

* gridNM Bid Adapter updates after review

* TheMediaGrid Bid Adapter: fix keywords workflow

* fix testing and kick off lgtm again

* TheMediaGrid: added ext.bidder.grid.demandSource processing

* TheMediaGrid: added user.id from fpd cookie

* TheMediaGrid: control cookie setting via bidder config

* TheMediaGrid: use localStorage instead cookie

* TheMediaGridNM Bid Adapter: update adapter to use /hbjson endpoint

* TheMediaGridNM: fix unnecessary conditions

* TheMediaGrid: fix bug with nurl field in response

* TheMediaGrid: update test

* TheMediaGridNM: fix possible bug with nurl

* TheMediaGrid: added alias as playwire

* TheMediaGrid: added alias as adlivetech

* TheMediaGrid: fix sync url workflow

* TrustX: fix sync url worflow + remove old syncurl

* TheMediaGrid: added instl support

* TheMediaGrid: fix test for instl

* TheMediaGrid: update md file

* TheMediaGrid: reformat segments for permutive rtd module

* TrustX: send all ortb2.user.data in user.data

* TheMediaGrid: remove permutive segments reformating

* TrustX: remove permutive segments reformating

* TheMediaGrid & TrustX: fix typo

* TheMediaGrid: support bid.ortb2.site.content

* TheMediaGrid Bid Adapter: support bid.ortb2.site.content.id

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>

* Fix for #8421 (#8493)

* Sending no decode whole url options to true, to avoid errors while decoding publisher url (#8497)

* Automatad Bid Adapter: changes to ajax request options for bid requests (#8444)

* changes for ajax request options for automatad bid request

* add test for isCredentials changes

* Various Magnite Adapters: GVL ID update (#8501)

* Magnite adapters still require legacy GVL IDs

* CTV update

* Adf adapter: avoid preflight request (#8498)

* Hadron RTD module: use internal methods (#8496)

* following prebid team's advise

* adding to adloader.js

* removing generic import

* using internal methods for loading external scripts in medianetRtdProvider (#8506)

Co-authored-by: monis.q <monis.q@media.net>

* Criteo - Update Publisher Tag version referenced by prebid adapter (#8491)

* Kargo Bid Adapter: onTimeout Support (#8449)

* Kargo Bid Adapter: Use currency from Bid Response

* Kargo Bid Adapter: Fix failed test

* Kargo Bid Adapter: adding media type to bid response, supporting vastXml response (#8426)

* kargo adapter - adding mediaType to bid response, conditionally set vastXml field

* kargo adapter - updating tests

* Kargo Bid Adapter: onTimeout Support (#6)

* Adding additional param

* Adding response time function

* Remove debug

* Updating response time log to be set by bid response

* Adding screen width/height to request

* Test fix

* Test fix

* Removing interpretResponse signaling

* Simplifying send data function

Co-authored-by: Wei Wong <wwong@kargo.com>
Co-authored-by: Andy Rusiecki <andy.rusiecki@gmail.com>

* Prebid 6.28.0 release

* Increment version to 6.29.0-pre

* CAPT-74: Pass ext section of each bid for prebid slot ID and GPID (#8509)

Co-authored-by: Timothy M. Ace <tace@imds.tv>

* Insticator Bid adapter: Adds Support for Video (#8452)

* feat: added support for video

* feat: added support for mimes

* feat: added mimes check to video validation

* Gdpr Enforcement module and sharedId/pubCommonId modules: vendor consent should not be enforced for first-party-id modules (#8448)

* Fixed issue with gdprEnforcement module and sharedId/pubCommonId modules: vendor consent should not be enforced for first-party-id modules

* addressed review comments

* addressed review comments

* added test to ensure device access is not allowed for vendorless modules in case purpose 1 consent isn't given

* fixed issue with missing moduleType param

Co-authored-by: Serhii Holdun <sholdun@magnite.com>

* PubMatic Analytics Adapter : Added support for logging multiple bids (#8517)

* Changed net revenue to True

* Removed groupm as alias

* Pasing the alternateBidder values to translator

* initial commit

* Added adId for differentiation of bids

* Fixed UT

* Added UT for GroupM

* Finding winning bid according to adId

* worked on LGTM comment

Co-authored-by: Azhar <azhar@L1119.local>

* AdOcean bid adapter: support for SupplyChain object  (#8518)

* AdOcean adapter - support for supply chain object

* AdOcean adapter - support for supply chain object - use older constructs

* AdOcean adapter - small fixes

* Taboola Bid Adapter: api support for https (#8520)

* create taboola adapter

* create taboola adapter md

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* update the md

* update the Maintainer email

* * update MD page
* refactor code for better readability
* small fix in UT

* * add privacy to the request builder
* add relevant Ut
* small fixes in UT

* * code refactoring + add more accurate way to get page url and referer
* add relevant Ut
* small fixes in md

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * update end point url
* update UT
* Update banner End point structure

* small fixes + update epi url

* remove the destruction from the bidResponse property

* (update the unit tests) remove the destruction from the bidResponse property

* fix tests

* fix tests - run stubs on each test

* rerun because of another adapter flaky test

* rerun because of another adapter flaky test

* fix cors issue, switch between height, width position

* update badv, bcat to be based in the ortb2 to support prebid 7 new protocols + update Ut

* retry run circleci

* retry run circleci

* pull from upstream
update md (placement + pub )

* update badv, bcat UT

* rerun build

* rerun build

* support storageAllowed restriction on unit tests for prebid 7

* create taboola adapter

* create taboola adapter md

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* update the md

* update the Maintainer email

* * update MD page
* refactor code for better readability
* small fix in UT

* * add privacy to the request builder
* add relevant Ut
* small fixes in UT

* * code refactoring + add more accurate way to get page url and referer
* add relevant Ut
* small fixes in md

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * update end point url
* update UT
* Update banner End point structure

* small fixes + update epi url

* remove the destruction from the bidResponse property

* (update the unit tests) remove the destruction from the bidResponse property

* fix tests

* fix tests - run stubs on each test

* rerun because of another adapter flaky test

* rerun because of another adapter flaky test

* fix cors issue, switch between height, width position

* update badv, bcat to be based in the ortb2 to support prebid 7 new protocols + update Ut

* retry run circleci

* retry run circleci

* pull from upstream
update md (placement + pub )

* update badv, bcat UT

* rerun build

* rerun build

* support storageAllowed restriction on unit tests for prebid 7

* support storageAllowed restriction on unit tests for prebid 7

* add it also to the aftereach

* add it also to the aftereach

* change the api endpoint https protocol

* ixBidAdapter: change to new endpoint and README (#8529)

* Vidazoo bid adapter: fix spurious test failure (#8515)

* Added support for IDs for multiple sources (#8499)

Co-authored-by: Nick Curry <nick.curry@4cite.com>

* Prebid 6.29.0 release

* Increment version to 7.0.0-pre

* Prebid 7 (#8530)

* Prebid 7: Delete userid targeting module (#8227)

* Delete userIdTargeting.js

* Delete userIdTargeting.md

* Delete shareUserIds_spec.js

* NextRoll ID: Remove NextRoll ID module (#8150)

* Remove Sortable Analytics Adapter (#8251)

* Prebid 7: Merge in changes from master (#8278)

* only map one slotrender to one adunit (#8211)

* DFP Ad Server Video: respect original url (#8168)

* original url components take precedence over defaults

uses object assignment

* tests that url is respected

* respects url size and cust params

* moves url cust param addition to fn

* tests that url params are respected

* Admaru adapter : add new bid adapter (#8149)

* init

* modified admaruBidAdapter.js, md, _spec.js

* modify for test

* Delete .project

* update

* update admarubidadapter.js

* Revert "Delete .project"

This reverts commit 0e1bdd4fcadd0a97fea87ba2a92cb502e5e3a19b.

* remove .project

* modified

* modified

* Delete .project

* modified

* Revert "Delete .project"

This reverts commit c4e7bd6096fe9521dd5e2fab2b3d5241149dc6ec.

* Delete .project

* modified

* modified

Co-authored-by: sung.chung <sung.chung@admaru.com>

* Missena Bid Adapter - allow custom endpoint. (#8222)

* Next Millenium Bid Adapter: Added new parameter group_id (#8200)

* changed name company

* changed name company in test

* Added processing of a new group_id parameter

* Added processing of a new group_id parameter

* changed check parameters

* fixed lint remarks

* added test

* fixed bug - lint

* changed test

* changed test - 2

* fixed bug - adapter

* add timeout value to timeout pixel (#8224)

* Outbrain bid adapter: added floor module and privacy link support (#8223)

* add floor support

* add additional validation for bid request format

* add privacy link support

* fixes

* set privacy in mapper

* fix test

* Improve Digital Bid adapter: use the oRTB server endpoint (#8138)

* Major refactoring to use new oRTB server endpoint

Co-authored-by: Faisal Islam <100519197+iosfaisal@users.noreply.github.com>
Co-authored-by: Jozef Bartek <31618107+jbartek25@users.noreply.github.com>

* fixed wrong merge

* Fixed issue related to site and app (#9)

* Fixed errors for test cases.

Co-authored-by: Faisal Islam <93644923+faisalvs@users.noreply.github.com>
Co-authored-by: Faisal Islam <100519197+iosfaisal@users.noreply.github.com>
Co-authored-by: Faisal Islam <faisal.islam@vivacomsolutions.com>

* NativoBidAdapter - Bid data mapping refactor and added QS params on request (#8196)

* Initial nativoBidAdapter document creation (js, md and spec)

* Fulling working prebid using nativoBidAdapter. Support for GDPR and CCPA in user syncs.

* Added defult size settings based on the largest ad unit. Added response body validation. Added consent to request url qs params.

* Changed bidder endpoint url

* Changed double quotes to single quotes.

* Reverted package-json.lock to remove modifications from PR

* Added optional bidder param 'url' so the ad server can force- match an existing placement

* Lint fix. Added space after if.

* Added new QS param to send various adUnit data to adapter endpopint

* Updated unit test for new QS param

* Added qs param to keep track of ad unit refreshes

* Updated bidMap key default value

* Updated refresh increment logic

* Refactored spread operator for IE11 support

* Updated isBidRequestValid check

* Refactored Object.enties to use Object.keys to fix CircleCI testing errors

* Updated bid mapping key creation to prioritize ad unit code over placementId

* Added filtering by ad, advertiser and campaign.

* Merged master

* Added more robust bidDataMap with multiple key access

* Deduped filer values

* Rolled back package.json

* Duped upstream/master's package.lock file ... not sure how it got changed in the first place

* Small refactor of filterData length check. Removed comparison with 0 since a length value of 0 is already falsy.

Co-authored-by: Joshua Fledderjohn <jfledderjohn@nativo.com>

* Floor price : allow having a 0$ floor (#8239)

* Prebid 6.18.0 release

* Increment version to 6.19.0-pre

* IAS RTD Module: Custom key values (#8214)

* Mapping table initialization

A constant initialises a mapping table where each possible key used by IAS is mapped to itself.
The dataProviders config for the IAS RTD module accepts an optional new property: keyMappings. The init function reads this property and uses it to overwrite any key that is already in the pre-initialised mapping table with the new value provided.
In a future addition, the mapping table will be used to populate the key-values actually sent to the adserver.

* Rename Key Values

After merging the key-values for each ad unit, a renaming function is called to ensure that any custom key chosen by the client is used.

* Bugfix

Call the callback() function in getBidRequestData.

* Unit tests changed to include one renamed parameter.

* Unit tests corrected and adapted to cover the current features.

* Yieldlab Bid Adapter: Add Support for User Matching (#8148)

* Build system: add option to generate source maps for production builds (#8220)

* Gamoshi Bid Adapter: Handle gdpr applies correctly (#8245)

* Nobid Prebid Adapter commit (#4050)

* Nobid Prebid Adapter commit

* Fixed global replace and unit tests

* Fixed find function

* Added nobidBidAdapter.md

* Removed description and added "Bid Params" section.

* Added test siteId 2 for testing.

* Refactored the Adapter to remove most references to the nobid object. We still need the nobid object because we have a passback tag in DFP that makes reference to it.

* Fix concurrent responses on the page

* Cosmetic change to log an error in case of missing ad markup

* Keep nobid.bidResponses cross adapters.

* Added GDPR support in user sync and added test coverage.
gulp test-coverage
gulp view-coverage

* Padding issues

* Fix padding issues

* Fix padding

* update outstream prod url (#4104)

* support pubcid and uids (#4143)

* Fix misspelling and minor cleanup of schain docs (#4150)

* Prebid 2.31.0 Release

* Increment pre version

* Rubicon: tuning logged messages (#4157)

* Rubicon: tuning logged messages

* Update rubiconBidAdapter.js

* fixed indentation

* Rubicon Video COPPA fix (#4155)

* Rubicon Video COPPA fix

* Unit test for Rubicon Video COPPA fix

* Playground XYZ adapter - iframe usersync bug fix (#4141)

* corrected user sync type

* removed support for iframe usersync

* added unit tests for getUserSyncs

* update nvmrc file (#4162)

* update gulp-footer package (#4160)

* Datablocks bid/analytics adapter (#4128)

* add datablocks Analytics and Bidder Adapters

* remove preload param

* remove preloadid

* better coverage of tests

* better coverage

* IE doesn't support array.find

* lint test

* update example host

* native asset id should be integer

* update logic of ad_types field in appnexusBidAdapter (#4065)

* Shorten SomoAudience to just Somo (#4163)

* Shorten SomoAudience to just Somo

* Make package-lock return

* Quantcast: Fix for empty video parameters (#4145)

* Copy params from bid.params.video.

* Added test for missing video parameters.

* Include mimes from adunit.

* One Video adding Rewarded Video Feature (#4142)

* outstream changes

* removing global filtet

* reverting page

* message

* adapter change

* remove space

* testcases

* testpage

* spaces for test page

* renderer exist case

* reverting package-lock.json

* adding schain object

* adding tagid

* syntaxx error fix

* video.html

* space trailing

* space

* tagid

* inventoryId and placement

* rewarded video

* added unit test case

* Module to pass User Ids to DFP (#4140)

* first commit

* renamed

* minor doc change

* documentation

* small change

* EB

* removed unused imports

* minor changes

* reanmaed a const

* adding more methods to test shareUserIds module

* unit tets cases for shareUserIds

* indentation

* renamed DFP to GAM

* renamed shareUserIds to userIdTargeting

* Update userIdTargeting.md

* trying to restart CI

* digitrust userId case handled

* minor comment change

* using auctionEnd event instead of requestBids.before

* using events.on

* Buzzoola bid adapter (#4127)

* initial commit for buzzoola adapter

* leave only banners for now

* fix bid validation

* change endpoint url

* add video type

* restore renderer

* fix renderer

* add fixed player sizes

* switch bids

* convert dimentions to strings

* write tests

* 100% tests

* remove new DOM element creation in tests

* handle empty response from server

* change description

* E2e tests for Native and Outstream video Ad formats. (#4116)

* reorganize e2e/ tests into separate directories

* new test page for e2e-banner testing

* add test to check if Banner Ad is getting loaded

* change location of the spec files to reflect change in test/e2e directory structure

* add test case to check for generation of valid targeting keys

* create Native Ad test page

* add test case to check validity of the targeting keys and correct rendering of the Ad

* update old browser versions to new

* update browser version

* update title

* remove console.log statements

* add basic functional test for e2e outstream video ad format

* Update LockerDome adUnitId bid param (#4176)

This is not a breaking change

* fix several issues in appnexus video bids (#4154)

* S2s testing disable client side (#4123)

* Add microadBidAdapter

* Remove unnecessary encodeURIComponent from microadBidAdapter

* Submit Advangelists Prebid Adapter

* Submit Advangelists Prebid Adapter 1.1

* Correct procudtion endpoint for prebid

* analytics update with wrapper name

* reverted error merge

* New testServerOnly flag

* Tests and a bug fix

* Removed dead code

* Fixes requested in review

* Check each adUnit

* isTestingServerOnly changes per Eric

* Fixed IE 11 bug

* More tests

* improved test case names

* New option to Include deal KVPs when enableSendAllBids === false (#4136)

* new option to include KVPs which have deals when
enableSendAllBids === false

* updating tests to be more realistic

* Prebid 2.32.0 Release

* increment pre version

* Rubicon doc: changing video test zone (#4187)

* added schain support to sonobi adapter (#4173)

* if schain config is not defined then error should not be thrown (#4165)

* if schain config is not defiend then error should not be thrown

* relaxed mode nodes param not defined error handled

* added test cases for config validation

* a curly bracket was missing in the example

* Rubicon: updating test params (#4190)

* myTargetBidAdapter: support currency config (#4188)

* Update README.md (#4193)

* Update README.md

* Update README.md

* cedato bid adapter instream video support (#4153)

* Added adxpremium prebid analytics adapter (#4181)

* feat(OAFLO-186): added support for schain (#4194)

* Sonobi - send entire userid payload (#4196)

* added userid param to pass the entire userId payload to sonobis bid request endpoint

* removed console log
git p

* fixed lint

* OpenX Adapter fix: updating outdated video examples (#4198)

* userId - Add support for refreshing the cached user id (#4082)

* [userId] Added support for refreshing the cached user id: refreshInSeconds storage parameter, related tests and implementation in id5 module

* [userId] Added support for refreshing the cached user id: refreshInSeconds storage parameter, related tests and implementation in id5 module

* UserId - ID5 - Updated doc with new contact point for partners

* UserId - Merged getStoredValue and getStoredDate

* [UserId] - ID5 - Moved back ID5 in ./modules

* UserId - ID5 - Fixed incorrect GDPR condition

* [UserId] - Doc update and test cleanup

* Prebid 2.33.0 Release

* Increment pre version

* SupplyChainObject support and fires a pixel onTimeout (#4152)

* - Implemented the 'onTimeout' callback to fire a pixel when there's a timeout.
- Added the ability to serialize an schain object according to the description provided here: https://github.com/InteractiveAdvertisingBureau/openrtb/blob/master/supplychainobject.md

* some mods to the schain tag generation

* - added tests for schain param checking.

* - fixed a malformed url for timeouts

* - Removed a trailing ',' while generating a schain param.

* - Using the schain object from validBidRequest if present. Reverting to checking if params has it if not.

* - reverting changes to merge with master

* - Resolving merge issues

* Feature/add profile parameter (#4185)

* Add optional profile parameter

* EMXDigital Bid Adapter: Add video dimensions in request (#4174)

* addressed feedback from #3731 ticket

* removed commented code from emx test spec

* logging removed from spec

* flip h & w values from playerSize for video requests

* adding Outstream mediaType to EMX Digital

* adding device info. update to grab video param. styling changes.

* add video dimensions from playerSize

* fix test for video dimensions

* Added keywords parameter support in TrustX Bid Adapter (#4183)

* Add trustx adapter and tests for it

* update integration example

* Update trustx adapter

* Post-review fixes of Trustx adapter

* Code improvement for trustx adapter: changed default price type from gross to net

* Update TrustX adapter to support the 1.0 version

* Make requested changes for TrustX adapter

* Updated markdown file for TrustX adapter

* Fix TrustX adapter and spec file

* Update TrustX adapter: r parameter was added to ad request as cache buster

* Add support of gdpr to Trustx Bid Adapter

* Add wtimeout to ad request params for TrustX Bid Adapter

* TrustX Bid Adapter: remove last ampersand in the ad request

* Update TrustX Bid Adapter to support identical uids in parameters

* Update TrustX Bid Adapter to ignore bids that sizes do not match the size of the request

* Update TrustX Bid Adapter to support instream and outstream video

* Added wrapperType and wrapperVersion parameters in ad request for TrustX Bid Adapter

* Update TrustX Bid Adapter to use refererInfo instead depricated function utils.getTopWindowUrl

* HOTFIX for referrer encodind in TrustX Bid Adapter

* Fix test for TrustX Bid Adapter

* TrustX Bid Adapter: added keywords passing support

* rubicon: avoid passing unknown position (#4207)

* rubicon: not passing pos if not specified

* added comment

* not sending pos for video when undefined

* cleaning up test

* fixed unit test

* correctly reference bidrequest and determine mediatype of bidresponse (#4204)

* GumGum: only send gdprConsent when found (#4205)

* adds digitrust module, mods gdpr from bool to int

* update unit test

* only send gdprconsent if present

* LKQD: Use refererInfo.referer as fallback pageurl (#4210)

* Refactored URL query parameter passthrough for additional values, changed SSP endpoint to v.lkqd.net, and updated associated unit tests

* Use refererInfo.referer as fallback pageurl

* Removed logs and testing values

* [UserId] - ID5 - Fixed case when consentData is undefined (No CMP) (#4215)

* create stubs for localStorage in widespaceBidAdapter test file (#4208)

* added adId property to adRenderFailed event (#4097)

When no bid (therefore no adUnitCode) is available in the adRenderFailed event it can be difficult to identify the erroring slot.But in almost all cases the given slot still has the adId targeting.

* OpenX Adapter: Forcing https requests and adding UserID module support for LiveRamp and TTD (#4182)

* OpenX Adapter: Updated requests to force https

* OpenX Adapter: Added support for TTD's UnifiedID and LiveRamp's IDL

* PubMatic to support userId sub-modules (#4191)

* added support for pubcommon, digitrust, id5id

* added support for IdentityLink

* changed the source for id5

* added unit test cases

* changed source param for identityLink

* TripleLift support for UnifiedId and IdentityLink (#4197)

* Add IdentityLink support and fix UnifiedId.

It appears we've been looking for UnifiedId userIds
on the bidderRequest object, when they are found on bidRequests.
This commit fixes that error, and adds support for IdentityLink.

* change maintainer email to group

* Added lemma adapter (#4126)

* lemmaBidAdapter.js

Added lemma bid adapter file

* lemmaBidAdapter.md

Added lemma bid adapter md file

* lemmaBidAdapter_spec.js

Added lemma bid adapter test spec file

* Update lemmaBidAdapter.js

Fixed automated code review alert comparison between inconvertible types

* Update lemmaBidAdapter.js

Fixed review changes

* Update lemmaBidAdapter.md

Correct parameter value.

* Adkernel adapter new alias (#4221)

* Force https scheme for Criteo Bidder (#4227)

* assign adapter version number

* Ensure that Criteo's bidder is always called through https

* Add Video Support for Datablocks Bid Adapter (#4195)

* add datablocks Analytics and Bidder Adapters

* remove preload param

* remove preloadid

* better coverage of tests

* better coverage

* IE doesn't support array.find

* lint test

* update example host

* native asset id should be integer

* add datablocks Video

* remove isInteger

* skip if empty

* update adUnit, bidRequest and bidResponse object (#4180)

* update adUnit, bidRequest and bidResponse object

* add test for mediaTypes object

* 3 display banner and video vast support for rads (#4209)

* add stv adapter

* remove comments from adapter file

* start rads adapter

* fix adapter and tests

* fixes

* fix adapter and doc

* fix adapter

* fix tests

* little fix

* add ip param

* fix dev url

* #3 radsBidAdapter.md

* #3 radsBidAdapter.md: cleanup

* fix code and doc

* UserId - Add SameSite and server-side pubcid support (#3869)

* Add SameSite and server-side pubcid support

* Fix emoteevBidAdapter unit test

* added schain to appnexus bid adapter (#4229)

* added schain to appnexus bid adapter

* semicolon

* update doubleclick url (#4179)

* Prebid 2.34.0 release

* increment pre version

* Rubi Analytics handles > 1 bidResponse per bidRequest (#4224)

* videoNow bid adapter (#4088)

* -- first commit

* -- cors and bidder's name fixed

* -- almost ready

* -- added docs

* -- added nurl tracking

* -- bid params

* -- tests added

* -- test fixed

* -- replace placeholder in the onBidWon pixel's url

* -- commit for restart tests

* -- change response data format for display ad

* -- tests updated

* -- 100% tests coverage

* -- a few clean the test's code

* -- custom urls from localStorage

* -- tests updated

* -- a few clean the test's code

* -- new init model

* -- spec for new init model

* -- fix for new init model

* -- code cleaned

* -- 100% tests coverage

* -- 100% tests coverage

* -- fixed test

* -- commit for restart tests

* djax new bidder adapter  (#4192)

* djax bidder adapter

* djax bidder adapter

* Update hello_world.html

* Added Turk Telekom Bid Adapter (#4203)

* Added Turk Telekom Bid Adapter

* Fix md file for Turk Telekom Bid Adapter

* MicroAd: Use HTTPS in all requests (#4220)

* Always use HTTPS endpoint in MicroAd

* Update code

* Fixed a broken test in MicroAd

* Schain: avoiding Object.values as it is breaking on IE11 (#4238)

* added support for pubcommon, digitrust, id5id

* added support for IdentityLink

* changed the source for id5

* added unit test cases

* changed source param for identityLink

* avoiding use of Object.values

* 3952 delay auction for ids (#4115)

* 3952 delay auction for user ids

* 3952 add integration example

* 3952 add tests

* 3952 fix html example

* add todos

* 3952 continue auction if ids received

* 3952 add tests for auction delay

* increase test coverage

* set config for test

* remove todo

* add a few more checks to tests

* add comment, force tests to rerun

* Feature: adUnitBidLimit  (#3906)

* added new feature to config to limit bids when sendallbids is enabled

* cleaned up code. removed extra spaces etc

* removed trailing spaces in config

* remove .flat() and replaced with spread operator

* removed flat function and instead pushing using spread operator

* updated to use sendBidsControl instead

* updated targeting_spec to test bidLimit

* removed trailing spaces from targeting_spec

* Update Rubicon Adapter netRevenue default (#4242)

* Add microadBidAdapter

* Remove unnecessary encodeURIComponent from microadBidAdapter

* Submit Advangelists Prebid Adapter

* Submit Advangelists Prebid Adapter 1.1

* Correct procudtion endpoint for prebid

* analytics update with wrapper name

* reverted error merge

* update changed default value of netRevenue to true

* Removed AdastaMadia from alias (#4255)

* Update appnexusBidAdapter.js (#4251)

* IdentityLink - change expiration time to 30 days (#4239)

* Add coppa support for AppNexus adapter (#4253)

* Add coppa support for AppNexus adapter

* test name

* add new longform e2e tests (#4206)

* Konduit module (#4184)

* Adding Konduit module

* Removed superfluous arguments passed to obtainVastUrl function

* Removed superfluous arguments passed to obtainVastUrl function.

* Build trigger (empty commit)

* Module documentation updated according to the comments

* Logic in obtainVastUrl function updated according to the review comment.

* Removed hook, enabled eslint

* Circle CI runs e2e tests on every push (#4200)

* run functional tests on circle ci on push to any remote branch

* remove extraneous key from config file

* add test.localhost as alias to 127.0.0.1

* check 0: execute circle-ci

* move /etc/config to a separate command

* change bid partner to rubicon

* test appnexus bid adapter in ci

* comment browserstack command

* remove console.log statement

* test1: circle-ci

* change reference dev -> prod while loading prebid

* add console.log statement

* check-2: circle-ci

* comment browserstack testing

* change bid adapter

* change bid adapter

* remove test case for checking targeting keys

* remove the ci flag

* uncomment test for checking correct generation of targeting keys

* swap AN -> Rubicon for testing targeting keys

* Outcon bid adapter. (#4161)

* Outcon bid adapter.

* Fix identation

* Fixes

* Fixes

* Fixes

* Spec fixes

* Fixes

* Fix urls

* Fix

* Fix parameters

* Fix space operators

* Fix bidder timeout

* Update

* Fix whitespace

* no message

* Outcon unit test

* no message

* no message

* no message

* no message

* Fixes

* Fixes

* Change url

* no message

* no message

* no message

* Added bidId

* no message

* no message

* no message

* no message

* Wrapping url with html

* no message

* no message

* no message

* Adding workflow to run end to end tests (#4230)

* Adding workflow to run end to end tests

* trying self branch

* Update to run at 12 every day

* cleanup config using aliases

* update branch and cron time

* add command

* update prebid path for e2e test pages (#4274)

* Prebid 2.35.0 release

* Increment pre version

* Add usersync to adpone adapter (#4245)

* add user sync to adpone adapter

* move adpone usersync to global variable

* added withcredentials to http request

* fix http request options

* fix http request options

* add withCredentials: true

* add withCredentials: true

* added test coverage to usersync

* update sync function

* add test coverage

* adpone adapter

* package lock

* add more testing

* add more testing

* testing for onBidWon fucntion

* test onbidwon function

* trigger build

* Revert GumGum Adapter 2.28 resizing changes (#4277)

* changed resizing unit tests to return the first size dimensions in the sizes array

* added some changes

* reverted adapter changes

* SpotX Bid Adapter: Support schain, ID5 object, Google consent object, and hide_skin (#4281)

* Add SpotXBidAdapter

* Minor updates

* Undo testing changes to shared files

* Fix relative imports

* Remove superfluous imports and write a few more tests

* Formatting, ID5 object, Google consent objects

  - Added ID5 object support
  - Added Google Consent object
  - Reformatted indentaiton on spec file

* Revert content_width and content_height changes in docs

  - not sure how these got moved, lets put them back

* Remove click_to_replay flag in example

  - no reason to use this one in the example

* Spotx adapter - Add schain support and update unit tests

* Update schain path in ORTB 2.3 request body

	- schain object is now added to ortb request body
	  at request.ext.source.ext.schain

* Add hide_skin to documentation

  - whoops, this got removed, let's add it back

* Update Rubicon Analytics Adapter `bidId` to match PBS (#4156)

* Add microadBidAdapter

* Remove unnecessary encodeURIComponent from microadBidAdapter

* Submit Advangelists Prebid Adapter

* Submit Advangelists Prebid Adapter 1.1

* Correct procudtion endpoint for prebid

* analytics update with wrapper name

* reverted error merge

* update for rubicon analytics to send seat[].bid.id for PBS video and banner

* fixed conditional for server and video or banner

* updated with optimized value test for bidid

* update changed default value of netRevenue to true

* remove var declaration for rightSlot to correct lgtm error for unused variable

* update defineSlot div id to match div id defined in html body

* update test ad unit test props

* revert lock to match remote master

* add seatBidId to bidObj in rpBidAdapter interpretResponse

* update setTargeting to execute in the bids back handler

* remove dev integration test page

* meaningless commit to get lgtm to re-run

* SmartRTB adapter update (#4246)

* modules: Implement SmartRTB adapter and spec.

* Fix for-loop syntax to support IE; refactor getDomain out of exported set.

* Remove debugs, update doc

* Update test for video support

* Handle missing syncs. Add video to media types in sample ad unit

* Add null response check, update primary endpoint

* Note smrtb video requires renderer

* Support Vast Track (#4276)

* Add microadBidAdapter

* Remove unnecessary encodeURIComponent from microadBidAdapter

* Submit Advangelists Prebid Adapter

* Submit Advangelists Prebid Adapter 1.1

* Correct procudtion endpoint for prebid

* analytics update with wrapper name

* reverted error merge

* update changed default value of netRevenue to true

* Add parameters if config.cache.vasttrack is true

* Use requestId instead of adId

* Test new vasttrack payload params

* Removed commented out code

* Relaxed conditional check per review

* Removed commented out line

* Added 1000x250 size (#4295)

* prepare vidazoo adapter for v3.0 (#4291)

* Improve Digital adapter: support schain (#4286)

* LiveIntent Identity Module. (#4178)

* LiveIntentIdSystem. Initial implementation.

* LiveIntentIdSystem. Removed whitespace.

* Fixed typo

* Renamed variables, cookiesm added md.

* Changed the default identity url.

* Composite id, with having more than just the lipbid passed around.

* Composite id.

* Merge conflict resolution.

* Changed docs and param description.

* Added typedoc & mentioned liveIntentIdSystem in submodule.json.

* Extracted the LiveIntentIdSystem under modules, removed it from default userId modules.

* Fixing the 204 + no body scenario.

* Added liveIntent to submodule.json

* Fixing docs indentation.

* Updated prebidServer & specs.

* Minor specs update.

* updating liveintent eids source (#4300)

* updating liveintent eids source

these are supposed to be domains

* updating unit test

* fix appnexusBidAdapter view-script regex (#4289)

* fix an view script regex

* minor syntax update

* 33Across adding bidder specific extension field (#4298)

* - add 33across specific ext field for statedAt

* - fix unit test for 33Across adapter

* PubMatic to support LiveIntent User Id sub-module (#4306)

* added support for pubcommon, digitrust, id5id

* added support for IdentityLink

* changed the source for id5

* added unit test cases

* changed source param for identityLink

* supporting LiveIntent Id in PubMatic adapter

* updated source for liveintent

* Finteza Analytics Adapter: fix cookies (#4292)

* fix reading and sending cookies

* fix lint errors

* clear comments

* add unit tests

* fix calling of setCookies for IE

* clear cookies after test

* use own setCookie method inside tests

* Update LockerDome adapter to support Prebid 3.0 (#4301)

* Returning the `IdResponse` type with an obj + callback. Fix for 4304 (#4305)

*  Returning the `IdResponse` type with an obj + callback.

* Renamed resp -> result.

* Removed whitespace.

* ShowHeroes adapter - expanded outstream support (#4222)

* add ShowHeroes Adapter

* ShowHeroes adapter - expanded outstream support

* Revert "ShowHeroes adapter - expanded outstream support"

This reverts commit bfcdb913b52012b5afbf95a84956b906518a4b51.

* ShowHeroes adapter - expanded outstream support

* ShowHeroes adapter - fixes (#4222)

* ShowHeroes adapter - banner and outstream fixes (#4222)

* ShowHeroes adapter - description and outstream changes (#4222)

* ShowHeroes adapter - increase test coverage and small fix

* [Orbidder-Adapter] Add bidRequestCount and remove bid.params.keyValues (#4264)

* initial orbidder version in personal github repo…

* update permutiveRtdProvider.md

* update permutiveRtdProvider.md

* ID -> 'bidder code'

* add GDPR clause + changed SDK permission bit

* supported bidders -> bidders with known support

Co-authored-by: Guy Dawson <guy@permutive.com>
Co-authored-by: Sam Desborough <sam.desborough@gmail.com>
Co-authored-by: matthieularere-msq <63732822+matthieularere-msq@users.noreply.github.com>
Co-authored-by: Jozef Bartek <31618107+jbartek25@users.noreply.github.com>
Co-authored-by: TPMN Admin <info@tpmn.co.kr>
Co-authored-by: changjun <changjun@tpmn.io>
Co-authored-by: jxdeveloper1 <71084096+jxdeveloper1@users.noreply.github.com>
Co-authored-by: David Carver <54326287+david-carver@users.noreply.github.com>
Co-authored-by: David Spohr <spohr.david@gmail.com>
Co-authored-by: Demetrio Girardi <dgirardi@prebid.org>
Co-authored-by: Mehdi Bouallagui <45876988+mbouallagui@users.noreply.github.com>
Co-authored-by: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Co-authored-by: Dennis <dennis@airgrid.io>
Co-authored-by: Alexander <32703851+pro-nsk@users.noreply.github.com>
Co-authored-by: Alexander Bogdanov <akascheev@asteriosoft.com>
Co-authored-by: TheMediaGrid <44166371+TheMediaGrid@users.noreply.github.com>
Co-authored-by: pm-azhar-mulla <75726247+pm-azhar-mulla@users.noreply.github.com>
Co-authored-by: Azhar <azhar@L1119.local>
Co-authored-by: JulianRSL <88969792+JulianRSL@users.noreply.github.com>
Co-authored-by: Julian <julian.rassolov@gmail.com>
Co-authored-by: Patrick McCann <patmmccann@gmail.com>
Co-authored-by: Remi Demol <rde@sirdata.fr>
Co-authored-by: Olivier <osazos@adagio.io>
Co-authored-by: Léonard Labat <le.labat@criteo.com>
Co-authored-by: Karim Mourra <karim@jwplayer.com>
Co-authored-by: joseluis laso <jlaso@users.noreply.github.com>
Co-authored-by: wojciech-bialy-wpm <67895844+wojciech-bialy-wpm@users.noreply.github.com>
Co-authored-by: Wojciech Biały <wb@WojciechBialy.local>
Co-authored-by: Prebid.js automated release <prebidjs-release@prebid.org>
Co-authored-by: John Wright <johngeorgewright@users.noreply.github.com>
Co-authored-by: mihaisandu07 <102022853+mihaisandu07@users.noreply.github.com>
Co-authored-by: Tiago Peczenyj <tiago.peczenyj@gmail.com>
Co-authored-by: jkthomas <tom.januszek@gmail.com>
Co-authored-by: Tomasz Januszek <tomasz@teavaro.com>
Co-authored-by: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Co-authored-by: Gena <wertixvost@gmail.com>
Co-authored-by: Love Sharma <sharmak.love@gmail.com>
Co-authored-by: Love Sharma <love.sharma@indexexchange.com>
Co-authored-by: kalidas-alkimi <92875788+kalidas-alkimi@users.noreply.github.com>
Co-authored-by: Alexander Bogdanov <abogdanov@asteriosoft.com>
Co-authored-by: motors <motors@live.ru>
Co-authored-by: Cyprien Pannier <cyprien.pannier@gmail.com>
Co-authored-by: shahinrahbariasl <56240400+shahinrahbariasl@users.noreply.github.com>
Co-authored-by: shahin.rahbariasl <shahin.rahbariasl@indexexchange.com>
Co-authored-by: Viktor Dreiling <34981284+3link@users.noreply.github.com>
Co-authored-by: Viktor Dreiling <viktor@Viktors-MacBook-Pro.fritz.box>
Co-authored-by: Viktor Dreiling <viktor@Viktors-MBP.fritz.box>
Co-authored-by: Hashiomoto <50349637+HashimotoLogly@users.noreply.github.com>
Co-authored-by: Andy Rusiecki <andy.rusiecki@gmail.com>
Co-authored-by: Faisal Islam <93644923+faisalvs@users.noreply.github.com>
Co-authored-by: iosfaisal <100519197+iosfaisal@users.noreply.github.com>
Co-authored-by: Federico Izuel <federicoizuel@gmail.com>
Co-authored-by: Jonathan Nadarajah <50102657+jogury@users.noreply.github.com>
Co-authored-by: Sacha <35510349+thebraveio@users.noreply.github.com>
Co-authored-by: rahulgravito <105201950+rahulgravito@users.noreply.github.com>
Co-authored-by: haruka-yamashita2 <39541428+haruka-yamashita2@users.noreply.github.com>
Co-authored-by: Vikas Srivastava <30315503+visrivastava@users.noreply.github.com>
Co-authored-by: asurovenko-zeta <80847074+asurovenko-zeta@users.noreply.github.com>
Co-authored-by: Surovenko Alexey <surovenko.alexey@gmail.com>
Co-authored-by: Jason Lydon <95770514+ftxmoJason@users.noreply.github.com>
Co-authored-by: Jason Lydon <jason.lydon@flashtalking.com>
Co-authored-by: johnwier <49074029+johnwier@users.noreply.github.com>
Co-authored-by: rajsidhunovatiq <79534312+rajsidhunovatiq@users.noreply.github.com>
Co-authored-by: novatiq <79258366+novatiq@users.noreply.github.com>
Co-authored-by: mmoschovas <63253416+mmoschovas@users.noreply.github.com>
Co-authored-by: Alexander Clouter <alex@coremem.com>
Co-authored-by: Chris Pabst <cpabst@users.noreply.github.com>
Co-authored-by: Maxim Pakhomov <maxim_pakhomov@lineate.com>
Co-authored-by: Maxim Pakhomov <70204615+maximpakhomov@users.noreply.github.com>
Co-authored-by: Bendegúz Ács <30595431+acsbendi@users.noreply.github.com>
Co-authored-by: José Venâncio <45434454+jvnnc@users.noreply.github.com>
Co-authored-by: Jose <jose.silva@navegg.com>
Co-authored-by: mikiz <31058500+mikizi@users.noreply.github.com>
Co-authored-by: Prebid-Team <prebid-team@vertoz.com>
Co-authored-by: Mohit Patil <mohitpatil546@gmail.com>
Co-authored-by: Monis Qadri <monis0395@users.noreply.github.com>
Co-authored-by: monis.q <monis.q@media.net>
Co-authored-by: guiann <guillaume.andouard@adyoulike.com>
Co-authored-by: Catalin Ciocov <catalin.ciocov@gmail.com>
Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
Co-authored-by: Paris Holley <mail@parisholley.com>
Co-authored-by: shubham.si <60253122+shubham-si@users.noreply.github.com>
Co-authored-by: Kanchika - Automatad <kanchika@automatad.com>
Co-authored-by: bretg <bgorsline@gmail.com>
Co-authored-by: Jurij Sinickij <jurij.sinickij@adform.com>
Co-authored-by: Jeremy Sadwith <jeremy@kargo.com>
Co-authored-by: Wei Wong <wwong@kargo.com>
Co-authored-by: Timothy Ace <github.com-1@timothyace.com>
Co-authored-by: Timothy M. Ace <tace@imds.tv>
Co-authored-by: Eugene Vigonny <79149590+EugeneVigonny@users.noreply.github.com>
Co-authored-by: Serhii Holdun <serhiyholdun@gmail.com>
Co-authored-by: Serhii Holdun <sholdun@magnite.com>
Co-authored-by: Marcin Muras <47107445+mmuras@users.noreply.github.com>
Co-authored-by: Peiyuan <106841361+ix-peiyuan@users.noreply.github.com>
Co-authored-by: Nick-Merkle <105746498+Nick-Merkle@users.noreply.github.com>
Co-authored-by: Nick Curry <nick.curry@4cite.com>
Co-authored-by: Abimael Martinez <abijr@users.noreply.github.com>
Co-authored-by: Nic G <nic.gallardo@freestar.io>
Co-authored-by: supadm <98890970+supadm@users.noreply.github.com>
Co-authored-by: sung.chung <sung.chung@admaru.com>
Co-authored-by: Petre Damoc <pdamoc@gmail.com>
Co-authored-by: Malkov Mikhail <mhlmlkv@gmail.com>
Co-authored-by: Yohan Boutin <yohan@seedtag.com>
Co-authored-by: Mark Kuhar <kuharmark@gmail.com>
Co-authored-by: Faisal Islam <faisal.islam@vivacomsolutions.com>
Co-authored-by: jsfledd <jsfledd@users.noreply.github.com>
Co-authored-by: Joshua Fledderjohn <jfledderjohn@nativo.com>
Co-authored-by: JulieLorin <julie@hubvisor.io>
Co-authored-by: Rocco Barbini <46724608+rbarbini-ias@users.noreply.github.com>
Co-authored-by: nkloeber <100145701+nkloeber@users.noreply.github.com>
Co-authored-by: Salomon Rada <salomon@gamoshi.com>
Co-authored-by: robdubois <53589945+robdubois@users.noreply.github.com>
Co-authored-by: sumit116 <sharmasumit116@gmail.com>
Co-authored-by: nwlosinski <norbert.wlosinski@gmail.com>
Co-authored-by: Mike Chowla <mike.chowla@pubmatic.com>
Co-authored-by: Bret Gorsline <bgorsline@rubiconproject.com>
Co-authored-by: Artem Seryak <artem.seryak@umbrellait.com>
Co-authored-by: Jonathan Mullins <mondojono@gmail.com>
Co-authored-by: htang555 <htang555@gmail.com>
Co-authored-by: Bryan DeLong <ananon@gmail.com>
Co-authored-by: dpapworth-qc <50959025+dpapworth-qc@users.noreply.github.com>
Co-authored-by: DeepthiNeeladri <deepthi.sravanaqa@gmail.com>
Co-authored-by: Harshad Mane <harshad.mane@pubmatic.com>
Co-authored-by: Roman <thecyric@gmail.com>
Co-authored-by: Neelanjan Sen <14229985+Fawke@users.noreply.github.com>
Co-authored-by: Margaret Liu <margs.liu@gmail.com>
Co-authored-by: TJ Eastmond <tj.eastmond@gmail.com>
Co-authored-by: Jason Snellbaker <jsnellbaker@appnexus.com>
Co-authored-by: JonGoSonobi <jgo@sonobi.com>
Co-authored-by: Vladimir Fedoseev <vl.fedoseev@gmail.com>
Co-authored-by: DJ Rosenbaum <djrosenbaum@gmail.com>
Co-authored-by: Alex Khmelnitsky <alexkh13@gmail.com>
Co-authored-by: adxpremium <55161519+adxpremium@users.noreply.github.com>
Co-authored-by: Jimmy Tu <jimee02@users.noreply.github.com>
Co-authored-by: Pierre-Antoine Durgeat <pa.durgeat@adventori.com>
Co-authored-by: Eric Harper <eharper@rubiconproject.com>
Co-authored-by: Telaria Engineering <36203956+telariaEng@users.noreply.github.com>
Co-authored-by: ujuettner <udo.juettner@gmail.com>
Co-authored-by: Dan Bogdan <43830380+EMXDigital@users.noreply.github.com>
Co-authored-by: PWyrembak <paul@trustx.org>
Co-authored-by: susyt <susan@fox.camp>
Co-authored-by: Max Crawford <mrcrawfo@gmail.com>
Co-authored-by: Pascal S <pascal.salesch@yieldlove.de>
Co-authored-by: Will Chapin <wrchapin@gmail.com>
Co-authored-by: Lemma Dev <54662130+lemmadev@users.noreply.github.com>
Co-authored-by: Denis Logachov <denis@adkernel.com>
Co-authored-by: onlsol <48312668+onlsol@users.noreply.github.com>
Co-authored-by: Paul Yang <pyang@conversantmedia.com>
Co-authored-by: Matt Kendall <1870166+mkendall07@users.noreply.github.com>
Co-authored-by: Mike Sperone <mike@mikesperone.com>
Co-authored-by: sdbaron <sergeydaub@gmail.com>
Co-authored-by: djaxbidder <55269794+djaxbidder@users.noreply.github.com>
Co-authored-by: turktelssp <54801433+turktelssp@users.noreply.github.com>
Co-authored-by: nkmt <45026101+strong-zero@users.noreply.github.com>
Co-authored-by: Mutasem Aldmour <mutdmour@gmail.com>
Co-authored-by: r-schweitzer <50628828+r-schweitzer@users.noreply.github.com>
Co-authored-by: Isaac A. Dettman <idettman@rubiconproject.com>
Co-authored-by: Adasta Media <55529969+Adasta2019@users.noreply.github.com>
Co-authored-by: mamatic <52153441+mamatic@users.noreply.github.com>
Co-authored-by: Konduit <55142865+konduit-dev@users.noreply.github.com>
Co-authored-by: TinchoF <50110327+TinchoF@users.noreply.github.com>
Co-authored-by: Jaimin Panchal <7393273+jaiminpanchal27@users.noreply.github.com>
Co-authored-by: Jaimin Panchal <email@example.com>
Co-authored-by: Sergio <sergio.anru@gmail.com>
Co-authored-by: Wayne Yang <Wayneyang2@gmail.com>
Co-authored-by: Cody Bonney <me@codybonney.com>
Co-authored-by: evanmsmrtb <evanm@smrtb.com>
Co-authored-by: hdeodhar <35999856+hdeodhar@users.noreply.github.com>
Co-authored-by: Oz Weiss <thewizarodofoz@gmail.com>
Co-authored-by: Janko Ulaga <janko.ulaga@gmail.com>
Co-authored-by: thomas-33across <44033452+thomas-33across@users.noreply.github.com>
Co-authored-by: Finteza Analytics <45741245+finteza@users.noreply.github.com>
Co-authored-by: Vadim Mazzherin <vadim.mazzherin@gmail.com>
Co-authored-by: Hendrik Iseke <39734979+hiseke@users.noreply.github.com>
Co-authored-by: Anand Venkatraman <avenkatraman@pulsepoint.com>
Co-authored-by: Eyas Ranjous <eyas.ranjous@gmail.com>
Co-authored-by: Michael <madma@users.noreply.github.com>
Co-authored-by: hbanalytics <55453525+hbanalytics@users.noreply.github.com>
Co-authored-by: Index Exchange 3 Prebid Team <pdu-supply-prebid@indexexchange.com>
Co-authored-by: Michael Kuryshev <mk0x9@users.noreply.github.com>
Co-authored-by: Roffray <gv@vuble.tv>
Co-authored-by: rumesh <rumesh@users.noreply.github.com>
Co-authored-by: oasis <2394426+bmwcmw@users.noreply.github.com>
Co-authored-by: Nepomuk Seiler <muuki88@users.noreply.github.com>
Co-authored-by: John Salis <jsalis531@gmail.com>
Co-authored-by: OneTagDevOps <38786435+OneTagDevOps@users.noreply.github.com>
Co-authored-by: Ankit Prakash <aprakash@sovrn.com>
Co-authored-by: Dan <webmaster@kakao-karten.de>
Co-authored-by: romanantropov <45817046+romanantropov@users.noreply.github.com>
Co-authored-by: msm0504 <51493331+msm0504@users.noreply.github.com>
Co-authored-by: vrtcal-dev <50931150+vrtcal-dev@users.noreply.github.com>
Co-authored-by: colbertk <50499465+colbertk@users.noreply.github.com>
Co-authored-by: Steve Alliance <steve.alliance@gmail.com>
Co-authored-by: bjorn-lw <32431346+bjorn-lw@users.noreply.github.com>
Co-authored-by: 7XBID00 <52267720+7XBID00@users.noreply.github.com>
Co-authored-by: Tomas Kovtun <bratrahim@gmail.com>
Co-authored-by: Jonathan Mullins <jonathan.mullins@playgroundxyz.com>
Co-authored-by: ucfunnel <39581136+ucfunnel@users.noreply.github.com>
Co-authored-by: ACannuniRP <57228257+ACannuniRP@users.noreply.github.com>
Co-authored-by: Hugo Duthil <hugo.duthil@gmail.com>
Co-authored-by: skazedo <skazedo@users.noreply.github.com>
Co-authored-by: 胡雨軒 Петр <piotr-yuxuan@users.noreply.github.com>
Co-authored-by: Konrad Dulemba <konrad@dulemba.me>
Co-authored-by: Mariya Mego <31904600+mash-a@users.noreply.github.com>
Co-authored-by: Daniel Cassidy <mail@danielcassidy.me.uk>
Co-authored-by: kpis-msa <50609476+kpis-msa@users.noreply.github.com>
Co-authored-by: omerBrowsi <54346241+omerBrowsi@users.noreply.github.com>
Co-authored-by: Marcian123 <qgrudziaz@gmail.com>
Co-authored-by: koji-eguchi <50477903+koji-eguchi@users.noreply.github.com>
Co-authored-by: sourabhg <sourabhg@users.noreply.github.com>
Co-authored-by: Alexis Andrieu <andrieu.alexis@hotmail.com>
Co-authored-by: Vlad Gurgov <vlad.gurgov@gmail.com>
Co-authored-by: Richard Lee <14349+dlackty@users.noreply.github.com>
Co-authored-by: Alex <eduard.cozma@gmail.com>
Co-authored-by: Vladislav Yatsun <vyatsun@gmail.com>
Co-authored-by: vincentproxistore <56686565+vincentproxistore@users.noreply.github.com>
Co-authored-by: Rich Snapp <richard.snapp@rakuten.com>
Co-authored-by: Rade Popovic <32302052+nanointeractive@users.noreply.github.com>
Co-authored-by: Matt Quirion <matt.quirion@gmail.com>
Co-authored-by: rhythmonebhaines <49991465+rhythmonebhaines@users.noreply.github.com>
Co-authored-by: binoy-chitale <binoy.c@media.net>
Co-authored-by: Alex Pashkov <alexpashkov123@gmail.com>
Co-authored-by: harpere <ericsbiz@yahoo.com>
Co-authored-by: Scott <smenzer@gmail.com>
Co-authored-by: tadam75 <adam.thomas@live.fr>
Co-authored-by: Veronica Kim <43146383+vkimcm@users.noreply.github.com>
Co-authored-by: songtungmtp <57524426+songtungmtp@users.noreply.github.com>
Co-authored-by: z-sunshine <33084773+z-sunshine@users.noreply.github.com>
Co-authored-by: Sander <sander@adhese.eu>
Co-authored-by: Moshe Moses <moses@gamoshi.com>
Co-authored-by: Ignat Khaylov <ignat@ignat.one>
Co-authored-by: Ignat Khaylov <ignat@Ignats-MacBook-Pro.local>
Co-authored-by: Bill Newman <huddled.masses1650@gmail.com>
Co-authored-by: Vladislav Isaiko <vladis@smartyads.com>
Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>
Co-authored-by: Mykhailo Yaremchuk <m.yaremchuk@smartyads.com>
Co-authored-by: Saveliev Taras <t.savelev@gmail.com>
Co-authored-by: Taras Saveliev <t-saveliev@yandex-team.ru>
Co-authored-by: Viktor Dreiling <viktor@Viktors-MBP.localdomain>
Co-authored-by: SmartyAdman <59048845+SmartyAdman@users.noreply.github.com>
Co-authored-by: minoru katogi <mkatogi@gmail.com>
Co-authored-by: minoru katogi <m_katogi@hotmail.com>
Co-authored-by: ADman Media <admanmedia@users.noreply.github.com>
Co-authored-by: SmartyAdman <adman@localhost.localdomain>
Co-authored-by: EddieYu <32135564+eddieyu1998@users.noreply.github.com>
Co-authored-by: SeedingAllianceTech <55976067+SeedingAllianceTech@users.noreply.github.com>
Co-authored-by: Jonas Hilsen <hilsen@seeding-alliance.de>
Co-authored-by: llays <llays@users.noreply.github.com>
Co-authored-by: Andrew Lays <andrew@mediawayss.com>
Co-authored-by: Jason Piros <jasonpiros@gmail.com>
Co-authored-by: duancg <cduan@distroscale.com>
Co-authored-by: Gabriel Chicoye <gabriel.chicoye@gmail.com>
Co-authored-by: Marcin Grzebyk <35067477+marcin15g@users.noreply.github.com>
Co-authored-by: nllerandi3lift <75995508+nllerandi3lift@users.noreply.github.com>
Co-authored-by: Dan Goldin <dgoldin@triplelift.com>
Co-authored-by: Oleg Romanenko <oleg@romanenko.ro>
Co-authored-by: Grzegorz Sroka <gsroka@gmail.com>
Co-authored-by: olafbuitelaar <olaf.buitelaar@gmail.com>
Co-authored-by: matt-vib <43612013+matt-vib@users.noreply.github.com>
Co-authored-by: Mikhail Ivanchenko <mihail.ivanchenko@nextmillennium.io>
Co-authored-by: puhiza-d <103563100+puhiza-d@users.noreply.github.com>
Co-authored-by: ramyferjaniadot <90328697+ramyferjaniadot@users.noreply.github.com>
Co-authored-by: Audiencerun <57719351+audiencerun@users.noreply.github.com>
Co-authored-by: anastasya123 <89073753+anastasya123@users.noreply.github.com>
Co-authored-by: kapil-tuptewar <91458408+kapil-tuptewar@users.noreply.github.com>
Co-authored-by: Kapil Tuptewar <kapiltuptewar@L1290.local>
Co-authored-by: Benoit Liabastre <b.liabastre@gmail.com>
Co-authored-by: thomasferal <thomas.feral@adomik.com>
Co-authored-by: Thuy Hoang <61451682+thuyhq@users.noreply.github.com>
Co-authored-by: Regulyarniy Nikolay <regularniy@gmail.com>
Co-authored-by: Aleksandr Štšepelin <as@jp.ee>
Co-authored-by: e-volution-tech <61746103+e-volution-tech@users.noreply.github.com>
Co-authored-by: mobfxoHB <74364234+mobfxoHB@users.noreply.github.com>
Co-authored-by: Teddy Pierre <33702256+pierreted90@users.noreply.github.com>
Co-authored-by: liliana-sortable <liliana@sortable.com>
Co-authored-by: Deepthi Neeladri Sravana <dsravana@UNKNOWN-172-154-7-X.yahoo.com>
Co-authored-by: Deepthi Neeladri Sravana <dsravana@rav1-1-gci-pool-general-10-87-131-88.corp.yahoo.com>
Co-authored-by: Deepthi Neeladri Sravana <dsravana@UNKNOWN-172-142-163-X.yahoo.com>
Co-authored-by: Deepthi Neeladri Sravana <dsravana@rav1-1-gci-pool-general-10-87-131-52.corp.yahoo.com>
Co-authored-by: Deepthi Neeladri Sravana <dsravana@C02VH0WGHTDG.local>
Co-authored-by: Deepthi Neeladri Sravana <dsravana@UNKNOWN-172-142-176-X.yahoo.com>
Co-authored-by: Deepthi Neeladri Sravana <dsravana@rav1-1-gci-pool-general-10-87-128-108.corp.yahoo.com>
Co-authored-by: Deepthi Neeladri Sravana <dsravana@rav1-1-gci-pool-general-10-87-140-151.corp.yahoo.com>
Co-authored-by: Deepthi Neeladri Sravana <dsravana@UNKNOWN-172-131-170-X.yahoo.com>
Co-authored-by: Deepthi Neeladri Sravana <dsravana@vpn-pool-142-186-126.snv.office.oath>
Co-authored-by: dsravana <deepthi.neeladri.sravana@verizonmedia.com>
Co-authored-by: Patrick Loughrey <patrickloughrey@patrickhreysmbp.mynetworksettings.com>
Co-authored-by: Patrick Loughrey <ploughrey@triplelift.com>
Co-authored-by: gbalboa0 <gbalboa@triplelift.com>
Co-authored-by: gbalboa0 <47567497+gbalboa0@users.noreply.github.com>
Co-authored-by: Michael Ermer <michael.ermer@ermer.de>
Co-authored-by: Espen <2290914+espen-j@users.noreply.github.com>
Co-authored-by: Vladyslav Laktionov <vlad.progers@gmail.com>
Co-authored-by: vlad <vlaktionov@decenterads.com>
Co-authored-by: DmitriyMishutin <105477277+DmitriyMishutin@users.noreply.github.com>
Co-authored-by: Dmitriy Mishutin <dmitriy.mishutin@cxense.com>
Co-authored-by: Florent DANCY <florent@dancy.io>
Co-authored-by: Philip Watson <philip.watson@adscale.co.nz>
Co-authored-by: Tachfine <t.elbelky@criteo.com>
Co-authored-by: Soni-Goyal <mailtosonigoyal@gmail.com>
Co-authored-by: Soni Goyal <soni.goyal@blueconic.com>
Co-authored-by: ffqs <47789178+ffqs@users.noreply.github.com>
Co-authored-by: lasloche <62240785+lasloche@users.noreply.github.com>
Co-authored-by: mihanikw2g <92710748+mihanikw2g@users.noreply.github.com>
Co-authored-by: Nikulin Mikhail <mnikulin@asteriosoft.com>
Co-authored-by: adquery <89853721+adquery@users.noreply.github.com>
Co-authored-by: m.czerwiak <marcin.czerwiak@azagroup.eu>
Co-authored-by: annavane <101708287+annavane@users.noreply.github.com>
Co-authored-by: AzureAD\AnnaVane <anna.vane@thenewco.com>
Co-authored-by: micheletnc <michele.milani@thenewco.it>
Co-authored-by: Naveen <172697+naveensrinivasan@users.noreply.github.com>
Co-authored-by: Noam Tzuberi <noamtzu@users.noreply.github.com>
Co-authored-by: Noam Tzuberi <noam.tzuberi@ironsrc.com>
Co-authored-by: Laslo Chechur <laslo.chechur@ironsrc.com>
Co-authored-by: OronW <41260031+OronW@users.noreply.github.com>
Co-authored-by: Hendrick Musche <107099114+sag-henmus@users.noreply.github.com>
Co-authored-by: TWrightSovrn <107207106+TWrightSovrn@users.noreply.github.com>
Co-authored-by: victorlassomarketing <103455651+victorlassomarketing@users.noreply.github.com>
Co-authored-by: anthonyjl92 <anthonyjl92@gmail.com>
Co-authored-by: Anthony Lin <anthony.lin@33across.com>
Co-authored-by: John Ivan Bauzon <johnbauzon@gmail.com>
Co-authored-by: Lisa Benmore <lbenmore@gmail.com>
Co-authored-by: John Bauzon <john.bauzon@gumgum.com>
Co-authored-by: kyoya-takei <kyoya-takei@dac.co.jp>
Co-authored-by: yuu.t <tongyu24@hotmail.com>
Co-authored-by: Yu Tong <y.tong@yieldlab.de>
Co-authored-by: ym-ainiguez <89419575+ym-ainiguez@users.noreply.github.com>
Co-authored-by: DianomiJH <84312830+DianomiJH@users.noreply.github.com>
Co-authored-by: Michael Stevens <michael.stevens@dianomi.com>
Co-authored-by: Chris Almeida-Symons <chris@Chriss-MacBook-Pro.local>
Co-authored-by: Martin Hill <martin.hill@gmail.com>
Co-authored-by: readpeaktuomo <66239046+readpeaktuomo@users.noreply.github.com>
Co-authored-by: Serhii Kozlov <serhii@shinez.io>
Co-authored-by: StalmIlya <102592784+StalmIlya@users.noreply.github.com>
Co-authored-by: Ilya Stalmahov <ilya_stalmahov@lineate.com>
Co-authored-by: Brian Schmidt <brian.schmidt@openx.com>
Co-authored-by: jessoventes <82361050+jessoventes@users.noreply.github.com>
Co-authored-by: Andy Rusiecki <andy@kargo.com>
Co-authored-by: Ubuntu <ubuntu@ip-172-31-25-92.us-west-1.compute.internal>
Co-authored-by: relaido <63339139+relaido@users.noreply.github.com>
Co-authored-by: ishigami_shingo <s.ishigami@relaido.co.jp>
Co-authored-by: cmertv-sishigami <s.ishigami@cmertv.com>
Co-authored-by: t_bun <t.bun@cmertv.com>
Co-authored-by: n.maeura <n.maeura@cmertv.com>
Co-authored-by: ccorbo <ccorbo2013@gmail.com>
Co-authored-by: Chris Corbo <chris.corbo@indexexchange.com>
Co-authored-by: jennylt <48404417+jennylt@users.noreply.github.com>
Co-authored-by: Michael <michael.ziso@taboola.com>
Co-authored-by: Mathieu Pheulpin <mpheulpin@sharethrough.com>
Co-authored-by: ako-adot <90328748+ako-adot@users.noreply.github.com>
Co-authored-by: eknis <tem.eknis@gmail.com>
Co-authored-by: Keisuke Kakinuma <keisuke.kakinuma@supership.jp>
Co-authored-by: Prebid-bydata <71428180+Prebid-bydata@users.noreply.github.com>
Co-authored-by: Jitendra-quizlet <jitendra.kumar@quizlet.com>
Co-authored-by: TM <tomasz.mielcarz@gmail.com>
Co-authored-by: Tomasz Mielcarz <tomasz.mielcarz@adrino.pl>
Co-authored-by: Mikael Lundin <mikael-lundin@users.noreply.github.com>
Co-authored-by: fndigrazia <digrazia.nicolas@gmail.com>
Co-authored-by: Phaneendra Hegde <pnhegde@users.noreply.github.com>
Co-authored-by: Phaneendra Hegde <phaneendra@pubx.ai>
Co-authored-by: newspassid-prebid <107485317+newspassid-prebid@users.noreply.github.com>
Co-authored-by: JacobKlein26 <42449375+JacobKlein26@users.noreply.github.com>
Co-authored-by: wsusrasp <106743463+wsusrasp@users.noreply.github.com>
Co-authored-by: skoklowski <slawomir.koklowski@dreamlab.pl>
Co-authored-by: Anass Seddiki <bwh.anass@gmail.com>
Co-authored-by: Thomas <thomas.dseao@gmail.com>
Co-authored-by: sag-jonhil <78849369+sag-jonhil@users.noreply.github.com>
Co-authored-by: Hendrick Musche <musche@seeding-alliance.de>
Co-authored-by: rimaburder-index <55195208+rimaburder-index@users.noreply.github.com>
Co-authored-by: samous <samuel.kerboeuf@gmail.com>
Co-authored-by: Niass <cheroubawan@hotmail.fr>
Co-authored-by: Samous <samuel@bliink.io>
Co-authored-by: Dejan Grbavcic <grajzer@users.noreply.github.com>
Co-authored-by: Anass Seddiki <anass.seddiki@1plusx.com>
Co-authored-by: onetag-dev <38786435+onetag-dev@users.noreply.github.com>
Co-authored-by: federico <f.liccione@onetag.com>
Co-authored-by: vfourny <109095331+vfourny-ogury@users.noreply.github.com>
Co-authored-by: Michele Nasti <musikele@users.noreply.github.com>
Co-authored-by: Michele Nasti <michele@rtk.io>
Co-authored-by: yieldlift <61510052+yieldlift@users.noreply.github.com>
Co-authored-by: Danijel Predarski <danijel.p@whitecitysoft.com>
Co-authored-by: Kenan Gillet <1706856+kenan-gillet@users.noreply.github.com>
Co-authored-by: Jared <jared.montalbo@flashtalking.com>
Co-authored-by: Skylinar <53079123+Skylinar@users.noreply.github.com>
Co-authored-by: smartclip AdTechnology <adtech@smartclip.com>
Co-authored-by: Gino Cirlini <adtech@smartclip.tv>
Co-authored-by: Sławomir Kokłowski <38455696+skoklowski@users.noreply.github.com>
---
 modules/permutiveRtdProvider.md | 125 ++++++++++++++++++++++++++------
 1 file changed, 102 insertions(+), 23 deletions(-)

diff --git a/modules/permutiveRtdProvider.md b/modules/permutiveRtdProvider.md
index 5fa6e14a474..f99389f82cc 100644
--- a/modules/permutiveRtdProvider.md
+++ b/modules/permutiveRtdProvider.md
@@ -1,9 +1,10 @@
-# Permutive Real-time Data Submodule
+## Prebid Config for Permutive RTD Module
 
-This submodule reads cohorts from Permutive and attaches them as targeting keys to bid requests. Using this module will deliver best targeting results, leveraging Permutive's real-time segmentation and modelling capabilities.
+This module reads cohorts from Permutive and attaches them as targeting keys to bid requests.
 
-## Usage
+### _Permutive Real-time Data Submodule_
 
+#### Usage
 Compile the Permutive RTD module into your Prebid build:
 
 ```
@@ -31,26 +32,13 @@ pbjs.setConfig({
 })
 ```
 
-## Supported Bidders
+#### Parameters
 
-The Permutive RTD module sets Audience Connector cohorts as bidder-specific `ortb2.user.data` first-party data, following the Prebid `ortb2` convention, for any bidder included in `acBidders`. The module also supports bidder-specific data locations per ad unit (custom parameters) for the below bidders:
-
-| Bidder  | ID         | Custom Cohorts | Audience Connector |
-| ------- | ---------- | -------------- | ------------------ |
-| Xandr   | `appnexus` | Yes            | Yes                |
-| Magnite | `rubicon`  | Yes            | No                 |
-| Ozone   | `ozone`    | No             | Yes                |
-
-Key-values details for custom parameters:
-
-- **Custom Cohorts:** When enabling the respective Activation for a cohort in Permutive, this module will automatically attach that cohort ID to the bid request. There is no need to enable individual bidders in the module configuration, it will automatically reflect which SSP integrations you have enabled in your Permutive dashboard. Permutive cohorts will be sent in the `permutive` key-value.
-
-- **Audience Connector:** You'll need to define which bidders should receive Audience Connector cohorts. You need to include the `ID` of any bidder in the `acBidders` array. Audience Connector cohorts will be sent in the `p_standard` key-value.
-
-## Parameters
+The parameters below provide configurability for general behaviours of the RTD submodule,
+as well as enabling settings for specific use cases mentioned above (e.g. acbidders).
 
 | Name                   | Type     | Description                                                                                   | Default |
-| ---------------------- | -------- | --------------------------------------------------------------------------------------------- | ------- |
+|------------------------|----------|-----------------------------------------------------------------------------------------------|---------|
 | name                   | String   | This should always be `permutive`                                                             | -       |
 | waitForIt              | Boolean  | Should be `true` if there's an `auctionDelay` defined (optional)                              | `false` |
 | params                 | Object   |                                                                                               | -       |
@@ -58,12 +46,103 @@ Key-values details for custom parameters:
 | params.maxSegs         | Integer  | Maximum number of cohorts to be included in either the `permutive` or `p_standard` key-value. | `500`   |
 | params.transformations | Object[] | An array of configurations for ORTB2 user data transformations                                |         |
 
-### The `transformations` parameter
+##### The `transformations` parameter
 
 This array contains configurations for transformations we'll apply to the Permutive object in the ORTB2 `user.data` array. The results of these transformations will be appended to the `user.data` array that's attached to ORTB2 bid requests.
 
-#### Supported transformations
+##### Supported transformations
 
 | Name           | ID  | Config structure                                  | Description                                                                          |
-| -------------- | --- | ------------------------------------------------- | ------------------------------------------------------------------------------------ |
+|----------------|-----|---------------------------------------------------|--------------------------------------------------------------------------------------|
 | IAB taxonomies | iab | { segtax: number, iabIds: Object<number, number>} | Transform segment IDs from Permutive to IAB (note: alpha version, subject to change) |
+
+#### Context
+
+Permutive is not listed as a TCF vendor as all data collection is on behalf of the publisher and based on consent the publisher has received from the user.
+Rather than through the TCF framework, this consent is provided to Permutive when the user gives the relevant permissions on the publisher website which allow the Permutive SDK to run.
+This means that if GDPR enforcement is configured _and_ the user consent isn’t given for Permutive to fire, no cohorts will populate.
+As Prebid utilizes TCF vendor consent, for the Permutive RTD module to load, Permutive needs to be labeled within the Vendor Exceptions
+
+#### Instructions
+
+1. Publisher enables GDPR rules within Prebid.
+2. Label Permutive as an exception, as shown below.
+```javascript
+[
+  {
+    purpose: 'storage',
+    enforcePurpose: true,
+    enforceVendor: true,
+    vendorExceptions: ["permutive"]
+  },
+  {
+    purpose: 'basicAds',
+    enforcePurpose: true,
+    enforceVendor: true,
+    vendorExceptions: []
+  }
+]
+```
+
+Before making any updates to this configuration, please ensure that this approach aligns with internal policies and current regulations regarding consent.
+
+## Cohort Activation with Permutive RTD Module
+
+### _Enabling Standard Cohorts_
+
+**Note**: Publishers must be enabled on the above Permutive RTD Submodule to enable Standard Cohorts.
+
+The acbidders config in the Permutive RTD module allows publishers to determine which demand partners (SSPs) will receive standard cohorts via the <u>user.data</u> ortb2 object. Cohorts will be sent in the `p_standard` key-value.
+
+The Permutive RTD module sets standard cohort IDs as bidder-specific ortb2.user.data first-party data, following the Prebid ortb2 convention.
+
+There are **two** ways to assign which demand partner bidders (e.g. SSPs) will receive Standard Cohort information via the Audience Connector (acbidders) config:
+
+#### Option 1 - Automated
+
+New demand partner bidders may be added to the acbidders config directly within the Permutive Platform.
+
+**Permutive can do this on your behalf**. Simply contact your Permutive CSM with strategicpartnershipops@permutive.com on cc,
+indicating which bidders you would like added.
+
+Or, a publisher may do this themselves within the UI using the below instructions.
+
+##### Create Integration
+
+In order to update acbidders via the Permutive dashboard,
+it is necessary to first enable the prebid integration in the integrations page (settings).
+
+**Note on Revenue Insights:** The prebid integration includes a feature for revenue insights,
+which is not required for the purpose of updating acbidders config.
+Please see [this document](https://support.permutive.com/hc/en-us/articles/360019044079-Revenue-Insights) for more information about revenue insights.
+
+##### Update acbidders
+
+The input for the “Data Provider config” is currently a multi-input free text.
+A valid “bidder code” needs to be entered in order to enable Standard Cohorts to be passed to the desired partner.
+The [prebid Bidders page](https://docs.prebid.org/dev-docs/bidders.html) contains instructions and a link to a list of possible bidder codes.
+
+Acbidders can be added or removed from the list using this feature, however, this will not impact any acbidders that have been applied using the manual method below.
+
+#### Option 2 - Manual
+
+As a secondary option, new demand partner bidders may be added manually.
+
+To do so, a Publisher may define which bidders should receive Standard Cohorts by
+including the _bidder code_ of any bidder in the `acBidders` array.
+
+**Note:** If a Publisher ever needs to remove a manually-added bidder, the bidder will also need to be removed manually.
+
+### _Enabling Custom Cohort IDs for Targeting_
+
+Separately from Standard Cohorts - The Permutive RTD module also supports passing any of the **custom** cohorts created in the dashboard to some SSP partners for targeting
+e.g. setting up publisher deals. For these activations, cohort IDs are set in bidder-specific locations per ad unit (custom parameters).
+
+Currently, bidders with known support for custom cohort targeting are:
+
+- Xandr
+- Magnite
+
+When enabling the respective Activation for a cohort in Permutive, this module will automatically attach that cohort ID to the bid request.
+There is no need to enable individual bidders in the module configuration, it will automatically reflect which SSP integrations you have enabled in your Permutive dashboard.
+Permutive cohorts will be sent in the permutive key-value.

From d06bdad3d6644b285e6aed1a6505fe6aec37d6c8 Mon Sep 17 00:00:00 2001
From: Michele Nasti <musikele@users.noreply.github.com>
Date: Tue, 26 Jul 2022 15:15:53 +0200
Subject: [PATCH 075/569] Prebid Core: switch native assets to ortb2 format
 (#8086)

* switch native assets to ortb2 format

* put rendererUrl, adTemplate back in message

* rename ortb2 to ortb

* typo fix

* changes to support ortb for native media type

* handle bid won case

* mark bid as won on any post message for native

* fix tests for bid_won event for native

* add missing imports

* native converting functions

* convert new native ortb media type object to proprietary format for native bidders

* fix LGTM.com issue

* added comments; minor fixes

* added test for convertOrtbRequestToProprietaryNative + fixes

* add nativeParams to conversion

* support nativeParams

* check that when native.ortb is present, it's the only property

* remove commented code

* removed unnecessary tests

* added test that checks that BID_WON is not fired more than once for the same adId

* validation is now performed on ortb data only

* fix for prebidServer_native_example.html

* PrebidServerBidAdapter also responds in ortb format

* fix aspect_ratios as an array in tests

* LGTM fix - remove unused variables

* Better name for native constants

* use WeakSet instead of Set

* when native request is openRTB, the whole native.ortb is passed over

* retain some defaults dor native PBS request

* fix for empty ortbRequest in nativeBidIsValid

* add non-asset properties to media type object

* final fixes after rebasing

* handle tracking of soon-deprecated ortb imptrackers and jstracker

* let native ad unit take all horizontal space

* pass "mapping" from legacy native to ortb to prebid universal creative

* Convert ortb assets to legacy for backward compatibility with legacy templates

* add ortb conversion for more bid adapters

* wrap conversion function in FEATURES.NATIVE

* remove expired bids from native wrapper

* instead of modifying bidresponse, use nativeReq

* wrap test in FEATURES.NATIVE

* fix for native mapping in prebidServerBidAdapter

* use copy-on-write to convert ortb requests to legacy

* fix comment on function

* Update criteoBidAdapter.js

Co-authored-by: Filip Stamenkovic <ficadub@gmail.com>
Co-authored-by: Michele Nasti <michele@rtk.io>
Co-authored-by: Patrick McCann <patmmccann@gmail.com>
---
 .../gpt/prebidServer_native_example.html      |   4 +-
 modules/ablidaBidAdapter.js                   |   4 +
 modules/adagioBidAdapter.js                   |   4 +
 modules/adbookpspBidAdapter.js                |   4 +
 modules/adfBidAdapter.js                      |   4 +
 modules/adgenerationBidAdapter.js             |   3 +
 modules/adkernelBidAdapter.js                 |   4 +
 modules/admanBidAdapter.js                    |   4 +
 modules/admixerBidAdapter.js                  |   4 +
 modules/adnowBidAdapter.js                    |   4 +
 modules/adotBidAdapter.js                     |   3 +
 modules/adprimeBidAdapter.js                  |   4 +
 modules/adrelevantisBidAdapter.js             |   4 +
 modules/adrinoBidAdapter.js                   |   3 +
 modules/adtrueBidAdapter.js                   |   4 +
 modules/aduptechBidAdapter.js                 |   4 +
 modules/adxcgBidAdapter.js                    |   4 +
 modules/adyoulikeBidAdapter.js                |   3 +
 modules/ajaBidAdapter.js                      |   4 +
 modules/appnexusBidAdapter.js                 |   4 +
 modules/apstreamBidAdapter.js                 |   3 +
 modules/bidscubeBidAdapter.js                 |   4 +
 modules/bizzclickBidAdapter.js                |   4 +
 modules/boldwinBidAdapter.js                  |   4 +
 modules/braveBidAdapter.js                    |   4 +
 modules/bridgewellBidAdapter.js               |   4 +
 modules/buzzoolaBidAdapter.js                 |   4 +
 modules/clickforceBidAdapter.js               |   4 +
 modules/colossussspBidAdapter.js              |   4 +
 modules/compassBidAdapter.js                  |   4 +
 modules/contentexchangeBidAdapter.js          |   4 +
 modules/craftBidAdapter.js                    |   4 +
 modules/criteoBidAdapter.js                   |   4 +
 modules/dailyhuntBidAdapter.js                |   4 +
 modules/datablocksBidAdapter.js               |   4 +
 modules/dianomiBidAdapter.js                  |   3 +
 modules/e_volutionBidAdapter.js               |   4 +
 modules/engageyaBidAdapter.js                 |   5 +
 modules/finativeBidAdapter.js                 |   3 +
 modules/goldbachBidAdapter.js                 |   4 +
 modules/gothamadsBidAdapter.js                |   4 +
 modules/growadvertisingBidAdapter.js          |   4 +
 modules/improvedigitalBidAdapter.js           |   4 +
 modules/iqzoneBidAdapter.js                   |   4 +
 modules/ixBidAdapter.js                       |   3 +
 modules/krushmediaBidAdapter.js               |   4 +
 modules/livewrappedBidAdapter.js              |   4 +
 modules/loganBidAdapter.js                    |   4 +
 modules/logicadBidAdapter.js                  |   4 +
 modules/loglyliftBidAdapter.js                |   4 +
 modules/lunamediahbBidAdapter.js              |   4 +
 modules/mathildeadsBidAdapter.js              |   4 +
 modules/mediaforceBidAdapter.js               |   4 +
 modules/mediafuseBidAdapter.js                |   3 +
 modules/mediakeysBidAdapter.js                |   4 +
 modules/medianetBidAdapter.js                 |   4 +
 modules/mediasquareBidAdapter.js              |   4 +
 modules/mgidBidAdapter.js                     |   4 +
 modules/microadBidAdapter.js                  |   4 +
 modules/mobfoxpbBidAdapter.js                 |   3 +
 modules/my6senseBidAdapter.js                 |   4 +
 modules/nextrollBidAdapter.js                 |   3 +
 modules/operaadsBidAdapter.js                 |   4 +
 modules/orbidderBidAdapter.js                 |   4 +
 modules/outbrainBidAdapter.js                 |   3 +
 modules/ozoneBidAdapter.js                    |   4 +
 modules/prebidServerBidAdapter/index.js       | 129 ++--
 modules/pubmaticBidAdapter.js                 |   3 +
 modules/pubwiseBidAdapter.js                  |   4 +
 modules/pulsepointBidAdapter.js               |   4 +
 modules/readpeakBidAdapter.js                 |   4 +
 modules/revcontentBidAdapter.js               |   4 +
 modules/rtbhouseBidAdapter.js                 |   4 +
 modules/seedingAllianceBidAdapter.js          |   4 +
 modules/smarthubBidAdapter.js                 |   3 +
 modules/smartyadsBidAdapter.js                |   4 +
 modules/sspBCBidAdapter.js                    |   4 +
 modules/talkadsBidAdapter.js                  |   3 +
 modules/temedyaBidAdapter.js                  |   4 +
 modules/theAdxBidAdapter.js                   |   4 +
 modules/trafficgateBidAdapter.js              |   3 +
 modules/ucfunnelBidAdapter.js                 |   4 +
 modules/ventesBidAdapter.js                   |   4 +
 modules/vibrantmediaBidAdapter.js             |   4 +
 modules/videoheroesBidAdapter.js              |   3 +
 modules/yieldlabBidAdapter.js                 |   4 +
 src/constants.json                            |  52 +-
 src/native.js                                 | 504 ++++++++++++++-
 src/prebid.js                                 |  10 +
 src/secureCreatives.js                        |  17 +-
 .../modules/prebidServerBidAdapter_spec.js    | 272 +++++---
 test/spec/native_spec.js                      | 587 +++++++++++++++---
 test/spec/unit/core/bidderFactory_spec.js     |  10 +-
 test/spec/unit/pbjs_api_spec.js               |  49 +-
 test/spec/unit/secureCreatives_spec.js        |  94 +--
 95 files changed, 1652 insertions(+), 396 deletions(-)

diff --git a/integrationExamples/gpt/prebidServer_native_example.html b/integrationExamples/gpt/prebidServer_native_example.html
index 16c7d38a427..c590f0bcee5 100644
--- a/integrationExamples/gpt/prebidServer_native_example.html
+++ b/integrationExamples/gpt/prebidServer_native_example.html
@@ -133,8 +133,8 @@
   <script>
     // GPT setup
     googletag.cmd.push(function () {
-      // var slot1 = googletag.defineSlot('/19968336/prebid_native_example_1', [[360, 360]], 'div-1').addService(googletag.pubads());
-      // var slot2 = googletag.defineSlot('/19968336/prebid_native_example_2', 'fluid', 'div-2').addService(googletag.pubads());
+      googletag.defineSlot('/19968336/prebid_native_example_1', [[360, 360]], 'div-1').addService(googletag.pubads());
+      googletag.defineSlot('/19968336/prebid_native_example_2', 'fluid', 'div-2').addService(googletag.pubads());
       googletag.pubads().disableInitialLoad();
       googletag.pubads().enableSingleRequest();
       googletag.enableServices();
diff --git a/modules/ablidaBidAdapter.js b/modules/ablidaBidAdapter.js
index 9e322ba449b..ca489a10a90 100644
--- a/modules/ablidaBidAdapter.js
+++ b/modules/ablidaBidAdapter.js
@@ -2,6 +2,7 @@ import { triggerPixel } from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'ablida';
 const ENDPOINT_URL = 'https://bidder.ablida.net/prebid';
@@ -28,6 +29,9 @@ export const spec = {
    * @param bidderRequest
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     if (validBidRequests.length === 0) {
       return [];
     }
diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index a76046ad2db..afc15bb2d17 100644
--- a/modules/adagioBidAdapter.js
+++ b/modules/adagioBidAdapter.js
@@ -31,6 +31,7 @@ import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
 import {OUTSTREAM} from '../src/video.js';
 import { getGlobal } from '../src/prebidGlobal.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'adagio';
 const LOG_PREFIX = 'Adagio:';
@@ -882,6 +883,9 @@ export const spec = {
   },
 
   buildRequests(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const secure = (location.protocol === 'https:') ? 1 : 0;
     const device = internal.getDevice();
     const site = internal.getSite(bidderRequest);
diff --git a/modules/adbookpspBidAdapter.js b/modules/adbookpspBidAdapter.js
index 198441975d8..917d18e9fae 100644
--- a/modules/adbookpspBidAdapter.js
+++ b/modules/adbookpspBidAdapter.js
@@ -19,6 +19,7 @@ import {
   uniques
 } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 /**
  * CONSTANTS
@@ -101,6 +102,9 @@ function isBidRequestValid(bidRequest) {
 }
 
 function buildRequests(validBidRequests, bidderRequest) {
+  // convert Native ORTB definition to old-style prebid native definition
+  validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
   const requests = [];
 
   if (validBidRequests.length > 0) {
diff --git a/modules/adfBidAdapter.js b/modules/adfBidAdapter.js
index 0b9c10bb38a..a3fb128437b 100644
--- a/modules/adfBidAdapter.js
+++ b/modules/adfBidAdapter.js
@@ -6,6 +6,7 @@ import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {_map, deepAccess, deepSetValue, mergeDeep, parseSizesInput} from '../src/utils.js';
 import {config} from '../src/config.js';
 import {Renderer} from '../src/Renderer.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const { getConfig } = config;
 
@@ -60,6 +61,9 @@ export const spec = {
     return !!(mid || (inv && mname));
   },
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let app, site;
 
     const commonFpd = bidderRequest.ortb2 || {};
diff --git a/modules/adgenerationBidAdapter.js b/modules/adgenerationBidAdapter.js
index b48d9d350e3..c91c4ad1ae0 100644
--- a/modules/adgenerationBidAdapter.js
+++ b/modules/adgenerationBidAdapter.js
@@ -2,6 +2,7 @@ import {tryAppendQueryString, getBidIdParameter} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const ADG_BIDDER_CODE = 'adgeneration';
 
@@ -25,6 +26,8 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     const ADGENE_PREBID_VERSION = '1.4.0';
     let serverRequests = [];
     for (let i = 0, len = validBidRequests.length; i < len; i++) {
diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index aa06b0977c5..78df319c5ee 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -20,6 +20,7 @@ import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {find, includes} from '../src/polyfill.js';
 import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 /*
  * In case you're AdKernel whitelable platform's client who needs branded adapter to
@@ -119,6 +120,9 @@ export const spec = {
    * @returns {ServerRequest[]}
    */
   buildRequests: function (bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     let impGroups = groupImpressionsByHostZone(bidRequests, bidderRequest.refererInfo);
     let requests = [];
     let schain = bidRequests[0].schain;
diff --git a/modules/admanBidAdapter.js b/modules/admanBidAdapter.js
index 4d47c4699ab..ed984645d0d 100644
--- a/modules/admanBidAdapter.js
+++ b/modules/admanBidAdapter.js
@@ -2,6 +2,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { isFn, deepAccess, logMessage } from '../src/utils.js';
 import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'adman';
 const AD_URL = 'https://pub.admanmedia.com/?c=o&m=multi';
@@ -63,6 +64,9 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let winTop = window;
     let location;
     // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
diff --git a/modules/admixerBidAdapter.js b/modules/admixerBidAdapter.js
index b2f9c09aa84..b9cde172ebe 100644
--- a/modules/admixerBidAdapter.js
+++ b/modules/admixerBidAdapter.js
@@ -2,6 +2,7 @@ import { logError } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'admixer';
 const ALIASES = ['go2net', 'adblender', 'adsyield', 'futureads'];
@@ -20,6 +21,9 @@ export const spec = {
    * Make a server request from the list of BidRequests.
    */
   buildRequests: function (validRequest, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validRequest = convertOrtbRequestToProprietaryNative(validRequest);
+
     let w;
     let docRef;
     do {
diff --git a/modules/adnowBidAdapter.js b/modules/adnowBidAdapter.js
index 472d0fdb2e1..484b6202479 100644
--- a/modules/adnowBidAdapter.js
+++ b/modules/adnowBidAdapter.js
@@ -2,6 +2,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import {deepAccess, parseQueryStringParameters, parseSizesInput} from '../src/utils.js';
 import {includes} from '../src/polyfill.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'adnow';
 const ENDPOINT = 'https://n.ads3-adnow.com/a';
@@ -48,6 +49,9 @@ export const spec = {
    * @return {ServerRequest}
    */
   buildRequests(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     return validBidRequests.map(req => {
       const mediaType = this._isBannerRequest(req) ? BANNER : NATIVE;
       const codeId = parseInt(req.params.codeId, 10);
diff --git a/modules/adotBidAdapter.js b/modules/adotBidAdapter.js
index af9cb8b5008..c34af4d3d17 100644
--- a/modules/adotBidAdapter.js
+++ b/modules/adotBidAdapter.js
@@ -5,6 +5,7 @@ import {isArray, isBoolean, isFn, isPlainObject, isStr, logError, replaceAuction
 import {find} from '../src/polyfill.js';
 import {config} from '../src/config.js';
 import {OUTSTREAM} from '../src/video.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'adot';
 const ADAPTER_VERSION = 'v2.0.0';
@@ -373,6 +374,8 @@ function splitAdUnits(validBidRequests) {
  * @returns {Array<AjaxRequest>}
  */
 function buildRequests(validBidRequests, bidderRequest) {
+  // convert Native ORTB definition to old-style prebid native definition
+  validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
   const adUnits = splitAdUnits(validBidRequests);
   const publisherPathConfig = config.getConfig('adot.publisherPath');
   const publisherPath = publisherPathConfig === undefined ? '' : '/' + publisherPathConfig;
diff --git a/modules/adprimeBidAdapter.js b/modules/adprimeBidAdapter.js
index 4b53c8441ef..49c18c2d067 100644
--- a/modules/adprimeBidAdapter.js
+++ b/modules/adprimeBidAdapter.js
@@ -2,6 +2,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { isFn, deepAccess, logMessage } from '../src/utils.js';
 import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'adprime';
 const AD_URL = 'https://delta.adprime.com/pbjs';
@@ -50,6 +51,9 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let winTop = window;
     let location;
     // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
diff --git a/modules/adrelevantisBidAdapter.js b/modules/adrelevantisBidAdapter.js
index 3a68513cde2..193c92cbb19 100644
--- a/modules/adrelevantisBidAdapter.js
+++ b/modules/adrelevantisBidAdapter.js
@@ -21,6 +21,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {find, includes} from '../src/polyfill.js';
 import {INSTREAM, OUTSTREAM} from '../src/video.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'adrelevantis';
 const URL = 'https://ssp.adrelevantis.com/prebid';
@@ -71,6 +72,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const tags = bidRequests.map(bidToTag);
     const userObjBid = find(bidRequests, hasUserInfo);
     let userObj;
diff --git a/modules/adrinoBidAdapter.js b/modules/adrinoBidAdapter.js
index e7cac348b3e..91f16fdb2b3 100644
--- a/modules/adrinoBidAdapter.js
+++ b/modules/adrinoBidAdapter.js
@@ -2,6 +2,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {triggerPixel} from '../src/utils.js';
 import {NATIVE} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'adrino';
 const REQUEST_METHOD = 'POST';
@@ -28,6 +29,8 @@ export const spec = {
   },
 
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     const bidRequests = [];
 
     for (let i = 0; i < validBidRequests.length; i++) {
diff --git a/modules/adtrueBidAdapter.js b/modules/adtrueBidAdapter.js
index b8cdb1f99aa..b0aafc3ae4e 100644
--- a/modules/adtrueBidAdapter.js
+++ b/modules/adtrueBidAdapter.js
@@ -3,6 +3,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
 import {getStorageManager} from '../src/storageManager.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'adtrue';
 const storage = getStorageManager({bidderCode: BIDDER_CODE});
@@ -450,6 +451,9 @@ export const spec = {
   },
 
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let refererInfo;
     if (bidderRequest && bidderRequest.refererInfo) {
       refererInfo = bidderRequest.refererInfo;
diff --git a/modules/aduptechBidAdapter.js b/modules/aduptechBidAdapter.js
index 1bb88c11cde..5d8b69af77f 100644
--- a/modules/aduptechBidAdapter.js
+++ b/modules/aduptechBidAdapter.js
@@ -1,6 +1,7 @@
 import {deepAccess, getAdUnitSizes} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 export const BIDDER_CODE = 'aduptech';
 export const ENDPOINT_URL_PUBLISHER_PLACEHOLDER = '{PUBLISHER}';
@@ -198,6 +199,9 @@ export const spec = {
    * @returns {Object[]}
    */
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const requests = [];
 
     // stop here on invalid or empty data
diff --git a/modules/adxcgBidAdapter.js b/modules/adxcgBidAdapter.js
index 9cfbc91b48b..4d6fd6fe841 100644
--- a/modules/adxcgBidAdapter.js
+++ b/modules/adxcgBidAdapter.js
@@ -17,6 +17,7 @@ import {
   triggerPixel
 } from '../src/utils.js';
 import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const { getConfig } = config;
 
@@ -65,6 +66,9 @@ export const spec = {
     return !!(adzoneid);
   },
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let app, site;
 
     const commonFpd = bidderRequest.ortb2 || {};
diff --git a/modules/adyoulikeBidAdapter.js b/modules/adyoulikeBidAdapter.js
index 5b3e885f2ed..8d5397fe507 100644
--- a/modules/adyoulikeBidAdapter.js
+++ b/modules/adyoulikeBidAdapter.js
@@ -3,6 +3,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {createEidsArray} from './userId/eids.js';
 import {find} from '../src/polyfill.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const VERSION = '1.0';
 const BIDDER_CODE = 'adyoulike';
@@ -60,6 +61,8 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
     let hasVideo = false;
     const payload = {
       Version: VERSION,
diff --git a/modules/ajaBidAdapter.js b/modules/ajaBidAdapter.js
index 5991439740f..121dc2ef96f 100644
--- a/modules/ajaBidAdapter.js
+++ b/modules/ajaBidAdapter.js
@@ -2,6 +2,7 @@ import { getBidIdParameter, tryAppendQueryString, createTrackPixelHtml, logError
 import { Renderer } from '../src/Renderer.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { VIDEO, BANNER, NATIVE } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'aja';
 const URL = 'https://ad.as.amanad.adtdp.com/v2/prebid';
@@ -35,6 +36,9 @@ export const spec = {
    * @returns {ServerRequest|ServerRequest[]}
    */
   buildRequests: function(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const bidRequests = [];
     const pageUrl = bidderRequest?.refererInfo?.page || undefined;
 
diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index 21c455009fe..056326eb824 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -34,6 +34,7 @@ import {INSTREAM, OUTSTREAM} from '../src/video.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {bidderSettings} from '../src/bidderSettings.js';
 import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'appnexus';
 const URL = 'https://ib.adnxs.com/ut/v3/prebid';
@@ -122,6 +123,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const tags = bidRequests.map(bidToTag);
     const userObjBid = find(bidRequests, hasUserInfo);
     let userObj = {};
diff --git a/modules/apstreamBidAdapter.js b/modules/apstreamBidAdapter.js
index b69fffb8b6b..5ae0d5c56fd 100644
--- a/modules/apstreamBidAdapter.js
+++ b/modules/apstreamBidAdapter.js
@@ -2,6 +2,7 @@ import { generateUUID, deepAccess, createTrackPixelHtml, getDNT } from '../src/u
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const CONSTANTS = {
   DSU_KEY: 'apr_dsu',
@@ -416,6 +417,8 @@ function isBidRequestValid(bid) {
 }
 
 function buildRequests(bidRequests, bidderRequest) {
+  // convert Native ORTB definition to old-style prebid native definition
+  bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
   const data = {
     med: encodeURIComponent(window.location.href),
     auid: bidderRequest.auctionId,
diff --git a/modules/bidscubeBidAdapter.js b/modules/bidscubeBidAdapter.js
index 951bd97d255..6cdbba61c75 100644
--- a/modules/bidscubeBidAdapter.js
+++ b/modules/bidscubeBidAdapter.js
@@ -1,6 +1,7 @@
 import { logMessage, getWindowLocation } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js'
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js'
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'bidscube'
 const URL = 'https://supply.bidscube.com/?c=o&m=multi'
@@ -15,6 +16,9 @@ export const spec = {
   },
 
   buildRequests: function (validBidRequests) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     validBidRequests = validBidRequests || []
     let winTop = window
     try {
diff --git a/modules/bizzclickBidAdapter.js b/modules/bizzclickBidAdapter.js
index ce961867c59..7b32ffd84b0 100644
--- a/modules/bizzclickBidAdapter.js
+++ b/modules/bizzclickBidAdapter.js
@@ -2,6 +2,7 @@ import { logMessage, getDNT, deepSetValue, deepAccess, _map, logWarn } from '../
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 const BIDDER_CODE = 'bizzclick';
 const ACCOUNTID_MACROS = '[account_id]';
 const URL_ENDPOINT = `https://us-e-node1.bizzclick.com/bid?rtb_seat_id=prebidjs&secret_key=${ACCOUNTID_MACROS}`;
@@ -57,6 +58,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     if (validBidRequests && validBidRequests.length === 0) return []
     let accuontId = validBidRequests[0].params.accountId;
     const endpointURL = URL_ENDPOINT.replace(ACCOUNTID_MACROS, accuontId);
diff --git a/modules/boldwinBidAdapter.js b/modules/boldwinBidAdapter.js
index 33e99211e9b..ec580f8c3c2 100644
--- a/modules/boldwinBidAdapter.js
+++ b/modules/boldwinBidAdapter.js
@@ -1,6 +1,7 @@
 import { isFn, deepAccess, logMessage } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'boldwin';
 const AD_URL = 'https://ssp.videowalldirect.com/pbjs';
@@ -49,6 +50,9 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let winTop = window;
     let location;
     // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
diff --git a/modules/braveBidAdapter.js b/modules/braveBidAdapter.js
index d29d58a2129..2e087b41868 100644
--- a/modules/braveBidAdapter.js
+++ b/modules/braveBidAdapter.js
@@ -2,6 +2,7 @@ import { parseUrl, isEmpty, isStr, triggerPixel } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'brave';
 const DEFAULT_CUR = 'USD';
@@ -38,6 +39,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     if (validBidRequests.length === 0 || !bidderRequest) return [];
 
     const endpointURL = ENDPOINT_URL.replace('hash', validBidRequests[0].params.placementId);
diff --git a/modules/bridgewellBidAdapter.js b/modules/bridgewellBidAdapter.js
index 6af7f4fc8a0..6088cefaa55 100644
--- a/modules/bridgewellBidAdapter.js
+++ b/modules/bridgewellBidAdapter.js
@@ -2,6 +2,7 @@ import {_each, deepSetValue, inIframe} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import {find} from '../src/polyfill.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'bridgewell';
 const REQUEST_ENDPOINT = 'https://prebid.scupio.com/recweb/prebid.aspx?cb=';
@@ -36,6 +37,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const adUnits = [];
     var bidderUrl = REQUEST_ENDPOINT + Math.random();
     var userIds;
diff --git a/modules/buzzoolaBidAdapter.js b/modules/buzzoolaBidAdapter.js
index c6e27c94e04..b5ea6227f58 100644
--- a/modules/buzzoolaBidAdapter.js
+++ b/modules/buzzoolaBidAdapter.js
@@ -3,6 +3,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
 import {OUTSTREAM} from '../src/video.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'buzzoola';
 const ENDPOINT = 'https://exchange.buzzoola.com/ssp/prebidjs';
@@ -32,6 +33,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidderRequest.bids = convertOrtbRequestToProprietaryNative(bidderRequest.bids);
+
     return {
       url: ENDPOINT,
       method: 'POST',
diff --git a/modules/clickforceBidAdapter.js b/modules/clickforceBidAdapter.js
index eceb4934b04..92bc9b1bad2 100644
--- a/modules/clickforceBidAdapter.js
+++ b/modules/clickforceBidAdapter.js
@@ -1,6 +1,7 @@
 import { _each } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 const BIDDER_CODE = 'clickforce';
 const ENDPOINT_URL = 'https://ad.holmesmind.com/adserver/prebid.json?cb=' + new Date().getTime() + '&hb=1&ver=1.21';
 
@@ -24,6 +25,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(validBidRequests) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const bidParams = [];
     _each(validBidRequests, function(bid) {
       bidParams.push({
diff --git a/modules/colossussspBidAdapter.js b/modules/colossussspBidAdapter.js
index eb6215765e1..4594b8c3ce6 100644
--- a/modules/colossussspBidAdapter.js
+++ b/modules/colossussspBidAdapter.js
@@ -3,6 +3,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { ajax } from '../src/ajax.js';
 import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'colossusssp';
 const G_URL = 'https://colossusssp.com/?c=o&m=multi';
@@ -61,6 +62,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let deviceWidth = 0;
     let deviceHeight = 0;
     let winLocation;
diff --git a/modules/compassBidAdapter.js b/modules/compassBidAdapter.js
index e439e72d1d9..a89c4c617b6 100644
--- a/modules/compassBidAdapter.js
+++ b/modules/compassBidAdapter.js
@@ -1,4 +1,5 @@
 import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
@@ -112,6 +113,9 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let deviceWidth = 0;
     let deviceHeight = 0;
 
diff --git a/modules/contentexchangeBidAdapter.js b/modules/contentexchangeBidAdapter.js
index 906359252ee..becc21555e3 100644
--- a/modules/contentexchangeBidAdapter.js
+++ b/modules/contentexchangeBidAdapter.js
@@ -2,6 +2,7 @@ import { isFn, deepAccess, logMessage } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'contentexchange';
 const AD_URL = 'https://eu2.adnetwork.agency/pbjs';
@@ -113,6 +114,9 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let deviceWidth = 0;
     let deviceHeight = 0;
 
diff --git a/modules/craftBidAdapter.js b/modules/craftBidAdapter.js
index 147e45d3d65..519c4dd9b6f 100644
--- a/modules/craftBidAdapter.js
+++ b/modules/craftBidAdapter.js
@@ -14,6 +14,7 @@ import {find, includes} from '../src/polyfill.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {ajax} from '../src/ajax.js';
 import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'craft';
 const URL_BASE = 'https://gacraft.jp/prebid-v3';
@@ -30,6 +31,9 @@ export const spec = {
   },
 
   buildRequests: function(bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const tags = bidRequests.map(bidToTag);
     const schain = bidRequests[0].schain;
     const payload = {
diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index fea77bbe462..82fe74c458e 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -6,6 +6,7 @@ import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { find } from '../src/polyfill.js';
 import { verify } from 'criteo-direct-rsa-validate/build/verify.js'; // ref#2
 import { getStorageManager } from '../src/storageManager.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 import { getRefererInfo } from '../src/refererDetection.js';
 import { hasPurpose1Consent } from '../src/utils/gpdr.js';
 
@@ -164,6 +165,9 @@ export const spec = {
    * @return {ServerRequest}
    */
   buildRequests: (bidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     let url;
     let data;
     let fpd = bidderRequest.ortb2 || {};
diff --git a/modules/dailyhuntBidAdapter.js b/modules/dailyhuntBidAdapter.js
index 590f3e79f85..5ae8ee3ea21 100644
--- a/modules/dailyhuntBidAdapter.js
+++ b/modules/dailyhuntBidAdapter.js
@@ -4,6 +4,7 @@ import {_map, deepAccess, isEmpty} from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
 import {find} from '../src/polyfill.js';
 import {INSTREAM, OUTSTREAM} from '../src/video.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'dailyhunt';
 const BIDDER_ALIAS = 'dh';
@@ -384,6 +385,9 @@ export const spec = {
   isBidRequestValid: bid => !!bid.params.placement_id && !!bid.params.publisher_id && !!bid.params.partner_name,
 
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let serverRequests = [];
 
     // ORTB Request.
diff --git a/modules/datablocksBidAdapter.js b/modules/datablocksBidAdapter.js
index fb036d4ff0c..f0e0c32990a 100644
--- a/modules/datablocksBidAdapter.js
+++ b/modules/datablocksBidAdapter.js
@@ -4,6 +4,7 @@ import { config } from '../src/config.js';
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { ajax } from '../src/ajax.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 export const storage = getStorageManager({bidderCode: 'datablocks'});
 
 const NATIVE_ID_MAP = {};
@@ -252,6 +253,9 @@ export const spec = {
 
   // GENERATE THE RTB REQUEST
   buildRequests: function(validRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validRequests = convertOrtbRequestToProprietaryNative(validRequests);
+
     // RETURN EMPTY IF THERE ARE NO VALID REQUESTS
     if (!validRequests.length) {
       return [];
diff --git a/modules/dianomiBidAdapter.js b/modules/dianomiBidAdapter.js
index ae6ae8f6f03..c64584f3ae8 100644
--- a/modules/dianomiBidAdapter.js
+++ b/modules/dianomiBidAdapter.js
@@ -13,6 +13,7 @@ import {
 } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const { getConfig } = config;
 
@@ -73,6 +74,8 @@ export const spec = {
     return !!smartadId;
   },
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     let app, site;
 
     const commonFpd = bidderRequest.ortb2 || {};
diff --git a/modules/e_volutionBidAdapter.js b/modules/e_volutionBidAdapter.js
index a4372fc5dec..8e829a39a57 100644
--- a/modules/e_volutionBidAdapter.js
+++ b/modules/e_volutionBidAdapter.js
@@ -1,6 +1,7 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { isFn, deepAccess, logMessage } from '../src/utils.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'e_volution';
 const AD_URL = 'https://service.e-volution.ai/?c=o&m=multi';
@@ -64,6 +65,9 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let winTop = window;
     let location;
     // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
diff --git a/modules/engageyaBidAdapter.js b/modules/engageyaBidAdapter.js
index ceec1de8fe7..a66e825e5df 100644
--- a/modules/engageyaBidAdapter.js
+++ b/modules/engageyaBidAdapter.js
@@ -1,6 +1,8 @@
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
 import { createTrackPixelHtml } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
 const BIDDER_CODE = 'engageya';
 const ENDPOINT_URL = 'https://recs.engageya.com/rec-api/getrecs.json';
 const ENDPOINT_METHOD = 'GET';
@@ -126,6 +128,9 @@ export const spec = {
   },
 
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     if (!validBidRequests) {
       return [];
     }
diff --git a/modules/finativeBidAdapter.js b/modules/finativeBidAdapter.js
index c4bb2dffe28..6368fc011cc 100644
--- a/modules/finativeBidAdapter.js
+++ b/modules/finativeBidAdapter.js
@@ -5,6 +5,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { NATIVE } from '../src/mediaTypes.js';
 import { _map, deepSetValue, isEmpty, deepAccess } from '../src/utils.js';
 import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'finative';
 const DEFAULT_CUR = 'EUR';
@@ -59,6 +60,8 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
     const tid = validBidRequests[0].transactionId;
     const cur = [config.getConfig('currency.adServerCurrency') || DEFAULT_CUR];
diff --git a/modules/goldbachBidAdapter.js b/modules/goldbachBidAdapter.js
index 9d5f6d71c6a..a6e5c59ced2 100644
--- a/modules/goldbachBidAdapter.js
+++ b/modules/goldbachBidAdapter.js
@@ -30,6 +30,7 @@ import {auctionManager} from '../src/auctionManager.js';
 import {find, includes} from '../src/polyfill.js';
 import {INSTREAM, OUTSTREAM} from '../src/video.js';
 import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'goldbach';
 const URL = 'https://ib.adnxs.com/ut/v3/prebid';
@@ -113,6 +114,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     let localBidRequests = [];
     bidRequests.forEach(bid => {
       if (Array.isArray(bid.params.placementId)) {
diff --git a/modules/gothamadsBidAdapter.js b/modules/gothamadsBidAdapter.js
index 5f2d3c4f36a..37433e547a9 100644
--- a/modules/gothamadsBidAdapter.js
+++ b/modules/gothamadsBidAdapter.js
@@ -2,6 +2,7 @@ import { logMessage, deepSetValue, deepAccess, _map, logWarn } from '../src/util
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'gothamads';
 const ACCOUNTID_MACROS = '[account_id]';
@@ -68,6 +69,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     if (validBidRequests && validBidRequests.length === 0) return []
     let accuontId = validBidRequests[0].params.accountId;
     const endpointURL = URL_ENDPOINT.replace(ACCOUNTID_MACROS, accuontId);
diff --git a/modules/growadvertisingBidAdapter.js b/modules/growadvertisingBidAdapter.js
index 0fdca8265c6..b9b256dbaff 100644
--- a/modules/growadvertisingBidAdapter.js
+++ b/modules/growadvertisingBidAdapter.js
@@ -3,6 +3,7 @@
 import { getBidIdParameter, deepAccess, _each, triggerPixel } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'growads';
 
@@ -15,6 +16,9 @@ export const spec = {
   },
 
   buildRequests: function (validBidRequests) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let zoneId;
     let domain;
     let requestURI;
diff --git a/modules/improvedigitalBidAdapter.js b/modules/improvedigitalBidAdapter.js
index a7a97f4c839..dd2f85dcff5 100644
--- a/modules/improvedigitalBidAdapter.js
+++ b/modules/improvedigitalBidAdapter.js
@@ -18,6 +18,7 @@ import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
 import {createEidsArray} from './userId/eids.js';
 import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'improvedigital';
 const CREATIVE_TTL = 300;
@@ -91,6 +92,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests(bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const request = {
       cur: [config.getConfig('currency.adServerCurrency') || 'USD'],
       ext: {
diff --git a/modules/iqzoneBidAdapter.js b/modules/iqzoneBidAdapter.js
index 3bd613e786b..f2de447d6a7 100644
--- a/modules/iqzoneBidAdapter.js
+++ b/modules/iqzoneBidAdapter.js
@@ -2,6 +2,7 @@ import { isFn, deepAccess, logMessage } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'iqzone';
 const AD_URL = 'https://smartssp-us-east.iqzone.com/pbjs';
@@ -111,6 +112,9 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let deviceWidth = 0;
     let deviceHeight = 0;
 
diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 7d3b3a33a7d..d4ac5208413 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -26,6 +26,7 @@ import {find} from '../src/polyfill.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {INSTREAM, OUTSTREAM} from '../src/video.js';
 import {Renderer} from '../src/Renderer.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'ix';
 const ALIAS_BIDDER_CODE = 'roundel';
@@ -837,6 +838,8 @@ function getEidInfo(allEids) {
  *
  */
 function buildRequest(validBidRequests, bidderRequest, impressions, version) {
+  // convert Native ORTB definition to old-style prebid native definition
+  validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
   // Always use secure HTTPS protocol.
   let baseUrl = SECURE_BID_URL;
   // Get ids from Prebid User ID Modules
diff --git a/modules/krushmediaBidAdapter.js b/modules/krushmediaBidAdapter.js
index 6dce40524a7..6c7b75bbce2 100644
--- a/modules/krushmediaBidAdapter.js
+++ b/modules/krushmediaBidAdapter.js
@@ -1,6 +1,7 @@
 import { isFn, deepAccess, logMessage } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'krushmedia';
 const AD_URL = 'https://ads4.krushmedia.com/?c=rtb&m=hb';
@@ -49,6 +50,9 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let winTop = window;
     let location;
     // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
diff --git a/modules/livewrappedBidAdapter.js b/modules/livewrappedBidAdapter.js
index 104ff667fcb..3839eb80b91 100644
--- a/modules/livewrappedBidAdapter.js
+++ b/modules/livewrappedBidAdapter.js
@@ -4,6 +4,7 @@ import {config} from '../src/config.js';
 import {find} from '../src/polyfill.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {getStorageManager} from '../src/storageManager.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'livewrapped';
 export const storage = getStorageManager({bidderCode: BIDDER_CODE});
@@ -46,6 +47,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const userId = find(bidRequests, hasUserId);
     const pubcid = find(bidRequests, hasPubcid);
     const publisherId = find(bidRequests, hasPublisherId);
diff --git a/modules/loganBidAdapter.js b/modules/loganBidAdapter.js
index 75327453b2e..ec5006b7c8c 100644
--- a/modules/loganBidAdapter.js
+++ b/modules/loganBidAdapter.js
@@ -2,6 +2,7 @@ import { isFn, deepAccess, getWindowTop } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'logan';
 const AD_URL = 'https://USeast2.logan.ai/pbjs';
@@ -50,6 +51,9 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const winTop = getWindowTop();
     const location = winTop.location;
     const placements = [];
diff --git a/modules/logicadBidAdapter.js b/modules/logicadBidAdapter.js
index 4f996ba3f09..034450c447f 100644
--- a/modules/logicadBidAdapter.js
+++ b/modules/logicadBidAdapter.js
@@ -1,5 +1,6 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'logicad';
 const ENDPOINT_URL = 'https://pb.ladsp.com/adrequest/prebid';
@@ -11,6 +12,9 @@ export const spec = {
     return !!(bid.params && bid.params.tid);
   },
   buildRequests: function (bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const requests = [];
     for (let i = 0, len = bidRequests.length; i < len; i++) {
       const request = {
diff --git a/modules/loglyliftBidAdapter.js b/modules/loglyliftBidAdapter.js
index a05434e8ee5..47f6e54485d 100644
--- a/modules/loglyliftBidAdapter.js
+++ b/modules/loglyliftBidAdapter.js
@@ -1,6 +1,7 @@
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'loglylift';
 const ENDPOINT_URL = 'https://bid.logly.co.jp/prebid/client/v1';
@@ -14,6 +15,9 @@ export const spec = {
   },
 
   buildRequests: function (bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const requests = [];
     for (let i = 0, len = bidRequests.length; i < len; i++) {
       const request = {
diff --git a/modules/lunamediahbBidAdapter.js b/modules/lunamediahbBidAdapter.js
index 286e87668fa..66838014e18 100644
--- a/modules/lunamediahbBidAdapter.js
+++ b/modules/lunamediahbBidAdapter.js
@@ -2,6 +2,7 @@ import { logMessage } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'lunamediahb';
 const AD_URL = 'https://balancer.lmgssp.com/?c=o&m=multi';
@@ -33,6 +34,9 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let winTop = window;
     let location;
     // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
diff --git a/modules/mathildeadsBidAdapter.js b/modules/mathildeadsBidAdapter.js
index f80e6e1f749..6b886b72955 100644
--- a/modules/mathildeadsBidAdapter.js
+++ b/modules/mathildeadsBidAdapter.js
@@ -2,6 +2,7 @@ import { isFn, deepAccess, logMessage } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'mathildeads';
 const AD_URL = 'https://endpoint2.mathilde-ads.com/pbjs';
@@ -111,6 +112,9 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let deviceWidth = 0;
     let deviceHeight = 0;
 
diff --git a/modules/mediaforceBidAdapter.js b/modules/mediaforceBidAdapter.js
index 8f15af72235..744cf89d655 100644
--- a/modules/mediaforceBidAdapter.js
+++ b/modules/mediaforceBidAdapter.js
@@ -1,6 +1,7 @@
 import { getDNT, deepAccess, isStr, replaceAuctionPrice, triggerPixel, parseGPTSingleSizeArrayToRtbSize, isEmpty } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'mediaforce';
 const ENDPOINT_URL = 'https://rtb.mfadsrvr.com/header_bid';
@@ -109,6 +110,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     if (validBidRequests.length === 0) {
       return;
     }
diff --git a/modules/mediafuseBidAdapter.js b/modules/mediafuseBidAdapter.js
index 4cd6b60e8a2..5a96c8b286c 100644
--- a/modules/mediafuseBidAdapter.js
+++ b/modules/mediafuseBidAdapter.js
@@ -9,6 +9,7 @@ import { OUTSTREAM, INSTREAM } from '../src/video.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { bidderSettings } from '../src/bidderSettings.js';
 import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'mediafuse';
 const URL = 'https://ib.adnxs.com/ut/v3/prebid';
@@ -85,6 +86,8 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
     const tags = bidRequests.map(bidToTag);
     const userObjBid = find(bidRequests, hasUserInfo);
     let userObj = {};
diff --git a/modules/mediakeysBidAdapter.js b/modules/mediakeysBidAdapter.js
index 6a4092cef4b..cc8ffc6d29e 100644
--- a/modules/mediakeysBidAdapter.js
+++ b/modules/mediakeysBidAdapter.js
@@ -21,6 +21,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {createEidsArray} from './userId/eids.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const AUCTION_TYPE = 1;
 const BIDDER_CODE = 'mediakeys';
@@ -596,6 +597,9 @@ export const spec = {
   },
 
   buildRequests: function(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const payload = createOrtbTemplate();
 
     // Pass the auctionId as ortb2 id
diff --git a/modules/medianetBidAdapter.js b/modules/medianetBidAdapter.js
index f17e136b2d2..d19862d2f64 100644
--- a/modules/medianetBidAdapter.js
+++ b/modules/medianetBidAdapter.js
@@ -16,6 +16,7 @@ import {config} from '../src/config.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {Renderer} from '../src/Renderer.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'medianet';
 const BID_URL = 'https://prebid.media.net/rtb/prebid';
@@ -450,6 +451,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(bidRequests, bidderRequests) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     let payload = generatePayload(bidRequests, bidderRequests);
     return {
       method: 'POST',
diff --git a/modules/mediasquareBidAdapter.js b/modules/mediasquareBidAdapter.js
index 1be58501828..a6903830b80 100644
--- a/modules/mediasquareBidAdapter.js
+++ b/modules/mediasquareBidAdapter.js
@@ -2,6 +2,7 @@ import {ajax} from '../src/ajax.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'mediasquare';
 const BIDDER_URL_PROD = 'https://pbs-front.mediasquare.fr/'
@@ -30,6 +31,9 @@ export const spec = {
          * @return ServerRequest Info describing the request to the server.
          */
   buildRequests: function(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let codes = [];
     let endpoint = document.location.search.match(/msq_test=true/) ? BIDDER_URL_TEST : BIDDER_URL_PROD;
     let floor = {};
diff --git a/modules/mgidBidAdapter.js b/modules/mgidBidAdapter.js
index 7565b713e88..56cf1e9645e 100644
--- a/modules/mgidBidAdapter.js
+++ b/modules/mgidBidAdapter.js
@@ -3,6 +3,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const GVLID = 358;
 const DEFAULT_CUR = 'USD';
@@ -117,6 +118,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     logInfo(LOG_INFO_PREFIX + `buildRequests`);
     if (validBidRequests.length === 0) {
       return;
diff --git a/modules/microadBidAdapter.js b/modules/microadBidAdapter.js
index d5116b1dcb0..b2eaf96f414 100644
--- a/modules/microadBidAdapter.js
+++ b/modules/microadBidAdapter.js
@@ -1,6 +1,7 @@
 import { deepAccess, isEmpty, isStr } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'microad';
 
@@ -57,6 +58,9 @@ export const spec = {
     return !!(bid && bid.params && bid.params.spot && bid.mediaTypes && (bid.mediaTypes.banner || bid.mediaTypes.native || bid.mediaTypes.video));
   },
   buildRequests: function(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const requests = [];
 
     validBidRequests.forEach(bid => {
diff --git a/modules/mobfoxpbBidAdapter.js b/modules/mobfoxpbBidAdapter.js
index a4af7133370..df900318881 100644
--- a/modules/mobfoxpbBidAdapter.js
+++ b/modules/mobfoxpbBidAdapter.js
@@ -1,6 +1,7 @@
 import { isFn, deepAccess, getWindowTop } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'mobfoxpb';
 const AD_URL = 'https://bes.mobfox.com/pbjs';
@@ -48,6 +49,8 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     const winTop = getWindowTop();
     const location = winTop.location;
     const placements = [];
diff --git a/modules/my6senseBidAdapter.js b/modules/my6senseBidAdapter.js
index 163e3c20e4b..27eb9a9541d 100644
--- a/modules/my6senseBidAdapter.js
+++ b/modules/my6senseBidAdapter.js
@@ -1,5 +1,6 @@
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'my6sense';
 const END_POINT = 'https://hb.mynativeplatform.com/pub2/web/v1.15.0/hbwidget.json';
@@ -119,6 +120,9 @@ function buildGdprServerProperty(bidderRequest) {
 }
 
 function buildRequests(validBidRequests, bidderRequest) {
+  // convert Native ORTB definition to old-style prebid native definition
+  validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
   let requests = [];
 
   if (validBidRequests && validBidRequests.length) {
diff --git a/modules/nextrollBidAdapter.js b/modules/nextrollBidAdapter.js
index 533c47e1ea6..0dd4b334f6e 100644
--- a/modules/nextrollBidAdapter.js
+++ b/modules/nextrollBidAdapter.js
@@ -11,6 +11,7 @@ import {
 } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 import {find} from '../src/polyfill.js';
 
@@ -39,6 +40,8 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     // TODO: is 'page' the right value here?
     let topLocation = parseUrl(deepAccess(bidderRequest, 'refererInfo.page'));
 
diff --git a/modules/operaadsBidAdapter.js b/modules/operaadsBidAdapter.js
index 27ca2dc0ed8..b75090cdec6 100644
--- a/modules/operaadsBidAdapter.js
+++ b/modules/operaadsBidAdapter.js
@@ -16,6 +16,7 @@ import {config} from '../src/config.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
 import {OUTSTREAM} from '../src/video.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'operaads';
 
@@ -118,6 +119,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     return validBidRequests.map(validBidRequest => (buildOpenRtbBidRequest(validBidRequest, bidderRequest)))
   },
 
diff --git a/modules/orbidderBidAdapter.js b/modules/orbidderBidAdapter.js
index bda0a0587f4..9979b1fdc3b 100644
--- a/modules/orbidderBidAdapter.js
+++ b/modules/orbidderBidAdapter.js
@@ -2,6 +2,7 @@ import { isFn, isPlainObject } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const storageManager = getStorageManager({bidderCode: 'orbidder'});
 
@@ -78,6 +79,9 @@ export const spec = {
    * @return The requests for the orbidder /bid endpoint, i.e. the server.
    */
   buildRequests(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const hostname = this.getHostname();
     return validBidRequests.map((bidRequest) => {
       let referer = '';
diff --git a/modules/outbrainBidAdapter.js b/modules/outbrainBidAdapter.js
index a640fa776c9..d1e47f6437b 100644
--- a/modules/outbrainBidAdapter.js
+++ b/modules/outbrainBidAdapter.js
@@ -8,6 +8,7 @@ import { NATIVE, BANNER } from '../src/mediaTypes.js';
 import { deepAccess, deepSetValue, replaceAuctionPrice, _map, isArray } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'outbrain';
 const GVLID = 164;
@@ -53,6 +54,8 @@ export const spec = {
     );
   },
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     const page = bidderRequest.refererInfo.page;
     const ua = navigator.userAgent;
     const test = setOnAny(validBidRequests, 'params.test');
diff --git a/modules/ozoneBidAdapter.js b/modules/ozoneBidAdapter.js
index 69fb3e840a1..bbcb559b53b 100644
--- a/modules/ozoneBidAdapter.js
+++ b/modules/ozoneBidAdapter.js
@@ -4,6 +4,7 @@ import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
 import {getPriceBucketString} from '../src/cpmBucketManager.js';
 import { Renderer } from '../src/Renderer.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'ozone';
 
@@ -169,6 +170,9 @@ export const spec = {
   },
 
   buildRequests(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     this.loadWhitelabelData(validBidRequests[0]);
     this.propertyBag.buildRequestsStart = new Date().getTime();
     let whitelabelBidder = this.propertyBag.whitelabel.bidder; // by default = ozone
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index bc90fe149de..9c240615c04 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -24,7 +24,7 @@ import {
   logWarn,
   mergeDeep,
   parseSizesInput,
-  pick, timestamp,
+  timestamp,
   triggerPixel,
   uniques
 } from '../../src/utils.js';
@@ -40,6 +40,7 @@ import { ajax } from '../../src/ajax.js';
 import {hook} from '../../src/hook.js';
 import {getGlobal} from '../../src/prebidGlobal.js';
 import {hasPurpose1Consent} from '../../src/utils/gpdr.js';
+import { nativeMapper } from '../../src/native.js';
 
 const getConfig = config.getConfig;
 
@@ -406,20 +407,14 @@ function addBidderFirstPartyDataToRequest(request, bidderFpd) {
 }
 
 // https://iabtechlab.com/wp-content/uploads/2016/07/OpenRTB-Native-Ads-Specification-Final-1.2.pdf#page=40
-let nativeDataIdMap = {
-  sponsoredBy: 1, // sponsored
-  body: 2, // desc
-  rating: 3,
-  likes: 4,
-  downloads: 5,
-  price: 6,
-  salePrice: 7,
-  phone: 8,
-  address: 9,
-  body2: 10, // desc2
-  cta: 12 // ctatext
-};
-let nativeDataNames = Object.keys(nativeDataIdMap);
+let nativeDataNames = Object.keys(CONSTANTS.PREBID_NATIVE_DATA_KEYS_TO_ORTB);
+
+// returns object with legacy asset name as key and asset id as value:
+// { "sponsoredBy": 1, ... }
+let nativeDataIdMap = nativeDataNames.reduce((prev, key) => {
+  prev[key] = CONSTANTS.NATIVE_ASSET_TYPES[CONSTANTS.PREBID_NATIVE_DATA_KEYS_TO_ORTB[key]];
+  return prev;
+}, {});
 
 let nativeImgIdMap = {
   icon: 1,
@@ -558,8 +553,8 @@ Object.assign(ORTB2.prototype, {
       this.adUnitsByImp[impressionId] = adUnit;
 
       const nativeParams = adUnit.nativeParams;
-      let nativeAssets;
-      if (FEATURES.NATIVE && nativeParams) {
+      let nativeAssets = nativeAssetCache[impressionId] = deepAccess(nativeParams, 'ortb.assets');
+      if (FEATURES.NATIVE && nativeParams && !nativeAssets) {
         let idCounter = -1;
         try {
           nativeAssets = nativeAssetCache[impressionId] = Object.keys(nativeParams).reduce((assets, type) => {
@@ -685,23 +680,29 @@ Object.assign(ORTB2.prototype, {
       }
 
       if (FEATURES.NATIVE && nativeAssets) {
+        const defaultRequest = {
+          // TODO: determine best way to pass these and if we allow defaults
+          context: 1,
+          plcmttype: 1,
+          eventtrackers: [
+            { event: 1, methods: [1] }
+          ],
+          // TODO: figure out how to support privacy field
+          // privacy: int
+          assets: nativeAssets
+        };
+        const ortbRequest = deepAccess(nativeParams, 'ortb');
         try {
-          mediaTypes['native'] = {
-            request: JSON.stringify({
-              // TODO: determine best way to pass these and if we allow defaults
-              context: 1,
-              plcmttype: 1,
-              eventtrackers: [
-                {event: 1, methods: [1]}
-              ],
-              // TODO: figure out how to support privacy field
-              // privacy: int
-              assets: nativeAssets
-            }),
+          const request = ortbRequest ? Object.assign(defaultRequest, ortbRequest) : defaultRequest;
+          mediaTypes[NATIVE] = {
+            request: JSON.stringify(request),
             ver: '1.2'
-          }
+          };
+          // saving the converted ortb native request into the native mapper, so the Universal Creative
+          // can render the native ad directly.
+          adUnit.bids.forEach(bid => nativeMapper.set(bid.bid_id, request));
         } catch (e) {
-          logError('error creating native request: ' + String(e))
+          logError('error creating native request: ' + String(e));
         }
       }
 
@@ -1083,55 +1084,35 @@ Object.assign(ORTB2.prototype, {
             if (!bidObject.vastUrl && bid.nurl) { bidObject.vastUrl = bid.nurl; }
           } else if (FEATURES.NATIVE && deepAccess(bid, 'ext.prebid.type') === NATIVE) {
             bidObject.mediaType = NATIVE;
-            let adm;
+            let ortb;
             if (typeof bid.adm === 'string') {
-              adm = bidObject.adm = JSON.parse(bid.adm);
+              ortb = bidObject.adm = JSON.parse(bid.adm);
             } else {
-              adm = bidObject.adm = bid.adm;
+              ortb = bidObject.adm = bid.adm;
             }
 
-            let trackers = {
-              [nativeEventTrackerMethodMap.img]: adm.imptrackers || [],
-              [nativeEventTrackerMethodMap.js]: adm.jstracker ? [adm.jstracker] : []
-            };
-            if (adm.eventtrackers) {
-              adm.eventtrackers.forEach(tracker => {
-                switch (tracker.method) {
-                  case nativeEventTrackerMethodMap.img:
-                    trackers[nativeEventTrackerMethodMap.img].push(tracker.url);
-                    break;
-                  case nativeEventTrackerMethodMap.js:
-                    trackers[nativeEventTrackerMethodMap.js].push(tracker.url);
-                    break;
-                }
-              });
+            // ortb.imptrackers and ortb.jstracker are going to be deprecated. So, when we find
+            // those properties, we're creating the equivalent eventtrackers and let prebid universal
+            //  creative deal with it
+            for (const imptracker of ortb.imptrackers || []) {
+              ortb.eventtrackers.push({
+                event: nativeEventTrackerEventMap.impression,
+                method: nativeEventTrackerMethodMap.img,
+                url: imptracker
+              })
+            }
+            if (ortb.jstracker) {
+              ortb.eventtrackers.push({
+                event: nativeEventTrackerEventMap.impression,
+                method: nativeEventTrackerMethodMap.js,
+                url: ortb.jstracker
+              })
             }
 
-            if (isPlainObject(adm) && Array.isArray(adm.assets)) {
-              let origAssets = nativeAssetCache[bid.impid];
-              bidObject.native = cleanObj(adm.assets.reduce((native, asset) => {
-                let origAsset = origAssets[asset.id];
-                if (isPlainObject(asset.img)) {
-                  native[origAsset.img.type ? nativeImgIdMap[origAsset.img.type] : 'image'] = pick(
-                    asset.img,
-                    ['url', 'w as width', 'h as height']
-                  );
-                } else if (isPlainObject(asset.title)) {
-                  native['title'] = asset.title.text
-                } else if (isPlainObject(asset.data)) {
-                  nativeDataNames.forEach(dataType => {
-                    if (nativeDataIdMap[dataType] === origAsset.data.type) {
-                      native[dataType] = asset.data.value;
-                    }
-                  });
-                }
-                return native;
-              }, cleanObj({
-                clickUrl: adm.link,
-                clickTrackers: deepAccess(adm, 'link.clicktrackers'),
-                impressionTrackers: trackers[nativeEventTrackerMethodMap.img],
-                javascriptTrackers: trackers[nativeEventTrackerMethodMap.js]
-              })));
+            if (isPlainObject(ortb) && Array.isArray(ortb.assets)) {
+              bidObject.native = {
+                ortb,
+              }
             } else {
               logError('prebid server native response contained no assets');
             }
diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index e34d58ddd2e..9ab5984860b 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -4,6 +4,7 @@ import { BANNER, VIDEO, NATIVE } from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
 import { bidderSettings } from '../src/bidderSettings.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'pubmatic';
 const LOG_WARN_PREFIX = 'PubMatic: ';
@@ -1021,6 +1022,8 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     var refererInfo;
     if (bidderRequest && bidderRequest.refererInfo) {
       refererInfo = bidderRequest.refererInfo;
diff --git a/modules/pubwiseBidAdapter.js b/modules/pubwiseBidAdapter.js
index 1a3adf12bd8..1c015a24536 100644
--- a/modules/pubwiseBidAdapter.js
+++ b/modules/pubwiseBidAdapter.js
@@ -2,6 +2,7 @@ import { _each, isStr, deepClone, isArray, deepSetValue, inIframe, logMessage, l
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 const VERSION = '0.1.0';
 const GVLID = 842;
 const NET_REVENUE = true;
@@ -116,6 +117,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     var refererInfo;
     if (bidderRequest && bidderRequest.refererInfo) {
       refererInfo = bidderRequest.refererInfo;
diff --git a/modules/pulsepointBidAdapter.js b/modules/pulsepointBidAdapter.js
index 0bff10bc6be..7b66bb7600f 100644
--- a/modules/pulsepointBidAdapter.js
+++ b/modules/pulsepointBidAdapter.js
@@ -1,3 +1,4 @@
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 /* eslint dot-notation:0, quote-props:0 */
 import {convertTypes, deepAccess, isArray, isFn, logError} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
@@ -39,6 +40,9 @@ export const spec = {
   ),
 
   buildRequests: (bidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const request = {
       id: bidRequests[0].bidderRequestId,
       imp: bidRequests.map(slot => impression(slot)),
diff --git a/modules/readpeakBidAdapter.js b/modules/readpeakBidAdapter.js
index be3f246232e..1572a3df0df 100644
--- a/modules/readpeakBidAdapter.js
+++ b/modules/readpeakBidAdapter.js
@@ -2,6 +2,7 @@ import { logError, replaceAuctionPrice, triggerPixel, isStr } from '../src/utils
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
 import { NATIVE, BANNER } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 export const ENDPOINT = 'https://app.readpeak.com/header/prebid';
 
@@ -24,6 +25,9 @@ export const spec = {
   isBidRequestValid: bid => !!(bid && bid.params && bid.params.publisherId),
 
   buildRequests: (bidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     const currencyObj = config.getConfig('currency');
     const currency = (currencyObj && currencyObj.adServerCurrency) || 'USD';
 
diff --git a/modules/revcontentBidAdapter.js b/modules/revcontentBidAdapter.js
index 3787c23b8ea..c7c82cd323e 100644
--- a/modules/revcontentBidAdapter.js
+++ b/modules/revcontentBidAdapter.js
@@ -5,6 +5,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
 import { triggerPixel, isFn, deepAccess, getAdUnitSizes, parseGPTSingleSizeArrayToRtbSize, _map } from '../src/utils.js';
 import {parseDomain} from '../src/refererDetection.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'revcontent';
 const NATIVE_PARAMS = {
@@ -32,6 +33,9 @@ export const spec = {
     return (typeof bid.params.apiKey !== 'undefined' && typeof bid.params.userId !== 'undefined');
   },
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const userId = validBidRequests[0].params.userId;
     const widgetId = validBidRequests[0].params.widgetId;
     const apiKey = validBidRequests[0].params.apiKey;
diff --git a/modules/rtbhouseBidAdapter.js b/modules/rtbhouseBidAdapter.js
index b3e8e80326e..1ae73e192b8 100644
--- a/modules/rtbhouseBidAdapter.js
+++ b/modules/rtbhouseBidAdapter.js
@@ -3,6 +3,7 @@ import { getOrigin } from '../libraries/getOrigin/index.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {includes} from '../src/polyfill.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'rtbhouse';
 const REGIONS = ['prebid-eu', 'prebid-us', 'prebid-asia'];
@@ -44,6 +45,9 @@ export const spec = {
     return !!(includes(REGIONS, bid.params.region) && bid.params.publisherId);
   },
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const request = {
       id: validBidRequests[0].auctionId,
       imp: validBidRequests.map(slot => mapImpression(slot)),
diff --git a/modules/seedingAllianceBidAdapter.js b/modules/seedingAllianceBidAdapter.js
index 1b178b59728..03fe99d7a71 100755
--- a/modules/seedingAllianceBidAdapter.js
+++ b/modules/seedingAllianceBidAdapter.js
@@ -5,6 +5,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { NATIVE } from '../src/mediaTypes.js';
 import { _map, deepSetValue, isEmpty, deepAccess } from '../src/utils.js';
 import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'seedingAlliance';
 const GVL_ID = 371;
@@ -62,6 +63,9 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
     const tid = validBidRequests[0].transactionId;
     const cur = [config.getConfig('currency.adServerCurrency') || DEFAULT_CUR];
diff --git a/modules/smarthubBidAdapter.js b/modules/smarthubBidAdapter.js
index e15b4c488f4..6aab6a8b57e 100644
--- a/modules/smarthubBidAdapter.js
+++ b/modules/smarthubBidAdapter.js
@@ -2,6 +2,7 @@ import {deepAccess, isFn, logError, logMessage} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'smarthub';
 
@@ -149,6 +150,8 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     const tempObj = {};
 
     const len = validBidRequests.length;
diff --git a/modules/smartyadsBidAdapter.js b/modules/smartyadsBidAdapter.js
index 5125eacc716..e5800e7cad0 100644
--- a/modules/smartyadsBidAdapter.js
+++ b/modules/smartyadsBidAdapter.js
@@ -2,6 +2,7 @@ import { logMessage } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'smartyads';
 const AD_URL = 'https://n1.smartyads.com/?c=o&m=prebid&secret_key=prebid_js';
@@ -33,6 +34,9 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     let winTop = window;
     let location;
     // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
diff --git a/modules/sspBCBidAdapter.js b/modules/sspBCBidAdapter.js
index 01de23f7590..94dbe9a4468 100644
--- a/modules/sspBCBidAdapter.js
+++ b/modules/sspBCBidAdapter.js
@@ -5,6 +5,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {includes as strIncludes} from '../src/polyfill.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'sspBC';
 const BIDDER_URL = 'https://ssp.wp.pl/bidder/';
@@ -537,6 +538,9 @@ const spec = {
     return true;
   },
   buildRequests(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     if ((!validBidRequests) || (validBidRequests.length < 1)) {
       return false;
     }
diff --git a/modules/talkadsBidAdapter.js b/modules/talkadsBidAdapter.js
index dae452b9a7d..22f4bc1eac8 100644
--- a/modules/talkadsBidAdapter.js
+++ b/modules/talkadsBidAdapter.js
@@ -2,6 +2,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { NATIVE, BANNER } from '../src/mediaTypes.js';
 import * as utils from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const CURRENCY = 'EUR';
 const BIDDER_CODE = 'talkads';
@@ -44,6 +45,8 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (paValidBidRequests, poBidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    paValidBidRequests = convertOrtbRequestToProprietaryNative(paValidBidRequests);
     utils.logInfo('buildRequests : ', paValidBidRequests, poBidderRequest);
     const laBids = paValidBidRequests.map((poBid, piId) => {
       const loOne = { id: piId, ad_unit: poBid.adUnitCode, bid_id: poBid.bidId, type: '', size: [] };
diff --git a/modules/temedyaBidAdapter.js b/modules/temedyaBidAdapter.js
index 76a6234c095..4eac0bc641f 100644
--- a/modules/temedyaBidAdapter.js
+++ b/modules/temedyaBidAdapter.js
@@ -1,6 +1,7 @@
 import { parseSizesInput, parseQueryStringParameters, logError } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'temedya';
 const ENDPOINT_URL = 'https://adm.vidyome.com/';
@@ -26,6 +27,9 @@ export const spec = {
   * @return ServerRequest Info describing the request to the server.
   */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     return validBidRequests.map(req => {
       const mediaType = this._isBannerRequest(req) ? 'display' : NATIVE;
       const data = {
diff --git a/modules/theAdxBidAdapter.js b/modules/theAdxBidAdapter.js
index 92bfb89f5e0..03c6ea62cb7 100644
--- a/modules/theAdxBidAdapter.js
+++ b/modules/theAdxBidAdapter.js
@@ -7,6 +7,7 @@ import {
 import {
   registerBidder
 } from '../src/adapters/bidderFactory.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'theadx';
 const ENDPOINT_URL = 'https://ssp.theadx.com/request';
@@ -141,6 +142,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     logInfo('theadx.buildRequests', 'validBidRequests', validBidRequests, 'bidderRequest', bidderRequest);
     let results = [];
     const requestType = 'POST';
diff --git a/modules/trafficgateBidAdapter.js b/modules/trafficgateBidAdapter.js
index 66a2a9a0152..6665c397fe9 100644
--- a/modules/trafficgateBidAdapter.js
+++ b/modules/trafficgateBidAdapter.js
@@ -1,6 +1,7 @@
 import { getWindowLocation, deepAccess } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'trafficgate';
 const URL = 'https://[HOST].bc-plugin.com/?c=o&m=multi'
@@ -19,6 +20,8 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     if (validBidRequests && validBidRequests.length === 0) return [];
 
     const location = getWindowLocation()
diff --git a/modules/ucfunnelBidAdapter.js b/modules/ucfunnelBidAdapter.js
index 33bcda29881..b441d93bcf5 100644
--- a/modules/ucfunnelBidAdapter.js
+++ b/modules/ucfunnelBidAdapter.js
@@ -3,6 +3,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const COOKIE_NAME = 'ucf_uid';
 const VER = 'ADGENT_PREBID-2018011501';
@@ -46,6 +47,9 @@ export const spec = {
    * @return {ServerRequest}
    */
   buildRequests: function(bids, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bids = convertOrtbRequestToProprietaryNative(bids);
+
     return bids.map(bid => {
       return {
         method: 'GET',
diff --git a/modules/ventesBidAdapter.js b/modules/ventesBidAdapter.js
index 787db1a7831..73ae0a7e5f1 100644
--- a/modules/ventesBidAdapter.js
+++ b/modules/ventesBidAdapter.js
@@ -2,6 +2,7 @@ import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {convertCamelToUnderscore, isArray, isNumber, isPlainObject, isStr, replaceAuctionPrice} from '../src/utils.js';
 import {find} from '../src/polyfill.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BID_METHOD = 'POST';
 const BIDDER_URL = 'https://ad.ventesavenues.in/va/ad';
@@ -354,6 +355,9 @@ const venavenBidderSpec = {
           validateParameters(adUnit.params);
   },
   buildRequests(bidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
+
     if (!bidRequests) return null;
 
     return groupBy(bidRequests, 'bidderRequestId').map(group => {
diff --git a/modules/vibrantmediaBidAdapter.js b/modules/vibrantmediaBidAdapter.js
index 0613f722af8..371b70448e5 100644
--- a/modules/vibrantmediaBidAdapter.js
+++ b/modules/vibrantmediaBidAdapter.js
@@ -1,3 +1,4 @@
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 /*
  * Vibrant Media Ltd.
  *
@@ -123,6 +124,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the prebid server.
    */
   buildRequests: function(validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const transformedBidRequests = transformBidRequests(validBidRequests);
 
     var url = window.parent.location.href;
diff --git a/modules/videoheroesBidAdapter.js b/modules/videoheroesBidAdapter.js
index 61123820cf5..089f1256937 100644
--- a/modules/videoheroesBidAdapter.js
+++ b/modules/videoheroesBidAdapter.js
@@ -2,6 +2,7 @@ import { isEmpty, parseUrl, isStr, triggerPixel } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'videoheroes';
 const DEFAULT_CUR = 'USD';
@@ -38,6 +39,8 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     if (validBidRequests.length === 0 || !bidderRequest) return [];
 
     const endpointURL = ENDPOINT_URL.replace('hash', validBidRequests[0].params.placementId);
diff --git a/modules/yieldlabBidAdapter.js b/modules/yieldlabBidAdapter.js
index bcaffb35842..96577ed8b02 100644
--- a/modules/yieldlabBidAdapter.js
+++ b/modules/yieldlabBidAdapter.js
@@ -3,6 +3,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js'
 import { find } from '../src/polyfill.js'
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js'
 import { Renderer } from '../src/Renderer.js'
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const ENDPOINT = 'https://ad.yieldlab.net'
 const BIDDER_CODE = 'yieldlab'
@@ -35,6 +36,9 @@ export const spec = {
    * @returns {ServerRequest|ServerRequest[]}
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
     const adslotIds = []
     const adslotSizes = [];
     const timestamp = Date.now()
diff --git a/src/constants.json b/src/constants.json
index 94696184e31..6557b705e37 100644
--- a/src/constants.json
+++ b/src/constants.json
@@ -46,7 +46,7 @@
     "STALE_RENDER": "staleRender",
     "BILLABLE_EVENT": "billableEvent"
   },
-  "AD_RENDER_FAILED_REASON" : {
+  "AD_RENDER_FAILED_REASON": {
     "PREVENT_WRITING_ON_MAIN_DOCUMENT": "preventWritingOnMainDocument",
     "NO_AD": "noAd",
     "EXCEPTION": "exception",
@@ -75,7 +75,7 @@
     "UUID": "hb_uuid",
     "CACHE_ID": "hb_cache_id",
     "CACHE_HOST": "hb_cache_host",
-    "ADOMAIN" : "hb_adomain"
+    "ADOMAIN": "hb_adomain"
   },
   "DEFAULT_TARGETING_KEYS": {
     "BIDDER": "hb_bidder",
@@ -109,14 +109,52 @@
     "rendererUrl": "hb_renderer_url",
     "adTemplate": "hb_adTemplate"
   },
-  "S2S" : {
-    "SRC" : "s2s",
-    "DEFAULT_ENDPOINT" : "https://prebid.adnxs.com/pbs/v1/openrtb2/auction",
+  "S2S": {
+    "SRC": "s2s",
+    "DEFAULT_ENDPOINT": "https://prebid.adnxs.com/pbs/v1/openrtb2/auction",
     "SYNCED_BIDDERS_KEY": "pbjsSyncs"
   },
-  "BID_STATUS" : {
+  "BID_STATUS": {
     "BID_TARGETING_SET": "targetingSet",
     "RENDERED": "rendered",
     "BID_REJECTED": "bidRejected"
-  }
+  },
+  "PREBID_NATIVE_DATA_KEYS_TO_ORTB": {
+    "body": "desc",
+    "body2": "desc2",
+    "sponsoredBy": "sponsored",
+    "cta": "ctatext",
+    "rating": "rating",
+    "address": "address",
+    "downloads": "downloads",
+    "likes": "likes",
+    "phone": "phone",
+    "price": "price",
+    "salePrice": "saleprice",
+    "displayUrl": "displayurl"
+  },
+  "NATIVE_ASSET_TYPES": {
+    "sponsored": 1,
+    "desc": 2,
+    "rating": 3,
+    "likes": 4,
+    "downloads": 5,
+    "price": 6,
+    "saleprice": 7,
+    "phone": 8,
+    "address": 9,
+    "desc2": 10,
+    "displayurl": 11,
+    "ctatext": 12
+  },
+  "NATIVE_IMAGE_TYPES": {
+    "ICON": 1,
+    "MAIN": 3
+  },
+  "NATIVE_KEYS_THAT_ARE_NOT_ASSETS": [
+    "sendTargetingKeys",
+    "adTemplate",
+    "rendererUrl",
+    "type"
+  ]
 }
diff --git a/src/native.js b/src/native.js
index 65ccaf208ee..11fb0b54b90 100644
--- a/src/native.js
+++ b/src/native.js
@@ -1,7 +1,9 @@
-import { deepAccess, getKeyByValue, insertHtmlIntoIframe, logError, triggerPixel } from './utils.js';
+import { deepAccess, getKeyByValue, insertHtmlIntoIframe, isInteger, isNumber, isPlainObject, logError, triggerPixel, isBoolean, isArray, deepClone } from './utils.js';
 import {includes} from './polyfill.js';
 import {auctionManager} from './auctionManager.js';
 import CONSTANTS from './constants.json';
+import { NATIVE } from './mediaTypes.js';
+import { filters } from './targeting.js';
 
 export const nativeAdapters = [];
 
@@ -10,6 +12,50 @@ export const NATIVE_TARGETING_KEYS = Object.keys(CONSTANTS.NATIVE_KEYS).map(
 );
 
 const IMAGE = {
+  ortb: {
+    ver: '1.2',
+    assets: [
+      {
+        required: 1,
+        id: 1,
+        img: {
+          type: 3,
+          wmin: 100,
+          hmin: 100,
+        }
+      },
+      {
+        required: 1,
+        id: 2,
+        title: {
+          len: 140,
+        }
+      },
+      {
+        required: 1,
+        id: 3,
+        data: {
+          type: 1,
+        }
+      },
+      {
+        required: 0,
+        id: 4,
+        data: {
+          type: 2,
+        }
+      },
+      {
+        required: 0,
+        id: 5,
+        img: {
+          type: 1,
+          wmin: 20,
+          hmin: 20,
+        }
+      },
+    ],
+  },
   image: { required: true },
   title: { required: true },
   sponsoredBy: { required: true },
@@ -22,6 +68,13 @@ const SUPPORTED_TYPES = {
   image: IMAGE
 };
 
+const { NATIVE_ASSET_TYPES, NATIVE_IMAGE_TYPES, PREBID_NATIVE_DATA_KEYS_TO_ORTB, NATIVE_KEYS_THAT_ARE_NOT_ASSETS } = CONSTANTS;
+
+// inverse native maps useful for converting to legacy
+const PREBID_NATIVE_DATA_KEYS_TO_ORTB_INVERSE = inverse(PREBID_NATIVE_DATA_KEYS_TO_ORTB);
+const NATIVE_ASSET_TYPES_INVERSE = inverse(NATIVE_ASSET_TYPES);
+
+export const nativeMapper = new Map();
 /**
  * Recieves nativeParams from an adUnit. If the params were not of type 'type',
  * passes them on directly. If they were of type 'type', translate
@@ -29,9 +82,12 @@ const SUPPORTED_TYPES = {
  */
 export function processNativeAdUnitParams(params) {
   if (params && params.type && typeIsSupported(params.type)) {
-    return SUPPORTED_TYPES[params.type];
+    params = SUPPORTED_TYPES[params.type];
   }
 
+  if (params && params.ortb && !isOpenRTBBidRequestValid(params.ortb)) {
+    return;
+  }
   return params;
 }
 
@@ -44,6 +100,61 @@ export function decorateAdUnitsWithNativeParams(adUnits) {
     }
   });
 }
+export function isOpenRTBBidRequestValid(ortb) {
+  const assets = ortb.assets;
+  if (!Array.isArray(assets) || assets.length === 0) {
+    logError(`assets in mediaTypes.native.ortb is not an array, or it's empty. Assets: `, assets);
+    return false;
+  }
+
+  // validate that ids exist, that they are unique and that they are numbers
+  const ids = assets.map(asset => asset.id);
+  if (assets.length !== new Set(ids).size || ids.some(id => id !== parseInt(id, 10))) {
+    logError(`each asset object must have 'id' property, it must be unique and it must be an integer`);
+    return false;
+  }
+
+  if (ortb.hasOwnProperty('eventtrackers') && !Array.isArray(ortb.eventtrackers)) {
+    logError('ortb.eventtrackers is not an array. Eventtrackers: ', ortb.eventtrackers);
+    return false;
+  }
+
+  return assets.every(asset => isOpenRTBAssetValid(asset))
+}
+
+function isOpenRTBAssetValid(asset) {
+  if (!isPlainObject(asset)) {
+    logError(`asset must be an object. Provided asset: `, asset);
+    return false;
+  }
+  if (asset.img) {
+    if (!isNumber(asset.img.w) && !isNumber(asset.img.wmin)) {
+      logError(`for img asset there must be 'w' or 'wmin' property`);
+      return false;
+    }
+    if (!isNumber(asset.img.h) && !isNumber(asset.img.hmin)) {
+      logError(`for img asset there must be 'h' or 'hmin' property`);
+      return false;
+    }
+  } else if (asset.title) {
+    if (!isNumber(asset.title.len)) {
+      logError(`for title asset there must be 'len' property defined`);
+      return false;
+    }
+  } else if (asset.data) {
+    if (!isNumber(asset.data.type)) {
+      logError(`for data asset 'type' property must be a number`);
+      return false;
+    }
+  } else if (asset.video) {
+    if (!Array.isArray(asset.video.mimes) || !Array.isArray(asset.video.protocols) ||
+      !isNumber(asset.video.minduration) || !isNumber(asset.video.maxduration)) {
+      logError('video asset is not properly configured');
+      return false;
+    }
+  }
+  return true;
+}
 
 /**
  * Check if the native type specified in the adUnit is supported by Prebid.
@@ -79,24 +190,30 @@ export const hasNonNativeBidder = adUnit =>
  * @return {Boolean} If object is valid
  */
 export function nativeBidIsValid(bid, {index = auctionManager.index} = {}) {
-  // all native bid responses must define a landing page url
-  if (!deepAccess(bid, 'native.clickUrl')) {
+  const adUnit = index.getAdUnit(bid);
+  if (!adUnit) { return false; }
+  let ortbRequest =
+  adUnit?.nativeParams?.ortb || nativeMapper.get(bid.requestId) || toOrtbNativeRequest(adUnit.nativeParams);
+  let ortbResponse =
+  bid.native?.ortb || toOrtbNativeResponse(bid.native, ortbRequest);
+  return isNativeOpenRTBBidValid(ortbResponse, ortbRequest);
+}
+
+export function isNativeOpenRTBBidValid(bidORTB, bidRequestORTB) {
+  if (!deepAccess(bidORTB, 'link.url')) {
+    logError(`native response doesn't have 'link' property. Ortb response: `, bidORTB);
     return false;
   }
 
-  const requestedAssets = index.getAdUnit(bid).nativeParams;
-  if (!requestedAssets) {
-    return true;
-  }
+  let requiredAssetIds = bidRequestORTB.assets.filter(asset => asset.required === 1).map(a => a.id);
+  let returnedAssetIds = bidORTB.assets.map(asset => asset.id);
 
-  const requiredAssets = Object.keys(requestedAssets).filter(
-    key => requestedAssets[key].required
-  );
-  const returnedAssets = Object.keys(bid['native']).filter(
-    key => bid['native'][key]
-  );
+  const match = requiredAssetIds.every(assetId => includes(returnedAssetIds, assetId));
+  if (!match) {
+    logError(`didn't receive a bid with all required assets. Required ids: ${requiredAssetIds}, but received ids in response: ${returnedAssetIds}`);
+  }
 
-  return requiredAssets.every(asset => includes(returnedAssets, asset));
+  return match;
 }
 
 /*
@@ -229,28 +346,45 @@ export function getAllAssetsMessage(data, adObject) {
   const message = {
     message: 'assetResponse',
     adId: data.adId,
-    assets: []
   };
 
-  Object.keys(adObject.native).forEach(function(key, index) {
-    if (key === 'adTemplate' && adObject.native[key]) {
-      message.adTemplate = getAssetValue(adObject.native[key]);
-    } else if (key === 'rendererUrl' && adObject.native[key]) {
-      message.rendererUrl = getAssetValue(adObject.native[key]);
+  // Pass to Prebid Universal Creative all assets, the legacy ones + the ortb ones (under ortb property)
+  const ortbRequest = nativeMapper.get(adObject.requestId);
+  let nativeReq = adObject.native;
+  nativeMapper.delete(adObject.requestId);
+  const ortbResponse = adObject.native?.ortb;
+  let legacyResponse = {};
+  if (ortbRequest && ortbResponse) {
+    legacyResponse = toLegacyResponse(ortbResponse, ortbRequest);
+    nativeReq = {
+      ...adObject.native,
+      ...legacyResponse
+    };
+  }
+  if (adObject.native.ortb) {
+    message.ortb = adObject.native.ortb;
+  }
+  message.assets = [];
+
+  Object.keys(nativeReq).forEach(function(key) {
+    if (key === 'adTemplate' && nativeReq[key]) {
+      message.adTemplate = getAssetValue(nativeReq[key]);
+    } else if (key === 'rendererUrl' && nativeReq[key]) {
+      message.rendererUrl = getAssetValue(nativeReq[key]);
     } else if (key === 'ext') {
-      Object.keys(adObject.native[key]).forEach(extKey => {
-        if (adObject.native[key][extKey]) {
-          const value = getAssetValue(adObject.native[key][extKey]);
+      Object.keys(nativeReq[key]).forEach(extKey => {
+        if (nativeReq[key][extKey]) {
+          const value = getAssetValue(nativeReq[key][extKey]);
           message.assets.push({ key: extKey, value });
         }
       })
-    } else if (adObject.native[key] && CONSTANTS.NATIVE_KEYS.hasOwnProperty(key)) {
-      const value = getAssetValue(adObject.native[key]);
+    } else if (nativeReq[key] && CONSTANTS.NATIVE_KEYS.hasOwnProperty(key)) {
+      const value = getAssetValue(nativeReq[key]);
 
       message.assets.push({ key, value });
     }
   });
-
+  removeExpiredBidsFromNativeMapper();
   return message;
 }
 
@@ -280,3 +414,319 @@ function getNativeKeys(adUnit) {
     ...extraNativeKeys
   }
 }
+
+/**
+ * converts Prebid legacy native assets request to OpenRTB format
+ * @param {object} legacyNativeAssets an object that describes a native bid request in Prebid proprietary format
+ * @returns an OpenRTB format of the same bid request
+ */
+export function toOrtbNativeRequest(legacyNativeAssets) {
+  if (!legacyNativeAssets && !isPlainObject(legacyNativeAssets)) {
+    logError('Native assets object is empty or not an object: ', legacyNativeAssets);
+    return;
+  }
+  const ortb = {
+    ver: '1.2',
+    assets: []
+  };
+  for (let key in legacyNativeAssets) {
+    // skip conversion for non-asset keys
+    if (key in NATIVE_KEYS_THAT_ARE_NOT_ASSETS) continue;
+
+    const asset = legacyNativeAssets[key];
+    let required = 0;
+    if (asset.required && isBoolean(asset.required)) {
+      required = Number(asset.required);
+    }
+    const ortbAsset = {
+      id: ortb.assets.length,
+      required
+    };
+    // data cases
+    if (key in PREBID_NATIVE_DATA_KEYS_TO_ORTB) {
+      ortbAsset.data = {
+        type: NATIVE_ASSET_TYPES[PREBID_NATIVE_DATA_KEYS_TO_ORTB[key]]
+      }
+      if (asset.len) {
+        ortbAsset.data.len = asset.len;
+      }
+    // icon or image case
+    } else if (key === 'icon' || key === 'image') {
+      ortbAsset.img = {
+        type: key === 'icon' ? NATIVE_IMAGE_TYPES.ICON : NATIVE_IMAGE_TYPES.MAIN,
+      }
+      // if min_width and min_height are defined in aspect_ratio, they are preferred
+      if (asset.aspect_ratios) {
+        if (!isArray(asset.aspect_ratios)) {
+          logError("image.aspect_ratios was passed, but it's not a an array:", asset.aspect_ratios);
+        } else if (asset.aspect_ratios.length != 1) {
+          logError("image.aspect_ratios was passed, but it's empty:", asset.aspect_ratios);
+        } else {
+          const { min_width: minWidth, min_height: minHeight } = asset.aspect_ratios[0];
+          if (!isInteger(minWidth) || !isInteger(minHeight)) {
+            logError('image.aspect_ratios min_width or min_height are invalid: ', minWidth, minHeight);
+          } else {
+            ortbAsset.img.wmin = minWidth;
+            ortbAsset.img.hmin = minHeight;
+          }
+        }
+      }
+
+      // if asset.sizes exist, by OpenRTB spec we should remove wmin and hmin
+      if (asset.sizes) {
+        if (asset.sizes.length != 2 || !isInteger(asset.sizes[0]) || !isInteger(asset.sizes[1])) {
+          logError('image.sizes was passed, but its value is not an array of integers:', asset.sizes);
+        } else {
+          ortbAsset.img.w = asset.sizes[0];
+          ortbAsset.img.h = asset.sizes[1];
+          delete ortbAsset.img.hmin;
+          delete ortbAsset.img.wmin;
+        }
+      }
+    // title case
+    } else if (key === 'title') {
+      ortbAsset.title = {
+        // in openRTB, len is required for titles, while in legacy prebid was not.
+        // for this reason, if len is missing in legacy prebid, we're adding a default value of 140.
+        len: asset.len || 140
+      }
+    // all extensions to the native bid request are passed as is
+    } else if (key === 'ext') {
+      ortbAsset.ext = {
+        asset
+      };
+      // in `ext` case, required field is not needed
+      delete ortbAsset.required;
+    }
+
+    ortb.assets.push(ortbAsset);
+  }
+  return ortb;
+}
+
+/**
+ * This function converts an OpenRTB native request object to Prebid proprietary
+ * format. The purpose of this function is to help adapters to handle the
+ * transition phase where publishers may be using OpenRTB objects but the
+ *  bidder does not yet support it.
+ * @param {object} openRTBRequest an OpenRTB v1.2 request object
+ * @returns a Prebid legacy native format request
+ */
+export function fromOrtbNativeRequest(openRTBRequest) {
+  if (!isOpenRTBBidRequestValid(openRTBRequest)) {
+    return;
+  }
+
+  const oldNativeObject = {};
+  for (const asset of openRTBRequest.assets) {
+    if (asset.title) {
+      const title = {
+        required: asset.required ? Boolean(asset.required) : false,
+        len: asset.title.len
+      }
+      oldNativeObject.title = title;
+    } else if (asset.img) {
+      const image = {
+        required: asset.required ? Boolean(asset.required) : false,
+      }
+      if (asset.img.w && asset.img.h) {
+        image.sizes = [asset.img.w, asset.img.h];
+      } else if (asset.img.wmin && asset.img.hmin) {
+        image.aspect_ratios = {
+          min_width: asset.img.wmin,
+          min_height: asset.img.hmin,
+          ratio_width: asset.img.wmin,
+          ratio_height: asset.img.hmin
+        }
+      }
+
+      if (asset.img.type === NATIVE_IMAGE_TYPES.MAIN) {
+        oldNativeObject.image = image;
+      } else {
+        oldNativeObject.icon = image;
+      }
+    } else if (asset.data) {
+      let assetType = Object.keys(NATIVE_ASSET_TYPES).find(k => NATIVE_ASSET_TYPES[k] === asset.data.type);
+      let prebidAssetName = Object.keys(PREBID_NATIVE_DATA_KEYS_TO_ORTB).find(k => PREBID_NATIVE_DATA_KEYS_TO_ORTB[k] === assetType);
+      oldNativeObject[prebidAssetName] = {
+        required: asset.required ? Boolean(asset.required) : false,
+      }
+      if (asset.data.len) {
+        oldNativeObject[prebidAssetName].len = asset.data.len;
+      }
+    }
+    // video was not supported by old prebid assets
+  }
+  return oldNativeObject;
+}
+
+/**
+ * Converts an OpenRTB request to a proprietary Prebid.js format.
+ * The proprietary Prebid format has many limitations and will be dropped in
+ * the future; adapters are encouraged to stop using it in favour of OpenRTB format.
+ * IMPLEMENTATION DETAILS: This function returns the same exact object if no
+ * conversion is needed. If a conversion is needed (meaning, at least one
+ * bidRequest contains a native.ortb definition), it will return a copy.
+ *
+ * @param {BidRequest[]} bidRequests an array of valid bid requests
+ * @returns an array of valid bid requests where the openRTB bids are converted to proprietary format.
+ */
+export function convertOrtbRequestToProprietaryNative(bidRequests) {
+  let needsToBeCopied = false;
+  if (!bidRequests || !isArray(bidRequests)) return bidRequests;
+  if (FEATURES.NATIVE) {
+    // check if a conversion is needed
+    needsToBeCopied = bidRequests.some(bidRequest => bidRequest.mediaTypes && bidRequest.mediaTypes[NATIVE] && bidRequest.mediaTypes[NATIVE].ortb);
+    if (!needsToBeCopied) return bidRequests;
+    let bidRequestsCopy = deepClone(bidRequests);
+    // convert Native ORTB definition to old-style prebid native definition
+    for (const bidRequest of bidRequestsCopy) {
+      if (bidRequest.mediaTypes && bidRequest.mediaTypes[NATIVE] && bidRequest.mediaTypes[NATIVE].ortb) {
+        bidRequest.mediaTypes[NATIVE] = {
+          // to keep other keywords like sendTargetingKeys, rendererUrl...
+          ...Object.keys(bidRequest.mediaTypes[NATIVE])
+            .filter(key => NATIVE_KEYS_THAT_ARE_NOT_ASSETS.includes(key))
+            .reduce((obj, key) => ({
+              ...obj,
+              [key]: bidRequest.mediaTypes[NATIVE][key]
+            }), {}),
+          ...fromOrtbNativeRequest(bidRequest.mediaTypes[NATIVE].ortb)
+        }
+        bidRequest.nativeParams = bidRequest.mediaTypes[NATIVE];
+        if (bidRequest.nativeParams) {
+          processNativeAdUnitParams(bidRequest.nativeParams);
+        }
+      }
+    }
+    return bidRequestsCopy;
+  }
+  return bidRequests;
+}
+
+export function toOrtbNativeResponse(legacyResponse, ortbRequest) {
+  const ortbResponse = {
+    link: {},
+    assets: [],
+    eventtrackers: []
+  };
+  Object.keys(legacyResponse).filter(key => !!legacyResponse[key]).forEach(key => {
+    const value = legacyResponse[key];
+    switch (key) {
+      // process titles
+      case 'title':
+        const titleAsset = ortbRequest.assets.find(asset => asset.title != null);
+        titleAsset.title = {
+          text: value
+        };
+        ortbResponse.assets.push(titleAsset);
+        break;
+      case 'image':
+      case 'icon':
+        const imageType = key === 'image' ? NATIVE_IMAGE_TYPES.MAIN : NATIVE_IMAGE_TYPES.ICON;
+        const imageAsset = ortbRequest.assets.find(asset => asset.img != null && asset.img.type == imageType);
+        imageAsset.img = {
+          url: value
+        };
+        ortbResponse.assets.push(imageAsset);
+        break;
+      case 'clickUrl':
+        ortbResponse.link.url = value;
+        break;
+      case 'clickTrackers':
+        ortbResponse.link.clicktrackers = value;
+        break;
+      case 'impressionTrackers':
+      case 'javascriptTrackers':
+        ortbResponse.eventtrackers.push({
+          event: 1,
+          method: key == 'impressionTrackers' ? 1 : 2,
+          url: value,
+        });
+        break;
+      default:
+        if (key in PREBID_NATIVE_DATA_KEYS_TO_ORTB) {
+          const dataAsset = ortbRequest.assets.find(asset => asset.data != null && asset.data.type === NATIVE_ASSET_TYPES[PREBID_NATIVE_DATA_KEYS_TO_ORTB[key]]);
+          dataAsset.data = {
+            value
+          };
+          ortbResponse.assets.push(dataAsset);
+        }
+        break;
+    }
+  });
+  return ortbResponse;
+}
+
+/**
+ * Generates a legacy response from an ortb response. Useful during the transition period.
+ * @param {*} ortbResponse a standard ortb response object
+ * @param {*} ortbRequest the ortb request, useful to match ids.
+ * @returns an object containing the response in legacy native format: { title: "this is a title", image: ... }
+ */
+function toLegacyResponse(ortbResponse, ortbRequest) {
+  const legacyResponse = {};
+  const requestAssets = ortbRequest?.assets || [];
+  legacyResponse.clickUrl = ortbResponse.link.url;
+  for (const asset of ortbResponse?.assets || []) {
+    const requestAsset = requestAssets.find(reqAsset => asset.id === reqAsset.id);
+    if (asset.title) {
+      legacyResponse.title = asset.title.text;
+    } else if (asset.img) {
+      legacyResponse[requestAsset.img.type === NATIVE_IMAGE_TYPES.MAIN ? 'image' : 'icon'] = asset.img.url;
+    } else if (asset.data) {
+      legacyResponse[PREBID_NATIVE_DATA_KEYS_TO_ORTB_INVERSE[NATIVE_ASSET_TYPES_INVERSE[requestAsset.data.type]]] = asset.data.value;
+    }
+  }
+  return legacyResponse;
+}
+
+/**
+ * Converts a Legacy native request to OpenRTB.
+ * The proprietary Prebid format has many limitations and will be dropped in
+ * the future; adapters are encouraged to stop using it in favour of OpenRTB format.
+ * @param {BidRequest[]} bidRequests an array of valid bid requests
+ * @returns an array of valid bid requests where the legacy format is converted to OpenRTB.
+ */
+export function convertLegacyNativeRequestToOrtb(bidRequests) {
+  if (!bidRequests || !isArray(bidRequests)) return bidRequests;
+  // convert Native ORTB definition to old-style prebid native definition
+  for (const bidRequest of bidRequests) {
+    if (bidRequest.mediaTypes && bidRequest.mediaTypes[NATIVE]) {
+      if (bidRequest.mediaTypes[NATIVE].ortb) continue;
+      // legacy case
+      const ortbRequest = toOrtbNativeRequest(bidRequest.mediaTypes[NATIVE]);
+      bidRequest.mediaTypes[NATIVE] = {
+        ...Object.entries(bidRequest.mediaTypes['native'])
+          .filter(([key, value]) => NATIVE_KEYS_THAT_ARE_NOT_ASSETS.includes(key))
+          .reduce((acc, curr) => { acc[curr[0]] = curr[1]; return acc }, {}),
+        ortb: ortbRequest
+      }
+      nativeMapper.set(bidRequest.bidId, ortbRequest);
+      // to keep other keywords like sendTargetingKeys, rendererUrl...
+      bidRequest.nativeParams = bidRequest.mediaTypes[NATIVE];
+      if (bidRequest.nativeParams) {
+        processNativeAdUnitParams(bidRequest.nativeParams);
+      }
+    }
+  }
+  return bidRequests;
+}
+
+/**
+ * Inverts key-values of an object.
+ */
+function inverse(obj) {
+  var retobj = {};
+  for (var key in obj) {
+    retobj[obj[key]] = key;
+  }
+  return retobj;
+}
+
+// to avoid memory leaks, this function will try to remove expired bids from the native wrapper.
+function removeExpiredBidsFromNativeMapper() {
+  const expiredBids = auctionManager.getBidsReceived().filter((bid) => !filters.isBidNotExpired(bid));
+  for (const expiredBid of expiredBids) {
+    nativeMapper.delete(expiredBid.requestId);
+  }
+}
diff --git a/src/prebid.js b/src/prebid.js
index a87c5a27f70..c9e26225076 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -129,6 +129,16 @@ function validateVideoMediaType(adUnit) {
 function validateNativeMediaType(adUnit) {
   const validatedAdUnit = deepClone(adUnit);
   const native = validatedAdUnit.mediaTypes.native;
+  // if native assets are specified in OpenRTB format, remove legacy assets and print a warn.
+  if (native.ortb) {
+    const legacyNativeKeys = Object.keys(CONSTANTS.NATIVE_KEYS).filter(key => CONSTANTS.NATIVE_KEYS[key].includes('hb_native_'));
+    const nativeKeys = Object.keys(native);
+    const intersection = nativeKeys.filter(nativeKey => legacyNativeKeys.includes(nativeKey));
+    if (intersection.length > 0) {
+      logError(`when using native OpenRTB format, you cannot use legacy native properties. Deleting ${intersection} keys from request.`);
+      intersection.forEach(legacyKey => delete validatedAdUnit.mediaTypes.native[legacyKey]);
+    }
+  }
   if (native.image && native.image.sizes && !Array.isArray(native.image.sizes)) {
     logError('Please use an array of sizes for native.image.sizes field.  Removing invalid mediaTypes.native.image.sizes property from request.');
     delete validatedAdUnit.mediaTypes.native.image.sizes;
diff --git a/src/secureCreatives.js b/src/secureCreatives.js
index 7eacb3c3fc0..d0c06f6ab1a 100644
--- a/src/secureCreatives.js
+++ b/src/secureCreatives.js
@@ -15,6 +15,7 @@ import {emitAdRenderFail, emitAdRenderSucceeded} from './adRendering.js';
 
 const BID_WON = constants.EVENTS.BID_WON;
 const STALE_RENDER = constants.EVENTS.STALE_RENDER;
+const WON_AD_IDS = new WeakSet();
 
 const HANDLER_MAP = {
   'Prebid Request': handleRenderRequest,
@@ -113,6 +114,13 @@ function handleNativeRequest(reply, data, adObject) {
     logError(`Cannot find ad '${data.adId}' for x-origin event request`);
     return;
   }
+
+  if (!WON_AD_IDS.has(adObject)) {
+    WON_AD_IDS.add(adObject);
+    auctionManager.addWinningBid(adObject);
+    events.emit(BID_WON, adObject);
+  }
+
   switch (data.action) {
     case 'assetRequest':
       reply(getAssetMessage(data, adObject));
@@ -126,12 +134,7 @@ function handleNativeRequest(reply, data, adObject) {
       resizeRemoteCreative(adObject);
       break;
     default:
-      const trackerType = fireNativeTrackers(data, adObject);
-      if (trackerType === 'click') {
-        return;
-      }
-      auctionManager.addWinningBid(adObject);
-      events.emit(BID_WON, adObject);
+      fireNativeTrackers(data, adObject);
   }
 }
 
@@ -190,7 +193,7 @@ function resizeRemoteCreative({ adId, adUnitCode, width, height }) {
     let element = getElementByAdUnit(elmType + ':not([style*="display: none"])');
     if (element) {
       let elementStyle = element.style;
-      elementStyle.width = width + 'px';
+      elementStyle.width = width ? width + 'px' : '100%';
       elementStyle.height = height + 'px';
     } else {
       logWarn(`Unable to locate matching page element for adUnitCode ${adUnitCode}.  Can't resize it to ad's dimensions.  Please review setup.`);
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index b1bbb02a115..0495c7000d1 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -87,6 +87,84 @@ const REQUEST = {
   ]
 };
 
+const NATIVE_ORTB_MTO = {
+  ortb: {
+    context: 3,
+    plcmttype: 2,
+    eventtrackers: [
+      {
+        event: 1,
+        methods: [
+          1
+        ]
+      },
+      {
+        event: 2,
+        methods: [
+          2
+        ]
+      }
+    ],
+    assets: [
+      {
+        id: 1,
+        required: 1,
+        img: {
+          type: 3,
+          w: 300,
+          h: 250
+        }
+      },
+      {
+        id: 2,
+        required: 1,
+        img: {
+          type: 1,
+          w: 127,
+          h: 83
+        }
+      },
+      {
+        id: 3,
+        required: 1,
+        data: {
+          type: 1,
+          len: 25
+        }
+      },
+      {
+        id: 4,
+        required: 1,
+        title: {
+          len: 140
+        }
+      },
+      {
+        id: 5,
+        required: 1,
+        data: {
+          type: 2,
+          len: 40
+        }
+      },
+      {
+        id: 6,
+        required: 1,
+        data: {
+          type: 12,
+          len: 15
+        }
+      },
+    ],
+    ext: {
+      custom_param: {
+        key: 'custom_value'
+      }
+    },
+    ver: '1.2'
+  }
+}
+
 const VIDEO_REQUEST = {
   'account_id': '1',
   'tid': '437fbbf5-33f5-487a-8e16-a7112903cfe5',
@@ -1196,7 +1274,7 @@ describe('S2S Adapter', function () {
               } else {
                 delete getGlobal().convertCurrency;
               }
-            })
+            });
 
             it(`should pick the ${expectDesc}`, () => {
               adapter.callBids(s2sReq, BID_REQUESTS, addBidResponse, done, ajax);
@@ -1209,97 +1287,121 @@ describe('S2S Adapter', function () {
       });
     });
 
-    it('adds device.w and device.h even if the config lacks a device object', function () {
-      const _config = {
-        s2sConfig: CONFIG,
-        app: { bundle: 'com.test.app' },
-      };
-
-      config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
-      const requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(requestBid.device).to.deep.equal({
-        w: window.innerWidth,
-        h: window.innerHeight
-      });
-      expect(requestBid.app).to.deep.equal({
-        bundle: 'com.test.app',
-        publisher: { 'id': '1' }
-      });
-    });
-
     if (FEATURES.NATIVE) {
-      it('adds native request for OpenRTB', function () {
-        const _config = {
-          s2sConfig: CONFIG
-        };
+      describe('native requests', function () {
+        it('adds device.w and device.h even if the config lacks a device object', function () {
+          const _config = {
+            s2sConfig: CONFIG,
+            app: { bundle: 'com.test.app' },
+          };
 
-        config.setConfig(_config);
-        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
-        const requestBid = JSON.parse(server.requests[0].requestBody);
+          config.setConfig(_config);
+          adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+          const requestBid = JSON.parse(server.requests[0].requestBody);
+          expect(requestBid.device).to.deep.equal({
+            w: window.innerWidth,
+            h: window.innerHeight
+          });
+          expect(requestBid.app).to.deep.equal({
+            bundle: 'com.test.app',
+            publisher: { 'id': '1' }
+          });
+        });
 
-        expect(requestBid.imp[0].native).to.deep.equal({
-          request: JSON.stringify({
-            'context': 1,
-            'plcmttype': 1,
-            'eventtrackers': [{
-              event: 1,
-              methods: [1]
-            }],
-            'assets': [
-              {
-                'required': 1,
-                'id': 0,
-                'title': {
-                  'len': 800
-                }
-              },
-              {
-                'required': 1,
-                'id': 1,
-                'img': {
-                  'type': 3,
-                  'w': 989,
-                  'h': 742
-                }
-              },
-              {
-                'required': 1,
-                'id': 2,
-                'img': {
-                  'type': 1,
-                  'wmin': 10,
-                  'hmin': 10,
-                  'ext': {
-                    'aspectratios': ['1:1']
+        it('adds native request for OpenRTB', function () {
+          const _config = {
+            s2sConfig: CONFIG
+          };
+
+          config.setConfig(_config);
+          adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+          const requestBid = JSON.parse(server.requests[0].requestBody);
+
+          expect(requestBid.imp[0].native).to.deep.equal({
+            request: JSON.stringify({
+              'context': 1,
+              'plcmttype': 1,
+              'eventtrackers': [{
+                event: 1,
+                methods: [1]
+              }],
+              'assets': [
+                {
+                  'required': 1,
+                  'id': 0,
+                  'title': {
+                    'len': 800
+                  }
+                },
+                {
+                  'required': 1,
+                  'id': 1,
+                  'img': {
+                    'type': 3,
+                    'w': 989,
+                    'h': 742
+                  }
+                },
+                {
+                  'required': 1,
+                  'id': 2,
+                  'img': {
+                    'type': 1,
+                    'wmin': 10,
+                    'hmin': 10,
+                    'ext': {
+                      'aspectratios': ['1:1']
+                    }
+                  }
+                },
+                {
+                  'required': 1,
+                  'id': 3,
+                  'data': {
+                    'type': 1
                   }
                 }
-              },
-              {
-                'required': 1,
-                'id': 3,
-                'data': {
-                  'type': 1
-                }
-              }
-            ]
-          }),
-          ver: '1.2'
+              ]
+            }),
+            ver: '1.2'
+          });
         });
-      });
 
-      it('should not include ext.aspectratios if adunit\'s aspect_ratios do not define radio_width and ratio_height', () => {
-        const req = deepClone(REQUEST);
-        req.ad_units[0].mediaTypes.native.icon.aspect_ratios[0] = {'min_width': 1, 'min_height': 2};
-        prepRequest(req);
-        adapter.callBids(req, BID_REQUESTS, addBidResponse, done, ajax);
-        const nativeReq = JSON.parse(JSON.parse(server.requests[0].requestBody).imp[0].native.request);
-        const icons = nativeReq.assets.map((a) => a.img).filter((img) => img && img.type === 1);
-        expect(icons).to.have.length(1);
-        expect(icons[0].hmin).to.equal(2);
-        expect(icons[0].wmin).to.equal(1);
-        expect(deepAccess(icons[0], 'ext.aspectratios')).to.be.undefined;
-      })
+        it('adds native ortb request for OpenRTB', function () {
+          const _config = {
+            s2sConfig: CONFIG
+          };
+
+          const openRtbNativeRequest = deepClone(REQUEST);
+          delete openRtbNativeRequest.ad_units[0].mediaTypes.native;
+          delete openRtbNativeRequest.ad_units[0].nativeParams;
+
+          openRtbNativeRequest.ad_units[0].mediaTypes.native = NATIVE_ORTB_MTO;
+          prepRequest(openRtbNativeRequest);
+
+          config.setConfig(_config);
+          adapter.callBids(openRtbNativeRequest, BID_REQUESTS, addBidResponse, done, ajax);
+          const requestBid = JSON.parse(server.requests[0].requestBody);
+
+          expect(requestBid.imp[0].native).to.deep.equal({
+            request: JSON.stringify(NATIVE_ORTB_MTO.ortb),
+            ver: '1.2'
+          });
+        });
+
+        it('should not include ext.aspectratios if adunit\'s aspect_ratios do not define radio_width and ratio_height', () => {
+          const req = deepClone(REQUEST);
+          req.ad_units[0].mediaTypes.native.icon.aspect_ratios[0] = {'min_width': 1, 'min_height': 2};
+          prepRequest(req);
+          adapter.callBids(req, BID_REQUESTS, addBidResponse, done, ajax);
+          const nativeReq = JSON.parse(JSON.parse(server.requests[0].requestBody).imp[0].native.request);
+          const icons = nativeReq.assets.map((a) => a.img).filter((img) => img && img.type === 1);
+          expect(icons).to.have.length(1);
+          expect(icons[0].hmin).to.equal(2);
+          expect(icons[0].wmin).to.equal(1);
+          expect(deepAccess(icons[0], 'ext.aspectratios')).to.be.undefined;
+        });
+      });
     }
 
     it('adds site if app is not present', function () {
diff --git a/test/spec/native_spec.js b/test/spec/native_spec.js
index 66e11b9a472..ce69c299697 100644
--- a/test/spec/native_spec.js
+++ b/test/spec/native_spec.js
@@ -5,10 +5,14 @@ import {
   nativeBidIsValid,
   getAssetMessage,
   getAllAssetsMessage,
-  decorateAdUnitsWithNativeParams
+  decorateAdUnitsWithNativeParams,
+  isOpenRTBBidRequestValid,
+  isNativeOpenRTBBidValid,
+  toOrtbNativeRequest,
 } from 'src/native.js';
 import CONSTANTS from 'src/constants.json';
-import {stubAuctionIndex} from '../helpers/indexStub.js';
+import { stubAuctionIndex } from '../helpers/indexStub.js';
+import { convertOrtbRequestToProprietaryNative, fromOrtbNativeRequest } from '../../src/native.js';
 const utils = require('src/utils');
 
 const bid = {
@@ -21,23 +25,23 @@ const bid = {
     image: {
       url: 'http://cdn.example.com/p/creative-image/image.png',
       height: 83,
-      width: 127
+      width: 127,
     },
     icon: {
       url: 'http://cdn.example.com/p/creative-image/icon.jpg',
       height: 742,
-      width: 989
+      width: 989,
     },
     sponsoredBy: 'AppNexus',
     clickUrl: 'https://www.link.example',
     clickTrackers: ['https://tracker.example'],
     impressionTrackers: ['https://impression.example'],
-    javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>',
+    javascriptTrackers: '<script src="http://www.foobar.js"></script>',
     ext: {
       foo: 'foo-value',
-      baz: 'baz-value'
-    }
-  }
+      baz: 'baz-value',
+    },
+  },
 };
 
 const bidWithUndefinedFields = {
@@ -50,12 +54,12 @@ const bidWithUndefinedFields = {
     clickUrl: 'https://www.link.example',
     clickTrackers: ['https://tracker.example'],
     impressionTrackers: ['https://impression.example'],
-    javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>',
+    javascriptTrackers: '<script src="http://www.foobar.js"></script>',
     ext: {
       foo: 'foo-value',
-      baz: undefined
-    }
-  }
+      baz: undefined,
+    },
+  },
 };
 
 describe('native.js', function () {
@@ -80,7 +84,9 @@ describe('native.js', function () {
     const targeting = getNativeTargeting(bid);
     expect(targeting[CONSTANTS.NATIVE_KEYS.title]).to.equal(bid.native.title);
     expect(targeting[CONSTANTS.NATIVE_KEYS.body]).to.equal(bid.native.body);
-    expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal(bid.native.clickUrl);
+    expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal(
+      bid.native.clickUrl
+    );
     expect(targeting.hb_native_foo).to.equal(bid.native.foo);
   });
 
@@ -92,19 +98,23 @@ describe('native.js', function () {
         clickUrl: { sendId: true },
         ext: {
           foo: {
-            sendId: false
+            sendId: false,
           },
           baz: {
-            sendId: true
-          }
-        }
-      }
+            sendId: true,
+          },
+        },
+      },
     };
     const targeting = getNativeTargeting(bid, deps(adUnit));
 
     expect(targeting[CONSTANTS.NATIVE_KEYS.title]).to.equal(bid.native.title);
-    expect(targeting[CONSTANTS.NATIVE_KEYS.body]).to.equal('hb_native_body:123');
-    expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal('hb_native_linkurl:123');
+    expect(targeting[CONSTANTS.NATIVE_KEYS.body]).to.equal(
+      'hb_native_body:123'
+    );
+    expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal(
+      'hb_native_linkurl:123'
+    );
     expect(targeting.hb_native_foo).to.equal(bid.native.ext.foo);
     expect(targeting.hb_native_baz).to.equal('hb_native_baz:123');
   });
@@ -117,13 +127,13 @@ describe('native.js', function () {
         clickUrl: { sendId: true },
         ext: {
           foo: {
-            required: false
+            required: false,
           },
           baz: {
-            required: false
-          }
-        }
-      }
+            required: false,
+          },
+        },
+      },
     };
 
     const targeting = getNativeTargeting(bidWithUndefinedFields, deps(adUnit));
@@ -132,7 +142,7 @@ describe('native.js', function () {
       CONSTANTS.NATIVE_KEYS.title,
       CONSTANTS.NATIVE_KEYS.sponsoredBy,
       CONSTANTS.NATIVE_KEYS.clickUrl,
-      'hb_native_foo'
+      'hb_native_foo',
     ]);
   });
 
@@ -142,22 +152,19 @@ describe('native.js', function () {
       nativeParams: {
         image: {
           required: true,
-          sizes: [150, 50]
+          sizes: [150, 50],
         },
         title: {
           required: true,
           len: 80,
-          sendTargetingKeys: true
+          sendTargetingKeys: true,
         },
         sendTargetingKeys: false,
-      }
-
+      },
     };
     const targeting = getNativeTargeting(bid, deps(adUnit));
 
-    expect(Object.keys(targeting)).to.deep.equal([
-      CONSTANTS.NATIVE_KEYS.title
-    ]);
+    expect(Object.keys(targeting)).to.deep.equal([CONSTANTS.NATIVE_KEYS.title]);
   });
 
   it('should only include targeting if sendTargetingKeys not set to false', function () {
@@ -166,38 +173,37 @@ describe('native.js', function () {
       nativeParams: {
         image: {
           required: true,
-          sizes: [150, 50]
+          sizes: [150, 50],
         },
         title: {
           required: true,
-          len: 80
+          len: 80,
         },
         body: {
-          required: true
+          required: true,
         },
         clickUrl: {
-          required: true
+          required: true,
         },
         icon: {
           required: false,
-          sendTargetingKeys: false
+          sendTargetingKeys: false,
         },
         cta: {
           required: false,
-          sendTargetingKeys: false
+          sendTargetingKeys: false,
         },
         sponsoredBy: {
           required: false,
-          sendTargetingKeys: false
+          sendTargetingKeys: false,
         },
         ext: {
           foo: {
             required: false,
-            sendTargetingKeys: true
-          }
-        }
-      }
-
+            sendTargetingKeys: true,
+          },
+        },
+      },
     };
     const targeting = getNativeTargeting(bid, deps(adUnit));
 
@@ -206,7 +212,7 @@ describe('native.js', function () {
       CONSTANTS.NATIVE_KEYS.body,
       CONSTANTS.NATIVE_KEYS.image,
       CONSTANTS.NATIVE_KEYS.clickUrl,
-      'hb_native_foo'
+      'hb_native_foo',
     ]);
   });
 
@@ -216,17 +222,16 @@ describe('native.js', function () {
       nativeParams: {
         image: {
           required: true,
-          sizes: [150, 50]
+          sizes: [150, 50],
         },
         title: {
           required: true,
           len: 80,
         },
         rendererUrl: {
-          url: 'https://www.renderer.com/'
-        }
-      }
-
+          url: 'https://www.renderer.com/',
+        },
+      },
     };
     const targeting = getNativeTargeting(bid, deps(adUnit));
 
@@ -238,7 +243,7 @@ describe('native.js', function () {
       CONSTANTS.NATIVE_KEYS.icon,
       CONSTANTS.NATIVE_KEYS.sponsoredBy,
       CONSTANTS.NATIVE_KEYS.clickUrl,
-      CONSTANTS.NATIVE_KEYS.rendererUrl
+      CONSTANTS.NATIVE_KEYS.rendererUrl,
     ]);
 
     expect(bid.native.rendererUrl).to.deep.equal('https://www.renderer.com/');
@@ -251,15 +256,14 @@ describe('native.js', function () {
       nativeParams: {
         image: {
           required: true,
-          sizes: [150, 50]
+          sizes: [150, 50],
         },
         title: {
           required: true,
           len: 80,
         },
-        adTemplate: '<div><p>##hb_native_body##<\/p><\/div>'
-      }
-
+        adTemplate: '<div><p>##hb_native_body##</p></div>',
+      },
     };
     const targeting = getNativeTargeting(bid, deps(adUnit));
 
@@ -270,10 +274,12 @@ describe('native.js', function () {
       CONSTANTS.NATIVE_KEYS.image,
       CONSTANTS.NATIVE_KEYS.icon,
       CONSTANTS.NATIVE_KEYS.sponsoredBy,
-      CONSTANTS.NATIVE_KEYS.clickUrl
+      CONSTANTS.NATIVE_KEYS.clickUrl,
     ]);
 
-    expect(bid.native.adTemplate).to.deep.equal('<div><p>##hb_native_body##<\/p><\/div>');
+    expect(bid.native.adTemplate).to.deep.equal(
+      '<div><p>##hb_native_body##</p></div>'
+    );
     delete bid.native.adTemplate;
   });
 
@@ -281,7 +287,10 @@ describe('native.js', function () {
     fireNativeTrackers({}, bid);
     sinon.assert.calledOnce(triggerPixelStub);
     sinon.assert.calledWith(triggerPixelStub, bid.native.impressionTrackers[0]);
-    sinon.assert.calledWith(insertHtmlIntoIframeStub, bid.native.javascriptTrackers);
+    sinon.assert.calledWith(
+      insertHtmlIntoIframeStub,
+      bid.native.javascriptTrackers
+    );
   });
 
   it('fires click trackers', function () {
@@ -291,7 +300,7 @@ describe('native.js', function () {
     sinon.assert.calledWith(triggerPixelStub, bid.native.clickTrackers[0]);
   });
 
-  it('creates native asset message', function() {
+  it('creates native asset message', function () {
     const messageRequest = {
       message: 'Prebid Native',
       action: 'assetRequest',
@@ -304,19 +313,19 @@ describe('native.js', function () {
     expect(message.assets.length).to.equal(3);
     expect(message.assets).to.deep.include({
       key: 'body',
-      value: bid.native.body
+      value: bid.native.body,
     });
     expect(message.assets).to.deep.include({
       key: 'image',
-      value: bid.native.image.url
+      value: bid.native.image.url,
     });
     expect(message.assets).to.deep.include({
       key: 'clickUrl',
-      value: bid.native.clickUrl
+      value: bid.native.clickUrl,
     });
   });
 
-  it('creates native all asset message', function() {
+  it('creates native all asset message', function () {
     const messageRequest = {
       message: 'Prebid Native',
       action: 'allAssetRequest',
@@ -328,43 +337,43 @@ describe('native.js', function () {
     expect(message.assets.length).to.equal(9);
     expect(message.assets).to.deep.include({
       key: 'body',
-      value: bid.native.body
+      value: bid.native.body,
     });
     expect(message.assets).to.deep.include({
       key: 'image',
-      value: bid.native.image.url
+      value: bid.native.image.url,
     });
     expect(message.assets).to.deep.include({
       key: 'clickUrl',
-      value: bid.native.clickUrl
+      value: bid.native.clickUrl,
     });
     expect(message.assets).to.deep.include({
       key: 'title',
-      value: bid.native.title
+      value: bid.native.title,
     });
     expect(message.assets).to.deep.include({
       key: 'icon',
-      value: bid.native.icon.url
+      value: bid.native.icon.url,
     });
     expect(message.assets).to.deep.include({
       key: 'cta',
-      value: bid.native.cta
+      value: bid.native.cta,
     });
     expect(message.assets).to.deep.include({
       key: 'sponsoredBy',
-      value: bid.native.sponsoredBy
+      value: bid.native.sponsoredBy,
     });
     expect(message.assets).to.deep.include({
       key: 'foo',
-      value: bid.native.ext.foo
+      value: bid.native.ext.foo,
     });
     expect(message.assets).to.deep.include({
       key: 'baz',
-      value: bid.native.ext.baz
+      value: bid.native.ext.baz,
     });
   });
 
-  it('creates native all asset message with only defined fields', function() {
+  it('creates native all asset message with only defined fields', function () {
     const messageRequest = {
       message: 'Prebid Native',
       action: 'allAssetRequest',
@@ -376,23 +385,97 @@ describe('native.js', function () {
     expect(message.assets.length).to.equal(4);
     expect(message.assets).to.deep.include({
       key: 'clickUrl',
-      value: bid.native.clickUrl
+      value: bid.native.clickUrl,
     });
     expect(message.assets).to.deep.include({
       key: 'title',
-      value: bid.native.title
+      value: bid.native.title,
     });
     expect(message.assets).to.deep.include({
       key: 'sponsoredBy',
-      value: bid.native.sponsoredBy
+      value: bid.native.sponsoredBy,
     });
     expect(message.assets).to.deep.include({
       key: 'foo',
-      value: bid.native.ext.foo
+      value: bid.native.ext.foo,
     });
   });
 });
 
+describe('validate native openRTB', function () {
+  it('should validate openRTB request', function () {
+    let openRTBNativeRequest = { assets: [] };
+    // assets array can't be empty
+    expect(isOpenRTBBidRequestValid(openRTBNativeRequest)).to.eq(false);
+    openRTBNativeRequest.assets.push({
+      id: 1.5,
+      required: 1,
+      title: {},
+    });
+
+    // asset.id must be integer
+    expect(isOpenRTBBidRequestValid(openRTBNativeRequest)).to.eq(false);
+    openRTBNativeRequest.assets[0].id = 1;
+    // title must have 'len' property
+    expect(isOpenRTBBidRequestValid(openRTBNativeRequest)).to.eq(false);
+    openRTBNativeRequest.assets[0].title.len = 140;
+    // openRTB request is valid
+    expect(isOpenRTBBidRequestValid(openRTBNativeRequest)).to.eq(true);
+
+    openRTBNativeRequest.assets.push({
+      id: 2,
+      required: 1,
+      video: {
+        mimes: [],
+        protocols: [],
+        minduration: 50,
+      },
+    });
+    // video asset should have all required properties
+    expect(isOpenRTBBidRequestValid(openRTBNativeRequest)).to.eq(false);
+    openRTBNativeRequest.assets[1].video.maxduration = 60;
+    expect(isOpenRTBBidRequestValid(openRTBNativeRequest)).to.eq(true);
+  });
+
+  it('should validate openRTB native bid', function () {
+    const openRTBRequest = {
+      assets: [
+        {
+          id: 1,
+          required: 1,
+        },
+        {
+          id: 2,
+          required: 0,
+        },
+        {
+          id: 3,
+          required: 1,
+        },
+      ],
+    };
+    let openRTBBid = {
+      assets: [
+        {
+          id: 1,
+        },
+        {
+          id: 2,
+        },
+      ],
+    };
+
+    // link is missing
+    expect(isNativeOpenRTBBidValid(openRTBBid, openRTBRequest)).to.eq(false);
+    openRTBBid.link = { url: 'www.foo.bar' };
+    // required id == 3 is missing
+    expect(isNativeOpenRTBBidValid(openRTBBid, openRTBRequest)).to.eq(false);
+
+    openRTBBid.assets[1].id = 3;
+    expect(isNativeOpenRTBBidValid(openRTBBid, openRTBRequest)).to.eq(true);
+  });
+});
+
 describe('validate native', function () {
   const adUnit = {
     transactionId: 'test_adunit',
@@ -407,15 +490,15 @@ describe('validate native', function () {
         image: {
           required: true,
           sizes: [150, 50],
-          aspect_ratios: [150, 50]
+          aspect_ratios: [150, 50],
         },
         icon: {
           required: true,
-          sizes: [50, 50]
+          sizes: [50, 50],
         },
-      }
-    }
-  }
+      },
+    },
+  };
 
   let validBid = {
     adId: 'abc123',
@@ -424,23 +507,24 @@ describe('validate native', function () {
     adUnitCode: '123/prebid_native_adunit',
     bidder: 'test_bidder',
     native: {
-      body: 'This is a Prebid Native Creative. There are many like it, but this one is mine.',
+      body:
+        'This is a Prebid Native Creative. There are many like it, but this one is mine.',
       clickTrackers: ['http://my.click.tracker/url'],
       icon: {
         url: 'http://my.image.file/ad_image.jpg',
         height: 75,
-        width: 75
+        width: 75,
       },
       image: {
         url: 'http://my.icon.file/ad_icon.jpg',
         height: 2250,
-        width: 3000
+        width: 3000,
       },
       clickUrl: 'http://prebid.org/dev-docs/show-native-ads.html',
       impressionTrackers: ['http://my.imp.tracker/url'],
-      javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>',
-      title: 'This is an example Prebid Native creative'
-    }
+      javascriptTrackers: '<script src="http://www.foobar.js"></script>',
+      title: 'This is an example Prebid Native creative',
+    },
   };
 
   let noIconDimBid = {
@@ -450,19 +534,20 @@ describe('validate native', function () {
     adUnitCode: '123/prebid_native_adunit',
     bidder: 'test_bidder',
     native: {
-      body: 'This is a Prebid Native Creative. There are many like it, but this one is mine.',
+      body:
+        'This is a Prebid Native Creative. There are many like it, but this one is mine.',
       clickTrackers: ['http://my.click.tracker/url'],
       icon: 'http://my.image.file/ad_image.jpg',
       image: {
         url: 'http://my.icon.file/ad_icon.jpg',
         height: 2250,
-        width: 3000
+        width: 3000,
       },
       clickUrl: 'http://prebid.org/dev-docs/show-native-ads.html',
       impressionTrackers: ['http://my.imp.tracker/url'],
-      javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>',
-      title: 'This is an example Prebid Native creative'
-    }
+      javascriptTrackers: '<script src="http://www.foobar.js"></script>',
+      title: 'This is an example Prebid Native creative',
+    },
   };
 
   let noImgDimBid = {
@@ -472,19 +557,20 @@ describe('validate native', function () {
     adUnitCode: '123/prebid_native_adunit',
     bidder: 'test_bidder',
     native: {
-      body: 'This is a Prebid Native Creative. There are many like it, but this one is mine.',
+      body:
+        'This is a Prebid Native Creative. There are many like it, but this one is mine.',
       clickTrackers: ['http://my.click.tracker/url'],
       icon: {
         url: 'http://my.image.file/ad_image.jpg',
         height: 75,
-        width: 75
+        width: 75,
       },
       image: 'http://my.icon.file/ad_icon.jpg',
       clickUrl: 'http://prebid.org/dev-docs/show-native-ads.html',
       impressionTrackers: ['http://my.imp.tracker/url'],
-      javascriptTrackers: '<script src=\"http://www.foobar.js\"></script>',
-      title: 'This is an example Prebid Native creative'
-    }
+      javascriptTrackers: '<script src="http://www.foobar.js"></script>',
+      title: 'This is an example Prebid Native creative',
+    },
   };
 
   beforeEach(function () {});
@@ -493,12 +579,307 @@ describe('validate native', function () {
 
   it('should accept bid if no image sizes are defined', function () {
     decorateAdUnitsWithNativeParams([adUnit]);
-    const index = stubAuctionIndex({adUnits: [adUnit]})
-    let result = nativeBidIsValid(validBid, {index});
+    const index = stubAuctionIndex({ adUnits: [adUnit] });
+    let result = nativeBidIsValid(validBid, { index });
     expect(result).to.be.true;
-    result = nativeBidIsValid(noIconDimBid, {index});
+    result = nativeBidIsValid(noIconDimBid, { index });
     expect(result).to.be.true;
-    result = nativeBidIsValid(noImgDimBid, {index});
+    result = nativeBidIsValid(noImgDimBid, { index });
     expect(result).to.be.true;
   });
+
+  it('should convert from old-style native to OpenRTB request', () => {
+    const adUnit = {
+      transactionId: 'test_adunit',
+      mediaTypes: {
+        native: {
+          title: {
+            required: true,
+          },
+          body: {
+            required: true,
+            len: 45
+          },
+          image: {
+            required: true,
+            sizes: [150, 50],
+            aspect_ratios: [{
+              min_width: 150,
+              min_height: 50
+            }]
+          },
+          icon: {
+            required: true,
+            aspect_ratios: [{
+              min_width: 150,
+              min_height: 50
+            }]
+          },
+          address: {},
+        },
+      },
+    };
+
+    const ortb = toOrtbNativeRequest(adUnit.mediaTypes.native);
+    expect(ortb).to.be.a('object');
+    expect(ortb.assets).to.be.a('array');
+
+    // title
+    expect(ortb.assets[0]).to.deep.include({
+      id: 0,
+      required: 1,
+      title: {
+        len: 140
+      }
+    });
+
+    // body => data
+    expect(ortb.assets[1]).to.deep.include({
+      id: 1,
+      required: 1,
+      data: {
+        type: 2,
+        len: 45
+      }
+    });
+
+    // image => image
+    expect(ortb.assets[2]).to.deep.include({
+      id: 2,
+      required: 1,
+      img: {
+        type: 3, // Main Image
+        w: 150,
+        h: 50,
+      }
+    });
+
+    expect(ortb.assets[3]).to.deep.include({
+      id: 3,
+      required: 1,
+      img: {
+        type: 1, // Icon Image
+        wmin: 150,
+        hmin: 50,
+      }
+    });
+
+    expect(ortb.assets[4]).to.deep.include({
+      id: 4,
+      required: 0,
+      data: {
+        type: 9,
+      }
+    });
+  });
+
+  it('should convert from ortb to old-style native request', () => {
+    const openRTBRequest = {
+      'ver': '1.2',
+      'context': 2,
+      'contextsubtype': 20,
+      'plcmttype': 11,
+      'plcmtcnt': 1,
+      'aurlsupport': 0,
+      'privacy': 1,
+      'eventrackers': [
+        {
+          'event': 1,
+          'methods': [1, 2]
+        },
+        {
+          'event': 2,
+          'methods': [1]
+        }
+      ],
+      'assets': [
+        {
+          'id': 123,
+          'required': 1,
+          'title': {
+            'len': 140
+          }
+        },
+        {
+          'id': 128,
+          'required': 0,
+          'img': {
+            'wmin': 836,
+            'hmin': 627,
+            'type': 3
+          }
+        },
+        {
+          'id': 124,
+          'required': 1,
+          'img': {
+            'wmin': 50,
+            'hmin': 50,
+            'type': 1
+          }
+        },
+        {
+          'id': 126,
+          'required': 1,
+          'data': {
+            'type': 1,
+            'len': 25
+          }
+        },
+        {
+          'id': 127,
+          'required': 1,
+          'data': {
+            'type': 2,
+            'len': 140
+          }
+        }
+      ]
+    };
+
+    const oldNativeRequest = fromOrtbNativeRequest(openRTBRequest);
+
+    expect(oldNativeRequest).to.be.a('object');
+    expect(oldNativeRequest.title).to.include({
+      required: true,
+      len: 140
+    });
+
+    expect(oldNativeRequest.image).to.deep.include({
+      required: false,
+      aspect_ratios: {
+        min_width: 836,
+        min_height: 627,
+        ratio_width: 836,
+        ratio_height: 627
+      }
+    });
+
+    expect(oldNativeRequest.icon).to.deep.include({
+      required: true,
+      aspect_ratios: {
+        min_width: 50,
+        min_height: 50,
+        ratio_width: 50,
+        ratio_height: 50
+      }
+    });
+    expect(oldNativeRequest.sponsoredBy).to.include({
+      required: true,
+      len: 25
+    })
+    expect(oldNativeRequest.body).to.include({
+      required: true,
+      len: 140
+    })
+  });
+
+  if (FEATURES.NATIVE) {
+    it('should convert ortb bid requests to proprietary requests', () => {
+      const validBidRequests = [{
+        bidId: 'bidId3',
+        adUnitCode: 'adUnitCode3',
+        transactionId: 'transactionId3',
+        mediaTypes: {
+          banner: {}
+        },
+        params: {
+          publisher: 'publisher2',
+          placement: 'placement3'
+        }
+      }];
+      const resultRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+      expect(resultRequests).to.be.deep.equals(validBidRequests);
+
+      validBidRequests[0].mediaTypes.native = {
+        ortb: {
+          ver: '1.2',
+          context: 2,
+          contextsubtype: 20,
+          plcmttype: 11,
+          plcmtcnt: 1,
+          aurlsupport: 0,
+          privacy: 1,
+          eventrackers: [
+            {
+              event: 1,
+              methods: [1, 2]
+            },
+            {
+              event: 2,
+              methods: [1]
+            }
+          ],
+          assets: [
+            {
+              id: 123,
+              required: 1,
+              title: {
+                len: 140
+              }
+            },
+            {
+              id: 128,
+              required: 0,
+              img: {
+                wmin: 836,
+                hmin: 627,
+                type: 3
+              }
+            },
+            {
+              id: 124,
+              required: 1,
+              img: {
+                wmin: 50,
+                hmin: 50,
+                type: 1
+              }
+            },
+            {
+              id: 126,
+              required: 1,
+              data: {
+                type: 1,
+                len: 25
+              }
+            },
+            {
+              id: 127,
+              required: 1,
+              data: {
+                type: 2,
+                len: 140
+              }
+            }
+          ]
+        }
+      };
+
+      const resultRequests2 = convertOrtbRequestToProprietaryNative(validBidRequests);
+      expect(resultRequests2[0].mediaTypes.native).to.deep.include({
+        title: {
+          required: true,
+          len: 140
+        },
+        icon: {
+          required: true,
+          aspect_ratios: {
+            min_width: 50,
+            min_height: 50,
+            ratio_width: 50,
+            ratio_height: 50
+          }
+        },
+        sponsoredBy: {
+          required: true,
+          len: 25
+        },
+        body: {
+          required: true,
+          len: 140
+        }
+      });
+    });
+  }
 });
diff --git a/test/spec/unit/core/bidderFactory_spec.js b/test/spec/unit/core/bidderFactory_spec.js
index be68fc03765..646791c7e1f 100644
--- a/test/spec/unit/core/bidderFactory_spec.js
+++ b/test/spec/unit/core/bidderFactory_spec.js
@@ -39,6 +39,10 @@ function onTimelyResponseStub() {
 
 }
 
+before(() => {
+  hook.ready();
+});
+
 let wrappedCallback = config.callbackWithBidder(CODE);
 
 describe('bidders created by newBidder', function () {
@@ -47,10 +51,6 @@ describe('bidders created by newBidder', function () {
   let addBidResponseStub;
   let doneStub;
 
-  before(() => {
-    hook.ready();
-  });
-
   beforeEach(function () {
     spec = {
       code: CODE,
@@ -952,7 +952,7 @@ describe('validate bid response: ', function () {
       bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
       expect(addBidResponseStub.calledOnce).to.equal(false);
-      expect(logErrorSpy.callCount).to.equal(1);
+      expect(logErrorSpy.calledWithMatch('Ignoring bid: Native bid missing some required properties.')).to.equal(true);
     });
   }
 
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index 5c0391f96bf..3cee2b6b679 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -2376,14 +2376,47 @@ describe('Unit: Prebid Module', function () {
         $$PREBID_GLOBAL$$.requestBids({adUnits});
         const spyArgs = adapterManager.callBids.getCall(0);
         const nativeRequest = spyArgs.args[1][0].bids[0].nativeParams;
-        expect(nativeRequest).to.deep.equal({
-          image: {required: true},
-          title: {required: true},
-          sponsoredBy: {required: true},
-          clickUrl: {required: true},
-          body: {required: false},
-          icon: {required: false},
-        });
+        expect(nativeRequest.ortb.assets).to.deep.equal([
+          {
+            required: 1,
+            id: 1,
+            img: {
+              type: 3,
+              wmin: 100,
+              hmin: 100,
+            }
+          },
+          {
+            required: 1,
+            id: 2,
+            title: {
+              len: 140,
+            }
+          },
+          {
+            required: 1,
+            id: 3,
+            data: {
+              type: 1,
+            }
+          },
+          {
+            required: 0,
+            id: 4,
+            data: {
+              type: 2,
+            }
+          },
+          {
+            required: 0,
+            id: 5,
+            img: {
+              type: 1,
+              wmin: 20,
+              hmin: 20,
+            }
+          },
+        ]);
         resetAuction();
       });
     });
diff --git a/test/spec/unit/secureCreatives_spec.js b/test/spec/unit/secureCreatives_spec.js
index 39fa9b9250f..7d5f9af35dd 100644
--- a/test/spec/unit/secureCreatives_spec.js
+++ b/test/spec/unit/secureCreatives_spec.js
@@ -1,7 +1,6 @@
 import {
   _sendAdToCreative, getReplier, receiveMessage
 } from 'src/secureCreatives.js';
-import * as secureCreatives from 'src/secureCreatives.js';
 import * as utils from 'src/utils.js';
 import {getAdUnits, getBidRequests, getBidResponses} from 'test/fixtures/fixtures.js';
 import {auctionManager} from 'src/auctionManager.js';
@@ -164,6 +163,7 @@ describe('secureCreatives', () => {
       stubGetAllAssetsMessage.restore();
       stubEmit.restore();
       resetAuction();
+      adResponse.adId = bidId;
     });
 
     describe('Prebid Request', function() {
@@ -336,60 +336,17 @@ describe('secureCreatives', () => {
         sinon.assert.calledWith(stubGetAllAssetsMessage, data, adResponse);
         sinon.assert.calledOnce(ev.source.postMessage);
         sinon.assert.notCalled(stubFireNativeTrackers);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.BID_WON);
-        sinon.assert.notCalled(spyAddWinningBid);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
-      });
-
-      it('Prebid native should allow stale rendering without config', function () {
-        pushBidResponseToAuction({});
-
-        const data = {
-          adId: bidId,
-          message: 'Prebid Native',
-          action: 'allAssetRequest'
-        };
-
-        const ev = makeEvent({
-          data: JSON.stringify(data),
-          source: {
-            postMessage: sinon.stub()
-          },
-          origin: 'any origin'
-        });
-
-        receiveMessage(ev);
-
-        sinon.assert.neverCalledWith(spyLogWarn, warning);
-        sinon.assert.calledOnce(stubGetAllAssetsMessage);
-        sinon.assert.calledWith(stubGetAllAssetsMessage, data, adResponse);
-        sinon.assert.calledOnce(ev.source.postMessage);
-        sinon.assert.notCalled(stubFireNativeTrackers);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.BID_WON);
-        sinon.assert.notCalled(spyAddWinningBid);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
-
-        resetHistories(ev.source.postMessage);
-
-        receiveMessage(ev);
-
-        sinon.assert.neverCalledWith(spyLogWarn, warning);
-        sinon.assert.calledOnce(stubGetAllAssetsMessage);
-        sinon.assert.calledWith(stubGetAllAssetsMessage, data, adResponse);
-        sinon.assert.calledOnce(ev.source.postMessage);
-        sinon.assert.notCalled(stubFireNativeTrackers);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.BID_WON);
-        sinon.assert.notCalled(spyAddWinningBid);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
+        sinon.assert.calledOnce(spyAddWinningBid);
         sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
       });
 
-      it('Prebid native should allow stale rendering with config', function () {
-        configObj.setConfig({'auctionOptions': {'suppressStaleRender': true}});
-
-        pushBidResponseToAuction({});
+      it('Prebid native should not fire BID_WON when receiveMessage is called more than once', () => {
+        let adId = 3;
+        pushBidResponseToAuction({ adId });
 
         const data = {
-          adId: bidId,
+          adId: adId,
           message: 'Prebid Native',
           action: 'allAssetRequest'
         };
@@ -403,37 +360,18 @@ describe('secureCreatives', () => {
         });
 
         receiveMessage(ev);
-
-        sinon.assert.neverCalledWith(spyLogWarn, warning);
-        sinon.assert.calledOnce(stubGetAllAssetsMessage);
-        sinon.assert.calledWith(stubGetAllAssetsMessage, data, adResponse);
-        sinon.assert.calledOnce(ev.source.postMessage);
-        sinon.assert.notCalled(stubFireNativeTrackers);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.BID_WON);
-        sinon.assert.notCalled(spyAddWinningBid);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
-
-        resetHistories(ev.source.postMessage);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
 
         receiveMessage(ev);
-
-        sinon.assert.neverCalledWith(spyLogWarn, warning);
-        sinon.assert.calledOnce(stubGetAllAssetsMessage);
-        sinon.assert.calledWith(stubGetAllAssetsMessage, data, adResponse);
-        sinon.assert.calledOnce(ev.source.postMessage);
-        sinon.assert.notCalled(stubFireNativeTrackers);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.BID_WON);
-        sinon.assert.notCalled(spyAddWinningBid);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
-
-        configObj.setConfig({'auctionOptions': {}});
+        stubEmit.withArgs(CONSTANTS.EVENTS.BID_WON, adResponse).calledOnce;
       });
 
       it('Prebid native should fire trackers', function () {
-        pushBidResponseToAuction({});
+        let adId = 2;
+        pushBidResponseToAuction({adId});
 
         const data = {
-          adId: bidId,
+          adId: adId,
           message: 'Prebid Native',
           action: 'click',
         };
@@ -450,8 +388,8 @@ describe('secureCreatives', () => {
 
         sinon.assert.neverCalledWith(spyLogWarn, warning);
         sinon.assert.calledOnce(stubFireNativeTrackers);
-        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.BID_WON);
-        sinon.assert.notCalled(spyAddWinningBid);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
+        sinon.assert.calledOnce(spyAddWinningBid);
 
         resetHistories(ev.source.postMessage);
 
@@ -461,8 +399,8 @@ describe('secureCreatives', () => {
 
         sinon.assert.neverCalledWith(spyLogWarn, warning);
         sinon.assert.calledOnce(stubFireNativeTrackers);
-        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
-        sinon.assert.calledOnce(spyAddWinningBid);
+        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.BID_WON);
+        sinon.assert.notCalled(spyAddWinningBid);
 
         expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
       });

From 90d1a188860a8ec256a0db2f660bbe9d8a46b655 Mon Sep 17 00:00:00 2001
From: Andrew Slagle <42588549+spotxslagle@users.noreply.github.com>
Date: Tue, 26 Jul 2022 11:44:48 -0600
Subject: [PATCH 076/569] Spotx Adapter: Remove append child (#8739)

* Allow SpotX module to load script without appendChild

* Fix SpotX spec to no longer use appendChild

* Revert adloader change

* Fix test merge issues
---
 modules/spotxBidAdapter.js                |  79 +++++------
 test/spec/modules/spotxBidAdapter_spec.js | 163 ++++++++++------------
 2 files changed, 114 insertions(+), 128 deletions(-)

diff --git a/modules/spotxBidAdapter.js b/modules/spotxBidAdapter.js
index bcc65c85791..d044df74cfe 100644
--- a/modules/spotxBidAdapter.js
+++ b/modules/spotxBidAdapter.js
@@ -1,8 +1,9 @@
-import { logError, deepAccess, isArray, getBidIdParameter, getDNT, deepSetValue, isEmpty, _each, logMessage, logWarn, isBoolean, isNumber, isPlainObject, isFn } from '../src/utils.js';
+import { logError, deepAccess, isArray, getBidIdParameter, getDNT, deepSetValue, isEmpty, _each, logMessage, logWarn, isBoolean, isNumber, isPlainObject, isFn, setScriptAttributes } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { VIDEO } from '../src/mediaTypes.js';
+import { loadExternalScript } from '../src/adloader.js';
 
 const BIDDER_CODE = 'spotx';
 const URL = 'https://search.spotxchange.com/openrtb/2.3/dados/';
@@ -421,11 +422,45 @@ export const spec = {
 }
 
 function createOutstreamScript(bid) {
-  const slot = getBidIdParameter('slot', bid.renderer.config.outstream_options);
-  logMessage('[SPOTX][renderer] Handle SpotX outstream renderer');
   const script = window.document.createElement('script');
+  let dataSpotXParams = createScriptAttributeMap(bid);
+
   script.type = 'text/javascript';
   script.src = 'https://js.spotx.tv/easi/v1/' + bid.channel_id + '.js';
+
+  setScriptAttributes(script, dataSpotXParams);
+
+  return script;
+}
+
+function outstreamRender(bid) {
+  if (bid.renderer.config.outstream_function != null && typeof bid.renderer.config.outstream_function === 'function') {
+    const script = createOutstreamScript(bid);
+    bid.renderer.config.outstream_function(bid, script);
+  } else {
+    try {
+      const inIframe = getBidIdParameter('in_iframe', bid.renderer.config.outstream_options);
+      const easiUrl = 'https://js.spotx.tv/easi/v1/' + bid.channel_id + '.js';
+      let attributes = createScriptAttributeMap(bid);
+      if (inIframe && window.document.getElementById(inIframe).nodeName == 'IFRAME') {
+        const rawframe = window.document.getElementById(inIframe);
+        let framedoc = rawframe.contentDocument;
+        if (!framedoc && rawframe.contentWindow) {
+          framedoc = rawframe.contentWindow.document;
+        }
+        loadExternalScript(easiUrl, BIDDER_CODE, undefined, framedoc, attributes);
+      } else {
+        loadExternalScript(easiUrl, BIDDER_CODE, undefined, undefined, attributes);
+      }
+    } catch (err) {
+      logError('[SPOTX][renderer] Error:' + err.message)
+    }
+  }
+}
+
+function createScriptAttributeMap(bid) {
+  const slot = getBidIdParameter('slot', bid.renderer.config.outstream_options);
+  logMessage('[SPOTX][renderer] Handle SpotX outstream renderer');
   let dataSpotXParams = {};
   dataSpotXParams['data-spotx_channel_id'] = '' + bid.channel_id;
   dataSpotXParams['data-spotx_vast_url'] = '' + bid.vastUrl;
@@ -440,6 +475,7 @@ function createOutstreamScript(bid) {
   dataSpotXParams['data-spotx_autoplay'] = '1';
   dataSpotXParams['data-spotx_blocked_autoplay_override_mode'] = '1';
   dataSpotXParams['data-spotx_video_slot_can_autoplay'] = '1';
+  dataSpotXParams['data-spotx_content_container_id'] = slot;
 
   const playersizeAutoAdapt = getBidIdParameter('playersize_auto_adapt', bid.renderer.config.outstream_options);
   if (playersizeAutoAdapt && isBoolean(playersizeAutoAdapt) && playersizeAutoAdapt === true) {
@@ -478,42 +514,7 @@ function createOutstreamScript(bid) {
       }
     }
   }
-
-  for (let key in dataSpotXParams) {
-    if (dataSpotXParams.hasOwnProperty(key)) {
-      script.setAttribute(key, dataSpotXParams[key]);
-    }
-  }
-
-  return script;
-}
-
-function outstreamRender(bid) {
-  const script = createOutstreamScript(bid);
-  if (bid.renderer.config.outstream_function != null && typeof bid.renderer.config.outstream_function === 'function') {
-    bid.renderer.config.outstream_function(bid, script);
-  } else {
-    try {
-      const inIframe = getBidIdParameter('in_iframe', bid.renderer.config.outstream_options);
-      if (inIframe && window.document.getElementById(inIframe).nodeName == 'IFRAME') {
-        const rawframe = window.document.getElementById(inIframe);
-        let framedoc = rawframe.contentDocument;
-        if (!framedoc && rawframe.contentWindow) {
-          framedoc = rawframe.contentWindow.document;
-        }
-        framedoc.body.appendChild(script);
-      } else {
-        const slot = getBidIdParameter('slot', bid.renderer.config.outstream_options);
-        if (slot && window.document.getElementById(slot)) {
-          window.document.getElementById(slot).appendChild(script);
-        } else {
-          window.document.getElementsByTagName('head')[0].appendChild(script);
-        }
-      }
-    } catch (err) {
-      logError('[SPOTX][renderer] Error:' + err.message)
-    }
-  }
+  return dataSpotXParams;
 }
 
 registerBidder(spec);
diff --git a/test/spec/modules/spotxBidAdapter_spec.js b/test/spec/modules/spotxBidAdapter_spec.js
index 274ef60471b..74eaf669bce 100644
--- a/test/spec/modules/spotxBidAdapter_spec.js
+++ b/test/spec/modules/spotxBidAdapter_spec.js
@@ -1,5 +1,6 @@
 import {expect} from 'chai';
 import {config} from 'src/config.js';
+import {loadExternalScript} from '../../../src/adloader';
 import {spec, GOOGLE_CONSENT} from 'modules/spotxBidAdapter.js';
 
 describe('the spotx adapter', function () {
@@ -18,14 +19,14 @@ describe('the spotx adapter', function () {
   };
 
   describe('isBidRequestValid', function() {
-    var bid;
+    let bid;
 
     beforeEach(function() {
       bid = getValidBidObject();
     });
 
     it('should fail validation if the bid isn\'t defined or not an object', function() {
-      var result = spec.isBidRequestValid();
+      let result = spec.isBidRequestValid();
 
       expect(result).to.equal(false);
 
@@ -92,7 +93,7 @@ describe('the spotx adapter', function () {
   });
 
   describe('buildRequests', function() {
-    var bid, bidRequestObj;
+    let bid, bidRequestObj;
 
     beforeEach(function() {
       bid = getValidBidObject();
@@ -104,7 +105,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should build a very basic request', function() {
-      var request = spec.buildRequests([bid], bidRequestObj)[0];
+      let request = spec.buildRequests([bid], bidRequestObj)[0];
       expect(request.method).to.equal('POST');
       expect(request.url).to.equal('https://search.spotxchange.com/openrtb/2.3/dados/12345?src_sys=prebid');
       expect(request.bidRequest).to.equal(bidRequestObj);
@@ -133,7 +134,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should change request parameters based on options sent', function() {
-      var request = spec.buildRequests([bid], bidRequestObj)[0];
+      let request = spec.buildRequests([bid], bidRequestObj)[0];
       expect(request.data.imp.video.ext).to.deep.equal({
         sdk_name: 'Prebid 1+',
         versionOrtb: '2.3'
@@ -239,7 +240,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should process premarket bids', function() {
-      var request;
+      let request;
       sinon.stub(Date, 'now').returns(1000);
 
       bid.params.pre_market_bids = [{
@@ -277,7 +278,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should pass GDPR params', function() {
-      var request;
+      let request;
 
       bidRequestObj.gdprConsent = {
         consentString: 'consent123',
@@ -291,7 +292,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should pass CCPA us_privacy string', function() {
-      var request;
+      let request;
 
       bidRequestObj.uspConsent = '1YYY'
 
@@ -300,7 +301,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should pass both GDPR params and CCPA us_privacy', function() {
-      var request;
+      let request;
 
       bidRequestObj.gdprConsent = {
         consentString: 'consent123',
@@ -315,7 +316,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should pass min and max duration params', function() {
-      var request;
+      let request;
 
       bid.params.min_duration = 3
       bid.params.max_duration = 15
@@ -327,7 +328,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should pass placement_type and position params', function() {
-      var request;
+      let request;
 
       bid.params.placement_type = 2
       bid.params.position = 5
@@ -339,11 +340,11 @@ describe('the spotx adapter', function () {
     });
 
     it('should pass page param and override refererInfo.referer', function() {
-      var request;
+      let request;
 
       bid.params.page = 'https://example.com';
 
-      var origGetConfig = config.getConfig;
+      let origGetConfig = config.getConfig;
       sinon.stub(config, 'getConfig').callsFake(function (key) {
         if (key === 'pageUrl') {
           return 'https://www.spotx.tv';
@@ -358,7 +359,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should use refererInfo.referer if no page is passed', function() {
-      var request;
+      let request;
 
       request = spec.buildRequests([bid], bidRequestObj)[0];
 
@@ -366,9 +367,9 @@ describe('the spotx adapter', function () {
     });
 
     it('should set ext.wrap_response to 0 when cache url is set and ignoreBidderCacheKey is true', function() {
-      var request;
+      let request;
 
-      var origGetConfig = config.getConfig;
+      let origGetConfig = config.getConfig;
       sinon.stub(config, 'getConfig').callsFake(function (key) {
         if (key === 'cache') {
           return {
@@ -392,7 +393,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should pass price floor in USD from the floors module if available', function () {
-      var request;
+      let request;
 
       bid.getFloor = function () {
         return { currency: 'USD', floor: 3 };
@@ -406,7 +407,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should not pass price floor if price floors module gives a non-USD currency', function () {
-      var request;
+      let request;
 
       bid.getFloor = function () {
         return { currency: 'EUR', floor: 3 };
@@ -418,7 +419,7 @@ describe('the spotx adapter', function () {
     });
 
     it('if floors module is not available, should pass price floor from price_floor param if available', function () {
-      var request;
+      let request;
 
       bid.params.price_floor = 2;
 
@@ -429,7 +430,7 @@ describe('the spotx adapter', function () {
   });
 
   describe('interpretResponse', function() {
-    var serverResponse, bidderRequestObj;
+    let serverResponse, bidderRequestObj;
 
     beforeEach(function() {
       bidderRequestObj = {
@@ -503,7 +504,7 @@ describe('the spotx adapter', function () {
     });
 
     it('should return an array of bid responses', function() {
-      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
       expect(responses).to.be.an('array').with.length(2);
       expect(responses[0].cache_key).to.equal('cache123');
       expect(responses[0].channel_id).to.equal(12345);
@@ -548,9 +549,16 @@ describe('the spotx adapter', function () {
   });
 
   describe('outstreamRender', function() {
-    var serverResponse, bidderRequestObj;
+    let serverResponse, bidderRequestObj;
 
     beforeEach(function() {
+      sinon.stub(window.document, 'getElementById').returns({
+        clientWidth: 200,
+        appendChild: sinon.stub().callsFake(function(script) {})
+      });
+      sinon.stub(window.document, 'createElement').returns({
+        setAttribute: function () {}
+      });
       bidderRequestObj = {
         bidRequest: {
           bids: [{
@@ -600,99 +608,76 @@ describe('the spotx adapter', function () {
         }
       };
     });
+    afterEach(function () {
+      window.document.getElementById.restore();
+      window.document.createElement.restore();
+    });
 
     it('should attempt to insert the EASI script', function() {
-      var scriptTag;
+      window.document.getElementById.restore();
       sinon.stub(window.document, 'getElementById').returns({
-        appendChild: sinon.stub().callsFake(function(script) { scriptTag = script; })
+        appendChild: sinon.stub().callsFake(function(script) {}),
       });
-      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+      let attrs;
 
       responses[0].renderer.render(responses[0]);
-
-      expect(scriptTag.getAttribute('type')).to.equal('text/javascript');
-      expect(scriptTag.getAttribute('src')).to.equal('https://js.spotx.tv/easi/v1/12345.js');
-      expect(scriptTag.getAttribute('data-spotx_channel_id')).to.equal('12345');
-      expect(scriptTag.getAttribute('data-spotx_vast_url')).to.equal('https://search.spotxchange.com/ad/vast.html?key=cache123');
-      expect(scriptTag.getAttribute('data-spotx_ad_unit')).to.equal('incontent');
-      expect(scriptTag.getAttribute('data-spotx_collapse')).to.equal('0');
-      expect(scriptTag.getAttribute('data-spotx_autoplay')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_blocked_autoplay_override_mode')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_video_slot_can_autoplay')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_digitrust_opt_out')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_content_width')).to.equal('400');
-      expect(scriptTag.getAttribute('data-spotx_content_height')).to.equal('300');
-      expect(scriptTag.getAttribute('data-spotx_ad_mute')).to.equal('1');
-      window.document.getElementById.restore();
+      expect(loadExternalScript.called).to.be.true;
+      attrs = valuesToString(loadExternalScript.args[0][4]);
+
+      expect(attrs['data-spotx_channel_id']).to.equal('12345');
+      expect(attrs['data-spotx_vast_url']).to.equal('https://search.spotxchange.com/ad/vast.html?key=cache123');
+      expect(attrs['data-spotx_ad_unit']).to.equal('incontent');
+      expect(attrs['data-spotx_collapse']).to.equal('0');
+      expect(attrs['data-spotx_autoplay']).to.equal('1');
+      expect(attrs['data-spotx_blocked_autoplay_override_mode']).to.equal('1');
+      expect(attrs['data-spotx_video_slot_can_autoplay']).to.equal('1');
+      expect(attrs['data-spotx_digitrust_opt_out']).to.equal('1');
+      expect(attrs['data-spotx_content_width']).to.equal('400');
+      expect(attrs['data-spotx_content_height']).to.equal('300');
+      expect(attrs['data-spotx_ad_mute']).to.equal('1');
     });
 
     it('should append into an iframe', function() {
-      var scriptTag;
+      bidderRequestObj.bidRequest.bids[0].params.outstream_options.in_iframe = 'iframeId';
+      window.document.getElementById.restore();
       sinon.stub(window.document, 'getElementById').returns({
         nodeName: 'IFRAME',
-        contentDocument: {
-          body: {
-            appendChild: sinon.stub().callsFake(function(script) { scriptTag = script; })
-          }
-        }
+        clientWidth: 200,
+        appendChild: sinon.stub().callsFake(function(script) {}),
+        contentDocument: {nodeName: 'IFRAME'}
       });
 
-      bidderRequestObj.bidRequest.bids[0].params.outstream_options.in_iframe = 'iframeId';
-
-      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
-
+      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
       responses[0].renderer.render(responses[0]);
-
-      expect(scriptTag.getAttribute('type')).to.equal('text/javascript');
-      expect(scriptTag.getAttribute('src')).to.equal('https://js.spotx.tv/easi/v1/12345.js');
-      expect(scriptTag.getAttribute('data-spotx_channel_id')).to.equal('12345');
-      expect(scriptTag.getAttribute('data-spotx_vast_url')).to.equal('https://search.spotxchange.com/ad/vast.html?key=cache123');
-      expect(scriptTag.getAttribute('data-spotx_ad_unit')).to.equal('incontent');
-      expect(scriptTag.getAttribute('data-spotx_collapse')).to.equal('0');
-      expect(scriptTag.getAttribute('data-spotx_autoplay')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_blocked_autoplay_override_mode')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_video_slot_can_autoplay')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_digitrust_opt_out')).to.equal('1');
-      expect(scriptTag.getAttribute('data-spotx_content_width')).to.equal('400');
-      expect(scriptTag.getAttribute('data-spotx_content_height')).to.equal('300');
-      window.document.getElementById.restore();
+      expect(loadExternalScript.called).to.be.true;
+      expect(loadExternalScript.args[0][3].nodeName).to.equal('IFRAME');
     });
 
     it('should adjust width and height to match slot clientWidth if playersize_auto_adapt is used', function() {
-      var scriptTag;
-      sinon.stub(window.document, 'getElementById').returns({
-        clientWidth: 200,
-        appendChild: sinon.stub().callsFake(function(script) { scriptTag = script; })
-      });
-      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
 
       responses[0].renderer.render(responses[0]);
-
-      expect(scriptTag.getAttribute('type')).to.equal('text/javascript');
-      expect(scriptTag.getAttribute('src')).to.equal('https://js.spotx.tv/easi/v1/12345.js');
-      expect(scriptTag.getAttribute('data-spotx_content_width')).to.equal('200');
-      expect(scriptTag.getAttribute('data-spotx_content_height')).to.equal('150');
-      window.document.getElementById.restore();
+      expect(loadExternalScript.args[0][4]['data-spotx_content_width']).to.equal('200');
+      expect(loadExternalScript.args[0][4]['data-spotx_content_height']).to.equal('150');
     });
 
     it('should use a default 4/3 ratio if playersize_auto_adapt is used and response does not contain width or height', function() {
       delete serverResponse.body.seatbid[0].bid[0].w;
       delete serverResponse.body.seatbid[0].bid[0].h;
-
-      var scriptTag;
-      sinon.stub(window.document, 'getElementById').returns({
-        clientWidth: 200,
-        appendChild: sinon.stub().callsFake(function(script) { scriptTag = script; })
-      });
-      var responses = spec.interpretResponse(serverResponse, bidderRequestObj);
+      let responses = spec.interpretResponse(serverResponse, bidderRequestObj);
 
       responses[0].renderer.render(responses[0]);
-
-      expect(scriptTag.getAttribute('type')).to.equal('text/javascript');
-      expect(scriptTag.getAttribute('src')).to.equal('https://js.spotx.tv/easi/v1/12345.js');
-      expect(scriptTag.getAttribute('data-spotx_content_width')).to.equal('200');
-      expect(scriptTag.getAttribute('data-spotx_content_height')).to.equal('150');
-      window.document.getElementById.restore();
+      expect(loadExternalScript.args[0][4]['data-spotx_content_width']).to.equal('200');
+      expect(loadExternalScript.args[0][4]['data-spotx_content_height']).to.equal('150');
     });
   });
 });
+
+function valuesToString(obj) {
+  let newObj = {};
+  for (let prop in obj) {
+    newObj[prop] = '' + obj[prop];
+  }
+  return newObj;
+}

From 92a50519d1287d0eb4f567ff44acb6eb7f29682a Mon Sep 17 00:00:00 2001
From: John Ivan Bauzon <johnbauzon@gmail.com>
Date: Wed, 27 Jul 2022 04:48:24 +0800
Subject: [PATCH 077/569] Gumgum Bid Adapter: changes for parameter consistency
 (#8742)

* Gumgum - ADTS-175 Support multiple GG params

* ADJS-1165-prebid-adaptor-changes-to-support-jp-products

* made tweaks to the skin product for the gumgumBidAdapter

* added test for new product id

* updated skins parameter for consistency

* updated test for updated skins parameter

Co-authored-by: Lisa Benmore <lbenmore@gmail.com>
Co-authored-by: John Bauzon <john.bauzon@gumgum.com>
---
 modules/gumgumBidAdapter.js                | 2 +-
 modules/gumgumBidAdapter.md                | 6 +++---
 test/spec/modules/gumgumBidAdapter_spec.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/gumgumBidAdapter.js b/modules/gumgumBidAdapter.js
index 471b5e41ddc..b77f82030e1 100644
--- a/modules/gumgumBidAdapter.js
+++ b/modules/gumgumBidAdapter.js
@@ -370,7 +370,7 @@ function buildRequests(validBidRequests, bidderRequest) {
         data.pi = 5;
       } else if (mediaTypes.video) {
         data.pi = mediaTypes.video.linearity === 2 ? 6 : 7; // invideo : video
-      } else if (params.product && params.product.toLowerCase() === 'skin') {
+      } else if (params.product && params.product.toLowerCase() === 'skins') {
         data.pi = 8;
       }
     } else { // legacy params
diff --git a/modules/gumgumBidAdapter.md b/modules/gumgumBidAdapter.md
index 02b70b8367d..88c9cd29f69 100644
--- a/modules/gumgumBidAdapter.md
+++ b/modules/gumgumBidAdapter.md
@@ -10,7 +10,7 @@ Maintainer: engineering@gumgum.com
 
 GumGum adapter for Prebid.js
 Please note that both video and in-video products require a mediaType of video. 
-In-screen, slot, and skin products should have a mediaType of banner.
+In-screen, slot, and skins products should have a mediaType of banner.
 
 # Test Parameters
 ```
@@ -51,7 +51,7 @@ var adUnits = [
       }
     ]
   },{
-    code: 'skin-placement',
+    code: 'skins-placement',
     sizes: [[300, 50]],
     mediaTypes: {
         banner: {
@@ -63,7 +63,7 @@ var adUnits = [
         bidder: 'gumgum',
         params: {
           zone: 'dc9d6be1', // GumGum Zone ID given to the client
-          product: 'skin',
+          product: 'skins',
           bidfloor: 0.03 // CPM bid floor
         }
       }
diff --git a/test/spec/modules/gumgumBidAdapter_spec.js b/test/spec/modules/gumgumBidAdapter_spec.js
index c4e9a86eec2..17fff31f132 100644
--- a/test/spec/modules/gumgumBidAdapter_spec.js
+++ b/test/spec/modules/gumgumBidAdapter_spec.js
@@ -279,8 +279,8 @@ describe('gumgumAdapter', function () {
         const bidRequest = spec.buildRequests([request])[0];
         expect(bidRequest.data.pi).to.equal(3);
       });
-      it('should set the correct pi param if product param is found and is equal to skin', function () {
-        const request = { ...bidRequests[0], params: { ...zoneParam, product: 'Skin' } };
+      it('should set the correct pi param if product param is found and is equal to skins', function () {
+        const request = { ...bidRequests[0], params: { ...zoneParam, product: 'Skins' } };
         const bidRequest = spec.buildRequests([request])[0];
         expect(bidRequest.data.pi).to.equal(8);
       });

From ddde310c4ab1828351a79ec52b7bfa6ae8254c3b Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 26 Jul 2022 14:34:47 -0700
Subject: [PATCH 078/569] Build system: adjust babel configuration to reduce
 bundle size (#8732)

---
 babelConfig.js    |   2 +-
 package-lock.json | 161 ++++++++++++++++++++++++----------------------
 package.json      |   3 +-
 3 files changed, 86 insertions(+), 80 deletions(-)

diff --git a/babelConfig.js b/babelConfig.js
index 785c6171c42..2592d8dc776 100644
--- a/babelConfig.js
+++ b/babelConfig.js
@@ -24,7 +24,7 @@ module.exports = function (options = {}) {
     ],
     'plugins': [
       [path.resolve(__dirname, './plugins/pbjsGlobals.js'), options],
-      useLocal('babel-plugin-transform-object-assign'),
+      [useLocal('@babel/plugin-transform-runtime')],
     ],
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 19a4ed0770d..6c4269824d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,12 +6,13 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "7.4.0-pre",
+      "version": "7.8.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
+        "@babel/plugin-transform-runtime": "^7.18.9",
         "@babel/preset-env": "^7.16.8",
-        "babel-plugin-transform-object-assign": "^6.22.0",
+        "@babel/runtime": "^7.18.9",
         "core-js": "^3.13.0",
         "core-js-pure": "^3.13.0",
         "criteo-direct-rsa-validate": "^1.1.0",
@@ -360,11 +361,11 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -400,9 +401,9 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
-      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz",
+      "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -469,9 +470,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
+      "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -1335,6 +1336,25 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-runtime": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.9.tgz",
+      "integrity": "sha512-wS8uJwBt7/b/mzE13ktsJdmS4JP/j7PQSaADtnb4I2wL0zK51MQ0pmF8/Jy0wUIS96fr+fXT6S/ifiPXnvrlSg==",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "babel-plugin-polyfill-corejs2": "^0.3.1",
+        "babel-plugin-polyfill-corejs3": "^0.5.2",
+        "babel-plugin-polyfill-regenerator": "^0.3.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
       "version": "7.16.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
@@ -1538,9 +1558,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.17.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz",
-      "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
+      "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
       },
@@ -1587,11 +1607,11 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
-      "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz",
+      "integrity": "sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.18.6",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -4441,14 +4461,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/babel-plugin-transform-object-assign": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-assign/-/babel-plugin-transform-object-assign-6.22.0.tgz",
-      "integrity": "sha1-+Z0vZvGgsNSY40bFNZaEdAyqILo=",
-      "dependencies": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
     "node_modules/babel-register": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
@@ -4468,7 +4480,7 @@
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
       "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.4 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
       "dev": true,
       "hasInstallScript": true
     },
@@ -4497,6 +4509,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
       "dependencies": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
@@ -4506,7 +4519,8 @@
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
       "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.4 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
       "hasInstallScript": true
     },
     "node_modules/babel-template": {
@@ -6640,6 +6654,7 @@
       "version": "3.21.1",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz",
       "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -6671,6 +6686,7 @@
       "version": "3.21.1",
       "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz",
       "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==",
+      "deprecated": "core-js-pure@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js-pure.",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -19048,7 +19064,8 @@
     "node_modules/regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
     },
     "node_modules/regenerator-transform": {
       "version": "0.14.5",
@@ -20561,6 +20578,7 @@
       "version": "9.3.2",
       "resolved": "https://registry.npmjs.org/standard-version/-/standard-version-9.3.2.tgz",
       "integrity": "sha512-u1rfKP4o4ew7Yjbfycv80aNMN2feTiqseAhUhrrx2XtdQGmu7gucpziXe68Z4YfHVqlxVEzo4aUA0Iu3VQOTgQ==",
+      "deprecated": "standard-version is deprecated. If you're a GitHub user, I recommend https://github.com/googleapis/release-please as an alternative.",
       "dev": true,
       "dependencies": {
         "chalk": "^2.4.2",
@@ -21800,20 +21818,6 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "node_modules/typescript": {
-      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
-      "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
-      "dev": true,
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
     "node_modules/typescript-compare": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
@@ -23657,11 +23661,11 @@
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
       "requires": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       }
     },
     "@babel/helper-module-transforms": {
@@ -23688,9 +23692,9 @@
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
-      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz",
+      "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="
     },
     "@babel/helper-remap-async-to-generator": {
       "version": "7.16.8",
@@ -23739,9 +23743,9 @@
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
+      "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
     },
     "@babel/helper-validator-option": {
       "version": "7.16.7",
@@ -24281,6 +24285,19 @@
         "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
+    "@babel/plugin-transform-runtime": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.9.tgz",
+      "integrity": "sha512-wS8uJwBt7/b/mzE13ktsJdmS4JP/j7PQSaADtnb4I2wL0zK51MQ0pmF8/Jy0wUIS96fr+fXT6S/ifiPXnvrlSg==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "babel-plugin-polyfill-corejs2": "^0.3.1",
+        "babel-plugin-polyfill-corejs3": "^0.5.2",
+        "babel-plugin-polyfill-regenerator": "^0.3.1",
+        "semver": "^6.3.0"
+      }
+    },
     "@babel/plugin-transform-shorthand-properties": {
       "version": "7.16.7",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
@@ -24433,9 +24450,9 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.17.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz",
-      "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
+      "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
       "requires": {
         "regenerator-runtime": "^0.13.4"
       },
@@ -24475,11 +24492,11 @@
       }
     },
     "@babel/types": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
-      "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz",
+      "integrity": "sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.18.6",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -26800,14 +26817,6 @@
         "@babel/helper-define-polyfill-provider": "^0.3.1"
       }
     },
-    "babel-plugin-transform-object-assign": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-assign/-/babel-plugin-transform-object-assign-6.22.0.tgz",
-      "integrity": "sha1-+Z0vZvGgsNSY40bFNZaEdAyqILo=",
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
     "babel-register": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
@@ -26853,6 +26862,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
       "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
@@ -26861,7 +26871,8 @@
         "core-js": {
           "version": "2.6.12",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+          "dev": true
         }
       }
     },
@@ -38354,7 +38365,8 @@
     "regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
     },
     "regenerator-transform": {
       "version": "0.14.5",
@@ -40581,13 +40593,6 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "typescript": {
-      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
-      "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
-      "dev": true,
-      "peer": true
-    },
     "typescript-compare": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
diff --git a/package.json b/package.json
index 5a4a3abdb10..9a2e223fe9d 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,8 @@
   "dependencies": {
     "@babel/core": "^7.16.7",
     "@babel/preset-env": "^7.16.8",
-    "babel-plugin-transform-object-assign": "^6.22.0",
+    "@babel/runtime": "^7.18.9",
+    "@babel/plugin-transform-runtime": "^7.18.9",
     "core-js": "^3.13.0",
     "core-js-pure": "^3.13.0",
     "criteo-direct-rsa-validate": "^1.1.0",

From d22f149da61d98c32d751e8687583859ff320aed Mon Sep 17 00:00:00 2001
From: Jason Lydon <95770514+ftxmoJason@users.noreply.github.com>
Date: Tue, 26 Jul 2022 18:15:43 -0400
Subject: [PATCH 079/569] FTRACK UserId Submodule: adding more tests for the
 get ID methods in pbjs (#8737)

* FTRACK: adding more tests for the get ID methods in pbjs

* FTRACK: making the tests a little DRYer

* FTRACK: cleaning up the tests

* FTRACK: cleaning up some comments

Co-authored-by: Jason Lydon <jason.lydon@flashtalking.com>
---
 modules/userId/eids.js                   |   6 +-
 test/spec/modules/eids_spec.js           |  30 ++++
 test/spec/modules/ftrackIdSystem_spec.js | 192 +++++++++++++----------
 3 files changed, 142 insertions(+), 86 deletions(-)

diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index 4b5fd55aa21..4c2e3a00107 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -372,11 +372,11 @@ export function createEidsArray(bidRequestUserId) {
         // ftrack has multiple IDs so we add each one that exists
         let eid = {
           'atype': 1,
-          'id': (bidRequestUserId[subModuleKey]['DeviceID'] || []).join('|'),
+          'id': (bidRequestUserId.ftrackId.DeviceID || []).join('|'),
           'ext': {}
         }
-        for (let id in bidRequestUserId[subModuleKey]) {
-          eid.ext[id] = (bidRequestUserId[subModuleKey][id] || []).join('|');
+        for (let id in bidRequestUserId.ftrackId) {
+          eid.ext[id] = (bidRequestUserId.ftrackId[id] || []).join('|');
         }
 
         eids.push(eid);
diff --git a/test/spec/modules/eids_spec.js b/test/spec/modules/eids_spec.js
index e0410ff7874..e71058824a4 100644
--- a/test/spec/modules/eids_spec.js
+++ b/test/spec/modules/eids_spec.js
@@ -302,6 +302,7 @@ describe('eids array generation for known sub-modules', function() {
       }]
     });
   });
+
   it('uid2', function() {
     const userId = {
       uid2: {'id': 'Sample_AD_Token'}
@@ -316,6 +317,7 @@ describe('eids array generation for known sub-modules', function() {
       }]
     });
   });
+
   it('kpuid', function() {
     const userId = {
       kpuid: 'Sample_Token'
@@ -330,6 +332,7 @@ describe('eids array generation for known sub-modules', function() {
       }]
     });
   });
+
   it('tncid', function() {
     const userId = {
       tncid: 'TEST_TNCID'
@@ -344,6 +347,7 @@ describe('eids array generation for known sub-modules', function() {
       }]
     });
   });
+
   it('pubProvidedId', function() {
     const userId = {
       pubProvidedId: [{
@@ -437,6 +441,32 @@ describe('eids array generation for known sub-modules', function() {
       uids: [{ id: 'some-random-id-value', atype: 1 }]
     });
   });
+
+  describe('ftrackId', () => {
+    it('should return the correct EID schema', () => {
+      expect(createEidsArray({
+        ftrackId: {
+          DeviceID: ['aaa', 'bbb'],
+          SingleDeviceID: ['ccc', 'ddd'],
+          HHID: ['eee', 'fff']
+        },
+        foo: {
+          bar: 'baz'
+        },
+        lorem: {
+          ipsum: ''
+        }
+      })).to.deep.equal([{
+        atype: 1,
+        id: 'aaa|bbb',
+        ext: {
+          DeviceID: 'aaa|bbb',
+          SingleDeviceID: 'ccc|ddd',
+          HHID: 'eee|fff'
+        }
+      }]);
+    });
+  });
 });
 
 describe('Negative case', function () {
diff --git a/test/spec/modules/ftrackIdSystem_spec.js b/test/spec/modules/ftrackIdSystem_spec.js
index 333a8cce624..2c3f3f8576c 100644
--- a/test/spec/modules/ftrackIdSystem_spec.js
+++ b/test/spec/modules/ftrackIdSystem_spec.js
@@ -308,107 +308,133 @@ describe('FTRACK ID System', () => {
     });
   });
 
-  describe('Uses ftrack getUserIdsAsEids() method', () => {
-    it('getUserIdsAsEids using the ftrack submodule and gets three ids (HHID, DeviceId, SingleDeviceId)', () => {
+  describe('pbjs "get id" methods', () => {
+    // The full set of ftrack IDs to test against
+    let expectedIds = {
+      HHID: ['household_test_id'],
+      DeviceID: ['device_test_id'],
+      SingleDeviceID: ['single_device_test_id']
+    };
+    // The full config mock
+    let userSyncConfigMock = {
+      userSync: {
+        auctionDelay: 10,
+        userIds: [{
+          name: 'ftrack',
+          value: {
+            ftrackId: expectedIds
+          }
+        }]
+      }
+    };
+    // The full eids response
+    let expectedEids = [{
+      id: 'device_test_id',
+      atype: 1,
+      ext: {
+        HHID: expectedIds.HHID.join('|'),
+        DeviceID: expectedIds.DeviceID.join('|'),
+        SingleDeviceID: expectedIds.SingleDeviceID.join('|')
+      }
+    }];
+
+    beforeEach(() => {
       init(config);
       setSubmoduleRegistry([ftrackIdSubmodule]);
+    });
 
-      const ids = {
-        ftrackId: {
-          HHID: ['household_test_id'],
-          DeviceID: ['device_test_id'],
-          SingleDeviceID: ['single_device_test_id']
-        }
+    afterEach(() => {
+      // Reset expectedIds to the default values because some tests overwrite them
+      expectedIds = {
+        HHID: ['household_test_id'],
+        DeviceID: ['device_test_id'],
+        SingleDeviceID: ['single_device_test_id']
       };
-      config.setConfig({
-        userSync: {
-          auctionDelay: 10,
-          userIds: [{
-            name: 'ftrack', value: ids,
-          }]
-        }
-      });
-
-      getGlobal().getUserIdsAsync().then((ids) => {
-        expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
-          id: 'device_test_id',
-          atype: 1,
-          ext: {
-            HHID: 'household_test_id',
-            DeviceID: 'device_test_id',
-            SingleDeviceID: 'single_device_test_id',
-          }
-        }]);
-      });
     });
 
-    it('gets only the deviceId', () => {
-      init(config);
-      setSubmoduleRegistry([ftrackIdSubmodule]);
+    describe('pbjs.getUserIdsAsync()', () => {
+      it('should return the IDs in the correct schema', () => {
+        config.setConfig(userSyncConfigMock);
 
-      const ids = { ftrackId: { DeviceID: ['device_test_id'] } };
-      config.setConfig({
-        userSync: {
-          auctionDelay: 10,
-          userIds: [{
-            name: 'ftrack', value: ids,
-          }]
-        }
+        getGlobal().getUserIdsAsync().then(ids => {
+          expect(ids).to.deep.equal({
+            ftrackId: expectedIds
+          });
+        });
       });
+    });
+
+    describe('pbjs.getUserIds()', () => {
+      it('should return the IDs in the correct schema', () => {
+        config.setConfig(userSyncConfigMock);
 
-      getGlobal().getUserIdsAsync().then((ids) => {
-        expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
-          id: 'device_test_id',
-          atype: 1,
-          ext: { DeviceID: 'device_test_id' }
-        }]);
+        expect(getGlobal().getUserIds()).to.deep.equal({
+          'ftrackId': expectedIds
+        });
       });
     });
 
-    it('gets only the user household id', () => {
-      init(config);
-      setSubmoduleRegistry([ftrackIdSubmodule]);
+    describe('pbjs.getUserIdsAsEids()', () => {
+      it('should return the correct EIDs schema', () => {
+        let userSyncConfig = Object.assign({}, userSyncConfigMock);
 
-      const ids = { ftrackId: { HHID: ['household_test_id'], } };
-      config.setConfig({
-        userSync: {
-          auctionDelay: 10,
-          userIds: [{
-            name: 'ftrack', value: ids,
-          }]
-        }
-      });
+        config.setConfig(userSyncConfig);
 
-      getGlobal().getUserIdsAsync().then((ids) => {
-        expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
-          id: '',
-          atype: 1,
-          ext: { HHID: 'household_test_id' }
-        }]);
+        expect(getGlobal().getUserIdsAsEids()).to.deep.equal(expectedEids);
       });
-    });
 
-    it('gets only the deviceId', () => {
-      init(config);
-      setSubmoduleRegistry([ftrackIdSubmodule]);
+      describe('by ID type:', () => {
+        it('- DeviceID', () => {
+          let userSyncConfig = Object.assign({}, userSyncConfigMock);
 
-      const ids = { ftrackId: { SingleDeviceID: ['single_device_test_id'] } };
-      config.setConfig({
-        userSync: {
-          auctionDelay: 10,
-          userIds: [{
-            name: 'ftrack', value: ids,
-          }]
-        }
-      });
+          userSyncConfig.userSync.userIds[0].value.ftrackId = {
+            DeviceID: ['device_test_id']
+          };
+
+          let expectedEidsClone = expectedEids.slice();
+          expectedEidsClone[0].ext = {
+            DeviceID: expectedIds.DeviceID.join('|')
+          };
+
+          config.setConfig(userSyncConfig);
+
+          expect(getGlobal().getUserIdsAsEids()).to.deep.equal(expectedEidsClone);
+        });
+
+        it('- HHID', () => {
+          let userSyncConfig = Object.assign({}, userSyncConfigMock);
+          userSyncConfig.userSync.userIds[0].value.ftrackId = {
+            HHID: ['household_test_id']
+          };
 
-      getGlobal().getUserIdsAsync().then((ids) => {
-        expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
-          id: '',
-          atype: 1,
-          ext: { SingleDeviceID: 'single_device_test_id' }
-        }]);
+          let expectedEidsClone = expectedEids.slice();
+          expectedEidsClone[0].id = '';
+          expectedEidsClone[0].ext = {
+            HHID: expectedIds.HHID.join('|')
+          };
+
+          config.setConfig(userSyncConfig);
+
+          expect(getGlobal().getUserIdsAsEids()).to.deep.equal(expectedEidsClone);
+        });
+
+        it('- SingleDeviceID', () => {
+          let userSyncConfig = Object.assign({}, userSyncConfigMock);
+          userSyncConfig.userSync.userIds[0].value.ftrackId = {
+            SingleDeviceID: ['single_device_test_id']
+          };
+
+          let expectedEidsClone = expectedEids.slice();
+          expectedEidsClone[0].id = '';
+          expectedEidsClone[0].ext = {
+            SingleDeviceID: expectedIds.SingleDeviceID.join('|')
+          };
+
+          config.setConfig(userSyncConfig);
+
+          expect(getGlobal().getUserIdsAsEids()).to.deep.equal(expectedEidsClone);
+        });
       });
     });
-  });
+  })
 });

From fbcecc9ee7d1f86411c90109365ee6938df50bad Mon Sep 17 00:00:00 2001
From: Regulyarniy Nikolay <regularniy@gmail.com>
Date: Wed, 27 Jul 2022 23:58:29 +1000
Subject: [PATCH 080/569] Videonow Bid Adapter: Initial Bid Adapter Release
 (#8669)

* Videonow bid adapter: add videonow bid adapter

* Update videonowBidAdapter.md

Co-authored-by: Patrick McCann <pmccann@cafemedia.com>
---
 modules/videonowBidAdapter.js                | 122 +++++++++++++++++++
 modules/videonowBidAdapter.md                |  37 ++++++
 test/spec/modules/videonowBidAdapter_spec.js |  80 ++++++++++++
 3 files changed, 239 insertions(+)
 create mode 100644 modules/videonowBidAdapter.js
 create mode 100644 modules/videonowBidAdapter.md
 create mode 100644 test/spec/modules/videonowBidAdapter_spec.js

diff --git a/modules/videonowBidAdapter.js b/modules/videonowBidAdapter.js
new file mode 100644
index 00000000000..bfbc07fdff1
--- /dev/null
+++ b/modules/videonowBidAdapter.js
@@ -0,0 +1,122 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import {_each, getBidIdParameter, getValue, logError, logInfo} from '../src/utils.js';
+
+const BIDDER_CODE = 'videonow';
+const RTB_URL = 'https://adx.videonow.ru/yhb'
+const DEFAULT_CURRENCY = 'RUB'
+const DEFAULT_CODE_TYPE = 'combo'
+const TTL_SECONDS = 60 * 5
+
+export const spec = {
+
+  code: BIDDER_CODE,
+  url: RTB_URL,
+  supportedMediaTypes: [ BANNER ],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bidRequest The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bidRequest) {
+    if (!bidRequest.params) {
+      return false;
+    }
+
+    if (!bidRequest.params.pId) {
+      logError('failed validation: pId not declared');
+      return false
+    }
+
+    return true
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} validBidRequests - an array of bids
+   * @param bidderRequest
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    logInfo('validBidRequests', validBidRequests);
+
+    const bidRequests = [];
+
+    _each(validBidRequests, (bid) => {
+      const bidId = getBidIdParameter('bidId', bid)
+      const placementId = getValue(bid.params, 'pId')
+      const currency = getValue(bid.params, 'currency') || DEFAULT_CURRENCY
+      const url = getValue(bid.params, 'url') || RTB_URL
+      const codeType = getValue(bid.params, 'codeType') || DEFAULT_CODE_TYPE
+      const sizes = getValue(bid, 'sizes')
+
+      bidRequests.push({
+        method: 'POST',
+        url,
+        data: {
+          places: [
+            {
+              id: bidId,
+              placementId,
+              codeType,
+              sizes
+            }
+          ],
+          settings: {
+            currency,
+          }
+        },
+      })
+    })
+
+    return bidRequests;
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {BidRequest} bidRequest The bid params
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    logInfo('serverResponse', serverResponse.body);
+
+    const responsesBody = serverResponse ? serverResponse.body : {};
+    const bidResponses = [];
+    try {
+      if (!responsesBody?.bids?.length) {
+        return [];
+      }
+
+      _each(responsesBody.bids, (bid) => {
+        if (bid?.displayCode) {
+          const bidResponse = {
+            requestId: bid.id,
+            cpm: bid.cpm,
+            currency: bid.currency,
+            width: bid.size.width,
+            height: bid.size.height,
+            ad: bid.displayCode,
+            ttl: TTL_SECONDS,
+            creativeId: bid.id,
+            netRevenue: true,
+            meta: {
+              advertiserDomains: bid.adDomain ? [bid.adDomain] : []
+            }
+          };
+          bidResponses.push(bidResponse)
+        }
+      })
+    } catch (error) {
+      logError(error);
+    }
+
+    return bidResponses
+  },
+}
+
+registerBidder(spec);
diff --git a/modules/videonowBidAdapter.md b/modules/videonowBidAdapter.md
new file mode 100644
index 00000000000..0762880f666
--- /dev/null
+++ b/modules/videonowBidAdapter.md
@@ -0,0 +1,37 @@
+# Overview
+
+**Module Name**: Videonow Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: nregularniy@videonow.ru
+
+# Description
+
+Videonow Bidder Adapter for Prebid.js. About: https://videonow.ru/
+
+
+Use `videonow` as bidder:
+
+# Params
+- `pId` required, profile ID
+- `currency` optional, currency, default is 'RUB'
+- `url` optional, for debug, bidder url
+- `codeType` optional, for debug, yhb codeType
+
+## AdUnits configuration example
+```
+    var adUnits = [{
+      code: 'your-slot', //use exactly the same code as your slot div id.
+      mediaTypes: {
+          banner: {
+              sizes: [[640, 480]]
+          }
+      },
+      bids: [{
+        bidder: 'videonow',
+        params: { 
+            pId: '1234',
+            currency: 'RUB',
+        }
+      }]
+    }];
+```
diff --git a/test/spec/modules/videonowBidAdapter_spec.js b/test/spec/modules/videonowBidAdapter_spec.js
new file mode 100644
index 00000000000..c9eb5ba0bbf
--- /dev/null
+++ b/test/spec/modules/videonowBidAdapter_spec.js
@@ -0,0 +1,80 @@
+import {expect} from 'chai';
+import {spec} from 'modules/videonowBidAdapter';
+
+describe('videonowBidAdapter', function () {
+  it('minimal params', function () {
+    expect(spec.isBidRequestValid({
+      bidder: 'videonow',
+      params: {
+        pId: 'advDesktopBillboard'
+      }})).to.equal(true)
+  })
+
+  it('minimal params no placementId', function () {
+    expect(spec.isBidRequestValid({
+      bidder: 'videonow',
+      params: {
+        currency: `GBP`
+      }})).to.equal(false)
+  })
+
+  it('generated_params common case', function () {
+    const bidRequestData = [{
+      bidId: 'bid1234',
+      bidder: 'videonow',
+      params: {
+        pId: 'advDesktopBillboard',
+        currency: `GBP`
+      },
+      sizes: [[240, 400]]
+    }];
+
+    const request = spec.buildRequests(bidRequestData);
+    const req_data = request[0].data;
+
+    expect(req_data.places[0].id).to.equal(`bid1234`)
+    expect(req_data.places[0].placementId).to.equal(`advDesktopBillboard`)
+    expect(req_data.settings.currency).to.equal(`GBP`)
+    expect(req_data.places[0].sizes[0][0]).to.equal(240);
+    expect(req_data.places[0].sizes[0][1]).to.equal(400);
+  });
+
+  it('response_params common case', function () {
+    const bidRequestData = {
+      data: {
+        bidId: 'bid1234'
+      }
+    };
+
+    const serverResponse = {
+      body: {
+        bids: [
+          {
+            'displayCode': '<html><body>test html</body></html>',
+            'id': '123456',
+            'cpm': 375,
+            'currency': 'RUB',
+            'placementId': 'profileName',
+            'codeType': 'js',
+            'size': {
+              'width': 640,
+              'height': 480
+            }
+          }
+        ]
+      }
+    };
+
+    const bids = spec.interpretResponse(serverResponse, bidRequestData);
+    expect(bids).to.have.lengthOf(1);
+    const bid = bids[0];
+    expect(bid.requestId).to.equal('123456')
+    expect(bid.cpm).to.equal(375);
+    expect(bid.currency).to.equal('RUB');
+    expect(bid.width).to.equal(640);
+    expect(bid.height).to.equal(480);
+    expect(bid.ad).to.equal('<html><body>test html</body></html>');
+    expect(bid.creativeId).to.equal(`123456`)
+    expect(bid.netRevenue).to.equal(true);
+  });
+})

From 15b688c9a4f15a7669fd1fa579f9c76e1a917949 Mon Sep 17 00:00:00 2001
From: rcheptanariu <35690143+rcheptanariu@users.noreply.github.com>
Date: Wed, 27 Jul 2022 18:54:16 +0300
Subject: [PATCH 081/569] InvibesBidAdapter - local storage bypass fixed
 (#8720)

* InvibesBidAdapter - local storage bypass fixed

* InvibesBidAdapter - fixed error when param not defined

Co-authored-by: Patrick McCann <patmmccann@gmail.com>
---
 modules/invibesBidAdapter.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/invibesBidAdapter.js b/modules/invibesBidAdapter.js
index 99434e18adb..2f80b89fb9c 100644
--- a/modules/invibesBidAdapter.js
+++ b/modules/invibesBidAdapter.js
@@ -381,7 +381,10 @@ function getUserIds(bidUserId) {
 function parseQueryStringParams() {
   let params = {};
   try {
-    params = JSON.parse(readFromLocalStorage('ivbs'));
+    let storedParam = storage.getDataFromLocalStorage('ivbs');
+    if (storedParam != null) {
+      params = JSON.parse(storedParam);
+    }
   } catch (e) {
   }
   let re = /[\\?&]([^=]+)=([^\\?&#]+)/g;

From 7c267f73935eed73940c3b83a3b390ac42f04aca Mon Sep 17 00:00:00 2001
From: jsfledd <jsfledd@users.noreply.github.com>
Date: Wed, 27 Jul 2022 11:08:24 -0700
Subject: [PATCH 082/569] Nativo Bid Adapter: add Price Floors Module support
 (#8666)

* Initial nativoBidAdapter document creation (js, md and spec)

* Fulling working prebid using nativoBidAdapter. Support for GDPR and CCPA in user syncs.

* Added defult size settings based on the largest ad unit. Added response body validation. Added consent to request url qs params.

* Changed bidder endpoint url

* Changed double quotes to single quotes.

* Reverted package-json.lock to remove modifications from PR

* Added optional bidder param 'url' so the ad server can force- match an existing placement

* Lint fix. Added space after if.

* Added new QS param to send various adUnit data to adapter endpopint

* Updated unit test for new QS param

* Added qs param to keep track of ad unit refreshes

* Updated bidMap key default value

* Updated refresh increment logic

* Refactored spread operator for IE11 support

* Updated isBidRequestValid check

* Refactored Object.enties to use Object.keys to fix CircleCI testing errors

* Updated bid mapping key creation to prioritize ad unit code over placementId

* Added filtering by ad, advertiser and campaign.

* Merged master

* Added more robust bidDataMap with multiple key access

* Deduped filer values

* Rolled back package.json

* Duped upstream/master's package.lock file ... not sure how it got changed in the first place

* Small refactor of filterData length check. Removed comparison with 0 since a length value of 0 is already falsy.

* Added bid sizes to request

* Fixed function name in spec. Added unit tests.

* Added priceFloor module support

* Added protection agains empty url parameter
---
 modules/nativoBidAdapter.js                | 198 ++++++++++++++++++---
 test/spec/modules/nativoBidAdapter_spec.js | 149 +++++++++++++++-
 2 files changed, 319 insertions(+), 28 deletions(-)

diff --git a/modules/nativoBidAdapter.js b/modules/nativoBidAdapter.js
index 271ecac7aa2..54c99b17834 100644
--- a/modules/nativoBidAdapter.js
+++ b/modules/nativoBidAdapter.js
@@ -11,6 +11,8 @@ const GVLID = 263
 const TIME_TO_LIVE = 360
 
 const SUPPORTED_AD_TYPES = [BANNER]
+const FLOOR_PRICE_CURRENCY = 'USD'
+const PRICE_FLOOR_WILDCARD = '*'
 
 /**
  * Keep track of bid data by keys
@@ -131,84 +133,106 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
+    // Parse values from bid requests
     const placementIds = new Set()
     const bidDataMap = BidDataMap()
     const placementSizes = { length: 0 }
+    const floorPriceData = {}
     let placementId, pageUrl
-    validBidRequests.forEach((request) => {
+    validBidRequests.forEach((bidRequest) => {
       pageUrl = deepAccess(
-        request,
+        bidRequest,
         'params.url',
-        bidderRequest.refererInfo.page
       )
-      placementId = deepAccess(request, 'params.placementId')
+      if (pageUrl == undefined || pageUrl === '') {
+        pageUrl = bidderRequest.refererInfo.page
+      }
+
+      placementId = deepAccess(bidRequest, 'params.placementId')
 
-      const bidDataKeys = [request.adUnitCode]
+      const bidDataKeys = [bidRequest.adUnitCode]
 
       if (placementId && !placementIds.has(placementId)) {
         placementIds.add(placementId)
         bidDataKeys.push(placementId)
 
-        placementSizes[placementId] = request.sizes
+        placementSizes[placementId] = bidRequest.sizes
         placementSizes.length++
       }
 
       const bidData = {
-        bidId: request.bidId,
-        size: getLargestSize(request.sizes),
+        bidId: bidRequest.bidId,
+        size: getLargestSize(bidRequest.sizes),
       }
       bidDataMap.addBidData(bidData, bidDataKeys)
+
+      const bidRequestFloorPriceData = parseFloorPriceData(bidRequest)
+      if (bidRequestFloorPriceData) {
+        floorPriceData[bidRequest.adUnitCode] = bidRequestFloorPriceData
+      }
     })
     bidRequestMap[bidderRequest.bidderRequestId] = bidDataMap
 
     // Build adUnit data
-    const adUnitData = {
-      adUnits: validBidRequests.map((adUnit) => {
-        // Track if we've already requested for this ad unit code
-        adUnitsRequested[adUnit.adUnitCode] =
-          adUnitsRequested[adUnit.adUnitCode] !== undefined
-            ? adUnitsRequested[adUnit.adUnitCode] + 1
-            : 0
-        return {
-          adUnitCode: adUnit.adUnitCode,
-          mediaTypes: adUnit.mediaTypes,
-        }
-      }),
-    }
+    const adUnitData = buildAdUnitData(validBidRequests)
 
-    // Build QS Params
+    // Build basic required QS Params
     let params = [
+      // Prebid request id
       { key: 'ntv_pb_rid', value: bidderRequest.bidderRequestId },
+      // Ad unit data
       {
         key: 'ntv_ppc',
         value: btoa(JSON.stringify(adUnitData)), // Convert to Base 64
       },
+      // Number count of requests per ad unit
       {
         key: 'ntv_dbr',
-        value: btoa(JSON.stringify(adUnitsRequested)),
+        value: btoa(JSON.stringify(adUnitsRequested)), // Convert to Base 64
       },
+      // Page url
       {
         key: 'ntv_url',
         value: encodeURIComponent(pageUrl),
       },
     ]
 
+    // Floor pricing
+    if (Object.keys(floorPriceData).length) {
+      params.unshift({
+        key: 'ntv_ppf',
+        value: btoa(JSON.stringify(floorPriceData)),
+      })
+    }
+
     // Add filtering
     if (adsToFilter.size > 0) {
-      params.unshift({ key: 'ntv_atf', value: Array.from(adsToFilter).join(',') })
+      params.unshift({
+        key: 'ntv_atf',
+        value: Array.from(adsToFilter).join(','),
+      })
     }
 
     if (advertisersToFilter.size > 0) {
-      params.unshift({ key: 'ntv_avtf', value: Array.from(advertisersToFilter).join(',') })
+      params.unshift({
+        key: 'ntv_avtf',
+        value: Array.from(advertisersToFilter).join(','),
+      })
     }
 
     if (campaignsToFilter.size > 0) {
-      params.unshift({ key: 'ntv_ctf', value: Array.from(campaignsToFilter).join(',') })
+      params.unshift({
+        key: 'ntv_ctf',
+        value: Array.from(campaignsToFilter).join(','),
+      })
     }
 
     // Placement Sizes
     if (placementSizes.length) {
-      params.unshift({ key: 'ntv_pas', value: btoa(JSON.stringify(placementSizes)) })
+      params.unshift({
+        key: 'ntv_pas',
+        value: btoa(JSON.stringify(placementSizes)),
+      })
     }
 
     // Add placement IDs
@@ -429,6 +453,126 @@ export const spec = {
 registerBidder(spec)
 
 // Utils
+export function parseFloorPriceData(bidRequest) {
+  if (typeof bidRequest.getFloor !== 'function') return
+
+  // Setup price floor data per bid request
+  let bidRequestFloorPriceData = {}
+  let bidMediaTypes = bidRequest.mediaTypes
+  let sizeOptions = new Set()
+  // Step through meach media type so we can get floor data for each media type per bid request
+  Object.keys(bidMediaTypes).forEach((mediaType) => {
+    // Setup price floor data per media type
+    let mediaTypeData = bidMediaTypes[mediaType]
+    let mediaTypeFloorPriceData = {}
+    // Step through each size of the media type so we can get floor data for each size per media type
+    mediaTypeData.sizes.forEach((size) => {
+      // Get floor price data per the getFloor method and respective media type / size combination
+      const priceFloorData = bidRequest.getFloor({
+        currency: FLOOR_PRICE_CURRENCY,
+        mediaType,
+        size,
+      })
+      // Save the data and track the sizes
+      mediaTypeFloorPriceData[sizeToString(size)] = priceFloorData.floor
+      sizeOptions.add(size)
+    })
+    bidRequestFloorPriceData[mediaType] = mediaTypeFloorPriceData
+
+    // Get floor price of current media type with a wildcard size
+    const sizeWildcardFloor = getSizeWildcardPrice(bidRequest, mediaType)
+    // Save the wildcard floor price if it was retrieved successfully
+    if (sizeWildcardFloor.floor > 0) {
+      mediaTypeFloorPriceData['*'] = sizeWildcardFloor.floor
+    }
+  })
+
+  // Get floor price for wildcard media type using all of the sizes present in the previous media types
+  const mediaWildCardPrices = getMediaWildcardPrices(bidRequest, [
+    PRICE_FLOOR_WILDCARD,
+    ...Array.from(sizeOptions),
+  ])
+  bidRequestFloorPriceData['*'] = mediaWildCardPrices
+
+  return bidRequestFloorPriceData
+}
+
+/**
+ * Get price floor data by always setting the size value to the wildcard for a specific size
+ * @param {Object} bidRequest - The bid request
+ * @param {String} mediaType - The media type
+ * @returns {Object} - Bid floor data
+ */
+export function getSizeWildcardPrice(bidRequest, mediaType) {
+  return bidRequest.getFloor({
+    currency: FLOOR_PRICE_CURRENCY,
+    mediaType,
+    size: PRICE_FLOOR_WILDCARD,
+  })
+}
+
+/**
+ * Get price data for a range of sizes and always setting the media type to the wildcard value
+ * @param {*} bidRequest - The bid request
+ * @param {*} sizes - The sizes to get the floor price data for
+ * @returns {Object} - Bid floor data
+ */
+export function getMediaWildcardPrices(
+  bidRequest,
+  sizes = [PRICE_FLOOR_WILDCARD]
+) {
+  const sizePrices = {}
+  sizes.forEach((size) => {
+    // MODIFY the bid request's mediaTypes property (so we can get the wildcard media type value)
+    const temp = bidRequest.mediaTypes
+    bidRequest.mediaTypes = { PRICE_FLOOR_WILDCARD: temp.sizes }
+    // Get price floor data
+    const priceFloorData = bidRequest.getFloor({
+      currency: FLOOR_PRICE_CURRENCY,
+      mediaType: PRICE_FLOOR_WILDCARD,
+      size,
+    })
+    // RESTORE initial property value
+    bidRequest.mediaTypes = temp
+
+    // Only save valid floor price data
+    const key =
+      size !== PRICE_FLOOR_WILDCARD ? sizeToString(size) : PRICE_FLOOR_WILDCARD
+    sizePrices[key] = priceFloorData.floor
+  })
+  return sizePrices
+}
+
+/**
+ * Format size array to a string
+ * @param {Array} size - Size data [width, height]
+ * @returns {String} - Formated size string
+ */
+export function sizeToString(size) {
+  if (!Array.isArray(size) || size.length < 2) return ''
+  return `${size[0]}x${size[1]}`
+}
+
+/**
+ * Build the ad unit data to send back to the request endpoint
+ * @param {Array<Object>} requests - Bid requests
+ * @returns {Array<Object>} - Array of ad unit data
+ */
+function buildAdUnitData(requests) {
+  return requests.map((request) => {
+    // Track if we've already requested for this ad unit code
+    adUnitsRequested[request.adUnitCode] =
+      adUnitsRequested[request.adUnitCode] !== undefined
+        ? adUnitsRequested[request.adUnitCode] + 1
+        : 0
+    // Return a new object with only the data we need
+    return {
+      adUnitCode: request.adUnitCode,
+      mediaTypes: request.mediaTypes,
+    }
+  })
+}
+
 /**
  * Append QS param to existing string
  * @param {String} str - String to append to
diff --git a/test/spec/modules/nativoBidAdapter_spec.js b/test/spec/modules/nativoBidAdapter_spec.js
index 0690c7f90e1..be6b07f9acc 100644
--- a/test/spec/modules/nativoBidAdapter_spec.js
+++ b/test/spec/modules/nativoBidAdapter_spec.js
@@ -1,5 +1,11 @@
 import { expect } from 'chai'
 import { spec, BidDataMap } from 'modules/nativoBidAdapter.js'
+import {
+  getSizeWildcardPrice,
+  getMediaWildcardPrices,
+  sizeToString,
+  parseFloorPriceData,
+} from '../../../modules/nativoBidAdapter'
 
 describe('bidDataMap', function () {
   it('Should fail gracefully if no key value pairs have been added and no key is sent', function () {
@@ -94,7 +100,7 @@ describe('nativoBidAdapterTests', function () {
     const bidRequestString = JSON.stringify(bidRequest)
     let bidRequests
 
-    beforeEach(function() {
+    beforeEach(function () {
       // Clone bidRequest each time
       bidRequests = [JSON.parse(bidRequestString)]
     })
@@ -119,6 +125,20 @@ describe('nativoBidAdapterTests', function () {
       expect(request.url).to.include('ntv_pas')
     })
 
+    it('ntv_url parameter should NOT be empty even if the utl parameter was set as an empty value', function () {
+      bidRequests[0].params.url = ''
+      const request = spec.buildRequests(bidRequests, {
+        bidderRequestId: 123456,
+        refererInfo: {
+          referer: 'https://www.test.com',
+        },
+      })
+
+      expect(request.url).to.exist
+      expect(request.url).to.be.a('string')
+      expect(request.url).to.not.be.empty
+    })
+
     it('url should NOT contain placement specific query string parameters if placementId option is not provided', function () {
       bidRequests[0].params = {}
       const request = spec.buildRequests(bidRequests, {
@@ -489,3 +509,130 @@ describe('Response to Request Filter Flow', () => {
     expect(request.url).to.include('ntv_ctf=234')
   })
 })
+
+describe('sizeToString', () => {
+  it('Formats size array correctly', () => {
+    const sizeString = sizeToString([300, 250])
+    expect(sizeString).to.be.equal('300x250')
+  })
+
+  it('Returns an empty array for invalid data', () => {
+    // Not an array
+    let sizeString = sizeToString(300, 350)
+    expect(sizeString).to.be.equal('')
+    // Single entry
+    sizeString = sizeToString([300])
+    expect(sizeString).to.be.equal('')
+    // Undefined
+    sizeString = sizeToString(undefined)
+    expect(sizeString).to.be.equal('')
+  })
+})
+
+describe('getSizeWildcardPrice', () => {
+  it('Generates the correct floor price data', () => {
+    let floorPrice = {
+      currency: 'USD',
+      floor: 1.0,
+    }
+    let getFloorMock = () => {
+      return floorPrice
+    }
+    let floorMockSpy = sinon.spy(getFloorMock)
+    let bidRequest = {
+      getFloor: floorMockSpy,
+      mediaTypes: {
+        banner: {
+          sizes: [300, 250],
+        },
+      },
+    }
+
+    let result = getSizeWildcardPrice(bidRequest, 'banner')
+    expect(
+      floorMockSpy.calledWith({
+        currency: 'USD',
+        mediaType: 'banner',
+        size: '*',
+      })
+    ).to.be.true
+    expect(result).to.equal(floorPrice)
+  })
+})
+
+describe('getMediaWildcardPrices', () => {
+  it('Generates the correct floor price data', () => {
+    let defaultFloorPrice = {
+      currency: 'USD',
+      floor: 1.1,
+    }
+    let sizefloorPrice = {
+      currency: 'USD',
+      floor: 2.2,
+    }
+    let getFloorMock = ({ currency, mediaType, size }) => {
+      if (Array.isArray(size)) return sizefloorPrice
+
+      return defaultFloorPrice
+    }
+    let floorMockSpy = sinon.spy(getFloorMock)
+    let bidRequest = {
+      getFloor: floorMockSpy,
+      mediaTypes: {
+        banner: {
+          sizes: [300, 250],
+        },
+      },
+    }
+
+    let result = getMediaWildcardPrices(bidRequest, ['*', [300, 250]])
+    expect(
+      floorMockSpy.calledWith({
+        currency: 'USD',
+        mediaType: '*',
+        size: '*',
+      })
+    ).to.be.true
+    expect(
+      floorMockSpy.calledWith({
+        currency: 'USD',
+        mediaType: '*',
+        size: [300, 250],
+      })
+    ).to.be.true
+    expect(result).to.deep.equal({ '*': 1.1, '300x250': 2.2 })
+  })
+})
+
+describe('parseFloorPriceData', () => {
+  it('Generates the correct floor price data', () => {
+    let defaultFloorPrice = {
+      currency: 'USD',
+      floor: 1.1,
+    }
+    let sizefloorPrice = {
+      currency: 'USD',
+      floor: 2.2,
+    }
+    let getFloorMock = ({ currency, mediaType, size }) => {
+      if (Array.isArray(size)) return sizefloorPrice
+
+      return defaultFloorPrice
+    }
+    let floorMockSpy = sinon.spy(getFloorMock)
+    let bidRequest = {
+      getFloor: floorMockSpy,
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        },
+      },
+    }
+
+    let result = parseFloorPriceData(bidRequest)
+    expect(result).to.deep.equal({
+      '*': { '*': 1.1, '300x250': 2.2 },
+      banner: { '*': 1.1, '300x250': 2.2 },
+    })
+  })
+})

From 7e12865005b876fd46c93ce399584d7255be0b23 Mon Sep 17 00:00:00 2001
From: ahmadlob <109217988+ahmadlob@users.noreply.github.com>
Date: Thu, 28 Jul 2022 05:33:48 +0300
Subject: [PATCH 083/569] Taboola Bid Adapter: dynamic ttl (#8747)

* update-ttl-passing

* Update taboolaBidAdapter_spec.js

* add fallback default value in case of null

* add semicolons

* .

* .

* .

* ..

* ...
---
 modules/taboolaBidAdapter.js                |  5 ++--
 test/spec/modules/taboolaBidAdapter_spec.js | 26 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/modules/taboolaBidAdapter.js b/modules/taboolaBidAdapter.js
index 1a35f9e548e..e94e7aba7ca 100644
--- a/modules/taboolaBidAdapter.js
+++ b/modules/taboolaBidAdapter.js
@@ -222,9 +222,8 @@ function getBid(requestId, currency, bidResponse) {
   if (!bidResponse) {
     return;
   }
-
   const {
-    price: cpm, crid: creativeId, adm: ad, w: width, h: height, adomain: advertiserDomains, meta = {}
+    price: cpm, crid: creativeId, adm: ad, w: width, h: height, exp: ttl, adomain: advertiserDomains, meta = {}
   } = bidResponse;
 
   if (advertiserDomains && advertiserDomains.length > 0) {
@@ -233,7 +232,7 @@ function getBid(requestId, currency, bidResponse) {
 
   return {
     requestId,
-    ttl: 60,
+    ttl,
     mediaType: BANNER,
     cpm,
     creativeId,
diff --git a/test/spec/modules/taboolaBidAdapter_spec.js b/test/spec/modules/taboolaBidAdapter_spec.js
index 4749a6a5919..739335e8f1f 100644
--- a/test/spec/modules/taboolaBidAdapter_spec.js
+++ b/test/spec/modules/taboolaBidAdapter_spec.js
@@ -311,6 +311,7 @@ describe('Taboola Adapter', function () {
                 'crid': '278195503434041083381',
                 'w': 300,
                 'h': 250,
+                'exp': 60,
                 'lurl': 'http://us-trc.taboola.com/sample'
               }
             ],
@@ -386,6 +387,31 @@ describe('Taboola Adapter', function () {
       const res = spec.interpretResponse(serverResponse, request)
       expect(res).to.deep.equal(expectedRes)
     });
+
+    it('should set the correct ttl form the response', function () {
+      // set exp-ttl to be 125
+      const [bid] = serverResponse.body.seatbid[0].bid;
+      serverResponse.body.seatbid[0].bid[0].exp = 125;
+      const expectedRes = [
+        {
+          requestId: request.bids[0].bidId,
+          cpm: bid.price,
+          creativeId: bid.crid,
+          ttl: 125,
+          netRevenue: false,
+          currency: serverResponse.body.cur,
+          mediaType: 'banner',
+          ad: bid.adm,
+          width: bid.w,
+          height: bid.h,
+          meta: {
+            'advertiserDomains': bid.adomain
+          },
+        }
+      ];
+      const res = spec.interpretResponse(serverResponse, request);
+      expect(res).to.deep.equal(expectedRes);
+    });
   })
 
   describe('userData', function () {

From 963c1fbe9c87419c2e3e2757c4405878dd51e823 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Jul 2022 08:24:50 -0400
Subject: [PATCH 084/569] Bump parse-url from 6.0.0 to 6.0.5 (#8756)

Bumps [parse-url](https://github.com/IonicaBizau/parse-url) from 6.0.0 to 6.0.5.
- [Release notes](https://github.com/IonicaBizau/parse-url/releases)
- [Commits](https://github.com/IonicaBizau/parse-url/compare/6.0.0...6.0.5)

---
updated-dependencies:
- dependency-name: parse-url
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6c4269824d7..ccf4d92a711 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18110,9 +18110,9 @@
       }
     },
     "node_modules/parse-url": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-6.0.0.tgz",
-      "integrity": "sha512-cYyojeX7yIIwuJzledIHeLUBVJ6COVLeT4eF+2P6aKVzwvgKQPndCBv3+yQ7pcWjqToYwaligxzSYNNmGoMAvw==",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-6.0.5.tgz",
+      "integrity": "sha512-e35AeLTSIlkw/5GFq70IN7po8fmDUjpDPY1rIK+VubRfsUvBonjQ+PBZG+vWMACnQSmNlvl524IucoDmcioMxA==",
       "dev": true,
       "dependencies": {
         "is-ssh": "^1.3.0",
@@ -37633,9 +37633,9 @@
       }
     },
     "parse-url": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-6.0.0.tgz",
-      "integrity": "sha512-cYyojeX7yIIwuJzledIHeLUBVJ6COVLeT4eF+2P6aKVzwvgKQPndCBv3+yQ7pcWjqToYwaligxzSYNNmGoMAvw==",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-6.0.5.tgz",
+      "integrity": "sha512-e35AeLTSIlkw/5GFq70IN7po8fmDUjpDPY1rIK+VubRfsUvBonjQ+PBZG+vWMACnQSmNlvl524IucoDmcioMxA==",
       "dev": true,
       "requires": {
         "is-ssh": "^1.3.0",

From c94c8de82d2aea4076e1067e4ab582fa3ebc22f6 Mon Sep 17 00:00:00 2001
From: Carlos Felix <carlos.felix@33across.com>
Date: Thu, 28 Jul 2022 07:46:03 -0500
Subject: [PATCH 085/569] 33Across Bid Adapter: Obtain display-related
 attributes  (#8730)

* capture display-related client side attributes

* rename the client display attributes

* Obtain the UA entropy values

* apply CR feedback, reuse win constant

* pass gpid into build

* feedback changes

* fix missing native property in some browsers

* rename entropy fields

* only store entropy data when it's present

* remove client hints

Co-authored-by: Anthony Lin <anthony.lin@33across.com>
Co-authored-by: anthonyjl92 <anthonyjl92@gmail.com>
---
 modules/33acrossBidAdapter.js                |  74 +++++-
 test/spec/modules/33acrossBidAdapter_spec.js | 231 ++++++++++++++++++-
 2 files changed, 301 insertions(+), 4 deletions(-)

diff --git a/modules/33acrossBidAdapter.js b/modules/33acrossBidAdapter.js
index 700b1409da2..ad2b092baa8 100644
--- a/modules/33acrossBidAdapter.js
+++ b/modules/33acrossBidAdapter.js
@@ -254,6 +254,7 @@ function _createServerRequest({ bidRequests, gdprConsent = {}, uspConsent, pageU
   });
 
   ttxRequest.site = { id: siteId };
+  ttxRequest.device = _buildDeviceORTB();
 
   if (pageUrl) {
     ttxRequest.site.page = pageUrl;
@@ -333,12 +334,15 @@ function setExtensions(obj = {}, extFields) {
 
 // BUILD REQUESTS: IMP
 function _buildImpORTB(bidRequest) {
+  const gpid = deepAccess(bidRequest, 'ortb2Imp.ext.gpid');
+
   const imp = {
     id: bidRequest.bidId,
     ext: {
       ttx: {
         prod: deepAccess(bidRequest, 'params.productId')
-      }
+      },
+      ...(gpid ? { gpid } : {})
     }
   };
 
@@ -734,6 +738,74 @@ function _createSync({ siteId = 'zzz000000000003zzz', gdprConsent = {}, uspConse
   return sync;
 }
 
+// BUILD REQUESTS: DEVICE
+function _buildDeviceORTB() {
+  const win = getWindowSelf();
+
+  return {
+    ext: {
+      ttx: {
+        ...getScreenDimensions(),
+        pxr: win.devicePixelRatio,
+        vp: getViewportDimensions(),
+        ah: win.screen.availHeight,
+        mtp: win.navigator.maxTouchPoints
+      }
+    }
+  };
+}
+
+function getTopMostAccessibleWindow() {
+  let mostAccessibleWindow = getWindowSelf();
+
+  try {
+    while (mostAccessibleWindow.parent !== mostAccessibleWindow &&
+      mostAccessibleWindow.parent.document) {
+      mostAccessibleWindow = mostAccessibleWindow.parent;
+    }
+  } catch (err) {
+    // Do not throw an exception if we can't access the topmost frame.
+  }
+
+  return mostAccessibleWindow;
+}
+
+function getViewportDimensions() {
+  const topWin = getTopMostAccessibleWindow();
+  const documentElement = topWin.document.documentElement;
+
+  return {
+    w: documentElement.clientWidth,
+    h: documentElement.clientHeight,
+  };
+}
+
+function getScreenDimensions() {
+  const {
+    innerWidth: windowWidth,
+    innerHeight: windowHeight,
+    screen
+  } = getWindowSelf();
+
+  const [biggerDimension, smallerDimension] = [
+    Math.max(screen.width, screen.height),
+    Math.min(screen.width, screen.height),
+  ];
+
+  if (windowHeight > windowWidth) { // Portrait mode
+    return {
+      w: smallerDimension,
+      h: biggerDimension,
+    };
+  }
+
+  // Landscape mode
+  return {
+    w: biggerDimension,
+    h: smallerDimension,
+  };
+}
+
 export const spec = {
   NON_MEASURABLE,
 
diff --git a/test/spec/modules/33acrossBidAdapter_spec.js b/test/spec/modules/33acrossBidAdapter_spec.js
index 4c5ff808bc0..3657f7da912 100644
--- a/test/spec/modules/33acrossBidAdapter_spec.js
+++ b/test/spec/modules/33acrossBidAdapter_spec.js
@@ -30,6 +30,21 @@ describe('33acrossBidAdapter:', function () {
       site: {
         id: siteId
       },
+      device: {
+        ext: {
+          ttx: {
+            w: 1024,
+            h: 728,
+            pxr: 2,
+            vp: {
+              w: 800,
+              h: 600
+            },
+            ah: 500,
+            mtp: 0
+          }
+        }
+      },
       id: 'r1',
       regs: {
         ext: {
@@ -117,7 +132,7 @@ describe('33acrossBidAdapter:', function () {
 
     this.withProduct = (prod = 'siab') => {
       ttxRequest.imp.forEach((imp) => {
-        Object.assign(imp, {
+        utils.mergeDeep(imp, {
           ext: {
             ttx: {
               prod
@@ -129,6 +144,18 @@ describe('33acrossBidAdapter:', function () {
       return this;
     };
 
+    this.withGpid = (gpid) => {
+      ttxRequest.imp.forEach((imp) => {
+        utils.mergeDeep(imp, {
+          ext: {
+            gpid
+          }
+        });
+      });
+
+      return this;
+    };
+
     this.withGdprConsent = (consent, gdpr) => {
       Object.assign(ttxRequest, {
         user: {
@@ -166,6 +193,12 @@ describe('33acrossBidAdapter:', function () {
       return this;
     };
 
+    this.withDevice = (device) => {
+      utils.mergeDeep(ttxRequest, { device });
+
+      return this;
+    };
+
     this.withPageUrl = pageUrl => {
       Object.assign(ttxRequest.site, {
         page: pageUrl
@@ -360,8 +393,21 @@ describe('33acrossBidAdapter:', function () {
     };
     win = {
       parent: null,
+      devicePixelRatio: 2,
+      screen: {
+        width: 1024,
+        height: 728,
+        availHeight: 500
+      },
+      navigator: {
+        maxTouchPoints: 0
+      },
       document: {
-        visibilityState: 'visible'
+        visibilityState: 'visible',
+        documentElement: {
+          clientWidth: 800,
+          clientHeight: 600
+        }
       },
 
       innerWidth: 800,
@@ -373,7 +419,6 @@ describe('33acrossBidAdapter:', function () {
         .withBanner()
         .build()
     );
-
     sandbox = sinon.sandbox.create();
     sandbox.stub(Date, 'now').returns(1);
     sandbox.stub(document, 'getElementById').returns(element);
@@ -755,6 +800,151 @@ describe('33acrossBidAdapter:', function () {
         const [ buildRequest ] = spec.buildRequests(bidRequests);
         validateBuiltServerRequest(buildRequest, serverRequest);
       });
+
+      context('when all the wrapping windows are accessible', function() {
+        it('returns the viewport dimensions of the top most accessible window', function() {
+          const ttxRequest = new TtxRequestBuilder()
+            .withBanner()
+            .withDevice({
+              ext: {
+                ttx: {
+                  vp: {
+                    w: 6789,
+                    h: 2345
+                  }
+                }
+              }
+            })
+            .withProduct()
+            .build();
+          const serverRequest = new ServerRequestBuilder()
+            .withData(ttxRequest)
+            .build();
+
+          sandbox.stub(win, 'parent').value({
+            document: {
+              documentElement: {
+                clientWidth: 1234,
+                clientHeight: 4567
+              }
+            },
+            parent: {
+              document: {
+                documentElement: {
+                  clientWidth: 6789,
+                  clientHeight: 2345
+                }
+              },
+            }
+          });
+
+          const [ buildRequest ] = spec.buildRequests(bidRequests);
+          validateBuiltServerRequest(buildRequest, serverRequest);
+        });
+      });
+
+      context('when one of the wrapping windows cannot be accessed', function() {
+        it('returns the viewport dimensions of the top most accessible window', function() {
+          const ttxRequest = new TtxRequestBuilder()
+            .withBanner()
+            .withDevice({
+              ext: {
+                ttx: {
+                  vp: {
+                    w: 9876,
+                    h: 5432
+                  }
+                }
+              }
+            })
+            .withProduct()
+            .build();
+          const serverRequest = new ServerRequestBuilder()
+            .withData(ttxRequest)
+            .build();
+          const notAccessibleParentWindow = {};
+
+          Object.defineProperty(notAccessibleParentWindow, 'document', {
+            get() { throw new Error('fakeError'); }
+          });
+
+          sandbox.stub(win, 'parent').value({
+            document: {
+              documentElement: {
+                clientWidth: 1234,
+                clientHeight: 4567
+              }
+            },
+            parent: {
+              parent: notAccessibleParentWindow,
+              document: {
+                documentElement: {
+                  clientWidth: 9876,
+                  clientHeight: 5432
+                }
+              },
+            }
+          });
+
+          const [ buildRequest ] = spec.buildRequests(bidRequests);
+          validateBuiltServerRequest(buildRequest, serverRequest);
+        });
+      });
+    });
+
+    it('returns the screen dimensions', function() {
+      const ttxRequest = new TtxRequestBuilder()
+        .withBanner()
+        .withDevice({
+          ext: {
+            ttx: {
+              w: 1024,
+              h: 728
+            }
+          }
+        })
+        .withProduct()
+        .build();
+      const serverRequest = new ServerRequestBuilder()
+        .withData(ttxRequest)
+        .build();
+
+      win.screen.width = 1024;
+      win.screen.height = 728;
+
+      const [ buildRequest ] = spec.buildRequests(bidRequests);
+
+      validateBuiltServerRequest(buildRequest, serverRequest);
+    });
+
+    context('when the window height is greater than the width', function() {
+      it('returns the smaller screen dimension as the width', function() {
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withDevice({
+            ext: {
+              ttx: {
+                w: 728,
+                h: 1024
+              }
+            }
+          })
+          .withProduct()
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+
+        win.screen.width = 1024;
+        win.screen.height = 728;
+
+        win.innerHeight = 728;
+        win.innerWidth = 727;
+
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+
+        validateBuiltServerRequest(buildRequest, serverRequest);
+      });
     });
 
     context('when tab is inactive', function() {
@@ -977,6 +1167,41 @@ describe('33acrossBidAdapter:', function () {
       });
     });
 
+    context('when Global Placement ID (gpid) is defined', function() {
+      let bidderRequest;
+
+      beforeEach(function() {
+        bidderRequest = {};
+      });
+
+      it('passes the Global Placement ID (gpid) in the request', function() {
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
+          .withGpid('fakeGPID0')
+          .build();
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+
+        let copyBidRequest = utils.deepClone(bidRequests);
+        const bidRequestsWithGpid = copyBidRequest.map(function(bidRequest, index) {
+          return {
+            ...bidRequest,
+            ortb2Imp: {
+              ext: {
+                gpid: 'fakeGPID' + index
+              }
+            }
+          };
+        });
+
+        const [ builtServerRequest ] = spec.buildRequests(bidRequestsWithGpid, bidderRequest);
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
     context('when referer value is not available', function() {
       it('returns corresponding server requests without site.page set', function() {
         const bidderRequest = {

From 58123576ddd62c4de65f8f0e10f6b65afb96218e Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Thu, 28 Jul 2022 05:52:16 -0700
Subject: [PATCH 086/569] Core & multiple modules: strict purpose 1 consent
 option; do not require vendor consent for "core" storage / ID modules (#8661)

* Allow sharedId to work without vendor consent

* Remove superfluous enforcement check from ixBidAdapter

* Make core storage respect device access rules

* respect storage access enforcement in userSync.js

* UserID: check whether storage is enabled only once consent can be enforced

* Add pubProvidedId

* GDPR enforcement: enforce consent when data is not available, but GDPR module is enabled

* Always enforce deviceAccess; move vendorless storage P1 enforcement behind `consentManagement.strictStorageEnforcement`
---
 modules/gdprEnforcement.js                    | 54 +++++++++---
 modules/ixBidAdapter.js                       | 13 +--
 modules/pubCommonId.js                        |  2 +-
 modules/sharedIdSystem.js                     |  8 +-
 modules/userId/index.js                       | 63 +++++++++-----
 src/storageManager.js                         | 21 ++---
 src/userSync.js                               | 14 +--
 test/helpers/consentData.js                   |  5 ++
 test/spec/modules/adnuntiusBidAdapter_spec.js |  7 +-
 test/spec/modules/gdprEnforcement_spec.js     | 87 ++++++++++++++++---
 test/spec/modules/ixBidAdapter_spec.js        |  1 +
 test/spec/modules/userId_spec.js              | 10 ++-
 test/spec/unit/core/storageManager_spec.js    | 29 ++++++-
 test/test_deps.js                             |  1 +
 14 files changed, 220 insertions(+), 95 deletions(-)

diff --git a/modules/gdprEnforcement.js b/modules/gdprEnforcement.js
index 9e300e1de97..b7035c509b6 100644
--- a/modules/gdprEnforcement.js
+++ b/modules/gdprEnforcement.js
@@ -12,6 +12,15 @@ import {validateStorageEnforcement} from '../src/storageManager.js';
 import * as events from '../src/events.js';
 import CONSTANTS from '../src/constants.json';
 
+// modules for which vendor consent is not needed (see https://github.com/prebid/Prebid.js/issues/8161)
+const VENDORLESS_MODULES = new Set([
+  'sharedId',
+  'pubCommonId',
+  'pubProvidedId',
+]);
+
+export const STRICT_STORAGE_ENFORCEMENT = 'strictStorageEnforcement';
+
 const TCF2 = {
   'purpose1': { id: 1, name: 'storage' },
   'purpose2': { id: 2, name: 'basicAds' },
@@ -44,6 +53,7 @@ const biddersBlocked = [];
 const analyticsBlocked = [];
 
 let hooksAdded = false;
+let strictStorageEnforcement = false;
 
 // Helps in stubbing these functions in unit tests.
 export const internal = {
@@ -116,6 +126,18 @@ function getGvlidForAnalyticsAdapter(code) {
   return adapterManager.getAnalyticsAdapter(code) && (adapterManager.getAnalyticsAdapter(code).gvlid || null);
 }
 
+export function shouldEnforce(consentData, purpose, name) {
+  if (consentData == null && gdprDataHandler.enabled) {
+    // there is no consent data, but the GDPR module has been installed and configured
+    // NOTE: this check is not foolproof, as when Prebid first loads, enforcement hooks have not been attached yet
+    // This piece of code would not run at all, and `gdprDataHandler.enabled` would be false, until the first
+    // `setConfig({consentManagement})`
+    logWarn(`Attempting operation that requires purpose ${purpose} consent while consent data is not available${name ? ` (module: ${name})` : ''}. Assuming no consent was given.`)
+    return true;
+  }
+  return consentData && consentData.gdprApplies;
+}
+
 /**
  * This function takes in a rule and consentData and validates against the consentData provided. Depending on what it returns,
  * the caller may decide to suppress a TCF-sensitive activity.
@@ -123,9 +145,10 @@ function getGvlidForAnalyticsAdapter(code) {
  * @param {Object} consentData - gdpr consent data
  * @param {string=} currentModule - Bidder code of the current module
  * @param {number=} gvlId - GVL ID for the module
+ * @param vendorlessModule a predicate function that takes a module name, and returns true if the module does not need vendor consent
  * @returns {boolean}
  */
-export function validateRules(rule, consentData, currentModule, gvlId) {
+export function validateRules(rule, consentData, currentModule, gvlId, vendorlessModule = VENDORLESS_MODULES.has.bind(VENDORLESS_MODULES)) {
   const purposeId = TCF2[Object.keys(TCF2).filter(purposeName => TCF2[purposeName].name === rule.purpose)[0]].id;
 
   // return 'true' if vendor present in 'vendorExceptions'
@@ -143,7 +166,7 @@ export function validateRules(rule, consentData, currentModule, gvlId) {
     or the user has consented. Similar with vendors.
   */
   const purposeAllowed = rule.enforcePurpose === false || purposeConsent === true;
-  const vendorAllowed = rule.enforceVendor === false || vendorConsent === true;
+  const vendorAllowed = vendorlessModule(currentModule) || rule.enforceVendor === false || vendorConsent === true;
 
   /*
     Few if any vendors should be declaring Legitimate Interest for Device Access (Purpose 1), but some are claiming
@@ -160,20 +183,24 @@ export function validateRules(rule, consentData, currentModule, gvlId) {
 /**
  * This hook checks whether module has permission to access device or not. Device access include cookie and local storage
  * @param {Function} fn reference to original function (used by hook logic)
+ * @param isVendorless if true, do not require vendor consent (for e.g. core modules)
  * @param {Number=} gvlid gvlid of the module
  * @param {string=} moduleName name of the module
+ * @param result
  */
-export function deviceAccessHook(fn, gvlid, moduleName, result) {
+export function deviceAccessHook(fn, isVendorless, gvlid, moduleName, result, {validate = validateRules} = {}) {
   result = Object.assign({}, {
     hasEnforcementHook: true
   });
   if (!hasDeviceAccess()) {
     logWarn('Device access is disabled by Publisher');
     result.valid = false;
-    fn.call(this, gvlid, moduleName, result);
+  } else if (isVendorless && !strictStorageEnforcement) {
+    // for vendorless (core) storage, do not enforce rules unless strictStorageEnforcement is set
+    result.valid = true;
   } else {
     const consentData = gdprDataHandler.getConsentData();
-    if (consentData && consentData.gdprApplies) {
+    if (shouldEnforce(consentData, 1, moduleName)) {
       const curBidder = config.getCurrentBidder();
       // Bidders have a copy of storage object with bidder code binded. Aliases will also pass the same bidder code when invoking storage functions and hence if alias tries to access device we will try to grab the gvl id for alias instead of original bidder
       if (curBidder && (curBidder != moduleName) && adapterManager.aliasRegistry[curBidder] === moduleName) {
@@ -182,21 +209,19 @@ export function deviceAccessHook(fn, gvlid, moduleName, result) {
         gvlid = getGvlid(moduleName) || gvlid;
       }
       const curModule = moduleName || curBidder;
-      let isAllowed = validateRules(purpose1Rule, consentData, curModule, gvlid);
+      let isAllowed = validate(purpose1Rule, consentData, curModule, gvlid, isVendorless ? () => true : undefined);
       if (isAllowed) {
         result.valid = true;
-        fn.call(this, gvlid, moduleName, result);
       } else {
         curModule && logWarn(`TCF2 denied device access for ${curModule}`);
         result.valid = false;
         storageBlocked.push(curModule);
-        fn.call(this, gvlid, moduleName, result);
       }
     } else {
       result.valid = true;
-      fn.call(this, gvlid, moduleName, result);
     }
   }
+  fn.call(this, isVendorless, gvlid, moduleName, result);
 }
 
 /**
@@ -206,8 +231,8 @@ export function deviceAccessHook(fn, gvlid, moduleName, result) {
  */
 export function userSyncHook(fn, ...args) {
   const consentData = gdprDataHandler.getConsentData();
-  if (consentData && consentData.gdprApplies) {
-    const curBidder = config.getCurrentBidder();
+  const curBidder = config.getCurrentBidder();
+  if (shouldEnforce(consentData, 1, curBidder)) {
     const gvlid = getGvlid(curBidder);
     let isAllowed = validateRules(purpose1Rule, consentData, curBidder, gvlid);
     if (isAllowed) {
@@ -228,7 +253,7 @@ export function userSyncHook(fn, ...args) {
  * @param {Object} consentData GDPR consent data
  */
 export function userIdHook(fn, submodules, consentData) {
-  if (consentData && consentData.gdprApplies) {
+  if (shouldEnforce(consentData, 1, 'User ID')) {
     let userIdModules = submodules.map((submodule) => {
       const gvlid = getGvlid(submodule.submodule);
       const moduleName = submodule.submodule.name;
@@ -255,7 +280,7 @@ export function userIdHook(fn, submodules, consentData) {
  */
 export function makeBidRequestsHook(fn, adUnits, ...args) {
   const consentData = gdprDataHandler.getConsentData();
-  if (consentData && consentData.gdprApplies) {
+  if (shouldEnforce(consentData, 2)) {
     adUnits.forEach(adUnit => {
       adUnit.bids = adUnit.bids.filter(bid => {
         const currBidder = bid.bidder;
@@ -283,7 +308,7 @@ export function makeBidRequestsHook(fn, adUnits, ...args) {
  */
 export function enableAnalyticsHook(fn, config) {
   const consentData = gdprDataHandler.getConsentData();
-  if (consentData && consentData.gdprApplies) {
+  if (shouldEnforce(consentData, 7, 'Analytics')) {
     if (!isArray(config)) {
       config = [config]
     }
@@ -341,6 +366,7 @@ export function setEnforcementConfig(config) {
   } else {
     enforcementRules = rules;
   }
+  strictStorageEnforcement = !!deepAccess(config, STRICT_STORAGE_ENFORCEMENT);
 
   purpose1Rule = find(enforcementRules, hasPurpose1);
   purpose2Rule = find(enforcementRules, hasPurpose2);
diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index d4ac5208413..62ffba3d8dc 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -5,7 +5,6 @@ import {
   deepClone,
   deepSetValue,
   getGptSlotInfoForAdUnitCode,
-  hasDeviceAccess,
   inIframe,
   isArray,
   isEmpty,
@@ -20,7 +19,7 @@ import {
 import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
 import CONSTANTS from '../src/constants.json';
-import {getStorageManager, validateStorageEnforcement} from '../src/storageManager.js';
+import {getStorageManager} from '../src/storageManager.js';
 import * as events from '../src/events.js';
 import {find} from '../src/polyfill.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
@@ -1474,15 +1473,7 @@ function storeErrorEventData(data) {
  */
 function localStorageHandler(data) {
   if (data.type === 'ERROR' && data.arguments && data.arguments[1] && data.arguments[1].bidder === BIDDER_CODE) {
-    const DEFAULT_ENFORCEMENT_SETTINGS = {
-      hasEnforcementHook: false,
-      valid: hasDeviceAccess()
-    };
-    validateStorageEnforcement(GLOBAL_VENDOR_ID, BIDDER_CODE, DEFAULT_ENFORCEMENT_SETTINGS, (permissions) => {
-      if (permissions.valid) {
-        storeErrorEventData(data);
-      }
-    });
+    storeErrorEventData(data);
   }
 }
 
diff --git a/modules/pubCommonId.js b/modules/pubCommonId.js
index faca59cce1c..e3fd21e7260 100644
--- a/modules/pubCommonId.js
+++ b/modules/pubCommonId.js
@@ -9,7 +9,7 @@ import * as events from '../src/events.js';
 import CONSTANTS from '../src/constants.json';
 import { getStorageManager } from '../src/storageManager.js';
 
-const storage = getStorageManager();
+const storage = getStorageManager({moduleName: 'pubCommonId'});
 
 const ID_NAME = '_pubcid';
 const OPTOUT_NAME = '_pubcid_optout';
diff --git a/modules/sharedIdSystem.js b/modules/sharedIdSystem.js
index 656b62815c7..99a34ae17f4 100644
--- a/modules/sharedIdSystem.js
+++ b/modules/sharedIdSystem.js
@@ -10,8 +10,7 @@ import {submodule} from '../src/hook.js';
 import { coppaDataHandler } from '../src/adapterManager.js';
 import {getStorageManager} from '../src/storageManager.js';
 
-const GVLID = 887;
-export const storage = getStorageManager({gvlid: GVLID, moduleName: 'pubCommonId'});
+export const storage = getStorageManager({moduleName: 'pubCommonId'});
 const COOKIE = 'cookie';
 const LOCAL_STORAGE = 'html5';
 const OPTOUT_NAME = '_pubcid_optout';
@@ -74,11 +73,6 @@ export const sharedIdSystemSubmodule = {
    */
   name: 'sharedId',
   aliasName: 'pubCommonId',
-  /**
-   * Vendor id of prebid
-   * @type {Number}
-   */
-  gvlid: GVLID,
 
   /**
    * decode the stored id value for passing to bid requests
diff --git a/modules/userId/index.js b/modules/userId/index.js
index ecc494846ee..f42c4c7827f 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -167,9 +167,6 @@ const CONSENT_DATA_COOKIE_STORAGE_CONFIG = {
 export const PBJS_USER_ID_OPTOUT_NAME = '_pbjs_id_optout';
 export const coreStorage = getCoreStorageManager('userid');
 
-/** @type {string[]} */
-let validStorageTypes = [];
-
 /** @type {boolean} */
 let addedUserIdHook = false;
 
@@ -834,7 +831,19 @@ function populateSubmoduleId(submodule, consentData, storedConsentData, forceRef
 }
 
 function initSubmodules(dest, submodules, consentData, forceRefresh = false) {
-  // gdpr consent with purpose one is required, otherwise exit immediately
+  if (!submodules.length) return []; // to simplify log messages from here on
+
+  // filter out submodules whose storage type is not enabled
+  // this needs to be done here (after consent data has loaded) so that enforcement may disable storage globally
+  const storageTypes = getActiveStorageTypes();
+  submodules = submodules.filter((submod) => !submod.config.storage || storageTypes.has(submod.config.storage.type));
+
+  if (!submodules.length) {
+    logWarn(`${MODULE_NAME} - no ID module is configured for one of the available storage types:`, Array.from(storageTypes))
+    return [];
+  }
+
+  // another consent check, this time each module is checked for consent with its own gvlid
   let { userIdModules, hasValidated } = validateGdprEnforcement(submodules, consentData);
   if (!hasValidated && !hasPurpose1Consent(consentData)) {
     logWarn(`${MODULE_NAME} - gdpr permission not valid for local storage or cookies, exit module`);
@@ -885,7 +894,7 @@ function updateInitializedSubmodules(dest, submodule) {
  * @param {string[]} activeStorageTypes
  * @returns {SubmoduleConfig[]}
  */
-function getValidSubmoduleConfigs(configRegistry, submoduleRegistry, activeStorageTypes) {
+function getValidSubmoduleConfigs(configRegistry, submoduleRegistry) {
   if (!Array.isArray(configRegistry)) {
     return [];
   }
@@ -895,11 +904,11 @@ function getValidSubmoduleConfigs(configRegistry, submoduleRegistry, activeStora
       return carry;
     }
     // Validate storage config contains 'type' and 'name' properties with non-empty string values
-    // 'type' must be a value currently enabled in the browser
+    // 'type' must be one of html5, cookies
     if (config.storage &&
       !isEmptyStr(config.storage.type) &&
       !isEmptyStr(config.storage.name) &&
-      activeStorageTypes.indexOf(config.storage.type) !== -1) {
+      ALL_STORAGE_TYPES.has(config.storage.type)) {
       carry.push(config);
     } else if (isPlainObject(config.value)) {
       carry.push(config);
@@ -910,11 +919,33 @@ function getValidSubmoduleConfigs(configRegistry, submoduleRegistry, activeStora
   }, []);
 }
 
+const ALL_STORAGE_TYPES = new Set([LOCAL_STORAGE, COOKIE]);
+
+function getActiveStorageTypes() {
+  const storageTypes = [];
+  let disabled = false;
+  if (coreStorage.localStorageIsEnabled()) {
+    storageTypes.push(LOCAL_STORAGE);
+    if (coreStorage.getDataFromLocalStorage(PBJS_USER_ID_OPTOUT_NAME)) {
+      logInfo(`${MODULE_NAME} - opt-out localStorage found, storage disabled`);
+      disabled = true;
+    }
+  }
+  if (coreStorage.cookiesAreEnabled()) {
+    storageTypes.push(COOKIE);
+    if (coreStorage.getCookie(PBJS_USER_ID_OPTOUT_NAME)) {
+      logInfo(`${MODULE_NAME} - opt-out cookie found, storage disabled`);
+      disabled = true;
+    }
+  }
+  return new Set(disabled ? [] : storageTypes)
+}
+
 /**
  * update submodules by validating against existing configs and storage types
  */
 function updateSubmodules() {
-  const configs = getValidSubmoduleConfigs(configRegistry, submoduleRegistry, validStorageTypes);
+  const configs = getValidSubmoduleConfigs(configRegistry, submoduleRegistry);
   if (!configs.length) {
     return;
   }
@@ -987,22 +1018,6 @@ export function init(config, {delay = GreedyPromise.timeout} = {}) {
   }
   submoduleRegistry = [];
 
-  // list of browser enabled storage types
-  validStorageTypes = [
-    coreStorage.localStorageIsEnabled() ? LOCAL_STORAGE : null,
-    coreStorage.cookiesAreEnabled() ? COOKIE : null
-  ].filter(i => i !== null);
-
-  // exit immediately if opt out cookie or local storage keys exists.
-  if (validStorageTypes.indexOf(COOKIE) !== -1 && coreStorage.getCookie(PBJS_USER_ID_OPTOUT_NAME)) {
-    logInfo(`${MODULE_NAME} - opt-out cookie found, exit module`);
-    return;
-  }
-  if (validStorageTypes.indexOf(LOCAL_STORAGE) !== -1 && coreStorage.getDataFromLocalStorage(PBJS_USER_ID_OPTOUT_NAME)) {
-    logInfo(`${MODULE_NAME} - opt-out localStorage found, exit module`);
-    return;
-  }
-
   // listen for config userSyncs to be set
   configListener = config.getConfig('userSync', conf => {
     // Note: support for 'usersync' was dropped as part of Prebid.js 4.0
diff --git a/src/storageManager.js b/src/storageManager.js
index e703e0774d3..4ab224f8d9b 100644
--- a/src/storageManager.js
+++ b/src/storageManager.js
@@ -1,6 +1,5 @@
 import {hook} from './hook.js';
 import {hasDeviceAccess, checkCookieSupport, logError, logInfo, isPlainObject} from './utils.js';
-import {includes} from './polyfill.js';
 import {bidderSettings as defaultBidderSettings} from './bidderSettings.js';
 
 const moduleTypeWhiteList = ['core', 'prebid-module'];
@@ -33,13 +32,11 @@ export function newStorageManager({gvlid, moduleName, bidderCode, moduleType} =
     const storageAllowed = bidderSettings.get(bidderCode, 'storageAllowed');
     return storageAllowed == null ? false : storageAllowed;
   }
+
+  const isVendorless = moduleTypeWhiteList.includes(moduleType);
+
   function isValid(cb) {
-    if (includes(moduleTypeWhiteList, moduleType)) {
-      let result = {
-        valid: true
-      }
-      return cb(result);
-    } else if (!isBidderAllowed()) {
+    if (!isBidderAllowed()) {
       logInfo(`bidderSettings denied access to device storage for bidder '${bidderCode}'`);
       const result = {valid: false};
       return cb(result);
@@ -48,7 +45,7 @@ export function newStorageManager({gvlid, moduleName, bidderCode, moduleType} =
       let hookDetails = {
         hasEnforcementHook: false
       }
-      validateStorageEnforcement(gvlid, bidderCode || moduleName, hookDetails, function(result) {
+      validateStorageEnforcement(isVendorless, gvlid, bidderCode || moduleName, hookDetails, function(result) {
         if (result && result.hasEnforcementHook) {
           value = cb(result);
         } else {
@@ -149,11 +146,7 @@ export function newStorageManager({gvlid, moduleName, bidderCode, moduleType} =
   const cookiesAreEnabled = function (done) {
     let cb = function (result) {
       if (result && result.valid) {
-        if (checkCookieSupport()) {
-          return true;
-        }
-        window.document.cookie = 'prebid.cookieTest';
-        return window.document.cookie.indexOf('prebid.cookieTest') !== -1;
+        return checkCookieSupport();
       }
       return false;
     }
@@ -303,7 +296,7 @@ export function newStorageManager({gvlid, moduleName, bidderCode, moduleType} =
 /**
  * This hook validates the storage enforcement if gdprEnforcement module is included
  */
-export const validateStorageEnforcement = hook('async', function(gvlid, moduleName, hookDetails, callback) {
+export const validateStorageEnforcement = hook('async', function(isVendorless, gvlid, moduleName, hookDetails, callback) {
   callback(hookDetails);
 }, 'validateStorageEnforcement');
 
diff --git a/src/userSync.js b/src/userSync.js
index 96c3d662cad..674114e11f6 100644
--- a/src/userSync.js
+++ b/src/userSync.js
@@ -315,12 +315,16 @@ export function newUserSync(userSyncDependencies) {
   return publicApi;
 }
 
-const browserSupportsCookies = !isSafariBrowser() && storage.cookiesAreEnabled();
-
-export const userSync = newUserSync({
+export const userSync = newUserSync(Object.defineProperties({
   config: config.getConfig('userSync'),
-  browserSupportsCookies: browserSupportsCookies
-});
+}, {
+  browserSupportsCookies: {
+    get: function() {
+      // call storage lazily to give time for consent data to be available
+      return !isSafariBrowser() && storage.cookiesAreEnabled();
+    }
+  }
+}));
 
 /**
  * @typedef {Object} UserSyncDependencies
diff --git a/test/helpers/consentData.js b/test/helpers/consentData.js
index b59388d67f2..c708e397bd6 100644
--- a/test/helpers/consentData.js
+++ b/test/helpers/consentData.js
@@ -2,6 +2,11 @@ import {gdprDataHandler} from 'src/adapterManager.js';
 import {GreedyPromise} from '../../src/utils/promise.js';
 
 export function mockGdprConsent(sandbox, getConsentData = () => null) {
+  sandbox.stub(gdprDataHandler, 'enabled').get(() => true)
   sandbox.stub(gdprDataHandler, 'promise').get(() => GreedyPromise.resolve(getConsentData()));
   sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(getConsentData)
 }
+
+beforeEach(() => {
+  gdprDataHandler.reset();
+})
diff --git a/test/spec/modules/adnuntiusBidAdapter_spec.js b/test/spec/modules/adnuntiusBidAdapter_spec.js
index 307830dd4ef..403ba63d7d1 100644
--- a/test/spec/modules/adnuntiusBidAdapter_spec.js
+++ b/test/spec/modules/adnuntiusBidAdapter_spec.js
@@ -11,8 +11,11 @@ describe('adnuntiusBidAdapter', function () {
   const GVLID = 855;
   const usi = utils.generateUUID()
   const meta = [{ key: 'usi', value: usi }]
-  const storage = getStorageManager({ gvlid: GVLID, moduleName: 'adnuntius' })
-  storage.setDataInLocalStorage('adn.metaData', JSON.stringify(meta))
+
+  before(() => {
+    const storage = getStorageManager({gvlid: GVLID, moduleName: 'adnuntius'})
+    storage.setDataInLocalStorage('adn.metaData', JSON.stringify(meta))
+  });
 
   beforeEach(function () {
     $$PREBID_GLOBAL$$.bidderSettings = {
diff --git a/test/spec/modules/gdprEnforcement_spec.js b/test/spec/modules/gdprEnforcement_spec.js
index a78f5ac948e..ddd522decab 100644
--- a/test/spec/modules/gdprEnforcement_spec.js
+++ b/test/spec/modules/gdprEnforcement_spec.js
@@ -10,13 +10,16 @@ import {
   purpose2Rule,
   enableAnalyticsHook,
   getGvlid,
-  internal
+  internal, STRICT_STORAGE_ENFORCEMENT
 } from 'modules/gdprEnforcement.js';
 import { config } from 'src/config.js';
 import adapterManager, { gdprDataHandler } from 'src/adapterManager.js';
 import * as utils from 'src/utils.js';
 import { validateStorageEnforcement } from 'src/storageManager.js';
 import * as events from 'src/events.js';
+import 'modules/appnexusBidAdapter.js'; // some tests expect this to be in the adapter registry
+import 'src/prebid.js'
+import {hook} from '../../../src/hook.js';
 
 describe('gdpr enforcement', function () {
   let nextFnSpy;
@@ -97,6 +100,10 @@ describe('gdpr enforcement', function () {
     }
   };
 
+  before(() => {
+    hook.ready();
+  });
+
   after(function () {
     validateStorageEnforcement.getHooks({ hook: deviceAccessHook }).remove();
     $$PREBID_GLOBAL$$.requestBids.getHooks().remove();
@@ -143,13 +150,13 @@ describe('gdpr enforcement', function () {
         }
       });
 
-      deviceAccessHook(nextFnSpy);
+      deviceAccessHook(nextFnSpy, false);
       expect(nextFnSpy.calledOnce).to.equal(true);
       let result = {
         hasEnforcementHook: true,
         valid: false
       }
-      sinon.assert.calledWith(nextFnSpy, undefined, undefined, result);
+      sinon.assert.calledWith(nextFnSpy, false, undefined, undefined, result);
     });
 
     it('should only check for consent for vendor exceptions when enforcePurpose and enforceVendor are false', function () {
@@ -171,8 +178,8 @@ describe('gdpr enforcement', function () {
       consentData.apiVersion = 2;
       gdprDataHandlerStub.returns(consentData);
 
-      deviceAccessHook(nextFnSpy, 1, 'appnexus');
-      deviceAccessHook(nextFnSpy, 5, 'rubicon');
+      deviceAccessHook(nextFnSpy, false, 1, 'appnexus');
+      deviceAccessHook(nextFnSpy, false, 5, 'rubicon');
       expect(logWarnSpy.callCount).to.equal(0);
     });
 
@@ -194,8 +201,8 @@ describe('gdpr enforcement', function () {
       consentData.apiVersion = 2;
       gdprDataHandlerStub.returns(consentData);
 
-      deviceAccessHook(nextFnSpy, 1, 'appnexus');
-      deviceAccessHook(nextFnSpy, 3, 'rubicon');
+      deviceAccessHook(nextFnSpy, false, 1, 'appnexus');
+      deviceAccessHook(nextFnSpy, false, 3, 'rubicon');
       expect(logWarnSpy.callCount).to.equal(1);
     });
 
@@ -217,13 +224,13 @@ describe('gdpr enforcement', function () {
       consentData.apiVersion = 2;
       gdprDataHandlerStub.returns(consentData);
 
-      deviceAccessHook(nextFnSpy, 1, 'appnexus');
+      deviceAccessHook(nextFnSpy, false, 1, 'appnexus');
       expect(nextFnSpy.calledOnce).to.equal(true);
       let result = {
         hasEnforcementHook: true,
         valid: true
       }
-      sinon.assert.calledWith(nextFnSpy, 1, 'appnexus', result);
+      sinon.assert.calledWith(nextFnSpy, false, 1, 'appnexus', result);
     });
 
     it('should use gvlMapping set by publisher', function() {
@@ -248,13 +255,13 @@ describe('gdpr enforcement', function () {
       consentData.apiVersion = 2;
       gdprDataHandlerStub.returns(consentData);
 
-      deviceAccessHook(nextFnSpy, 1, 'appnexus');
+      deviceAccessHook(nextFnSpy, false, 1, 'appnexus');
       expect(nextFnSpy.calledOnce).to.equal(true);
       let result = {
         hasEnforcementHook: true,
         valid: true
       }
-      sinon.assert.calledWith(nextFnSpy, 4, 'appnexus', result);
+      sinon.assert.calledWith(nextFnSpy, false, 4, 'appnexus', result);
       config.resetConfig();
     });
 
@@ -283,16 +290,43 @@ describe('gdpr enforcement', function () {
       consentData.apiVersion = 2;
       gdprDataHandlerStub.returns(consentData);
 
-      deviceAccessHook(nextFnSpy, 1, 'appnexus');
+      deviceAccessHook(nextFnSpy, false, 1, 'appnexus');
       expect(nextFnSpy.calledOnce).to.equal(true);
       let result = {
         hasEnforcementHook: true,
         valid: true
       }
-      sinon.assert.calledWith(nextFnSpy, 4, 'appnexus', result);
+      sinon.assert.calledWith(nextFnSpy, false, 4, 'appnexus', result);
       config.resetConfig();
       curBidderStub.restore();
     });
+
+    it(`should mark module as vendorless for rule validation when isVendorless = true and ${STRICT_STORAGE_ENFORCEMENT} is set`, () => {
+      setEnforcementConfig({
+        [STRICT_STORAGE_ENFORCEMENT]: true
+      });
+      let consentData = {
+        vendorData: staticConfig.consentData.getTCData,
+        gdprApplies: true
+      }
+      gdprDataHandlerStub.returns(consentData);
+      const validate = sinon.stub().callsFake(() => true);
+      deviceAccessHook(nextFnSpy, true, 123, 'mockModule', undefined, {validate});
+      expect(validate.args[0][4]('mockModule')).to.be.true;
+    });
+
+    it(`should not enforce consent for vendorless modules if ${STRICT_STORAGE_ENFORCEMENT} is not set`, () => {
+      setEnforcementConfig({});
+      let consentData = {
+        vendorData: staticConfig.consentData.getTCData,
+        gdprApplies: true
+      }
+      gdprDataHandlerStub.returns(consentData);
+      const validate = sinon.stub().callsFake(() => false);
+      deviceAccessHook(nextFnSpy, true, 123, 'mockModule', undefined, {validate});
+      sinon.assert.callCount(validate, 0);
+      sinon.assert.calledWith(nextFnSpy, true, 123, 'mockModule', {hasEnforcementHook: true, valid: true});
+    })
   });
 
   describe('userSyncHook', function () {
@@ -888,6 +922,33 @@ describe('gdpr enforcement', function () {
       expect(isAllowed).to.equal(true);
     });
 
+    describe('when module does not need vendor consent', () => {
+      Object.entries({
+        'storage': 1,
+        'basicAds': 2,
+        'measurement': 7
+      }).forEach(([purpose, purposeNo]) => {
+        describe(`for purpose ${purpose}`, () => {
+          const rule = createGdprRule(purpose);
+          Object.entries({
+            'allowed': true,
+            'not allowed': false
+          }).forEach(([t, consentGiven]) => {
+            it(`should be ${t} when purpose is ${t}`, () => {
+              const consent = utils.deepClone(consentData);
+              consent.vendorData.purpose.consents[purposeNo] = consentGiven;
+              // vendor consent (and gvlid) should be ignored
+              consent.vendorData.vendor.consents[123] = !consentGiven;
+              // take legitimate interest out of the picture for this test
+              consent.vendorData.purpose.legitimateInterests = {};
+              const actual = validateRules(rule, consent, 'mockModule', 123, () => true);
+              expect(actual).to.equal(consentGiven);
+            })
+          })
+        })
+      })
+    })
+
     describe('Purpose 2 special case', function () {
       const consentDataWithLIFalse = utils.deepClone(consentData);
       consentDataWithLIFalse.vendorData.purpose.legitimateInterests['2'] = false;
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index 086ec305ccc..243b702f03d 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -3462,6 +3462,7 @@ describe('IndexexchangeAdapter', function () {
 
     it('should not save error data into localstorage if consent is not given', () => {
       config.setConfig({ deviceAccess: false });
+      storage.localStorageIsEnabled.restore(); // let core manage device access
       const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
       bid.params.size = ['400', 100];
       expect(spec.isBidRequestValid(bid)).to.be.false;
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 486018d41c4..77ba1396afb 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -698,11 +698,15 @@ describe('User ID', function () {
       config.resetConfig();
     });
 
-    it('fails initialization if opt out cookie exists', function () {
+    it('does not fetch ids if opt out cookie exists', function () {
       init(config);
       setSubmoduleRegistry([sharedIdSystemSubmodule]);
-      config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
-      expect(utils.logInfo.args[0][0]).to.exist.and.to.equal('User ID - opt-out cookie found, exit module');
+      const cfg = getConfigMock(['pubCommonId', 'pubcid', 'cookie']);
+      cfg.userSync.auctionDelay = 1; // to let init complete without an auction
+      config.setConfig(cfg);
+      return getGlobal().getUserIdsAsync().then((uid) => {
+        expect(uid).to.eql({});
+      })
     });
 
     it('initializes if no opt out cookie exists', function () {
diff --git a/test/spec/unit/core/storageManager_spec.js b/test/spec/unit/core/storageManager_spec.js
index dacde5491b7..cb38aed9e47 100644
--- a/test/spec/unit/core/storageManager_spec.js
+++ b/test/spec/unit/core/storageManager_spec.js
@@ -3,7 +3,7 @@ import {
   getCoreStorageManager,
   storageCallbacks,
   getStorageManager,
-  newStorageManager
+  newStorageManager, validateStorageEnforcement
 } from 'src/storageManager.js';
 import { config } from 'src/config.js';
 import * as utils from 'src/utils.js';
@@ -55,6 +55,33 @@ describe('storage manager', function() {
     deviceAccessSpy.restore();
   });
 
+  describe(`core storage`, () => {
+    let storage, validateHook;
+
+    beforeEach(() => {
+      storage = getCoreStorageManager();
+      validateHook = sinon.stub().callsFake(function (next, ...args) {
+        next.apply(this, args);
+      });
+      validateStorageEnforcement.before(validateHook, 99);
+    });
+
+    afterEach(() => {
+      validateStorageEnforcement.getHooks({hook: validateHook}).remove();
+      config.resetConfig();
+    })
+
+    it('should respect (vendorless) consent enforcement', () => {
+      storage.localStorageIsEnabled();
+      expect(validateHook.args[0][1]).to.eql(true); // isVendorless should be set to true
+    });
+
+    it('should respect the deviceAccess flag', () => {
+      config.setConfig({deviceAccess: false});
+      expect(storage.localStorageIsEnabled()).to.be.false
+    })
+  })
+
   describe('localstorage forbidden access in 3rd-party context', function() {
     let errorLogSpy;
     let originalLocalStorage;
diff --git a/test/test_deps.js b/test/test_deps.js
index 77fbad93e1c..35713106f8c 100644
--- a/test/test_deps.js
+++ b/test/test_deps.js
@@ -4,6 +4,7 @@ window.process = {
   }
 };
 
+require('test/helpers/consentData.js');
 require('test/helpers/prebidGlobal.js');
 require('test/mocks/adloaderStub.js');
 require('test/mocks/xhr.js');

From 95ee4932dfbf699029cc9ebf3fa16e6fe723e8ac Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Thu, 28 Jul 2022 06:03:34 -0700
Subject: [PATCH 087/569] Topics FPD module: initial release (#8646)

* Topics FPD module

* Small improvements

* Map taxonomyVersion to segtax, modelVersion to segclass

* Convert fpdModule & topicsFpdModule to use GreedyPromise
---
 modules/.submodules.json                  |   3 +-
 modules/fpdModule/index.js                |  22 +-
 modules/topicsFpdModule.js                |  80 ++++++++
 test/spec/modules/fpdModule_spec.js       | 127 ++++++------
 test/spec/modules/topicsFpdModule_spec.js | 239 ++++++++++++++++++++++
 5 files changed, 406 insertions(+), 65 deletions(-)
 create mode 100644 modules/topicsFpdModule.js
 create mode 100644 test/spec/modules/topicsFpdModule_spec.js

diff --git a/modules/.submodules.json b/modules/.submodules.json
index d24e7ff96f5..b031a6bac02 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -70,7 +70,8 @@
     ],
     "fpdModule": [
       "enrichmentFpdModule",
-      "validationFpdModule"
+      "validationFpdModule",
+      "topicsFpdModule"
     ]
   },
   "libraries": {
diff --git a/modules/fpdModule/index.js b/modules/fpdModule/index.js
index bd735e215a4..553cab47b66 100644
--- a/modules/fpdModule/index.js
+++ b/modules/fpdModule/index.js
@@ -4,6 +4,8 @@
  */
 import { config } from '../../src/config.js';
 import { module, getHook } from '../../src/hook.js';
+import {logError} from '../../src/utils.js';
+import {GreedyPromise} from '../../src/utils/promise.js';
 
 let submodules = [];
 
@@ -17,19 +19,27 @@ export function reset() {
 
 export function processFpd({global = {}, bidder = {}} = {}) {
   let modConf = config.getConfig('firstPartyData') || {};
-
+  let result = GreedyPromise.resolve({global, bidder});
   submodules.sort((a, b) => {
     return ((a.queue || 1) - (b.queue || 1));
   }).forEach(submodule => {
-    ({global = global, bidder = bidder} = submodule.processFpd(modConf, {global, bidder}));
+    result = result.then(
+      ({global, bidder}) => GreedyPromise.resolve(submodule.processFpd(modConf, {global, bidder}))
+        .catch((err) => {
+          logError(`Error in FPD module ${submodule.name}`, err);
+          return {};
+        })
+        .then((result) => ({global: result.global || global, bidder: result.bidder || bidder}))
+    );
   });
-
-  return {global, bidder};
+  return result;
 }
 
 export function startAuctionHook(fn, req) {
-  Object.assign(req.ortb2Fragments, processFpd(req.ortb2Fragments));
-  fn.call(this, req);
+  processFpd(req.ortb2Fragments).then((ortb2Fragments) => {
+    Object.assign(req.ortb2Fragments, ortb2Fragments);
+    fn.call(this, req);
+  })
 }
 
 function setupHook() {
diff --git a/modules/topicsFpdModule.js b/modules/topicsFpdModule.js
new file mode 100644
index 00000000000..dbd1d3e90e9
--- /dev/null
+++ b/modules/topicsFpdModule.js
@@ -0,0 +1,80 @@
+import {logError, logWarn, mergeDeep} from '../src/utils.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {submodule} from '../src/hook.js';
+import {GreedyPromise} from '../src/utils/promise.js';
+
+const TAXONOMIES = {
+  // map from topic taxonomyVersion to IAB segment taxonomy
+  '1': 600
+}
+
+function partitionBy(field, items) {
+  return items.reduce((partitions, item) => {
+    const key = item[field];
+    if (!partitions.hasOwnProperty(key)) partitions[key] = [];
+    partitions[key].push(item);
+    return partitions;
+  }, {});
+}
+
+export function getTopicsData(name, topics, taxonomies = TAXONOMIES) {
+  return Object.entries(partitionBy('taxonomyVersion', topics))
+    .filter(([taxonomyVersion]) => {
+      if (!taxonomies.hasOwnProperty(taxonomyVersion)) {
+        logWarn(`Unrecognized taxonomyVersion from Topics API: "${taxonomyVersion}"; topic will be ignored`);
+        return false;
+      }
+      return true;
+    }).flatMap(([taxonomyVersion, topics]) =>
+      Object.entries(partitionBy('modelVersion', topics))
+        .map(([modelVersion, topics]) => {
+          const datum = {
+            ext: {
+              segtax: taxonomies[taxonomyVersion],
+              segclass: modelVersion
+            },
+            segment: topics.map((topic) => ({id: topic.topic.toString()}))
+          };
+          if (name != null) {
+            datum.name = name;
+          }
+          return datum;
+        })
+    );
+}
+
+export function getTopics(doc = document) {
+  let topics = null;
+  try {
+    if ('browsingTopics' in doc && doc.featurePolicy.allowsFeature('browsing-topics')) {
+      topics = GreedyPromise.resolve(doc.browsingTopics());
+    }
+  } catch (e) {
+    logError('Could not call topics API', e);
+  }
+  if (topics == null) {
+    topics = GreedyPromise.resolve([]);
+  }
+  return topics;
+}
+
+const topicsData = getTopics().then((topics) => getTopicsData(getRefererInfo().domain, topics));
+
+export function processFpd(config, {global}, {data = topicsData} = {}) {
+  return data.then((data) => {
+    if (data.length) {
+      mergeDeep(global, {
+        user: {
+          data
+        }
+      });
+    }
+    return {global};
+  });
+}
+
+submodule('firstPartyData', {
+  name: 'topics',
+  queue: 1,
+  processFpd
+});
diff --git a/test/spec/modules/fpdModule_spec.js b/test/spec/modules/fpdModule_spec.js
index d43ae8309bd..498bed29243 100644
--- a/test/spec/modules/fpdModule_spec.js
+++ b/test/spec/modules/fpdModule_spec.js
@@ -5,9 +5,6 @@ import {processFpd, registerSubmodules, startAuctionHook, reset} from 'modules/f
 import * as enrichmentModule from 'modules/enrichmentFpdModule.js';
 import * as validationModule from 'modules/validationFpdModule/index.js';
 
-let enrichments = {...enrichmentModule};
-let validations = {...validationModule};
-
 describe('the first party data module', function () {
   afterEach(function () {
     config.resetConfig();
@@ -18,21 +15,37 @@ describe('the first party data module', function () {
       global: {key: 'value'},
       bidder: {A: {bkey: 'bvalue'}}
     }
-    before(() => {
+    beforeEach(() => {
       reset();
+    });
+
+    it('should run ortb2Fragments through fpd submodules', () => {
       registerSubmodules({
         name: 'test',
-        queue: 2,
         processFpd: function () {
           return mockFpd;
         }
       });
-    })
+      const req = {ortb2Fragments: {}};
+      return new Promise((resolve) => startAuctionHook(resolve, req))
+        .then(() => {
+          expect(req.ortb2Fragments).to.eql(mockFpd);
+        })
+    });
 
-    it('should run ortb2Fragments through fpd submodules', () => {
+    it('should work with fpd submodules that return promises', () => {
+      registerSubmodules({
+        name: 'test',
+        processFpd: function () {
+          return Promise.resolve(mockFpd);
+        }
+      });
       const req = {ortb2Fragments: {}};
-      startAuctionHook(() => null, req);
-      expect(req.ortb2Fragments).to.eql(mockFpd);
+      return new Promise((resolve) => {
+        startAuctionHook(resolve, req);
+      }).then(() => {
+        expect(req.ortb2Fragments).to.eql(mockFpd);
+      });
     });
   });
 
@@ -79,7 +92,6 @@ describe('the first party data module', function () {
     });
 
     it('filters ortb2 data that is set', function () {
-      let validated;
       const global = {
         user: {
           data: {},
@@ -113,42 +125,42 @@ describe('the first party data module', function () {
       width = 1120;
       height = 750;
 
-      ({global: validated} = processFpd({global}));
-      expect(validated.site.ref).to.equal(getRefererInfo().ref || undefined);
-      expect(validated.site.page).to.equal('https://www.domain.com/path?query=12345');
-      expect(validated.site.domain).to.equal('domain.com');
-      expect(validated.site.content.data).to.deep.equal([{segment: [{id: 'test'}], name: 'bar'}]);
-      expect(validated.user.data).to.be.undefined;
-      expect(validated.device).to.deep.to.equal({w: 1, h: 1});
-      expect(validated.site.keywords).to.be.undefined;
+      return processFpd({global}).then(({global: validated}) => {
+        expect(validated.site.ref).to.equal(getRefererInfo().ref || undefined);
+        expect(validated.site.page).to.equal('https://www.domain.com/path?query=12345');
+        expect(validated.site.domain).to.equal('domain.com');
+        expect(validated.site.content.data).to.deep.equal([{segment: [{id: 'test'}], name: 'bar'}]);
+        expect(validated.user.data).to.be.undefined;
+        expect(validated.device).to.deep.to.equal({w: 1, h: 1});
+        expect(validated.site.keywords).to.be.undefined;
+      });
     });
 
     it('should not overwrite existing data with default settings', function () {
-      let validated;
       const global = {
         site: {
           ref: 'https://referer.com'
         }
       };
 
-      ({global: validated} = processFpd({global}));
-      expect(validated.site.ref).to.equal('https://referer.com');
+      return processFpd({global}).then(({global: validated}) => {
+        expect(validated.site.ref).to.equal('https://referer.com');
+      });
     });
 
     it('should allow overwrite default data with setConfig', function () {
-      let validated;
       const global = {
         site: {
           ref: 'https://referer.com'
         }
       };
 
-      ({global: validated} = processFpd({global}));
-      expect(validated.site.ref).to.equal('https://referer.com');
+      return processFpd({global}).then(({global: validated}) => {
+        expect(validated.site.ref).to.equal('https://referer.com');
+      });
     });
 
     it('should filter all data', function () {
-      let validated;
       let global = {
         imp: [],
         site: {
@@ -179,15 +191,13 @@ describe('the first party data module', function () {
           adServerCurrency: 'USD'
         }
       };
-
       config.setConfig({'firstPartyData': {skipEnrichments: true}});
-
-      ({global: validated} = processFpd({global}));
-      expect(validated).to.deep.equal({});
+      return processFpd({global}).then(({global: validated}) => {
+        expect(validated).to.deep.equal({});
+      });
     });
 
     it('should add enrichments but not alter any arbitrary ortb2 data', function () {
-      let validated;
       let global = {
         site: {
           ext: {
@@ -205,12 +215,12 @@ describe('the first party data module', function () {
         },
         cur: ['USD']
       };
-
-      ({global: validated} = processFpd({global}));
-      expect(validated.site.ref).to.equal(getRefererInfo().referer);
-      expect(validated.site.ext.data).to.deep.equal({inventory: ['value1']});
-      expect(validated.user.ext.data).to.deep.equal({visitor: ['value2']});
-      expect(validated.cur).to.deep.equal(['USD']);
+      return processFpd({global}).then(({global: validated}) => {
+        expect(validated.site.ref).to.equal(getRefererInfo().referer);
+        expect(validated.site.ext.data).to.deep.equal({inventory: ['value1']});
+        expect(validated.user.ext.data).to.deep.equal({visitor: ['value2']});
+        expect(validated.cur).to.deep.equal(['USD']);
+      })
     });
 
     it('should filter bidderConfig data', function () {
@@ -230,12 +240,13 @@ describe('the first party data module', function () {
         }
       };
 
-      const {bidder: validated} = processFpd({bidder});
-      expect(validated.bidderA).to.not.be.undefined;
-      expect(validated.bidderA.user.data).to.be.undefined;
-      expect(validated.bidderA.user.keywords).to.equal('test');
-      expect(validated.bidderA.site.keywords).to.equal('other');
-      expect(validated.bidderA.site.ref).to.equal('https://domain.com');
+      return processFpd({bidder}).then(({bidder: validated}) => {
+        expect(validated.bidderA).to.not.be.undefined;
+        expect(validated.bidderA.user.data).to.be.undefined;
+        expect(validated.bidderA.user.keywords).to.equal('test');
+        expect(validated.bidderA.site.keywords).to.equal('other');
+        expect(validated.bidderA.site.ref).to.equal('https://domain.com');
+      })
     });
 
     it('should not filter bidderConfig data as it is valid', function () {
@@ -255,17 +266,16 @@ describe('the first party data module', function () {
         }
       };
 
-      const {bidder: validated} = processFpd({bidder});
-
-      expect(validated.bidderA).to.not.be.undefined;
-      expect(validated.bidderA.user.data).to.deep.equal([{segment: [{id: 'data1_id'}], name: 'data1'}]);
-      expect(validated.bidderA.user.keywords).to.equal('test');
-      expect(validated.bidderA.site.keywords).to.equal('other');
-      expect(validated.bidderA.site.ref).to.equal('https://domain.com');
+      return processFpd({bidder}).then(({bidder: validated}) => {
+        expect(validated.bidderA).to.not.be.undefined;
+        expect(validated.bidderA.user.data).to.deep.equal([{segment: [{id: 'data1_id'}], name: 'data1'}]);
+        expect(validated.bidderA.user.keywords).to.equal('test');
+        expect(validated.bidderA.site.keywords).to.equal('other');
+        expect(validated.bidderA.site.ref).to.equal('https://domain.com');
+      });
     });
 
     it('should not set default values if skipEnrichments is turned on', function () {
-      let validated;
       config.setConfig({'firstPartyData': {skipEnrichments: true}});
 
       let global = {
@@ -281,15 +291,15 @@ describe('the first party data module', function () {
         }
       };
 
-      ({global: validated} = processFpd({global}));
-      expect(validated.device).to.be.undefined;
-      expect(validated.site.ref).to.be.undefined;
-      expect(validated.site.page).to.be.undefined;
-      expect(validated.site.domain).to.be.undefined;
+      return processFpd({global}).then(({global: validated}) => {
+        expect(validated.device).to.be.undefined;
+        expect(validated.site.ref).to.be.undefined;
+        expect(validated.site.page).to.be.undefined;
+        expect(validated.site.domain).to.be.undefined;
+      });
     });
 
     it('should not validate ortb2 data if skipValidations is turned on', function () {
-      let validated;
       config.setConfig({'firstPartyData': {skipValidations: true}});
 
       let global = {
@@ -304,8 +314,9 @@ describe('the first party data module', function () {
         }
       };
 
-      ({global: validated} = processFpd({global}));
-      expect(validated.user.data).to.deep.equal([{segment: [{id: 'nonfiltered'}]}]);
+      return processFpd({global}).then(({global: validated}) => {
+        expect(validated.user.data).to.deep.equal([{segment: [{id: 'nonfiltered'}]}]);
+      });
     });
   });
 });
diff --git a/test/spec/modules/topicsFpdModule_spec.js b/test/spec/modules/topicsFpdModule_spec.js
new file mode 100644
index 00000000000..3781768497b
--- /dev/null
+++ b/test/spec/modules/topicsFpdModule_spec.js
@@ -0,0 +1,239 @@
+import {getTopics, getTopicsData, processFpd} from '../../../modules/topicsFpdModule.js';
+import {deepClone} from '../../../src/utils.js';
+
+describe('getTopicsData', () => {
+  function makeTopic(topic, modelv, taxv = '1') {
+    return {
+      topic,
+      taxonomyVersion: taxv,
+      modelVersion: modelv
+    }
+  }
+
+  function byTaxClass(segments) {
+    return segments.reduce((memo, segment) => {
+      memo[`${segment.ext.segtax}:${segment.ext.segclass}`] = segment;
+      return memo;
+    }, {})
+  }
+
+  [
+    {
+      t: 'no topics',
+      topics: [],
+      expected: []
+    },
+    {
+      t: 'single topic',
+      topics: [makeTopic(123, 'm1')],
+      expected: [
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm1'
+          },
+          segment: [
+            {id: '123'}
+          ]
+        }
+      ]
+    },
+    {
+      t: 'multiple topics with the same model version',
+      topics: [makeTopic(123, 'm1'), makeTopic(321, 'm1')],
+      expected: [
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm1'
+          },
+          segment: [
+            {id: '123'},
+            {id: '321'}
+          ]
+        }
+      ]
+    },
+    {
+      t: 'multiple topics with different model versions',
+      topics: [makeTopic(1, 'm1'), makeTopic(2, 'm1'), makeTopic(3, 'm2')],
+      expected: [
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm1'
+          },
+          segment: [
+            {id: '1'},
+            {id: '2'}
+          ]
+        },
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm2'
+          },
+          segment: [
+            {id: '3'}
+          ]
+        }
+      ]
+    },
+    {
+      t: 'multiple topics, some with a taxonomy version other than "1"',
+      topics: [makeTopic(123, 'm1'), makeTopic(321, 'm1', 'other')],
+      expected: [
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm1'
+          },
+          segment: [
+            {id: '123'}
+          ]
+        }
+      ]
+    },
+    {
+      t: 'multiple topics in multiple taxonomies',
+      taxonomies: {
+        '1': 600,
+        '2': 601
+      },
+      topics: [
+        makeTopic(123, 'm1', '1'),
+        makeTopic(321, 'm1', '2'),
+        makeTopic(213, 'm2', '1'),
+      ],
+      expected: [
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm1'
+          },
+          segment: [
+            {id: '123'}
+          ]
+        },
+        {
+          ext: {
+            segtax: 601,
+            segclass: 'm1',
+          },
+          segment: [
+            {id: '321'}
+          ]
+        },
+        {
+          ext: {
+            segtax: 600,
+            segclass: 'm2'
+          },
+          segment: [
+            {id: '213'}
+          ]
+        }
+      ]
+    }
+  ].forEach(({t, topics, expected, taxonomies}) => {
+    describe(`on ${t}`, () => {
+      it('should convert topics to user.data segments correctly', () => {
+        const actual = getTopicsData('mockName', topics, taxonomies);
+        expect(actual.length).to.eql(expected.length);
+        expected = byTaxClass(expected);
+        Object.entries(byTaxClass(actual)).forEach(([key, datum]) => {
+          sinon.assert.match(datum, expected[key]);
+          expect(datum.name).to.equal('mockName');
+        })
+      });
+
+      it('should not set name if null', () => {
+        getTopicsData(null, topics).forEach((data) => {
+          expect(data.hasOwnProperty('name')).to.be.false;
+        })
+      })
+    })
+  })
+});
+
+describe('getTopics', () => {
+  Object.entries({
+    'document with no browsingTopics': {},
+    'document that disallows topics': {
+      featurePolicy: {
+        allowsFeature: sinon.stub().returns(false)
+      }
+    },
+    'document that throws on featurePolicy': {
+      browsingTopics: sinon.stub(),
+      get featurePolicy() {
+        throw new Error()
+      }
+    },
+    'document that throws on browsingTopics': {
+      browsingTopics: sinon.stub().callsFake(() => { throw new Error(); }),
+      featurePolicy: {
+        allowsFeature: sinon.stub().returns(true)
+      }
+    },
+  }).forEach(([t, doc]) => {
+    it(`should resolve to an empty list on ${t}`, () => {
+      return getTopics(doc).then((topics) => {
+        expect(topics).to.eql([]);
+      });
+    })
+  });
+
+  it('should call `document.browsingTopics` when allowed', () => {
+    const topics = ['t1', 't2']
+    return getTopics({
+      browsingTopics: sinon.stub().returns(Promise.resolve(topics)),
+      featurePolicy: {
+        allowsFeature: sinon.stub().returns(true)
+      }
+    }).then((actual) => {
+      expect(actual).to.eql(topics);
+    })
+  })
+})
+
+describe('processFpd', () => {
+  const mockData = [
+    {
+      name: 'domain',
+      segment: [{id: 123}]
+    },
+    {
+      name: 'domain',
+      segment: [{id: 321}]
+    }
+  ];
+
+  it('should add topics data', () => {
+    return processFpd({}, {global: {}}, {data: Promise.resolve(mockData)})
+      .then(({global}) => {
+        expect(global.user.data).to.eql(mockData);
+      });
+  });
+
+  it('should apppend to existing user.data', () => {
+    const global = {
+      user: {
+        data: [
+          {name: 'preexisting'},
+        ]
+      }
+    };
+    return processFpd({}, {global: deepClone(global)}, {data: Promise.resolve(mockData)})
+      .then((data) => {
+        expect(data.global.user.data).to.eql(global.user.data.concat(mockData));
+      });
+  });
+
+  it('should not modify fpd when there is no data', () => {
+    return processFpd({}, {global: {}}, {data: Promise.resolve([])})
+      .then((data) => {
+        expect(data.global).to.eql({});
+      });
+  });
+});

From 45c33129674e3015ebfee45aa6f8b06410fab0c6 Mon Sep 17 00:00:00 2001
From: relaido <63339139+relaido@users.noreply.github.com>
Date: Thu, 28 Jul 2022 22:08:06 +0900
Subject: [PATCH 088/569] Relaido Bid Adapter: Add params for hashed canonical
 url. (#8743)

* add relaido adapter

* remove event listener

* fixed UserSyncs and e.data

* fix conflicts

* Add params for hashed canonical url.

* Add params for hashed canonical url.

removed review comment.

Co-authored-by: ishigami_shingo <s.ishigami@relaido.co.jp>
Co-authored-by: cmertv-sishigami <s.ishigami@cmertv.com>
Co-authored-by: t_bun <t.bun@cmertv.com>
Co-authored-by: n.maeura <n.maeura@cmertv.com>
---
 modules/relaidoBidAdapter.js                | 15 ++++++++++++---
 test/spec/modules/relaidoBidAdapter_spec.js |  4 +++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/modules/relaidoBidAdapter.js b/modules/relaidoBidAdapter.js
index 880e826d75b..c9e9fc00eb7 100644
--- a/modules/relaidoBidAdapter.js
+++ b/modules/relaidoBidAdapter.js
@@ -3,10 +3,11 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { Renderer } from '../src/Renderer.js';
 import { getStorageManager } from '../src/storageManager.js';
+import sha1 from 'crypto-js/sha1';
 
 const BIDDER_CODE = 'relaido';
 const BIDDER_DOMAIN = 'api.relaido.jp';
-const ADAPTER_VERSION = '1.0.8';
+const ADAPTER_VERSION = '1.0.9';
 const DEFAULT_TTL = 300;
 const UUID_KEY = 'relaido_uuid';
 
@@ -104,9 +105,9 @@ function buildRequests(validBidRequests, bidderRequest) {
     uuid: getUuid(),
     pv: '$prebid.version$',
     imuid: imuid,
-    // TODO: is 'page' the right value here?
+    canonical_url_hash: getCanonicalUrlHash(bidderRequest.refererInfo),
     ref: bidderRequest.refererInfo.page
-  })
+  });
 
   return {
     method: 'POST',
@@ -277,6 +278,14 @@ function getUuid() {
   return newId;
 }
 
+function getCanonicalUrlHash(refererInfo) {
+  const canonicalUrl = refererInfo.canonicalUrl || null;
+  if (!canonicalUrl) {
+    return null;
+  }
+  return sha1(canonicalUrl).toString();
+}
+
 export function isMobile() {
   const ua = navigator.userAgent;
   if (ua.indexOf('iPhone') > -1 || ua.indexOf('iPod') > -1 || (ua.indexOf('Android') > -1 && ua.indexOf('Tablet') == -1)) {
diff --git a/test/spec/modules/relaidoBidAdapter_spec.js b/test/spec/modules/relaidoBidAdapter_spec.js
index ead44f96bc9..9aec1f179a4 100644
--- a/test/spec/modules/relaidoBidAdapter_spec.js
+++ b/test/spec/modules/relaidoBidAdapter_spec.js
@@ -51,7 +51,8 @@ describe('RelaidoAdapter', function () {
     bidderRequest = {
       timeout: 1000,
       refererInfo: {
-        page: 'https://publisher.com/home'
+        page: 'https://publisher.com/home?aaa=test1&bbb=test2',
+        canonicalUrl: 'https://publisher.com/home'
       }
     };
     serverResponse = {
@@ -238,6 +239,7 @@ describe('RelaidoAdapter', function () {
       const request = data.bids[0];
       expect(bidRequests.method).to.equal('POST');
       expect(bidRequests.url).to.equal('https://api.relaido.jp/bid/v1/sprebid');
+      expect(data.canonical_url_hash).to.equal('e6092f44a0044903ae3764126eedd6187c1d9f04');
       expect(data.ref).to.equal(bidderRequest.refererInfo.page);
       expect(data.timeout_ms).to.equal(bidderRequest.timeout);
       expect(request.ad_unit_code).to.equal(bidRequest.adUnitCode);

From 93fc10b6deb5c87dc5f7880baa2c3971ed79024e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Jul 2022 11:41:30 -0400
Subject: [PATCH 089/569] Bump terser from 5.12.0 to 5.14.2 (#8719)

Bumps [terser](https://github.com/terser/terser) from 5.12.0 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 103 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 74 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ccf4d92a711..ef3ab0394fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1922,6 +1922,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
@@ -1930,15 +1944,34 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.11",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
       "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz",
-      "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
+      "version": "0.3.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
+      "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
@@ -21266,14 +21299,14 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz",
-      "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
+      "version": "5.14.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
+      "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
       "dev": true,
       "dependencies": {
+        "@jridgewell/source-map": "^0.3.2",
         "acorn": "^8.5.0",
         "commander": "^2.20.0",
-        "source-map": "~0.7.2",
         "source-map-support": "~0.5.20"
       },
       "bin": {
@@ -21387,15 +21420,6 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/text-extensions": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
@@ -24729,20 +24753,47 @@
         }
       }
     },
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
     "@jridgewell/resolve-uri": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
       "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew=="
     },
+    "@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true
+    },
+    "@jridgewell/source-map": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
     "@jridgewell/sourcemap-codec": {
       "version": "1.4.11",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
       "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz",
-      "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
+      "version": "0.3.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
+      "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
       "requires": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
@@ -40160,14 +40211,14 @@
       }
     },
     "terser": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz",
-      "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
+      "version": "5.14.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
+      "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
       "dev": true,
       "requires": {
+        "@jridgewell/source-map": "^0.3.2",
         "acorn": "^8.5.0",
         "commander": "^2.20.0",
-        "source-map": "~0.7.2",
         "source-map-support": "~0.5.20"
       },
       "dependencies": {
@@ -40182,12 +40233,6 @@
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
           "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
           "dev": true
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
         }
       }
     },

From 7e203b39f0395ee35b37de1510052cfe59bd7bdb Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Thu, 28 Jul 2022 10:37:38 -0700
Subject: [PATCH 090/569] Prebid core: fix native trackers for Prebid Server;
 simplify native ORTB logic (#8748)

* Prebid core: simplify native ORTB logic

* Remove nativeMapper; do not mix ORTB request and response

* fix lint

* set bidRequest.nativeParams after ortb -> legacy conversion

* Fix native trackers for native ortb responses (including Prebid Server)

* remove redundant native request generation from PBS adapter

* use includes instead of in
---
 modules/prebidServerBidAdapter/index.js       | 118 +--------
 src/adapterManager.js                         |   1 +
 src/native.js                                 | 235 ++++++++++--------
 .../modules/prebidServerBidAdapter_spec.js    |  99 ++++----
 test/spec/native_spec.js                      | 145 ++++++++++-
 test/spec/unit/core/bidderFactory_spec.js     |   3 +
 6 files changed, 336 insertions(+), 265 deletions(-)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 9c240615c04..9c7c3c921b0 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -2,7 +2,6 @@ import Adapter from '../../src/adapter.js';
 import {createBid} from '../../src/bidfactory.js';
 import {
   bind,
-  cleanObj,
   createTrackPixelHtml,
   deepAccess,
   deepClone,
@@ -30,17 +29,16 @@ import {
 } from '../../src/utils.js';
 import CONSTANTS from '../../src/constants.json';
 import adapterManager from '../../src/adapterManager.js';
-import { config } from '../../src/config.js';
-import { VIDEO, NATIVE } from '../../src/mediaTypes.js';
-import { isValid } from '../../src/adapters/bidderFactory.js';
+import {config} from '../../src/config.js';
+import {NATIVE, VIDEO} from '../../src/mediaTypes.js';
+import {isValid} from '../../src/adapters/bidderFactory.js';
 import * as events from '../../src/events.js';
 import {find, includes} from '../../src/polyfill.js';
-import { S2S_VENDORS } from './config.js';
-import { ajax } from '../../src/ajax.js';
+import {S2S_VENDORS} from './config.js';
+import {ajax} from '../../src/ajax.js';
 import {hook} from '../../src/hook.js';
 import {getGlobal} from '../../src/prebidGlobal.js';
 import {hasPurpose1Consent} from '../../src/utils/gpdr.js';
-import { nativeMapper } from '../../src/native.js';
 
 const getConfig = config.getConfig;
 
@@ -446,11 +444,6 @@ if (FEATURES.NATIVE) {
     });
   });
 }
-/*
- * Protocol spec for OpenRTB endpoint
- * e.g., https://<prebid-server-url>/v1/openrtb2/auction
- */
-let nativeAssetCache = {}; // store processed native params to preserve
 
 /**
  * map wurl to auction id and adId for use in the BID_WON event
@@ -552,78 +545,6 @@ Object.assign(ORTB2.prototype, {
       impIds.add(impressionId);
       this.adUnitsByImp[impressionId] = adUnit;
 
-      const nativeParams = adUnit.nativeParams;
-      let nativeAssets = nativeAssetCache[impressionId] = deepAccess(nativeParams, 'ortb.assets');
-      if (FEATURES.NATIVE && nativeParams && !nativeAssets) {
-        let idCounter = -1;
-        try {
-          nativeAssets = nativeAssetCache[impressionId] = Object.keys(nativeParams).reduce((assets, type) => {
-            let params = nativeParams[type];
-
-            function newAsset(obj) {
-              idCounter++;
-              return Object.assign({
-                required: params.required ? 1 : 0,
-                id: (isNumber(params.id)) ? idCounter = params.id : idCounter
-              }, obj ? cleanObj(obj) : {});
-            }
-
-            switch (type) {
-              case 'image':
-              case 'icon':
-                let imgTypeId = nativeImgIdMap[type];
-                let asset = cleanObj({
-                  type: imgTypeId,
-                  w: deepAccess(params, 'sizes.0'),
-                  h: deepAccess(params, 'sizes.1'),
-                  wmin: deepAccess(params, 'aspect_ratios.0.min_width'),
-                  hmin: deepAccess(params, 'aspect_ratios.0.min_height')
-                });
-                if (!((asset.w && asset.h) || (asset.hmin && asset.wmin))) {
-                  throw 'invalid img sizes (must provide sizes or min_height & min_width if using aspect_ratios)';
-                }
-                if (Array.isArray(params.aspect_ratios)) {
-                  // pass aspect_ratios as ext data I guess?
-                  const aspectRatios = params.aspect_ratios
-                    .filter((ar) => ar.ratio_width && ar.ratio_height)
-                    .map(ratio => `${ratio.ratio_width}:${ratio.ratio_height}`);
-                  if (aspectRatios.length > 0) {
-                    asset.ext = {
-                      aspectratios: aspectRatios
-                    }
-                  }
-                }
-                assets.push(newAsset({
-                  img: asset
-                }));
-                break;
-              case 'title':
-                if (!params.len) {
-                  throw 'invalid title.len';
-                }
-                assets.push(newAsset({
-                  title: {
-                    len: params.len
-                  }
-                }));
-                break;
-              default:
-                let dataAssetTypeId = nativeDataIdMap[type];
-                if (dataAssetTypeId) {
-                  assets.push(newAsset({
-                    data: {
-                      type: dataAssetTypeId,
-                      len: params.len
-                    }
-                  }))
-                }
-            }
-            return assets;
-          }, []);
-        } catch (e) {
-          logError('error creating native request: ' + String(e))
-        }
-      }
       const videoParams = deepAccess(adUnit, 'mediaTypes.video');
       const bannerParams = deepAccess(adUnit, 'mediaTypes.banner');
 
@@ -678,8 +599,8 @@ Object.assign(ORTB2.prototype, {
             }, {});
         }
       }
-
-      if (FEATURES.NATIVE && nativeAssets) {
+      const nativeReq = deepAccess(adUnit, 'nativeOrtbRequest')
+      if (FEATURES.NATIVE && nativeReq) {
         const defaultRequest = {
           // TODO: determine best way to pass these and if we allow defaults
           context: 1,
@@ -689,18 +610,13 @@ Object.assign(ORTB2.prototype, {
           ],
           // TODO: figure out how to support privacy field
           // privacy: int
-          assets: nativeAssets
         };
-        const ortbRequest = deepAccess(nativeParams, 'ortb');
         try {
-          const request = ortbRequest ? Object.assign(defaultRequest, ortbRequest) : defaultRequest;
+          const request = Object.assign(defaultRequest, nativeReq);
           mediaTypes[NATIVE] = {
             request: JSON.stringify(request),
             ver: '1.2'
           };
-          // saving the converted ortb native request into the native mapper, so the Universal Creative
-          // can render the native ad directly.
-          adUnit.bids.forEach(bid => nativeMapper.set(bid.bid_id, request));
         } catch (e) {
           logError('error creating native request: ' + String(e));
         }
@@ -1091,24 +1007,6 @@ Object.assign(ORTB2.prototype, {
               ortb = bidObject.adm = bid.adm;
             }
 
-            // ortb.imptrackers and ortb.jstracker are going to be deprecated. So, when we find
-            // those properties, we're creating the equivalent eventtrackers and let prebid universal
-            //  creative deal with it
-            for (const imptracker of ortb.imptrackers || []) {
-              ortb.eventtrackers.push({
-                event: nativeEventTrackerEventMap.impression,
-                method: nativeEventTrackerMethodMap.img,
-                url: imptracker
-              })
-            }
-            if (ortb.jstracker) {
-              ortb.eventtrackers.push({
-                event: nativeEventTrackerEventMap.impression,
-                method: nativeEventTrackerMethodMap.js,
-                url: ortb.jstracker
-              })
-            }
-
             if (isPlainObject(ortb) && Array.isArray(ortb.assets)) {
               bidObject.native = {
                 ortb,
diff --git a/src/adapterManager.js b/src/adapterManager.js
index a707cc473d6..03f3848e81b 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -66,6 +66,7 @@ function getBids({bidderCode, auctionId, bidderRequestId, adUnits, src}) {
       .reduce((bids, bid) => {
         bid = Object.assign({}, bid, getDefinedParams(adUnit, [
           'nativeParams',
+          'nativeOrtbRequest',
           'ortb2Imp',
           'mediaType',
           'renderer'
diff --git a/src/native.js b/src/native.js
index 11fb0b54b90..4ba4505d441 100644
--- a/src/native.js
+++ b/src/native.js
@@ -1,9 +1,21 @@
-import { deepAccess, getKeyByValue, insertHtmlIntoIframe, isInteger, isNumber, isPlainObject, logError, triggerPixel, isBoolean, isArray, deepClone } from './utils.js';
+import {
+  deepAccess,
+  deepClone,
+  getKeyByValue,
+  insertHtmlIntoIframe,
+  isArray,
+  isBoolean,
+  isInteger,
+  isNumber,
+  isPlainObject,
+  logError,
+  triggerPixel,
+  pick
+} from './utils.js';
 import {includes} from './polyfill.js';
 import {auctionManager} from './auctionManager.js';
 import CONSTANTS from './constants.json';
-import { NATIVE } from './mediaTypes.js';
-import { filters } from './targeting.js';
+import {NATIVE} from './mediaTypes.js';
 
 export const nativeAdapters = [];
 
@@ -74,7 +86,20 @@ const { NATIVE_ASSET_TYPES, NATIVE_IMAGE_TYPES, PREBID_NATIVE_DATA_KEYS_TO_ORTB,
 const PREBID_NATIVE_DATA_KEYS_TO_ORTB_INVERSE = inverse(PREBID_NATIVE_DATA_KEYS_TO_ORTB);
 const NATIVE_ASSET_TYPES_INVERSE = inverse(NATIVE_ASSET_TYPES);
 
-export const nativeMapper = new Map();
+const TRACKER_METHODS = {
+  img: 1,
+  js: 2,
+  1: 'img',
+  2: 'js'
+}
+
+const TRACKER_EVENTS = {
+  impression: 1,
+  'viewable-mrc50': 2,
+  'viewable-mrc100': 3,
+  'viewable-video50': 4,
+}
+
 /**
  * Recieves nativeParams from an adUnit. If the params were not of type 'type',
  * passes them on directly. If they were of type 'type', translate
@@ -98,6 +123,9 @@ export function decorateAdUnitsWithNativeParams(adUnits) {
     if (nativeParams) {
       adUnit.nativeParams = processNativeAdUnitParams(nativeParams);
     }
+    if (adUnit.nativeParams) {
+      adUnit.nativeOrtbRequest = adUnit.nativeParams.ortb || toOrtbNativeRequest(adUnit.nativeParams);
+    }
   });
 }
 export function isOpenRTBBidRequestValid(ortb) {
@@ -192,10 +220,8 @@ export const hasNonNativeBidder = adUnit =>
 export function nativeBidIsValid(bid, {index = auctionManager.index} = {}) {
   const adUnit = index.getAdUnit(bid);
   if (!adUnit) { return false; }
-  let ortbRequest =
-  adUnit?.nativeParams?.ortb || nativeMapper.get(bid.requestId) || toOrtbNativeRequest(adUnit.nativeParams);
-  let ortbResponse =
-  bid.native?.ortb || toOrtbNativeResponse(bid.native, ortbRequest);
+  let ortbRequest = adUnit.nativeOrtbRequest
+  let ortbResponse = bid.native?.ortb || toOrtbNativeResponse(bid.native, ortbRequest);
   return isNativeOpenRTBBidValid(ortbResponse, ortbRequest);
 }
 
@@ -242,20 +268,45 @@ export function isNativeOpenRTBBidValid(bidORTB, bidRequestORTB) {
  *   fireTrackers(); // fires impressions when creative is loaded
  * </script>
  */
-export function fireNativeTrackers(message, adObject) {
-  let trackers;
+export function fireNativeTrackers(message, bidResponse) {
+  const nativeResponse = bidResponse.native.ortb || legacyPropertiesToOrtbNative(bidResponse.native);
+
   if (message.action === 'click') {
-    trackers = adObject['native'] && adObject['native'].clickTrackers;
+    fireClickTrackers(nativeResponse);
   } else {
-    trackers = adObject['native'] && adObject['native'].impressionTrackers;
+    fireImpressionTrackers(nativeResponse);
+  }
+  return message.action;
+}
 
-    if (adObject['native'] && adObject['native'].javascriptTrackers) {
-      insertHtmlIntoIframe(adObject['native'].javascriptTrackers);
+export function fireImpressionTrackers(nativeResponse, {runMarkup = (mkup) => insertHtmlIntoIframe(mkup), fetchURL = triggerPixel} = {}) {
+  const impTrackers = (nativeResponse.eventtrackers || [])
+    .filter(tracker => tracker.event === TRACKER_EVENTS.impression);
+
+  let {img, js} = impTrackers.reduce((tally, tracker) => {
+    if (TRACKER_METHODS.hasOwnProperty(tracker.method)) {
+      tally[TRACKER_METHODS[tracker.method]].push(tracker.url)
     }
+    return tally;
+  }, {img: [], js: []});
+
+  if (nativeResponse.imptrackers) {
+    img = img.concat(nativeResponse.imptrackers);
   }
+  img.forEach(url => fetchURL(url));
 
-  (trackers || []).forEach(triggerPixel);
-  return message.action;
+  js = js.map(url => `<script async src="${url}"></script>`);
+  if (nativeResponse.jstracker) {
+    // jstracker is already HTML markup
+    js = js.concat([nativeResponse.jstracker]);
+  }
+  if (js.length) {
+    runMarkup(js.join('\n'));
+  }
+}
+
+export function fireClickTrackers(nativeResponse, {fetchURL = triggerPixel} = {}) {
+  (nativeResponse.link?.clicktrackers || []).forEach(url => fetchURL(url));
 }
 
 /**
@@ -342,16 +393,15 @@ export function getAssetMessage(data, adObject) {
   return message;
 }
 
-export function getAllAssetsMessage(data, adObject) {
+export function getAllAssetsMessage(data, adObject, {getNativeReq = (bidResponse) => auctionManager.index.getAdUnit(bidResponse).nativeOrtbRequest} = {}) {
   const message = {
     message: 'assetResponse',
     adId: data.adId,
   };
 
   // Pass to Prebid Universal Creative all assets, the legacy ones + the ortb ones (under ortb property)
-  const ortbRequest = nativeMapper.get(adObject.requestId);
+  const ortbRequest = getNativeReq(adObject);
   let nativeReq = adObject.native;
-  nativeMapper.delete(adObject.requestId);
   const ortbResponse = adObject.native?.ortb;
   let legacyResponse = {};
   if (ortbRequest && ortbResponse) {
@@ -384,7 +434,6 @@ export function getAllAssetsMessage(data, adObject) {
       message.assets.push({ key, value });
     }
   });
-  removeExpiredBidsFromNativeMapper();
   return message;
 }
 
@@ -431,7 +480,7 @@ export function toOrtbNativeRequest(legacyNativeAssets) {
   };
   for (let key in legacyNativeAssets) {
     // skip conversion for non-asset keys
-    if (key in NATIVE_KEYS_THAT_ARE_NOT_ASSETS) continue;
+    if (NATIVE_KEYS_THAT_ARE_NOT_ASSETS.includes(key)) continue;
 
     const asset = legacyNativeAssets[key];
     let required = 0;
@@ -459,7 +508,7 @@ export function toOrtbNativeRequest(legacyNativeAssets) {
       if (asset.aspect_ratios) {
         if (!isArray(asset.aspect_ratios)) {
           logError("image.aspect_ratios was passed, but it's not a an array:", asset.aspect_ratios);
-        } else if (asset.aspect_ratios.length != 1) {
+        } else if (!asset.aspect_ratios.length) {
           logError("image.aspect_ratios was passed, but it's empty:", asset.aspect_ratios);
         } else {
           const { min_width: minWidth, min_height: minHeight } = asset.aspect_ratios[0];
@@ -469,12 +518,20 @@ export function toOrtbNativeRequest(legacyNativeAssets) {
             ortbAsset.img.wmin = minWidth;
             ortbAsset.img.hmin = minHeight;
           }
+          const aspectRatios = asset.aspect_ratios
+            .filter((ar) => ar.ratio_width && ar.ratio_height)
+            .map(ratio => `${ratio.ratio_width}:${ratio.ratio_height}`);
+          if (aspectRatios.length > 0) {
+            ortbAsset.img.ext = {
+              aspectratios: aspectRatios
+            }
+          }
         }
       }
 
       // if asset.sizes exist, by OpenRTB spec we should remove wmin and hmin
       if (asset.sizes) {
-        if (asset.sizes.length != 2 || !isInteger(asset.sizes[0]) || !isInteger(asset.sizes[1])) {
+        if (asset.sizes.length !== 2 || !isInteger(asset.sizes[0]) || !isInteger(asset.sizes[1])) {
           logError('image.sizes was passed, but its value is not an array of integers:', asset.sizes);
         } else {
           ortbAsset.img.w = asset.sizes[0];
@@ -492,9 +549,7 @@ export function toOrtbNativeRequest(legacyNativeAssets) {
       }
     // all extensions to the native bid request are passed as is
     } else if (key === 'ext') {
-      ortbAsset.ext = {
-        asset
-      };
+      ortbAsset.ext = asset;
       // in `ext` case, required field is not needed
       delete ortbAsset.required;
     }
@@ -572,30 +627,21 @@ export function fromOrtbNativeRequest(openRTBRequest) {
  * @returns an array of valid bid requests where the openRTB bids are converted to proprietary format.
  */
 export function convertOrtbRequestToProprietaryNative(bidRequests) {
-  let needsToBeCopied = false;
-  if (!bidRequests || !isArray(bidRequests)) return bidRequests;
   if (FEATURES.NATIVE) {
+    if (!bidRequests || !isArray(bidRequests)) return bidRequests;
     // check if a conversion is needed
-    needsToBeCopied = bidRequests.some(bidRequest => bidRequest.mediaTypes && bidRequest.mediaTypes[NATIVE] && bidRequest.mediaTypes[NATIVE].ortb);
-    if (!needsToBeCopied) return bidRequests;
+    if (!bidRequests.some(bidRequest => (bidRequest?.mediaTypes || {})[NATIVE]?.ortb)) {
+      return bidRequests;
+    }
     let bidRequestsCopy = deepClone(bidRequests);
     // convert Native ORTB definition to old-style prebid native definition
     for (const bidRequest of bidRequestsCopy) {
       if (bidRequest.mediaTypes && bidRequest.mediaTypes[NATIVE] && bidRequest.mediaTypes[NATIVE].ortb) {
-        bidRequest.mediaTypes[NATIVE] = {
-          // to keep other keywords like sendTargetingKeys, rendererUrl...
-          ...Object.keys(bidRequest.mediaTypes[NATIVE])
-            .filter(key => NATIVE_KEYS_THAT_ARE_NOT_ASSETS.includes(key))
-            .reduce((obj, key) => ({
-              ...obj,
-              [key]: bidRequest.mediaTypes[NATIVE][key]
-            }), {}),
-          ...fromOrtbNativeRequest(bidRequest.mediaTypes[NATIVE].ortb)
-        }
-        bidRequest.nativeParams = bidRequest.mediaTypes[NATIVE];
-        if (bidRequest.nativeParams) {
-          processNativeAdUnitParams(bidRequest.nativeParams);
-        }
+        bidRequest.mediaTypes[NATIVE] = Object.assign(
+          pick(bidRequest.mediaTypes[NATIVE], NATIVE_KEYS_THAT_ARE_NOT_ASSETS),
+          fromOrtbNativeRequest(bidRequest.mediaTypes[NATIVE].ortb)
+        );
+        bidRequest.nativeParams = processNativeAdUnitParams(bidRequest.mediaTypes[NATIVE]);
       }
     }
     return bidRequestsCopy;
@@ -603,11 +649,52 @@ export function convertOrtbRequestToProprietaryNative(bidRequests) {
   return bidRequests;
 }
 
-export function toOrtbNativeResponse(legacyResponse, ortbRequest) {
-  const ortbResponse = {
+/**
+ * convert PBJS proprietary native properties that are *not* assets to the ORTB native format.
+ *
+ * @param legacyNative `bidResponse.native` object as returned by adapters
+ */
+export function legacyPropertiesToOrtbNative(legacyNative) {
+  const response = {
     link: {},
-    assets: [],
     eventtrackers: []
+  }
+  Object.entries(legacyNative).forEach(([key, value]) => {
+    switch (key) {
+      case 'clickUrl':
+        response.link.url = value;
+        break;
+      case 'clickTrackers':
+        response.link.clicktrackers = Array.isArray(value) ? value : [value];
+        break;
+      case 'impressionTrackers':
+        (Array.isArray(value) ? value : [value]).forEach(url => {
+          response.eventtrackers.push({
+            event: TRACKER_EVENTS.impression,
+            method: TRACKER_METHODS.img,
+            url
+          });
+        });
+        break;
+      case 'javascriptTrackers':
+        // jstracker is deprecated, but we need to use it here since 'javascriptTrackers' is markup, not an url
+        // TODO: at the time of writing this, core expected javascriptTrackers to be a string (despite the name),
+        // but many adapters are passing an array. It's possible that some of them are, in fact, passing URLs and not markup
+        // in general, native trackers seem to be neglected and/or broken
+        response.jstracker = Array.isArray(value) ? value.join('') : value;
+        break;
+    }
+  })
+  return response;
+}
+
+export function toOrtbNativeResponse(legacyResponse, ortbRequest) {
+  // copy the request, so we don't pollute it with response data below
+  ortbRequest = deepClone(ortbRequest);
+
+  const ortbResponse = {
+    ...legacyPropertiesToOrtbNative(legacyResponse),
+    assets: []
   };
   Object.keys(legacyResponse).filter(key => !!legacyResponse[key]).forEach(key => {
     const value = legacyResponse[key];
@@ -629,20 +716,6 @@ export function toOrtbNativeResponse(legacyResponse, ortbRequest) {
         };
         ortbResponse.assets.push(imageAsset);
         break;
-      case 'clickUrl':
-        ortbResponse.link.url = value;
-        break;
-      case 'clickTrackers':
-        ortbResponse.link.clicktrackers = value;
-        break;
-      case 'impressionTrackers':
-      case 'javascriptTrackers':
-        ortbResponse.eventtrackers.push({
-          event: 1,
-          method: key == 'impressionTrackers' ? 1 : 2,
-          url: value,
-        });
-        break;
       default:
         if (key in PREBID_NATIVE_DATA_KEYS_TO_ORTB) {
           const dataAsset = ortbRequest.assets.find(asset => asset.data != null && asset.data.type === NATIVE_ASSET_TYPES[PREBID_NATIVE_DATA_KEYS_TO_ORTB[key]]);
@@ -680,38 +753,6 @@ function toLegacyResponse(ortbResponse, ortbRequest) {
   return legacyResponse;
 }
 
-/**
- * Converts a Legacy native request to OpenRTB.
- * The proprietary Prebid format has many limitations and will be dropped in
- * the future; adapters are encouraged to stop using it in favour of OpenRTB format.
- * @param {BidRequest[]} bidRequests an array of valid bid requests
- * @returns an array of valid bid requests where the legacy format is converted to OpenRTB.
- */
-export function convertLegacyNativeRequestToOrtb(bidRequests) {
-  if (!bidRequests || !isArray(bidRequests)) return bidRequests;
-  // convert Native ORTB definition to old-style prebid native definition
-  for (const bidRequest of bidRequests) {
-    if (bidRequest.mediaTypes && bidRequest.mediaTypes[NATIVE]) {
-      if (bidRequest.mediaTypes[NATIVE].ortb) continue;
-      // legacy case
-      const ortbRequest = toOrtbNativeRequest(bidRequest.mediaTypes[NATIVE]);
-      bidRequest.mediaTypes[NATIVE] = {
-        ...Object.entries(bidRequest.mediaTypes['native'])
-          .filter(([key, value]) => NATIVE_KEYS_THAT_ARE_NOT_ASSETS.includes(key))
-          .reduce((acc, curr) => { acc[curr[0]] = curr[1]; return acc }, {}),
-        ortb: ortbRequest
-      }
-      nativeMapper.set(bidRequest.bidId, ortbRequest);
-      // to keep other keywords like sendTargetingKeys, rendererUrl...
-      bidRequest.nativeParams = bidRequest.mediaTypes[NATIVE];
-      if (bidRequest.nativeParams) {
-        processNativeAdUnitParams(bidRequest.nativeParams);
-      }
-    }
-  }
-  return bidRequests;
-}
-
 /**
  * Inverts key-values of an object.
  */
@@ -722,11 +763,3 @@ function inverse(obj) {
   }
   return retobj;
 }
-
-// to avoid memory leaks, this function will try to remove expired bids from the native wrapper.
-function removeExpiredBidsFromNativeMapper() {
-  const expiredBids = auctionManager.getBidsReceived().filter((bid) => !filters.isBidNotExpired(bid));
-  for (const expiredBid of expiredBids) {
-    nativeMapper.delete(expiredBid.requestId);
-  }
-}
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 0495c7000d1..ff600d4ef93 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -1316,55 +1316,54 @@ describe('S2S Adapter', function () {
           config.setConfig(_config);
           adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
           const requestBid = JSON.parse(server.requests[0].requestBody);
-
-          expect(requestBid.imp[0].native).to.deep.equal({
-            request: JSON.stringify({
-              'context': 1,
-              'plcmttype': 1,
-              'eventtrackers': [{
-                event: 1,
-                methods: [1]
-              }],
-              'assets': [
-                {
-                  'required': 1,
-                  'id': 0,
-                  'title': {
-                    'len': 800
-                  }
-                },
-                {
-                  'required': 1,
-                  'id': 1,
-                  'img': {
-                    'type': 3,
-                    'w': 989,
-                    'h': 742
-                  }
-                },
-                {
-                  'required': 1,
-                  'id': 2,
-                  'img': {
-                    'type': 1,
-                    'wmin': 10,
-                    'hmin': 10,
-                    'ext': {
-                      'aspectratios': ['1:1']
-                    }
-                  }
-                },
-                {
-                  'required': 1,
-                  'id': 3,
-                  'data': {
-                    'type': 1
+          const ortbReq = JSON.parse(requestBid.imp[0].native.request);
+          expect(ortbReq).to.deep.equal({
+            'ver': '1.2',
+            'context': 1,
+            'plcmttype': 1,
+            'eventtrackers': [{
+              event: 1,
+              methods: [1]
+            }],
+            'assets': [
+              {
+                'required': 1,
+                'id': 0,
+                'title': {
+                  'len': 800
+                }
+              },
+              {
+                'required': 1,
+                'id': 1,
+                'img': {
+                  'type': 3,
+                  'w': 989,
+                  'h': 742
+                }
+              },
+              {
+                'required': 1,
+                'id': 2,
+                'img': {
+                  'type': 1,
+                  'wmin': 10,
+                  'hmin': 10,
+                  'ext': {
+                    'aspectratios': ['1:1']
                   }
                 }
-              ]
-            }),
-            ver: '1.2'
+              },
+              {
+                'required': 1,
+                'id': 3,
+                'data': {
+                  'type': 1
+                }
+              }
+            ]
           });
+          expect(requestBid.imp[0].native.ver).to.equal('1.2');
         });
 
         it('adds native ortb request for OpenRTB', function () {
@@ -1382,11 +1381,9 @@ describe('S2S Adapter', function () {
           config.setConfig(_config);
           adapter.callBids(openRtbNativeRequest, BID_REQUESTS, addBidResponse, done, ajax);
           const requestBid = JSON.parse(server.requests[0].requestBody);
-
-          expect(requestBid.imp[0].native).to.deep.equal({
-            request: JSON.stringify(NATIVE_ORTB_MTO.ortb),
-            ver: '1.2'
-          });
+          const nativeReq = JSON.parse(requestBid.imp[0].native.request);
+          expect(nativeReq).to.deep.equal(NATIVE_ORTB_MTO.ortb);
+          expect(requestBid.imp[0].native.ver).to.equal('1.2');
         });
 
         it('should not include ext.aspectratios if adunit\'s aspect_ratios do not define radio_width and ratio_height', () => {
diff --git a/test/spec/native_spec.js b/test/spec/native_spec.js
index ce69c299697..a6f8e7ae891 100644
--- a/test/spec/native_spec.js
+++ b/test/spec/native_spec.js
@@ -8,7 +8,7 @@ import {
   decorateAdUnitsWithNativeParams,
   isOpenRTBBidRequestValid,
   isNativeOpenRTBBidValid,
-  toOrtbNativeRequest,
+  toOrtbNativeRequest, toOrtbNativeResponse, legacyPropertiesToOrtbNative, fireImpressionTrackers, fireClickTrackers,
 } from 'src/native.js';
 import CONSTANTS from 'src/constants.json';
 import { stubAuctionIndex } from '../helpers/indexStub.js';
@@ -332,7 +332,7 @@ describe('native.js', function () {
       adId: '123',
     };
 
-    const message = getAllAssetsMessage(messageRequest, bid);
+    const message = getAllAssetsMessage(messageRequest, bid, {getNativeReq: () => null});
 
     expect(message.assets.length).to.equal(9);
     expect(message.assets).to.deep.include({
@@ -380,7 +380,7 @@ describe('native.js', function () {
       adId: '123',
     };
 
-    const message = getAllAssetsMessage(messageRequest, bidWithUndefinedFields);
+    const message = getAllAssetsMessage(messageRequest, bidWithUndefinedFields, {getNativeReq: () => null});
 
     expect(message.assets.length).to.equal(4);
     expect(message.assets).to.deep.include({
@@ -883,3 +883,142 @@ describe('validate native', function () {
     });
   }
 });
+
+describe('legacyPropertiesToOrtbNative', () => {
+  describe('click trakckers', () => {
+    it('should convert clickUrl to link.url', () => {
+      const native = legacyPropertiesToOrtbNative({clickUrl: 'some-url'});
+      expect(native.link.url).to.eql('some-url');
+    });
+    it('should convert single clickTrackers to link.clicktrackers', () => {
+      const native = legacyPropertiesToOrtbNative({clickTrackers: 'some-url'});
+      expect(native.link.clicktrackers).to.eql([
+        'some-url'
+      ])
+    });
+    it('should convert multiple clickTrackers into link.clicktrackers', () => {
+      const native = legacyPropertiesToOrtbNative({clickTrackers: ['url1', 'url2']});
+      expect(native.link.clicktrackers).to.eql([
+        'url1',
+        'url2'
+      ])
+    })
+  });
+  describe('impressionTrackers', () => {
+    it('should convert a single tracker into an eventtracker entry', () => {
+      const native = legacyPropertiesToOrtbNative({impressionTrackers: 'some-url'});
+      expect(native.eventtrackers).to.eql([
+        {
+          event: 1,
+          method: 1,
+          url: 'some-url'
+        }
+      ]);
+    });
+
+    it('should convert an array into corresponding eventtracker entries', () => {
+      const native = legacyPropertiesToOrtbNative({impressionTrackers: ['url1', 'url2']});
+      expect(native.eventtrackers).to.eql([
+        {
+          event: 1,
+          method: 1,
+          url: 'url1'
+        },
+        {
+          event: 1,
+          method: 1,
+          url: 'url2'
+        }
+      ])
+    })
+  });
+  describe('javascriptTrackers', () => {
+    it('should convert a single value into jstracker', () => {
+      const native = legacyPropertiesToOrtbNative({javascriptTrackers: 'some-markup'});
+      expect(native.jstracker).to.eql('some-markup');
+    })
+    it('should merge multiple values into a single jstracker', () => {
+      const native = legacyPropertiesToOrtbNative({javascriptTrackers: ['some-markup', 'some-other-markup']});
+      expect(native.jstracker).to.eql('some-markupsome-other-markup');
+    })
+  });
+});
+
+describe('fireImpressionTrackers', () => {
+  let runMarkup, fetchURL;
+  beforeEach(() => {
+    runMarkup = sinon.stub();
+    fetchURL = sinon.stub();
+  })
+
+  function runTrackers(resp) {
+    fireImpressionTrackers(resp, {runMarkup, fetchURL})
+  }
+
+  it('should run markup in jstracker', () => {
+    runTrackers({
+      jstracker: 'some-markup'
+    });
+    sinon.assert.calledWith(runMarkup, 'some-markup');
+  });
+
+  it('should fetch each url in imptrackers', () => {
+    const urls = ['url1', 'url2'];
+    runTrackers({
+      imptrackers: urls
+    });
+    urls.forEach(url => sinon.assert.calledWith(fetchURL, url));
+  });
+
+  it('should fetch each url in eventtrackers that use the image method', () => {
+    const urls = ['url1', 'url2'];
+    runTrackers({
+      eventtrackers: urls.map(url => ({event: 1, method: 1, url}))
+    });
+    urls.forEach(url => sinon.assert.calledWith(fetchURL, url))
+  });
+
+  it('should load as a script each url in eventtrackers that use the js method', () => {
+    const urls = ['url1', 'url2'];
+    runTrackers({
+      eventtrackers: urls.map(url => ({event: 1, method: 2, url}))
+    });
+    urls.forEach(url => sinon.assert.calledWith(runMarkup, sinon.match(`script async src="${url}"`)))
+  });
+
+  it('should not fire trackers that are not impression trakcers', () => {
+    runTrackers({
+      link: {
+        clicktrackers: ['click-url']
+      },
+      eventtrackers: [{
+        event: 2, // not imp
+        method: 1,
+        url: 'some-url'
+      }]
+    });
+    sinon.assert.notCalled(fetchURL);
+    sinon.assert.notCalled(runMarkup);
+  })
+})
+
+describe('fireClickTrackers', () => {
+  let fetchURL;
+  beforeEach(() => {
+    fetchURL = sinon.stub();
+  });
+
+  function runTrackers(resp) {
+    fireClickTrackers(resp, {fetchURL});
+  }
+
+  it('should load each URL in link.clicktrackers', () => {
+    const urls = ['url1', 'url2'];
+    runTrackers({
+      link: {
+        clicktrackers: urls
+      }
+    });
+    urls.forEach(url => sinon.assert.calledWith(fetchURL, url));
+  })
+})
diff --git a/test/spec/unit/core/bidderFactory_spec.js b/test/spec/unit/core/bidderFactory_spec.js
index 646791c7e1f..c040bba4eec 100644
--- a/test/spec/unit/core/bidderFactory_spec.js
+++ b/test/spec/unit/core/bidderFactory_spec.js
@@ -12,6 +12,7 @@ import {hook} from '../../../../src/hook.js';
 import {auctionManager} from '../../../../src/auctionManager.js';
 import {stubAuctionIndex} from '../../../helpers/indexStub.js';
 import { bidderSettings } from '../../../../src/bidderSettings.js';
+import {decorateAdUnitsWithNativeParams} from '../../../../src/native.js';
 
 const CODE = 'sampleBidder';
 const MOCK_BIDS_REQUEST = {
@@ -882,6 +883,7 @@ describe('validate bid response: ', function () {
           title: {'required': true},
         }
       }]
+      decorateAdUnitsWithNativeParams(adUnits);
       let bidRequest = {
         bids: [{
           bidId: '1',
@@ -923,6 +925,7 @@ describe('validate bid response: ', function () {
           title: {'required': true},
         },
       }];
+      decorateAdUnitsWithNativeParams(adUnits);
       let bidRequest = {
         bids: [{
           bidId: '1',

From d0a729b04237d8106b6d1afb400c2274fe0c9ade Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 28 Jul 2022 17:49:13 +0000
Subject: [PATCH 091/569] Prebid 7.8.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ef3ab0394fb..bbd66c24b7f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.8.0-pre",
+  "version": "7.8.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 9a2e223fe9d..4d737ec389c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.8.0-pre",
+  "version": "7.8.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From ef86ab1d6a1bbc2fdbfc2dcccffef74d1349768f Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 28 Jul 2022 17:49:14 +0000
Subject: [PATCH 092/569] Increment version to 7.9.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bbd66c24b7f..c29ddad3673 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.8.0",
+  "version": "7.9.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 4d737ec389c..3c6622adf9b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.8.0",
+  "version": "7.9.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 82d74d2f57ceac5511fdcfd8d35a433f07d3a2ca Mon Sep 17 00:00:00 2001
From: nllerandi3lift <75995508+nllerandi3lift@users.noreply.github.com>
Date: Thu, 28 Jul 2022 18:44:10 -0400
Subject: [PATCH 093/569] Triplelift Bid Adapter: outstream support (#8709)

* alt outstream support

* removes consoleLog

* rename video ttl

* multi-imp

* simplify video if statement in buildPostBody

* distinguish banner from video bid; temp solution for testing

* adds tests for mediatype

* remove console log

* individual instream/outstream tests

* simplify some functions

* nitpick

* adds media_type check

* adds placement options to outstream

* checks instream placement values

* TL-19850 Finished log error logic around floors functionality

* deprecates getlegacyFpd

* remove console log

* TL-19850 Changed functionlity of tests

* restore logErrorSpy aftereach

* removing pub name from test

Co-authored-by: Dan Goldin <dgoldin@triplelift.com>
Co-authored-by: Patrick Loughrey <patrickloughrey@patrickhreysmbp.mynetworksettings.com>
Co-authored-by: Patrick Loughrey <ploughrey@triplelift.com>
---
 modules/tripleliftBidAdapter.js               |  64 ++-
 .../spec/modules/tripleliftBidAdapter_spec.js | 388 +++++++++++++++++-
 2 files changed, 423 insertions(+), 29 deletions(-)

diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index df4f9a9ba38..a5a93024ff9 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -8,7 +8,7 @@ const GVLID = 28;
 const BIDDER_CODE = 'triplelift';
 const STR_ENDPOINT = 'https://tlx.3lift.com/header/auction?';
 const BANNER_TIME_TO_LIVE = 300;
-const INSTREAM_TIME_TO_LIVE = 3600;
+const VIDEO_TIME_TO_LIVE = 3600;
 let gdprApplies = true;
 let consentString = null;
 export const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
@@ -120,12 +120,15 @@ function _buildPostBody(bidRequests, bidderRequest) {
       tagid: bidRequest.params.inventoryCode,
       floor: _getFloor(bidRequest)
     };
-    // remove the else to support multi-imp
-    if (_isInstreamBidRequest(bidRequest)) {
+    // Check for video bidrequest
+    if (_isVideoBidRequest(bidRequest)) {
       imp.video = _getORTBVideo(bidRequest);
-    } else if (bidRequest.mediaTypes.banner) {
+    }
+    // append banner if applicable and request is not for instream
+    if (bidRequest.mediaTypes.banner && !_isInstream(bidRequest)) {
       imp.banner = { format: _sizes(bidRequest.sizes) };
-    };
+    }
+
     if (!isEmpty(bidRequest.ortb2Imp)) {
       imp.fpd = _getAdUnitFpd(bidRequest.ortb2Imp);
     }
@@ -153,22 +156,41 @@ function _buildPostBody(bidRequests, bidderRequest) {
   return data;
 }
 
-function _isInstreamBidRequest(bidRequest) {
-  if (!bidRequest.mediaTypes.video) return false;
-  if (!bidRequest.mediaTypes.video.context) return false;
-  if (bidRequest.mediaTypes.video.context.toLowerCase() === 'instream') {
-    return true;
-  } else {
-    return false;
-  }
+function _isVideoBidRequest(bidRequest) {
+  return _isValidVideoObject(bidRequest) && (_isInstream(bidRequest) || _isOutstream(bidRequest));
+}
+
+function _isOutstream(bidRequest) {
+  return _isValidVideoObject(bidRequest) && bidRequest.mediaTypes.video.context.toLowerCase() === 'outstream';
+}
+
+function _isInstream(bidRequest) {
+  return _isValidVideoObject(bidRequest) && bidRequest.mediaTypes.video.context.toLowerCase() === 'instream';
+}
+
+function _isValidVideoObject(bidRequest) {
+  return bidRequest.mediaTypes.video && bidRequest.mediaTypes.video.context;
 }
 
 function _getORTBVideo(bidRequest) {
   // give precedent to mediaTypes.video
   let video = { ...bidRequest.params.video, ...bidRequest.mediaTypes.video };
-  if (!video.w) video.w = video.playerSize[0][0];
-  if (!video.h) video.h = video.playerSize[0][1];
+  try {
+    if (!video.w) video.w = video.playerSize[0][0];
+    if (!video.h) video.h = video.playerSize[0][1];
+  } catch (err) {
+    logWarn('Video size not defined', err);
+  }
   if (video.context === 'instream') video.placement = 1;
+  if (video.context === 'outstream') {
+    if (!video.placement) {
+      video.placement = 3
+    } else if ([3, 4, 5].indexOf(video.placement) === -1) {
+      logMessage(`video.placement value of ${video.placement} is invalid for outstream context. Setting placement to 3`)
+      video.placement = 3
+    }
+  }
+
   // clean up oRTB object
   delete video.playerSize;
   return video;
@@ -180,7 +202,7 @@ function _getFloor (bid) {
     try {
       const floorInfo = bid.getFloor({
         currency: 'USD',
-        mediaType: _isInstreamBidRequest(bid) ? 'video' : 'banner',
+        mediaType: _isVideoBidRequest(bid) ? 'video' : 'banner',
         size: '*'
       });
       if (typeof floorInfo === 'object' &&
@@ -366,10 +388,10 @@ function _buildResponseObject(bidderRequest, bid) {
       meta: {}
     };
 
-    if (_isInstreamBidRequest(breq)) {
+    if (_isVideoBidRequest(breq) && bid.media_type === 'video') {
       bidResponse.vastXml = bid.ad;
       bidResponse.mediaType = 'video';
-      bidResponse.ttl = INSTREAM_TIME_TO_LIVE;
+      bidResponse.ttl = VIDEO_TIME_TO_LIVE;
     };
 
     if (bid.advertiser_name) {
@@ -381,7 +403,11 @@ function _buildResponseObject(bidderRequest, bid) {
     }
 
     if (bid.tl_source && bid.tl_source == 'hdx') {
-      bidResponse.meta.mediaType = 'banner';
+      if (_isVideoBidRequest(breq) && bid.media_type === 'video') {
+        bidResponse.meta.mediaType = 'video'
+      } else {
+        bidResponse.meta.mediaType = 'banner'
+      }
     }
 
     if (bid.tl_source && bid.tl_source == 'tlx') {
diff --git a/test/spec/modules/tripleliftBidAdapter_spec.js b/test/spec/modules/tripleliftBidAdapter_spec.js
index b0269aaf077..bfcfce1ccb4 100644
--- a/test/spec/modules/tripleliftBidAdapter_spec.js
+++ b/test/spec/modules/tripleliftBidAdapter_spec.js
@@ -345,6 +345,209 @@ describe('triplelift adapter', function () {
           auctionId: '1d1a030790a475',
           userId: {},
           schain,
+        },
+        // outstream video only
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480]
+            }
+          },
+          adUnitCode: 'adunit-code-outstream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // banner and incomplete outstream (missing size)
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream'
+            },
+            banner: {
+              sizes: [
+                [970, 250],
+                [1, 1]
+              ]
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // outstream video; valid placement
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480],
+              placement: 3
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // outstream video; valid placement
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480],
+              placement: 4
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // outstream video; valid placement
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480],
+              placement: 5
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // outstream video; undefined placement
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480]
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // outstream video; invalid placement
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480],
+              placement: 6
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
         }
       ];
 
@@ -415,13 +618,16 @@ describe('triplelift adapter', function () {
       expect(payload.imp[0].tagid).to.equal('12345');
       expect(payload.imp[0].floor).to.equal(1.0);
       expect(payload.imp[0].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      // instream
       expect(payload.imp[1].tagid).to.equal('insteam_test');
       expect(payload.imp[1].floor).to.equal(1.0);
       expect(payload.imp[1].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[1].video.placement).to.equal(1);
       // banner and outstream video
-      expect(payload.imp[2]).to.not.have.property('video');
+      expect(payload.imp[2]).to.have.property('video');
       expect(payload.imp[2]).to.have.property('banner');
       expect(payload.imp[2].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      expect(payload.imp[2].video).to.deep.equal({'mimes': ['video/mp4'], 'maxduration': 30, 'minduration': 6, 'w': 640, 'h': 480, 'context': 'outstream', 'placement': 3});
       // banner and incomplete video
       expect(payload.imp[3]).to.not.have.property('video');
       expect(payload.imp[3]).to.have.property('banner');
@@ -434,10 +640,51 @@ describe('triplelift adapter', function () {
       expect(payload.imp[5]).to.not.have.property('banner');
       expect(payload.imp[5]).to.have.property('video');
       expect(payload.imp[5].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[5].video.placement).to.equal(1);
       // banner and outream video and native
-      expect(payload.imp[6]).to.not.have.property('video');
+      expect(payload.imp[6]).to.have.property('video');
       expect(payload.imp[6]).to.have.property('banner');
       expect(payload.imp[6].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      expect(payload.imp[6].video).to.deep.equal({'mimes': ['video/mp4'], 'maxduration': 30, 'minduration': 6, 'w': 640, 'h': 480, 'context': 'outstream', 'placement': 3});
+      // outstream video only
+      expect(payload.imp[7]).to.have.property('video');
+      expect(payload.imp[7]).to.not.have.property('banner');
+      expect(payload.imp[7].video).to.deep.equal({'mimes': ['video/mp4'], 'maxduration': 30, 'minduration': 6, 'w': 640, 'h': 480, 'context': 'outstream', 'placement': 3});
+      // banner and incomplete outstream (missing size); video request is permitted so banner can still monetize
+      expect(payload.imp[8]).to.have.property('video');
+      expect(payload.imp[8]).to.have.property('banner');
+      expect(payload.imp[8].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      expect(payload.imp[8].video).to.deep.equal({'mimes': ['video/mp4'], 'maxduration': 30, 'minduration': 6, 'context': 'outstream', 'placement': 3});
+    });
+
+    it('should check for valid outstream placement values', function () {
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      const payload = request.data;
+      // outstream video; valid placement
+      expect(payload.imp[9]).to.not.have.property('banner');
+      expect(payload.imp[9]).to.have.property('video');
+      expect(payload.imp[9].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[9].video.placement).to.equal(3);
+      // outstream video; valid placement
+      expect(payload.imp[10]).to.not.have.property('banner');
+      expect(payload.imp[10]).to.have.property('video');
+      expect(payload.imp[10].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[10].video.placement).to.equal(4);
+      // outstream video; valid placement
+      expect(payload.imp[11]).to.not.have.property('banner');
+      expect(payload.imp[11]).to.have.property('video');
+      expect(payload.imp[11].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[11].video.placement).to.equal(5);
+      // outstream video; undefined placement
+      expect(payload.imp[12]).to.not.have.property('banner');
+      expect(payload.imp[12]).to.have.property('video');
+      expect(payload.imp[12].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[12].video.placement).to.equal(3);
+      // outstream video; invalid placement
+      expect(payload.imp[13]).to.not.have.property('banner');
+      expect(payload.imp[13]).to.have.property('video');
+      expect(payload.imp[13].video).to.exist.and.to.be.a('object');
+      expect(payload.imp[13].video.placement).to.equal(3);
     });
 
     it('should add tdid to the payload if included', function () {
@@ -913,14 +1160,40 @@ describe('triplelift adapter', function () {
               iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
               tl_source: 'tlx',
               advertiser_name: 'fake advertiser name',
-              adomain: ['basspro.com', 'internetalerts.org']
+              adomain: ['basspro.com', 'internetalerts.org'],
+              media_type: 'banner'
             },
             {
               imp_id: 1,
               crid: '10092_76480_i2j6qm8u',
               cpm: 9.99,
-              ad: '<VAST version=\"2.0\"><Ad id=\"gsen95th\"><Wrapper><Error><![CDATA[https://eb2.3lift.net/ive?aid=156025986241697082890&bmid=10092&bsid=76480&crid=10092_76480_i2j6qm8u&e=[ERRORCODE]]]></Error><Impression><![CDATA[https://eb2.3lift.net/r?rr=creative&bc=0.011&uid=8217096503606905723&pr=%24%7BAUCTION_PRICE%7D&brid=554350&bmid=10092&biid=10066&aid=156025986241697082890&bcud=11&sid=76480&ts=1593552049&fid=11]]></Impression><Impression><![CDATA[https://tlx.3lift.net/header/notify?px=1&pr=${AUCTION_PRICE}&ts=1593552049&aid=156025986241697082890&ec=10092_76480_i2j6qm8u&n=GgDyAqABCAASFTE1NjAyNTk4NjI0MTY5NzA4Mjg5MBgAIAEo7E4wwNUEQAFIAFAAYAtogIAEcO7qIZABAJgBAKgBALABC7gBAMABCsgBC%2BABCvABAPgBlo0GgAL%2FlwWIAgqRAgAAAAAAAPA%2FmQIzMzMzMzPDP6ECAAAAAAAAAACoAgCwAgDIAgTYAgDxAmZmZmZmZuY%2F%2BALSTpADAJgDAKADAKgDA%2FgCDIgDAJIDBDEyMzQ%3D]]></Impression><AdSystem version=\"1.0\">The Trade Desk</AdSystem><VASTAdTagURI><![CDATA[https://insight.adsrvr.org/enduser/vast/?iid=590299b9-1817-4859-a2af-ef007bb4c78e&crid=gsen95th&wp=0.011&aid=1&wpc=USD&sfe=10fba14e&puid=&tdid=&pid=13hzg59&ag=l2w0772&adv=ct0nqrx&sig=1BGM_YxB0HAcl-s55S_NKIu-oLW94YpTn_DjMRmdWHzs.&bp=0.3&cf=1448159&fq=0&td_s=388389451&rcats=&mcat=&mste=&mfld=2&mssi=None&mfsi=ve35dsnkwp&uhow=75&agsa=&rgco=South%20Korea&rgre=Gyeonggi-do&rgme=&rgci=Ansan-si&rgz=15345&svbttd=1&dt=Mobile&osf=iOS&os=iOS134&br=WebView&rlangs=01&mlang=&svpid=7453-EB&did=&rcxt=InApp&lat=37.324400&lon=126.823700&tmpc=9.66&daid=d7804da7-147b-421d-bb44-60ad3ac32681&vp=0&osi=&osv=&svscid=388389451&bffi=41&mk=Apple&mdl=iPhone&vpb=PreRoll&dc=14&vcc=EDwYPDICCAI6BAgBCAJAAUgBUASIAQKgAZ4DqAGwBsgBAdABA-gBAoACA4oCCAgCCAMIBQgGmgIICAMIBQgGCAegAgKoAgGwAgC4AgDAAgE.&sv=triplelift&pidi=3584&advi=270782&cmpi=1319400&agi=6167705&cridi=13268739&svi=70&cmp=a9nj9ex&tsig=tlN4j1OujX9nrFakJmfpTuNNfg-D0qArlSjjNAb8tLg.&c=MAQ4AEgAUAc.&dur=&crrelr=&adpt=tl_ltriplelift&ipl=39250&fpa=826&pcm=3&said=40286845772363793660&ict=Unknown&auct=1&im=1]]></VASTAdTagURI><Creatives><Creative><Linear><VideoClicks><ClickTracking><![CDATA[https://eb2.3lift.net/ec?aid=156025986241697082890]]></ClickTracking></VideoClicks><TrackingEvents><Tracking event=\"mute\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=5]]></Tracking><Tracking event=\"unmute\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=6]]></Tracking><Tracking event=\"expand\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=7]]></Tracking><Tracking event=\"collapse\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=8]]></Tracking><Tracking event=\"pause\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=14]]></Tracking><Tracking event=\"resume\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=15]]></Tracking><Tracking event=\"fullscreen\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=16]]></Tracking><Tracking event=\"exitFullscreen\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=17]]></Tracking><Tracking event=\"skip\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=18]]></Tracking><Tracking event=\"start\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=7]]></Tracking><Tracking event=\"firstQuartile\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=1]]></Tracking><Tracking event=\"midpoint\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=2]]></Tracking><Tracking event=\"thirdQuartile\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=3]]></Tracking><Tracking event=\"complete\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=4]]></Tracking><Tracking event=\"progress\" offset=\"00:00:02\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=1]]></Tracking><Tracking event=\"progress\" offset=\"00:00:03\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=2]]></Tracking><Tracking event=\"progress\" offset=\"00:00:05\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=3]]></Tracking><Tracking event=\"progress\" offset=\"00:00:10\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=4]]></Tracking><Tracking event=\"progress\" offset=\"00:00:15\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=5]]></Tracking><Tracking event=\"progress\" offset=\"00:00:30\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=6]]></Tracking></TrackingEvents></Linear></Creative></Creatives></Wrapper></Ad></VAST>',
-              tlx_source: 'hdx'
+              ad: '<VAST version="2.0"><Ad id="gsen95th"><Wrapper><Error><![CDATA[https://eb2.3lift.net/ive?aid=156025986241697082890&bmid=10092&bsid=76480&crid=10092_76480_i2j6qm8u&e=[ERRORCODE]]]></Error><Impression><![CDATA[https://eb2.3lift.net/r?rr=creative&bc=0.011&uid=8217096503606905723&pr=%24%7BAUCTION_PRICE%7D&brid=554350&bmid=10092&biid=10066&aid=156025986241697082890&bcud=11&sid=76480&ts=1593552049&fid=11]]></Impression><Impression><![CDATA[https://tlx.3lift.net/header/notify?px=1&pr=${AUCTION_PRICE}&ts=1593552049&aid=156025986241697082890&ec=10092_76480_i2j6qm8u&n=GgDyAqABCAASFTE1NjAyNTk4NjI0MTY5NzA4Mjg5MBgAIAEo7E4wwNUEQAFIAFAAYAtogIAEcO7qIZABAJgBAKgBALABC7gBAMABCsgBC%2BABCvABAPgBlo0GgAL%2FlwWIAgqRAgAAAAAAAPA%2FmQIzMzMzMzPDP6ECAAAAAAAAAACoAgCwAgDIAgTYAgDxAmZmZmZmZuY%2F%2BALSTpADAJgDAKADAKgDA%2FgCDIgDAJIDBDEyMzQ%3D]]></Impression><AdSystem version="1.0">The Trade Desk</AdSystem><VASTAdTagURI><![CDATA[https://insight.adsrvr.org/enduser/vast/?iid=590299b9-1817-4859-a2af-ef007bb4c78e&crid=gsen95th&wp=0.011&aid=1&wpc=USD&sfe=10fba14e&puid=&tdid=&pid=13hzg59&ag=l2w0772&adv=ct0nqrx&sig=1BGM_YxB0HAcl-s55S_NKIu-oLW94YpTn_DjMRmdWHzs.&bp=0.3&cf=1448159&fq=0&td_s=388389451&rcats=&mcat=&mste=&mfld=2&mssi=None&mfsi=ve35dsnkwp&uhow=75&agsa=&rgco=South%20Korea&rgre=Gyeonggi-do&rgme=&rgci=Ansan-si&rgz=15345&svbttd=1&dt=Mobile&osf=iOS&os=iOS134&br=WebView&rlangs=01&mlang=&svpid=7453-EB&did=&rcxt=InApp&lat=37.324400&lon=126.823700&tmpc=9.66&daid=d7804da7-147b-421d-bb44-60ad3ac32681&vp=0&osi=&osv=&svscid=388389451&bffi=41&mk=Apple&mdl=iPhone&vpb=PreRoll&dc=14&vcc=EDwYPDICCAI6BAgBCAJAAUgBUASIAQKgAZ4DqAGwBsgBAdABA-gBAoACA4oCCAgCCAMIBQgGmgIICAMIBQgGCAegAgKoAgGwAgC4AgDAAgE.&sv=triplelift&pidi=3584&advi=270782&cmpi=1319400&agi=6167705&cridi=13268739&svi=70&cmp=a9nj9ex&tsig=tlN4j1OujX9nrFakJmfpTuNNfg-D0qArlSjjNAb8tLg.&c=MAQ4AEgAUAc.&dur=&crrelr=&adpt=tl_ltriplelift&ipl=39250&fpa=826&pcm=3&said=40286845772363793660&ict=Unknown&auct=1&im=1]]></VASTAdTagURI><Creatives><Creative><Linear><VideoClicks><ClickTracking><![CDATA[https://eb2.3lift.net/ec?aid=156025986241697082890]]></ClickTracking></VideoClicks><TrackingEvents><Tracking event="mute"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=5]]></Tracking><Tracking event="unmute"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=6]]></Tracking><Tracking event="expand"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=7]]></Tracking><Tracking event="collapse"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=8]]></Tracking><Tracking event="pause"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=14]]></Tracking><Tracking event="resume"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=15]]></Tracking><Tracking event="fullscreen"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=16]]></Tracking><Tracking event="exitFullscreen"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=17]]></Tracking><Tracking event="skip"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=18]]></Tracking><Tracking event="start"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=7]]></Tracking><Tracking event="firstQuartile"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=1]]></Tracking><Tracking event="midpoint"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=2]]></Tracking><Tracking event="thirdQuartile"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=3]]></Tracking><Tracking event="complete"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=4]]></Tracking><Tracking event="progress" offset="00:00:02"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=1]]></Tracking><Tracking event="progress" offset="00:00:03"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=2]]></Tracking><Tracking event="progress" offset="00:00:05"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=3]]></Tracking><Tracking event="progress" offset="00:00:10"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=4]]></Tracking><Tracking event="progress" offset="00:00:15"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=5]]></Tracking><Tracking event="progress" offset="00:00:30"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=6]]></Tracking></TrackingEvents></Linear></Creative></Creatives></Wrapper></Ad></VAST>',
+              tl_source: 'hdx',
+              media_type: 'video'
+            },
+            // video bid on banner+outstream request
+            {
+              imp_id: 2,
+              crid: '5989_33264_352817187',
+              cpm: 20,
+              ad: '<VAST xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:noNamespaceSchemaLocation="vast.xsd">\n  <Ad id="21641499">\n  \t<Wrapper><Error><![CDATA[https://eb2.3lift.com/sce?aid=148508128401385324170&inv_code=testing_mobile_outstream&e=[ERRORCODE]&block=video]]>',
+              tl_source: 'hdx',
+              advertiser_name: 'zennioptical.com',
+              adomain: ['zennioptical.com'],
+              media_type: 'video'
+            },
+            // banner bid on banner+outstream request
+            {
+              imp_id: 3,
+              crid: '5989_33264_352817187',
+              cpm: 20,
+              width: 970,
+              height: 250,
+              ad: 'ad-markup',
+              tl_source: 'hdx',
+              advertiser_name: 'zennioptical.com',
+              adomain: ['zennioptical.com'],
+              media_type: 'banner'
             }
           ]
         }
@@ -946,13 +1219,13 @@ describe('triplelift adapter', function () {
                 ]
               }
             },
-            bidId: '30b31c1838de1e',
+            bidId: '30b31c1838de1e'
           },
           {
             imp_id: 1,
             crid: '10092_76480_i2j6qm8u',
             cpm: 9.99,
-            ad: '<VAST version=\"2.0\"><Ad id=\"gsen95th\"><Wrapper><Error><![CDATA[https://eb2.3lift.net/ive?aid=156025986241697082890&bmid=10092&bsid=76480&crid=10092_76480_i2j6qm8u&e=[ERRORCODE]]]></Error><Impression><![CDATA[https://eb2.3lift.net/r?rr=creative&bc=0.011&uid=8217096503606905723&pr=%24%7BAUCTION_PRICE%7D&brid=554350&bmid=10092&biid=10066&aid=156025986241697082890&bcud=11&sid=76480&ts=1593552049&fid=11]]></Impression><Impression><![CDATA[https://tlx.3lift.net/header/notify?px=1&pr=${AUCTION_PRICE}&ts=1593552049&aid=156025986241697082890&ec=10092_76480_i2j6qm8u&n=GgDyAqABCAASFTE1NjAyNTk4NjI0MTY5NzA4Mjg5MBgAIAEo7E4wwNUEQAFIAFAAYAtogIAEcO7qIZABAJgBAKgBALABC7gBAMABCsgBC%2BABCvABAPgBlo0GgAL%2FlwWIAgqRAgAAAAAAAPA%2FmQIzMzMzMzPDP6ECAAAAAAAAAACoAgCwAgDIAgTYAgDxAmZmZmZmZuY%2F%2BALSTpADAJgDAKADAKgDA%2FgCDIgDAJIDBDEyMzQ%3D]]></Impression><AdSystem version=\"1.0\">The Trade Desk</AdSystem><VASTAdTagURI><![CDATA[https://insight.adsrvr.org/enduser/vast/?iid=590299b9-1817-4859-a2af-ef007bb4c78e&crid=gsen95th&wp=0.011&aid=1&wpc=USD&sfe=10fba14e&puid=&tdid=&pid=13hzg59&ag=l2w0772&adv=ct0nqrx&sig=1BGM_YxB0HAcl-s55S_NKIu-oLW94YpTn_DjMRmdWHzs.&bp=0.3&cf=1448159&fq=0&td_s=388389451&rcats=&mcat=&mste=&mfld=2&mssi=None&mfsi=ve35dsnkwp&uhow=75&agsa=&rgco=South%20Korea&rgre=Gyeonggi-do&rgme=&rgci=Ansan-si&rgz=15345&svbttd=1&dt=Mobile&osf=iOS&os=iOS134&br=WebView&rlangs=01&mlang=&svpid=7453-EB&did=&rcxt=InApp&lat=37.324400&lon=126.823700&tmpc=9.66&daid=d7804da7-147b-421d-bb44-60ad3ac32681&vp=0&osi=&osv=&svscid=388389451&bffi=41&mk=Apple&mdl=iPhone&vpb=PreRoll&dc=14&vcc=EDwYPDICCAI6BAgBCAJAAUgBUASIAQKgAZ4DqAGwBsgBAdABA-gBAoACA4oCCAgCCAMIBQgGmgIICAMIBQgGCAegAgKoAgGwAgC4AgDAAgE.&sv=triplelift&pidi=3584&advi=270782&cmpi=1319400&agi=6167705&cridi=13268739&svi=70&cmp=a9nj9ex&tsig=tlN4j1OujX9nrFakJmfpTuNNfg-D0qArlSjjNAb8tLg.&c=MAQ4AEgAUAc.&dur=&crrelr=&adpt=tl_ltriplelift&ipl=39250&fpa=826&pcm=3&said=40286845772363793660&ict=Unknown&auct=1&im=1]]></VASTAdTagURI><Creatives><Creative><Linear><VideoClicks><ClickTracking><![CDATA[https://eb2.3lift.net/ec?aid=156025986241697082890]]></ClickTracking></VideoClicks><TrackingEvents><Tracking event=\"mute\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=5]]></Tracking><Tracking event=\"unmute\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=6]]></Tracking><Tracking event=\"expand\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=7]]></Tracking><Tracking event=\"collapse\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=8]]></Tracking><Tracking event=\"pause\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=14]]></Tracking><Tracking event=\"resume\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=15]]></Tracking><Tracking event=\"fullscreen\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=16]]></Tracking><Tracking event=\"exitFullscreen\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=17]]></Tracking><Tracking event=\"skip\"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=18]]></Tracking><Tracking event=\"start\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=7]]></Tracking><Tracking event=\"firstQuartile\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=1]]></Tracking><Tracking event=\"midpoint\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=2]]></Tracking><Tracking event=\"thirdQuartile\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=3]]></Tracking><Tracking event=\"complete\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=4]]></Tracking><Tracking event=\"progress\" offset=\"00:00:02\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=1]]></Tracking><Tracking event=\"progress\" offset=\"00:00:03\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=2]]></Tracking><Tracking event=\"progress\" offset=\"00:00:05\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=3]]></Tracking><Tracking event=\"progress\" offset=\"00:00:10\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=4]]></Tracking><Tracking event=\"progress\" offset=\"00:00:15\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=5]]></Tracking><Tracking event=\"progress\" offset=\"00:00:30\"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=6]]></Tracking></TrackingEvents></Linear></Creative></Creatives></Wrapper></Ad></VAST>',
+            ad: '<VAST version="2.0"><Ad id="gsen95th"><Wrapper><Error><![CDATA[https://eb2.3lift.net/ive?aid=156025986241697082890&bmid=10092&bsid=76480&crid=10092_76480_i2j6qm8u&e=[ERRORCODE]]]></Error><Impression><![CDATA[https://eb2.3lift.net/r?rr=creative&bc=0.011&uid=8217096503606905723&pr=%24%7BAUCTION_PRICE%7D&brid=554350&bmid=10092&biid=10066&aid=156025986241697082890&bcud=11&sid=76480&ts=1593552049&fid=11]]></Impression><Impression><![CDATA[https://tlx.3lift.net/header/notify?px=1&pr=${AUCTION_PRICE}&ts=1593552049&aid=156025986241697082890&ec=10092_76480_i2j6qm8u&n=GgDyAqABCAASFTE1NjAyNTk4NjI0MTY5NzA4Mjg5MBgAIAEo7E4wwNUEQAFIAFAAYAtogIAEcO7qIZABAJgBAKgBALABC7gBAMABCsgBC%2BABCvABAPgBlo0GgAL%2FlwWIAgqRAgAAAAAAAPA%2FmQIzMzMzMzPDP6ECAAAAAAAAAACoAgCwAgDIAgTYAgDxAmZmZmZmZuY%2F%2BALSTpADAJgDAKADAKgDA%2FgCDIgDAJIDBDEyMzQ%3D]]></Impression><AdSystem version="1.0">The Trade Desk</AdSystem><VASTAdTagURI><![CDATA[https://insight.adsrvr.org/enduser/vast/?iid=590299b9-1817-4859-a2af-ef007bb4c78e&crid=gsen95th&wp=0.011&aid=1&wpc=USD&sfe=10fba14e&puid=&tdid=&pid=13hzg59&ag=l2w0772&adv=ct0nqrx&sig=1BGM_YxB0HAcl-s55S_NKIu-oLW94YpTn_DjMRmdWHzs.&bp=0.3&cf=1448159&fq=0&td_s=388389451&rcats=&mcat=&mste=&mfld=2&mssi=None&mfsi=ve35dsnkwp&uhow=75&agsa=&rgco=South%20Korea&rgre=Gyeonggi-do&rgme=&rgci=Ansan-si&rgz=15345&svbttd=1&dt=Mobile&osf=iOS&os=iOS134&br=WebView&rlangs=01&mlang=&svpid=7453-EB&did=&rcxt=InApp&lat=37.324400&lon=126.823700&tmpc=9.66&daid=d7804da7-147b-421d-bb44-60ad3ac32681&vp=0&osi=&osv=&svscid=388389451&bffi=41&mk=Apple&mdl=iPhone&vpb=PreRoll&dc=14&vcc=EDwYPDICCAI6BAgBCAJAAUgBUASIAQKgAZ4DqAGwBsgBAdABA-gBAoACA4oCCAgCCAMIBQgGmgIICAMIBQgGCAegAgKoAgGwAgC4AgDAAgE.&sv=triplelift&pidi=3584&advi=270782&cmpi=1319400&agi=6167705&cridi=13268739&svi=70&cmp=a9nj9ex&tsig=tlN4j1OujX9nrFakJmfpTuNNfg-D0qArlSjjNAb8tLg.&c=MAQ4AEgAUAc.&dur=&crrelr=&adpt=tl_ltriplelift&ipl=39250&fpa=826&pcm=3&said=40286845772363793660&ict=Unknown&auct=1&im=1]]></VASTAdTagURI><Creatives><Creative><Linear><VideoClicks><ClickTracking><![CDATA[https://eb2.3lift.net/ec?aid=156025986241697082890]]></ClickTracking></VideoClicks><TrackingEvents><Tracking event="mute"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=5]]></Tracking><Tracking event="unmute"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=6]]></Tracking><Tracking event="expand"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=7]]></Tracking><Tracking event="collapse"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=8]]></Tracking><Tracking event="pause"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=14]]></Tracking><Tracking event="resume"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=15]]></Tracking><Tracking event="fullscreen"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=16]]></Tracking><Tracking event="exitFullscreen"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=17]]></Tracking><Tracking event="skip"><![CDATA[https://eb2.3lift.net/eee?aid=156025986241697082890&inv_code=niice_main_instream&ev=1&eid=18]]></Tracking><Tracking event="start"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=7]]></Tracking><Tracking event="firstQuartile"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=1]]></Tracking><Tracking event="midpoint"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=2]]></Tracking><Tracking event="thirdQuartile"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=3]]></Tracking><Tracking event="complete"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&quartile=4]]></Tracking><Tracking event="progress" offset="00:00:02"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=1]]></Tracking><Tracking event="progress" offset="00:00:03"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=2]]></Tracking><Tracking event="progress" offset="00:00:05"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=3]]></Tracking><Tracking event="progress" offset="00:00:10"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=4]]></Tracking><Tracking event="progress" offset="00:00:15"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=5]]></Tracking><Tracking event="progress" offset="00:00:30"><![CDATA[https://eb2.3lift.net/evd?aid=156025986241697082890&inv_code=niice_main_instream&bmid=10092&vlt=2&bypassDuration=true&progress=6]]></Tracking></TrackingEvents></Linear></Creative></Creatives></Wrapper></Ad></VAST>',
             tlx_source: 'hdx',
             mediaTypes: {
               video: {
@@ -960,7 +1233,89 @@ describe('triplelift adapter', function () {
                 playerSize: [640, 480]
               }
             },
-            bidId: '30b31c1838de1e',
+            bidId: '30b31c1838de1e'
+          },
+          // banner and outstream
+          {
+            bidder: 'triplelift',
+            params: {
+              inventoryCode: 'testing_desktop_outstream',
+              floor: 1
+            },
+            nativeParams: {},
+            mediaTypes: {
+              video: {
+                context: 'outstream',
+                playerSize: [[640, 480]],
+                mimes: ['video/mp4'],
+                protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+                playbackmethod: [2],
+                skip: 1
+              },
+              banner: {
+                sizes: [
+                  [728, 90],
+                  [970, 250],
+                  [970, 90]
+                ]
+              },
+              native: {}
+            },
+            adUnitCode: 'video-outstream',
+            transactionId: '135061c3-f546-4e28-8a07-44c2fb58a958',
+            sizes: [
+              [728, 90],
+              [970, 250],
+              [970, 90]
+            ],
+            bidId: '73edc0ba8de203',
+            bidderRequestId: '3d81143328560b',
+            auctionId: 'f6427dc0-b954-4010-a76c-d498380796a2',
+            src: 'client',
+            bidRequestsCount: 2,
+            bidderRequestsCount: 2,
+            bidderWinsCount: 0
+          },
+          // banner and outstream
+          {
+            bidder: 'triplelift',
+            params: {
+              inventoryCode: 'testing_desktop_outstream',
+              floor: 1
+            },
+            nativeParams: {},
+            mediaTypes: {
+              video: {
+                context: 'outstream',
+                playerSize: [[640, 480]],
+                mimes: ['video/mp4'],
+                protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+                playbackmethod: [2],
+                skip: 1
+              },
+              banner: {
+                sizes: [
+                  [728, 90],
+                  [970, 250],
+                  [970, 90]
+                ]
+              },
+              native: {}
+            },
+            adUnitCode: 'video-outstream',
+            transactionId: '135061c3-f546-4e28-8a07-44c2fb58a958',
+            sizes: [
+              [728, 90],
+              [970, 250],
+              [970, 90]
+            ],
+            bidId: '73edc0ba8de203',
+            bidderRequestId: '3d81143328560b',
+            auctionId: 'f6427dc0-b954-4010-a76c-d498380796a2',
+            src: 'client',
+            bidRequestsCount: 2,
+            bidderRequestsCount: 2,
+            bidderWinsCount: 0
           }
         ],
         refererInfo: {
@@ -1007,16 +1362,29 @@ describe('triplelift adapter', function () {
         }
       ];
       let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
-      expect(result).to.have.length(2);
+      expect(result).to.have.length(4);
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
       expect(Object.keys(result[1])).to.have.members(Object.keys(expectedResponse[1]));
       expect(result[0].ttl).to.equal(300);
       expect(result[1].ttl).to.equal(3600);
     });
 
+    it('should identify format of bid and respond accordingly', function() {
+      let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
+      expect(result[0].meta.mediaType).to.equal('native');
+      expect(result[1].mediaType).to.equal('video');
+      expect(result[1].meta.mediaType).to.equal('video');
+      // video bid on banner+outstream request
+      expect(result[2].mediaType).to.equal('video');
+      expect(result[2].meta.mediaType).to.equal('video');
+      expect(result[2].vastXml).to.include('aid=148508128401385324170&inv_code=testing_mobile_outstream');
+      // banner bid on banner+outstream request
+      expect(result[3].meta.mediaType).to.equal('banner');
+    })
+
     it('should return multiple responses to support SRA', function () {
       let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
-      expect(result).to.have.length(2);
+      expect(result).to.have.length(4);
     });
 
     it('should include the advertiser name in the meta field if available', function () {

From a231b0da5935b474f5341a9070f7951222f2aeed Mon Sep 17 00:00:00 2001
From: Jozef Bartek <31618107+jbartek25@users.noreply.github.com>
Date: Mon, 1 Aug 2022 18:40:29 +0200
Subject: [PATCH 094/569] Improve Digital adapter: support for JS trackers in
 native 1.2 (#8701)

---
 modules/improvedigitalBidAdapter.js                | 3 +++
 test/spec/modules/improvedigitalBidAdapter_spec.js | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/improvedigitalBidAdapter.js b/modules/improvedigitalBidAdapter.js
index dd2f85dcff5..a362f85654c 100644
--- a/modules/improvedigitalBidAdapter.js
+++ b/modules/improvedigitalBidAdapter.js
@@ -434,6 +434,9 @@ const ID_REQUEST = {
       return null;
     }
     const request = {
+      eventtrackers: [
+        {event: 1, methods: [1, 2]}
+      ],
       assets: [],
     }
     for (let i of Object.keys(nativeParams)) {
diff --git a/test/spec/modules/improvedigitalBidAdapter_spec.js b/test/spec/modules/improvedigitalBidAdapter_spec.js
index b44859f73a0..a882f5ca5ef 100644
--- a/test/spec/modules/improvedigitalBidAdapter_spec.js
+++ b/test/spec/modules/improvedigitalBidAdapter_spec.js
@@ -248,7 +248,7 @@ describe('Improve Digital Adapter Tests', function () {
         {
           id: '33e9500b21129f',
           native: {
-            request: '{"assets":[{"id":3,"required":1,"data":{"type":2}}]}',
+            request: '{"eventtrackers":[{"event":1,"methods":[1,2]}],"assets":[{"id":3,"required":1,"data":{"type":2}}]}',
             ver: '1.2'
           },
           secure: 0,
@@ -277,7 +277,7 @@ describe('Improve Digital Adapter Tests', function () {
       const payload = JSON.parse(spec.buildRequests([nativeBidRequest], {})[0].data);
       expect(payload.imp[0].native).to.deep.equal({
         ver: '1.2',
-        request: '{\"assets\":[{\"id\":0,\"required\":1,\"title\":{\"len\":140}},{\"id\":3,\"required\":1,\"data\":{\"type\":2}}]}'
+        request: '{"eventtrackers":[{"event":1,"methods":[1,2]}],"assets":[{"id":0,"required":1,"title":{"len":140}},{"id":3,"required":1,"data":{"type":2}}]}'
       });
     });
 
@@ -299,7 +299,7 @@ describe('Improve Digital Adapter Tests', function () {
       const payload = JSON.parse(spec.buildRequests([nativeBidRequest], {})[0].data);
       expect(payload.imp[0].native).to.deep.equal({
         ver: '1.2',
-        request: '{\"assets\":[{\"id\":0,\"required\":1,\"title\":{\"len\":140}},{\"id\":3,\"required\":1,\"data\":{\"type\":2}}]}'
+        request: '{"eventtrackers":[{"event":1,"methods":[1,2]}],"assets":[{"id":0,"required":1,"title":{"len":140}},{"id":3,"required":1,"data":{"type":2}}]}'
       });
     });
 
@@ -930,7 +930,7 @@ describe('Improve Digital Adapter Tests', function () {
               'exp': 120,
               'id': '52098fad-20c1-476b-a4fa-41e275e5a4a5',
               'price': 1.8600000000000003,
-              'adm': "{\"ver\":\"1.1\",\"imptrackers\":[\"https://secure.adnxs.com/imptr?id=52311&t=2\",\"https://euw-ice.360yield.com/imp_pixel?ic=hcUBlCANx1FabHBf6FR2gC7UO4xEyXahdZAn0-B5qL-bb3A74BJ1smyWIyW7IWcC0SOjSXzVpevTHXxTqJ.sf.Qhahyy6tSo.0j1QWfXlH8sM4-8vKWjMjw-x.IrJJNlwkQ0s1CdwcwTefcLXm5l2E-W19VhACuV7f3mgrZMNjiSw.SjJAfyPC3SIyAMRjYfj53UmjriQ46T7lhmkqxK8wHmksYCdbZc3PZESk8NWl28sxdjNvnYYCFMcJbeav.LOLabyTXfwy-1cEPbQs.IKMRZIKaqccTDPV3wOtzbNv0jQzatd3Nnv-PGFQcjQ-GW3i27W04Fws4kodpFSn-B6VwZAjzLzoyd5gBncyRnAyCplEbgHU5sZ1IyKHWjgCl3ZtRIK5vqrRD5D-xqgSnOi7-phG.CqZWDZ4bMDSfQg2ZnbvUTyGKcEl0WR59dW5izTMV4Fjizcrvr5T-t.zMbGwz.hGnmLIyhTqh.IcwW.GiDLVExlDlix5S1LXIWVsSyrQ==\"],\"assets\":[{\"id\":1,\"data\":{\"value\":\"ImproveDigital\",\"type\":1}},{\"id\":3,\"data\":{\"value\":\"Test content.\",\"type\":2}},{\"id\":0,\"title\":{\"text\":\"Sample Prebid Test Title\"}}],\"link\":{\"url\":\"https://euw-ice.360yield.com/click/hcUBlHOV7YhVse8RyBa0ajjyPa9Vt17e4g-1m3cRj3E67vq-RYux.SiUeAmBfNBcoOqkUc6A15AWmi4yFu5K-BdkaYjildyyk7fNLyR6hWr411kv4vrFwm5jrIBceuHS6K8oN69f.uCo8zGTdR2TbSlldwcpahQPlufZU.6VaMsu4IC53uEiUT5vb7kAw6TTlxuGBNq6zaGryiWEV2.N3YYJDTyYPh8tv-ZFyeFZFm0Gnjv.xWbC.70JcRUVU9UelQaPsTpTWYTXBhJt84YJUw1-GNtaLNVLSjjZbVoA2fsMti5p6OBmF.7u39on2OPgvseIkSmge7Pqg63pRqdP75hp.DAEk6OkcN1jGnwP2DSbvpaSbin5lVqjfO0B-wnQgfQTCUtM5v4JmkNweLhUf9Q-x.nPKLW5SccEk9ZFXzY2-1wpT3PWm8Tix3NRscLPZub9wHzL..pl6ip8cQ9hp16UjwT4H6RMAxL0R7bl-h2pAicGAzYmuO7ntRESKUoIWA==//http%3A%2F%2Fquantum-advertising.com%2Ffr%2F\"},\"jstracker\":\"<script type=\\\"application/javascript\\\">var js_tracker = ['https://secure.adnxs.com/imptr?id=52312&t=1', 'https://pixel.adsafeprotected.com/rjss/st/291611/36974035/skeleton.js?ias_adpath=[class~=ea_improve_pid_${TAG_ID}]']</script>\"}",
+              'adm': '{"ver":"1.1","imptrackers":["https://secure.adnxs.com/imptr?id=52311&t=2","https://euw-ice.360yield.com/imp_pixel?ic=hcUBlCANx1FabHBf6FR2gC7UO4xEyXahdZAn0-B5qL-bb3A74BJ1smyWIyW7IWcC0SOjSXzVpevTHXxTqJ.sf.Qhahyy6tSo.0j1QWfXlH8sM4-8vKWjMjw-x.IrJJNlwkQ0s1CdwcwTefcLXm5l2E-W19VhACuV7f3mgrZMNjiSw.SjJAfyPC3SIyAMRjYfj53UmjriQ46T7lhmkqxK8wHmksYCdbZc3PZESk8NWl28sxdjNvnYYCFMcJbeav.LOLabyTXfwy-1cEPbQs.IKMRZIKaqccTDPV3wOtzbNv0jQzatd3Nnv-PGFQcjQ-GW3i27W04Fws4kodpFSn-B6VwZAjzLzoyd5gBncyRnAyCplEbgHU5sZ1IyKHWjgCl3ZtRIK5vqrRD5D-xqgSnOi7-phG.CqZWDZ4bMDSfQg2ZnbvUTyGKcEl0WR59dW5izTMV4Fjizcrvr5T-t.zMbGwz.hGnmLIyhTqh.IcwW.GiDLVExlDlix5S1LXIWVsSyrQ=="],"assets":[{"id":1,"data":{"value":"ImproveDigital","type":1}},{"id":3,"data":{"value":"Test content.","type":2}},{"id":0,"title":{"text":"Sample Prebid Test Title"}}],"link":{"url":"https://euw-ice.360yield.com/click/hcUBlHOV7YhVse8RyBa0ajjyPa9Vt17e4g-1m3cRj3E67vq-RYux.SiUeAmBfNBcoOqkUc6A15AWmi4yFu5K-BdkaYjildyyk7fNLyR6hWr411kv4vrFwm5jrIBceuHS6K8oN69f.uCo8zGTdR2TbSlldwcpahQPlufZU.6VaMsu4IC53uEiUT5vb7kAw6TTlxuGBNq6zaGryiWEV2.N3YYJDTyYPh8tv-ZFyeFZFm0Gnjv.xWbC.70JcRUVU9UelQaPsTpTWYTXBhJt84YJUw1-GNtaLNVLSjjZbVoA2fsMti5p6OBmF.7u39on2OPgvseIkSmge7Pqg63pRqdP75hp.DAEk6OkcN1jGnwP2DSbvpaSbin5lVqjfO0B-wnQgfQTCUtM5v4JmkNweLhUf9Q-x.nPKLW5SccEk9ZFXzY2-1wpT3PWm8Tix3NRscLPZub9wHzL..pl6ip8cQ9hp16UjwT4H6RMAxL0R7bl-h2pAicGAzYmuO7ntRESKUoIWA==//http%3A%2F%2Fquantum-advertising.com%2Ffr%2F"},"jstracker":"<script type=\\"application/javascript\\">var js_tracker = [\\"https://secure.adnxs.com/imptr?id=52312&t=1\\", \\"https://pixel.adsafeprotected.com/rjss/st/291611/36974035/skeleton.js?ias_adpath=[class~=ea_improve_pid_${TAG_ID}]\\"]</script>"}',
               'impid': '33e9500b21129f',
               'cid': '196108'
             }

From d46661a4aa8994d57f3bea3055bd4e4c8aa50e10 Mon Sep 17 00:00:00 2001
From: Sasikumar Dharmaraj <83545471+sasikumar-c1x@users.noreply.github.com>
Date: Tue, 2 Aug 2022 20:36:50 +0530
Subject: [PATCH 095/569] c1x Bid Adapter: adding back adapter with updated
 pbjs compliance (#8706)

* C1X Adapter GDPR Support

* remove the redundant userSync

* fixed keyword spacing issue

* c1x adapter changes

* c1x adapter latest changes

* added deal id support for ssp endpoint

* changes for ne bidder parameters in md file

* changes

* changes

* test cases added

* Test cases changes

* test cases added

* test cases changes

* test cases changes

* changes

* changes

* changes

* changes

* changes for log

* changes suggested from PR

Co-authored-by: Cathy Huang <cathy@c1exchange.com>
Co-authored-by: sasikumar dharmaraj <sasikumar.dharmaraj@gmail.com>
Co-authored-by: Devyani Choubey <devyanichoubey@Devyani-Choubey.local>
Co-authored-by: devyaniChoubey <devyanichoubey16@gmail.com>
---
 modules/c1xBidAdapter.js                | 209 ++++++++++++++++++++++++
 modules/c1xBidAdapter.md                |  70 ++++++++
 test/spec/modules/c1xBidAdapter_spec.js | 189 +++++++++++++++++++++
 3 files changed, 468 insertions(+)
 create mode 100644 modules/c1xBidAdapter.js
 create mode 100644 modules/c1xBidAdapter.md
 create mode 100644 test/spec/modules/c1xBidAdapter_spec.js

diff --git a/modules/c1xBidAdapter.js b/modules/c1xBidAdapter.js
new file mode 100644
index 00000000000..8b579f52299
--- /dev/null
+++ b/modules/c1xBidAdapter.js
@@ -0,0 +1,209 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { logInfo, logError } from '../src/utils.js';
+import { BANNER } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'c1x';
+const URL = 'https://hb-stg.c1exchange.com/ht';
+// const PIXEL_ENDPOINT = '//px.c1exchange.com/pubpixel/';
+const LOG_MSG = {
+  invalidBid: 'C1X: [ERROR] bidder returns an invalid bid',
+  noSite: 'C1X: [ERROR] no site id supplied',
+  noBid: 'C1X: [INFO] creating a NO bid for Adunit: ',
+  bidWin: 'C1X: [INFO] creating a bid for Adunit: '
+};
+
+/**
+ * Adapter for requesting bids from C1X header tag server.
+ * v3.1 (c) C1X Inc., 2018
+ */
+
+export const c1xAdapter = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  // check the bids sent to c1x bidder
+  isBidRequestValid: function (bid) {
+    if (bid.bidder !== BIDDER_CODE || typeof bid.params === 'undefined') {
+      return false;
+    }
+    if (typeof bid.params.placementId === 'undefined') {
+      return false;
+    }
+    return true;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} validBidRequests A non-empty list of valid bid requests that should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let payload = {};
+    let tagObj = {};
+    let bidRequest = [];
+    const adunits = validBidRequests.length;
+    const rnd = new Date().getTime();
+    const c1xTags = validBidRequests.map(bidToTag);
+    const bidIdTags = validBidRequests.map(bidToShortTag); // include only adUnitCode and bidId from request obj
+
+    // flattened tags in a tag object
+    tagObj = c1xTags.reduce((current, next) => Object.assign(current, next));
+
+    payload = {
+      adunits: adunits.toString(),
+      rnd: rnd.toString(),
+      response: 'json',
+      compress: 'gzip'
+    };
+
+    // for GDPR support
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      payload['consent_string'] = bidderRequest.gdprConsent.consentString;
+      payload['consent_required'] = (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies.toString() : 'true'
+      ;
+    }
+
+    Object.assign(payload, tagObj);
+    let payloadString = stringifyPayload(payload);
+    // ServerRequest object
+    bidRequest.push({
+      method: 'GET',
+      url: URL,
+      data: payloadString,
+      bids: bidIdTags
+    })
+    return bidRequest;
+  },
+
+  interpretResponse: function (serverResponse, requests) {
+    serverResponse = serverResponse.body;
+    requests = requests.bids || [];
+    const currency = 'USD';
+    const bidResponses = [];
+    let netRevenue = false;
+
+    if (!serverResponse || serverResponse.error) {
+      let errorMessage = serverResponse.error;
+      logError(LOG_MSG.invalidBid + errorMessage);
+      return bidResponses;
+    } else {
+      serverResponse.forEach(bid => {
+        logInfo(bid)
+        if (bid.bid) {
+          if (bid.bidType === 'NET_BID') {
+            netRevenue = !netRevenue;
+          }
+          const curBid = {
+            requestId: bid.bidId,
+            width: bid.width,
+            height: bid.height,
+            cpm: bid.cpm,
+            ad: bid.ad,
+            creativeId: bid.crid,
+            currency: currency,
+            ttl: 300,
+            netRevenue: netRevenue
+          };
+
+          if (bid.dealId) {
+            curBid['dealId'] = bid.dealId
+          }
+
+          for (let i = 0; i < requests.length; i++) {
+            if (bid.adId === requests[i].adUnitCode) {
+              curBid.requestId = requests[i].bidId;
+            }
+          }
+          logInfo(LOG_MSG.bidWin + bid.adId + ' size: ' + curBid.width + 'x' + curBid.height);
+          bidResponses.push(curBid);
+        } else {
+          // no bid
+          logInfo(LOG_MSG.noBid + bid.adId);
+        }
+      });
+    }
+
+    return bidResponses;
+  }
+
+}
+
+function bidToTag(bid, index) {
+  const tag = {};
+  const adIndex = 'a' + (index + 1).toString(); // ad unit id for c1x
+  const sizeKey = adIndex + 's';
+  const priceKey = adIndex + 'p';
+  const dealKey = adIndex + 'd';
+  // TODO: Multiple Floor Prices
+
+  const sizesArr = bid.sizes;
+  const floorPriceMap = getBidFloor(bid);
+
+  const dealId = bid.params.dealId || '';
+
+  if (dealId) {
+    tag[dealKey] = dealId;
+  }
+
+  tag[adIndex] = bid.adUnitCode;
+  tag[sizeKey] = sizesArr.reduce((prev, current) => prev + (prev === '' ? '' : ',') + current.join('x'), '');
+  const newSizeArr = tag[sizeKey].split(',');
+  if (floorPriceMap) {
+    newSizeArr.forEach(size => {
+      if (size in floorPriceMap) {
+        tag[priceKey] = floorPriceMap[size].toString();
+      } // we only accept one cpm price in floorPriceMap
+    });
+  }
+  if (bid.params.pageurl) {
+    tag['pageurl'] = bid.params.pageurl;
+  }
+
+  return tag;
+}
+
+function getBidFloor(bidRequest) {
+  let floorInfo = {};
+
+  if (typeof bidRequest.getFloor === 'function') {
+    floorInfo = bidRequest.getFloor({
+      currency: 'USD',
+      mediaType: 'banner',
+      size: '*',
+    });
+  }
+
+  let floor =
+    floorInfo.floor ||
+    bidRequest.params.bidfloor ||
+    bidRequest.params.floorPriceMap ||
+    0;
+
+  return floor;
+}
+
+function bidToShortTag(bid) {
+  const tag = {};
+  tag.adUnitCode = bid.adUnitCode;
+  tag.bidId = bid.bidId;
+  return tag;
+}
+
+function stringifyPayload(payload) {
+  let payloadString = [];
+  for (var key in payload) {
+    if (payload.hasOwnProperty(key)) {
+      payloadString.push(key + '=' + payload[key]);
+    }
+  }
+  return payloadString.join('&');
+}
+
+registerBidder(c1xAdapter);
diff --git a/modules/c1xBidAdapter.md b/modules/c1xBidAdapter.md
new file mode 100644
index 00000000000..9a7cef486d2
--- /dev/null
+++ b/modules/c1xBidAdapter.md
@@ -0,0 +1,70 @@
+# Overview
+
+Module Name: C1X Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: vishnu@c1exchange.com
+
+# Description
+
+Module that connects to C1X's demand sources
+
+# Test Parameters
+```
+  var adUnits = [{
+    code: 'test-div-1',
+    mediaTypes: {
+        banner: {
+            sizes: [[750, 200]],
+        }
+    },
+    bids: [{
+        bidder: 'c1x',
+        params: {
+            placementId: 'div-gpt-ad-1654594619717-0',
+            'floorPriceMap': {
+                    '300x250': 4.35
+            }
+        }
+    }]
+  }, {
+    code: 'test-div-2',
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250], [750, 200]],
+        }
+    },
+    bids: [{
+        bidder: 'c1x',
+        params: {
+            placementId: 'div-gpt-ad-1654940683355-0',
+            'floorPriceMap': {
+                    '300x250': 4.35
+            }
+            dealId: '1233' // optional parameter
+        }
+    }]
+  }];
+
+
+  pbjs.bidderSettings = {
+    c1x: {
+      siteId: 999,
+      adserverTargeting: [{
+          key: "hb_bidder",
+          val: function(bidResponse) {
+              return bidResponse.bidderCode;
+          }
+      }, {
+          key: "hb_adid",
+          val: function(bidResponse) {
+              return bidResponse.adId;
+          }
+      }, {
+          key: "hb_pb",
+          val: function(bidResponse) {
+              return bidResponse.pbLg;
+          }
+      }]
+    }
+  }
+```
\ No newline at end of file
diff --git a/test/spec/modules/c1xBidAdapter_spec.js b/test/spec/modules/c1xBidAdapter_spec.js
new file mode 100644
index 00000000000..315680cba26
--- /dev/null
+++ b/test/spec/modules/c1xBidAdapter_spec.js
@@ -0,0 +1,189 @@
+import { expect } from 'chai';
+import { newBidder } from 'src/adapters/bidderFactory';
+import { c1xAdapter } from '../../../modules/c1xBidAdapter.js';
+
+const ENDPOINT = 'https://hb-stg.c1exchange.com/ht';
+const BIDDER_CODE = 'c1x';
+
+describe('C1XAdapter', () => {
+  const adapter = newBidder(c1xAdapter);
+  describe('inherited functions', () => {
+    it('exists and is a function', () => {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+  describe('isBidRequestValid', () => {
+    let bid = {
+      'bidder': BIDDER_CODE,
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250], [300, 600]],
+      'params': {
+        'placementId': 'div-gpt-ad-1654594619717-0'
+      }
+    };
+    it('should return true when required params found', function () {
+      expect(c1xAdapter.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when placementId not passed correctly', function () {
+      bid.params.placementId = undefined;
+      expect(c1xAdapter.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when require params are not passed', function () {
+      let bid = Object.assign({}, bid);
+      bid.params = {};
+      expect(c1xAdapter.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+  describe('buildRequests', () => {
+    let bidRequests = [
+      {
+        'bidder': BIDDER_CODE,
+        'params': {
+          'placementId': 'div-gpt-ad-1654594619717-0',
+          'dealId': '1233'
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [300, 250], [300, 600]
+            ]
+          }
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      }
+    ];
+    const parseRequest = (data) => {
+      const parsedData = '{"' + data.replace(/=|&/g, (foundChar) => {
+        if (foundChar == '=') return '":"';
+        else if (foundChar == '&') return '","';
+      }) + '"}'
+      return parsedData;
+    };
+    it('sends bid request to ENDPOINT via GET', () => {
+      const request = c1xAdapter.buildRequests(bidRequests);
+      expect(request[0].url).to.contain(ENDPOINT);
+      expect(request[0].method).to.equal('GET');
+    });
+    it('should generate correct bid Id tag', () => {
+      const request = c1xAdapter.buildRequests(bidRequests)[0];
+      expect(request.bids[0].adUnitCode).to.equal('adunit-code');
+      expect(request.bids[0].bidId).to.equal('30b31c1838de1e');
+    });
+    it('should convert params to proper form and attach to request', () => {
+      const request = c1xAdapter.buildRequests(bidRequests)[0];
+      const originalPayload = parseRequest(request.data);
+      const payloadObj = JSON.parse(originalPayload);
+      expect(payloadObj.adunits).to.equal('1');
+      expect(payloadObj.a1s).to.equal('300x250,300x600');
+      expect(payloadObj.a1).to.equal('adunit-code');
+      expect(payloadObj.a1d).to.equal('1233');
+    });
+    it('should convert floor price to proper form and attach to request', () => {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          'params': {
+            'placementId': 'div-gpt-ad-1654594619717-0',
+            'dealId': '1233',
+            'floorPriceMap': {
+              '300x250': 4.35
+            }
+          }
+        });
+      const request = c1xAdapter.buildRequests([bidRequest])[0];
+      const originalPayload = parseRequest(request.data);
+      const payloadObj = JSON.parse(originalPayload);
+      expect(payloadObj.a1p).to.equal('4.35');
+    });
+    it('should convert pageurl to proper form and attach to request', () => {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          'params': {
+            'placementId': 'div-gpt-ad-1654594619717-0',
+            'dealId': '1233',
+            'pageurl': 'http://c1exchange.com/'
+          }
+        });
+
+      let bidderRequest = {
+        'bidderCode': 'c1x'
+      }
+      bidderRequest.bids = bidRequests;
+      const request = c1xAdapter.buildRequests([bidRequest], bidderRequest)[0];
+      const originalPayload = parseRequest(request.data);
+      const payloadObj = JSON.parse(originalPayload);
+      expect(payloadObj.pageurl).to.equal('http://c1exchange.com/');
+    });
+
+    it('should convert GDPR Consent to proper form and attach to request', () => {
+      let consentString = 'BOP2gFWOQIFovABABAENBGAAAAAAMw';
+      let bidderRequest = {
+        'bidderCode': 'c1x',
+        'gdprConsent': {
+          'consentString': consentString,
+          'gdprApplies': true
+        }
+      }
+      bidderRequest.bids = bidRequests;
+
+      const request = c1xAdapter.buildRequests(bidRequests, bidderRequest)[0];
+      const originalPayload = parseRequest(request.data);
+      const payloadObj = JSON.parse(originalPayload);
+      expect(payloadObj['consent_string']).to.equal('BOP2gFWOQIFovABABAENBGAAAAAAMw');
+      expect(payloadObj['consent_required']).to.equal('true');
+    });
+  });
+
+  describe('interpretResponse', () => {
+    let response = {
+      'bid': true,
+      'cpm': 1.5,
+      'ad': '<!-- Creative -->',
+      'width': 300,
+      'height': 250,
+      'crid': '8888',
+      'adId': 'c1x-test',
+      'bidType': 'GROSS_BID'
+    };
+    it('should get correct bid response', () => {
+      let expectedResponse = [
+        {
+          width: 300,
+          height: 250,
+          cpm: 1.5,
+          ad: '<!-- Creative -->',
+          creativeId: '8888',
+          currency: 'USD',
+          ttl: 300,
+          netRevenue: false,
+          requestId: 'yyyy'
+        }
+      ];
+      let bidderRequest = {};
+      bidderRequest.bids = [
+        {
+          adUnitCode: 'c1x-test',
+          bidId: 'yyyy'
+        }
+      ];
+      let result = c1xAdapter.interpretResponse({ body: [response] }, bidderRequest);
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+    it('handles nobid responses', () => {
+      let response = {
+        bid: false,
+        adId: 'c1x-test'
+      };
+      let bidderRequest = {};
+      let result = c1xAdapter.interpretResponse({ body: [response] }, bidderRequest);
+      expect(result.length).to.equal(0);
+    });
+  });
+});

From 7d127441c5df7fc760c78e92fb79fd7618fb8f15 Mon Sep 17 00:00:00 2001
From: matthieularere-msq
 <63732822+matthieularere-msq@users.noreply.github.com>
Date: Wed, 3 Aug 2022 15:34:34 +0200
Subject: [PATCH 096/569] bidWatch Analytics Adapter : add creative endpoint
 (#8710)

* New Analytics Adapter bidwatch

* test for bidwatch Analytics Adapter

* change maintainer address

* Update bidwatchAnalyticsAdapter.js

* Update bidwatchAnalyticsAdapter.js

* Update bidwatchAnalyticsAdapter.md

* Update bidwatchAnalyticsAdapter.md

* add features to bidwatchAnalyticsAdapter

* update tests

* add test and made improvements
---
 modules/bidwatchAnalyticsAdapter.js           | 81 ++++++++++++++++---
 .../modules/bidwatchAnalyticsAdapter_spec.js  | 18 ++++-
 2 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/modules/bidwatchAnalyticsAdapter.js b/modules/bidwatchAnalyticsAdapter.js
index 26a8c370af3..138f0533238 100644
--- a/modules/bidwatchAnalyticsAdapter.js
+++ b/modules/bidwatchAnalyticsAdapter.js
@@ -10,10 +10,14 @@ const {
   EVENTS: {
     AUCTION_END,
     BID_WON,
+    BID_RESPONSE,
+    BID_REQUESTED,
   }
 } = CONSTANTS;
 
+let saveEvents = {}
 let allEvents = {}
+let auctionEnd = {}
 let initOptions = {}
 let endpoint = 'https://default'
 let objectToSearchForBidderCode = ['bidderRequests', 'bidsReceived', 'noBids']
@@ -22,38 +26,87 @@ function getAdapterNameForAlias(aliasName) {
   return adapterManager.aliasRegistry[aliasName] || aliasName;
 }
 
-function setOriginalBidder(arg) {
+function cleanArgObject(arg, removead) {
+  if (typeof arg['bidderCode'] == 'string') { arg['originalBidder'] = getAdapterNameForAlias(arg['bidderCode']); }
+  if (typeof arg['creativeId'] == 'number') {
+    arg['creativeId'] = arg['creativeId'].toString();
+  }
+  if (removead && typeof arg['ad'] != 'undefined') {
+    arg['ad'] = 'emptied';
+  }
+  if (typeof arg['gdprConsent'] != 'undefined' && typeof arg['gdprConsent']['vendorData'] != 'undefined') {
+    arg['gdprConsent']['vendorData'] = 'emptied';
+  }
+  return arg;
+}
+
+function cleanArgs(arg, removead) {
   Object.keys(arg).forEach(key => {
-    arg[key]['originalBidder'] = getAdapterNameForAlias(arg[key]['bidderCode']);
-    if (typeof arg[key]['creativeId'] == 'number') { arg[key]['creativeId'] = arg[key]['creativeId'].toString(); }
+    arg[key] = cleanArgObject(arg[key], removead);
   });
   return arg
 }
 
-function checkBidderCode(args) {
+function checkBidderCode(args, removead) {
   if (typeof args == 'object') {
     for (let i = 0; i < objectToSearchForBidderCode.length; i++) {
-      if (typeof args[objectToSearchForBidderCode[i]] == 'object') { args[objectToSearchForBidderCode[i]] = setOriginalBidder(args[objectToSearchForBidderCode[i]]) }
+      if (typeof args[objectToSearchForBidderCode[i]] == 'object') { args[objectToSearchForBidderCode[i]] = cleanArgs(args[objectToSearchForBidderCode[i]], removead) }
     }
   }
   if (typeof args['bidderCode'] == 'string') { args['originalBidder'] = getAdapterNameForAlias(args['bidderCode']); } else if (typeof args['bidder'] == 'string') { args['originalBidder'] = getAdapterNameForAlias(args['bidder']); }
   if (typeof args['creativeId'] == 'number') { args['creativeId'] = args['creativeId'].toString(); }
+
   return args
 }
 
 function addEvent(eventType, args) {
-  if (allEvents[eventType] == undefined) { allEvents[eventType] = [] }
-  if (eventType && args) { args = checkBidderCode(args); }
-  allEvents[eventType].push(args);
+  let argsCleaned;
+  if (eventType && args) {
+    if (allEvents[eventType] == undefined) { allEvents[eventType] = [] }
+    if (saveEvents[eventType] == undefined) { saveEvents[eventType] = [] }
+    argsCleaned = checkBidderCode(JSON.parse(JSON.stringify(args)), false);
+    allEvents[eventType].push(argsCleaned);
+    saveEvents[eventType].push(argsCleaned);
+    argsCleaned = checkBidderCode(JSON.parse(JSON.stringify(args)), true);
+    if (['auctionend', 'bidtimeout'].includes(eventType.toLowerCase())) {
+      if (auctionEnd[eventType] == undefined) { auctionEnd[eventType] = [] }
+      auctionEnd[eventType].push(argsCleaned);
+    }
+  }
 }
 
 function handleBidWon(args) {
-  if (typeof allEvents.bidRequested == 'object' && allEvents.bidRequested.length > 0 && allEvents.bidRequested[0].gdprConsent) { args.gdpr = allEvents.bidRequested[0].gdprConsent; }
+  args = cleanArgObject(JSON.parse(JSON.stringify(args)), true);
+  let increment = args['cpm'];
+  if (typeof saveEvents['auctionEnd'] == 'object') {
+    for (let i = 0; i < saveEvents['auctionEnd'].length; i++) {
+      let tmpAuction = saveEvents['auctionEnd'][i];
+      if (tmpAuction['auctionId'] == args['auctionId'] && typeof tmpAuction['bidsReceived'] == 'object') {
+        for (let j = 0; j < tmpAuction['bidsReceived'].length; j++) {
+          let tmpBid = tmpAuction['bidsReceived'][j];
+          if (tmpBid['transactionId'] == args['transactionId'] && tmpBid['adId'] != args['adId']) {
+            if (args['cpm'] < tmpBid['cpm']) {
+              increment = 0;
+            } else if (increment > args['cpm'] - tmpBid['cpm']) {
+              increment = args['cpm'] - tmpBid['cpm'];
+            }
+          }
+        }
+      }
+    }
+  }
+  args['cpmIncrement'] = increment;
+  if (typeof saveEvents.bidRequested == 'object' && saveEvents.bidRequested.length > 0 && saveEvents.bidRequested[0].gdprConsent) { args.gdpr = saveEvents.bidRequested[0].gdprConsent; }
   ajax(endpoint + '.bidwatch.io/analytics/bid_won', null, JSON.stringify(args), {method: 'POST', withCredentials: true});
 }
 
 function handleAuctionEnd() {
-  ajax(endpoint + '.bidwatch.io/analytics/auctions', null, JSON.stringify(allEvents), {method: 'POST', withCredentials: true});
+  ajax(endpoint + '.bidwatch.io/analytics/auctions', null, JSON.stringify(auctionEnd), {method: 'POST', withCredentials: true});
+  auctionEnd = {}
+  if (typeof allEvents['bidResponse'] != 'undefined') {
+    for (let i = 0; i < allEvents['bidResponse'].length; i++) { ajax(endpoint + '.bidwatch.io/analytics/creatives', null, JSON.stringify(allEvents['bidResponse'][i]), {method: 'POST', withCredentials: true}); }
+  }
+  allEvents = {}
 }
 
 let bidwatchAnalytics = Object.assign(adapter({url, analyticsType}), {
@@ -61,14 +114,20 @@ let bidwatchAnalytics = Object.assign(adapter({url, analyticsType}), {
     eventType,
     args
   }) {
-    addEvent(eventType, args);
     switch (eventType) {
       case AUCTION_END:
+        addEvent(eventType, args);
         handleAuctionEnd();
         break;
       case BID_WON:
         handleBidWon(args);
         break;
+      case BID_RESPONSE:
+        addEvent(eventType, args);
+        break;
+      case BID_REQUESTED:
+        addEvent(eventType, args);
+        break;
     }
   }});
 
diff --git a/test/spec/modules/bidwatchAnalyticsAdapter_spec.js b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
index 1a322d131a9..f827f068bb3 100644
--- a/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
+++ b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
@@ -106,7 +106,8 @@ describe('BidWatch Analytics', function () {
         'gdprConsent': {
           'consentString': 'CONSENT',
           'gdprApplies': true,
-          'apiVersion': 2
+          'apiVersion': 2,
+          'vendorData': 'a lot of borring stuff',
         },
         'start': 1647424261189
       },
@@ -281,7 +282,22 @@ describe('BidWatch Analytics', function () {
       });
       events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
       events.emit(constants.EVENTS.AUCTION_END, auctionEnd);
+      expect(server.requests.length).to.equal(1);
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message).to.have.property('auctionEnd').exist;
+      expect(message.auctionEnd).to.have.lengthOf(1);
+      expect(message.auctionEnd[0]).to.have.property('bidsReceived').and.to.have.lengthOf(1);
+      expect(message.auctionEnd[0].bidsReceived[0]).to.have.property('ad');
+      expect(message.auctionEnd[0].bidsReceived[0].ad).to.equal('emptied');
+      expect(message.auctionEnd[0]).to.have.property('bidderRequests').and.to.have.lengthOf(1);
+      expect(message.auctionEnd[0].bidderRequests[0]).to.have.property('gdprConsent');
+      expect(message.auctionEnd[0].bidderRequests[0].gdprConsent).to.have.property('vendorData');
+      expect(message.auctionEnd[0].bidderRequests[0].gdprConsent.vendorData).to.equal('emptied');
       events.emit(constants.EVENTS.BID_WON, bidWon);
+      expect(server.requests.length).to.equal(2);
+      message = JSON.parse(server.requests[1].requestBody);
+      expect(message).to.have.property('ad').and.to.equal('emptied');
+      expect(message).to.have.property('cpmIncrement').and.to.equal(27.4276);
       sinon.assert.callCount(bidwatchAnalytics.track, 3);
     });
   });

From b9fe9a2991e8383b6c121e19fe1d859fbd80365f Mon Sep 17 00:00:00 2001
From: AndBeyondMediaHB <107686862+AndBeyondMediaHB@users.noreply.github.com>
Date: Wed, 3 Aug 2022 19:42:33 +0300
Subject: [PATCH 097/569] BeyondMedia Bid Adapter: initial bid adapter release
 (#8682)

* add andBeyondMedia adapter

* update bidderCode
---
 modules/andBeyondMediaBidAdapter.js           | 202 +++++++++
 modules/andBeyondMediaBidAdapter.md           |  79 ++++
 .../modules/andBeyondMediaBidAdapter_spec.js  | 400 ++++++++++++++++++
 3 files changed, 681 insertions(+)
 create mode 100644 modules/andBeyondMediaBidAdapter.js
 create mode 100644 modules/andBeyondMediaBidAdapter.md
 create mode 100644 test/spec/modules/andBeyondMediaBidAdapter_spec.js

diff --git a/modules/andBeyondMediaBidAdapter.js b/modules/andBeyondMediaBidAdapter.js
new file mode 100644
index 00000000000..57c141dc2aa
--- /dev/null
+++ b/modules/andBeyondMediaBidAdapter.js
@@ -0,0 +1,202 @@
+import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
+
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'beyondmedia';
+const AD_URL = 'https://backend.andbeyond.media/pbjs';
+const SYNC_URL = 'https://cookies.andbeyond.media';
+
+function isBidResponseValid(bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
+    return false;
+  }
+
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.vastUrl || bid.vastXml);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
+    default:
+      return false;
+  }
+}
+
+function getPlacementReqData(bid) {
+  const { params, bidId, mediaTypes } = bid;
+  const schain = bid.schain || {};
+  const { placementId } = params;
+  const bidfloor = getBidFloor(bid);
+
+  const placement = {
+    bidId,
+    schain,
+    bidfloor
+  };
+
+  placement.placementId = placementId;
+  placement.type = 'publisher';
+
+  if (mediaTypes && mediaTypes[BANNER]) {
+    placement.adFormat = BANNER;
+    placement.sizes = mediaTypes[BANNER].sizes;
+  } else if (mediaTypes && mediaTypes[VIDEO]) {
+    placement.adFormat = VIDEO;
+    placement.playerSize = mediaTypes[VIDEO].playerSize;
+    placement.minduration = mediaTypes[VIDEO].minduration;
+    placement.maxduration = mediaTypes[VIDEO].maxduration;
+    placement.mimes = mediaTypes[VIDEO].mimes;
+    placement.protocols = mediaTypes[VIDEO].protocols;
+    placement.startdelay = mediaTypes[VIDEO].startdelay;
+    placement.placement = mediaTypes[VIDEO].placement;
+    placement.skip = mediaTypes[VIDEO].skip;
+    placement.skipafter = mediaTypes[VIDEO].skipafter;
+    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+    placement.delivery = mediaTypes[VIDEO].delivery;
+    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+    placement.api = mediaTypes[VIDEO].api;
+    placement.linearity = mediaTypes[VIDEO].linearity;
+  } else if (mediaTypes && mediaTypes[NATIVE]) {
+    placement.native = mediaTypes[NATIVE];
+    placement.adFormat = NATIVE;
+  }
+
+  return placement;
+}
+
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return deepAccess(bid, 'params.bidfloor', 0);
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*',
+    });
+    return bidFloor.floor;
+  } catch (err) {
+    logError(err);
+    return 0;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid = {}) => {
+    const { params, bidId, mediaTypes } = bid;
+    let valid = Boolean(bidId && params && params.placementId);
+
+    if (mediaTypes && mediaTypes[BANNER]) {
+      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
+    } else if (mediaTypes && mediaTypes[VIDEO]) {
+      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
+    } else if (mediaTypes && mediaTypes[NATIVE]) {
+      valid = valid && Boolean(mediaTypes[NATIVE]);
+    }
+
+    return valid;
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    let deviceWidth = 0;
+    let deviceHeight = 0;
+
+    let winLocation;
+    try {
+      const winTop = window.top;
+      deviceWidth = winTop.screen.width;
+      deviceHeight = winTop.screen.height;
+      winLocation = winTop.location;
+    } catch (e) {
+      logMessage(e);
+      winLocation = window.location;
+    }
+
+    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
+    let refferLocation;
+    try {
+      refferLocation = refferUrl && new URL(refferUrl);
+    } catch (e) {
+      logMessage(e);
+    }
+
+    let location = refferLocation || winLocation;
+    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+    const host = location.host;
+    const page = location.pathname;
+    const secure = location.protocol === 'https:' ? 1 : 0;
+    const placements = [];
+    const request = {
+      deviceWidth,
+      deviceHeight,
+      language,
+      secure,
+      host,
+      page,
+      placements,
+      coppa: config.getConfig('coppa') === true ? 1 : 0,
+      ccpa: bidderRequest.uspConsent || undefined,
+      gdpr: bidderRequest.gdprConsent || undefined,
+      tmax: config.getConfig('bidderTimeout')
+    };
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      placements.push(getPlacementReqData(bid));
+    }
+
+    return {
+      method: 'POST',
+      url: AD_URL,
+      data: request
+    };
+  },
+
+  interpretResponse: (serverResponse) => {
+    let response = [];
+    for (let i = 0; i < serverResponse.body.length; i++) {
+      let resItem = serverResponse.body[i];
+      if (isBidResponseValid(resItem)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/andBeyondMediaBidAdapter.md b/modules/andBeyondMediaBidAdapter.md
new file mode 100644
index 00000000000..ebb44a7779c
--- /dev/null
+++ b/modules/andBeyondMediaBidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: AndBeyond.Media Bidder Adapter
+Module Type: AndBeyond.Media Bidder Adapter
+Maintainer: sysengg@andbeyond.media
+```
+
+# Description
+
+Connects to AndBeyond.Media exchange for bids.
+AndBeyond.Media bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'beyondmedia',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'beyondmedia',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'beyondmedia',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/test/spec/modules/andBeyondMediaBidAdapter_spec.js b/test/spec/modules/andBeyondMediaBidAdapter_spec.js
new file mode 100644
index 00000000000..b739bec288e
--- /dev/null
+++ b/test/spec/modules/andBeyondMediaBidAdapter_spec.js
@@ -0,0 +1,400 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/andBeyondMediaBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'beyondmedia'
+
+describe('AndBeyondMediaBidAdapter', function () {
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative',
+      }
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    refererInfo: {
+      referer: 'https://test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+      expect(spec.isBidRequestValid(bids[1])).to.be.true;
+      expect(spec.isBidRequestValid(bids[2])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://backend.andbeyond.media/pbjs');
+    });
+
+    it('Returns general data valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('string');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      serverRequest = spec.buildRequests([], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.placements).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cookies.andbeyond.media/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cookies.andbeyond.media/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+  });
+});

From 7792685ad4787357058eacbd103478964f3877e3 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Wed, 3 Aug 2022 18:16:19 +0000
Subject: [PATCH 098/569] Prebid 7.9.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c29ddad3673..1033d517bad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.9.0-pre",
+  "version": "7.9.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 3c6622adf9b..772023d54fb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.9.0-pre",
+  "version": "7.9.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 53c5f4ddc44e6a190cfb6d2cef85c9886e5c7331 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Wed, 3 Aug 2022 18:16:20 +0000
Subject: [PATCH 099/569] Increment version to 7.10.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1033d517bad..a8d1b0f9097 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.9.0",
+  "version": "7.10.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 772023d54fb..91a41436d32 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.9.0",
+  "version": "7.10.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From db2a333f2c521824193771fc302ec64f0b1e1118 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Wed, 3 Aug 2022 12:39:42 -0700
Subject: [PATCH 100/569] Prebid core: improve library support; make
 AnalyticsAdapter a library (#8599)

* Automatically resolve libraries and their dependencies

* Move AnalyticsAdapter under libraries
---
 .gitignore                                    |  2 +-
 allowedModules.js                             |  3 +
 gulpHelpers.js                                | 77 ++++++------------
 gulpfile.js                                   |  9 ++-
 libraries/LIBRARIES.md                        |  5 ++
 .../analyticsAdapter}/AnalyticsAdapter.js     | 11 ++-
 .../analyticsAdapter/examples}/example.js     |  2 +-
 .../analyticsAdapter/examples}/example2.js    |  2 +-
 .../examples}/libraries/example.js            |  0
 .../examples}/libraries/example2.js           |  0
 modules/.submodules.json                      | 12 ---
 modules/adWMGAnalyticsAdapter.js              |  2 +-
 modules/adagioAnalyticsAdapter.js             |  2 +-
 modules/adkernelAdnAnalyticsAdapter.js        |  2 +-
 modules/adlooxAnalyticsAdapter.js             |  2 +-
 modules/adomikAnalyticsAdapter.js             |  2 +-
 modules/adxcgAnalyticsAdapter.js              |  2 +-
 modules/adxpremiumAnalyticsAdapter.js         |  2 +-
 modules/appierAnalyticsAdapter.js             |  2 +-
 modules/atsAnalyticsAdapter.js                |  2 +-
 modules/bidwatchAnalyticsAdapter.js           |  2 +-
 modules/byDataAnalyticsAdapter.js             |  2 +-
 modules/concertAnalyticsAdapter.js            |  2 +-
 modules/datablocksAnalyticsAdapter.js         |  2 +-
 modules/eplanningAnalyticsAdapter.js          |  2 +-
 modules/fintezaAnalyticsAdapter.js            |  2 +-
 modules/hadronAnalyticsAdapter.js             |  2 +-
 modules/id5AnalyticsAdapter.js                |  2 +-
 modules/invisiblyAnalyticsAdapter.js          |  2 +-
 modules/kargoAnalyticsAdapter.js              |  2 +-
 modules/konduitAnalyticsAdapter.js            |  2 +-
 modules/livewrappedAnalyticsAdapter.js        |  2 +-
 modules/liveyieldAnalyticsAdapter.js          |  2 +-
 modules/malltvAnalyticsAdapter.js             |  2 +-
 modules/marsmediaAnalyticsAdapter.js          |  2 +-
 modules/medianetAnalyticsAdapter.js           |  2 +-
 modules/ooloAnalyticsAdapter.js               |  2 +-
 modules/openxAnalyticsAdapter.js              |  2 +-
 modules/optimonAnalyticsAdapter.js            |  2 +-
 modules/pianoDmpAnalyticsAdapter.js           |  2 +-
 modules/prebidmanagerAnalyticsAdapter.js      |  2 +-
 modules/pubmaticAnalyticsAdapter.js           |  2 +-
 modules/pubperfAnalyticsAdapter.js            |  2 +-
 modules/pubstackAnalyticsAdapter.js           |  2 +-
 modules/pubwiseAnalyticsAdapter.js            |  2 +-
 modules/pubxaiAnalyticsAdapter.js             |  2 +-
 modules/pulsepointAnalyticsAdapter.js         |  2 +-
 modules/realvuAnalyticsAdapter.js             |  2 +-
 modules/relevantAnalyticsAdapter.js           |  2 +-
 modules/rivrAnalyticsAdapter.js               |  2 +-
 modules/roxotAnalyticsAdapter.js              |  2 +-
 modules/rubiconAnalyticsAdapter.js            |  2 +-
 modules/scaleableAnalyticsAdapter.js          |  2 +-
 modules/sharethroughAnalyticsAdapter.js       |  2 +-
 modules/sigmoidAnalyticsAdapter.js            |  2 +-
 modules/sonobiAnalyticsAdapter.js             |  2 +-
 modules/sovrnAnalyticsAdapter.js              |  2 +-
 modules/staqAnalyticsAdapter.js               |  2 +-
 modules/terceptAnalyticsAdapter.js            |  2 +-
 modules/ucfunnelAnalyticsAdapter.js           |  2 +-
 modules/yieldoneAnalyticsAdapter.js           |  2 +-
 modules/yuktamediaAnalyticsAdapter.js         |  2 +-
 modules/zeta_global_sspAnalyticsAdapter.js    |  2 +-
 package-lock.json                             | 79 +++++++++++++++++++
 package.json                                  |  1 +
 test/mocks/analyticsStub.js                   |  2 +-
 test/spec/AnalyticsAdapter_spec.js            |  2 +-
 webpack.conf.js                               | 58 +++++++++++---
 68 files changed, 227 insertions(+), 142 deletions(-)
 create mode 100644 libraries/LIBRARIES.md
 rename {src => libraries/analyticsAdapter}/AnalyticsAdapter.js (95%)
 rename {src/adapters/analytics => libraries/analyticsAdapter/examples}/example.js (85%)
 rename {src/adapters/analytics => libraries/analyticsAdapter/examples}/example2.js (92%)
 rename {src/adapters/analytics => libraries/analyticsAdapter/examples}/libraries/example.js (100%)
 rename {src/adapters/analytics => libraries/analyticsAdapter/examples}/libraries/example2.js (100%)

diff --git a/.gitignore b/.gitignore
index c0452b7b3d0..e5f000dd4d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ selenium*.log
 integrationExamples/gpt/gpt.html
 integrationExamples/gpt/*-test.html
 integrationExamples/implementations/
-src/adapters/analytics/libraries
+libraries/analyticsAdapter/examples/libraries
 
 # Coverage reports
 build/coverage/
diff --git a/allowedModules.js b/allowedModules.js
index be9a2dc2abf..3e6e3039fa2 100644
--- a/allowedModules.js
+++ b/allowedModules.js
@@ -15,5 +15,8 @@ module.exports = {
     'just-clone',
     'dlv',
     'dset'
+  ],
+  'libraries': [
+    ...sharedWhiteList // empty for now, but keep it to enable linting
   ]
 };
diff --git a/gulpHelpers.js b/gulpHelpers.js
index 60e2fab0df2..1eec08b7a3e 100644
--- a/gulpHelpers.js
+++ b/gulpHelpers.js
@@ -6,12 +6,9 @@ const MANIFEST = 'package.json';
 const through = require('through2');
 const _ = require('lodash');
 const gutil = require('gulp-util');
-const dependencyMap = require('./modules/.submodules.json');
-const submodules = dependencyMap.parentModules;
-const libraries = dependencyMap.libraries;
+const submodules = require('./modules/.submodules.json').parentModules;
 
 const MODULE_PATH = './modules';
-const LIBRARY_PATH = './libraries';
 const BUILD_PATH = './build/dist';
 const DEV_PATH = './build/dev';
 const ANALYTICS_PATH = '../analytics';
@@ -71,68 +68,34 @@ module.exports = {
       }
     });
 
-    Object.keys(libraries).forEach(library => {
-      if (!modules.includes(library) && modules.some(module => libraries[library].dependants.includes(module))) {
-        modules.unshift(library);
-      }
-    });
-
     return modules;
   },
-  getParentLibraries(moduleName) {
-    const libraryNames = [];
-    Object.keys(libraries).forEach(libraryName => {
-      const library = libraries[libraryName];
-      if (library.dependants.includes(moduleName)) {
-        libraryNames.push(libraryName);
-      }
-    });
-    return libraryNames;
-  },
-  getLibraryFiles(name) {
-    const library = libraries[name];
-    const files = library.files.map((file) => path.resolve('./libraries/', name, file))
-    return files;
-  },
-  isLibrary(name) {
-    return !!libraries[name];
-  },
   getModules: _.memoize(function(externalModules) {
     externalModules = externalModules || [];
     var internalModules;
     try {
-      var getInternalModules = function(absolutePath) {
-        return fs.readdirSync(absolutePath)
-          .filter(file => (/^[^\.]+(\.js)?$/).test(file))
-          .reduce((memo, file) => {
-            var moduleName = file.split(new RegExp('[.\\' + path.sep + ']'))[0];
-            var modulePath = path.join(absolutePath, file);
-            if (fs.lstatSync(modulePath).isDirectory()) {
-              modulePath = path.join(modulePath, 'index.js')
-            }
-            if (fs.existsSync(modulePath)) {
-              memo[modulePath] = moduleName;
-            }
-            return memo;
-          }, {});
-      };
-
       var absoluteModulePath = path.join(__dirname, MODULE_PATH);
-      var absoluteLibraryPath = path.join(__dirname, LIBRARY_PATH);
-
-      internalModules = getInternalModules(absoluteModulePath);
-      var internalLibraries = getInternalModules(absoluteLibraryPath);
-      Object.assign(internalModules, internalLibraries);
+      internalModules = fs.readdirSync(absoluteModulePath)
+        .filter(file => (/^[^\.]+(\.js)?$/).test(file))
+        .reduce((memo, file) => {
+          var moduleName = file.split(new RegExp('[.\\' + path.sep + ']'))[0];
+          var modulePath = path.join(absoluteModulePath, file);
+          if (fs.lstatSync(modulePath).isDirectory()) {
+            modulePath = path.join(modulePath, 'index.js')
+          }
+          if (fs.existsSync(modulePath)) {
+            memo[modulePath] = moduleName;
+          }
+          return memo;
+        }, {});
     } catch (err) {
       internalModules = {};
     }
     return Object.assign(externalModules.reduce((memo, module) => {
       try {
         // prefer internal project modules before looking at project dependencies
-        var modulePath = require.resolve(module, {paths: [MODULE_PATH, LIBRARY_PATH]});
-        if (modulePath === '') {
-          modulePath = require.resolve(module);
-        }
+        var modulePath = require.resolve(module, {paths: ['./modules']});
+        if (modulePath === '') modulePath = require.resolve(module);
 
         memo[modulePath] = module;
       } catch (err) {
@@ -142,16 +105,20 @@ module.exports = {
     }, internalModules));
   }),
 
+  getBuiltPath(dev, assetPath) {
+    return path.join(__dirname, dev ? DEV_PATH : BUILD_PATH, assetPath)
+  },
+
   getBuiltModules: function(dev, externalModules) {
     var modules = this.getModuleNames(externalModules);
     if (Array.isArray(externalModules)) {
       modules = _.intersection(modules, externalModules);
     }
-    return modules.map(name => path.join(__dirname, dev ? DEV_PATH : BUILD_PATH, name + '.js'));
+    return modules.map(name => this.getBuiltPath(dev, name + '.js'));
   },
 
   getBuiltPrebidCoreFile: function(dev) {
-    return path.join(__dirname, dev ? DEV_PATH : BUILD_PATH, 'prebid-core' + '.js');
+    return this.getBuiltPath(dev, 'prebid-core.js')
   },
 
   getModulePaths: function(externalModules) {
diff --git a/gulpfile.js b/gulpfile.js
index 39181c92316..3425850286d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -240,8 +240,15 @@ function bundle(dev, moduleArr) {
       });
     }
   }
+  const coreFile = helpers.getBuiltPrebidCoreFile(dev);
+  const moduleFiles = helpers.getBuiltModules(dev, modules);
+  const depGraph = require(helpers.getBuiltPath(dev, 'dependencies.json'));
+  const dependencies = new Set();
+  [coreFile].concat(moduleFiles).map(name => path.basename(name)).forEach((file) => {
+    (depGraph[file] || []).forEach((dep) => dependencies.add(helpers.getBuiltPath(dev, dep)));
+  })
 
-  var entries = [helpers.getBuiltPrebidCoreFile(dev)].concat(helpers.getBuiltModules(dev, modules));
+  const entries = [coreFile].concat(Array.from(dependencies), moduleFiles);
 
   var outputFileName = argv.bundleName ? argv.bundleName : 'prebid.js';
 
diff --git a/libraries/LIBRARIES.md b/libraries/LIBRARIES.md
new file mode 100644
index 00000000000..e4d8fcc4f98
--- /dev/null
+++ b/libraries/LIBRARIES.md
@@ -0,0 +1,5 @@
+## Cross-module libraries
+
+Each directory under this one is packaged into a "library" during the build. 
+
+Modules may share code by simply importing from a common library file; if the module is included in the build, any libraries they import from will also be included.
diff --git a/src/AnalyticsAdapter.js b/libraries/analyticsAdapter/AnalyticsAdapter.js
similarity index 95%
rename from src/AnalyticsAdapter.js
rename to libraries/analyticsAdapter/AnalyticsAdapter.js
index 47f56dc054f..277a1455a75 100644
--- a/src/AnalyticsAdapter.js
+++ b/libraries/analyticsAdapter/AnalyticsAdapter.js
@@ -1,7 +1,7 @@
-import CONSTANTS from './constants.json';
-import { ajax } from './ajax.js';
-import { logMessage, _each } from './utils.js';
-import * as events from './events.js'
+import CONSTANTS from '../../src/constants.json';
+import { ajax } from '../../src/ajax.js';
+import { logMessage, _each } from '../../src/utils.js';
+import * as events from '../../src/events.js'
 
 export const _internal = {
   ajax
@@ -31,14 +31,13 @@ const {
 const ENDPOINT = 'endpoint';
 const BUNDLE = 'bundle';
 
-var _sampled = true;
-
 export default function AnalyticsAdapter({ url, analyticsType, global, handler }) {
   const _queue = [];
   let _eventCount = 0;
   let _enableCheck = true;
   let _handlers;
   let _enabled = false;
+  let _sampled = true;
 
   if (analyticsType === ENDPOINT || BUNDLE) {
     _emptyQueue();
diff --git a/src/adapters/analytics/example.js b/libraries/analyticsAdapter/examples/example.js
similarity index 85%
rename from src/adapters/analytics/example.js
rename to libraries/analyticsAdapter/examples/example.js
index 1321612b688..c6907907b23 100644
--- a/src/adapters/analytics/example.js
+++ b/libraries/analyticsAdapter/examples/example.js
@@ -2,7 +2,7 @@
  * example.js - analytics adapter for Example Analytics Library example
  */
 
-import adapter from '../../AnalyticsAdapter.js';
+import adapter from '../AnalyticsAdapter.js';
 
 export default adapter(
   {
diff --git a/src/adapters/analytics/example2.js b/libraries/analyticsAdapter/examples/example2.js
similarity index 92%
rename from src/adapters/analytics/example2.js
rename to libraries/analyticsAdapter/examples/example2.js
index eadf994ce36..d95a3f54283 100644
--- a/src/adapters/analytics/example2.js
+++ b/libraries/analyticsAdapter/examples/example2.js
@@ -5,7 +5,7 @@ import { ajax } from '../../../src/ajax.js';
  * example2.js - analytics adapter for Example2 Analytics Endpoint example
  */
 
-import adapter from '../../AnalyticsAdapter.js';
+import adapter from '../AnalyticsAdapter.js';
 
 const url = 'https://httpbin.org/post';
 const analyticsType = 'endpoint';
diff --git a/src/adapters/analytics/libraries/example.js b/libraries/analyticsAdapter/examples/libraries/example.js
similarity index 100%
rename from src/adapters/analytics/libraries/example.js
rename to libraries/analyticsAdapter/examples/libraries/example.js
diff --git a/src/adapters/analytics/libraries/example2.js b/libraries/analyticsAdapter/examples/libraries/example2.js
similarity index 100%
rename from src/adapters/analytics/libraries/example2.js
rename to libraries/analyticsAdapter/examples/libraries/example2.js
diff --git a/modules/.submodules.json b/modules/.submodules.json
index b031a6bac02..72eadf15d31 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -73,17 +73,5 @@
       "validationFpdModule",
       "topicsFpdModule"
     ]
-  },
-  "libraries": {
-    "getOrigin": {
-      "files": [
-        "./index.js"
-      ],
-      "dependants": [
-        "ooloAnalyticsAdapter",
-        "resetdigitalBidAdapter",
-        "rtbhouseBidAdapter.js"
-      ]
-    }
   }
 }
\ No newline at end of file
diff --git a/modules/adWMGAnalyticsAdapter.js b/modules/adWMGAnalyticsAdapter.js
index 8183187eb73..dd0340071d1 100644
--- a/modules/adWMGAnalyticsAdapter.js
+++ b/modules/adWMGAnalyticsAdapter.js
@@ -1,4 +1,4 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import { ajax } from '../src/ajax.js';
diff --git a/modules/adagioAnalyticsAdapter.js b/modules/adagioAnalyticsAdapter.js
index f929f7e660b..96f3f089cbd 100644
--- a/modules/adagioAnalyticsAdapter.js
+++ b/modules/adagioAnalyticsAdapter.js
@@ -2,7 +2,7 @@
  * Analytics Adapter for Adagio
  */
 
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import { getWindowTop } from '../src/utils.js';
diff --git a/modules/adkernelAdnAnalyticsAdapter.js b/modules/adkernelAdnAnalyticsAdapter.js
index d4aa3b035e0..901c0d2fd98 100644
--- a/modules/adkernelAdnAnalyticsAdapter.js
+++ b/modules/adkernelAdnAnalyticsAdapter.js
@@ -1,4 +1,4 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import { logError, parseUrl, _each } from '../src/utils.js';
diff --git a/modules/adlooxAnalyticsAdapter.js b/modules/adlooxAnalyticsAdapter.js
index a26a5e507e6..5db75c656bb 100644
--- a/modules/adlooxAnalyticsAdapter.js
+++ b/modules/adlooxAnalyticsAdapter.js
@@ -5,7 +5,7 @@
  */
 
 import adapterManager from '../src/adapterManager.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import {loadExternalScript} from '../src/adloader.js';
 import {auctionManager} from '../src/auctionManager.js';
 import {AUCTION_COMPLETED} from '../src/auction.js';
diff --git a/modules/adomikAnalyticsAdapter.js b/modules/adomikAnalyticsAdapter.js
index 40809c59093..27a6821d9f5 100644
--- a/modules/adomikAnalyticsAdapter.js
+++ b/modules/adomikAnalyticsAdapter.js
@@ -1,4 +1,4 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import {logInfo} from '../src/utils.js';
diff --git a/modules/adxcgAnalyticsAdapter.js b/modules/adxcgAnalyticsAdapter.js
index 5cd04ce13cd..f3bb1270334 100644
--- a/modules/adxcgAnalyticsAdapter.js
+++ b/modules/adxcgAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { parseSizesInput, uniques, buildUrl, logError } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 
diff --git a/modules/adxpremiumAnalyticsAdapter.js b/modules/adxpremiumAnalyticsAdapter.js
index 4db01024208..456180a964b 100644
--- a/modules/adxpremiumAnalyticsAdapter.js
+++ b/modules/adxpremiumAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import {deepClone, logError, logInfo} from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import {includes} from '../src/polyfill.js';
diff --git a/modules/appierAnalyticsAdapter.js b/modules/appierAnalyticsAdapter.js
index afcf63ef2c1..b4081feaf92 100644
--- a/modules/appierAnalyticsAdapter.js
+++ b/modules/appierAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import {getGlobal} from '../src/prebidGlobal.js';
diff --git a/modules/atsAnalyticsAdapter.js b/modules/atsAnalyticsAdapter.js
index 390e06366d1..0c0227ea34a 100644
--- a/modules/atsAnalyticsAdapter.js
+++ b/modules/atsAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import { logError, logInfo } from '../src/utils.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adaptermanager from '../src/adapterManager.js';
 import {ajax} from '../src/ajax.js';
diff --git a/modules/bidwatchAnalyticsAdapter.js b/modules/bidwatchAnalyticsAdapter.js
index 138f0533238..ef63fee53d5 100644
--- a/modules/bidwatchAnalyticsAdapter.js
+++ b/modules/bidwatchAnalyticsAdapter.js
@@ -1,4 +1,4 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import { ajax } from '../src/ajax.js';
diff --git a/modules/byDataAnalyticsAdapter.js b/modules/byDataAnalyticsAdapter.js
index 1bf47cd467f..ccf57942d7a 100644
--- a/modules/byDataAnalyticsAdapter.js
+++ b/modules/byDataAnalyticsAdapter.js
@@ -2,7 +2,7 @@ import { deepClone, logInfo, logError } from '../src/utils.js';
 import Base64 from 'crypto-js/enc-base64';
 import hmacSHA512 from 'crypto-js/hmac-sha512';
 import enc from 'crypto-js/enc-utf8';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import { getStorageManager } from '../src/storageManager.js';
diff --git a/modules/concertAnalyticsAdapter.js b/modules/concertAnalyticsAdapter.js
index cd52a2ffabf..210d1898338 100644
--- a/modules/concertAnalyticsAdapter.js
+++ b/modules/concertAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { logMessage } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 
diff --git a/modules/datablocksAnalyticsAdapter.js b/modules/datablocksAnalyticsAdapter.js
index 5e977155284..61933cc45e9 100644
--- a/modules/datablocksAnalyticsAdapter.js
+++ b/modules/datablocksAnalyticsAdapter.js
@@ -2,7 +2,7 @@
  * Analytics Adapter for Datablocks
  */
 
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
 var datablocksAdapter = adapter({
diff --git a/modules/eplanningAnalyticsAdapter.js b/modules/eplanningAnalyticsAdapter.js
index 365f91382f7..9eb701b8ecc 100644
--- a/modules/eplanningAnalyticsAdapter.js
+++ b/modules/eplanningAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { logError } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 
diff --git a/modules/fintezaAnalyticsAdapter.js b/modules/fintezaAnalyticsAdapter.js
index 10b59de1838..7b1b2f69364 100644
--- a/modules/fintezaAnalyticsAdapter.js
+++ b/modules/fintezaAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { parseUrl, logError } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import { getStorageManager } from '../src/storageManager.js';
 import CONSTANTS from '../src/constants.json';
diff --git a/modules/hadronAnalyticsAdapter.js b/modules/hadronAnalyticsAdapter.js
index c0e39925b4a..073dd15ea49 100644
--- a/modules/hadronAnalyticsAdapter.js
+++ b/modules/hadronAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import { ajax } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import * as utils from '../src/utils.js';
 import CONSTANTS from '../src/constants.json';
diff --git a/modules/id5AnalyticsAdapter.js b/modules/id5AnalyticsAdapter.js
index 69e303b520a..5ae04eb57ce 100644
--- a/modules/id5AnalyticsAdapter.js
+++ b/modules/id5AnalyticsAdapter.js
@@ -1,4 +1,4 @@
-import buildAdapter from '../src/AnalyticsAdapter.js';
+import buildAdapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import { ajax } from '../src/ajax.js';
diff --git a/modules/invisiblyAnalyticsAdapter.js b/modules/invisiblyAnalyticsAdapter.js
index 1f0bbfd46c3..a4f4eba271c 100644
--- a/modules/invisiblyAnalyticsAdapter.js
+++ b/modules/invisiblyAnalyticsAdapter.js
@@ -2,7 +2,7 @@
  * invisiblyAdapterAdapter.js - analytics adapter for Invisibly
  */
 import { ajaxBuilder } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
 import { generateUUID, logInfo } from '../src/utils.js';
diff --git a/modules/kargoAnalyticsAdapter.js b/modules/kargoAnalyticsAdapter.js
index 8ddf14aaa83..652e105167d 100644
--- a/modules/kargoAnalyticsAdapter.js
+++ b/modules/kargoAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { logError } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 
diff --git a/modules/konduitAnalyticsAdapter.js b/modules/konduitAnalyticsAdapter.js
index f8a44d7cc94..a1a586b25db 100644
--- a/modules/konduitAnalyticsAdapter.js
+++ b/modules/konduitAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { parseSizesInput, logError, uniques } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import { targeting } from '../src/targeting.js';
 import { config } from '../src/config.js';
diff --git a/modules/livewrappedAnalyticsAdapter.js b/modules/livewrappedAnalyticsAdapter.js
index 1116fd99ba0..2721031948d 100644
--- a/modules/livewrappedAnalyticsAdapter.js
+++ b/modules/livewrappedAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { timestamp, logInfo, getWindowTop } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import { getGlobal } from '../src/prebidGlobal.js';
diff --git a/modules/liveyieldAnalyticsAdapter.js b/modules/liveyieldAnalyticsAdapter.js
index 411b76a5149..997c0eaace0 100644
--- a/modules/liveyieldAnalyticsAdapter.js
+++ b/modules/liveyieldAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import { logError } from '../src/utils.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 
diff --git a/modules/malltvAnalyticsAdapter.js b/modules/malltvAnalyticsAdapter.js
index a0e2a208bc9..af903795e49 100644
--- a/modules/malltvAnalyticsAdapter.js
+++ b/modules/malltvAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import {ajax} from '../src/ajax.js'
-import adapter from '../src/AnalyticsAdapter.js'
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js'
 import CONSTANTS from '../src/constants.json'
 import adapterManager from '../src/adapterManager.js'
 import {getGlobal} from '../src/prebidGlobal.js'
diff --git a/modules/marsmediaAnalyticsAdapter.js b/modules/marsmediaAnalyticsAdapter.js
index 12c333631a2..c86cc4dfbc2 100644
--- a/modules/marsmediaAnalyticsAdapter.js
+++ b/modules/marsmediaAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
 /****
diff --git a/modules/medianetAnalyticsAdapter.js b/modules/medianetAnalyticsAdapter.js
index 05c18a47f94..b7abe5f56cf 100644
--- a/modules/medianetAnalyticsAdapter.js
+++ b/modules/medianetAnalyticsAdapter.js
@@ -11,7 +11,7 @@ import {
   uniques,
   getHighestCpm
 } from '../src/utils.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import {ajax} from '../src/ajax.js';
diff --git a/modules/ooloAnalyticsAdapter.js b/modules/ooloAnalyticsAdapter.js
index 6f9d5620d53..9bc140f0536 100644
--- a/modules/ooloAnalyticsAdapter.js
+++ b/modules/ooloAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { _each, deepClone, pick, deepSetValue, logError, logInfo } from '../src/utils.js';
 import { getOrigin } from '../libraries/getOrigin/index.js';
-import adapter from '../src/AnalyticsAdapter.js'
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js'
 import adapterManager from '../src/adapterManager.js'
 import CONSTANTS from '../src/constants.json'
 import { ajax } from '../src/ajax.js'
diff --git a/modules/openxAnalyticsAdapter.js b/modules/openxAnalyticsAdapter.js
index 89140c0aacd..7cc71fe898e 100644
--- a/modules/openxAnalyticsAdapter.js
+++ b/modules/openxAnalyticsAdapter.js
@@ -13,7 +13,7 @@ import {
   parseSizesInput,
   uniques
 } from '../src/utils.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import {ajax} from '../src/ajax.js';
diff --git a/modules/optimonAnalyticsAdapter.js b/modules/optimonAnalyticsAdapter.js
index 34b2778afc9..82bc18f605d 100644
--- a/modules/optimonAnalyticsAdapter.js
+++ b/modules/optimonAnalyticsAdapter.js
@@ -8,7 +8,7 @@
 *
 */
 
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
 const optimonAnalyticsAdapter = adapter({
diff --git a/modules/pianoDmpAnalyticsAdapter.js b/modules/pianoDmpAnalyticsAdapter.js
index 08ef5406d9f..47159475b5d 100644
--- a/modules/pianoDmpAnalyticsAdapter.js
+++ b/modules/pianoDmpAnalyticsAdapter.js
@@ -1,4 +1,4 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
 const pianoDmpAnalytics = adapter({ analyticsType: 'bundle', handler: 'on' });
diff --git a/modules/prebidmanagerAnalyticsAdapter.js b/modules/prebidmanagerAnalyticsAdapter.js
index 6235b10fa13..708d2b79243 100644
--- a/modules/prebidmanagerAnalyticsAdapter.js
+++ b/modules/prebidmanagerAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { generateUUID, getParameterByName, logError, parseUrl, logInfo } from '../src/utils.js';
 import {ajaxBuilder} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import { getStorageManager } from '../src/storageManager.js';
 import CONSTANTS from '../src/constants.json';
diff --git a/modules/pubmaticAnalyticsAdapter.js b/modules/pubmaticAnalyticsAdapter.js
index 6a73838ff1d..48b570a683b 100755
--- a/modules/pubmaticAnalyticsAdapter.js
+++ b/modules/pubmaticAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import { _each, pick, logWarn, isStr, isArray, logError } from '../src/utils.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import { ajax } from '../src/ajax.js';
diff --git a/modules/pubperfAnalyticsAdapter.js b/modules/pubperfAnalyticsAdapter.js
index 9282d5814c0..9ef95adb77a 100644
--- a/modules/pubperfAnalyticsAdapter.js
+++ b/modules/pubperfAnalyticsAdapter.js
@@ -2,7 +2,7 @@
  * Analytics Adapter for Pubperf
  */
 
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import { logError } from '../src/utils.js';
 
diff --git a/modules/pubstackAnalyticsAdapter.js b/modules/pubstackAnalyticsAdapter.js
index b1da40c5b89..ef33b2d75ae 100644
--- a/modules/pubstackAnalyticsAdapter.js
+++ b/modules/pubstackAnalyticsAdapter.js
@@ -1,4 +1,4 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
 const pubstackAnalytics = adapter({
diff --git a/modules/pubwiseAnalyticsAdapter.js b/modules/pubwiseAnalyticsAdapter.js
index 9b40d45542c..7976bcef58d 100644
--- a/modules/pubwiseAnalyticsAdapter.js
+++ b/modules/pubwiseAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { getParameterByName, logInfo, generateUUID, debugTurnedOn } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import { getStorageManager } from '../src/storageManager.js';
diff --git a/modules/pubxaiAnalyticsAdapter.js b/modules/pubxaiAnalyticsAdapter.js
index 3f35cd8ff79..bd92162b8cb 100644
--- a/modules/pubxaiAnalyticsAdapter.js
+++ b/modules/pubxaiAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { deepAccess, getGptSlotInfoForAdUnitCode, parseSizesInput, getWindowLocation, buildUrl } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 
diff --git a/modules/pulsepointAnalyticsAdapter.js b/modules/pulsepointAnalyticsAdapter.js
index 375a817f257..999ae3dd3de 100644
--- a/modules/pulsepointAnalyticsAdapter.js
+++ b/modules/pulsepointAnalyticsAdapter.js
@@ -2,7 +2,7 @@
  * pulsepoint.js - Analytics Adapter for PulsePoint
  */
 
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
 var pulsepointAdapter = adapter({
diff --git a/modules/realvuAnalyticsAdapter.js b/modules/realvuAnalyticsAdapter.js
index 832e907893c..0811c70a2f7 100644
--- a/modules/realvuAnalyticsAdapter.js
+++ b/modules/realvuAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 // RealVu Analytics Adapter
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import { getStorageManager } from '../src/storageManager.js';
diff --git a/modules/relevantAnalyticsAdapter.js b/modules/relevantAnalyticsAdapter.js
index 5917262c810..7774370f7ad 100644
--- a/modules/relevantAnalyticsAdapter.js
+++ b/modules/relevantAnalyticsAdapter.js
@@ -1,4 +1,4 @@
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
 const relevantAnalytics = adapter({ analyticsType: 'bundle', handler: 'on' });
diff --git a/modules/rivrAnalyticsAdapter.js b/modules/rivrAnalyticsAdapter.js
index 279b1b13051..cf14ff44571 100644
--- a/modules/rivrAnalyticsAdapter.js
+++ b/modules/rivrAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import * as utils from '../src/utils.js';
 
diff --git a/modules/roxotAnalyticsAdapter.js b/modules/roxotAnalyticsAdapter.js
index b11898b9ea8..1ded17f3a5b 100644
--- a/modules/roxotAnalyticsAdapter.js
+++ b/modules/roxotAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import {deepClone, getParameterByName, logError, logInfo} from '../src/utils.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import {includes} from '../src/polyfill.js';
diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index ca0d0c1fe65..3ad1bb26b47 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import { generateUUID, mergeDeep, deepAccess, parseUrl, logError, pick, isEmpty, logWarn, debugTurnedOn, parseQS, getWindowLocation, isAdUnitCodeMatchingSlot, isNumber, isGptPubadsDefined, _each, deepSetValue, deepClone, logInfo } from '../src/utils.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import { ajax } from '../src/ajax.js';
diff --git a/modules/scaleableAnalyticsAdapter.js b/modules/scaleableAnalyticsAdapter.js
index d7379462e0d..46f9d45d84d 100644
--- a/modules/scaleableAnalyticsAdapter.js
+++ b/modules/scaleableAnalyticsAdapter.js
@@ -2,7 +2,7 @@
 
 import { ajax } from '../src/ajax.js';
 import CONSTANTS from '../src/constants.json';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import { logMessage } from '../src/utils.js';
 
diff --git a/modules/sharethroughAnalyticsAdapter.js b/modules/sharethroughAnalyticsAdapter.js
index 4f065cbca23..6502c7e3a53 100644
--- a/modules/sharethroughAnalyticsAdapter.js
+++ b/modules/sharethroughAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import { tryAppendQueryString } from '../src/utils.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 
 const emptyUrl = '';
diff --git a/modules/sigmoidAnalyticsAdapter.js b/modules/sigmoidAnalyticsAdapter.js
index a0521bd5297..dc386813978 100644
--- a/modules/sigmoidAnalyticsAdapter.js
+++ b/modules/sigmoidAnalyticsAdapter.js
@@ -1,7 +1,7 @@
 /* Sigmoid Analytics Adapter for prebid.js v1.1.0-pre
 Updated : 2018-03-28 */
 import {includes} from '../src/polyfill.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import {getStorageManager} from '../src/storageManager.js';
diff --git a/modules/sonobiAnalyticsAdapter.js b/modules/sonobiAnalyticsAdapter.js
index 0de6647149a..75d481aba9e 100644
--- a/modules/sonobiAnalyticsAdapter.js
+++ b/modules/sonobiAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import { deepClone, logInfo, logError } from '../src/utils.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import {ajaxBuilder} from '../src/ajax.js';
diff --git a/modules/sovrnAnalyticsAdapter.js b/modules/sovrnAnalyticsAdapter.js
index 8a5b816ef43..a72c4b1a5a5 100644
--- a/modules/sovrnAnalyticsAdapter.js
+++ b/modules/sovrnAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import {logError, timestamp} from '../src/utils.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adaptermanager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import {ajaxBuilder} from '../src/ajax.js';
diff --git a/modules/staqAnalyticsAdapter.js b/modules/staqAnalyticsAdapter.js
index b9bfe5212c6..69d23a3a604 100644
--- a/modules/staqAnalyticsAdapter.js
+++ b/modules/staqAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import { logInfo, logError, parseUrl, _each } from '../src/utils.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import { getRefererInfo } from '../src/refererDetection.js';
diff --git a/modules/terceptAnalyticsAdapter.js b/modules/terceptAnalyticsAdapter.js
index 748e512bd42..9d215f0ceda 100644
--- a/modules/terceptAnalyticsAdapter.js
+++ b/modules/terceptAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { parseSizesInput, getWindowLocation, buildUrl } from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 
diff --git a/modules/ucfunnelAnalyticsAdapter.js b/modules/ucfunnelAnalyticsAdapter.js
index 7a471a1d3b4..77fffddbaae 100644
--- a/modules/ucfunnelAnalyticsAdapter.js
+++ b/modules/ucfunnelAnalyticsAdapter.js
@@ -1,5 +1,5 @@
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import {getGlobal} from '../src/prebidGlobal.js';
diff --git a/modules/yieldoneAnalyticsAdapter.js b/modules/yieldoneAnalyticsAdapter.js
index 126e3504f98..0663ecb3f76 100644
--- a/modules/yieldoneAnalyticsAdapter.js
+++ b/modules/yieldoneAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import { isArray, deepClone } from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
 import { targeting } from '../src/targeting.js';
diff --git a/modules/yuktamediaAnalyticsAdapter.js b/modules/yuktamediaAnalyticsAdapter.js
index 8ff22faa7f4..31c6daae7f6 100644
--- a/modules/yuktamediaAnalyticsAdapter.js
+++ b/modules/yuktamediaAnalyticsAdapter.js
@@ -1,6 +1,6 @@
 import {buildUrl, generateUUID, getWindowLocation, logError, logInfo, parseSizesInput, parseUrl} from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import {getStorageManager} from '../src/storageManager.js';
diff --git a/modules/zeta_global_sspAnalyticsAdapter.js b/modules/zeta_global_sspAnalyticsAdapter.js
index 906e6e19cc2..ee3bb9cd5d6 100644
--- a/modules/zeta_global_sspAnalyticsAdapter.js
+++ b/modules/zeta_global_sspAnalyticsAdapter.js
@@ -3,7 +3,7 @@ import { ajax } from '../src/ajax.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 
-import adapter from '../src/AnalyticsAdapter.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
 
 const ZETA_GVL_ID = 833;
 const ADAPTER_CODE = 'zeta_global_ssp';
diff --git a/package-lock.json b/package-lock.json
index a8d1b0f9097..0e221a988fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -99,6 +99,7 @@
         "webdriverio": "^7.6.1",
         "webpack": "^5.70.0",
         "webpack-bundle-analyzer": "^4.5.0",
+        "webpack-manifest-plugin": "^5.0.0",
         "webpack-stream": "^7.0.0",
         "yargs": "^1.3.1"
       },
@@ -20391,6 +20392,12 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
     "node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -22907,6 +22914,44 @@
         }
       }
     },
+    "node_modules/webpack-manifest-plugin": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-5.0.0.tgz",
+      "integrity": "sha512-8RQfMAdc5Uw3QbCQ/CBV/AXqOR8mt03B6GJmRbhWopE8GzRfEpn+k0ZuWywxW+5QZsffhmFDY1J6ohqJo+eMuw==",
+      "dev": true,
+      "dependencies": {
+        "tapable": "^2.0.0",
+        "webpack-sources": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.22.0"
+      },
+      "peerDependencies": {
+        "webpack": "^5.47.0"
+      }
+    },
+    "node_modules/webpack-manifest-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-manifest-plugin/node_modules/webpack-sources": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
+      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/webpack-merge": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
@@ -39479,6 +39524,12 @@
         "debug": "~4.3.1"
       }
     },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -41524,6 +41575,34 @@
         }
       }
     },
+    "webpack-manifest-plugin": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-5.0.0.tgz",
+      "integrity": "sha512-8RQfMAdc5Uw3QbCQ/CBV/AXqOR8mt03B6GJmRbhWopE8GzRfEpn+k0ZuWywxW+5QZsffhmFDY1J6ohqJo+eMuw==",
+      "dev": true,
+      "requires": {
+        "tapable": "^2.0.0",
+        "webpack-sources": "^2.2.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "webpack-sources": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
+          "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "^2.0.1",
+            "source-map": "^0.6.1"
+          }
+        }
+      }
+    },
     "webpack-merge": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
diff --git a/package.json b/package.json
index 91a41436d32..f3bbc12d2d5 100644
--- a/package.json
+++ b/package.json
@@ -108,6 +108,7 @@
     "webdriverio": "^7.6.1",
     "webpack": "^5.70.0",
     "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-manifest-plugin": "^5.0.0",
     "webpack-stream": "^7.0.0",
     "yargs": "^1.3.1"
   },
diff --git a/test/mocks/analyticsStub.js b/test/mocks/analyticsStub.js
index 1023db882e8..8507c5a6275 100644
--- a/test/mocks/analyticsStub.js
+++ b/test/mocks/analyticsStub.js
@@ -1,4 +1,4 @@
-import {_internal} from '../../src/AnalyticsAdapter.js';
+import {_internal} from '../../libraries/analyticsAdapter/AnalyticsAdapter.js';
 
 before(() => {
   // stub out analytics networking to avoid random events polluting the global xhr mock
diff --git a/test/spec/AnalyticsAdapter_spec.js b/test/spec/AnalyticsAdapter_spec.js
index cdd17ea89ad..06ab8838985 100644
--- a/test/spec/AnalyticsAdapter_spec.js
+++ b/test/spec/AnalyticsAdapter_spec.js
@@ -14,7 +14,7 @@ const AD_RENDER_SUCCEEDED = CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED;
 const AUCTION_DEBUG = CONSTANTS.EVENTS.AUCTION_DEBUG;
 const ADD_AD_UNITS = CONSTANTS.EVENTS.ADD_AD_UNITS;
 
-const AnalyticsAdapter = require('src/AnalyticsAdapter').default;
+const AnalyticsAdapter = require('libraries/analyticsAdapter/AnalyticsAdapter.js').default;
 const config = {
   url: 'https://localhost:9999/endpoint',
   analyticsType: 'endpoint'
diff --git a/webpack.conf.js b/webpack.conf.js
index deb8ad94e51..0ead550e446 100644
--- a/webpack.conf.js
+++ b/webpack.conf.js
@@ -5,10 +5,30 @@ var webpack = require('webpack');
 var helpers = require('./gulpHelpers.js');
 var { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 var argv = require('yargs').argv;
+const fs = require('fs');
 const babelConfig = require('./babelConfig.js')({disableFeatures: helpers.getDisabledFeatures(), prebidDistUrlBase: argv.distUrlBase});
+const {WebpackManifestPlugin} = require('webpack-manifest-plugin')
 
 var plugins = [
   new webpack.EnvironmentPlugin({'LiveConnectMode': null}),
+  new WebpackManifestPlugin({
+    fileName: 'dependencies.json',
+    generate: (seed, files) => {
+      const entries = new Set();
+      const addEntry = entries.add.bind(entries);
+
+      files.forEach(file => file.chunk && file.chunk._groups && file.chunk._groups.forEach(addEntry));
+
+      return Array.from(entries).reduce((acc, entry) => {
+        const name = (entry.options || {}).name || (entry.runtimeChunk || {}).name
+        const files = (entry.chunks || [])
+          .filter(chunk => chunk.name !== name)
+          .flatMap(chunk => [...chunk.files])
+          .filter(Boolean);
+        return name && files.length ? {...acc, [`${name}.js`]: files} : acc
+      }, seed)
+    }
+  })
 ];
 
 if (argv.analyze) {
@@ -44,16 +64,6 @@ module.exports = {
           dependOn: 'prebid-core'
         };
 
-        if (helpers.isLibrary(mod)) {
-          const libraryFiles = helpers.getLibraryFiles(mod);
-          moduleEntry.import = libraryFiles || moduleEntry.import;
-        }
-
-        const libraries = helpers.getParentLibraries(mod);
-        if (libraries.length) {
-          moduleEntry.dependOn = ['prebid-core'].concat(libraries);
-        }
-
         entry[mod] = moduleEntry;
       }
     });
@@ -97,7 +107,33 @@ module.exports = {
           module: true, // do not prepend every module with 'use strict'; allow mangling of top-level locals
         }
       })
-    ]
+    ],
+    splitChunks: {
+      chunks: 'initial',
+      minChunks: 1,
+      minSize: 0,
+      cacheGroups: (() => {
+        const libRoot = path.resolve(__dirname, 'libraries');
+        const libraries = Object.fromEntries(
+          fs.readdirSync(libRoot)
+            .filter((f) => fs.lstatSync(path.resolve(libRoot, f)).isDirectory())
+            .map(lib => {
+              const dir = path.resolve(libRoot, lib)
+              const def = {
+                name: lib,
+                test: (module) => {
+                  return module.resource && module.resource.startsWith(dir)
+                }
+              }
+              return [lib, def];
+            })
+        );
+        return Object.assign(libraries, {
+          default: false,
+          defaultVendors: false
+        })
+      })()
+    }
   },
   plugins
 };

From 301b07260123283af5c7378385550a77081f505a Mon Sep 17 00:00:00 2001
From: eknis <tem.eknis@gmail.com>
Date: Thu, 4 Aug 2022 13:18:00 +0900
Subject: [PATCH 101/569] Intimate Merger Universal Identifier System: add
 imppid (#8767)

* add imuidModule "imppid"

* update response

* fix test

* update spec

* add GAM ppid test for imppid
---
 modules/imuIdSystem.js                | 66 ++++++++++++++++-----------
 modules/imuIdSystem.md                |  1 +
 modules/userId/eids.js                |  5 ++
 test/spec/modules/eids_spec.js        | 32 +++++++++++++
 test/spec/modules/imuIdSystem_spec.js | 24 ++++++++--
 test/spec/modules/userId_spec.js      | 25 +++++++++-
 6 files changed, 121 insertions(+), 32 deletions(-)

diff --git a/modules/imuIdSystem.js b/modules/imuIdSystem.js
index 72e81d243a3..24b11dc1667 100644
--- a/modules/imuIdSystem.js
+++ b/modules/imuIdSystem.js
@@ -13,21 +13,12 @@ import { getStorageManager } from '../src/storageManager.js';
 export const storage = getStorageManager();
 
 export const storageKey = '__im_uid';
+export const storagePpKey = '__im_ppid';
 export const cookieKey = '_im_vid';
-export const apiUrl = 'https://audiencedata.im-apps.net/imuid/get';
+export const apiDomain = 'sync6.im-apps.net';
 const storageMaxAge = 1800000; // 30 minites (30 * 60 * 1000)
 const cookiesMaxAge = 97200000000; // 37 months ((365 * 3 + 30) * 24 * 60 * 60 * 1000)
 
-export function setImDataInLocalStorage(value) {
-  storage.setDataInLocalStorage(storageKey, value);
-  storage.setDataInLocalStorage(`${storageKey}_mt`, new Date(timestamp()).toUTCString());
-}
-
-export function removeImDataFromLocalStorage() {
-  storage.removeDataFromLocalStorage(storageKey);
-  storage.removeDataFromLocalStorage(`${storageKey}_mt`);
-}
-
 function setImDataInCookie(value) {
   storage.setCookie(
     cookieKey,
@@ -37,6 +28,12 @@ function setImDataInCookie(value) {
   );
 }
 
+export function removeImDataFromLocalStorage() {
+  storage.removeDataFromLocalStorage(storageKey);
+  storage.removeDataFromLocalStorage(`${storageKey}_mt`);
+  storage.removeDataFromLocalStorage(storagePpKey);
+}
+
 export function getLocalData() {
   const mt = storage.getDataFromLocalStorage(`${storageKey}_mt`);
   let expired = true;
@@ -45,17 +42,27 @@ export function getLocalData() {
   }
   return {
     id: storage.getDataFromLocalStorage(storageKey),
+    ppid: storage.getDataFromLocalStorage(storagePpKey),
     vid: storage.getCookie(cookieKey),
     expired: expired
   };
 }
 
+export function getApiUrl(cid, url) {
+  if (url) {
+    return `${url}?cid=${cid}`;
+  }
+  return `https://${apiDomain}/${cid}/pid`;
+}
+
 export function apiSuccessProcess(jsonResponse) {
   if (!jsonResponse) {
     return;
   }
-  if (jsonResponse.uid) {
-    setImDataInLocalStorage(jsonResponse.uid);
+  if (jsonResponse.uid && jsonResponse.ppid) {
+    storage.setDataInLocalStorage(storageKey, jsonResponse.uid);
+    storage.setDataInLocalStorage(`${storageKey}_mt`, new Date(timestamp()).toUTCString());
+    storage.setDataInLocalStorage(storagePpKey, jsonResponse.ppid);
     if (jsonResponse.vid) {
       setImDataInCookie(jsonResponse.vid);
     }
@@ -77,7 +84,11 @@ export function getApiCallback(callback) {
         }
       }
       if (callback && responseObj.uid) {
-        callback(responseObj.uid);
+        const callbackObj = {
+          imuid: responseObj.uid,
+          imppid: responseObj.ppid
+        };
+        callback(callbackObj);
       }
     },
     error: error => {
@@ -95,13 +106,6 @@ export function callImuidApi(apiUrl) {
   };
 }
 
-export function getApiUrl(cid, url) {
-  if (url) {
-    return `${url}?cid=${cid}`;
-  }
-  return `${apiUrl}?cid=${cid}`;
-}
-
 /** @type {Submodule} */
 export const imuIdSubmodule = {
   /**
@@ -112,18 +116,21 @@ export const imuIdSubmodule = {
   /**
    * decode the stored id value for passing to bid requests
    * @function
-   * @returns {{imuid: string} | undefined}
+   * @returns {{imuid: string, imppid: string} | undefined}
    */
-  decode(id) {
-    if (id && typeof id === 'string') {
-      return {imuid: id};
+  decode(ids) {
+    if (ids && typeof ids === 'object') {
+      return {
+        imuid: ids.imuid,
+        imppid: ids.imppid
+      };
     }
     return undefined;
   },
   /**
    * @function
    * @param {SubmoduleConfig} [config]
-   * @returns {{id: string} | undefined | {callback:function}}}
+   * @returns {{id:{imuid: string, imppid: string}} | undefined | {callback:function}}}
    */
   getId(config) {
     const configParams = (config && config.params) || {};
@@ -144,7 +151,12 @@ export const imuIdSubmodule = {
     if (localData.expired) {
       callImuidApi(apiUrl)();
     }
-    return {id: localData.id};
+    return {
+      id: {
+        imuid: localData.id,
+        imppid: localData.ppid
+      }
+    };
   }
 };
 
diff --git a/modules/imuIdSystem.md b/modules/imuIdSystem.md
index 81aa87ba1d4..cda7fa6528d 100644
--- a/modules/imuIdSystem.md
+++ b/modules/imuIdSystem.md
@@ -16,6 +16,7 @@ The following configuration parameters are available:
 ```javascript
 pbjs.setConfig({
   userSync: {
+    ppid: 'ppid.intimatemerger.com', // GAM Publisher Provided id support
     userIds: [{
       name: 'imuid',
       params: {
diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index 4c2e3a00107..e0f100ee660 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -277,6 +277,11 @@ export const USER_IDS_CONFIG = {
     atype: 3
   },
 
+  'imppid': {
+    source: 'ppid.intimatemerger.com',
+    atype: 1
+  },
+
   'imuid': {
     source: 'intimatemerger.com',
     atype: 1
diff --git a/test/spec/modules/eids_spec.js b/test/spec/modules/eids_spec.js
index e71058824a4..6872145710c 100644
--- a/test/spec/modules/eids_spec.js
+++ b/test/spec/modules/eids_spec.js
@@ -467,6 +467,38 @@ describe('eids array generation for known sub-modules', function() {
       }]);
     });
   });
+
+  describe('imuid', function() {
+    it('should return the correct EID schema with imuid', function() {
+      const userId = {
+        imuid: 'testimuid'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'intimatemerger.com',
+        uids: [{
+          id: 'testimuid',
+          atype: 1
+        }]
+      });
+    });
+
+    it('should return the correct EID schema with imppid', function() {
+      const userId = {
+        imppid: 'imppid-value-imppid-value-imppid-value'
+      };
+      const newEids = createEidsArray(userId);
+      expect(newEids.length).to.equal(1);
+      expect(newEids[0]).to.deep.equal({
+        source: 'ppid.intimatemerger.com',
+        uids: [{
+          id: 'imppid-value-imppid-value-imppid-value',
+          atype: 1
+        }]
+      });
+    });
+  });
 });
 
 describe('Negative case', function () {
diff --git a/test/spec/modules/imuIdSystem_spec.js b/test/spec/modules/imuIdSystem_spec.js
index 2934a7c213b..3650302a2ed 100644
--- a/test/spec/modules/imuIdSystem_spec.js
+++ b/test/spec/modules/imuIdSystem_spec.js
@@ -7,6 +7,7 @@ import {
   callImuidApi,
   getApiCallback,
   storageKey,
+  storagePpKey,
   cookieKey,
   apiUrl
 } from 'modules/imuIdSystem.js';
@@ -48,12 +49,17 @@ describe('imuId module', function () {
   describe('getId()', function () {
     it('should return the uid when it exists in local storages', function () {
       getLocalStorageStub.withArgs(storageKey).returns('testUid');
+      getLocalStorageStub.withArgs(storagePpKey).returns('testPpid');
       const id = imuIdSubmodule.getId(configParamTestCase);
-      expect(id).to.be.deep.equal({id: 'testUid'});
+      expect(id).to.be.deep.equal({id: {
+        imuid: 'testUid',
+        imppid: 'testPpid'
+      }});
     });
 
     storageTestCasesForEmpty.forEach(testCase => it('should return the callback when it not exists in local storages', function () {
       getLocalStorageStub.withArgs(storageKey).returns(testCase);
+      getLocalStorageStub.withArgs(storagePpKey).returns(testCase);
       const id = imuIdSubmodule.getId(configParamTestCase);
       expect(id).have.all.keys('callback');
     }));
@@ -73,7 +79,7 @@ describe('imuId module', function () {
   describe('getApiUrl()', function () {
     it('should return default url when cid only', function () {
       const url = getApiUrl(5126);
-      expect(url).to.be.equal(`${apiUrl}?cid=5126`);
+      expect(url).to.be.equal(`https://sync6.im-apps.net/5126/pid`);
     });
 
     it('should return param url when set url', function () {
@@ -84,8 +90,14 @@ describe('imuId module', function () {
 
   describe('decode()', function () {
     it('should return the uid when it exists in local storages', function () {
-      const id = imuIdSubmodule.decode('testDecode');
-      expect(id).to.be.deep.equal({imuid: 'testDecode'});
+      const id = imuIdSubmodule.decode({
+        imppid: 'imppid-value-imppid-value-imppid-value',
+        imuid: 'testDecodeImPpid'
+      });
+      expect(id).to.be.deep.equal({
+        imppid: 'imppid-value-imppid-value-imppid-value',
+        imuid: 'testDecodeImPpid'
+      });
     });
 
     it('should return the undefined when decode id is not "string"', function () {
@@ -97,11 +109,13 @@ describe('imuId module', function () {
   describe('getLocalData()', function () {
     it('always have the same key', function () {
       getLocalStorageStub.withArgs(storageKey).returns('testid');
+      getLocalStorageStub.withArgs(storagePpKey).returns('imppid-value-imppid-value-imppid-value');
       getCookieStub.withArgs(cookieKey).returns('testvid');
       getLocalStorageStub.withArgs(`${storageKey}_mt`).returns(new Date(utils.timestamp()).toUTCString());
       const localData = getLocalData();
       expect(localData).to.be.deep.equal({
         id: 'testid',
+        ppid: 'imppid-value-imppid-value-imppid-value',
         vid: 'testvid',
         expired: false
       });
@@ -112,6 +126,7 @@ describe('imuId module', function () {
       const localData = getLocalData();
       expect(localData).to.be.deep.equal({
         id: undefined,
+        ppid: undefined,
         vid: undefined,
         expired: true
       });
@@ -122,6 +137,7 @@ describe('imuId module', function () {
     it('should return the undefined when success response', function () {
       const res = apiSuccessProcess({
         uid: 'test',
+        ppid: 'imppid-value-imppid-value-imppid-value',
         vid: 'test'
       });
       expect(res).to.equal(undefined);
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 77ba1396afb..046b3ffd321 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -46,6 +46,7 @@ import {deepintentDpesSubmodule} from 'modules/deepintentDpesIdSystem.js';
 import {amxIdSubmodule} from '../../../modules/amxIdSystem.js';
 import {kinessoIdSubmodule} from 'modules/kinessoIdSystem.js';
 import {adqueryIdSubmodule} from 'modules/adqueryIdSystem.js';
+import {imuIdSubmodule} from 'modules/imuIdSystem.js';
 import * as mockGpt from '../integration/faker/googletag.js';
 import 'src/prebid.js';
 import {hook} from '../../../src/hook.js';
@@ -402,7 +403,7 @@ describe('User ID', function () {
     it('should set googletag ppid correctly', function () {
       let adUnits = [getAdUnitMock()];
       init(config);
-      setSubmoduleRegistry([amxIdSubmodule, sharedIdSystemSubmodule, identityLinkSubmodule]);
+      setSubmoduleRegistry([amxIdSubmodule, sharedIdSystemSubmodule, identityLinkSubmodule, imuIdSubmodule]);
 
       config.setConfig({
         userSync: {
@@ -411,6 +412,7 @@ describe('User ID', function () {
             { name: 'amxId', value: {'amxId': 'amx-id-value-amx-id-value-amx-id-value'} },
             { name: 'pubCommonId', value: {'pubcid': 'pubCommon-id-value-pubCommon-id-value'} },
             { name: 'identityLink', value: {'idl_env': 'identityLink-id-value-identityLink-id-value'} },
+            { name: 'imuid', value: {'imppid': 'imppid-value-imppid-value-imppid-value'} },
           ]
         }
       });
@@ -422,6 +424,27 @@ describe('User ID', function () {
       });
     });
 
+    it('should set googletag ppid correctly for imuIdSubmodule', function () {
+      let adUnits = [getAdUnitMock()];
+      init(config);
+      setSubmoduleRegistry([imuIdSubmodule]);
+
+      config.setConfig({
+        userSync: {
+          ppid: 'ppid.intimatemerger.com',
+          userIds: [
+            { name: 'imuid', value: {'imppid': 'imppid-value-imppid-value-imppid-value'} },
+          ]
+        }
+      });
+      // before ppid should not be set
+      expect(window.googletag._ppid).to.equal(undefined);
+      return expectImmediateBidHook(() => {}, {adUnits}).then(() => {
+        // ppid should have been set without dashes and stuff
+        expect(window.googletag._ppid).to.equal('imppidvalueimppidvalueimppidvalue');
+      });
+    });
+
     it('should log a warning if PPID too big or small', function () {
       let adUnits = [getAdUnitMock()];
 

From 8743babfdbe9f30740d8ee524f7fb8cdf000c3de Mon Sep 17 00:00:00 2001
From: Pgb-Criteo <92986445+Pgb-Criteo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:27:25 +0200
Subject: [PATCH 102/569] Criteo Bid Adapter: Add Coppa support (#8781)

* Criteo Bid Adapter: Add support of the COPPA flag

* Criteo Bid Adapter: Add support of the COPPA flag
---
 modules/criteoBidAdapter.js                |  6 +++++-
 test/spec/modules/criteoBidAdapter_spec.js | 25 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 82fe74c458e..be97a709421 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -175,7 +175,8 @@ export const spec = {
     Object.assign(bidderRequest, {
       publisherExt: fpd.site?.ext,
       userExt: fpd.user?.ext,
-      ceh: config.getConfig('criteo.ceh')
+      ceh: config.getConfig('criteo.ceh'),
+      coppa: config.getConfig('coppa')
     });
 
     // If publisher tag not already loaded try to get it from fast bid
@@ -446,6 +447,9 @@ function buildCdbRequest(context, bidRequests, bidderRequest) {
       url: context.url,
       ext: bidderRequest.publisherExt,
     },
+    regs: {
+      coppa: bidderRequest.coppa === true ? 1 : (bidderRequest.coppa === false ? 0 : undefined)
+    },
     slots: bidRequests.map(bidRequest => {
       networkId = bidRequest.params.networkId || networkId;
       schain = bidRequest.schain || schain;
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index 58f8e1ad871..ea29d43e4c0 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -1213,6 +1213,31 @@ describe('The Criteo bidding adapter', function () {
         }
       });
     });
+
+    it('should properly build a request when coppa flag is true', function () {
+      const bidRequests = [];
+      const bidderRequest = {};
+      config.setConfig({ coppa: true });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.regs.coppa).to.not.be.undefined;
+      expect(request.data.regs.coppa).to.equal(1);
+    });
+
+    it('should properly build a request when coppa flag is false', function () {
+      const bidRequests = [];
+      const bidderRequest = {};
+      config.setConfig({ coppa: false });
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.regs.coppa).to.not.be.undefined;
+      expect(request.data.regs.coppa).to.equal(0);
+    });
+
+    it('should properly build a request when coppa flag is not defined', function () {
+      const bidRequests = [];
+      const bidderRequest = {};
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.regs.coppa).to.be.undefined;
+    });
   });
 
   describe('interpretResponse', function () {

From c2036dbd9075e2eddd1ac0aeae64233e61bcd7fa Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Thu, 4 Aug 2022 05:28:45 -0700
Subject: [PATCH 103/569] ix Bid Adapter: fix LGTM trailing semi-colon (#8782)

---
 modules/ixBidAdapter.js | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 62ffba3d8dc..ce4fdcc2431 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -47,7 +47,7 @@ const PRICE_TO_DOLLAR_FACTOR = {
 };
 const IFRAME_USER_SYNC_URL = 'https://js-sec.indexww.com/um/ixmatch.html';
 const FLOOR_SOURCE = { PBJS: 'p', IX: 'x' };
-const IMG_USER_SYNC_URL = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid'
+const IMG_USER_SYNC_URL = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid';
 export const ERROR_CODES = {
   BID_SIZE_INVALID_FORMAT: 1,
   BID_SIZE_NOT_INCLUDED: 2,
@@ -309,7 +309,7 @@ function bidToNativeImp(bid) {
   const imp = bidToImp(bid);
   const nativeAdUnitRef = deepAccess(bid, 'mediaTypes.native');
 
-  const assets = []
+  const assets = [];
 
   // Convert all native assets to imp object
   for (const [adUnitProperty, adUnitValues] of Object.entries(nativeAdUnitRef)) {
@@ -350,7 +350,7 @@ function bidToNativeImp(bid) {
       methods: [1, 2]
     }],
     privacy: 1
-  }
+  };
 
   imp.native = {
     request: JSON.stringify(request),
@@ -536,9 +536,9 @@ function parseBid(rawBid, currency, bidRequest) {
   bid.creativeId = rawBid.hasOwnProperty('crid') ? rawBid.crid : '-';
 
   if (rawBid.mtype == MEDIA_TYPES.Video) {
-    bid.vastXml = rawBid.adm
+    bid.vastXml = rawBid.adm;
   } else if (rawBid.ext && rawBid.ext.vasturl) {
-    bid.vastUrl = rawBid.ext.vasturl
+    bid.vastUrl = rawBid.ext.vasturl;
   }
 
   let parsedAdm = null;
@@ -559,7 +559,7 @@ function parseBid(rawBid, currency, bidRequest) {
     bid.mediaTypes = bidRequest.mediaTypes;
     bid.ttl = isValidExpiry ? rawBid.exp : VIDEO_TIME_TO_LIVE;
   } else if (parsedAdm && parsedAdm.native) {
-    bid.native = interpretNativeAdm(parsedAdm.native)
+    bid.native = interpretNativeAdm(parsedAdm.native);
     bid.width = rawBid.w ? rawBid.w : 1;
     bid.height = rawBid.h ? rawBid.h : 1;
     bid.mediaType = NATIVE;
@@ -889,7 +889,7 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
   }
 
   if (tmax) {
-    r.ext.ixdiag.tmax = tmax
+    r.ext.ixdiag.tmax = tmax;
   }
 
   if (config.getConfig('userSync')) {
@@ -943,7 +943,7 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
         if (gdprConsent.hasOwnProperty('addtlConsent') && gdprConsent.addtlConsent) {
           r.user.ext.consented_providers_settings = {
             consented_providers: gdprConsent.addtlConsent
-          }
+          };
         }
       }
     }
@@ -1061,7 +1061,7 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     const divId = impressions[transactionIds[adUnitIndex]].divId;
 
     if (!gpid && dfpAdUnitCode && divId) {
-      gpid = `${dfpAdUnitCode}#${divId}`
+      gpid = `${dfpAdUnitCode}#${divId}`;
     }
     if (impressionObjects.length && BANNER in impressionObjects[0]) {
       const { id, banner: { topframe } } = impressionObjects[0];
@@ -1071,7 +1071,7 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
           topframe,
           format: impressionObjects.map(({ banner: { w, h }, ext }) => ({ w, h, ext }))
         },
-      }
+      };
 
       if (dfpAdUnitCode || gpid || tid) {
         _bannerImpression.ext = {};
@@ -1139,9 +1139,9 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     }
 
     // add identifiers info to ixDiag
-    const pbaAdSlot = impressions[transactionIds[adUnitIndex]].pbadslot
-    const tagId = impressions[transactionIds[adUnitIndex]].tagId
-    const adUnitCode = impressions[transactionIds[adUnitIndex]].adUnitCode
+    const pbaAdSlot = impressions[transactionIds[adUnitIndex]].pbadslot;
+    const tagId = impressions[transactionIds[adUnitIndex]].tagId;
+    const adUnitCode = impressions[transactionIds[adUnitIndex]].adUnitCode;
     if (pbaAdSlot || tagId || adUnitCode || divId) {
       const clonedRObject = deepClone(r);
       const requestSize = `${baseUrl}${parseQueryStringParameters({ ...payload, r: JSON.stringify(clonedRObject) })}`.length;
@@ -1203,7 +1203,7 @@ function _getUserIds(bidRequest) {
 function buildIXDiag(validBidRequests) {
   var adUnitMap = validBidRequests
     .map(bidRequest => bidRequest.transactionId)
-    .filter((value, index, arr) => arr.indexOf(value) === index)
+    .filter((value, index, arr) => arr.indexOf(value) === index);
 
   var ixdiag = {
     mfu: 0,
@@ -1355,7 +1355,7 @@ function createBannerImps(validBidRequest, missingBannerSizes, bannerImps) {
   // Create IX imps from params.size
   if (bannerSizeDefined) {
     if (!bannerImps[validBidRequest.transactionId].hasOwnProperty('ixImps')) {
-      bannerImps[validBidRequest.transactionId].ixImps = []
+      bannerImps[validBidRequest.transactionId].ixImps = [];
     }
     bannerImps[validBidRequest.transactionId].ixImps.push(imp);
   }

From 67cb83ca7121f5a03d41024822799389c5d878ee Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Thu, 4 Aug 2022 10:53:02 -0400
Subject: [PATCH 104/569] Various files: clean up unneeded code (#8778)

* Update example2.js

* Update example.js

* Update config.js

* Update freewheel-sspBidAdapter.js

* Update browsiRtdProvider.js

* Update consentManagementUsp.js

* Update synacormediaBidAdapter.js

* Update trustpidSystem.js

* Update tappxBidAdapter.js

* Update nobidBidAdapter.js

* Update visxBidAdapter.js

* Update remote.html

* Update prebidServer_example.html

* Update openxBidAdapter.js

* Update fintezaAnalyticsAdapter.js

* Update postbid-config.js

* Update postbid-config.js

* Update fintezaAnalyticsAdapter.js

* Update 1plusXRtdProviderExample.html

* Update prebidServer_example.html

* Update blueconicRtdProvider_example.html

* Update hadronRtdProvider_example.html

* Update airgridRtdProvider_example.html

* Update userId_example.html

* Update inskin_example.html

* Update serverbidServer_example.html

* Update postbid-config.js
---
 integrationExamples/gpt/1plusXRtdProviderExample.html  |  6 ++----
 .../gpt/airgridRtdProvider_example.html                |  5 +----
 integrationExamples/gpt/amp/remote.html                |  2 +-
 .../gpt/blueconicRtdProvider_example.html              |  6 ++----
 integrationExamples/gpt/hadronRtdProvider_example.html |  4 +---
 integrationExamples/gpt/inskin_example.html            |  4 +---
 integrationExamples/gpt/prebidServer_example.html      |  4 +---
 integrationExamples/gpt/serverbidServer_example.html   |  4 +---
 integrationExamples/gpt/userId_example.html            |  4 +---
 integrationExamples/postbid/oas/postbid-config.js      | 10 +++++-----
 .../analyticsAdapter/examples/libraries/example.js     |  4 ++--
 .../analyticsAdapter/examples/libraries/example2.js    |  4 ++--
 modules/browsiRtdProvider.js                           |  4 ++--
 modules/consentManagementUsp.js                        |  2 +-
 modules/fintezaAnalyticsAdapter.js                     |  2 +-
 modules/freewheel-sspBidAdapter.js                     |  2 +-
 modules/nobidBidAdapter.js                             |  2 +-
 modules/openxBidAdapter.js                             |  2 --
 modules/synacormediaBidAdapter.js                      |  2 +-
 modules/tappxBidAdapter.js                             |  4 ++--
 modules/trustpidSystem.js                              |  2 +-
 modules/visxBidAdapter.js                              |  2 +-
 src/config.js                                          |  2 +-
 23 files changed, 32 insertions(+), 51 deletions(-)

diff --git a/integrationExamples/gpt/1plusXRtdProviderExample.html b/integrationExamples/gpt/1plusXRtdProviderExample.html
index 2eb75063df1..b2c7a0037ff 100644
--- a/integrationExamples/gpt/1plusXRtdProviderExample.html
+++ b/integrationExamples/gpt/1plusXRtdProviderExample.html
@@ -82,9 +82,7 @@
       var gads = document.createElement('script');
       gads.async = true;
       gads.type = 'text/javascript';
-      var useSSL = 'https:' == document.location.protocol;
-      gads.src = (useSSL ? 'https:' : 'http:') +
-        '//securepubads.g.doubleclick.net/tag/js/gpt.js';
+      gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
       var node = document.getElementsByTagName('script')[0];
       node.parentNode.insertBefore(gads, node);
     })();
@@ -109,4 +107,4 @@ <h2>1plusX RTD Module for Prebid</h2>
   </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/integrationExamples/gpt/airgridRtdProvider_example.html b/integrationExamples/gpt/airgridRtdProvider_example.html
index a8fd989f682..657eae8f481 100644
--- a/integrationExamples/gpt/airgridRtdProvider_example.html
+++ b/integrationExamples/gpt/airgridRtdProvider_example.html
@@ -108,10 +108,7 @@
         var gads = document.createElement("script");
         gads.async = true;
         gads.type = "text/javascript";
-        var useSSL = "https:" == document.location.protocol;
-        gads.src =
-          (useSSL ? "https:" : "http:") +
-          "//www.googletagservices.com/tag/js/gpt.js";
+        gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
         var node = document.getElementsByTagName("script")[0];
         node.parentNode.insertBefore(gads, node);
       })();
diff --git a/integrationExamples/gpt/amp/remote.html b/integrationExamples/gpt/amp/remote.html
index 785d854766f..4ee2cdcb2f6 100644
--- a/integrationExamples/gpt/amp/remote.html
+++ b/integrationExamples/gpt/amp/remote.html
@@ -33,7 +33,7 @@
 
     // load Prebid.js
     (function () {
-        var d = document, pbs = d.createElement("script"), pro = d.location.protocal;
+        var d = document, pbs = d.createElement("script");
         pbs.type = "text/javascript";
         pbs.src = prebidSrc;
         var target = document.getElementsByTagName("head")[0];
diff --git a/integrationExamples/gpt/blueconicRtdProvider_example.html b/integrationExamples/gpt/blueconicRtdProvider_example.html
index e51a54b3be6..598a7569d8e 100644
--- a/integrationExamples/gpt/blueconicRtdProvider_example.html
+++ b/integrationExamples/gpt/blueconicRtdProvider_example.html
@@ -30,7 +30,7 @@
         var pbjs = pbjs || {};
         pbjs.que = pbjs.que || [];
     </script>
-    <script src="//cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js" async></script>
+    <script src="https://cdn.jsdelivr.net/npm/prebid.js@latest/dist/not-for-prod/prebid.js" async></script>
 
     <script>
         var googletag = googletag || {};
@@ -88,9 +88,7 @@
             var gads = document.createElement('script');
             gads.async = true;
             gads.type = 'text/javascript';
-            var useSSL = 'https:' == document.location.protocol;
-            gads.src = (useSSL ? 'https:' : 'http:') +
-                '//securepubads.g.doubleclick.net/tag/js/gpt.js';
+            gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
             var node = document.getElementsByTagName('script')[0];
             node.parentNode.insertBefore(gads, node);
         })();
diff --git a/integrationExamples/gpt/hadronRtdProvider_example.html b/integrationExamples/gpt/hadronRtdProvider_example.html
index 065c8379956..f90ce21921c 100644
--- a/integrationExamples/gpt/hadronRtdProvider_example.html
+++ b/integrationExamples/gpt/hadronRtdProvider_example.html
@@ -88,9 +88,7 @@
             var gads = document.createElement('script');
             gads.async = true;
             gads.type = 'text/javascript';
-            var useSSL = 'https:' == document.location.protocol;
-            gads.src = (useSSL ? 'https:' : 'http:') +
-                '//www.googletagservices.com/tag/js/gpt.js';
+            gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
             var node = document.getElementsByTagName('script')[0];
             node.parentNode.insertBefore(gads, node);
         })();
diff --git a/integrationExamples/gpt/inskin_example.html b/integrationExamples/gpt/inskin_example.html
index 197a5b1ffe1..45fd448cf48 100644
--- a/integrationExamples/gpt/inskin_example.html
+++ b/integrationExamples/gpt/inskin_example.html
@@ -72,9 +72,7 @@
           var gads = document.createElement('script');
           gads.async = true;
           gads.type = 'text/javascript';
-          var useSSL = 'https:' == document.location.protocol;
-          gads.src = (useSSL ? 'https:' : 'http:') +
-            '//www.googletagservices.com/tag/js/gpt.js';
+          gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
           var node = document.getElementsByTagName('script')[0];
           node.parentNode.insertBefore(gads, node);
         })();
diff --git a/integrationExamples/gpt/prebidServer_example.html b/integrationExamples/gpt/prebidServer_example.html
index 37902edd979..f23554369bc 100644
--- a/integrationExamples/gpt/prebidServer_example.html
+++ b/integrationExamples/gpt/prebidServer_example.html
@@ -12,9 +12,7 @@
           var gads = document.createElement('script');
           gads.async = true;
           gads.type = 'text/javascript';
-          var useSSL = 'https:' == document.location.protocol;
-          gads.src = (useSSL ? 'https:' : 'http:') +
-          '//www.googletagservices.com/tag/js/gpt.js';
+          gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
           var node = document.getElementsByTagName('script')[0];
           node.parentNode.insertBefore(gads, node);
         })();
diff --git a/integrationExamples/gpt/serverbidServer_example.html b/integrationExamples/gpt/serverbidServer_example.html
index 3d76e963663..1bd9b39d999 100644
--- a/integrationExamples/gpt/serverbidServer_example.html
+++ b/integrationExamples/gpt/serverbidServer_example.html
@@ -13,9 +13,7 @@
           var gads = document.createElement('script');
           gads.async = true;
           gads.type = 'text/javascript';
-          var useSSL = 'https:' == document.location.protocol;
-          gads.src = (useSSL ? 'https:' : 'http:') +
-          '//www.googletagservices.com/tag/js/gpt.js';
+          gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
           var node = document.getElementsByTagName('script')[0];
           node.parentNode.insertBefore(gads, node);
         })();
diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html
index 48b349649bc..5a6c80c4adf 100644
--- a/integrationExamples/gpt/userId_example.html
+++ b/integrationExamples/gpt/userId_example.html
@@ -296,9 +296,7 @@
       var gads = document.createElement('script');
       gads.async = true;
       gads.type = 'text/javascript';
-      var useSSL = 'https:' == document.location.protocol;
-      gads.src = (useSSL ? 'https:' : 'http:') +
-        '//www.googletagservices.com/tag/js/gpt.js';
+      gads.src = 'https://securepubads.g.doubleclick.net/tag/js/gpt.js';
       var node = document.getElementsByTagName('script')[0];
       node.parentNode.insertBefore(gads, node);
     })();
diff --git a/integrationExamples/postbid/oas/postbid-config.js b/integrationExamples/postbid/oas/postbid-config.js
index f251938bc9c..7b574185288 100644
--- a/integrationExamples/postbid/oas/postbid-config.js
+++ b/integrationExamples/postbid/oas/postbid-config.js
@@ -3,10 +3,10 @@ var pbjs = pbjs || {};
 pbjs.que = pbjs.que || [];
 
 (function() {
-    var pbjsEl = document.createElement("script"); pbjsEl.type = "text/javascript";
-    pbjsEl.async = true; var isHttps = 'https:' === document.location.protocol;
-    pbjsEl.src = (isHttps ? "https" : "http") + "://acdn.adnxs.com/prebid/not-for-prod/prebid.js";
-    var pbjsTargetEl = document.getElementsByTagName("head")[0];
+    var pbjsEl = document.createElement('script'); pbjsEl.type = 'text/javascript';
+    pbjsEl.async = true;
+    pbjsEl.src = 'https://acdn.adnxs.com/prebid/not-for-prod/prebid.js'
+    var pbjsTargetEl = document.getElementsByTagName('head')[0];
     pbjsTargetEl.insertBefore(pbjsEl, pbjsTargetEl.firstChild);
 })();
 
@@ -51,4 +51,4 @@ pbjs.que.push(function() {
     });
 });
 </script>
-<iframe id='postbid_if_3' FRAMEBORDER="0" SCROLLING="no" MARGINHEIGHT="0" MARGINWIDTH="0" TOPMARGIN="0" LEFTMARGIN="0" ALLOWTRANSPARENCY="true" WIDTH="0" HEIGHT="0"></iframe>
\ No newline at end of file
+<iframe id='postbid_if_3' FRAMEBORDER="0" SCROLLING="no" MARGINHEIGHT="0" MARGINWIDTH="0" TOPMARGIN="0" LEFTMARGIN="0" ALLOWTRANSPARENCY="true" WIDTH="0" HEIGHT="0"></iframe>
diff --git a/libraries/analyticsAdapter/examples/libraries/example.js b/libraries/analyticsAdapter/examples/libraries/example.js
index 0d758fd5513..f2bfd612193 100644
--- a/libraries/analyticsAdapter/examples/libraries/example.js
+++ b/libraries/analyticsAdapter/examples/libraries/example.js
@@ -31,8 +31,8 @@ events.init();
 // overwrite example object and handle 'on' callbacks
 window[window.ExampleAnalyticsGlobalObject] = example = utils.errorless(function() {
   if (arguments[0] && arguments[0] === 'on') {
-    var eventName = arguments[1] && arguments[1];
-    var args = arguments[2] && arguments[2];
+    var eventName = arguments[1];
+    var args = arguments[2];
     if (eventName && args) {
       if (eventName === 'bidAdjustment') {
         pbjsHandlers.onBidAdjustment.apply(this, [args]);
diff --git a/libraries/analyticsAdapter/examples/libraries/example2.js b/libraries/analyticsAdapter/examples/libraries/example2.js
index 68e814b1417..9a7106a48e0 100644
--- a/libraries/analyticsAdapter/examples/libraries/example2.js
+++ b/libraries/analyticsAdapter/examples/libraries/example2.js
@@ -31,8 +31,8 @@ events.init();
 // overwrite example object and handle 'on' callbacks
 window[window.ExampleAnalyticsGlobalObject2] = example = utils.errorless(function() {
   if (arguments[0] && arguments[0] === 'on') {
-    var eventName = arguments[1] && arguments[1];
-    var args = arguments[2] && arguments[2];
+    var eventName = arguments[1];
+    var args = arguments[2];
     if (eventName && args) {
       if (eventName === 'bidAdjustment') {
         pbjsHandlers.onBidAdjustment.apply(this, [args]);
diff --git a/modules/browsiRtdProvider.js b/modules/browsiRtdProvider.js
index 15f2d58010d..ffc946cbb33 100644
--- a/modules/browsiRtdProvider.js
+++ b/modules/browsiRtdProvider.js
@@ -93,7 +93,7 @@ export function collectData() {
 function waitForData(callback) {
   if (_browsiData) {
     _dataReadyCallback = null;
-    callback(_browsiData);
+    callback();
   } else {
     _dataReadyCallback = callback;
   }
@@ -102,7 +102,7 @@ function waitForData(callback) {
 export function setData(data) {
   _browsiData = data;
   if (isFn(_dataReadyCallback)) {
-    _dataReadyCallback(_browsiData);
+    _dataReadyCallback();
     _dataReadyCallback = null;
   }
 }
diff --git a/modules/consentManagementUsp.js b/modules/consentManagementUsp.js
index 0224d6ef2c0..cde32a2f1c0 100644
--- a/modules/consentManagementUsp.js
+++ b/modules/consentManagementUsp.js
@@ -44,7 +44,7 @@ function lookupUspConsent({onSuccess, onError}) {
     let uspapiFrame;
     let uspapiFunction;
 
-    while (!uspapiFrame) {
+    while (true) {
       try {
         if (typeof f.__uspapi === 'function') {
           uspapiFunction = f.__uspapi;
diff --git a/modules/fintezaAnalyticsAdapter.js b/modules/fintezaAnalyticsAdapter.js
index 7b1b2f69364..88c5f85f15d 100644
--- a/modules/fintezaAnalyticsAdapter.js
+++ b/modules/fintezaAnalyticsAdapter.js
@@ -181,7 +181,7 @@ function initSession() {
       !checkSessionByExpires() ||
       !checkSessionByReferer() ||
       !checkSessionByDay()) {
-    sessionId = '' + timestamp + getRandAsStr(SESSION_RAND_PART);
+    sessionId = '' + timestamp + getRandAsStr(SESSION_RAND_PART); // lgtm [js/insecure-randomness]
     begin = timestamp;
 
     isNew = true;
diff --git a/modules/freewheel-sspBidAdapter.js b/modules/freewheel-sspBidAdapter.js
index 91453fdcf5d..38973f915b6 100644
--- a/modules/freewheel-sspBidAdapter.js
+++ b/modules/freewheel-sspBidAdapter.js
@@ -189,7 +189,7 @@ function formatAdHTML(bid, size) {
   var libUrl = '';
   if (integrationType && integrationType !== 'inbanner') {
     libUrl = PRIMETIME_URL + getComponentId(bid.params.format) + '.min.js';
-    script = getOutstreamScript(bid, size);
+    script = getOutstreamScript(bid);
   } else {
     libUrl = MUSTANG_URL;
     script = getInBannerScript(bid, size);
diff --git a/modules/nobidBidAdapter.js b/modules/nobidBidAdapter.js
index cfe18301b32..877afb08293 100644
--- a/modules/nobidBidAdapter.js
+++ b/modules/nobidBidAdapter.js
@@ -30,7 +30,7 @@ function nobidBuildRequests(bids, bidderRequest) {
   var serializeState = function(divIds, siteId, adunits) {
     var filterAdUnitsByIds = function(divIds, adUnits) {
       var filtered = [];
-      if (!divIds || !divIds.length) {
+      if (!divIds.length) {
         filtered = adUnits;
       } else if (adUnits) {
         var a = [];
diff --git a/modules/openxBidAdapter.js b/modules/openxBidAdapter.js
index 7bea38a2de3..251e6fb50e3 100644
--- a/modules/openxBidAdapter.js
+++ b/modules/openxBidAdapter.js
@@ -213,13 +213,11 @@ function getViewportDimensions(isIfr) {
     } catch (e) {
       return;
     }
-    docEl = tDoc.documentElement;
     body = tDoc.body;
 
     width = tWin.innerWidth || docEl.clientWidth || body.clientWidth;
     height = tWin.innerHeight || docEl.clientHeight || body.clientHeight;
   } else {
-    docEl = tDoc.documentElement;
     width = tWin.innerWidth || docEl.clientWidth;
     height = tWin.innerHeight || docEl.clientHeight;
   }
diff --git a/modules/synacormediaBidAdapter.js b/modules/synacormediaBidAdapter.js
index a48c1aaf55b..845d6b4b5fb 100644
--- a/modules/synacormediaBidAdapter.js
+++ b/modules/synacormediaBidAdapter.js
@@ -101,7 +101,7 @@ export const spec = {
     });
 
     // CCPA
-    if (bidderRequest && bidderRequest.uspConsent) {
+    if (bidderRequest.uspConsent) {
       deepSetValue(openRtbBidRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
     }
 
diff --git a/modules/tappxBidAdapter.js b/modules/tappxBidAdapter.js
index fd038f3104e..b8f7a5559f8 100644
--- a/modules/tappxBidAdapter.js
+++ b/modules/tappxBidAdapter.js
@@ -406,9 +406,9 @@ function buildOneRequest(validBidRequests, bidderRequest) {
         (typeof uuid !== 'undefined' && uuid !== null) &&
         (typeof uuid.source == 'string' && uuid.source !== null) &&
         (typeof uuid.uids[0].id == 'string' && uuid.uids[0].id !== null)
-    )
+    );
 
-    if (typeof user !== 'undefined') { user.ext.eids = eidsArr }
+    user.ext.eids = eidsArr;
   };
 
   let regs = {};
diff --git a/modules/trustpidSystem.js b/modules/trustpidSystem.js
index 27ca4bf6340..fc2bab19913 100644
--- a/modules/trustpidSystem.js
+++ b/modules/trustpidSystem.js
@@ -84,7 +84,7 @@ function getTrustpidFromStorage() {
   logInfo(`${LOG_PREFIX}: Domain acronym found: ${acronym}`);
 
   // Domain is correct in both local storage and idGraph, but no acronym is existing for the domain
-  if (domain && !acronym) {
+  if (!acronym) {
     return {
       trustpid: null,
       acr: null
diff --git a/modules/visxBidAdapter.js b/modules/visxBidAdapter.js
index cec48a83c35..ee4d9708f15 100644
--- a/modules/visxBidAdapter.js
+++ b/modules/visxBidAdapter.js
@@ -375,7 +375,7 @@ function _isAdSlotExists(adUnitCode) {
   }
 
   const gptAdSlot = getGptSlotInfoForAdUnitCode(adUnitCode);
-  if (gptAdSlot && gptAdSlot.divId && document.getElementById(gptAdSlot.divId)) {
+  if (gptAdSlot.divId && document.getElementById(gptAdSlot.divId)) {
     return true;
   }
 
diff --git a/src/config.js b/src/config.js
index a50edc09221..30ab8f35e2c 100644
--- a/src/config.js
+++ b/src/config.js
@@ -526,7 +526,7 @@ export function newConfig() {
     }
 
     const mergedConfig = Object.keys(obj).reduce((accum, key) => {
-      const prevConf = _getConfig(key)[key] || {};
+      const prevConf = _getConfig()[key] || {};
       accum[key] = mergeDeep(prevConf, obj[key]);
       return accum;
     }, {});

From 35b49996f057a962f2705205e432d2e238827f69 Mon Sep 17 00:00:00 2001
From: pm-azhar-mulla <75726247+pm-azhar-mulla@users.noreply.github.com>
Date: Thu, 4 Aug 2022 20:33:03 +0530
Subject: [PATCH 105/569] Prebid Core: Handled edge cases for
 allowedAlternateBidderCodes functionality (#8760)

* Changed net revenue to True

* handled edge cases

* Empty alternateBidderCodes will reject the bids

Co-authored-by: Azhar <azhar@L1119.local>
---
 src/adapters/bidderFactory.js             |  1 +
 test/spec/unit/core/bidderFactory_spec.js | 29 +++++++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
index e798c63d753..03103dbdcdd 100644
--- a/src/adapters/bidderFactory.js
+++ b/src/adapters/bidderFactory.js
@@ -260,6 +260,7 @@ export function newBidder(spec) {
     let allowAlternateBidderCodes = bidderSettings.get(requestBidder, 'allowAlternateBidderCodes') || false;
     let alternateBiddersList = bidderSettings.get(requestBidder, 'allowedAlternateBidderCodes');
     if (!!responseBidder && !!requestBidder && requestBidder !== responseBidder) {
+      alternateBiddersList = isArray(alternateBiddersList) ? alternateBiddersList.map(val => val.trim().toLowerCase()).filter(val => !!val).filter(uniques) : alternateBiddersList;
       if (!allowAlternateBidderCodes || (isArray(alternateBiddersList) && (alternateBiddersList[0] !== '*' && !alternateBiddersList.includes(responseBidder)))) {
         return true;
       }
diff --git a/test/spec/unit/core/bidderFactory_spec.js b/test/spec/unit/core/bidderFactory_spec.js
index c040bba4eec..93cb7bd4449 100644
--- a/test/spec/unit/core/bidderFactory_spec.js
+++ b/test/spec/unit/core/bidderFactory_spec.js
@@ -1050,8 +1050,8 @@ describe('validate bid response: ', function () {
       bids1 = Object.assign({},
         bids[0],
         {
-          bidderCode: 'validAlternateBidder',
-          adapterCode: 'knownAdapter1'
+          bidderCode: 'validalternatebidder',
+          adapterCode: 'knownadapter1'
         }
       );
       logWarnSpy = sinon.spy(utils, 'logWarn');
@@ -1126,6 +1126,31 @@ describe('validate bid response: ', function () {
       expect(logErrorSpy.callCount).to.equal(0);
     });
 
+    it('should accept the bid, when allowedAlternateBidderCodes is marked as * (with space) and allowAlternateBidderCodes flag is true', function () {
+      bidderSettingStub.withArgs(CODE, 'allowAlternateBidderCodes').returns(true);
+      bidderSettingStub.withArgs(CODE, 'allowedAlternateBidderCodes').returns([' * ']);
+
+      const bidder = newBidder(spec);
+      spec.interpretResponse.returns(bids1);
+      bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(addBidResponseStub.calledOnce).to.equal(true);
+      expect(logWarnSpy.callCount).to.equal(0);
+      expect(logErrorSpy.callCount).to.equal(0);
+    });
+
+    it('should not accept the bid, when allowedAlternateBidderCodes is marked as empty array and allowAlternateBidderCodes flag is true', function () {
+      bidderSettingStub.withArgs(CODE, 'allowAlternateBidderCodes').returns(true);
+      bidderSettingStub.withArgs(CODE, 'allowedAlternateBidderCodes').returns([]);
+
+      const bidder = newBidder(spec);
+      spec.interpretResponse.returns(bids1);
+      bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+      expect(addBidResponseStub.calledOnce).to.equal(false);
+      expect(logWarnSpy.callCount).to.equal(1);
+    });
+
     it('should accept the bid, when allowedAlternateBidderCodes contains bidder name and allowAlternateBidderCodes flag is true', function () {
       bidderSettingStub.withArgs(CODE, 'allowAlternateBidderCodes').returns(true);
       bidderSettingStub.withArgs(CODE, 'allowedAlternateBidderCodes').returns(['validAlternateBidder']);

From cdb290c501d626d9020e2c0d5ce03b1edc4785bd Mon Sep 17 00:00:00 2001
From: dzhang-criteo <87757739+dzhang-criteo@users.noreply.github.com>
Date: Thu, 4 Aug 2022 19:47:23 +0200
Subject: [PATCH 106/569] Criteo Adapter: remove bid.adId (#8783)

---
 modules/criteoBidAdapter.js                |  3 +-
 test/spec/modules/criteoBidAdapter_spec.js | 37 ----------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index be97a709421..590062c76bd 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -1,4 +1,4 @@
-import { deepAccess, getUniqueIdentifierStr, isArray, logError, logInfo, logWarn, parseUrl } from '../src/utils.js';
+import { deepAccess, isArray, logError, logInfo, logWarn, parseUrl } from '../src/utils.js';
 import { loadExternalScript } from '../src/adloader.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
@@ -235,7 +235,6 @@ export const spec = {
         const bidId = bidRequest.bidId;
         const bid = {
           requestId: bidId,
-          adId: slot.bidId || getUniqueIdentifierStr(),
           cpm: slot.cpm,
           currency: slot.currency,
           netRevenue: true,
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index ea29d43e4c0..19e97ea85bb 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -1310,7 +1310,6 @@ describe('The Criteo bidding adapter', function () {
       const bids = spec.interpretResponse(response, request);
       expect(bids).to.have.lengthOf(1);
       expect(bids[0].requestId).to.equal('test-bidId');
-      expect(bids[0].adId).to.equal('abc123');
       expect(bids[0].cpm).to.equal(1.23);
       expect(bids[0].ad).to.equal('test-ad');
       expect(bids[0].width).to.equal(728);
@@ -1344,7 +1343,6 @@ describe('The Criteo bidding adapter', function () {
       const bids = spec.interpretResponse(response, request);
       expect(bids).to.have.lengthOf(1);
       expect(bids[0].requestId).to.equal('test-bidId');
-      expect(bids[0].adId).to.equal('abc123');
       expect(bids[0].cpm).to.equal(1.23);
       expect(bids[0].vastUrl).to.equal('http://test-ad');
       expect(bids[0].mediaType).to.equal(VIDEO);
@@ -1401,7 +1399,6 @@ describe('The Criteo bidding adapter', function () {
       const bids = spec.interpretResponse(response, request);
       expect(bids).to.have.lengthOf(1);
       expect(bids[0].requestId).to.equal('test-bidId');
-      expect(bids[0].adId).to.equal('abc123');
       expect(bids[0].cpm).to.equal(1.23);
       expect(bids[0].mediaType).to.equal(NATIVE);
     });
@@ -1520,40 +1517,6 @@ describe('The Criteo bidding adapter', function () {
       expect(bids[0].height).to.equal(90);
     });
 
-    it('should generate unique adIds if none are returned by the endpoint', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            cpm: 1.23,
-            creative: 'test-ad',
-            width: 300,
-            height: 250,
-          }, {
-            impid: 'test-requestId',
-            cpm: 4.56,
-            creative: 'test-ad',
-            width: 728,
-            height: 90,
-          }],
-        },
-      };
-      const request = {
-        bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
-          sizes: [[300, 250], [728, 90]],
-          params: {
-            networkId: 456,
-          }
-        }]
-      };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(2);
-      const prebidBids = bids.map(bid => Object.assign(createBid(CONSTANTS.STATUS.GOOD, request.bidRequests[0]), bid));
-      expect(prebidBids[0].adId).to.not.equal(prebidBids[1].adId);
-    });
-
     [{
       hasBidResponseLevelPafData: true,
       hasBidResponseBidLevelPafData: true,

From a93a7c98adf1a3037c759069e817d8916ae60497 Mon Sep 17 00:00:00 2001
From: kapil-tuptewar <91458408+kapil-tuptewar@users.noreply.github.com>
Date: Fri, 5 Aug 2022 16:32:23 +0530
Subject: [PATCH 107/569] Sending device.language in iso standard 2 characters
 (#8789)

Co-authored-by: Kapil Tuptewar <kapiltuptewar@L1290.local>
---
 modules/pubmaticBidAdapter.js                | 3 +++
 test/spec/modules/pubmaticBidAdapter_spec.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index 9ab5984860b..42c05f765bc 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -1112,6 +1112,9 @@ export const spec = {
       payload.device = Object.assign(payload.device, config.getConfig('device'));
     }
 
+    // update device.language to ISO-639-1-alpha-2 (2 character language)
+    payload.device.language = payload.device.language && payload.device.language.split('-')[0];
+
     // passing transactionId in source.tid
     deepSetValue(payload, 'source.tid', conf.transactionId);
 
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
index e8bedc851c7..6e65e725024 100644
--- a/test/spec/modules/pubmaticBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -1141,7 +1141,7 @@ describe('PubMatic adapter', function () {
         expect(data.device.dnt).to.equal((navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0);
         expect(data.device.h).to.equal(screen.height);
         expect(data.device.w).to.equal(screen.width);
-        expect(data.device.language).to.equal(navigator.language);
+        expect(data.device.language).to.equal(navigator.language.split('-')[0]);
         expect(data.device.newkey).to.equal('new-device-data');// additional data from config
         sandbox.restore();
       });

From 81a9e50cc2c666630b372363d795f39b241dd9b5 Mon Sep 17 00:00:00 2001
From: Snigel <108489367+snigelweb@users.noreply.github.com>
Date: Fri, 5 Aug 2022 16:04:41 +0200
Subject: [PATCH 108/569] Snigel Bid Adapter: initial adapter release (#8723)

* add snigel prebid adapter, docs and tests

* fix small oversight

* improve user sync behavior

* implement PR feedback, add support for schain, floors and user IDs
---
 modules/snigelBidAdapter.js                | 150 +++++++++++
 modules/snigelBidAdapter.md                |  46 ++++
 test/spec/modules/snigelBidAdapter_spec.js | 296 +++++++++++++++++++++
 3 files changed, 492 insertions(+)
 create mode 100644 modules/snigelBidAdapter.js
 create mode 100644 modules/snigelBidAdapter.md
 create mode 100644 test/spec/modules/snigelBidAdapter_spec.js

diff --git a/modules/snigelBidAdapter.js b/modules/snigelBidAdapter.js
new file mode 100644
index 00000000000..e0ec10c6ed6
--- /dev/null
+++ b/modules/snigelBidAdapter.js
@@ -0,0 +1,150 @@
+import {config} from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import {deepAccess, isArray, isFn, isPlainObject} from '../src/utils.js';
+import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+
+const BIDDER_CODE = 'snigel';
+const GVLID = 1076;
+const DEFAULT_URL = 'https://adserv.snigelweb.com/bp/v1/prebid';
+const DEFAULT_TTL = 60;
+const DEFAULT_CURRENCIES = ['USD'];
+const FLOOR_MATCH_ALL_SIZES = '*';
+
+const getConfig = config.getConfig;
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bidRequest) {
+    return !!bidRequest.params.placement;
+  },
+
+  buildRequests: function (bidRequests, bidderRequest) {
+    const gdprApplies = deepAccess(bidderRequest, 'gdprConsent.gdprApplies');
+    return {
+      method: 'POST',
+      url: getEndpoint(),
+      data: JSON.stringify({
+        id: bidderRequest.bidderRequestId,
+        cur: getCurrencies(),
+        test: getTestFlag(),
+        devw: window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth,
+        devh: window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight,
+        version: $$PREBID_GLOBAL$$.version,
+        gdprApplies: gdprApplies,
+        gdprConsentString: gdprApplies === true ? deepAccess(bidderRequest, 'gdprConsent.consentString') : undefined,
+        gdprConsentProv: gdprApplies === true ? deepAccess(bidderRequest, 'gdprConsent.addtlConsent') : undefined,
+        uspConsent: deepAccess(bidderRequest, 'uspConsent'),
+        coppa: getConfig('coppa'),
+        eids: deepAccess(bidRequests, '0.userIdAsEids'),
+        schain: deepAccess(bidRequests, '0.schain'),
+        page: getPage(bidderRequest),
+        placements: bidRequests.map((r) => {
+          return {
+            uuid: r.bidId,
+            name: r.params.placement,
+            sizes: r.sizes,
+            floor: getPriceFloor(r, BANNER, FLOOR_MATCH_ALL_SIZES),
+          };
+        }),
+      }),
+      bidderRequest,
+    };
+  },
+
+  interpretResponse: function (serverResponse) {
+    if (!serverResponse.body || !serverResponse.body.bids) {
+      return [];
+    }
+
+    return serverResponse.body.bids.map((bid) => {
+      return {
+        requestId: bid.uuid,
+        cpm: bid.price,
+        creativeId: bid.crid,
+        currency: serverResponse.body.cur,
+        width: bid.width,
+        height: bid.height,
+        ad: bid.ad,
+        netRevenue: true,
+        ttl: bid.ttl || DEFAULT_TTL,
+        meta: bid.meta,
+      };
+    });
+  },
+
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
+    const syncUrl = getSyncUrl(responses || []);
+    if (syncUrl && syncOptions.iframeEnabled && hasSyncConsent(gdprConsent, uspConsent)) {
+      return [{type: 'iframe', url: getSyncEndpoint(syncUrl, gdprConsent)}];
+    }
+  },
+};
+
+registerBidder(spec);
+
+function getPage(bidderRequest) {
+  return (
+    getConfig(`${BIDDER_CODE}.page`) || deepAccess(bidderRequest, 'refererInfo.canonicalUrl') || window.location.href
+  );
+}
+
+function getEndpoint() {
+  return getConfig(`${BIDDER_CODE}.url`) || DEFAULT_URL;
+}
+
+function getTestFlag() {
+  return getConfig(`${BIDDER_CODE}.test`) === true;
+}
+
+function getCurrencies() {
+  const currencyOverrides = getConfig(`${BIDDER_CODE}.cur`);
+  if (currencyOverrides !== undefined && (!isArray(currencyOverrides) || currencyOverrides.length === 0)) {
+    throw Error('Currency override must be an array with at least one currency');
+  }
+  return currencyOverrides || DEFAULT_CURRENCIES;
+}
+
+function getFloorCurrency() {
+  return getConfig(`${BIDDER_CODE}.floorCur`) || getCurrencies()[0];
+}
+
+function getPriceFloor(bidRequest, mediaType, size) {
+  if (isFn(bidRequest.getFloor)) {
+    const cur = getFloorCurrency();
+    const floorInfo = bidRequest.getFloor({
+      currency: cur,
+      mediaType: mediaType,
+      size: size,
+    });
+    if (isPlainObject(floorInfo) && !isNaN(floorInfo.floor)) {
+      return {
+        cur: floorInfo.currency || cur,
+        value: floorInfo.floor,
+      };
+    }
+  }
+}
+
+function hasSyncConsent(gdprConsent, uspConsent) {
+  if (gdprConsent?.gdprApplies && !hasPurpose1Consent(gdprConsent)) {
+    return false;
+  } else if (uspConsent && uspConsent[1] === 'Y' && uspConsent[2] === 'Y') {
+    return false;
+  } else {
+    return true;
+  }
+}
+
+function getSyncUrl(responses) {
+  return getConfig(`${BIDDER_CODE}.syncUrl`) || deepAccess(responses[0], 'body.syncUrl');
+}
+
+function getSyncEndpoint(url, gdprConsent) {
+  return `${url}?gdpr=${gdprConsent?.gdprApplies ? 1 : 0}&gdpr_consent=${encodeURIComponent(
+    gdprConsent?.consentString || ''
+  )}`;
+}
diff --git a/modules/snigelBidAdapter.md b/modules/snigelBidAdapter.md
new file mode 100644
index 00000000000..a83e133144f
--- /dev/null
+++ b/modules/snigelBidAdapter.md
@@ -0,0 +1,46 @@
+# Overview
+
+- Module name: Snigel Bid Adapter
+- Module type: Bidder Adapter
+- Maintainer: devops@snigel.com
+- Bidder code: snigel
+- Supported media types: Banner
+
+# Description
+
+Connects to Snigel demand sources for bids.
+
+**Note:** This bid adapter requires our ad operation experts to create an optimized setup for the desired placements on your property.
+Please reach out to us [through our contact form](https://snigel.com/get-in-touch). We will reply as soon as possible.
+
+# Parameters
+
+| Name | Required | Description | Example |
+| :--- | :-------- | :---------- | :------ |
+| placement | Yes | Placement identifier | top_leaderboard |
+
+# Test
+
+```js
+var adUnits = [
+  {
+    code: "example",
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [970, 90],
+          [728, 90],
+        ],
+      },
+    },
+    bids: [
+      {
+        bidder: "snigel",
+        params: {
+          placement: "prebid_test_placement",
+        },
+      },
+    ],
+  },
+];
+```
diff --git a/test/spec/modules/snigelBidAdapter_spec.js b/test/spec/modules/snigelBidAdapter_spec.js
new file mode 100644
index 00000000000..3fc09493f03
--- /dev/null
+++ b/test/spec/modules/snigelBidAdapter_spec.js
@@ -0,0 +1,296 @@
+import {expect} from 'chai';
+import {spec} from 'modules/snigelBidAdapter.js';
+import {config} from 'src/config.js';
+import {isValid} from 'src/adapters/bidderFactory.js';
+
+const BASE_BID_REQUEST = {
+  adUnitCode: 'top_leaderboard',
+  bidId: 'bid_test',
+  sizes: [
+    [970, 90],
+    [728, 90],
+  ],
+  bidder: 'snigel',
+  params: {},
+  requestId: 'req_test',
+  transactionId: 'trans_test',
+};
+const makeBidRequest = function (overrides) {
+  return {...BASE_BID_REQUEST, ...overrides};
+};
+
+const BASE_BIDDER_REQUEST = {
+  bidderRequestId: 'test',
+  refererInfo: {
+    canonicalUrl: 'https://localhost',
+  },
+};
+const makeBidderRequest = function (overrides) {
+  return {...BASE_BIDDER_REQUEST, ...overrides};
+};
+
+const DUMMY_USP_CONSENT = '1YYN';
+const DUMMY_GDPR_CONSENT_STRING =
+  'BOSSotLOSSotLAPABAENBc-AAAAgR7_______9______9uz_Gv_v_f__33e8__9v_l_7_-___u_-33d4-_1vX99yfm1-7ftr3tp_86ues2_XqK_9oIiA';
+
+describe('snigelBidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    it('should return false if no placement provided', function () {
+      expect(spec.isBidRequestValid(BASE_BID_REQUEST)).to.equal(false);
+    });
+
+    it('should return true if placement provided', function () {
+      const bidRequest = makeBidRequest({params: {placement: 'top_leaderboard'}});
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    afterEach(function () {
+      config.resetConfig();
+    });
+
+    it('should build a single request for every impression and its placement', function () {
+      const bidderRequest = Object.assign({}, BASE_BIDDER_REQUEST);
+      const bidRequests = [
+        makeBidRequest({bidId: 'a', params: {placement: 'top_leaderboard'}}),
+        makeBidRequest({bidId: 'b', params: {placement: 'bottom_leaderboard'}}),
+      ];
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request).to.be.an('object');
+      expect(request).to.have.property('url').and.to.equal('https://adserv.snigelweb.com/bp/v1/prebid');
+      expect(request).to.have.property('method').and.to.equal('POST');
+
+      expect(request).to.have.property('data');
+      const data = JSON.parse(request.data);
+      expect(data).to.have.property('id').and.to.equal('test');
+      expect(data).to.have.property('cur').and.to.deep.equal(['USD']);
+      expect(data).to.have.property('test').and.to.equal(false);
+      expect(data).to.have.property('page').and.to.equal('https://localhost');
+      expect(data).to.have.property('placements');
+      expect(data.placements.length).to.equal(2);
+      expect(data.placements[0].uuid).to.equal('a');
+      expect(data.placements[0].name).to.equal('top_leaderboard');
+      expect(data.placements[1].uuid).to.equal('b');
+      expect(data.placements[1].name).to.equal('bottom_leaderboard');
+    });
+
+    it('should forward GDPR flag and GDPR consent string if enabled', function () {
+      const bidderRequest = makeBidderRequest({
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: DUMMY_GDPR_CONSENT_STRING,
+        },
+      });
+
+      const request = spec.buildRequests([], bidderRequest);
+      expect(request).to.have.property('data');
+      const data = JSON.parse(request.data);
+      expect(data).to.have.property('gdprApplies').and.to.equal(true);
+      expect(data).to.have.property('gdprConsentString').and.to.equal(DUMMY_GDPR_CONSENT_STRING);
+    });
+
+    it('should forward GDPR flag and no GDPR consent string if disabled', function () {
+      const bidderRequest = makeBidderRequest({
+        gdprConsent: {
+          gdprApplies: false,
+          consentString: DUMMY_GDPR_CONSENT_STRING,
+        },
+      });
+
+      const request = spec.buildRequests([], bidderRequest);
+      expect(request).to.have.property('data');
+      const data = JSON.parse(request.data);
+      expect(data).to.have.property('gdprApplies').and.to.equal(false);
+      expect(data).to.not.have.property('gdprConsentString');
+    });
+
+    it('should forward USP consent if set', function () {
+      const bidderRequest = makeBidderRequest({
+        uspConsent: DUMMY_USP_CONSENT,
+      });
+
+      const request = spec.buildRequests([], bidderRequest);
+      expect(request).to.have.property('data');
+      const data = JSON.parse(request.data);
+      expect(data).to.have.property('uspConsent').and.to.equal(DUMMY_USP_CONSENT);
+    });
+
+    it('should forward whether or not COPPA applies', function () {
+      config.setConfig({
+        'coppa': true,
+      });
+
+      const request = spec.buildRequests([], BASE_BIDDER_REQUEST);
+      expect(request).to.have.property('data');
+      const data = JSON.parse(request.data);
+      expect(data).to.have.property('coppa').and.to.equal(true);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should not return any bids if the request failed', function () {
+      expect(spec.interpretResponse({}, {})).to.be.empty;
+      expect(spec.interpretResponse({body: 'Some error message'}, {})).to.be.empty;
+    });
+
+    it('should not return any bids if the request did not return any bids either', function () {
+      expect(spec.interpretResponse({body: {bids: []}})).to.be.empty;
+    });
+
+    it('should return valid bids with additional meta information', function () {
+      const serverResponse = {
+        body: {
+          id: BASE_BIDDER_REQUEST.bidderRequestId,
+          cur: 'USD',
+          bids: [
+            {
+              uuid: BASE_BID_REQUEST.bidId,
+              price: 0.0575,
+              ad: '<html><body><h1>Test Ad</h1></body></html>',
+              width: 728,
+              height: 90,
+              crid: 'test',
+              meta: {
+                advertiserDomains: ['addomain.com'],
+              },
+            },
+          ],
+        },
+      };
+
+      const bids = spec.interpretResponse(serverResponse, {});
+      expect(bids.length).to.equal(1);
+      const bid = bids[0];
+      expect(isValid(BASE_BID_REQUEST.adUnitCode, bid)).to.be.true;
+      expect(bid).to.have.property('meta');
+      expect(bid.meta).to.have.property('advertiserDomains');
+      expect(bid.meta.advertiserDomains).to.be.an('array');
+      expect(bid.meta.advertiserDomains.length).to.equal(1);
+      expect(bid.meta.advertiserDomains[0]).to.equal('addomain.com');
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should not return any user syncs if sync url does not exist in response', function () {
+      const response = {
+        body: {
+          id: BASE_BIDDER_REQUEST.bidderRequestId,
+          cur: 'USD',
+          bids: [],
+        },
+      };
+      const syncOptions = {
+        iframeEnabled: true,
+      };
+      const gdprConsent = {
+        gdprApplies: false,
+      };
+
+      const syncs = spec.getUserSyncs(syncOptions, [response], gdprConsent);
+      expect(syncs).to.be.undefined;
+    });
+
+    it('should not return any user syncs if publisher disabled iframe-based sync', function () {
+      const response = {
+        body: {
+          id: BASE_BIDDER_REQUEST.bidderRequestId,
+          cur: 'USD',
+          syncUrl: 'https://somesyncurl',
+          bids: [],
+        },
+      };
+      const syncOptions = {
+        iframeEnabled: false,
+      };
+      const gdprConsent = {
+        gdprApplies: false,
+      };
+
+      const syncs = spec.getUserSyncs(syncOptions, [response], gdprConsent);
+      expect(syncs).to.be.undefined;
+    });
+
+    it('should not return any user syncs if GDPR applies and the user did not consent to purpose one', function () {
+      const response = {
+        body: {
+          id: BASE_BIDDER_REQUEST.bidderRequestId,
+          cur: 'USD',
+          syncUrl: 'https://somesyncurl',
+          bids: [],
+        },
+      };
+      const syncOptions = {
+        iframeEnabled: true,
+      };
+      const gdprConsent = {
+        gdprApplies: true,
+        vendorData: {
+          purpose: {
+            consents: {1: false},
+          },
+        },
+      };
+
+      const syncs = spec.getUserSyncs(syncOptions, [response], gdprConsent);
+      expect(syncs).to.be.undefined;
+    });
+
+    it("should return an iframe specific to the publisher's property if all conditions are met", function () {
+      const response = {
+        body: {
+          id: BASE_BIDDER_REQUEST.bidderRequestId,
+          cur: 'USD',
+          syncUrl: 'https://somesyncurl',
+          bids: [],
+        },
+      };
+      const syncOptions = {
+        iframeEnabled: true,
+      };
+      const gdprConsent = {
+        gdprApplies: false,
+      };
+
+      const syncs = spec.getUserSyncs(syncOptions, [response], gdprConsent);
+      expect(syncs).to.be.an('array').and.of.length(1);
+      const sync = syncs[0];
+      expect(sync).to.have.property('type');
+      expect(sync.type).to.equal('iframe');
+      expect(sync).to.have.property('url');
+      expect(sync.url).to.equal('https://somesyncurl?gdpr=0&gdpr_consent=');
+    });
+
+    it('should pass GDPR applicability and consent string as query parameters', function () {
+      const response = {
+        body: {
+          id: BASE_BIDDER_REQUEST.bidderRequestId,
+          cur: 'USD',
+          syncUrl: 'https://somesyncurl',
+          bids: [],
+        },
+      };
+      const syncOptions = {
+        iframeEnabled: true,
+      };
+      const gdprConsent = {
+        gdprApplies: true,
+        consentString: DUMMY_GDPR_CONSENT_STRING,
+        vendorData: {
+          purpose: {
+            consents: {1: true},
+          },
+        },
+      };
+
+      const syncs = spec.getUserSyncs(syncOptions, [response], gdprConsent);
+      expect(syncs).to.be.an('array').and.of.length(1);
+      const sync = syncs[0];
+      expect(sync).to.have.property('type');
+      expect(sync.type).to.equal('iframe');
+      expect(sync).to.have.property('url');
+      expect(sync.url).to.equal(`https://somesyncurl?gdpr=1&gdpr_consent=${DUMMY_GDPR_CONSENT_STRING}`);
+    });
+  });
+});

From dd3267dcbef849ea9ddb509967f95711e9f585d0 Mon Sep 17 00:00:00 2001
From: Brian Schmidt <brian.schmidt@openx.com>
Date: Sun, 7 Aug 2022 07:59:29 -0700
Subject: [PATCH 109/569] openxOrtb support 204 response, small bug fix (#8796)

---
 modules/openxOrtbBidAdapter.js                |  6 +++-
 test/spec/modules/openxOrtbBidAdapter_spec.js | 33 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/modules/openxOrtbBidAdapter.js b/modules/openxOrtbBidAdapter.js
index a7a8d53a624..bbe0e827b8e 100644
--- a/modules/openxOrtbBidAdapter.js
+++ b/modules/openxOrtbBidAdapter.js
@@ -252,6 +252,10 @@ function getFloor(bid, mediaType) {
 }
 
 function interpretResponse(resp, req) {
+  if (!resp.body) {
+    resp.body = {nbr: 0};
+  }
+
   // pass these from request to the responses for use in userSync
   if (req.data.ext) {
     if (req.data.ext.delDomain) {
@@ -301,7 +305,7 @@ function interpretResponse(resp, req) {
       }
 
       if (respBody.ext && respBody.ext.paf) {
-        response.meta.paf = respBody.ext.paf;
+        response.meta.paf = Object.assign({}, respBody.ext.paf);
         response.meta.paf.content_id = utils.deepAccess(bid, 'ext.paf.content_id');
       }
 
diff --git a/test/spec/modules/openxOrtbBidAdapter_spec.js b/test/spec/modules/openxOrtbBidAdapter_spec.js
index b3f63d9c23a..3fe9b627d04 100644
--- a/test/spec/modules/openxOrtbBidAdapter_spec.js
+++ b/test/spec/modules/openxOrtbBidAdapter_spec.js
@@ -952,7 +952,7 @@ describe('OpenxRtbAdapter', function () {
     let bidResponse;
     let bid;
 
-    context('when there is no response', function () {
+    context('when there is an nbr response', function () {
       let bids;
       beforeEach(function () {
         bidRequestConfigs = [{
@@ -983,6 +983,37 @@ describe('OpenxRtbAdapter', function () {
       });
     });
 
+    context('when there is no response', function () {
+      let bids;
+      beforeEach(function () {
+        bidRequestConfigs = [{
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain'
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]],
+            },
+          },
+          bidId: 'test-bid-id',
+          bidderRequestId: 'test-bidder-request-id',
+          auctionId: 'test-auction-id'
+        }];
+
+        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
+
+        bidResponse = ''; // Unknown error
+        bids = spec.interpretResponse({body: bidResponse}, bidRequest);
+      });
+
+      it('should not return any bids', function () {
+        expect(bids.length).to.equal(0);
+      });
+    });
+
     context('when there is a response, the common response properties', function () {
       beforeEach(function () {
         bidRequestConfigs = [{

From d7e7aa142598887a3b74a5e458f3dbaa290ef7a2 Mon Sep 17 00:00:00 2001
From: Alexey Stoletny <alexey.stoletny@me.com>
Date: Mon, 8 Aug 2022 09:05:49 -0500
Subject: [PATCH 110/569] CleanIO RTD Module: support billable event (#8750)

* clean.io RTD Module: send billable events

* Added unit test for billable events

* attempt to trigger circleci

* Fixed some analytics test to expect Clean.io billableEvents too.

Co-authored-by: mkikot-sigma <mykyta.kikot@sigma.software>
Co-authored-by: Patrick McCann <patmmccann@gmail.com>
Co-authored-by: eugen-tikhonov <31205179+eugen-tikhonov@users.noreply.github.com>
Co-authored-by: yevhen.tykhonov <yevhen.tykhonov@gmail.com>
---
 modules/cleanioRtdProvider.js                 | 29 +++++++++++++++++++
 test/spec/modules/cleanioRtdProvider_spec.js  | 23 +++++++++++++++
 .../modules/concertAnalyticsAdapter_spec.js   |  3 +-
 .../modules/eplanningAnalyticsAdapter_spec.js |  4 +--
 .../modules/fintezaAnalyticsAdapter_spec.js   |  3 +-
 .../modules/invisiblyAnalyticsAdapter_spec.js | 11 +++++--
 .../modules/konduitAnalyticsAdapter_spec.js   |  3 +-
 .../modules/optimonAnalyticsAdapter_spec.js   |  3 +-
 .../modules/pianoDmpAnalyticsAdapter_spec.js  |  4 +++
 .../prebidmanagerAnalyticsAdapter_spec.js     |  3 +-
 .../modules/pubperfAnalyticsAdapter_spec.js   |  3 +-
 .../modules/pubstackAnalyticsAdapter_spec.js  |  3 +-
 .../modules/pubwiseAnalyticsAdapter_spec.js   |  6 ++--
 .../modules/sigmoidAnalyticsAdapter_spec.js   |  2 +-
 .../modules/sovrnAnalyticsAdapter_spec.js     |  3 +-
 .../modules/yieldoneAnalyticsAdapter_spec.js  |  6 +++-
 16 files changed, 91 insertions(+), 18 deletions(-)

diff --git a/modules/cleanioRtdProvider.js b/modules/cleanioRtdProvider.js
index b9fdcef768e..a6ac3fc1317 100644
--- a/modules/cleanioRtdProvider.js
+++ b/modules/cleanioRtdProvider.js
@@ -8,6 +8,8 @@
 
 import { submodule } from '../src/hook.js';
 import { logError, generateUUID, insertElement } from '../src/utils.js';
+import * as events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
 
 // ============================ MODULE STATE ===============================
 
@@ -147,6 +149,26 @@ function readConfig(config) {
   }
 }
 
+/**
+ * The function to be called upon module init
+ * Defined as a variable to be able to reset it naturally
+ */
+let startBillableEvents = function() {
+  // Upon clean.io submodule initialization, every winner bid is considered to be protected
+  // and therefore, subjected to billing
+  events.on(CONSTANTS.EVENTS.BID_WON, winnerBidResponse => {
+    events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+      vendor: 'clean.io',
+      billingId: generateUUID(),
+      type: 'impression',
+      // TODO: if absolutely crucial, winnerBidResponse may be used
+      // to track down auctionId and transactionId
+      // However, those seem to be of importance for Demand Managers,
+      // while these billable events are for publishers
+    });
+  });
+}
+
 // ============================ MODULE REGISTRATION ===============================
 
 /**
@@ -160,6 +182,13 @@ function beforeInit() {
       try {
         readConfig(config);
         onModuleInit();
+
+        // Subscribing once to ensure no duplicate events
+        // in case module initialization code runs multiple times
+        // This should have been a part of submodule definition, but well...
+        // The assumption here is that in production init() will be called exactly once
+        startBillableEvents();
+        startBillableEvents = () => {};
         return true;
       } catch (err) {
         if (err instanceof ConfigError) {
diff --git a/test/spec/modules/cleanioRtdProvider_spec.js b/test/spec/modules/cleanioRtdProvider_spec.js
index 47c4b1b4961..8453b633906 100644
--- a/test/spec/modules/cleanioRtdProvider_spec.js
+++ b/test/spec/modules/cleanioRtdProvider_spec.js
@@ -1,5 +1,7 @@
 import * as utils from '../../../src/utils.js';
 import * as hook from '../../../src/hook.js'
+import * as events from '../../../src/events.js';
+import CONSTANTS from '../../../src/constants.json';
 
 import { __TEST__ } from '../../../modules/cleanioRtdProvider.js';
 
@@ -184,5 +186,26 @@ describe('clean.io RTD module', function () {
       onBidResponseEvent(fakeBidResponse3, {}, {});
       ensurePrependToBidResponse(fakeBidResponse3);
     });
+
+    it('should send billable event per bid won event', function () {
+      const { init } = getModule();
+      expect(init({ params: { cdnUrl: 'https://abc1234567890.cloudfront.net/script.js', protectionMode: 'full' } }, {})).to.equal(true);
+
+      const eventCounter = { registerCleanioBillingEvent: function() {} };
+      sinon.spy(eventCounter, 'registerCleanioBillingEvent');
+
+      events.on(CONSTANTS.EVENTS.BILLABLE_EVENT, (evt) => {
+        if (evt.vendor === 'clean.io') {
+          eventCounter.registerCleanioBillingEvent()
+        }
+      });
+
+      events.emit(CONSTANTS.EVENTS.BID_WON, {});
+      events.emit(CONSTANTS.EVENTS.BID_WON, {});
+      events.emit(CONSTANTS.EVENTS.BID_WON, {});
+      events.emit(CONSTANTS.EVENTS.BID_WON, {});
+
+      sinon.assert.callCount(eventCounter.registerCleanioBillingEvent, 4);
+    });
   });
 });
diff --git a/test/spec/modules/concertAnalyticsAdapter_spec.js b/test/spec/modules/concertAnalyticsAdapter_spec.js
index b0aad2f3156..d130aea6043 100644
--- a/test/spec/modules/concertAnalyticsAdapter_spec.js
+++ b/test/spec/modules/concertAnalyticsAdapter_spec.js
@@ -48,7 +48,8 @@ describe('ConcertAnalyticsAdapter', function() {
       sandbox.spy(concertAnalytics, 'track');
 
       fireBidEvents(events);
-      sandbox.assert.callCount(concertAnalytics.track, 5);
+      // 5 Concert events + 1 Clean.io event
+      sandbox.assert.callCount(concertAnalytics.track, 6);
     });
 
     it('should report data for BID_RESPONSE, BID_WON events', function() {
diff --git a/test/spec/modules/eplanningAnalyticsAdapter_spec.js b/test/spec/modules/eplanningAnalyticsAdapter_spec.js
index 872518f2f27..bb9e6c4fb86 100644
--- a/test/spec/modules/eplanningAnalyticsAdapter_spec.js
+++ b/test/spec/modules/eplanningAnalyticsAdapter_spec.js
@@ -153,8 +153,8 @@ describe('eplanning analytics adapter', function () {
       // Step 10 check that the host to send the ajax request is configurable via options
       expect(eplAnalyticsAdapter.context.host).to.equal(initOptions.host);
 
-      // Step 11 verify that we received 6 events
-      sinon.assert.callCount(eplAnalyticsAdapter.track, 6);
+      // Step 11 verify that we received 7 events (6 E-Planning events + 1 Clean.io event)
+      sinon.assert.callCount(eplAnalyticsAdapter.track, 7);
     });
   });
 });
diff --git a/test/spec/modules/fintezaAnalyticsAdapter_spec.js b/test/spec/modules/fintezaAnalyticsAdapter_spec.js
index 76f77505105..cddffc63554 100644
--- a/test/spec/modules/fintezaAnalyticsAdapter_spec.js
+++ b/test/spec/modules/fintezaAnalyticsAdapter_spec.js
@@ -189,7 +189,8 @@ describe('finteza analytics adapter', function () {
         expect(url.search.value).to.equal(String(cpm));
         expect(url.search.unit).to.equal('usd');
 
-        sinon.assert.callCount(fntzAnalyticsAdapter.track, 1);
+        // 1 Finteza event + 1 Clean.io event
+        sinon.assert.callCount(fntzAnalyticsAdapter.track, 2);
       });
     });
 
diff --git a/test/spec/modules/invisiblyAnalyticsAdapter_spec.js b/test/spec/modules/invisiblyAnalyticsAdapter_spec.js
index e13b16661b0..d97b0925713 100644
--- a/test/spec/modules/invisiblyAnalyticsAdapter_spec.js
+++ b/test/spec/modules/invisiblyAnalyticsAdapter_spec.js
@@ -202,7 +202,9 @@ describe('Invisibly Analytics Adapter test suite', function () {
           events.emit(constants.EVENTS.BID_REQUESTED, MOCK.BID_REQUESTED);
           events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE);
           events.emit(constants.EVENTS.BID_WON, MOCK.BID_WON);
-          sinon.assert.callCount(invisiblyAdapter.track, 5);
+
+          // 5 Invisibly events + 1 Clean.io event
+          sinon.assert.callCount(invisiblyAdapter.track, 6);
         });
 
         it('should not catch events triggered without invisibly account config', function () {
@@ -380,7 +382,9 @@ describe('Invisibly Analytics Adapter test suite', function () {
         expect(invisiblyEvents.event_data.pageViewId).to.exist;
         expect(invisiblyEvents.event_data.ver).to.equal(1);
         expect(invisiblyEvents.event_type).to.equal('PREBID_bidWon');
-        sinon.assert.callCount(invisiblyAdapter.track, 1);
+
+        // 1 Invisibly event + 1 Clean.io event
+        sinon.assert.callCount(invisiblyAdapter.track, 2);
       });
 
       // spec for bidder done event
@@ -551,7 +555,8 @@ describe('Invisibly Analytics Adapter test suite', function () {
         events.emit(constants.EVENTS.ADD_AD_UNITS, MOCK.ADD_AD_UNITS);
         events.emit(constants.EVENTS.AD_RENDER_FAILED, MOCK.AD_RENDER_FAILED);
 
-        sinon.assert.callCount(invisiblyAdapter.track, 13);
+        // 13 Invisibly events + 1 Clean.io event
+        sinon.assert.callCount(invisiblyAdapter.track, 14);
       });
     });
 
diff --git a/test/spec/modules/konduitAnalyticsAdapter_spec.js b/test/spec/modules/konduitAnalyticsAdapter_spec.js
index ac557d27f90..1612138cde4 100644
--- a/test/spec/modules/konduitAnalyticsAdapter_spec.js
+++ b/test/spec/modules/konduitAnalyticsAdapter_spec.js
@@ -121,6 +121,7 @@ describe(`Konduit Analytics Adapter`, () => {
     expect(requestBody.konduitId).to.be.equal(konduitId);
     expect(requestBody.prebidVersion).to.be.equal('$prebid.version$');
     expect(requestBody.environment).to.be.an('object');
-    sinon.assert.callCount(konduitAnalyticsAdapter.track, 6);
+    // 6 Konduit events + 1 Clean.io event
+    sinon.assert.callCount(konduitAnalyticsAdapter.track, 7);
   });
 });
diff --git a/test/spec/modules/optimonAnalyticsAdapter_spec.js b/test/spec/modules/optimonAnalyticsAdapter_spec.js
index c50bfcb170f..406e9cb75c4 100644
--- a/test/spec/modules/optimonAnalyticsAdapter_spec.js
+++ b/test/spec/modules/optimonAnalyticsAdapter_spec.js
@@ -35,6 +35,7 @@ describe('Optimon Analytics Adapter', () => {
     events.emit(constants.EVENTS.BID_TIMEOUT, optmn_arguments)
     events.emit(constants.EVENTS.BID_WON, optmn_arguments)
 
-    expect(optmn_queue.length).to.eql(3);
+    // 3 Optimon events + 1 Clean.io event
+    expect(optmn_queue.length).to.eql(4);
   });
 });
diff --git a/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js b/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js
index 240e90c3c32..49b048f1fe6 100644
--- a/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js
@@ -52,6 +52,10 @@ describe('Piano DMP Analytics Adapter', () => {
 
       // Then
       const callQueue = (window.cX || {}).callQueue;
+      const billableEventIndex = callQueue.findIndex(([, params]) => params.eventType === constants.EVENTS.BILLABLE_EVENT);
+      if (billableEventIndex > -1) {
+        callQueue.splice(billableEventIndex, 1);
+      }
 
       expect(callQueue).to.be.an('array');
       expect(callQueue.length).to.equal(testEvents.length);
diff --git a/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js b/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
index e504eced868..2e1bf4df062 100644
--- a/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
+++ b/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
@@ -102,7 +102,8 @@ describe('Prebid Manager Analytics Adapter', function () {
       events.emit(constants.EVENTS.AUCTION_END, {});
       events.emit(constants.EVENTS.BID_TIMEOUT, {});
 
-      sinon.assert.callCount(prebidmanagerAnalytics.track, 6);
+      // 6 Prebid Manager events + 1 Clean.io event
+      sinon.assert.callCount(prebidmanagerAnalytics.track, 7);
     });
   });
 
diff --git a/test/spec/modules/pubperfAnalyticsAdapter_spec.js b/test/spec/modules/pubperfAnalyticsAdapter_spec.js
index b316b44617a..160529125d3 100644
--- a/test/spec/modules/pubperfAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubperfAnalyticsAdapter_spec.js
@@ -49,7 +49,8 @@ describe('Pubperf Analytics Adapter', function() {
       events.emit(constants.EVENTS.AUCTION_END, {});
       events.emit(constants.EVENTS.BID_TIMEOUT, {});
 
-      sinon.assert.callCount(pubperfAnalytics.track, 6);
+      // 6 Pubperf events + 1 Clean.io event
+      sinon.assert.callCount(pubperfAnalytics.track, 7);
     });
   });
 });
diff --git a/test/spec/modules/pubstackAnalyticsAdapter_spec.js b/test/spec/modules/pubstackAnalyticsAdapter_spec.js
index 4df25f1665b..3d01a0bb506 100644
--- a/test/spec/modules/pubstackAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubstackAnalyticsAdapter_spec.js
@@ -33,6 +33,7 @@ describe('Pubstack Analytics Adapter', () => {
     events.emit(constants.EVENTS.NO_BID, args)
 
     // Then
-    expect(queue.length).to.eql(6);
+    // 6 Pubstack events + 1 Clean.io event
+    expect(queue.length).to.eql(7);
   });
 });
diff --git a/test/spec/modules/pubwiseAnalyticsAdapter_spec.js b/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
index 3be4ea3d69c..dd5c223b767 100644
--- a/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
@@ -71,10 +71,10 @@ describe('PubWise Prebid Analytics', function () {
       events.emit(constants.EVENTS.AUCTION_END, {});
 
       // eslint-disable-next-line
-      //console.log(requests);   
+      //console.log(requests);
 
       /* testing for 6 calls, including the 2 we're not currently tracking */
-      sandbox.assert.callCount(pubwiseAnalytics.track, 7);
+      sandbox.assert.callCount(pubwiseAnalytics.track, 8);
     });
 
     it('should initialize the auction properly', function () {
@@ -92,7 +92,7 @@ describe('PubWise Prebid Analytics', function () {
       let request = requests[0];
       let data = JSON.parse(request.requestBody);
       // eslint-disable-next-line
-      // console.log(data.metaData);            
+      // console.log(data.metaData);
       expect(data.metaData, 'metaData property').to.exist;
       expect(data.metaData.pbjs_version, 'pbjs version').to.equal('$prebid.version$')
       expect(data.metaData.session_id, 'session id').not.to.be.empty
diff --git a/test/spec/modules/sigmoidAnalyticsAdapter_spec.js b/test/spec/modules/sigmoidAnalyticsAdapter_spec.js
index 854c3a8e22d..6d772de02eb 100644
--- a/test/spec/modules/sigmoidAnalyticsAdapter_spec.js
+++ b/test/spec/modules/sigmoidAnalyticsAdapter_spec.js
@@ -38,7 +38,7 @@ describe('sigmoid Prebid Analytic', function () {
       events.emit(constants.EVENTS.BID_RESPONSE, {});
       events.emit(constants.EVENTS.BID_WON, {});
 
-      sinon.assert.callCount(sigmoidAnalytic.track, 7);
+      sinon.assert.callCount(sigmoidAnalytic.track, 8);
     });
   });
   describe('build utm tag data', function () {
diff --git a/test/spec/modules/sovrnAnalyticsAdapter_spec.js b/test/spec/modules/sovrnAnalyticsAdapter_spec.js
index d6795331417..8284bb54e9b 100644
--- a/test/spec/modules/sovrnAnalyticsAdapter_spec.js
+++ b/test/spec/modules/sovrnAnalyticsAdapter_spec.js
@@ -202,7 +202,8 @@ describe('Sovrn Analytics Adapter', function () {
       events.emit(constants.EVENTS.BID_RESPONSE, {});
       events.emit(constants.EVENTS.BID_WON, {});
 
-      sinon.assert.callCount(sovrnAnalyticsAdapter.track, 5);
+      // 5 SovrnAnalytics events + 1 Clean.io event
+      sinon.assert.callCount(sovrnAnalyticsAdapter.track, 6);
     });
 
     it('should catch no events if no affiliate id', function () {
diff --git a/test/spec/modules/yieldoneAnalyticsAdapter_spec.js b/test/spec/modules/yieldoneAnalyticsAdapter_spec.js
index f77bc7bc7ba..f55577913a5 100644
--- a/test/spec/modules/yieldoneAnalyticsAdapter_spec.js
+++ b/test/spec/modules/yieldoneAnalyticsAdapter_spec.js
@@ -269,7 +269,11 @@ describe('Yieldone Prebid Analytic', function () {
       setTimeout(function() {
         events.emit(constants.EVENTS.BID_WON, winner);
 
-        sinon.assert.callCount(sendStatStub, 2);
+        sinon.assert.callCount(sendStatStub, 2)
+        const billableEventIndex = yieldoneAnalytics.eventsStorage[auctionId].events.findIndex(event => event.eventType === constants.EVENTS.BILLABLE_EVENT);
+        if (billableEventIndex > -1) {
+          yieldoneAnalytics.eventsStorage[auctionId].events.splice(billableEventIndex, 1);
+        }
         expect(yieldoneAnalytics.eventsStorage[auctionId]).to.deep.equal(wonExpectedResult);
 
         delete yieldoneAnalytics.eventsStorage[auctionId];

From 2afac1ed2a531a72fc206358bcad38a51d9788ad Mon Sep 17 00:00:00 2001
From: Abdullah Al Mamun Oronno <mr.oronno@gmail.com>
Date: Mon, 8 Aug 2022 19:10:11 -0400
Subject: [PATCH 111/569] Fix broken download link (#8800)

Download link https://prebid.org/download.html no longer valid. Updated with current link https://docs.prebid.org/download.html
---
 RELEASE_SCHEDULE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_SCHEDULE.md b/RELEASE_SCHEDULE.md
index b68495ed4ae..45f4e6c7dc5 100644
--- a/RELEASE_SCHEDULE.md
+++ b/RELEASE_SCHEDULE.md
@@ -12,7 +12,7 @@
 We aim to push a new release of Prebid.js every week on Tuesday.
 
 While the releases will be available immediately for those using direct Git access,
-it will be about a week before the Prebid Org [Download Page](http://prebid.org/download.html) will be updated.
+it will be about a week before the Prebid Org [Download Page](https://docs.prebid.org/download.html) will be updated.
 
 You can determine what is in a given build using the [releases page](https://github.com/prebid/Prebid.js/releases)
 

From 9d8112a0e395bd37d3baa3482dad7da7bffec221 Mon Sep 17 00:00:00 2001
From: pm-azhar-mulla <75726247+pm-azhar-mulla@users.noreply.github.com>
Date: Tue, 9 Aug 2022 04:43:08 +0530
Subject: [PATCH 112/569] PubMatic Bid Adapter: Sending
 allowedAlternateBidderCodes data to AdServer (#8790)

* Changed net revenue to True

* Added bidderCode and adapterCode to bidObject

* setting seat as default adapterCode

* removed bidderCode

* Added unit test cases

* cloned the test object

* send alternateBidderCodes to adserver

* handled blank and duplicate entries

* added test cases

* Handled case for empty biddersArray

Co-authored-by: Azhar <azhar@L1119.local>
---
 modules/pubmaticBidAdapter.js                | 21 ++++++--
 test/spec/modules/pubmaticBidAdapter_spec.js | 57 ++++++++++++++++++++
 2 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index 42c05f765bc..bdc8010618c 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -1,4 +1,4 @@
-import { logWarn, _each, isBoolean, isStr, isArray, inIframe, mergeDeep, deepAccess, isNumber, deepSetValue, logInfo, logError, deepClone, convertTypes } from '../src/utils.js';
+import { logWarn, _each, isBoolean, isStr, isArray, inIframe, mergeDeep, deepAccess, isNumber, deepSetValue, logInfo, logError, deepClone, convertTypes, uniques } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO, NATIVE } from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
@@ -177,6 +177,8 @@ let publisherId = 0;
 let isInvalidNativeRequest = false;
 let NATIVE_ASSET_ID_TO_KEY_MAP = {};
 let NATIVE_ASSET_KEY_TO_ASSET_MAP = {};
+let biddersList = ['pubmatic'];
+const allBiddersList = ['all'];
 
 // loading NATIVE_ASSET_ID_TO_KEY_MAP
 _each(NATIVE_ASSETS, anAsset => { NATIVE_ASSET_ID_TO_KEY_MAP[anAsset.ID] = anAsset.KEY });
@@ -1089,10 +1091,21 @@ export const spec = {
     payload.ext.wrapper.wv = $$REPO_AND_VERSION$$;
     payload.ext.wrapper.transactionId = conf.transactionId;
     payload.ext.wrapper.wp = 'pbjs';
-    if (bidderRequest && bidderRequest.bidderCode) {
-      payload.ext.allowAlternateBidderCodes = bidderSettings.get(bidderRequest.bidderCode, 'allowAlternateBidderCodes');
-      payload.ext.allowedAlternateBidderCodes = bidderSettings.get(bidderRequest.bidderCode, 'allowedAlternateBidderCodes');
+    const allowAlternateBidder = bidderRequest ? bidderSettings.get(bidderRequest.bidderCode, 'allowAlternateBidderCodes') : undefined;
+    if (allowAlternateBidder !== undefined) {
+      payload.ext.marketplace = {};
+      if (bidderRequest && allowAlternateBidder == true) {
+        let allowedBiddersList = bidderSettings.get(bidderRequest.bidderCode, 'allowedAlternateBidderCodes');
+        if (isArray(allowedBiddersList)) {
+          allowedBiddersList = allowedBiddersList.map(val => val.trim().toLowerCase()).filter(val => !!val).filter(uniques)
+          biddersList = allowedBiddersList.includes('*') ? allBiddersList : [...biddersList, ...allowedBiddersList];
+        } else {
+          biddersList = allBiddersList;
+        }
+      }
+      payload.ext.marketplace.allowedbidders = biddersList.filter(uniques);
     }
+
     payload.user.gender = (conf.gender ? conf.gender.trim() : UNDEFINED);
     payload.user.geo = {};
     payload.user.geo.lat = _parseSlotParam('lat', conf.lat);
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
index 6e65e725024..f3a49a6a925 100644
--- a/test/spec/modules/pubmaticBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -3,6 +3,7 @@ import {spec, checkVideoPlacement} from 'modules/pubmaticBidAdapter.js';
 import * as utils from 'src/utils.js';
 import {config} from 'src/config.js';
 import { createEidsArray } from 'modules/userId/eids.js';
+import { bidderSettings } from 'src/bidderSettings.js';
 const constants = require('src/constants.json');
 
 describe('PubMatic adapter', function () {
@@ -1104,6 +1105,62 @@ describe('PubMatic adapter', function () {
         expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
   		});
 
+      describe('Marketplace parameters', function() {
+        let bidderSettingStub;
+        beforeEach(function() {
+          bidderSettingStub = sinon.stub(bidderSettings, 'get');
+        });
+
+        afterEach(function() {
+          bidderSettingStub.restore();
+        });
+
+        it('should not be present when allowAlternateBidderCodes is undefined', function () {
+          bidderSettingStub.returns(undefined);
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.ext.marketplace).to.equal(undefined);
+        });
+
+        it('should be pubmatic and groupm when allowedAlternateBidderCodes is \'groupm\'', function () {
+          bidderSettingStub.withArgs('pubmatic', 'allowAlternateBidderCodes').returns(true);
+          bidderSettingStub.withArgs('pubmatic', 'allowedAlternateBidderCodes').returns(['groupm']);
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id',
+            bidderCode: 'pubmatic'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.ext.marketplace.allowedbidders).to.be.an('array');
+          expect(data.ext.marketplace.allowedbidders.length).to.equal(2);
+          expect(data.ext.marketplace.allowedbidders[0]).to.equal('pubmatic');
+          expect(data.ext.marketplace.allowedbidders[1]).to.equal('groupm');
+        });
+
+        it('should be ALL by default', function () {
+          bidderSettingStub.returns(true);
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.ext.marketplace.allowedbidders).to.be.an('array');
+          expect(data.ext.marketplace.allowedbidders[0]).to.equal('all');
+        });
+
+        it('should be ALL when allowedAlternateBidderCodes is \'*\'', function () {
+          bidderSettingStub.withArgs('pubmatic', 'allowAlternateBidderCodes').returns(true);
+          bidderSettingStub.withArgs('pubmatic', 'allowedAlternateBidderCodes').returns(['*']);
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id',
+            bidderCode: 'pubmatic'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.ext.marketplace.allowedbidders).to.be.an('array');
+          expect(data.ext.marketplace.allowedbidders[0]).to.equal('all');
+        });
+      })
+
       it('Set content from config, set site.content', function() {
         let sandbox = sinon.sandbox.create();
         const content = {

From 84499f743115d6c4bf8c33de62eb23ce5a3843ff Mon Sep 17 00:00:00 2001
From: julian-burger-ttd <105891200+julian-burger-ttd@users.noreply.github.com>
Date: Mon, 8 Aug 2022 20:12:08 -0700
Subject: [PATCH 113/569] Ttd Bid adapter: support for transaction id, bcat,
 and consolidate params (#8679)

* remove siteId parameter
make placementId parameter optional if GPID is passed
pass transactionId through to source.tid
read bcat from ortb2

* enforce check for gpid or placementId

* add error message

* Support badv/battr, get tid from ext object

* Address review feedback

Co-authored-by: Minh Daole <minh.daole@thetradedesk.com>
---
 modules/ttdBidAdapter.js                |  63 ++++++----
 modules/ttdBidAdapter.md                |  14 +--
 test/spec/modules/ttdBidAdapter_spec.js | 147 ++++++++++++++++++------
 3 files changed, 156 insertions(+), 68 deletions(-)

diff --git a/modules/ttdBidAdapter.js b/modules/ttdBidAdapter.js
index 55d7490a4ad..b95b379d74d 100644
--- a/modules/ttdBidAdapter.js
+++ b/modules/ttdBidAdapter.js
@@ -4,7 +4,7 @@ import { createEidsArray } from './userId/eids.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
-const BIDADAPTERVERSION = 'TTD-PREBID-2022.02.18';
+const BIDADAPTERVERSION = 'TTD-PREBID-2022.06.28';
 const BIDDER_CODE = 'ttd';
 const BIDDER_CODE_LONG = 'thetradedesk';
 const BIDDER_ENDPOINT = 'https://direct.adsrvr.org/bid/bidder/';
@@ -58,7 +58,9 @@ function getBidFloor(bid) {
 }
 
 function getSource(validBidRequests) {
-  let source = {};
+  let source = {
+    tid: validBidRequests[0].transactionId
+  };
   if (validBidRequests[0].schain) {
     utils.deepSetValue(source, 'ext.schain', validBidRequests[0].schain);
   }
@@ -124,7 +126,6 @@ function getUser(bidderRequest) {
 
 function getSite(bidderRequest, firstPartyData) {
   var site = {
-    id: utils.deepAccess(bidderRequest, 'bids.0.params.siteId'),
     page: utils.deepAccess(bidderRequest, 'refererInfo.page'),
     publisher: {
       id: utils.deepAccess(bidderRequest, 'bids.0.params.publisherId'),
@@ -141,15 +142,20 @@ function getSite(bidderRequest, firstPartyData) {
 
 function getImpression(bidRequest) {
   let impression = {
-    id: bidRequest.bidId,
-    tagid: bidRequest.params.placementId
+    id: bidRequest.bidId
   };
 
-  let gpid = utils.deepAccess(bidRequest, 'ortb2Imp.ext.gpid');
-  if (gpid) {
-    impression.ext = {
-      gpid: gpid
-    }
+  const gpid = utils.deepAccess(bidRequest, 'ortb2Imp.ext.gpid');
+  const tid = utils.deepAccess(bidRequest, 'ortb2Imp.ext.tid');
+  if (gpid || tid) {
+    impression.ext = {}
+    if (gpid) { impression.ext.gpid = gpid }
+    if (tid) { impression.ext.tid = tid }
+  }
+
+  const tagid = gpid || bidRequest.params.placementId;
+  if (tagid) {
+    impression.tagid = tagid
   }
 
   const mediaTypesVideo = utils.deepAccess(bidRequest, 'mediaTypes.video');
@@ -212,6 +218,12 @@ function banner(bid) {
       format: sizes,
     },
     optionalParams);
+
+  const battr = utils.deepAccess(bid, 'ortb2Imp.battr');
+  if (battr) {
+    banner.battr = battr
+  }
+
   return banner;
 }
 
@@ -279,6 +291,11 @@ function video(bid) {
     video.maxbitrate = maxbitrate;
   }
 
+  const battr = utils.deepAccess(bid, 'ortb2Imp.battr');
+  if (battr) {
+    video.battr = battr
+  }
+
   return video;
 }
 
@@ -318,20 +335,10 @@ export const spec = {
       utils.logWarn(BIDDER_CODE + ': params.publisherId must be 32 characters or less');
       return false;
     }
-    if (!bid.params.siteId) {
-      utils.logWarn(BIDDER_CODE + ': Missing required parameter params.siteId');
-      return false;
-    }
-    if (bid.params.siteId.length > 50) {
-      utils.logWarn(BIDDER_CODE + ': params.siteId must be 50 characters or less');
-      return false;
-    }
-    if (!bid.params.placementId) {
-      utils.logWarn(BIDDER_CODE + ': Missing required parameter params.placementId');
-      return false;
-    }
-    if (bid.params.placementId.length > 128) {
-      utils.logWarn(BIDDER_CODE + ': params.placementId must be 128 characters or less');
+
+    const gpid = utils.deepAccess(bid, 'ortb2Imp.ext.gpid');
+    if (!bid.params.placementId && !gpid) {
+      utils.logWarn(BIDDER_CODE + ': one of params.placementId or gpid (via the GPT module https://docs.prebid.org/dev-docs/modules/gpt-pre-auction.html) must be passed');
       return false;
     }
 
@@ -387,6 +394,14 @@ export const spec = {
       ext: getExt(firstPartyData)
     }
 
+    if (firstPartyData && firstPartyData.bcat) {
+      topLevel.bcat = firstPartyData.bcat;
+    }
+
+    if (firstPartyData && firstPartyData.badv) {
+      topLevel.badv = firstPartyData.badv;
+    }
+
     let url = BIDDER_ENDPOINT + bidderRequest.bids[0].params.supplySourceId;
 
     let serverRequest = {
diff --git a/modules/ttdBidAdapter.md b/modules/ttdBidAdapter.md
index 9c67f3267cb..efdef751149 100644
--- a/modules/ttdBidAdapter.md
+++ b/modules/ttdBidAdapter.md
@@ -29,9 +29,7 @@ The Trade Desk bid adapter supports Banner and Video.
                         bidder: 'ttd',
                         params: {
                             supplySourceId: 'supplier',
-                            publisherId: '1427ab10f2e448057ed3b422',
-                            siteId: 'site-123',
-                            placementId: 'footer1'
+                            publisherId: '1427ab10f2e448057ed3b422'
                         }
                     }
                 ]
@@ -51,8 +49,7 @@ The Trade Desk bid adapter supports Banner and Video.
                         params: {
                             supplySourceId: 'supplier',
                             publisherId: '1427ab10f2e448057ed3b422',
-                            siteId: 'site-123',
-                            placementId: 'footer1',
+                            placementId: '/1111/home#header',
                             banner: {
                                 expdir: [1, 3]
                             },
@@ -77,9 +74,7 @@ The Trade Desk bid adapter supports Banner and Video.
                         bidder: 'ttd',
                         params: {
                             supplySourceId: 'supplier',
-                            publisherId: '1427ab10f2e448057ed3b422',
-                            siteId: 'site-123',
-                            placementId: 'footer1'
+                            publisherId: '1427ab10f2e448057ed3b422'
                         }
                     }
                 ]
@@ -112,8 +107,7 @@ The Trade Desk bid adapter supports Banner and Video.
                         params: {
                             supplySourceId: 'supplier',
                             publisherId: '1427ab10f2e448057ed3b422',
-                            siteId: 'site-123',
-                            placementId: 'footer1'
+                            placementId: '/1111/home#header'
                         }
                     }
                 ]
diff --git a/test/spec/modules/ttdBidAdapter_spec.js b/test/spec/modules/ttdBidAdapter_spec.js
index b933a5dd0c9..aa2e84b619e 100644
--- a/test/spec/modules/ttdBidAdapter_spec.js
+++ b/test/spec/modules/ttdBidAdapter_spec.js
@@ -17,8 +17,7 @@ describe('ttdBidAdapter', function () {
         'params': {
           'supplySourceId': 'supplier',
           'publisherId': '22222222',
-          'placementId': 'some-PlacementId_1',
-          'siteId': 'testSiteId'
+          'placementId': 'some-PlacementId_1'
         },
         'mediaTypes': {
           'banner': {
@@ -57,27 +56,20 @@ describe('ttdBidAdapter', function () {
         expect(spec.isBidRequestValid(bid)).to.equal(false);
       });
 
-      it('should return false when siteId not passed', function () {
-        let bid = makeBid();
-        delete bid.params.siteId;
-        expect(spec.isBidRequestValid(bid)).to.equal(false);
-      });
-
-      it('should return false when siteId is longer than 50 characters', function () {
-        let bid = makeBid();
-        bid.params.siteId = '1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111'
-        expect(spec.isBidRequestValid(bid)).to.equal(false);
-      });
-
-      it('should return false when placementId not passed', function () {
+      it('should return true if placementId is not passed and gpid is passed', function () {
         let bid = makeBid();
         delete bid.params.placementId;
-        expect(spec.isBidRequestValid(bid)).to.equal(false);
+        bid.ortb2Imp = {
+          ext: {
+            gpid: '/1111/home#header'
+          }
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
       });
 
-      it('should return false when the placementId is longer than 128 characters', function () {
+      it('should return false if neither placementId nor gpid is passed', function () {
         let bid = makeBid();
-        bid.params.placementId = '1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111'; // 130 characters
+        delete bid.params.placementId;
         expect(spec.isBidRequestValid(bid)).to.equal(false);
       });
 
@@ -103,7 +95,6 @@ describe('ttdBidAdapter', function () {
           'params': {
             'supplySourceId': 'supplier',
             'publisherId': '22222222',
-            'siteId': 'testSiteId123',
             'placementId': 'somePlacementId'
           },
           'mediaTypes': {
@@ -187,17 +178,21 @@ describe('ttdBidAdapter', function () {
       'params': {
         'supplySourceId': 'supplier',
         'publisherId': '13144370',
-        'placementId': '1gaa015',
-        'siteId': 'testSiteId123'
+        'placementId': '1gaa015'
       },
       'mediaTypes': {
         'banner': {
           'sizes': [[300, 250], [300, 600]]
         }
       },
+      'ortb2Imp': {
+        'ext': {
+          'tid': '8651474f-58b1-4368-b812-84f8c937a099',
+        }
+      },
       'sizes': [[300, 250], [300, 600]],
+      'transactionId': '1111474f-58b1-4368-b812-84f8c937a099',
       'adUnitCode': 'div-gpt-ad-1460505748561-0',
-      'transactionId': '8651474f-58b1-4368-b812-84f8c937a099',
       'bidId': '243310435309b5',
       'bidderRequestId': '18084284054531',
       'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
@@ -240,16 +235,49 @@ describe('ttdBidAdapter', function () {
       expect(url).to.equal('https://direct.adsrvr.org/bid/bidder/supplier');
     });
 
-    it('sends publisher id, site id, and placement id', function () {
+    it('sends publisher id', function () {
       const requestBody = testBuildRequests(baseBannerBidRequests, baseBidderRequest).data;
       expect(requestBody.site).to.be.not.null;
       expect(requestBody.site.publisher).to.be.not.null;
-      expect(requestBody.imp[0].tagid).to.be.not.null;
       expect(requestBody.site.publisher.id).to.equal(baseBannerBidRequests[0].params.publisherId);
-      expect(requestBody.site.id).to.equal(baseBannerBidRequests[0].params.siteId);
+    });
+
+    it('sends placement id in tagid', function () {
+      const requestBody = testBuildRequests(baseBannerBidRequests, baseBidderRequest).data;
       expect(requestBody.imp[0].tagid).to.equal(baseBannerBidRequests[0].params.placementId);
     });
 
+    it('sends gpid in tagid if present', function () {
+      let clonedBannerRequests = deepClone(baseBannerBidRequests);
+      const gpid = '/1111/home#header';
+      clonedBannerRequests[0].ortb2Imp = {
+        ext: {
+          gpid: gpid
+        }
+      };
+      const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].tagid).to.equal(gpid);
+    });
+
+    it('sends gpid in ext.gpid if present', function () {
+      let clonedBannerRequests = deepClone(baseBannerBidRequests);
+      const gpid = '/1111/home#header';
+      clonedBannerRequests[0].ortb2Imp = {
+        ext: {
+          gpid: gpid
+        }
+      };
+      const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].ext).to.be.not.null;
+      expect(requestBody.imp[0].ext.gpid).to.equal(gpid);
+    });
+
+    it('sends transaction id in source.tid', function () {
+      const requestBody = testBuildRequests(baseBannerBidRequests, baseBidderRequest).data;
+      expect(requestBody.source).to.be.not.null;
+      expect(requestBody.source.tid).to.equal('1111474f-58b1-4368-b812-84f8c937a099');
+    });
+
     it('includes the ad size in the bid request', function () {
       const requestBody = testBuildRequests(baseBannerBidRequests, baseBidderRequest).data;
       expect(requestBody.imp[0].banner.format[0].w).to.equal(300);
@@ -283,18 +311,44 @@ describe('ttdBidAdapter', function () {
     });
 
     it('sets keywords properly if sent', function () {
-      let clonedBannerRequests = deepClone(baseBannerBidRequests);
-
       const ortb2 = {
         site: {
           keywords: 'highViewability, clothing, holiday shopping'
         }
       };
-      const requestBody = testBuildRequests(clonedBannerRequests, {...baseBidderRequest, ortb2}).data;
+      const requestBody = testBuildRequests(baseBannerBidRequests, {...baseBidderRequest, ortb2}).data;
       config.resetConfig();
       expect(requestBody.ext.ttdprebid.keywords).to.deep.equal(['highViewability', 'clothing', 'holiday shopping']);
     });
 
+    it('sets bcat properly if sent', function () {
+      const ortb2 = {
+        bcat: ['IAB1-1', 'IAB2-9']
+      };
+      const requestBody = testBuildRequests(baseBannerBidRequests, {...baseBidderRequest, ortb2}).data;
+      config.resetConfig();
+      expect(requestBody.bcat).to.deep.equal(['IAB1-1', 'IAB2-9']);
+    });
+
+    it('sets badv properly if sent', function () {
+      const ortb2 = {
+        badv: ['adv1.com', 'adv2.com']
+      };
+      const requestBody = testBuildRequests(baseBannerBidRequests, {...baseBidderRequest, ortb2}).data;
+      config.resetConfig();
+      expect(requestBody.badv).to.deep.equal(['adv1.com', 'adv2.com']);
+    });
+
+    it('sets battr properly if present', function () {
+      let clonedBannerRequests = deepClone(baseBannerBidRequests);
+      const battr = [1, 2, 3];
+      clonedBannerRequests[0].ortb2Imp = {
+        battr: battr
+      };
+      const requestBody = testBuildRequests(clonedBannerRequests, baseBidderRequest).data;
+      expect(requestBody.imp[0].banner.battr).to.equal(battr);
+    });
+
     it('sets ext properly', function () {
       let clonedBannerRequests = deepClone(baseBannerBidRequests);
 
@@ -442,9 +496,14 @@ describe('ttdBidAdapter', function () {
           'sizes': [[300, 250], [300, 600]]
         }
       },
+      'ortb2Imp': {
+        'ext': {
+          'tid': '8651474f-58b1-4368-b812-84f8c937a099',
+        }
+      },
       'sizes': [[300, 250], [300, 600]],
+      'transactionId': '1111474f-58b1-4368-b812-84f8c937a099',
       'adUnitCode': 'div-gpt-ad-1460505748561-0',
-      'transactionId': '8651474f-58b1-4368-b812-84f8c937a099',
       'bidId': 'small',
       'bidderRequestId': '18084284054531',
       'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
@@ -454,17 +513,21 @@ describe('ttdBidAdapter', function () {
       'bidder': 'ttd',
       'params': {
         'publisherId': '13144370',
-        'placementId': 'top',
-        'siteId': 'testSite123'
+        'placementId': 'top'
       },
       'mediaTypes': {
         'banner': {
           'sizes': [[728, 90]]
         }
       },
+      'ortb2Imp': {
+        'ext': {
+          'tid': '12345678-58b1-4368-b812-84f8c937a099',
+        }
+      },
       'sizes': [[728, 90]],
-      'adUnitCode': 'div-gpt-ad-91515710-0',
       'transactionId': '825c1228-ca8c-4657-b40f-2df500621527',
+      'adUnitCode': 'div-gpt-ad-91515710-0',
       'bidId': 'large',
       'bidderRequestId': '18084284054531',
       'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
@@ -493,6 +556,12 @@ describe('ttdBidAdapter', function () {
     it('sends multiple impressions', function () {
       const requestBody = testBuildRequests(baseBannerMultipleBidRequests, baseBidderRequest).data;
       expect(requestBody.imp.length).to.equal(2);
+      expect(requestBody.source).to.be.not.null;
+      expect(requestBody.source.tid).to.equal('1111474f-58b1-4368-b812-84f8c937a099');
+      expect(requestBody.imp[0].ext).to.be.not.null;
+      expect(requestBody.imp[0].ext.tid).to.equal('8651474f-58b1-4368-b812-84f8c937a099');
+      expect(requestBody.imp[1].ext).to.be.not.null;
+      expect(requestBody.imp[1].ext.tid).to.equal('12345678-58b1-4368-b812-84f8c937a099');
     });
 
     it('sends the right tag ids for each ad unit', function () {
@@ -547,8 +616,13 @@ describe('ttdBidAdapter', function () {
           'sizes': [[300, 250], [300, 600]]
         }
       },
+      'ortb2Imp': {
+        'ext': {
+          'tid': '8651474f-58b1-4368-b812-84f8c937a099',
+        }
+      },
+      'transactionId': '1111474f-58b1-4368-b812-84f8c937a099',
       'adUnitCode': 'div-gpt-ad-1460505748561-0',
-      'transactionId': '8651474f-58b1-4368-b812-84f8c937a099',
       'bidId': '243310435309b5',
       'bidderRequestId': '18084284054531',
       'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
@@ -607,8 +681,13 @@ describe('ttdBidAdapter', function () {
           'maxduration': 30
         }
       },
+      'ortb2Imp': {
+        'ext': {
+          'tid': '8651474f-58b1-4368-b812-84f8c937a099',
+        }
+      },
+      'transactionId': '1111474f-58b1-4368-b812-84f8c937a099',
       'adUnitCode': 'div-gpt-ad-1460505748561-0',
-      'transactionId': '8651474f-58b1-4368-b812-84f8c937a099',
       'bidId': '243310435309b5',
       'bidderRequestId': '18084284054531',
       'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',

From 555c4c0b9c01c05b8cb4a91fd0822a7e3f9ef6ce Mon Sep 17 00:00:00 2001
From: JacobKlein26 <42449375+JacobKlein26@users.noreply.github.com>
Date: Mon, 8 Aug 2022 23:13:45 -0400
Subject: [PATCH 114/569] NextMillennium Bid Adapter: Add referrer and imp to
 bid request (#8718)

* add more information and testing

* fix typo

* fix typo in testing

* use getRefererInfo

Co-authored-by: Mikhail Ivanchenko <mihail.ivanchenko@nextmillennium.io>
---
 modules/nextMillenniumBidAdapter.js           | 23 +++++++++++++++++--
 .../modules/nextMillenniumBidAdapter_spec.js  | 17 ++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index 375258176da..f873e5b5c29 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -1,4 +1,5 @@
 import { isStr, _each, parseUrl, getWindowTop, getBidIdParameter } from '../src/utils.js';
+import { getRefererInfo } from '../src/refererDetection.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 
@@ -24,12 +25,18 @@ export const spec = {
 
     _each(validBidRequests, function(bid) {
       window.nmmRefreshCounts[bid.adUnitCode] = window.nmmRefreshCounts[bid.adUnitCode] || 0;
+      const id = getPlacementId(bid)
+
+      if (bid.sizes && !Array.isArray(bid.sizes[0])) bid.sizes = [bid.sizes]
+      if (!bid.ortb2) bid.ortb2 = {}
+      if (!bid.ortb2.device) bid.ortb2.device = {}
+      bid.ortb2.device.referrer = (getRefererInfo && getRefererInfo().ref) || ''
       const postBody = {
         'id': bid.auctionId,
         'ext': {
           'prebid': {
             'storedrequest': {
-              'id': getPlacementId(bid)
+              'id': id
             }
           },
 
@@ -39,7 +46,19 @@ export const spec = {
             'scrollTop': window.pageYOffset || document.documentElement.scrollTop
           }
         },
-        ...bid.ortb2
+        ...bid.ortb2,
+        'imp': [{
+          'banner': {
+            'format': (bid.sizes || []).map(s => { return {w: s[0], h: s[1]} })
+          },
+          'ext': {
+            'prebid': {
+              'storedrequest': {
+                'id': id
+              }
+            }
+          }
+        }]
       }
 
       const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
diff --git a/test/spec/modules/nextMillenniumBidAdapter_spec.js b/test/spec/modules/nextMillenniumBidAdapter_spec.js
index 9362388b539..40005356fd8 100644
--- a/test/spec/modules/nextMillenniumBidAdapter_spec.js
+++ b/test/spec/modules/nextMillenniumBidAdapter_spec.js
@@ -114,6 +114,23 @@ describe('nextMillenniumBidAdapterTests', function() {
     expect(JSON.parse(request[0].data).ext.nextMillennium.elOffsets).to.be.an('object')
   })
 
+  it('Check if refferer was added', function() {
+    const request = spec.buildRequests(bidRequestData)
+    expect(JSON.parse(request[0].data).device.referrer).to.exist
+  })
+
+  it('Check if imp object was added', function() {
+    const request = spec.buildRequests(bidRequestData)
+    expect(JSON.parse(request[0].data).imp).to.be.an('array')
+  })
+
+  it('Check if imp prebid stored id is correct', function() {
+    const request = spec.buildRequests(bidRequestData)
+    const requestData = JSON.parse(request[0].data);
+    const storedReqId = requestData.ext.prebid.storedrequest.id;
+    expect(requestData.imp[0].ext.prebid.storedrequest.id).to.equal(storedReqId)
+  })
+
   it('Test getUserSyncs function', function () {
     const syncOptions = {
       'iframeEnabled': true

From 638e7c5866fa62093f9fea074554d90c3cb5cf23 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Mon, 8 Aug 2022 20:14:19 -0700
Subject: [PATCH 115/569] UserID: continue the auction if userId init fails
 (#8788)

---
 modules/userId/index.js          | 16 ++++++++++------
 test/spec/modules/userId_spec.js | 15 ++++++++++++++-
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/modules/userId/index.js b/modules/userId/index.js
index f42c4c7827f..f925e637178 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -614,9 +614,9 @@ function getPPID() {
  * @param {Object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
  * @param {function} fn required; The next function in the chain, used by hook.js
  */
-export function requestBidsHook(fn, reqBidsConfigObj, {delay = GreedyPromise.timeout} = {}) {
+export function requestBidsHook(fn, reqBidsConfigObj, {delay = GreedyPromise.timeout, getIds = getUserIdsAsync} = {}) {
   GreedyPromise.race([
-    getUserIdsAsync(),
+    getIds().catch(() => null),
     delay(auctionDelay)
   ]).then(() => {
     // pass available user id data to bid adapters
@@ -762,13 +762,17 @@ function refreshUserIds({submoduleNames} = {}, callback) {
 function getUserIdsAsync() {
   return initIdSystem().then(
     () => getUserIds(),
-    (e) =>
-      e === INIT_CANCELED
+    (e) => {
+      if (e === INIT_CANCELED) {
         // there's a pending refresh - because GreedyPromise runs this synchronously, we are now in the middle
         // of canceling the previous init, before the refresh logic has had a chance to run.
         // Use a "normal" Promise to clear the stack and let it complete (or this will just recurse infinitely)
-        ? Promise.resolve().then(getUserIdsAsync)
-        : GreedyPromise.reject(e)
+        return Promise.resolve().then(getUserIdsAsync)
+      } else {
+        logError('Error initializing userId', e)
+        return GreedyPromise.reject(e)
+      }
+    }
   );
 }
 
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 046b3ffd321..e6058673d41 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -539,9 +539,22 @@ describe('User ID', function () {
         clearStack().then(() => {
           // simulate init complete
           mockIdCallback.callArg(0, {id: {MOCKID: '1111'}});
-        })
+        });
       });
 
+      it('should continue the auction when init fails', (done) => {
+        startInit();
+        requestBidsHook(() => {
+          done();
+        },
+        {adUnits: [getAdUnitMock()]},
+        {
+          delay: delay(),
+          getIds: () => Promise.reject(new Error())
+        }
+        );
+      })
+
       it('should not get stuck when init fails', () => {
         const err = new Error();
         mockIdCallback.callsFake(() => { throw err; });

From a5b4cab0b185927d73b780bffdd27674aafc6432 Mon Sep 17 00:00:00 2001
From: wojciech-bialy-wpm
 <67895844+wojciech-bialy-wpm@users.noreply.github.com>
Date: Tue, 9 Aug 2022 05:28:10 +0200
Subject: [PATCH 116/569] sspBC bid adapter - remove storage/cookie check, add
 screen size to request (#8762)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update tests for sspBC adapter

Update tests for sspBC adapter:
- change userSync test (due to tcf param appended in v4.6)
- add tests for onBidWon and onTimeout

* [sspbc-adapter] 5.3 updates: content-type for notifications

* [sspbc-adapter] pass CTA to native bid

* [sspbc-5.3] keep pbsize for detected adunits

* [sspbc-5.3] increment adaptor ver

* [sspbc-adapter] maintenance update to sspBCBidAdapter

* remove yarn.lock

* Delete package-lock.json

* remove package-lock.jsonfrom pull request

* [sspbc-adapter] send pageViewId in request

* [sspbc-adapter] update pageViewId test

* [sspbc-adapter] add viewabiility tracker to native ads

* [sspbc-adapter] add support for bid.admNative property

* [sspbc-adapter] ensure that placement id length is always 3 (improves matching response to request)

* [sspbc-adapter] read publisher id and custom ad label, then send them to banner creative

* [sspbc-adapter] adlabel and pubid are set as empty strings, if not present in bid response

* [sspbc-adapter] jstracker data fix

* [sspbc-adapter] jstracker data fix

* [sspbc-adapter] send tagid in notifications

* [sspbc-adapter] add gvlid to spec; prepare getUserSyncs for iframe + image sync

* [sspbc-adapter] fix notification payload

* [sspbc-adapter] fix notification payload, fix tests

* [sspbc-adapter] add userIds to ortb request

* [sspbc-adapter] update to 4.1, change request to be ortb 2.6 compliant

* [sspbc-adapter] update tests

* [ssbc-adapter] bid cache for video ads

* [sspbc-adapter] add PageView.id to banner ad; update tests

* [sspbc-adapter] fix window.gam not being added to banner html

* [sspbc-adapter] send device / content language

* [sspbc-adapter] send pageview and site ids to user sync frame

* [sspbc-adapter] add ES6 version of common ad library (for banner creatives)

* [sspbc-adapter] move content property

* [sspbc-adapter] reorganize notification payload creator

* [sspbc-adapter] store PLN price in meta; send in bidWon notification

* [sspbc-adapter] add playbackmethod to supporten video params; allow overridinbg video settngs via  bid.params.video

* [sspbc-adapter] update md

* [sspbc-adapter] fix error in mapVideo method (Object assign merror when mediaTypes do not contain video)

* [sspbc-5.7] remove storage/cookie detection

* [sspbc-5.7] add screen size to request

Co-authored-by: Wojciech Biały <wb@WojciechBialy.local>
---
 modules/sspBCBidAdapter.js                | 29 ++++++++++-------------
 test/spec/modules/sspBCBidAdapter_spec.js |  4 ++--
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/modules/sspBCBidAdapter.js b/modules/sspBCBidAdapter.js
index 94dbe9a4468..0a19410c78f 100644
--- a/modules/sspBCBidAdapter.js
+++ b/modules/sspBCBidAdapter.js
@@ -1,10 +1,9 @@
-import {deepAccess, getWindowTop, isArray, logWarn} from '../src/utils.js';
-import {ajax} from '../src/ajax.js';
-import {config} from '../src/config.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
-import {includes as strIncludes} from '../src/polyfill.js';
-import { getStorageManager } from '../src/storageManager.js';
+import { deepAccess, getWindowTop, isArray, logWarn } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { includes as strIncludes } from '../src/polyfill.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'sspBC';
@@ -13,9 +12,8 @@ const SYNC_URL = 'https://ssp.wp.pl/bidder/usersync';
 const NOTIFY_URL = 'https://ssp.wp.pl/bidder/notify';
 const TRACKER_URL = 'https://bdr.wpcdn.pl/tag/jstracker.js';
 const GVLID = 676;
-const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
 const TMAX = 450;
-const BIDDER_VERSION = '5.6';
+const BIDDER_VERSION = '5.7';
 const DEFAULT_CURRENCY = 'PLN';
 const W = window;
 const { navigator } = W;
@@ -102,11 +100,6 @@ const getNotificationPayload = bidData => {
   }
 }
 
-const cookieSupport = () => {
-  const isSafari = /^((?!chrome|android|crios|fxios).)*safari/i.test(navigator.userAgent);
-  return !isSafari && storage.cookiesAreEnabled();
-};
-
 const applyClientHints = ortbRequest => {
   const { location } = document;
   const { connection = {}, deviceMemory, userAgentData = {} } = navigator;
@@ -569,7 +562,11 @@ const spec = {
       tmax,
       user: {},
       regs: {},
-      device: { language: getBrowserLanguage() },
+      device: {
+        language: getBrowserLanguage(),
+        w: screen.width,
+        h: screen.height,
+      },
       test: testMode,
     };
 
@@ -579,7 +576,7 @@ const spec = {
 
     return {
       method: 'POST',
-      url: `${BIDDER_URL}?cs=${cookieSupport()}&bdver=${BIDDER_VERSION}&pbver=${pbver}&inver=0`,
+      url: `${BIDDER_URL}?bdver=${BIDDER_VERSION}&pbver=${pbver}&inver=0`,
       data: JSON.stringify(payload),
       bidderRequest,
     };
diff --git a/test/spec/modules/sspBCBidAdapter_spec.js b/test/spec/modules/sspBCBidAdapter_spec.js
index f286eb3a1ff..d182b9db24c 100644
--- a/test/spec/modules/sspBCBidAdapter_spec.js
+++ b/test/spec/modules/sspBCBidAdapter_spec.js
@@ -678,8 +678,8 @@ describe('SSPBC adapter', function () {
     });
 
     it('should send no syncs, if frame sync is not allowed', function () {
-      expect(syncResultImage).to.have.length(0); ;
-      expect(syncResultNone).to.have.length(0); ;
+      expect(syncResultImage).to.have.length(0);
+      expect(syncResultNone).to.have.length(0);
     });
   });
 

From ec2117323b23c3084149292b8610f7bed3749534 Mon Sep 17 00:00:00 2001
From: Rupesh Lakhani <35333377+AskRupert-DM@users.noreply.github.com>
Date: Tue, 9 Aug 2022 14:18:56 +0100
Subject: [PATCH 117/569] Ozone Bid Adapter: Various improvements (#8755)

* ozone adapter 2.8.0

added instream support
fixed/cleaned up code

* spec test for ozone 2.8.0 adapter

* ozone adapter 2.8.0

* Update ozoneBidAdapter_spec.js

* Update ozoneBidAdapter.md

Co-authored-by: Patrick McCann <pmccann@cafemedia.com>
---
 modules/ozoneBidAdapter.js                | 369 +++------
 modules/ozoneBidAdapter.md                |  37 +
 test/spec/modules/ozoneBidAdapter_spec.js | 878 +++++++++-------------
 3 files changed, 504 insertions(+), 780 deletions(-)

diff --git a/modules/ozoneBidAdapter.js b/modules/ozoneBidAdapter.js
index bbcb559b53b..2f229720208 100644
--- a/modules/ozoneBidAdapter.js
+++ b/modules/ozoneBidAdapter.js
@@ -1,23 +1,30 @@
-import { logInfo, logError, deepAccess, logWarn, deepSetValue, isArray, contains, isStr, mergeDeep } from '../src/utils.js';
+import {
+  logInfo,
+  logError,
+  deepAccess,
+  logWarn,
+  deepSetValue,
+  isArray,
+  contains,
+  mergeDeep,
+  parseUrl
+} from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
 import {getPriceBucketString} from '../src/cpmBucketManager.js';
 import { Renderer } from '../src/Renderer.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-
+import {getRefererInfo} from '../src/refererDetection.js';
 const BIDDER_CODE = 'ozone';
-
 const ORIGIN = 'https://elb.the-ozone-project.com' // applies only to auction & cookie
 const AUCTIONURI = '/openrtb2/auction';
 const OZONECOOKIESYNC = '/static/load-cookie.html';
 const OZONE_RENDERER_URL = 'https://prebid.the-ozone-project.com/ozone-renderer.js';
 const ORIGIN_DEV = 'https://test.ozpr.net';
-
-const OZONEVERSION = '2.7.0';
+const OZONEVERSION = '2.8.0';
 export const spec = {
   gvlid: 524,
-  aliases: [{code: 'lmc', gvlid: 524}, {code: 'newspassid', gvlid: 524}],
+  aliases: [{code: 'lmc', gvlid: 524}],
   version: OZONEVERSION,
   code: BIDDER_CODE,
   supportedMediaTypes: [VIDEO, BANNER],
@@ -31,10 +38,6 @@ export const spec = {
     'cookieSyncUrl': ORIGIN + OZONECOOKIESYNC,
     'rendererUrl': OZONE_RENDERER_URL
   },
-  /**
-   * make sure that the whitelabel/default values are available in the propertyBag
-   * @param bid Object : the bid
-   */
   loadWhitelabelData(bid) {
     if (this.propertyBag.whitelabel) { return; }
     this.propertyBag.whitelabel = JSON.parse(JSON.stringify(this.whitelabel_defaults));
@@ -53,7 +56,6 @@ export const spec = {
         this.propertyBag.whitelabel.auctionUrl = bidderConfig.endpointOverride.origin + AUCTIONURI;
         this.propertyBag.whitelabel.cookieSyncUrl = bidderConfig.endpointOverride.origin + OZONECOOKIESYNC;
       }
-
       if (arr.hasOwnProperty('renderer')) {
         if (arr.renderer.match('%3A%2F%2F')) {
           this.propertyBag.whitelabel.rendererUrl = decodeURIComponent(arr['renderer']);
@@ -92,11 +94,6 @@ export const spec = {
   getRendererUrl() {
     return this.propertyBag.whitelabel.rendererUrl;
   },
-  /**
-   * Basic check to see whether required parameters are in the request.
-   * @param bid
-   * @returns {boolean}
-   */
   isBidRequestValid(bid) {
     this.loadWhitelabelData(bid);
     logInfo('isBidRequestValid : ', config.getConfig(), bid);
@@ -115,7 +112,7 @@ export const spec = {
       return false;
     }
     if (!(bid.params.publisherId).toString().match(/^[a-zA-Z0-9\-]{12}$/)) {
-      logError('VALIDATION FAILED : publisherId must be exactly 12 alphanumieric characters including hyphens', adUnitCode);
+      logError('VALIDATION FAILED : publisherId must be exactly 12 alphanumeric characters including hyphens', adUnitCode);
       return false;
     }
     if (!(bid.params.hasOwnProperty('siteId'))) {
@@ -160,19 +157,10 @@ export const spec = {
     }
     return true;
   },
-
-  /**
-   * Split this out so that we can validate the placementId and also the override GET parameter ozstoredrequest
-   * @param placementId
-   */
   isValidPlacementId(placementId) {
     return placementId.toString().match(/^[0-9]{10}$/);
   },
-
   buildRequests(validBidRequests, bidderRequest) {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
     this.loadWhitelabelData(validBidRequests[0]);
     this.propertyBag.buildRequestsStart = new Date().getTime();
     let whitelabelBidder = this.propertyBag.whitelabel.bidder; // by default = ozone
@@ -193,14 +181,13 @@ export const spec = {
     singleRequest = singleRequest !== false; // undefined & true will be true
     logInfo(`config ${whitelabelBidder}.singleRequest : `, singleRequest);
     let ozoneRequest = {}; // we only want to set specific properties on this, not validBidRequests[0].params
-    delete ozoneRequest.test; // don't allow test to be set in the config - ONLY use $_GET['pbjs_debug']
-
-    let fpd = bidderRequest.ortb2;
+    logInfo('going to get ortb2 from bidder request...');
+    let fpd = deepAccess(bidderRequest, 'ortb2', null);
+    logInfo('got fpd: ', fpd);
     if (fpd && deepAccess(fpd, 'user')) {
       logInfo('added FPD user object');
       ozoneRequest.user = fpd.user;
     }
-
     const getParams = this.getGetParametersAsObject();
     const wlOztestmodeKey = whitelabelPrefix + 'testmode';
     const isTestMode = getParams[wlOztestmodeKey] || null; // this can be any string, it's used for testing ads
@@ -212,7 +199,8 @@ export const spec = {
       let placementId = placementIdOverrideFromGetParam || this.getPlacementId(ozoneBidRequest); // prefer to use a valid override param, else the bidRequest placement Id
       obj.id = ozoneBidRequest.bidId; // this causes an error if we change it to something else, even if you update the bidRequest object: "WARNING: Bidder ozone made bid for unknown request ID: mb7953.859498327448. Ignoring."
       obj.tagid = placementId;
-      obj.secure = window.location.protocol === 'https:' ? 1 : 0;
+      let parsed = parseUrl(getRefererInfo().page);
+      obj.secure = parsed.protocol === 'https' ? 1 : 0;
       let arrBannerSizes = [];
       if (!ozoneBidRequest.hasOwnProperty('mediaTypes')) {
         if (ozoneBidRequest.hasOwnProperty('sizes')) {
@@ -292,7 +280,7 @@ export const spec = {
         }
       }
       if (fpd && deepAccess(fpd, 'site')) {
-        logInfo('added fpd.site');
+        logInfo('adding fpd.site');
         if (deepAccess(obj, 'ext.' + whitelabelBidder + '.customData.0.targeting', false)) {
           obj.ext[whitelabelBidder].customData[0].targeting = Object.assign(obj.ext[whitelabelBidder].customData[0].targeting, fpd.site);
         } else {
@@ -304,7 +292,6 @@ export const spec = {
       }
       return obj;
     });
-
     let extObj = {};
     extObj[whitelabelBidder] = {};
     extObj[whitelabelBidder][whitelabelPrefix + '_pb_v'] = OZONEVERSION;
@@ -315,8 +302,7 @@ export const spec = {
         extObj[whitelabelBidder].pubcid = userIds.pubcid;
       }
     }
-
-    extObj[whitelabelBidder].pv = this.getPageId(); // attach the page ID that will be common to all auciton calls for this page if refresh() is called
+    extObj[whitelabelBidder].pv = this.getPageId(); // attach the page ID that will be common to all auction calls for this page if refresh() is called
     let ozOmpFloorDollars = this.getWhitelabelConfigItem('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
     logInfo(`${whitelabelPrefix}_omp_floor dollar value = `, ozOmpFloorDollars);
     if (typeof ozOmpFloorDollars === 'number') {
@@ -327,25 +313,22 @@ export const spec = {
     let ozWhitelistAdserverKeys = this.getWhitelabelConfigItem('ozone.oz_whitelist_adserver_keys');
     let useOzWhitelistAdserverKeys = isArray(ozWhitelistAdserverKeys) && ozWhitelistAdserverKeys.length > 0;
     extObj[whitelabelBidder][whitelabelPrefix + '_kvp_rw'] = useOzWhitelistAdserverKeys ? 1 : 0;
-    if (whitelabelBidder != 'ozone') {
+    if (whitelabelBidder !== 'ozone') {
       logInfo('setting aliases object');
       extObj.prebid = {aliases: {'ozone': whitelabelBidder}};
     }
-    if (getParams.hasOwnProperty('ozf')) { extObj[whitelabelBidder]['ozf'] = getParams.ozf == 'true' || getParams.ozf == 1 ? 1 : 0; }
-    if (getParams.hasOwnProperty('ozpf')) { extObj[whitelabelBidder]['ozpf'] = getParams.ozpf == 'true' || getParams.ozpf == 1 ? 1 : 0; }
+    if (getParams.hasOwnProperty('ozf')) { extObj[whitelabelBidder]['ozf'] = getParams.ozf === 'true' || getParams.ozf === '1' ? 1 : 0; }
+    if (getParams.hasOwnProperty('ozpf')) { extObj[whitelabelBidder]['ozpf'] = getParams.ozpf === 'true' || getParams.ozpf === '1' ? 1 : 0; }
     if (getParams.hasOwnProperty('ozrp') && getParams.ozrp.match(/^[0-3]$/)) { extObj[whitelabelBidder]['ozrp'] = parseInt(getParams.ozrp); }
     if (getParams.hasOwnProperty('ozip') && getParams.ozip.match(/^\d+$/)) { extObj[whitelabelBidder]['ozip'] = parseInt(getParams.ozip); }
     if (this.propertyBag.endpointOverride != null) { extObj[whitelabelBidder]['origin'] = this.propertyBag.endpointOverride; }
-
-    var userExtEids = this.generateEids(validBidRequests); // generate the UserIDs in the correct format for UserId module
-
+    let userExtEids = deepAccess(validBidRequests, '0.userIdAsEids', []); // generate the UserIDs in the correct format for UserId module
     ozoneRequest.site = {
       'publisher': {'id': htmlParams.publisherId},
-      'page': document.location.href,
+      'page': getRefererInfo().page,
       'id': htmlParams.siteId
     };
-    ozoneRequest.test = (getParams.hasOwnProperty('pbjs_debug') && getParams['pbjs_debug'] === 'true') ? 1 : 0;
-
+    ozoneRequest.test = config.getConfig('debug') ? 1 : 0;
     if (bidderRequest && bidderRequest.gdprConsent) {
       logInfo('ADDING GDPR info');
       let apiVersion = deepAccess(bidderRequest, 'gdprConsent.apiVersion', 1);
@@ -359,20 +342,18 @@ export const spec = {
       logInfo('WILL NOT ADD GDPR info; no bidderRequest.gdprConsent object');
     }
     if (bidderRequest && bidderRequest.uspConsent) {
-      logInfo('ADDING CCPA info');
-      deepSetValue(ozoneRequest, 'user.ext.uspConsent', bidderRequest.uspConsent);
+      logInfo('ADDING USP consent info');
+      deepSetValue(ozoneRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
     } else {
-      logInfo('WILL NOT ADD CCPA info; no bidderRequest.uspConsent.');
+      logInfo('WILL NOT ADD USP consent info; no bidderRequest.uspConsent.');
     }
     if (schain) { // we set this while iterating over the bids
       logInfo('schain found');
       deepSetValue(ozoneRequest, 'source.ext.schain', schain);
     }
-
     if (config.getConfig('coppa') === true) {
       deepSetValue(ozoneRequest, 'regs.coppa', 1);
     }
-
     if (singleRequest) {
       logInfo('buildRequests starting to generate response for a single request');
       ozoneRequest.id = bidderRequest.auctionId; // Unique ID of the bid request, provided by the exchange.
@@ -414,19 +395,6 @@ export const spec = {
     logInfo(`buildRequests going to return for non-single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, arrRet);
     return arrRet;
   },
-  /**
-   * parse a bidRequestRef that contains getFloor(), get all the data from it for the sizes & media requested for this bid & return an object containing floor data you can send to auciton endpoint
-   * @param bidRequestRef object = a valid bid request object reference
-   * @return object
-   *
-   * call:
-   * bidObj.getFloor({
-      currency: 'USD', <- currency to return the value in
-      mediaType: ‘banner’,
-      size: ‘*’ <- or [300,250] or [[300,250],[640,480]]
-   * });
-   *
-   */
   getFloorObjectForAuction(bidRequestRef) {
     const mediaTypesSizes = {
       banner: deepAccess(bidRequestRef, 'mediaTypes.banner.sizes', null),
@@ -447,16 +415,6 @@ export const spec = {
     logInfo('getFloorObjectForAuction returning : ', JSON.parse(JSON.stringify(ret)));
     return ret;
   },
-  /**
-   * Interpret the response if the array contains BIDDER elements, in the format: [ [bidder1 bid 1, bidder1 bid 2], [bidder2 bid 1, bidder2 bid 2] ]
-   * NOte that in singleRequest mode this will be called once, else it will be called for each adSlot's response
-   *
-   * Updated April 2019 to return all bids, not just the one we decide is the 'winner'
-   *
-   * @param serverResponse
-   * @param request
-   * @returns {*}
-   */
   interpretResponse(serverResponse, request) {
     if (request && request.bidderRequest && request.bidderRequest.bids) { this.loadWhitelabelData(request.bidderRequest.bids[0]); }
     let startTime = new Date().getTime();
@@ -478,15 +436,12 @@ export const spec = {
       enhancedAdserverTargeting = true;
     }
     logInfo('enhancedAdserverTargeting', enhancedAdserverTargeting);
-
     serverResponse.seatbid = injectAdIdsIntoAllBidResponses(serverResponse.seatbid); // we now make sure that each bid in the bidresponse has a unique (within page) adId attribute.
-
     serverResponse.seatbid = this.removeSingleBidderMultipleBids(serverResponse.seatbid);
     let ozOmpFloorDollars = this.getWhitelabelConfigItem('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
     let addOzOmpFloorDollars = typeof ozOmpFloorDollars === 'number';
     let ozWhitelistAdserverKeys = this.getWhitelabelConfigItem('ozone.oz_whitelist_adserver_keys');
     let useOzWhitelistAdserverKeys = isArray(ozWhitelistAdserverKeys) && ozWhitelistAdserverKeys.length > 0;
-
     for (let i = 0; i < serverResponse.seatbid.length; i++) {
       let sb = serverResponse.seatbid[i];
       for (let j = 0; j < sb.bid.length; j++) {
@@ -499,17 +454,30 @@ export const spec = {
         let isVideo = false;
         let bidType = deepAccess(thisBid, 'ext.prebid.type');
         logInfo(`this bid type is : ${bidType}`, j);
+        let adserverTargeting = {};
         if (bidType === VIDEO) {
           isVideo = true;
+          this.setBidMediaTypeIfNotExist(thisBid, VIDEO);
           videoContext = this.getVideoContextForBidId(thisBid.bidId, request.bidderRequest.bids); // should be instream or outstream (or null if error)
           if (videoContext === 'outstream') {
-            logInfo('going to attach a renderer to OUTSTREAM video : ', j);
+            logInfo('going to set thisBid.mediaType = VIDEO & attach a renderer to OUTSTREAM video : ', j);
             thisBid.renderer = newRenderer(thisBid.bidId);
           } else {
-            logInfo('bid is not an outstream video, will not attach a renderer: ', j);
+            logInfo('bid is not an outstream video, will set thisBid.mediaType = VIDEO and thisBid.vastUrl and not attach a renderer: ', j);
+            thisBid.vastUrl = `https://${deepAccess(thisBid, 'ext.prebid.targeting.hb_cache_host', 'missing_host')}${deepAccess(thisBid, 'ext.prebid.targeting.hb_cache_path', 'missing_path')}?id=${deepAccess(thisBid, 'ext.prebid.targeting.hb_cache_id', 'missing_id')}`; // need to see if this works ok for ozone
+            adserverTargeting['hb_cache_host'] = deepAccess(thisBid, 'ext.prebid.targeting.hb_cache_host', 'no-host');
+            adserverTargeting['hb_cache_path'] = deepAccess(thisBid, 'ext.prebid.targeting.hb_cache_path', 'no-path');
+            if (!thisBid.hasOwnProperty('videoCacheKey')) {
+              let videoCacheUuid = deepAccess(thisBid, 'ext.prebid.targeting.hb_uuid', 'no_hb_uuid');
+              logInfo(`Adding videoCacheKey: ${videoCacheUuid}`);
+              thisBid.videoCacheKey = videoCacheUuid;
+            } else {
+              logInfo('videoCacheKey already exists on the bid object, will not add it');
+            }
           }
+        } else {
+          this.setBidMediaTypeIfNotExist(thisBid, BANNER);
         }
-        let adserverTargeting = {};
         if (enhancedAdserverTargeting) {
           let allBidsForThisBidid = ozoneGetAllBidsForBidId(thisBid.bidId, serverResponse.seatbid);
           logInfo('Going to iterate allBidsForThisBidId', allBidsForThisBidid);
@@ -552,7 +520,8 @@ export const spec = {
         adserverTargeting[whitelabelPrefix + '_auc_id'] = String(request.bidderRequest.auctionId);
         adserverTargeting[whitelabelPrefix + '_winner'] = String(winningSeat);
         adserverTargeting[whitelabelPrefix + '_bid'] = 'true';
-
+        adserverTargeting[whitelabelPrefix + '_cache_id'] = deepAccess(thisBid, 'ext.prebid.targeting.hb_cache_id', 'no-id');
+        adserverTargeting[whitelabelPrefix + '_uuid'] = deepAccess(thisBid, 'ext.prebid.targeting.hb_uuid', 'no-id');
         if (enhancedAdserverTargeting) {
           adserverTargeting[whitelabelPrefix + '_imp_id'] = String(winningBid.impid);
           adserverTargeting[whitelabelPrefix + '_pb_v'] = OZONEVERSION;
@@ -570,26 +539,24 @@ export const spec = {
       }
     }
     let endTime = new Date().getTime();
-    logInfo(`interpretResponse going to return at time ${endTime} (took ${endTime - startTime}ms) Time from buildRequests Start -> interpretRequests End = ${endTime - this.propertyBag.buildRequestsStart}ms`, arrAllBids);
+    logInfo(`interpretResponse going to return at time ${endTime} (took ${endTime - startTime}ms) Time from buildRequests Start -> interpretRequests End = ${endTime - this.propertyBag.buildRequestsStart}ms`);
+    logInfo('interpretResponse arrAllBids (serialised): ', JSON.parse(JSON.stringify(arrAllBids))); // this is ok to log because the renderer has not been attached yet
     return arrAllBids;
   },
-  /**
-   * Use this to get all config values
-   * Now it's getting complicated with whitelabeling, this simplifies the code for getting config values.
-   * eg. to get whitelabelled version you just sent the ozone default string like ozone.oz_omp_floor
-   * @param ozoneVersion string like 'ozone.oz_omp_floor'
-   * @return {string|object}
-   */
+  setBidMediaTypeIfNotExist(thisBid, mediaType) {
+    if (!thisBid.hasOwnProperty('mediaType')) {
+      logInfo(`setting thisBid.mediaType = ${mediaType}`);
+      thisBid.mediaType = mediaType;
+    } else {
+      logInfo(`found value for thisBid.mediaType: ${thisBid.mediaType}`);
+    }
+  },
   getWhitelabelConfigItem(ozoneVersion) {
-    if (this.propertyBag.whitelabel.bidder == 'ozone') { return config.getConfig(ozoneVersion); }
+    if (this.propertyBag.whitelabel.bidder === 'ozone') { return config.getConfig(ozoneVersion); }
     let whitelabelledSearch = ozoneVersion.replace('ozone', this.propertyBag.whitelabel.bidder);
     whitelabelledSearch = whitelabelledSearch.replace('oz_', this.propertyBag.whitelabel.keyPrefix + '_');
     return config.getConfig(whitelabelledSearch);
   },
-  /**
-   * If a bidder bids for > 1 size for an adslot, allow only the highest bid
-   * @param seatbid object (serverResponse.seatbid)
-   */
   removeSingleBidderMultipleBids(seatbid) {
     var ret = [];
     for (let i = 0; i < seatbid.length; i++) {
@@ -620,7 +587,7 @@ export const spec = {
     }
     if (optionsType.iframeEnabled) {
       var arrQueryString = [];
-      if (document.location.search.match(/pbjs_debug=true/)) {
+      if (config.getConfig('debug')) {
         arrQueryString.push('pbjs_debug=true');
       }
       arrQueryString.push('gdpr=' + (deepAccess(gdprConsent, 'gdprApplies', false) ? '1' : '0'));
@@ -633,7 +600,6 @@ export const spec = {
       arrQueryString.push('siteId=' + this.cookieSyncBag.siteId);
       arrQueryString.push('cb=' + Date.now());
       arrQueryString.push('bidder=' + this.propertyBag.whitelabel.bidder);
-
       var strQueryString = arrQueryString.join('&');
       if (strQueryString.length > 0) {
         strQueryString = '?' + strQueryString;
@@ -645,11 +611,6 @@ export const spec = {
       }];
     }
   },
-  /**
-   * Find the bid matching the bidId in the request object
-   * get instream or outstream if this was a video request else null
-   * @return object|null
-   */
   getBidRequestForBidId(bidId, arrBids) {
     for (let i = 0; i < arrBids.length; i++) {
       if (arrBids[i].bidId === bidId) { // bidId in the request comes back as impid in the seatbid bids
@@ -658,13 +619,6 @@ export const spec = {
     }
     return null;
   },
-  /**
-   * Locate the bid inside the arrBids for this bidId, then discover the video context, and return it.
-   * IF the bid cannot be found return null, else return a string.
-   * @param bidId
-   * @param arrBids
-   * @return string|null
-   */
   getVideoContextForBidId(bidId, arrBids) {
     let requestBid = this.getBidRequestForBidId(bidId, arrBids);
     if (requestBid != null) {
@@ -672,11 +626,6 @@ export const spec = {
     }
     return null;
   },
-  /**
-   * This is used for cookie sync, not auction call
-   *  Look for pubcid & all the other IDs according to http://prebid.org/dev-docs/modules/userId.html
-   *  @return map
-   */
   findAllUserIds(bidRequest) {
     var ret = {};
     let searchKeysSingle = ['pubcid', 'tdid', 'idl_env', 'criteoId', 'lotamePanoramaId', 'fabrickId'];
@@ -710,10 +659,6 @@ export const spec = {
       if (sharedid) {
         ret['sharedid'] = sharedid;
       }
-      let sharedidthird = deepAccess(bidRequest.userId, 'sharedid.third');
-      if (sharedidthird) {
-        ret['sharedidthird'] = sharedidthird;
-      }
     }
     if (!ret.hasOwnProperty('pubcid')) {
       let pubcid = deepAccess(bidRequest, 'crumbs.pubcid');
@@ -723,20 +668,9 @@ export const spec = {
     }
     return ret;
   },
-  /**
-   * Convenient method to get the value we need for the placementId - ONLY from the bidRequest - NOT taking into account any GET override ID
-   * @param bidRequest
-   * @return string
-   */
   getPlacementId(bidRequest) {
     return (bidRequest.params.placementId).toString();
   },
-  /**
-   * GET parameter introduced in 2.2.0 : ozstoredrequest
-   * IF the GET parameter exists then it must validate for placementId correctly
-   * IF there's a $_GET['ozstoredrequest'] & it's valid then return this. Else return null.
-   * @returns null|string
-   */
   getPlacementIdOverrideFromGetParam() {
     let whitelabelPrefix = this.propertyBag.whitelabel.keyPrefix;
     let arr = this.getGetParametersAsObject();
@@ -750,68 +684,19 @@ export const spec = {
     }
     return null;
   },
-  /**
-   * Generate an object we can append to the auction request, containing user data formatted correctly for different ssps
-   * http://prebid.org/dev-docs/modules/userId.html
-   * @param validBidRequests
-   * @return {Array}
-   */
-  generateEids(validBidRequests) {
-    let eids;
-    const bidRequest = validBidRequests[0];
-    if (bidRequest && bidRequest.userId) {
-      eids = bidRequest.userIdAsEids;
-      this.handleTTDId(eids, validBidRequests);
-    }
-    return eids;
-  },
-  handleTTDId(eids, validBidRequests) {
-    let ttdId = null;
-    let adsrvrOrgId = config.getConfig('adsrvrOrgId');
-    if (isStr(deepAccess(validBidRequests, '0.userId.tdid'))) {
-      ttdId = validBidRequests[0].userId.tdid;
-    } else if (adsrvrOrgId && isStr(adsrvrOrgId.TDID)) {
-      ttdId = adsrvrOrgId.TDID;
-    }
-    if (ttdId !== null) {
-      eids.push({
-        'source': 'adserver.org',
-        'uids': [{
-          'id': ttdId,
-          'atype': 1,
-          'ext': {
-            'rtiPartner': 'TDID'
-          }
-        }]
-      });
-    }
-  },
   getGetParametersAsObject() {
-    let items = location.search.substr(1).split('&');
-    let ret = {};
-    let tmp = null;
-    for (let index = 0; index < items.length; index++) {
-      tmp = items[index].split('=');
-      ret[tmp[0]] = tmp[1];
-    }
-    return ret;
+    let parsed = parseUrl(getRefererInfo().page);
+    logInfo('getGetParametersAsObject found:', parsed.search);
+    return parsed.search;
   },
-  /**
-   * Do we have to block this request? Could be due to config values (no longer checking gdpr)
-   * @return {boolean|*[]} true = block the request, else false
-   */
   blockTheRequest() {
     let ozRequest = this.getWhitelabelConfigItem('ozone.oz_request');
     if (typeof ozRequest == 'boolean' && !ozRequest) {
-      logWarn(`Will not allow auction : ${this.propertyBag.whitelabel.keyPrefix}one.${this.propertyBag.whitelabel.keyPrefix}_request is set to false`);
+      logWarn(`Will not allow auction : ${this.propertyBag.whitelabel.keyPrefix}_request is set to false`);
       return true;
     }
     return false;
   },
-  /**
-   * This returns a random ID for this page. It starts off with the current ms timestamp then appends a random component
-   * @return {string}
-   */
   getPageId: function() {
     if (this.propertyBag.pageId == null) {
       let randPart = '';
@@ -829,14 +714,6 @@ export const spec = {
     ret = this._unpackVideoConfigIntoIABformat(ret, childConfig);
     return ret;
   },
-  /**
-   *
-   * look in ONE object to get video config (we need to call this multiple times, so child settings override parent)
-   * @param ret
-   * @param objConfig
-   * @return {*}
-   * @private
-   */
   _unpackVideoConfigIntoIABformat(ret, objConfig) {
     let arrVideoKeysAllowed = ['mimes', 'minduration', 'maxduration', 'protocols', 'w', 'h', 'startdelay', 'placement', 'linearity', 'skip', 'skipmin', 'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate', 'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend', 'delivery', 'pos', 'companionad', 'api', 'companiontype'];
     for (const key in objConfig) {
@@ -865,14 +742,6 @@ export const spec = {
     objRet = this._addVideoDefaults(objRet, childConfig, true); // child config will override parent config
     return objRet;
   },
-  /**
-   * modify objRet, adding in default values
-   * @param objRet
-   * @param objConfig
-   * @param addIfMissing
-   * @return {*}
-   * @private
-   */
   _addVideoDefaults(objRet, objConfig, addIfMissing) {
     let context = deepAccess(objConfig, 'context');
     if (context === 'outstream') {
@@ -889,15 +758,38 @@ export const spec = {
       objRet.skip = skippable ? 1 : 0;
     }
     return objRet;
+  },
+  getLoggableBidObject(bid) {
+    let logObj = {
+      ad: bid.ad,
+      adId: bid.adId,
+      adUnitCode: bid.adUnitCode,
+      adm: bid.adm,
+      adomain: bid.adomain,
+      adserverTargeting: bid.adserverTargeting,
+      auctionId: bid.auctionId,
+      bidId: bid.bidId,
+      bidder: bid.bidder,
+      bidderCode: bid.bidderCode,
+      cpm: bid.cpm,
+      creativeId: bid.creativeId,
+      crid: bid.crid,
+      currency: bid.currency,
+      h: bid.h,
+      w: bid.w,
+      impid: bid.impid,
+      mediaType: bid.mediaType,
+      params: bid.params,
+      price: bid.price,
+      transactionId: bid.transactionId,
+      ttl: bid.ttl
+    };
+    if (bid.hasOwnProperty('floorData')) {
+      logObj.floorData = bid.floorData;
+    }
+    return logObj;
   }
 };
-
-/**
- * add a page-level-unique adId element to all server response bids.
- * NOTE that this is destructive - it mutates the serverResponse object sent in as a parameter
- * @param seatbid  object (serverResponse.seatbid)
- * @returns seatbid object
- */
 export function injectAdIdsIntoAllBidResponses(seatbid) {
   logInfo('injectAdIdsIntoAllBidResponses', seatbid);
   for (let i = 0; i < seatbid.length; i++) {
@@ -908,7 +800,6 @@ export function injectAdIdsIntoAllBidResponses(seatbid) {
   }
   return seatbid;
 }
-
 export function checkDeepArray(Arr) {
   if (Array.isArray(Arr)) {
     if (Array.isArray(Arr[0])) {
@@ -920,7 +811,6 @@ export function checkDeepArray(Arr) {
     return Arr;
   }
 }
-
 export function defaultSize(thebidObj) {
   if (!thebidObj) {
     logInfo('defaultSize received empty bid obj! going to return fixed default size');
@@ -935,13 +825,6 @@ export function defaultSize(thebidObj) {
   returnObject.defaultHeight = checkDeepArray(sizes)[1];
   return returnObject;
 }
-
-/**
- * Do the messy searching for the best bid response in the serverResponse.seatbid array matching the requestBid.bidId
- * @param requestBid
- * @param serverResponseSeatBid
- * @returns {*} bid object
- */
 export function ozoneGetWinnerForRequestBid(requestBidId, serverResponseSeatBid) {
   let thisBidWinner = null;
   let winningSeat = null;
@@ -960,13 +843,6 @@ export function ozoneGetWinnerForRequestBid(requestBidId, serverResponseSeatBid)
   }
   return {'seat': winningSeat, 'bid': thisBidWinner};
 }
-
-/**
- * Get a list of all the bids, for this bidId. The keys in the response object will be {seatname} OR {seatname}{w}x{h} if seatname already exists
- * @param matchBidId
- * @param serverResponseSeatBid
- * @returns {} = {ozone|320x600:{obj}, ozone|320x250:{obj}, appnexus|300x250:{obj}, ... }
- */
 export function ozoneGetAllBidsForBidId(matchBidId, serverResponseSeatBid) {
   let objBids = {};
   for (let j = 0; j < serverResponseSeatBid.length; j++) {
@@ -986,21 +862,13 @@ export function ozoneGetAllBidsForBidId(matchBidId, serverResponseSeatBid) {
   }
   return objBids;
 }
-
-/**
- * Round the bid price down according to the granularity
- * @param price
- * @param mediaType = video, banner or native
- */
 export function getRoundedBid(price, mediaType) {
   const mediaTypeGranularity = config.getConfig(`mediaTypePriceGranularity.${mediaType}`); // might be string or object or nothing; if set then this takes precedence over 'priceGranularity'
   let objBuckets = config.getConfig('customPriceBucket'); // this is always an object - {} if strBuckets is not 'custom'
   let strBuckets = config.getConfig('priceGranularity'); // priceGranularity value, always a string ** if priceGranularity is set to an object then it's always 'custom' **
   let theConfigObject = getGranularityObject(mediaType, mediaTypeGranularity, strBuckets, objBuckets);
   let theConfigKey = getGranularityKeyName(mediaType, mediaTypeGranularity, strBuckets);
-
   logInfo('getRoundedBid. price:', price, 'mediaType:', mediaType, 'configkey:', theConfigKey, 'configObject:', theConfigObject, 'mediaTypeGranularity:', mediaTypeGranularity, 'strBuckets:', strBuckets);
-
   let priceStringsObj = getPriceBucketString(
     price,
     theConfigObject,
@@ -1021,13 +889,6 @@ export function getRoundedBid(price, mediaType) {
   }
   return priceStringsObj['auto'];
 }
-
-/**
- * return the key to use to get the value out of the priceStrings object, taking into account anything at
- * config.priceGranularity level or config.mediaType.xxx level
- * I've noticed that the key specified by prebid core : config.getConfig('priceGranularity') does not properly
- * take into account the 2-levels of config
- */
 export function getGranularityKeyName(mediaType, mediaTypeGranularity, strBuckets) {
   if (typeof mediaTypeGranularity === 'string') {
     return mediaTypeGranularity;
@@ -1040,11 +901,6 @@ export function getGranularityKeyName(mediaType, mediaTypeGranularity, strBucket
   }
   return 'auto'; // fall back to a default key - should literally never be needed.
 }
-
-/**
- * return the object to use to create the custom value of the priceStrings object, taking into account anything at
- * config.priceGranularity level or config.mediaType.xxx level
- */
 export function getGranularityObject(mediaType, mediaTypeGranularity, strBuckets, objBuckets) {
   if (typeof mediaTypeGranularity === 'object') {
     return mediaTypeGranularity;
@@ -1054,12 +910,6 @@ export function getGranularityObject(mediaType, mediaTypeGranularity, strBuckets
   }
   return '';
 }
-
-/**
- * We expect to be able to find a standard set of properties on winning bid objects; add them here.
- * @param seatBid
- * @returns {*}
- */
 export function ozoneAddStandardProperties(seatBid, defaultWidth, defaultHeight) {
   seatBid.cpm = seatBid.price;
   seatBid.bidId = seatBid.impid;
@@ -1073,12 +923,6 @@ export function ozoneAddStandardProperties(seatBid, defaultWidth, defaultHeight)
   seatBid.ttl = 300;
   return seatBid;
 }
-
-/**
- *
- * @param objVideo will be like {"playerSize":[640,480],"mimes":["video/mp4"],"context":"outstream"} or POSSIBLY {"playerSize":[[640,480]],"mimes":["video/mp4"],"context":"outstream"}
- * @return object {w,h} or null
- */
 export function getWidthAndHeightFromVideoObject(objVideo) {
   let playerSize = getPlayerSizeFromObject(objVideo);
   if (!playerSize) {
@@ -1098,11 +942,6 @@ export function getWidthAndHeightFromVideoObject(objVideo) {
   }
   return ({'w': playerSize[0], 'h': playerSize[1]});
 }
-
-/**
- * @param objVideo will be like {"playerSize":[640,480],"mimes":["video/mp4"],"context":"outstream"} or POSSIBLY {"playerSize":[[640,480]],"mimes":["video/mp4"],"context":"outstream"}
- * @return object {w,h} or null
- */
 export function playerSizeIsNestedArray(objVideo) {
   let playerSize = getPlayerSizeFromObject(objVideo);
   if (!playerSize) {
@@ -1113,12 +952,6 @@ export function playerSizeIsNestedArray(objVideo) {
   }
   return (playerSize[0] && typeof playerSize[0] === 'object');
 }
-
-/**
- * Common functionality when looking at a video object, to get the playerSize
- * @param objVideo
- * @returns {*}
- */
 function getPlayerSizeFromObject(objVideo) {
   logInfo('getPlayerSizeFromObject received object', objVideo);
   let playerSize = deepAccess(objVideo, 'playerSize');
@@ -1135,10 +968,6 @@ function getPlayerSizeFromObject(objVideo) {
   }
   return playerSize;
 }
-/*
-  Rendering video ads - create a renderer instance, mark it as not loaded, set a renderer function.
-  The renderer function will not assume that the renderer script is loaded - it will push() the ultimate render function call
- */
 function newRenderer(adUnitCode, rendererOptions = {}) {
   let isLoaded = window.ozoneVideo;
   logInfo(`newRenderer going to set loaded to ${isLoaded ? 'true' : 'false'}`);
@@ -1151,16 +980,18 @@ function newRenderer(adUnitCode, rendererOptions = {}) {
   try {
     renderer.setRender(outstreamRender);
   } catch (err) {
-    logError('Prebid Error when calling setRender on renderer', JSON.parse(JSON.stringify(renderer)), err);
+    logError('Prebid Error when calling setRender on renderer', renderer, err);
   }
+  logInfo('returning renderer object');
   return renderer;
 }
 function outstreamRender(bid) {
-  logInfo('outstreamRender called. Going to push the call to window.ozoneVideo.outstreamRender(bid) bid =', JSON.parse(JSON.stringify(bid)));
+  logInfo('outstreamRender called. Going to push the call to window.ozoneVideo.outstreamRender(bid) bid = (first static, then reference)');
+  logInfo(JSON.parse(JSON.stringify(spec.getLoggableBidObject(bid))));
   bid.renderer.push(() => {
+    logInfo('Going to execute window.ozoneVideo.outstreamRender');
     window.ozoneVideo.outstreamRender(bid);
   });
 }
-
 registerBidder(spec);
 logInfo(`*BidAdapter ${OZONEVERSION} was loaded`);
diff --git a/modules/ozoneBidAdapter.md b/modules/ozoneBidAdapter.md
index ca18c962219..6f4cf752f22 100644
--- a/modules/ozoneBidAdapter.md
+++ b/modules/ozoneBidAdapter.md
@@ -72,3 +72,40 @@ adUnits = [{
                     }]
                 }];
 ```
+
+//Instream Video adUnit
+
+adUnits = [{
+					code: 'video1',
+					mediaTypes: {
+						video: {
+							playerSize: [640, 480],
+							context: 'instream',
+							mimes: ['video/mp4'],
+							protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+							playbackmethod: [2]
+						}
+					},
+					bids: [{
+							bidder: 'ozone',
+							params: {
+								publisherId: 'OZONENUK0001',
+								placementId: '8000000328', // or 999
+								siteId: '4204204201',
+								video: {
+									skippable: true,
+									playback_method: ['auto_play_sound_off']
+								},
+							customData: [{
+							      "settings": {},
+							      "targeting": {
+							          "key": "value",
+								  "key2": ["value1", "value2"]
+								  }
+							}
+							]
+
+							}
+						}]
+				};
+```
diff --git a/test/spec/modules/ozoneBidAdapter_spec.js b/test/spec/modules/ozoneBidAdapter_spec.js
index b29494e0b54..4c7e330b237 100644
--- a/test/spec/modules/ozoneBidAdapter_spec.js
+++ b/test/spec/modules/ozoneBidAdapter_spec.js
@@ -7,12 +7,6 @@ import * as utils from '../../../src/utils.js';
 const OZONEURI = 'https://elb.the-ozone-project.com/openrtb2/auction';
 const BIDDER_CODE = 'ozone';
 
-/*
-
-NOTE - use firefox console to deep copy the objects to use here
-
- */
-var originalPropertyBag = {'pageId': null};
 var validBidRequests = [
   {
     adUnitCode: 'div-gpt-ad-1460505748561-0',
@@ -147,7 +141,6 @@ var validBidRequestsWithUserIdData = [
         }]
       }
     ]
-
   }
 ];
 var validBidRequestsMinimal = [
@@ -176,7 +169,6 @@ var validBidRequestsNoSizes = [
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
 ];
-
 var validBidRequestsWithBannerMediaType = [
   {
     adUnitCode: 'div-gpt-ad-1460505748561-0',
@@ -205,7 +197,6 @@ var validBidRequestsWithNonBannerMediaTypesAndValidOutstreamVideo = [
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
 ];
-
 var validBidRequests1OutstreamVideo2020 = [
   {
     'bidder': 'ozone',
@@ -288,7 +279,6 @@ var validBidRequests1OutstreamVideo2020 = [
     'bidderWinsCount': 0
   }
 ];
-
 var validBidderRequest1OutstreamVideo2020 = {
   bidderRequest: {
     auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
@@ -392,84 +382,79 @@ var validBidderRequest1OutstreamVideo2020 = {
   }
 };
 var validBidderRequest = {
-  bidderRequest: {
+  auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+  auctionStart: 1536838908986,
+  bidderCode: 'ozone',
+  bidderRequestId: '1c1586b27a1b5c8',
+  bids: [{
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
     auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
-    auctionStart: 1536838908986,
-    bidderCode: 'ozone',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
-    bids: [{
-      adUnitCode: 'div-gpt-ad-1460505748561-0',
-      auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
-      bidId: '2899ec066a91ff8',
-      bidRequestsCount: 1,
-      bidder: 'ozone',
-      bidderRequestId: '1c1586b27a1b5c8',
-      crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-      params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
-      sizes: [[300, 250], [300, 600]],
-      transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
-    }],
-    doneCbCallCount: 1,
-    start: 1536838908987,
-    timeout: 3000
-  }
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }],
+  doneCbCallCount: 1,
+  start: 1536838908987,
+  timeout: 3000
 };
-
 var bidderRequestWithFullGdpr = {
-  bidderRequest: {
+  auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
+  auctionStart: 1536838908986,
+  bidderCode: 'ozone',
+  bidderRequestId: '1c1586b27a1b5c8',
+  bids: [{
+    adUnitCode: 'div-gpt-ad-1460505748561-0',
     auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
-    auctionStart: 1536838908986,
-    bidderCode: 'ozone',
+    bidId: '2899ec066a91ff8',
+    bidRequestsCount: 1,
+    bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
-    bids: [{
-      adUnitCode: 'div-gpt-ad-1460505748561-0',
-      auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
-      bidId: '2899ec066a91ff8',
-      bidRequestsCount: 1,
-      bidder: 'ozone',
-      bidderRequestId: '1c1586b27a1b5c8',
-      crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-      params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
-      sizes: [[300, 250], [300, 600]],
-      transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
-    }],
-    doneCbCallCount: 1,
-    start: 1536838908987,
-    timeout: 3000,
-    gdprConsent: {
-      'consentString': 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
-      'vendorData': {
-        'metadata': 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
-        'gdprApplies': true,
-        'hasGlobalScope': false,
-        'cookieVersion': '1',
-        'created': '2019-05-31T12:46:48.825',
-        'lastUpdated': '2019-05-31T12:46:48.825',
-        'cmpId': '28',
-        'cmpVersion': '1',
-        'consentLanguage': 'en',
-        'consentScreen': '1',
-        'vendorListVersion': 148,
-        'maxVendorId': 631,
-        'purposeConsents': {
-          '1': true,
-          '2': true,
-          '3': true,
-          '4': true,
-          '5': true
-        },
-        'vendorConsents': {
-          '468': true,
-          '522': true,
-          '524': true, /* 524 is ozone */
-          '565': true,
-          '591': true
-        }
+    crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
+    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { banner: { topframe: 1, w: 300, h: 250, format: [{ w: 300, h: 250 }, { w: 300, h: 600 }] }, id: '2899ec066a91ff8', secure: 1, tagid: 'undefined' } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }],
+  doneCbCallCount: 1,
+  start: 1536838908987,
+  timeout: 3000,
+  gdprConsent: {
+    'consentString': 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
+    'vendorData': {
+      'metadata': 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
+      'gdprApplies': true,
+      'hasGlobalScope': false,
+      'cookieVersion': '1',
+      'created': '2019-05-31T12:46:48.825',
+      'lastUpdated': '2019-05-31T12:46:48.825',
+      'cmpId': '28',
+      'cmpVersion': '1',
+      'consentLanguage': 'en',
+      'consentScreen': '1',
+      'vendorListVersion': 148,
+      'maxVendorId': 631,
+      'purposeConsents': {
+        '1': true,
+        '2': true,
+        '3': true,
+        '4': true,
+        '5': true
       },
-      'gdprApplies': true
-    }, }
+      'vendorConsents': {
+        '468': true,
+        '522': true,
+        '524': true, /* 524 is ozone */
+        '565': true,
+        '591': true
+      }
+    },
+    'gdprApplies': true
+  }
 };
-
 var gdpr1 = {
   'consentString': 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
   'vendorData': {
@@ -502,7 +487,6 @@ var gdpr1 = {
   },
   'gdprApplies': true
 };
-
 var bidderRequestWithPartialGdpr = {
   bidderRequest: {
     auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99',
@@ -547,7 +531,6 @@ var bidderRequestWithPartialGdpr = {
     }
   }
 };
-
 var validResponse = {
   'body': {
     'id': 'd6198807-7a53-4141-b2db-d2cb754d68ba',
@@ -604,7 +587,6 @@ var validResponse = {
   },
   'headers': {}
 };
-
 var validResponse2Bids = {
   'body': {
     'id': 'd6198807-7a53-4141-b2db-d2cb754d68ba',
@@ -691,9 +673,6 @@ var validResponse2Bids = {
   },
   'headers': {}
 };
-/*
-A bidder returns a bid for both sizes in an adunit
- */
 var validResponse2BidsSameAdunit = {
   'body': {
     'id': 'd6198807-7a53-4141-b2db-d2cb754d68ba',
@@ -780,14 +759,6 @@ var validResponse2BidsSameAdunit = {
   },
   'headers': {}
 };
-/*
-
-SPECIAL CONSIDERATION FOR VIDEO TESTS:
-
-DO NOT USE _validVideoResponse directly - the interpretResponse function will modify it (adding a renderer!!!) so all
-subsequent calls will already have a renderer attached!!!
-
-*/
 function getCleanValidVideoResponse() {
   return JSON.parse(JSON.stringify(_validVideoResponse));
 }
@@ -873,7 +844,6 @@ var _validVideoResponse = {
   },
   'headers': {}
 };
-
 var validBidResponse1adWith2Bidders = {
   'body': {
     'id': '91221f96-b931-4acc-8f05-c2a1186fa5ac',
@@ -964,11 +934,6 @@ var validBidResponse1adWith2Bidders = {
   },
   'headers': {}
 };
-
-/*
-testing 2 ads, 2 bidders, one bidder bids for both slots in one adunit
- */
-
 var multiRequest1 = [
   {
     'bidder': 'ozone',
@@ -1101,182 +1066,178 @@ var multiRequest1 = [
     'bidderWinsCount': 0
   }
 ];
-
 var multiBidderRequest1 = {
-  bidderRequest: {
-    'bidderCode': 'ozone',
-    'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
-    'bidderRequestId': '1d03a1dfc563fc',
-    'bids': [
-      {
-        'bidder': 'ozone',
-        'params': {
-          'publisherId': 'OZONERUP0001',
-          'siteId': '4204204201',
-          'placementId': '0420420421',
-          'customData': [
-            {
-              'settings': {},
-              'targeting': {
-                'sens': 'f',
-                'pt1': '/uk',
-                'pt2': 'uk',
-                'pt3': 'network-front',
-                'pt4': 'ng',
-                'pt5': [
-                  'uk'
-                ],
-                'pt7': 'desktop',
-                'pt8': [
-                  'tfmqxwj7q',
-                  'txeh7uyo0',
-                  't8nxz6qzd',
-                  't8nyiude5',
-                  'sek9ghqwi'
-                ],
-                'pt9': '|k0xw2vqzp33kklb3j5w4|||'
-              }
-            }
-          ]
-        },
-        'mediaTypes': {
-          'banner': {
-            'sizes': [
-              [
-                300,
-                250
+  'bidderCode': 'ozone',
+  'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+  'bidderRequestId': '1d03a1dfc563fc',
+  'bids': [
+    {
+      'bidder': 'ozone',
+      'params': {
+        'publisherId': 'OZONERUP0001',
+        'siteId': '4204204201',
+        'placementId': '0420420421',
+        'customData': [
+          {
+            'settings': {},
+            'targeting': {
+              'sens': 'f',
+              'pt1': '/uk',
+              'pt2': 'uk',
+              'pt3': 'network-front',
+              'pt4': 'ng',
+              'pt5': [
+                'uk'
               ],
-              [
-                300,
-                600
-              ]
-            ]
+              'pt7': 'desktop',
+              'pt8': [
+                'tfmqxwj7q',
+                'txeh7uyo0',
+                't8nxz6qzd',
+                't8nyiude5',
+                'sek9ghqwi'
+              ],
+              'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+            }
           }
-        },
-        'adUnitCode': 'mpu',
-        'transactionId': '6480bac7-31b5-4723-9145-ad8966660651',
-        'sizes': [
-          [
-            300,
-            250
-          ],
-          [
-            300,
-            600
-          ]
-        ],
-        'bidId': '2d30e86db743a8',
-        'bidderRequestId': '1d03a1dfc563fc',
-        'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
-        'src': 'client',
-        'bidRequestsCount': 1,
-        'bidderRequestsCount': 1,
-        'bidderWinsCount': 0
+        ]
       },
-      {
-        'bidder': 'ozone',
-        'params': {
-          'publisherId': 'OZONERUP0001',
-          'siteId': '4204204201',
-          'placementId': '0420420421',
-          'customData': [
-            {
-              'settings': {},
-              'targeting': {
-                'sens': 'f',
-                'pt1': '/uk',
-                'pt2': 'uk',
-                'pt3': 'network-front',
-                'pt4': 'ng',
-                'pt5': [
-                  'uk'
-                ],
-                'pt7': 'desktop',
-                'pt8': [
-                  'tfmqxwj7q',
-                  'penl4dfdk',
-                  't8nxz6qzd',
-                  't8nyiude5',
-                  'sek9ghqwi'
-                ],
-                'pt9': '|k0xw2vqzp33kklb3j5w4|||'
-              }
-            }
-          ]
-        },
-        'mediaTypes': {
-          'banner': {
-            'sizes': [
-              [
-                728,
-                90
-              ],
-              [
-                970,
-                250
-              ]
+      'mediaTypes': {
+        'banner': {
+          'sizes': [
+            [
+              300,
+              250
+            ],
+            [
+              300,
+              600
             ]
-          }
-        },
-        'adUnitCode': 'leaderboard',
-        'transactionId': 'a49988e6-ae7c-46c4-9598-f18db49892a0',
-        'sizes': [
-          [
-            728,
-            90
-          ],
-          [
-            970,
-            250
           ]
+        }
+      },
+      'adUnitCode': 'mpu',
+      'transactionId': '6480bac7-31b5-4723-9145-ad8966660651',
+      'sizes': [
+        [
+          300,
+          250
         ],
-        'bidId': '3025f169863b7f8',
-        'bidderRequestId': '1d03a1dfc563fc',
-        'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
-        'src': 'client',
-        'bidRequestsCount': 1,
-        'bidderRequestsCount': 1,
-        'bidderWinsCount': 0
-      }
-    ],
-    'auctionStart': 1592918645574,
-    'timeout': 3000,
-    'refererInfo': {
-      'referer': 'http://ozone.ardm.io/adapter/2.4.0/620x350-switch.html?guardian=true&pbjs_debug=true',
-      'reachedTop': true,
-      'numIframes': 0,
-      'stack': [
-        'http://ozone.ardm.io/adapter/2.4.0/620x350-switch.html?guardian=true&pbjs_debug=true'
-      ]
+        [
+          300,
+          600
+        ]
+      ],
+      'bidId': '2d30e86db743a8',
+      'bidderRequestId': '1d03a1dfc563fc',
+      'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
     },
-    'gdprConsent': {
-      'consentString': 'BOvy5sFO1dBa2AKAiBENDP-AAAAwVrv7_77-_9f-_f__9uj3Gr_v_f__32ccL5tv3h_7v-_7fi_-0nV4u_1tft9ydk1-5ctDztp507iakiPHmqNeb9n_mz1eZpRP58E09j53z7Ew_v8_v-b7BCPN_Y3v-8K96kA',
-      'vendorData': {
-        'metadata': 'BOvy5sFO1dBa2AKAiBENDPA',
-        'gdprApplies': true,
-        'hasGlobalConsent': false,
-        'hasGlobalScope': false,
-        'purposeConsents': {
-          '1': true,
-          '2': true,
-          '3': true,
-          '4': true,
-          '5': true
-        },
-        'vendorConsents': {
-          '1': true,
-          '2': true,
-          '3': false,
-          '4': true,
-          '5': true
+    {
+      'bidder': 'ozone',
+      'params': {
+        'publisherId': 'OZONERUP0001',
+        'siteId': '4204204201',
+        'placementId': '0420420421',
+        'customData': [
+          {
+            'settings': {},
+            'targeting': {
+              'sens': 'f',
+              'pt1': '/uk',
+              'pt2': 'uk',
+              'pt3': 'network-front',
+              'pt4': 'ng',
+              'pt5': [
+                'uk'
+              ],
+              'pt7': 'desktop',
+              'pt8': [
+                'tfmqxwj7q',
+                'penl4dfdk',
+                't8nxz6qzd',
+                't8nyiude5',
+                'sek9ghqwi'
+              ],
+              'pt9': '|k0xw2vqzp33kklb3j5w4|||'
+            }
+          }
+        ]
+      },
+      'mediaTypes': {
+        'banner': {
+          'sizes': [
+            [
+              728,
+              90
+            ],
+            [
+              970,
+              250
+            ]
+          ]
         }
       },
-      'gdprApplies': true
+      'adUnitCode': 'leaderboard',
+      'transactionId': 'a49988e6-ae7c-46c4-9598-f18db49892a0',
+      'sizes': [
+        [
+          728,
+          90
+        ],
+        [
+          970,
+          250
+        ]
+      ],
+      'bidId': '3025f169863b7f8',
+      'bidderRequestId': '1d03a1dfc563fc',
+      'auctionId': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
+    }
+  ],
+  'auctionStart': 1592918645574,
+  'timeout': 3000,
+  'refererInfo': {
+    'referer': 'http://ozone.ardm.io/adapter/2.4.0/620x350-switch.html?guardian=true&pbjs_debug=true',
+    'reachedTop': true,
+    'numIframes': 0,
+    'stack': [
+      'http://ozone.ardm.io/adapter/2.4.0/620x350-switch.html?guardian=true&pbjs_debug=true'
+    ]
+  },
+  'gdprConsent': {
+    'consentString': 'BOvy5sFO1dBa2AKAiBENDP-AAAAwVrv7_77-_9f-_f__9uj3Gr_v_f__32ccL5tv3h_7v-_7fi_-0nV4u_1tft9ydk1-5ctDztp507iakiPHmqNeb9n_mz1eZpRP58E09j53z7Ew_v8_v-b7BCPN_Y3v-8K96kA',
+    'vendorData': {
+      'metadata': 'BOvy5sFO1dBa2AKAiBENDPA',
+      'gdprApplies': true,
+      'hasGlobalConsent': false,
+      'hasGlobalScope': false,
+      'purposeConsents': {
+        '1': true,
+        '2': true,
+        '3': true,
+        '4': true,
+        '5': true
+      },
+      'vendorConsents': {
+        '1': true,
+        '2': true,
+        '3': false,
+        '4': true,
+        '5': true
+      }
     },
-    'start': 1592918645578
-  }
+    'gdprApplies': true
+  },
+  'start': 1592918645578
 };
-
 var multiResponse1 = {
   'body': {
     'id': '592ee33b-fb2e-4c00-b2d5-383e99cac57f',
@@ -1488,11 +1449,6 @@ var multiResponse1 = {
   },
   'headers': {}
 };
-
-/*
---------------------end of 2 slots, 2 ----------------------------
- */
-
 describe('ozone Adapter', function () {
   describe('isBidRequestValid', function () {
     let validBidReq = {
@@ -1503,13 +1459,10 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should return true when required params found', function () {
       expect(spec.isBidRequestValid(validBidReq)).to.equal(true);
     });
-
     var validBidReq2 = {
-
       bidder: BIDDER_CODE,
       params: {
         placementId: '1310000099',
@@ -1519,11 +1472,9 @@ describe('ozone Adapter', function () {
       },
       siteId: 1234567890
     }
-
     it('should return true when required params found and all optional params are valid', function () {
       expect(spec.isBidRequestValid(validBidReq2)).to.equal(true);
     });
-
     var xEmptyPlacement = {
       bidder: BIDDER_CODE,
       params: {
@@ -1532,11 +1483,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate empty placementId', function () {
       expect(spec.isBidRequestValid(xEmptyPlacement)).to.equal(false);
     });
-
     var xMissingPlacement = {
       bidder: BIDDER_CODE,
       params: {
@@ -1544,11 +1493,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate missing placementId', function () {
       expect(spec.isBidRequestValid(xMissingPlacement)).to.equal(false);
     });
-
     var xBadPlacement = {
       bidder: BIDDER_CODE,
       params: {
@@ -1557,11 +1504,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate placementId with a non-numeric value', function () {
       expect(spec.isBidRequestValid(xBadPlacement)).to.equal(false);
     });
-
     var xBadPlacementTooShort = {
       bidder: BIDDER_CODE,
       params: {
@@ -1570,11 +1515,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate placementId with a numeric value of wrong length', function () {
       expect(spec.isBidRequestValid(xBadPlacementTooShort)).to.equal(false);
     });
-
     var xBadPlacementTooLong = {
       bidder: BIDDER_CODE,
       params: {
@@ -1583,11 +1526,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate placementId with a numeric value of wrong length', function () {
       expect(spec.isBidRequestValid(xBadPlacementTooLong)).to.equal(false);
     });
-
     var xMissingPublisher = {
       bidder: BIDDER_CODE,
       params: {
@@ -1595,11 +1536,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate missing publisherId', function () {
       expect(spec.isBidRequestValid(xMissingPublisher)).to.equal(false);
     });
-
     var xMissingSiteId = {
       bidder: BIDDER_CODE,
       params: {
@@ -1607,11 +1546,9 @@ describe('ozone Adapter', function () {
         placementId: '1234567890',
       }
     };
-
     it('should not validate missing sitetId', function () {
       expect(spec.isBidRequestValid(xMissingSiteId)).to.equal(false);
     });
-
     var xBadPublisherTooShort = {
       bidder: BIDDER_CODE,
       params: {
@@ -1620,11 +1557,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate publisherId being too short', function () {
       expect(spec.isBidRequestValid(xBadPublisherTooShort)).to.equal(false);
     });
-
     var xBadPublisherTooLong = {
       bidder: BIDDER_CODE,
       params: {
@@ -1633,11 +1568,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate publisherId being too long', function () {
       expect(spec.isBidRequestValid(xBadPublisherTooLong)).to.equal(false);
     });
-
     var publisherNumericOk = {
       bidder: BIDDER_CODE,
       params: {
@@ -1646,11 +1579,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should validate publisherId being 12 digits', function () {
       expect(spec.isBidRequestValid(publisherNumericOk)).to.equal(true);
     });
-
     var xEmptyPublisher = {
       bidder: BIDDER_CODE,
       params: {
@@ -1659,11 +1590,9 @@ describe('ozone Adapter', function () {
         siteId: '1234567890'
       }
     };
-
     it('should not validate empty publisherId', function () {
       expect(spec.isBidRequestValid(xEmptyPublisher)).to.equal(false);
     });
-
     var xBadSite = {
       bidder: BIDDER_CODE,
       params: {
@@ -1672,37 +1601,15 @@ describe('ozone Adapter', function () {
         siteId: '12345Z'
       }
     };
-
     it('should not validate bad siteId', function () {
       expect(spec.isBidRequestValid(xBadSite)).to.equal(false);
     });
-
-    var xBadSiteTooLong = {
-      bidder: BIDDER_CODE,
-      params: {
-        placementId: '1234567890',
-        publisherId: '9876abcd12-3',
-        siteId: '12345678901'
-      }
-    };
-
     it('should not validate siteId too long', function () {
       expect(spec.isBidRequestValid(xBadSite)).to.equal(false);
     });
-
-    var xBadSiteTooShort = {
-      bidder: BIDDER_CODE,
-      params: {
-        placementId: '1234567890',
-        publisherId: '9876abcd12-3',
-        siteId: '123456789'
-      }
-    };
-
     it('should not validate siteId too short', function () {
       expect(spec.isBidRequestValid(xBadSite)).to.equal(false);
     });
-
     var allNonStrings = {
       bidder: BIDDER_CODE,
       params: {
@@ -1711,11 +1618,9 @@ describe('ozone Adapter', function () {
         siteId: 1234567890
       }
     };
-
     it('should validate all numeric values being sent as non-string numbers', function () {
       expect(spec.isBidRequestValid(allNonStrings)).to.equal(true);
     });
-
     var emptySiteId = {
       bidder: BIDDER_CODE,
       params: {
@@ -1724,11 +1629,9 @@ describe('ozone Adapter', function () {
         siteId: ''
       }
     };
-
     it('should not validate siteId being empty string (it is required now)', function () {
       expect(spec.isBidRequestValid(emptySiteId)).to.equal(false);
     });
-
     var xBadCustomData = {
       bidder: BIDDER_CODE,
       params: {
@@ -1738,12 +1641,10 @@ describe('ozone Adapter', function () {
         'customData': 'this aint gonna work'
       }
     };
-
     it('should not validate customData not being an array', function () {
       expect(spec.isBidRequestValid(xBadCustomData)).to.equal(false);
     });
-
-    var xBadCustomData_OLD_CUSTOMDATA_VALUE = {
+    var xBadCustomDataOldCustomdataValue = {
       bidder: BIDDER_CODE,
       params: {
         'placementId': '1234567890',
@@ -1752,12 +1653,10 @@ describe('ozone Adapter', function () {
         'customData': {'gender': 'bart', 'age': 'low'}
       }
     };
-
     it('should not validate customData being an object, not an array', function () {
-      expect(spec.isBidRequestValid(xBadCustomData_OLD_CUSTOMDATA_VALUE)).to.equal(false);
+      expect(spec.isBidRequestValid(xBadCustomDataOldCustomdataValue)).to.equal(false);
     });
-
-    var xBadCustomData_zerocd = {
+    var xBadCustomDataZerocd = {
       bidder: BIDDER_CODE,
       params: {
         'placementId': '1111111110',
@@ -1766,12 +1665,10 @@ describe('ozone Adapter', function () {
         'customData': []
       }
     };
-
     it('should not validate customData array having no elements', function () {
-      expect(spec.isBidRequestValid(xBadCustomData_zerocd)).to.equal(false);
+      expect(spec.isBidRequestValid(xBadCustomDataZerocd)).to.equal(false);
     });
-
-    var xBadCustomData_notargeting = {
+    var xBadCustomDataNotargeting = {
       bidder: BIDDER_CODE,
       params: {
         'placementId': '1234567890',
@@ -1781,10 +1678,9 @@ describe('ozone Adapter', function () {
       }
     };
     it('should not validate customData[] having no "targeting"', function () {
-      expect(spec.isBidRequestValid(xBadCustomData_notargeting)).to.equal(false);
+      expect(spec.isBidRequestValid(xBadCustomDataNotargeting)).to.equal(false);
     });
-
-    var xBadCustomData_tgt_not_obj = {
+    var xBadCustomDataTgtNotObj = {
       bidder: BIDDER_CODE,
       params: {
         'placementId': '1234567890',
@@ -1794,9 +1690,8 @@ describe('ozone Adapter', function () {
       }
     };
     it('should not validate customData[0].targeting not being an object', function () {
-      expect(spec.isBidRequestValid(xBadCustomData_tgt_not_obj)).to.equal(false);
+      expect(spec.isBidRequestValid(xBadCustomDataTgtNotObj)).to.equal(false);
     });
-
     var xBadCustomParams = {
       bidder: BIDDER_CODE,
       params: {
@@ -1821,11 +1716,9 @@ describe('ozone Adapter', function () {
           mimes: ['video/mp4']}
       }
     };
-
     it('should not validate video without context attribute', function () {
       expect(spec.isBidRequestValid(xBadVideoContext2)).to.equal(false);
     });
-
     let validVideoBidReq = {
       bidder: BIDDER_CODE,
       params: {
@@ -1839,7 +1732,6 @@ describe('ozone Adapter', function () {
           'context': 'outstream'},
       }
     };
-
     it('should validate video outstream being sent', function () {
       expect(spec.isBidRequestValid(validVideoBidReq)).to.equal(true);
     });
@@ -1849,47 +1741,44 @@ describe('ozone Adapter', function () {
       expect(spec.isBidRequestValid(instreamVid)).to.equal(true);
     });
   });
-
   describe('buildRequests', function () {
+    beforeEach(function () {
+      config.resetConfig()
+    });
     it('sends bid request to OZONEURI via POST', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       expect(request.url).to.equal(OZONEURI);
       expect(request.method).to.equal('POST');
     });
-
     it('sends data as a string', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       expect(request.data).to.be.a('string');
     });
-
     it('sends all bid parameters', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
-
     it('adds all parameters inside the ext object only', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       expect(request.data).to.be.a('string');
       var data = JSON.parse(request.data);
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(request).not.to.have.key('lotameData');
       expect(request).not.to.have.key('customData');
     });
-
     it('adds all parameters inside the ext object only - lightning', function () {
       let localBidReq = JSON.parse(JSON.stringify(validBidRequests));
-      const request = spec.buildRequests(localBidReq, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(localBidReq, validBidderRequest);
       expect(request.data).to.be.a('string');
       var data = JSON.parse(request.data);
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(request).not.to.have.key('lotameData');
       expect(request).not.to.have.key('customData');
     });
-
     it('ignores ozoneData in & after version 2.1.1', function () {
       let validBidRequestsWithOzoneData = JSON.parse(JSON.stringify(validBidRequests));
       validBidRequestsWithOzoneData[0].params.ozoneData = {'networkID': '3048', 'dfpSiteID': 'd.thesun', 'sectionID': 'homepage', 'path': '/', 'sec_id': 'null', 'sec': 'sec', 'topics': 'null', 'kw': 'null', 'aid': 'null', 'search': 'null', 'article_type': 'null', 'hide_ads': '', 'article_slug': 'null'};
-      const request = spec.buildRequests(validBidRequestsWithOzoneData, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsWithOzoneData, validBidderRequest);
       expect(request.data).to.be.a('string');
       var data = JSON.parse(request.data);
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
@@ -1897,43 +1786,36 @@ describe('ozone Adapter', function () {
       expect(request).not.to.have.key('lotameData');
       expect(request).not.to.have.key('customData');
     });
-
     it('has correct bidder', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       expect(request.bidderRequest.bids[0].bidder).to.equal(BIDDER_CODE);
     });
-
     it('handles mediaTypes element correctly', function () {
-      const request = spec.buildRequests(validBidRequestsWithBannerMediaType, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsWithBannerMediaType, validBidderRequest);
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
-
     it('handles no ozone or custom data', function () {
-      const request = spec.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsMinimal, validBidderRequest);
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
-
     it('handles video mediaType element correctly, with outstream video', function () {
-      const request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest);
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
-
     it('should not crash when there is no sizes element at all', function () {
-      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
-
     it('should be able to handle non-single requests', function () {
       config.setConfig({'ozone': {'singleRequest': false}});
-      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
       expect(request).to.be.a('array');
       expect(request[0]).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
       config.setConfig({'ozone': {'singleRequest': true}});
     });
-
     it('should add gdpr consent information to the request when ozone is true', function () {
       let consentString = 'BOcocyaOcocyaAfEYDENCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NphLgA==';
-      let bidderRequest = validBidderRequest.bidderRequest;
+      let bidderRequest = validBidderRequest;
       bidderRequest.gdprConsent = {
         consentString: consentString,
         gdprApplies: true,
@@ -1944,16 +1826,14 @@ describe('ozone Adapter', function () {
           purposeConsents: {1: true, 2: true, 3: true, 4: true, 5: true}
         }
       }
-
       const request = spec.buildRequests(validBidRequestsNoSizes, bidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.regs.ext.gdpr).to.equal(1);
       expect(payload.user.ext.consent).to.equal(consentString);
     });
-
     it('should add gdpr consent information to the request when vendorData is missing vendorConsents (Mirror)', function () {
       let consentString = 'BOcocyaOcocyaAfEYDENCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NphLgA==';
-      let bidderRequest = validBidderRequest.bidderRequest;
+      let bidderRequest = validBidderRequest;
       bidderRequest.gdprConsent = {
         consentString: consentString,
         gdprApplies: true,
@@ -1962,16 +1842,14 @@ describe('ozone Adapter', function () {
           gdprApplies: true
         }
       }
-
       const request = spec.buildRequests(validBidRequestsNoSizes, bidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.regs.ext.gdpr).to.equal(1);
       expect(payload.user.ext.consent).to.equal(consentString);
     });
-
     it('should set regs.ext.gdpr flag to 0 when gdprApplies is false', function () {
       let consentString = 'BOcocyaOcocyaAfEYDENCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NphLgA==';
-      let bidderRequest = validBidderRequest.bidderRequest;
+      let bidderRequest = validBidderRequest;
       bidderRequest.gdprConsent = {
         consentString: consentString,
         gdprApplies: false,
@@ -1982,15 +1860,13 @@ describe('ozone Adapter', function () {
           purposeConsents: {1: true, 2: true, 3: true, 4: true, 5: true}
         }
       };
-
       const request = spec.buildRequests(validBidRequestsNoSizes, bidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.regs.ext.gdpr).to.equal(0);
     });
-
     it('should not have imp[N].ext.ozone.userId', function () {
       let consentString = 'BOcocyaOcocyaAfEYDENCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NphLgA==';
-      let bidderRequest = validBidderRequest.bidderRequest;
+      let bidderRequest = validBidderRequest;
       bidderRequest.gdprConsent = {
         consentString: consentString,
         gdprApplies: false,
@@ -2001,7 +1877,6 @@ describe('ozone Adapter', function () {
           purposeConsents: {1: true, 2: true, 3: true, 4: true, 5: true}
         }
       };
-
       let bidRequests = validBidRequests;
       bidRequests[0]['userId'] = {
         'digitrustid': {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
@@ -2019,7 +1894,6 @@ describe('ozone Adapter', function () {
       expect(firstBid).to.not.have.property('userId');
       delete validBidRequests[0].userId; // tidy up now, else it will screw with other tests
     });
-
     it('should pick up the value of pubcid when built using the pubCommonId module (not userId)', function () {
       let bidRequests = validBidRequests;
       bidRequests[0]['userId'] = {
@@ -2031,23 +1905,13 @@ describe('ozone Adapter', function () {
         'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
       };
       bidRequests[0]['userIdAsEids'] = validBidRequestsWithUserIdData[0]['userIdAsEids'];
-      const request = spec.buildRequests(bidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(bidRequests, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.ext.ozone.pubcid).to.equal(bidRequests[0]['crumbs']['pubcid']);
       delete validBidRequests[0].userId; // tidy up now, else it will screw with other tests
     });
-
     it('should add a user.ext.eids object to contain user ID data in the new location (Nov 2019) Updated Aug 2020', function() {
-      const request = spec.buildRequests(validBidRequestsWithUserIdData, validBidderRequest.bidderRequest);
-      /*
-      'pubcid': '12345678',
-      'tdid': '1111tdid',
-      'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
-      'criteoId': '1111criteoId',
-      'idl_env': 'liverampId',
-      'parrableId': {'eid': '01.5678.parrableid'}
-       */
-
+      const request = spec.buildRequests(validBidRequestsWithUserIdData, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.user).to.exist;
       expect(payload.user.ext).to.exist;
@@ -2067,12 +1931,11 @@ describe('ozone Adapter', function () {
       expect(payload.user.ext.eids[6]['source']).to.equal('parrableId');
       expect(payload.user.ext.eids[6]['uids'][0]['id']['eid']).to.equal('01.5678.parrableid');
     });
-
     it('replaces the auction url for a config override', function () {
       spec.propertyBag.whitelabel = null;
       let fakeOrigin = 'http://sometestendpoint';
       config.setConfig({'ozone': {'endpointOverride': {'origin': fakeOrigin}}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       expect(request.url).to.equal(fakeOrigin + '/openrtb2/auction');
       expect(request.method).to.equal('POST');
       const data = JSON.parse(request.data);
@@ -2080,12 +1943,11 @@ describe('ozone Adapter', function () {
       config.setConfig({'ozone': {'kvpPrefix': null, 'endpointOverride': null}});
       spec.propertyBag.whitelabel = null;
     });
-
     it('replaces the FULL auction url for a config override', function () {
       spec.propertyBag.whitelabel = null;
       let fakeurl = 'http://sometestendpoint/myfullurl';
       config.setConfig({'ozone': {'endpointOverride': {'auctionUrl': fakeurl}}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       expect(request.url).to.equal(fakeurl);
       expect(request.method).to.equal('POST');
       const data = JSON.parse(request.data);
@@ -2093,7 +1955,6 @@ describe('ozone Adapter', function () {
       config.setConfig({'ozone': {'kvpPrefix': null, 'endpointOverride': null}});
       spec.propertyBag.whitelabel = null;
     });
-
     it('replaces the renderer url for a config override', function () {
       spec.propertyBag.whitelabel = null;
       let fakeUrl = 'http://renderer.com';
@@ -2107,9 +1968,8 @@ describe('ozone Adapter', function () {
       spec.propertyBag.whitelabel = null;
     });
     it('should generate all the adservertargeting keys correctly named', function () {
-      var specMock = utils.deepClone(spec);
       config.setConfig({'ozone': {'kvpPrefix': 'xx'}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(result[0].adserverTargeting).to.have.own.property('xx_appnexus_crid');
       expect(utils.deepAccess(result[0].adserverTargeting, 'xx_appnexus_crid')).to.equal('98493581');
@@ -2118,33 +1978,28 @@ describe('ozone Adapter', function () {
       expect(utils.deepAccess(result[0].adserverTargeting, 'xx_size')).to.equal('300x600');
       expect(utils.deepAccess(result[0].adserverTargeting, 'xx_pb_r')).to.equal('0.50');
       expect(utils.deepAccess(result[0].adserverTargeting, 'xx_bid')).to.equal('true');
-      config.resetConfig();
     });
     it('should create a meta object on each bid returned', function () {
-      var specMock = utils.deepClone(spec);
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(result[0]).to.have.own.property('meta');
       expect(result[0].meta.advertiserDomains[0]).to.equal('http://prebid.org');
-      config.resetConfig();
     });
-
     it('replaces the kvp prefix ', function () {
       spec.propertyBag.whitelabel = null;
       config.setConfig({'ozone': {'kvpPrefix': 'test'}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const data = JSON.parse(request.data);
       expect(data.ext.ozone).to.haveOwnProperty('test_rw');
       config.setConfig({'ozone': {'kvpPrefix': null}});
       spec.propertyBag.whitelabel = null;
     });
-
     it('handles an alias ', function () {
       spec.propertyBag.whitelabel = null;
       config.setConfig({'lmc': {'kvpPrefix': 'test'}});
       let br = JSON.parse(JSON.stringify(validBidRequests));
       br[0]['bidder'] = 'lmc';
-      const request = spec.buildRequests(br, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(br, validBidderRequest);
       const data = JSON.parse(request.data);
       expect(data.ext.lmc).to.haveOwnProperty('test_rw');
       config.setConfig({'lmc': {'kvpPrefix': null}}); // I cant remove the key so set the value to null
@@ -2155,7 +2010,7 @@ describe('ozone Adapter', function () {
       specMock.getGetParametersAsObject = function() {
         return {'oztestmode': 'mytestvalue_123'};
       };
-      const request = specMock.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest);
       const data = JSON.parse(request.data);
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(data.imp[0].ext.ozone.customData[0].targeting.oztestmode).to.equal('mytestvalue_123');
@@ -2165,7 +2020,7 @@ describe('ozone Adapter', function () {
       specMock.getGetParametersAsObject = function() {
         return {ozf: '1', ozpf: '0', ozrp: '2', ozip: '123'};
       };
-      const request = specMock.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest);
       const data = JSON.parse(request.data);
       expect(data.ext.ozone.ozf).to.equal(1);
       expect(data.ext.ozone.ozpf).to.equal(0);
@@ -2177,7 +2032,7 @@ describe('ozone Adapter', function () {
       specMock.getGetParametersAsObject = function() {
         return {ozf: 'false', ozpf: 'true', ozrp: 'xyz', ozip: 'hello'};
       };
-      const request = specMock.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest);
       const data = JSON.parse(request.data);
       expect(data.ext.ozone.ozf).to.equal(0);
       expect(data.ext.ozone.ozpf).to.equal(1);
@@ -2189,7 +2044,7 @@ describe('ozone Adapter', function () {
       specMock.getGetParametersAsObject = function() {
         return {'oztestmode': 'mytestvalue_123'};
       };
-      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
       const data = JSON.parse(request.data);
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(data.imp[0].ext.ozone.customData[0].targeting.oztestmode).to.equal('mytestvalue_123');
@@ -2199,17 +2054,16 @@ describe('ozone Adapter', function () {
       specMock.getGetParametersAsObject = function() {
         return {};
       };
-      let request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+      let request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
       let url = request.url;
       expect(url).to.equal('https://elb.the-ozone-project.com/openrtb2/auction');
       let cookieUrl = specMock.getCookieSyncUrl();
       expect(cookieUrl).to.equal('https://elb.the-ozone-project.com/static/load-cookie.html');
-
       specMock = utils.deepClone(spec);
       specMock.getGetParametersAsObject = function() {
         return {'auction': 'dev', 'cookiesync': 'dev'};
       };
-      request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+      request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
       url = request.url;
       expect(url).to.equal('https://test.ozpr.net/openrtb2/auction');
       cookieUrl = specMock.getCookieSyncUrl();
@@ -2220,7 +2074,7 @@ describe('ozone Adapter', function () {
       specMock.getGetParametersAsObject = function() {
         return {'ozstoredrequest': '1122334455'}; // 10 digits are valid
       };
-      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
       const data = JSON.parse(request.data);
       expect(data.ext.ozone.oz_rw).to.equal(1);
       expect(data.imp[0].ext.prebid.storedrequest.id).to.equal('1122334455');
@@ -2230,71 +2084,65 @@ describe('ozone Adapter', function () {
       specMock.getGetParametersAsObject = function() {
         return {'ozstoredrequest': 'BADVAL'}; // 10 digits are valid
       };
-      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest);
       const data = JSON.parse(request.data);
       expect(data.ext.ozone.oz_rw).to.equal(0);
       expect(data.imp[0].ext.prebid.storedrequest.id).to.equal('1310000099');
     });
-
     it('should pick up the config value of coppa & set it in the request', function () {
       config.setConfig({'coppa': true});
-      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.regs).to.include.keys('coppa');
       expect(payload.regs.coppa).to.equal(1);
-      config.resetConfig();
     });
     it('should pick up the config value of coppa & only set it in the request if its true', function () {
       config.setConfig({'coppa': false});
-      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(utils.deepAccess(payload, 'regs.coppa')).to.be.undefined;
-      config.resetConfig();
     });
     it('should handle oz_omp_floor correctly', function () {
       config.setConfig({'ozone': {'oz_omp_floor': 1.56}});
-      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(utils.deepAccess(payload, 'ext.ozone.oz_omp_floor')).to.equal(1.56);
-      config.resetConfig();
     });
     it('should ignore invalid oz_omp_floor values', function () {
       config.setConfig({'ozone': {'oz_omp_floor': '1.56'}});
-      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(utils.deepAccess(payload, 'ext.ozone.oz_omp_floor')).to.be.undefined;
-      config.resetConfig();
     });
     it('should should contain a unique page view id in the auction request which persists across calls', function () {
-      let request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      let request = spec.buildRequests(validBidRequests, validBidderRequest);
       let payload = JSON.parse(request.data);
       expect(utils.deepAccess(payload, 'ext.ozone.pv')).to.be.a('string');
-      request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest.bidderRequest);
+      request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest);
       let payload2 = JSON.parse(request.data);
       expect(utils.deepAccess(payload2, 'ext.ozone.pv')).to.be.a('string');
       expect(utils.deepAccess(payload2, 'ext.ozone.pv')).to.equal(utils.deepAccess(payload, 'ext.ozone.pv'));
     });
     it('should indicate that the whitelist was used when it contains valid data', function () {
       config.setConfig({'ozone': {'oz_whitelist_adserver_keys': ['oz_ozappnexus_pb', 'oz_ozappnexus_imp_id']}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.ext.ozone.oz_kvp_rw).to.equal(1);
-      config.resetConfig();
     });
     it('should indicate that the whitelist was not used when it contains no data', function () {
       config.setConfig({'ozone': {'oz_whitelist_adserver_keys': []}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.ext.ozone.oz_kvp_rw).to.equal(0);
-      config.resetConfig();
     });
     it('should indicate that the whitelist was not used when it is not set in the config', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.ext.ozone.oz_kvp_rw).to.equal(0);
     });
     it('should handle ortb2 site data', function () {
-      const ortb2 = {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      bidderRequest.ortb2 = {
         'site': {
           'name': 'example_ortb2_name',
           'domain': 'page.example.com',
@@ -2307,14 +2155,14 @@ describe('ozone Adapter', function () {
           'search': 'drill'
         }
       };
-      const request = spec.buildRequests(validBidRequests, {...validBidderRequest.bidderRequest, ortb2});
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.imp[0].ext.ozone.customData[0].targeting.name).to.equal('example_ortb2_name');
       expect(payload.user.ext).to.not.have.property('gender');
-      config.resetConfig();
     });
     it('should add ortb2 site data when there is no customData already created', function () {
-      const ortb2 = {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      bidderRequest.ortb2 = {
         'site': {
           'name': 'example_ortb2_name',
           'domain': 'page.example.com',
@@ -2327,25 +2175,25 @@ describe('ozone Adapter', function () {
           'search': 'drill'
         }
       };
-      const request = spec.buildRequests(validBidRequestsNoCustomData, {...validBidderRequest.bidderRequest, ortb2});
+      const request = spec.buildRequests(validBidRequestsNoCustomData, bidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.imp[0].ext.ozone.customData[0].targeting.name).to.equal('example_ortb2_name');
       expect(payload.imp[0].ext.ozone.customData[0].targeting).to.not.have.property('gender')
-      config.resetConfig();
     });
     it('should add ortb2 user data to the user object', function () {
-      const ortb2 = {
+      let bidderRequest = JSON.parse(JSON.stringify(validBidderRequest));
+      bidderRequest.ortb2 = {
         'user': {
-          'gender': 'who knows these days'
+          'gender': 'I identify as a box of rocks'
         }
       };
-      const request = spec.buildRequests(validBidRequests, {...validBidderRequest.bidderRequest, ortb2});
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
-      expect(payload.user.gender).to.equal('who knows these days');
-      config.resetConfig();
+      expect(payload.user.gender).to.equal('I identify as a box of rocks');
     });
     it('should not override the user.ext.consent string even if this is set in config ortb2', function () {
-      const ortb2 = {
+      let bidderRequest = JSON.parse(JSON.stringify(bidderRequestWithFullGdpr));
+      bidderRequest.ortb2 = {
         'user': {
           'ext': {
             'consent': 'this is the consent override that shouldnt work',
@@ -2353,15 +2201,14 @@ describe('ozone Adapter', function () {
           }
         }
       };
-      const request = spec.buildRequests(validBidRequests, {...bidderRequestWithFullGdpr.bidderRequest, ortb2});
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
       expect(payload.user.ext.consent2).to.equal('this should be set');
       expect(payload.user.ext.consent).to.equal('BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA');
-      config.resetConfig();
     });
     it('should have openrtb video params', function() {
       let allowed = ['mimes', 'minduration', 'maxduration', 'protocols', 'w', 'h', 'startdelay', 'placement', 'linearity', 'skip', 'skipmin', 'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate', 'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend', 'delivery', 'pos', 'companionad', 'api', 'companiontype', 'ext'];
-      const request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest);
       const payload = JSON.parse(request.data);
       const vid = (payload.imp[0].video);
       const keys = Object.keys(vid);
@@ -2391,13 +2238,11 @@ describe('ozone Adapter', function () {
       });
       let localBidRequest = JSON.parse(JSON.stringify(validBidRequestsWithBannerMediaType));
       localBidRequest[0].getFloor = function(x) { return {'currency': 'USD', 'floor': 0.8} };
-      const request = spec.buildRequests(localBidRequest, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(localBidRequest, validBidderRequest);
       const payload = JSON.parse(request.data);
       expect(utils.deepAccess(payload, 'imp.0.floor.banner.currency')).to.equal('USD');
       expect(utils.deepAccess(payload, 'imp.0.floor.banner.floor')).to.equal(0.8);
-      config.resetConfig();
     });
-
     it('handles schain object in each bidrequest (will be the same in each br)', function () {
       let br = JSON.parse(JSON.stringify(validBidRequests));
       let schainConfigObject = {
@@ -2412,44 +2257,44 @@ describe('ozone Adapter', function () {
         ]
       };
       br[0]['schain'] = schainConfigObject;
-      const request = spec.buildRequests(br, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(br, validBidderRequest);
       const data = JSON.parse(request.data);
       expect(data.source.ext).to.haveOwnProperty('schain');
       expect(data.source.ext.schain).to.deep.equal(schainConfigObject); // .deep.equal() : Target object deeply (but not strictly) equals `{a: 1}`
     });
   });
-
   describe('interpretResponse', function () {
+    beforeEach(function () {
+      config.resetConfig()
+    })
     it('should build bid array', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(result.length).to.equal(1);
     });
-
     it('should have all relevant fields', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       const bid = result[0];
       expect(bid.cpm).to.equal(validResponse.body.seatbid[0].bid[0].cpm);
       expect(bid.width).to.equal(validResponse.body.seatbid[0].bid[0].width);
       expect(bid.height).to.equal(validResponse.body.seatbid[0].bid[0].height);
     });
-
     it('should build bid array with gdpr', function () {
-      let validBR = JSON.parse(JSON.stringify(bidderRequestWithFullGdpr.bidderRequest));
+      let validBR = JSON.parse(JSON.stringify(bidderRequestWithFullGdpr));
       validBR.gdprConsent = {'gdprApplies': 1, 'consentString': 'This is the gdpr consent string'};
       const request = spec.buildRequests(validBidRequests, validBR); // works the old way, with GDPR not enforced by default
       const result = spec.interpretResponse(validResponse, request);
       expect(result.length).to.equal(1);
     });
     it('should build bid array with usp/CCPA', function () {
-      let validBR = JSON.parse(JSON.stringify(bidderRequestWithFullGdpr.bidderRequest));
+      let validBR = JSON.parse(JSON.stringify(bidderRequestWithFullGdpr));
       validBR.uspConsent = '1YNY';
       const request = spec.buildRequests(validBidRequests, validBR);
       const payload = JSON.parse(request.data);
-      expect(payload.user.ext.uspConsent).to.equal('1YNY');
+      expect(payload.user.ext.uspConsent).not.to.exist;
+      expect(payload.regs.ext.us_privacy).to.equal('1YNY');
     });
-
     it('should build bid array with only partial gdpr', function () {
       var validBidderRequestWithGdpr = bidderRequestWithPartialGdpr.bidderRequest;
       validBidderRequestWithGdpr.gdprConsent = {'gdprApplies': 1, 'consentString': 'This is the gdpr consent string'};
@@ -2457,26 +2302,22 @@ describe('ozone Adapter', function () {
       const payload = JSON.parse(request.data);
       expect(payload.user.ext.consent).to.be.a('string');
     });
-
     it('should fail ok if no seatbid in server response', function () {
       const result = spec.interpretResponse({}, {});
       expect(result).to.be.an('array');
       expect(result).to.be.empty;
     });
-
     it('should fail ok if seatbid is not an array', function () {
       const result = spec.interpretResponse({'body': {'seatbid': 'nothing_here'}}, {});
       expect(result).to.be.an('array');
       expect(result).to.be.empty;
     });
-
     it('should have video renderer for outstream video', function () {
       const request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest1OutstreamVideo2020.bidderRequest);
       const result = spec.interpretResponse(getCleanValidVideoResponse(), validBidderRequest1OutstreamVideo2020);
       const bid = result[0];
       expect(bid.renderer).to.be.an.instanceOf(Renderer);
     });
-
     it('should have NO video renderer for instream video', function () {
       let instreamRequestsObj = JSON.parse(JSON.stringify(validBidRequests1OutstreamVideo2020));
       instreamRequestsObj[0].mediaTypes.video.context = 'instream';
@@ -2487,99 +2328,87 @@ describe('ozone Adapter', function () {
       const bid = result[0];
       expect(bid.hasOwnProperty('renderer')).to.be.false;
     });
-
     it('should correctly parse response where there are more bidders than ad slots', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validBidResponse1adWith2Bidders, request);
       expect(result.length).to.equal(2);
     });
-
     it('should have a ttl of 600', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(result[0].ttl).to.equal(300);
     });
-
     it('should handle oz_omp_floor_dollars correctly, inserting 1 as necessary', function () {
       config.setConfig({'ozone': {'oz_omp_floor': 0.01}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_omp')).to.equal('1');
-      config.resetConfig();
     });
     it('should handle oz_omp_floor_dollars correctly, inserting 0 as necessary', function () {
       config.setConfig({'ozone': {'oz_omp_floor': 2.50}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_omp')).to.equal('0');
-      config.resetConfig();
     });
     it('should handle missing oz_omp_floor_dollars correctly, inserting nothing', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_omp')).to.be.undefined;
     });
     it('should handle ext.bidder.ozone.floor correctly, setting flr & rid as necessary', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       let vres = JSON.parse(JSON.stringify(validResponse));
       vres.body.seatbid[0].bid[0].ext.bidder.ozone = {floor: 1, ruleId: 'ZjbsYE1q'};
       const result = spec.interpretResponse(vres, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_flr')).to.equal(1);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_rid')).to.equal('ZjbsYE1q');
-      config.resetConfig();
     });
     it('should handle ext.bidder.ozone.floor correctly, inserting 0 as necessary', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       let vres = JSON.parse(JSON.stringify(validResponse));
       vres.body.seatbid[0].bid[0].ext.bidder.ozone = {floor: 0, ruleId: 'ZjbXXE1q'};
       const result = spec.interpretResponse(vres, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_flr')).to.equal(0);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_rid')).to.equal('ZjbXXE1q');
-      config.resetConfig();
     });
     it('should handle ext.bidder.ozone.floor correctly, inserting nothing as necessary', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       let vres = JSON.parse(JSON.stringify(validResponse));
       vres.body.seatbid[0].bid[0].ext.bidder.ozone = {};
       const result = spec.interpretResponse(vres, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_flr', null)).to.equal(null);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_rid', null)).to.equal(null);
-      config.resetConfig();
     });
     it('should handle ext.bidder.ozone.floor correctly, when bidder.ozone is not there', function () {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       let vres = JSON.parse(JSON.stringify(validResponse));
       const result = spec.interpretResponse(vres, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_flr', null)).to.equal(null);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_rid', null)).to.equal(null);
-      config.resetConfig();
     });
     it('should handle a valid whitelist, removing items not on the list & leaving others', function () {
       config.setConfig({'ozone': {'oz_whitelist_adserver_keys': ['oz_appnexus_crid', 'oz_appnexus_adId']}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_adv')).to.be.undefined;
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_adId')).to.equal('2899ec066a91ff8-0-oz-0');
-      config.resetConfig();
     });
     it('should ignore a whitelist if enhancedAdserverTargeting is false', function () {
       config.setConfig({'ozone': {'oz_whitelist_adserver_keys': ['oz_appnexus_crid', 'oz_appnexus_imp_id'], 'enhancedAdserverTargeting': false}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_adv')).to.be.undefined;
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_imp_id')).to.be.undefined;
-      config.resetConfig();
     });
     it('should correctly handle enhancedAdserverTargeting being false', function () {
       config.setConfig({'ozone': {'enhancedAdserverTargeting': false}});
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_adv')).to.be.undefined;
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_imp_id')).to.be.undefined;
-      config.resetConfig();
     });
     it('should add flr into ads request if floor exists in the auction response', function () {
-      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest);
       let validres = JSON.parse(JSON.stringify(validResponse2Bids));
       validres.body.seatbid[0].bid[0].ext.bidder.ozone = {'floor': 1};
       const result = spec.interpretResponse(validres, request);
@@ -2587,7 +2416,7 @@ describe('ozone Adapter', function () {
       expect(utils.deepAccess(result[1].adserverTargeting, 'oz_appnexus_flr', '')).to.equal('');
     });
     it('should add rid into ads request if ruleId exists in the auction response', function () {
-      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest);
       let validres = JSON.parse(JSON.stringify(validResponse2Bids));
       validres.body.seatbid[0].bid[0].ext.bidder.ozone = {'ruleId': 123};
       const result = spec.interpretResponse(validres, request);
@@ -2595,13 +2424,13 @@ describe('ozone Adapter', function () {
       expect(utils.deepAccess(result[1].adserverTargeting, 'oz_appnexus_rid', '')).to.equal('');
     });
     it('should add oz_ozappnexus_sid (cid value) for all appnexus bids', function () {
-      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest);
       let validres = JSON.parse(JSON.stringify(validResponse2BidsSameAdunit));
       const result = spec.interpretResponse(validres, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_ozappnexus_sid')).to.equal(result[0].cid);
     });
     it('should add unique adId values to each bid', function() {
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
       let validres = JSON.parse(JSON.stringify(validResponse2BidsSameAdunit));
       const result = spec.interpretResponse(validres, request);
       expect(result.length).to.equal(1);
@@ -2610,7 +2439,7 @@ describe('ozone Adapter', function () {
     });
     it('should correctly process an auction with 2 adunits & multiple bidders one of which bids for both adslots', function() {
       let validres = JSON.parse(JSON.stringify(multiResponse1));
-      let request = spec.buildRequests(multiRequest1, multiBidderRequest1.bidderRequest);
+      let request = spec.buildRequests(multiRequest1, multiBidderRequest1);
       let result = spec.interpretResponse(validres, request);
       expect(result.length).to.equal(4); // one of the 5 bids will have been removed
       expect(result[1]['price']).to.equal(0.521);
@@ -2620,15 +2449,28 @@ describe('ozone Adapter', function () {
       validres = JSON.parse(JSON.stringify(multiResponse1));
       validres.body.seatbid[0].bid[1].price = 1.1;
       validres.body.seatbid[0].bid[1].cpm = 1.1;
-      request = spec.buildRequests(multiRequest1, multiBidderRequest1.bidderRequest);
+      request = spec.buildRequests(multiRequest1, multiBidderRequest1);
       result = spec.interpretResponse(validres, request);
       expect(result[1]['price']).to.equal(1.1);
       expect(result[1]['impid']).to.equal('3025f169863b7f8');
       expect(result[1]['id']).to.equal('18552976939844681');
       expect(result[1]['adserverTargeting']['oz_ozappnexus_adId']).to.equal('3025f169863b7f8-0-oz-1');
     });
+    it('should add mediaType: banner for a banner ad', function () {
+      const request = spec.buildRequests(validBidRequests, validBidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result[0].mediaType).to.equal('banner');
+    });
+    it('should add mediaType: video for a video ad', function () {
+      let instreamRequestsObj = JSON.parse(JSON.stringify(validBidRequests1OutstreamVideo2020));
+      instreamRequestsObj[0].mediaTypes.video.context = 'instream';
+      let instreamBidderReq = JSON.parse(JSON.stringify(validBidderRequest1OutstreamVideo2020));
+      instreamBidderReq.bidderRequest.bids[0].mediaTypes.video.context = 'instream';
+      const result = spec.interpretResponse(getCleanValidVideoResponse(), instreamBidderReq);
+      const bid = result[0];
+      expect(bid.mediaType).to.equal('video');
+    });
   });
-
   describe('userSyncs', function () {
     it('should fail gracefully if no server response', function () {
       const result = spec.getUserSyncs('bad', false, gdpr1);
@@ -2639,7 +2481,7 @@ describe('ozone Adapter', function () {
       expect(result).to.be.empty;
     });
     it('should append the various values if they exist', function() {
-      spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', gdpr1);
       expect(result).to.be.an('array');
       expect(result[0].url).to.include('publisherId=9876abcd12-3');
@@ -2648,19 +2490,18 @@ describe('ozone Adapter', function () {
       expect(result[0].url).to.include('gdpr_consent=BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA');
     });
     it('should append ccpa (usp data)', function() {
-      spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', gdpr1, '1YYN');
       expect(result).to.be.an('array');
       expect(result[0].url).to.include('usp_consent=1YYN');
     });
     it('should use "" if no usp is sent to cookieSync', function() {
-      spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      spec.buildRequests(validBidRequests, validBidderRequest);
       const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', gdpr1);
       expect(result).to.be.an('array');
       expect(result[0].url).to.include('usp_consent=&');
     });
   });
-
   describe('video object utils', function () {
     it('should find width & height from video object', function () {
       let obj = {'playerSize': [640, 480], 'mimes': ['video/mp4'], 'context': 'outstream'};
@@ -2715,7 +2556,7 @@ describe('ozone Adapter', function () {
       expect(result).to.be.null;
     });
     it('should add oz_appnexus_dealid into ads request if dealid exists in the auction response', function () {
-      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest);
       let validres = JSON.parse(JSON.stringify(validResponse2Bids));
       validres.body.seatbid[0].bid[0].dealid = '1234';
       const result = spec.interpretResponse(validres, request);
@@ -2723,7 +2564,6 @@ describe('ozone Adapter', function () {
       expect(utils.deepAccess(result[1].adserverTargeting, 'oz_appnexus_dealid', '')).to.equal('');
     });
   });
-
   describe('default size', function () {
     it('should should return default sizes if no obj is sent', function () {
       let obj = '';
@@ -2732,7 +2572,6 @@ describe('ozone Adapter', function () {
       expect(result.defaultWidth).to.equal(300);
     });
   });
-
   describe('getGranularityKeyName', function() {
     it('should return a string granularity as-is', function() {
       const result = getGranularityKeyName('', 'this is it', '');
@@ -2747,7 +2586,6 @@ describe('ozone Adapter', function () {
       expect(result).to.equal('string buckets');
     });
   });
-
   describe('getGranularityObject', function() {
     it('should return an object as-is', function() {
       const result = getGranularityObject('', {'name': 'mark'}, '', '');
@@ -2758,19 +2596,19 @@ describe('ozone Adapter', function () {
       expect(result.name).to.equal('rupert');
     });
   });
-
   describe('blockTheRequest', function() {
+    beforeEach(function () {
+      config.resetConfig()
+    })
     it('should return true if oz_request is false', function() {
       config.setConfig({'ozone': {'oz_request': false}});
-      let result = spec.blockTheRequest(bidderRequestWithFullGdpr);
+      let result = spec.blockTheRequest();
       expect(result).to.be.true;
-      config.resetConfig();
     });
     it('should return false if oz_request is true', function() {
       config.setConfig({'ozone': {'oz_request': true}});
-      let result = spec.blockTheRequest(bidderRequestWithFullGdpr);
+      let result = spec.blockTheRequest();
       expect(result).to.be.false;
-      config.resetConfig();
     });
   });
   describe('getPageId', function() {
@@ -2876,11 +2714,10 @@ describe('ozone Adapter', function () {
       expect(response[1].bid.length).to.equal(2);
     });
   });
-  /**
-   * spec.getWhitelabelConfigItem test - get a config value for a whitelabelled bidder,
-   * from a standard ozone.oz_xxxx_yyy string
-   */
   describe('getWhitelabelConfigItem', function() {
+    beforeEach(function () {
+      config.resetConfig()
+    })
     it('should fetch the whitelabelled equivalent config value correctly', function () {
       var specMock = utils.deepClone(spec);
       config.setConfig({'ozone': {'oz_omp_floor': 'ozone-floor-value'}});
@@ -2896,7 +2733,26 @@ describe('ozone Adapter', function () {
       let testKey2 = 'ozone.singleRequest';
       let markbidder_config2 = specMock.getWhitelabelConfigItem(testKey2);
       expect(markbidder_config2).to.equal('markbidder-singlerequest-value');
-      config.resetConfig();
+    });
+  });
+  describe('setBidMediaTypeIfNotExist', function() {
+    it('should leave the bid object alone if it already contains mediaType', function() {
+      let thisBid = {mediaType: 'marktest'};
+      spec.setBidMediaTypeIfNotExist(thisBid, 'replacement');
+      expect(thisBid.mediaType).to.equal('marktest');
+    });
+    it('should change the bid object if it doesnt already contain mediaType', function() {
+      let thisBid = {someKey: 'someValue'};
+      spec.setBidMediaTypeIfNotExist(thisBid, 'replacement');
+      expect(thisBid.mediaType).to.equal('replacement');
+    });
+  });
+  describe('getLoggableBidObject', function() {
+    it('should return an object without a "renderer" element', function () {
+      let obj = {'renderer': {}, 'somevalue': '', 'h': 100};
+      let ret = spec.getLoggableBidObject(obj);
+      expect(ret).to.not.have.own.property('renderer');
+      expect(ret.h).to.equal(100);
     });
   });
 });

From 969f0502d6a53d7af56ec1ed02a9ed40216e94be Mon Sep 17 00:00:00 2001
From: Denis Logachov <denis@adkernel.com>
Date: Tue, 9 Aug 2022 19:45:26 +0300
Subject: [PATCH 118/569] Adkernel Bid Adapter: DisplayIo alias (#8803)

Adaptor alias for DisplayIo network
---
 modules/adkernelBidAdapter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index 78df319c5ee..78f00784462 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -94,7 +94,8 @@ export const spec = {
     {code: 'turktelekom'},
     {code: 'felixads'},
     {code: 'motionspots'},
-    {code: 'sonic_twist'}
+    {code: 'sonic_twist'},
+    {code: 'displayioads'}
   ],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 

From 01fe272dd20d0f58b645f74278be6795a579110a Mon Sep 17 00:00:00 2001
From: Saar Amrani <89377180+saar120@users.noreply.github.com>
Date: Tue, 9 Aug 2022 20:16:13 +0300
Subject: [PATCH 119/569] Vidazoo Bid Adapter: pass referrer to server +
 pubProvidedId support (#8797)

* feat(module): multi size request

* fix getUserSyncs
added tests

* update(module): package-lock.json from master

* feat(module): VidazooBidAdapter - send top query params to server

* feat(module): pass referrer to server.

* feat(module): added pubProvidedId to supported ID systems.

Co-authored-by: Udi Talias <udi.talias@gmail.com>
Co-authored-by: roman <shmoop207@gmail.com>
---
 modules/vidazooBidAdapter.js                | 2 ++
 test/spec/modules/vidazooBidAdapter_spec.js | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index 7e2000e455a..1f84c9f4b16 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -22,6 +22,7 @@ export const SUPPORTED_ID_SYSTEMS = {
   'parrableId': 1,
   'pubcid': 1,
   'tdid': 1,
+  'pubProvidedId': 1
 };
 const storage = getStorageManager({ gvlid: GVLID, bidderCode: BIDDER_CODE });
 
@@ -72,6 +73,7 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
     cb: Date.now(),
     bidFloor: bidFloor,
     bidId: bidId,
+    referrer: bidderRequest.refererInfo.ref,
     adUnitCode: adUnitCode,
     publisherId: pId,
     sessionId: sId,
diff --git a/test/spec/modules/vidazooBidAdapter_spec.js b/test/spec/modules/vidazooBidAdapter_spec.js
index dc178a9c485..1b4ed4b170d 100644
--- a/test/spec/modules/vidazooBidAdapter_spec.js
+++ b/test/spec/modules/vidazooBidAdapter_spec.js
@@ -48,7 +48,8 @@ const BIDDER_REQUEST = {
   },
   'uspConsent': 'consent_string',
   'refererInfo': {
-    'page': 'https://www.greatsite.com'
+    'page': 'https://www.greatsite.com',
+    'ref': 'https://www.somereferrer.com'
   }
 };
 
@@ -168,6 +169,7 @@ describe('VidazooBidAdapter', function () {
           usPrivacy: 'consent_string',
           sizes: ['300x250', '300x600'],
           url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
           cb: 1000,
           bidFloor: 0.1,
           bidId: '2d52001cabd527',

From ac5f36d648bc5a2e3e1d500c979c648585d28fed Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Tue, 9 Aug 2022 13:39:28 -0400
Subject: [PATCH 120/569] Update aniviewBidAdapter.js (#8802)

---
 modules/aniviewBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/aniviewBidAdapter.js b/modules/aniviewBidAdapter.js
index e97a2531def..00280379133 100644
--- a/modules/aniviewBidAdapter.js
+++ b/modules/aniviewBidAdapter.js
@@ -203,7 +203,7 @@ function interpretResponse(serverResponse, bidRequest) {
           let xml = new window.DOMParser().parseFromString(xmlStr, 'text/xml');
           if (xml && xml.getElementsByTagName('parsererror').length == 0) {
             let cpmData = getCpmData(xml);
-            if (cpmData && cpmData.cpm > 0) {
+            if (cpmData.cpm > 0) {
               bidResponse.requestId = bidRequest.data.bidId;
               bidResponse.ad = '';
               bidResponse.cpm = cpmData.cpm;

From 1cae444020a6535e1396fea9f0f71c6a943c172d Mon Sep 17 00:00:00 2001
From: abermanov-zeta <95416296+abermanov-zeta@users.noreply.github.com>
Date: Tue, 9 Aug 2022 20:14:12 +0200
Subject: [PATCH 121/569] Zeta Global BidAdapter: update the bid endpoint.
 (#8801)

* Zeta Global BidAdapter: update the bid endpoint.

* Zeta Global BidAdapter: fix tests.
---
 modules/zeta_global_sspBidAdapter.js                | 2 +-
 test/spec/modules/zeta_global_sspBidAdapter_spec.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/zeta_global_sspBidAdapter.js b/modules/zeta_global_sspBidAdapter.js
index 86b28021bab..d80265b28bb 100644
--- a/modules/zeta_global_sspBidAdapter.js
+++ b/modules/zeta_global_sspBidAdapter.js
@@ -5,7 +5,7 @@ import {config} from '../src/config.js';
 import {parseDomain} from '../src/refererDetection.js';
 
 const BIDDER_CODE = 'zeta_global_ssp';
-const ENDPOINT_URL = 'https://ssp.disqus.com/bid';
+const ENDPOINT_URL = 'https://ssp.disqus.com/bid/prebid';
 const USER_SYNC_URL_IFRAME = 'https://ssp.disqus.com/sync?type=iframe';
 const USER_SYNC_URL_IMAGE = 'https://ssp.disqus.com/sync?type=image';
 const DEFAULT_CUR = 'USD';
diff --git a/test/spec/modules/zeta_global_sspBidAdapter_spec.js b/test/spec/modules/zeta_global_sspBidAdapter_spec.js
index e67629cb4f7..a70c1c79828 100644
--- a/test/spec/modules/zeta_global_sspBidAdapter_spec.js
+++ b/test/spec/modules/zeta_global_sspBidAdapter_spec.js
@@ -271,7 +271,7 @@ describe('Zeta Ssp Bid Adapter', function () {
   it('Test required params in banner request', function () {
     const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
     const payload = JSON.parse(request.data);
-    expect(request.url).to.eql('https://ssp.disqus.com/bid?shortname=test_shortname');
+    expect(request.url).to.eql('https://ssp.disqus.com/bid/prebid?shortname=test_shortname');
     expect(payload.ext.sid).to.eql('publisherId');
     expect(payload.ext.tags.someTag).to.eql(444);
     expect(payload.ext.tags.shortname).to.be.undefined;
@@ -280,7 +280,7 @@ describe('Zeta Ssp Bid Adapter', function () {
   it('Test required params in video request', function () {
     const request = spec.buildRequests(videoRequest, videoRequest[0]);
     const payload = JSON.parse(request.data);
-    expect(request.url).to.eql('https://ssp.disqus.com/bid?shortname=test_shortname');
+    expect(request.url).to.eql('https://ssp.disqus.com/bid/prebid?shortname=test_shortname');
     expect(payload.ext.sid).to.eql('publisherId');
     expect(payload.ext.tags.someTag).to.eql(444);
     expect(payload.ext.tags.shortname).to.be.undefined;

From 34d44793e124ae76efcf4840a79ce5f2a778e64d Mon Sep 17 00:00:00 2001
From: Mikael Lundin <mikael-lundin@users.noreply.github.com>
Date: Tue, 9 Aug 2022 20:21:24 +0200
Subject: [PATCH 122/569] Adnuntius Bid Adapter: allow Adnuntius to read
 dimensions (#8806)

* package lock fix.

* Add dimensions to prebid.
---
 modules/adnuntiusBidAdapter.js                |  4 +++-
 test/spec/modules/adnuntiusBidAdapter_spec.js | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/adnuntiusBidAdapter.js b/modules/adnuntiusBidAdapter.js
index b9499af7d9d..0ae8411c073 100644
--- a/modules/adnuntiusBidAdapter.js
+++ b/modules/adnuntiusBidAdapter.js
@@ -89,7 +89,9 @@ export const spec = {
       networks[network].adUnits = networks[network].adUnits || [];
       if (bidderRequest && bidderRequest.refererInfo) networks[network].context = bidderRequest.refererInfo.page;
       if (adnMeta) networks[network].metaData = adnMeta;
-      networks[network].adUnits.push({ ...targeting, auId: bid.params.auId, targetId: bid.bidId });
+      const adUnit = { ...targeting, auId: bid.params.auId, targetId: bid.bidId }
+      if (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) adUnit.dimensions = bid.mediaTypes.banner.sizes
+      networks[network].adUnits.push(adUnit);
     }
 
     const networkKeys = Object.keys(networks)
diff --git a/test/spec/modules/adnuntiusBidAdapter_spec.js b/test/spec/modules/adnuntiusBidAdapter_spec.js
index 403ba63d7d1..2d5ea630f0f 100644
--- a/test/spec/modules/adnuntiusBidAdapter_spec.js
+++ b/test/spec/modules/adnuntiusBidAdapter_spec.js
@@ -13,7 +13,7 @@ describe('adnuntiusBidAdapter', function () {
   const meta = [{ key: 'usi', value: usi }]
 
   before(() => {
-    const storage = getStorageManager({gvlid: GVLID, moduleName: 'adnuntius'})
+    const storage = getStorageManager({ gvlid: GVLID, moduleName: 'adnuntius' })
     storage.setDataInLocalStorage('adn.metaData', JSON.stringify(meta))
   });
 
@@ -46,7 +46,11 @@ describe('adnuntiusBidAdapter', function () {
         auId: '8b6bc',
         network: 'adnuntius',
       },
-
+      mediaTypes: {
+        banner: {
+          sizes: [[640, 480], [600, 400]],
+        }
+      },
     }
   ]
 
@@ -228,7 +232,7 @@ describe('adnuntiusBidAdapter', function () {
       expect(request[0]).to.have.property('url');
       expect(request[0].url).to.equal(ENDPOINT_URL);
       expect(request[0]).to.have.property('data');
-      expect(request[0].data).to.equal('{\"adUnits\":[{\"auId\":\"8b6bc\",\"targetId\":\"123\"}],\"metaData\":{\"usi\":\"' + usi + '\"}}');
+      expect(request[0].data).to.equal('{\"adUnits\":[{\"auId\":\"8b6bc\",\"targetId\":\"123\",\"dimensions\":[[640,480],[600,400]]}],\"metaData\":{\"usi\":\"' + usi + '\"}}');
     });
 
     it('Test Video requests', function () {

From 8de67ab45c6db4790c0adf4509ed98345f9f34e3 Mon Sep 17 00:00:00 2001
From: Mathieu Pheulpin <mpheulpin@sharethrough.com>
Date: Wed, 10 Aug 2022 07:36:33 -0700
Subject: [PATCH 123/569] Sharethrough Bid Adapter: Fix `bcat` and `badv` from
 First Party Data (#8808)

* [PGE-178206885] Fix bcat and badv via first party data

PGE-178206885

* Fix version number
---
 modules/sharethroughBidAdapter.js                |  6 +++---
 test/spec/modules/sharethroughBidAdapter_spec.js | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/sharethroughBidAdapter.js b/modules/sharethroughBidAdapter.js
index 731fc5c3a4e..cfbd94096bd 100644
--- a/modules/sharethroughBidAdapter.js
+++ b/modules/sharethroughBidAdapter.js
@@ -4,7 +4,7 @@ import { config } from '../src/config.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { createEidsArray } from './userId/eids.js';
 
-const VERSION = '4.1.1';
+const VERSION = '4.2.0';
 const BIDDER_CODE = 'sharethrough';
 const SUPPLY_ID = 'WYu2BXv1';
 
@@ -58,8 +58,8 @@ export const sharethroughAdapterSpec = {
           schain: bidRequests[0].schain,
         },
       },
-      bcat: deepAccess(bidderRequest.ortb2Imp, 'bcat') || bidRequests[0].params.bcat || [],
-      badv: bidRequests[0].params.badv || [],
+      bcat: deepAccess(bidderRequest.ortb2, 'bcat') || bidRequests[0].params.bcat || [],
+      badv: deepAccess(bidderRequest.ortb2, 'badv') || bidRequests[0].params.badv || [],
       test: 0,
     };
 
diff --git a/test/spec/modules/sharethroughBidAdapter_spec.js b/test/spec/modules/sharethroughBidAdapter_spec.js
index 7addd9ee786..bb5e8e69b6e 100644
--- a/test/spec/modules/sharethroughBidAdapter_spec.js
+++ b/test/spec/modules/sharethroughBidAdapter_spec.js
@@ -480,6 +480,8 @@ describe('sharethrough adapter spec', function () {
               },
             },
           },
+          bcat: ['IAB1', 'IAB2-1'],
+          badv: ['domain1.com', 'domain2.com'],
         };
 
         it('should include first party data in open rtb request, site section', () => {
@@ -493,13 +495,20 @@ describe('sharethrough adapter spec', function () {
         });
 
         it('should include first party data in open rtb request, user section', () => {
-          const openRtbReq = spec.buildRequests(bidRequests, {...bidderRequest, ortb2: firstPartyData})[0].data;
+          const openRtbReq = spec.buildRequests(bidRequests, { ...bidderRequest, ortb2: firstPartyData })[0].data;
 
           expect(openRtbReq.user.yob).to.equal(firstPartyData.user.yob);
           expect(openRtbReq.user.gender).to.equal(firstPartyData.user.gender);
           expect(openRtbReq.user.ext.data).to.deep.equal(firstPartyData.user.ext.data);
           expect(openRtbReq.user.ext.eids).not.to.be.undefined;
         });
+
+        it('should include first party data in open rtb request, ORTB blocked section', () => {
+          const openRtbReq = spec.buildRequests(bidRequests, { ...bidderRequest, ortb2: firstPartyData })[0].data;
+
+          expect(openRtbReq.bcat).to.deep.equal(firstPartyData.bcat);
+          expect(openRtbReq.badv).to.deep.equal(firstPartyData.badv);
+        });
       });
     });
 

From 2227454e6f21915f951b59dd2e39a032516c8273 Mon Sep 17 00:00:00 2001
From: pm-azhar-mulla <75726247+pm-azhar-mulla@users.noreply.github.com>
Date: Wed, 10 Aug 2022 20:38:56 +0530
Subject: [PATCH 124/569] resolved merge config issue (#8791)

Co-authored-by: pm-azhar-mulla <azhar@L1119.local>
---
 src/config.js            | 12 ++++++------
 test/spec/config_spec.js |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/config.js b/src/config.js
index 30ab8f35e2c..5e89210dfcb 100644
--- a/src/config.js
+++ b/src/config.js
@@ -386,7 +386,11 @@ export function newConfig() {
         option = Object.assign({}, defaults[topic], option);
       }
 
-      topicalConfig[topic] = config[topic] = option;
+      try {
+        topicalConfig[topic] = config[topic] = option;
+      } catch (e) {
+        logWarn(`Cannot set config for property ${topic} : `, e)
+      }
     });
 
     callSubscribers(topicalConfig);
@@ -525,11 +529,7 @@ export function newConfig() {
       return;
     }
 
-    const mergedConfig = Object.keys(obj).reduce((accum, key) => {
-      const prevConf = _getConfig()[key] || {};
-      accum[key] = mergeDeep(prevConf, obj[key]);
-      return accum;
-    }, {});
+    const mergedConfig = mergeDeep(_getConfig(), obj);
 
     setConfig({ ...mergedConfig });
     return mergedConfig;
diff --git a/test/spec/config_spec.js b/test/spec/config_spec.js
index 294fce2fa9b..d7f6b9de6c0 100644
--- a/test/spec/config_spec.js
+++ b/test/spec/config_spec.js
@@ -596,6 +596,7 @@ describe('config API', function () {
     }
 
     setConfig({
+      bidderTimeout: 2000,
       ortb2: {
         user: {
           data: [userObj1, userObj2]
@@ -609,6 +610,7 @@ describe('config API', function () {
     });
 
     const rtd = {
+      bidderTimeout: 3000,
       ortb2: {
         user: {
           data: [userObj1]
@@ -623,11 +625,13 @@ describe('config API', function () {
     mergeConfig(rtd);
 
     let ortb2Config = getConfig('ortb2');
+    let bidderTimeout = getConfig('bidderTimeout');
 
     expect(ortb2Config.user.data).to.deep.include.members([userObj1, userObj2]);
     expect(ortb2Config.site.content.data).to.deep.include.members([siteObj1]);
     expect(ortb2Config.user.data).to.have.lengthOf(2);
     expect(ortb2Config.site.content.data).to.have.lengthOf(1);
+    expect(bidderTimeout).to.equal(3000);
   });
 
   it('should not corrupt global configuration with bidder configuration', () => {

From b273c5712fe7311a1cf117ffa42ff143f9f43271 Mon Sep 17 00:00:00 2001
From: Wls-demo <67785512+Wls-demo@users.noreply.github.com>
Date: Wed, 10 Aug 2022 19:00:12 +0300
Subject: [PATCH 125/569] Boldwin Bid Adapter: added endpointId param (#8798)

* new boldwin bid adapter

* fix

* Restarting ci / circleci

* changes

* fixed conflicts

* added endpointId param

* kick off CircleCI tests

Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>
Co-authored-by: Vladislav Isaiko <vladis@smartyads.com>
Co-authored-by: Mykhailo Yaremchuk <m.yaremchuk@smartyads.com>
Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/boldwinBidAdapter.js                | 15 ++++++++++++---
 modules/boldwinBidAdapter.md                | 17 +++++++++++++++++
 test/spec/modules/boldwinBidAdapter_spec.js |  3 ++-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/modules/boldwinBidAdapter.js b/modules/boldwinBidAdapter.js
index ec580f8c3c2..ec9aeb2b888 100644
--- a/modules/boldwinBidAdapter.js
+++ b/modules/boldwinBidAdapter.js
@@ -46,7 +46,7 @@ export const spec = {
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   isBidRequestValid: (bid) => {
-    return Boolean(bid.bidId && bid.params && bid.params.placementId);
+    return Boolean(bid.bidId && bid.params && (bid.params.placementId || bid.params.endpointId));
   },
 
   buildRequests: (validBidRequests = [], bidderRequest) => {
@@ -85,7 +85,7 @@ export const spec = {
 
     for (let i = 0; i < len; i++) {
       let bid = validBidRequests[i];
-      const { mediaTypes } = bid;
+      const { mediaTypes, params } = bid;
       const placement = {};
       let sizes;
       if (mediaTypes) {
@@ -114,9 +114,18 @@ export const spec = {
           placement.native = mediaTypes[NATIVE];
         }
       }
+
+      const { placementId, endpointId } = params;
+      if (placementId) {
+        placement.placementId = placementId;
+        placement.type = 'publisher';
+      } else if (endpointId) {
+        placement.endpointId = endpointId;
+        placement.type = 'network';
+      }
+
       placements.push({
         ...placement,
-        placementId: bid.params.placementId,
         bidId: bid.bidId,
         sizes: sizes || [],
         wPlayer: sizes ? sizes[0] : 0,
diff --git a/modules/boldwinBidAdapter.md b/modules/boldwinBidAdapter.md
index 5e2a5b139b3..47f4b4ffe78 100644
--- a/modules/boldwinBidAdapter.md
+++ b/modules/boldwinBidAdapter.md
@@ -47,5 +47,22 @@ Module that connects to boldwin demand sources
                         }
                     ]
                 }
+                // Will return static test banner
+                {
+                    code: 'endpointId_0',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'boldwin',
+                            params: {
+                                endpointId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
             ];
 ```
diff --git a/test/spec/modules/boldwinBidAdapter_spec.js b/test/spec/modules/boldwinBidAdapter_spec.js
index afb5f935621..5b51183ea6d 100644
--- a/test/spec/modules/boldwinBidAdapter_spec.js
+++ b/test/spec/modules/boldwinBidAdapter_spec.js
@@ -59,11 +59,12 @@ describe('BoldwinBidAdapter', function () {
       expect(data.gdpr).to.not.exist;
       expect(data.ccpa).to.not.exist;
       let placement = data['placements'][0];
-      expect(placement).to.have.keys('placementId', 'bidId', 'adFormat', 'sizes', 'hPlayer', 'wPlayer', 'schain', 'bidFloor');
+      expect(placement).to.have.keys('placementId', 'bidId', 'adFormat', 'sizes', 'hPlayer', 'wPlayer', 'schain', 'bidFloor', 'type');
       expect(placement.placementId).to.equal('testBanner');
       expect(placement.bidId).to.equal('23fhj33i987f');
       expect(placement.adFormat).to.equal(BANNER);
       expect(placement.schain).to.be.an('object');
+      expect(placement.type).to.exist.and.to.equal('publisher');
     });
 
     it('Returns valid data for mediatype video', function () {

From c64d0bae03e0e9904481f8f7ccc879f2eab3b2cf Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Wed, 10 Aug 2022 11:01:14 -0700
Subject: [PATCH 126/569] ShowHeroes Bid Adapter: add new endpoint (#8816)

* add ShowHeroes Adapter

* ShowHeroes adapter - expanded outstream support

* Revert "ShowHeroes adapter - expanded outstream support"

This reverts commit bfcdb913b52012b5afbf95a84956b906518a4b51.

* ShowHeroes adapter - expanded outstream support

* ShowHeroes adapter - fixes (#4222)

* ShowHeroes adapter - banner and outstream fixes (#4222)

* ShowHeroes adapter - description and outstream changes (#4222)

* ShowHeroes adapter - increase test coverage and small fix

* ShowHeroes Adapter - naming convention issue

* Mixed AdUnits declaration support

* ITDEV-4723 PrebidJS adapter support with SupplyChain module object

* ITDEV-4723 Fix tests

* ITDEV-4723 New entry point

* showheroes-bsBidAdapter: Add support for advertiserDomains

* showheroes-bsBidAdapter: hotfix for outstream render

* showheroes-bsBidAdapter: update renderer url

* showheroes-bsBidAdapter: use only the necessary fields from the gdprConsent

* ShowHeroes adapter - added a new endpoint

* ShowHeroes adapter - unit tests

* Update showheroes-bsBidAdapter.md

* kick off tests

Co-authored-by: Eldengrof <vadim.mazzherin@gmail.com>
Co-authored-by: veranevera <vera.yukhina@showheroes.com>
Co-authored-by: Elizaveta Voziyanova <44549195+h2p4x8@users.noreply.github.com>
---
 modules/showheroes-bsBidAdapter.js            | 178 +++++++++++++-----
 modules/showheroes-bsBidAdapter.md            |  49 +++++
 .../modules/showheroes-bsBidAdapter_spec.js   | 175 ++++++++++++++++-
 3 files changed, 352 insertions(+), 50 deletions(-)

diff --git a/modules/showheroes-bsBidAdapter.js b/modules/showheroes-bsBidAdapter.js
index c1987a32c80..98451ebbb2f 100644
--- a/modules/showheroes-bsBidAdapter.js
+++ b/modules/showheroes-bsBidAdapter.js
@@ -1,4 +1,11 @@
-import { deepAccess, getBidIdParameter, getWindowTop, logError } from '../src/utils.js';
+import {
+  deepAccess,
+  getBidIdParameter,
+  getWindowTop,
+  triggerPixel,
+  logInfo,
+  logError
+} from '../src/utils.js';
 import { config } from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
@@ -7,6 +14,7 @@ import { loadExternalScript } from '../src/adloader.js';
 
 const PROD_ENDPOINT = 'https://bs.showheroes.com/api/v1/bid';
 const STAGE_ENDPOINT = 'https://bid-service.stage.showheroes.com/api/v1/bid';
+const VIRALIZE_ENDPOINT = 'https://ads.viralize.tv/prebid-sh/';
 const PROD_PUBLISHER_TAG = 'https://static.showheroes.com/publishertag.js';
 const STAGE_PUBLISHER_TAG = 'https://pubtag.stage.showheroes.com/publishertag.js';
 const PROD_VL = 'https://video-library.showheroes.com';
@@ -26,12 +34,13 @@ export const spec = {
   aliases: ['showheroesBs'],
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid: function(bid) {
-    return !!bid.params.playerId;
+    return !!bid.params.playerId || !!bid.params.unitId;
   },
   buildRequests: function(validBidRequests, bidderRequest) {
     let adUnits = [];
-    const pageURL = validBidRequests[0].params.contentPageUrl || bidderRequest.refererInfo.page;
+    const pageURL = validBidRequests[0].params.contentPageUrl || bidderRequest.refererInfo.referer;
     const isStage = !!validBidRequests[0].params.stage;
+    const isViralize = !!validBidRequests[0].params.unitId;
     const isOutstream = deepAccess(validBidRequests[0], 'mediaTypes.video.context') === 'outstream';
     const isCustomRender = deepAccess(validBidRequests[0], 'params.outstreamOptions.customRender');
     const isNodeRender = deepAccess(validBidRequests[0], 'params.outstreamOptions.slot') || deepAccess(validBidRequests[0], 'params.outstreamOptions.iframe');
@@ -40,12 +49,19 @@ export const spec = {
     const isBanner = !!validBidRequests[0].mediaTypes.banner || (isOutstream && !(isCustomRender || isNativeRender || isNodeRender));
     const defaultSchain = validBidRequests[0].schain || {};
 
+    const consentData = bidderRequest.gdprConsent || {};
+    const gdprConsent = {
+      apiVersion: consentData.apiVersion || 2,
+      gdprApplies: consentData.gdprApplies || 0,
+      consentString: consentData.consentString || '',
+    }
+
     validBidRequests.forEach((bid) => {
       const videoSizes = getVideoSizes(bid);
       const bannerSizes = getBannerSizes(bid);
       const vpaidMode = getBidIdParameter('vpaidMode', bid.params);
 
-      const makeBids = (type, size) => {
+      const makeBids = (type, size, isViralize) => {
         let context = '';
         let streamType = 2;
 
@@ -61,53 +77,79 @@ export const spec = {
           }
         }
 
-        const consentData = bidderRequest.gdprConsent || {};
-
-        const gdprConsent = {
-          apiVersion: consentData.apiVersion || 2,
-          gdprApplies: consentData.gdprApplies || 0,
-          consentString: consentData.consentString || '',
-        }
-
-        return {
+        let rBid = {
           type: streamType,
           adUnitCode: bid.adUnitCode,
           bidId: bid.bidId,
-          mediaType: type,
           context: context,
-          playerId: getBidIdParameter('playerId', bid.params),
           auctionId: bidderRequest.auctionId,
           bidderCode: BIDDER_CODE,
-          gdprConsent: gdprConsent,
           start: +new Date(),
           timeout: 3000,
-          size: {
-            width: size[0],
-            height: size[1]
-          },
           params: bid.params,
-          schain: bid.schain || defaultSchain,
+          schain: bid.schain || defaultSchain
         };
+
+        if (isViralize) {
+          rBid.unitId = getBidIdParameter('unitId', bid.params);
+          rBid.sizes = size;
+          rBid.mediaTypes = {
+            [type]: {'context': context}
+          };
+        } else {
+          rBid.playerId = getBidIdParameter('playerId', bid.params);
+          rBid.mediaType = type;
+          rBid.size = {
+            width: size[0],
+            height: size[1]
+          };
+          rBid.gdprConsent = gdprConsent;
+        }
+
+        return rBid;
       };
 
-      videoSizes.forEach((size) => {
-        adUnits.push(makeBids(VIDEO, size));
-      });
+      if (isViralize) {
+        if (videoSizes && videoSizes[0]) {
+          adUnits.push(makeBids(VIDEO, videoSizes, isViralize));
+        }
+        if (bannerSizes && bannerSizes[0]) {
+          adUnits.push(makeBids(BANNER, bannerSizes, isViralize));
+        }
+      } else {
+        videoSizes.forEach((size) => {
+          adUnits.push(makeBids(VIDEO, size));
+        });
 
-      bannerSizes.forEach((size) => {
-        adUnits.push(makeBids(BANNER, size));
-      });
+        bannerSizes.forEach((size) => {
+          adUnits.push(makeBids(BANNER, size));
+        });
+      }
     });
 
-    return {
-      url: isStage ? STAGE_ENDPOINT : PROD_ENDPOINT,
-      method: 'POST',
-      options: {contentType: 'application/json', accept: 'application/json'},
-      data: {
+    let endpointUrl;
+    let data;
+
+    const QA = validBidRequests[0].params.qa || {};
+
+    if (isViralize) {
+      endpointUrl = VIRALIZE_ENDPOINT;
+      data = {
+        'bidRequests': adUnits,
+        'context': {
+          'gdprConsent': gdprConsent,
+          'schain': defaultSchain,
+          'pageURL': QA.pageURL || encodeURIComponent(pageURL)
+        }
+      }
+    } else {
+      endpointUrl = isStage ? STAGE_ENDPOINT : PROD_ENDPOINT;
+
+      data = {
         'user': [],
         'meta': {
           'adapterVersion': 2,
-          'pageURL': encodeURIComponent(pageURL),
+          'pageURL': QA.pageURL || encodeURIComponent(pageURL),
           'vastCacheEnabled': (!!config.getConfig('cache') && !isBanner && !outstreamOptions) || false,
           'isDesktop': getWindowTop().document.documentElement.clientWidth > 700,
           'xmlAndTag': !!(isOutstream && isCustomRender) || false,
@@ -116,6 +158,13 @@ export const spec = {
         'requests': adUnits,
         'debug': validBidRequests[0].params.debug || false,
       }
+    }
+
+    return {
+      url: QA.endpoint || endpointUrl,
+      method: 'POST',
+      options: {contentType: 'application/json', accept: 'application/json'},
+      data: data
     };
   },
   interpretResponse: function(response, request) {
@@ -149,33 +198,53 @@ export const spec = {
     }
     return syncs;
   },
+
+  onBidWon(bid) {
+    if (bid.callbacks) {
+      triggerPixel(bid.callbacks.won);
+    }
+    logInfo(
+      `Showheroes adapter won the auction. Bid id: ${bid.bidId || bid.requestId}`
+    );
+  },
 };
 
 function createBids(bidRes, reqData) {
-  if (bidRes && (!Array.isArray(bidRes.bids) || bidRes.bids.length < 1)) {
+  if (!bidRes) {
+    return [];
+  }
+  const responseBids = bidRes.bids || bidRes.bidResponses;
+  if (!Array.isArray(responseBids) || responseBids.length < 1) {
     return [];
   }
 
   const bids = [];
   const bidMap = {};
-  (reqData.requests || []).forEach((bid) => {
+  (reqData.requests || reqData.bidRequests || []).forEach((bid) => {
     bidMap[bid.bidId] = bid;
   });
 
-  bidRes.bids.forEach(function (bid) {
-    const reqBid = bidMap[bid.bidId];
+  responseBids.forEach(function (bid) {
+    const requestId = bid.bidId || bid.requestId;
+    const reqBid = bidMap[requestId];
     const currentBidParams = reqBid.params;
+    const isViralize = !!reqBid.params.unitId;
+    const size = {
+      width: bid.width || bid.size.width,
+      height: bid.height || bid.size.height
+    };
+
     let bidUnit = {};
     bidUnit.cpm = bid.cpm;
-    bidUnit.requestId = bid.bidId;
+    bidUnit.requestId = requestId;
     bidUnit.adUnitCode = reqBid.adUnitCode;
     bidUnit.currency = bid.currency;
     bidUnit.mediaType = bid.mediaType || VIDEO;
     bidUnit.ttl = TTL;
-    bidUnit.creativeId = 'c_' + bid.bidId;
+    bidUnit.creativeId = 'c_' + requestId;
     bidUnit.netRevenue = true;
-    bidUnit.width = bid.size.width;
-    bidUnit.height = bid.size.height;
+    bidUnit.width = size.width;
+    bidUnit.height = size.height;
     bidUnit.meta = {
       advertiserDomains: bid.adomain || []
     };
@@ -185,24 +254,26 @@ function createBids(bidRes, reqData) {
         content: bid.vastXml,
       };
     }
-    if (bid.vastTag) {
-      bidUnit.vastUrl = bid.vastTag;
+    if (bid.vastTag || bid.vastUrl) {
+      bidUnit.vastUrl = bid.vastTag || bid.vastUrl;
     }
     if (bid.mediaType === BANNER) {
       bidUnit.ad = getBannerHtml(bid, reqBid, reqData);
     } else if (bid.context === 'outstream') {
       const renderer = Renderer.install({
-        id: bid.bidId,
+        id: requestId,
         url: 'https://static.showheroes.com/renderer.js',
         adUnitCode: reqBid.adUnitCode,
         config: {
           playerId: reqBid.playerId,
-          width: bid.size.width,
-          height: bid.size.height,
+          width: size.width,
+          height: size.height,
           vastUrl: bid.vastTag,
           vastXml: bid.vastXml,
+          ad: bid.ad,
           debug: reqData.debug,
-          isStage: !!reqData.meta.stage,
+          isStage: reqData.meta && !!reqData.meta.stage,
+          isViralize: isViralize,
           customRender: getBidIdParameter('customRender', currentBidParams.outstreamOptions),
           slot: getBidIdParameter('slot', currentBidParams.outstreamOptions),
           iframe: getBidIdParameter('iframe', currentBidParams.outstreamOptions),
@@ -218,7 +289,12 @@ function createBids(bidRes, reqData) {
 }
 
 function outstreamRender(bid) {
-  const embedCode = createOutstreamEmbedCode(bid);
+  let embedCode;
+  if (bid.renderer.config.isViralize) {
+    embedCode = createOutstreamEmbedCodeV2(bid);
+  } else {
+    embedCode = createOutstreamEmbedCode(bid);
+  }
   if (typeof bid.renderer.config.customRender === 'function') {
     bid.renderer.config.customRender(bid, embedCode);
   } else {
@@ -266,6 +342,12 @@ function createOutstreamEmbedCode(bid) {
   return fragment;
 }
 
+function createOutstreamEmbedCodeV2(bid) {
+  const range = document.createRange();
+  range.selectNode(document.getElementsByTagName('body')[0]);
+  return range.createContextualFragment(getBidIdParameter('ad', bid.renderer.config));
+}
+
 function getBannerHtml (bid, reqBid, reqData) {
   const isStage = !!reqData.meta.stage;
   const urls = getEnvURLs(isStage);
diff --git a/modules/showheroes-bsBidAdapter.md b/modules/showheroes-bsBidAdapter.md
index cde652e9d83..a32a77a2525 100644
--- a/modules/showheroes-bsBidAdapter.md
+++ b/modules/showheroes-bsBidAdapter.md
@@ -125,3 +125,52 @@ Module that connects to ShowHeroes demand source to fetch bids.
            }
        ];
 ```
+
+# Test Parameters (V2)
+```
+    var adUnits = [
+           {
+               code: 'video',
+               mediaTypes: {
+                   video: {
+                       playerSize: [640, 480],
+                       context: 'instream',
+                   }
+               },
+               bids: [
+                   {
+                       bidder: "showheroes-bs",
+                       params: {
+                           unitId: 'AACBWAcof-611K4U',
+                           vpaidMode: true // by default is 'false'
+                       }
+                   }
+               ]
+           },
+           {
+               code: 'video',
+               mediaTypes: {
+                   video: {
+                       playerSize: [640, 480],
+                       context: 'outstream',
+                   }
+               },
+               bids: [
+                   {
+                       bidder: "showheroes-bs",
+                       params: {
+                           unitId: 'AACBTwsZVANd9NlB',
+
+                           outstreamOptions: {
+                               // Required for the outstream renderer to exact node, one of
+                               iframe: 'iframe_id',
+                               // or
+                               slot: 'slot_id'
+                           }
+                       }
+                   }
+               ]
+           }
+       ];
+```
+
diff --git a/test/spec/modules/showheroes-bsBidAdapter_spec.js b/test/spec/modules/showheroes-bsBidAdapter_spec.js
index 69e8343dfc9..1aa7b132221 100644
--- a/test/spec/modules/showheroes-bsBidAdapter_spec.js
+++ b/test/spec/modules/showheroes-bsBidAdapter_spec.js
@@ -48,6 +48,18 @@ const bidRequestCommonParams = {
   'auctionId': '43aa080090a47f',
 }
 
+const bidRequestCommonParamsV2 = {
+  'bidder': 'showheroes-bs',
+  'params': {
+    'unitId': 'AACBWAcof-611K4U',
+  },
+  'adUnitCode': 'adunit-code-1',
+  'sizes': [[640, 480]],
+  'bidId': '38b373e1e31c18',
+  'bidderRequestId': '12e3ade2543ba6',
+  'auctionId': '43aa080090a47f',
+}
+
 const bidRequestVideo = {
   ...bidRequestCommonParams,
   ...{
@@ -72,6 +84,30 @@ const bidRequestOutstream = {
   }
 }
 
+const bidRequestVideoV2 = {
+  ...bidRequestCommonParamsV2,
+  ...{
+    'mediaTypes': {
+      'video': {
+        'playerSize': [640, 480],
+        'context': 'instream',
+      }
+    }
+  }
+}
+
+const bidRequestOutstreamV2 = {
+  ...bidRequestCommonParamsV2,
+  ...{
+    'mediaTypes': {
+      'video': {
+        'playerSize': [640, 480],
+        'context': 'outstream'
+      }
+    }
+  }
+}
+
 const bidRequestVideoVpaid = {
   ...bidRequestCommonParams,
   ...{
@@ -129,12 +165,19 @@ describe('shBidAdapter', function () {
 
   describe('isBidRequestValid', function () {
     it('should return true when required params found', function () {
-      const request = {
+      const requestV1 = {
         'params': {
           'playerId': '47427aa0-f11a-4d24-abca-1295a46a46cd',
         }
       }
-      expect(spec.isBidRequestValid(request)).to.equal(true)
+      expect(spec.isBidRequestValid(requestV1)).to.equal(true)
+
+      const requestV2 = {
+        'params': {
+          'unitId': 'AACBTwsZVANd9NlB',
+        }
+      }
+      expect(spec.isBidRequestValid(requestV2)).to.equal(true)
     })
 
     it('should return false when required params are not passed', function () {
@@ -149,6 +192,9 @@ describe('shBidAdapter', function () {
     it('sends bid request to ENDPOINT via POST', function () {
       const request = spec.buildRequests([bidRequestVideo], bidderRequest)
       expect(request.method).to.equal('POST')
+
+      const requestV2 = spec.buildRequests([bidRequestVideoV2], bidderRequest)
+      expect(requestV2.method).to.equal('POST')
     })
 
     it('check sizes formats', function () {
@@ -268,6 +314,30 @@ describe('shBidAdapter', function () {
       expect(payload2).to.have.property('type', 5);
     })
 
+    it('should attach valid params to the payload when type is video (instream V2)', function () {
+      const request = spec.buildRequests([bidRequestVideoV2], bidderRequest)
+      const payload = request.data.bidRequests[0];
+      expect(payload).to.be.an('object');
+      expect(payload).to.have.property('unitId', 'AACBWAcof-611K4U');
+      expect(payload.mediaTypes).to.eql({
+        [VIDEO]: {
+          'context': 'instream'
+        }
+      });
+    })
+
+    it('should attach valid params to the payload when type is video (outstream V2)', function () {
+      const request = spec.buildRequests([bidRequestOutstreamV2], bidderRequest)
+      const payload = request.data.bidRequests[0];
+      expect(payload).to.be.an('object');
+      expect(payload).to.have.property('unitId', 'AACBWAcof-611K4U');
+      expect(payload.mediaTypes).to.eql({
+        [VIDEO]: {
+          'context': 'outstream'
+        }
+      });
+    })
+
     it('passes gdpr if present', function () {
       const request = spec.buildRequests([bidRequestVideo], {...bidderRequest, ...gdpr})
       const payload = request.data.requests[0];
@@ -275,6 +345,13 @@ describe('shBidAdapter', function () {
       expect(payload.gdprConsent).to.eql(gdpr.gdprConsent)
     })
 
+    it('passes gdpr if present (V2)', function () {
+      const request = spec.buildRequests([bidRequestVideoV2], {...bidderRequest, ...gdpr})
+      const context = request.data.context;
+      expect(context).to.be.an('object');
+      expect(context.gdprConsent).to.eql(gdpr.gdprConsent)
+    })
+
     it('passes schain object if present', function() {
       const request = spec.buildRequests([{
         ...bidRequestVideo,
@@ -284,6 +361,16 @@ describe('shBidAdapter', function () {
       expect(payload).to.be.an('object');
       expect(payload.schain).to.eql(schain.schain);
     })
+
+    it('passes schain object if present (V2)', function() {
+      const request = spec.buildRequests([{
+        ...bidRequestVideoV2,
+        ...schain
+      }], bidderRequest)
+      const context = request.data.context;
+      expect(context).to.be.an('object');
+      expect(context.schain).to.eql(schain.schain);
+    })
   })
 
   describe('interpretResponse', function () {
@@ -327,6 +414,39 @@ describe('shBidAdapter', function () {
       }],
     };
 
+    const basicResponseV2 = {
+      'requestId': '38b373e1e31c18',
+      'adUnitCode': 'adunit-code-1',
+      'cpm': 1,
+      'currency': 'EUR',
+      'width': 640,
+      'height': 480,
+      'advertiserDomain': [],
+      'callbacks': {
+        'won': ['https://api-n729.qa.viralize.com/track/?ver=15&session_id=01ecd03ce381505ccdeb88e555b05001&category=request_session&type=event&request_session_id=01ecd03ce381505ccdeb88e555b05001&label=prebid_won&reason=ok']
+      },
+      'mediaType': 'video',
+      'adomain': adomain,
+    };
+
+    const vastUrl = 'https://api-n729.qa.viralize.com/vast/?zid=AACBWAcof-611K4U&u=https://example.org/?foo=bar&gdpr=0&cs=XXXXXXXXXXXXXXXXXXXX&sid=01ecd03ce381505ccdeb88e555b05001&width=300&height=200&prebidmode=1'
+
+    const responseVideoV2 = {
+      'bidResponses': [{
+        ...basicResponseV2,
+        'context': 'instream',
+        'vastUrl': vastUrl,
+      }],
+    };
+
+    const responseVideoOutstreamV2 = {
+      'bidResponses': [{
+        ...basicResponseV2,
+        'context': 'outstream',
+        'ad': '<script id="testScript" data-wid="auto" type="text/javascript" src="https://ads.viralize.tv/display/?zid=AACBTwsZVANd9NlB&u=https%3A%2F%2Fexample.org%2F%3Ffoo%3Dbar&gdpr=0&cs=XXXXXXXXXXXXXXXXXXXX&sid=01ececb3b4c19270d6a77ccf75433001&width=300&height=200&prebidmode=1"></script>',
+      }],
+    };
+
     it('should get correct bid response when type is video', function () {
       const request = spec.buildRequests([bidRequestVideo], bidderRequest)
       const expectedResponse = [
@@ -356,6 +476,31 @@ describe('shBidAdapter', function () {
       expect(result).to.deep.equal(expectedResponse)
     })
 
+    it('should get correct bid response when type is video (V2)', function () {
+      const request = spec.buildRequests([bidRequestVideoV2], bidderRequest)
+      const expectedResponse = [
+        {
+          'cpm': 1,
+          'creativeId': 'c_38b373e1e31c18',
+          'adUnitCode': 'adunit-code-1',
+          'currency': 'EUR',
+          'width': 640,
+          'height': 480,
+          'mediaType': 'video',
+          'netRevenue': true,
+          'vastUrl': vastUrl,
+          'requestId': '38b373e1e31c18',
+          'ttl': 300,
+          'meta': {
+            'advertiserDomains': adomain
+          }
+        }
+      ]
+
+      const result = spec.interpretResponse({'body': responseVideoV2}, request)
+      expect(result).to.deep.equal(expectedResponse)
+    })
+
     it('should get correct bid response when type is banner', function () {
       const request = spec.buildRequests([bidRequestBanner], bidderRequest)
 
@@ -396,6 +541,32 @@ describe('shBidAdapter', function () {
       expect(spots.length).to.equal(1)
     })
 
+    it('should get correct bid response when type is outstream (slot V2)', function () {
+      const bidRequestV2 = JSON.parse(JSON.stringify(bidRequestOutstreamV2));
+      const slotId = 'testSlot2'
+      bidRequestV2.params.outstreamOptions = {
+        slot: slotId
+      }
+
+      const container = document.createElement('div')
+      container.setAttribute('id', slotId)
+      document.body.appendChild(container)
+
+      const request = spec.buildRequests([bidRequestV2], bidderRequest)
+
+      const result = spec.interpretResponse({'body': responseVideoOutstreamV2}, request)
+      const bid = result[0]
+      expect(bid).to.have.property('mediaType', VIDEO);
+
+      const renderer = bid.renderer
+      expect(renderer).to.be.an('object')
+      expect(renderer.id).to.equal(bidRequestV2.bidId)
+      renderer.render(bid)
+
+      const scripts = container.querySelectorAll('#testScript')
+      expect(scripts.length).to.equal(1)
+    })
+
     it('should get correct bid response when type is outstream (iframe)', function () {
       const bidRequest = JSON.parse(JSON.stringify(bidRequestOutstream));
       const slotId = 'testIframe'

From 9afa2b04fff85cbc4d5a22daf3b506be2a86884c Mon Sep 17 00:00:00 2001
From: Samuel Adu <samuel.adu@gmail.com>
Date: Wed, 10 Aug 2022 20:05:04 +0100
Subject: [PATCH 127/569] Yahoossp bid adapter: Fix schain data handling
 (#8817)

* Yahoossp bid adapter: Fix schain data handling

* Add missing trailing semicolon

Co-authored-by: slimkrazy <sam@slimkrazy.com>
---
 modules/yahoosspBidAdapter.js                |  3 ++-
 test/spec/modules/yahoosspBidAdapter_spec.js | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/yahoosspBidAdapter.js b/modules/yahoosspBidAdapter.js
index 926c3317f1d..d1b7b08c202 100644
--- a/modules/yahoosspBidAdapter.js
+++ b/modules/yahoosspBidAdapter.js
@@ -281,7 +281,8 @@ function generateOpenRtbObject(bidderRequest, bid) {
       outBoundBidRequest = appendFirstPartyData(outBoundBidRequest, bid);
     };
 
-    if (deepAccess(bid, 'schain')) {
+    const schainData = deepAccess(bid, 'schain.nodes');
+    if (isArray(schainData) && schainData.length > 0) {
       outBoundBidRequest.source.ext.schain = bid.schain;
       outBoundBidRequest.source.ext.schain.nodes[0].rid = outBoundBidRequest.id;
     };
diff --git a/test/spec/modules/yahoosspBidAdapter_spec.js b/test/spec/modules/yahoosspBidAdapter_spec.js
index 4dce1358fae..6e52e9c57db 100644
--- a/test/spec/modules/yahoosspBidAdapter_spec.js
+++ b/test/spec/modules/yahoosspBidAdapter_spec.js
@@ -334,6 +334,19 @@ describe('YahooSSP Bid Adapter:', () => {
   });
 
   describe('Schain module support:', () => {
+    it('should not include schain data when schain array is empty', function () {
+      const { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const globalSchain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: []
+      };
+      bidRequest.schain = globalSchain;
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      const schain = data.source.ext.schain;
+      expect(schain).to.be.undefined;
+    });
+
     it('should send Global or Bidder specific schain', function () {
       const { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({});
       const globalSchain = {

From 2ee4d3f21f5767734222d0298d3b538e6cc3c859 Mon Sep 17 00:00:00 2001
From: caseywhitmire <60086994+caseywhitmire@users.noreply.github.com>
Date: Wed, 10 Aug 2022 17:43:13 -0700
Subject: [PATCH 128/569] Various files: fix LGTM trailing semi-colon (#8811)

* akamaiDapRtdProvider: fix LGTM trailing semi-colon

* newspassidBidAdapter: fix LGTM trailing semi-colon

* native: fix LGTM trailing semi-colon

* kueezBidAdapter: fix LGTM trailing semi-colon

* shinezBidAdapter: fix LGTM trailing semi-colon

* openxOrtbBidAdapter: fix LGTM trailing semi-colon

* bliinkBidAdapter: fix LGTM trailing semi-colon

* c1xBidAdapter: fix LGTM trailing semi-colon

* improvedigitalBidAdapter: fix LGTM trailing semi-colon

* weboramaRtdProvider: fix LGTM trailing semi-colon

* 1plusXRtdProvider: fix LGTM trailing semi-colon

* byDataAnalyticsAdapter: fix LGTM trailing semi-colon

* index: fix LGTM trailing semi-colon

* userId/index: fix LGTM trailing semi-colon

* taboolaBidAdapter: fix LGTM trailing semi-colon

* mediafuseBidAdapter: fix LGTM trailing semi-colon

* videoheroesBidAdapter: fix LGTM trailing semi-colon

* gulpfile: fix LGTM trailing semi-colon

* criteoBidAdapter: fix LGTM trailing semi-colon

* eplanningBidAdapter: fix LGTM trailing semi-colon

* hadronAnalyticsAdapter: fix LGTM trailing semi-colon

* config: fix LGTM trailing semi-colon

* imuIdSystem: fix LGTM trailing semi-colon

* spotxBidAdapter: fix LGTM trailing semi-colon
---
 gulpfile.js                             | 10 +++++-----
 modules/1plusXRtdProvider.js            |  2 +-
 modules/akamaiDapRtdProvider.js         |  4 ++--
 modules/bliinkBidAdapter.js             |  2 +-
 modules/byDataAnalyticsAdapter.js       |  2 +-
 modules/c1xBidAdapter.js                |  2 +-
 modules/criteoBidAdapter.js             |  2 +-
 modules/eplanningBidAdapter.js          |  6 +++---
 modules/hadronAnalyticsAdapter.js       |  4 ++--
 modules/improvedigitalBidAdapter.js     |  4 ++--
 modules/imuIdSystem.js                  |  2 +-
 modules/kueezBidAdapter.js              |  4 ++--
 modules/mediafuseBidAdapter.js          | 16 ++++++++--------
 modules/newspassidBidAdapter.js         |  2 +-
 modules/openxOrtbBidAdapter.js          |  6 +++---
 modules/prebidServerBidAdapter/index.js | 14 +++++++-------
 modules/shinezBidAdapter.js             |  4 ++--
 modules/spotxBidAdapter.js              | 10 +++++-----
 modules/taboolaBidAdapter.js            |  2 +-
 modules/userId/index.js                 |  2 +-
 modules/videoheroesBidAdapter.js        |  2 +-
 modules/weboramaRtdProvider.js          |  6 +++---
 src/config.js                           |  2 +-
 src/native.js                           |  2 +-
 24 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 3425850286d..09de874e389 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -246,7 +246,7 @@ function bundle(dev, moduleArr) {
   const dependencies = new Set();
   [coreFile].concat(moduleFiles).map(name => path.basename(name)).forEach((file) => {
     (depGraph[file] || []).forEach((dep) => dependencies.add(helpers.getBuiltPath(dev, dep)));
-  })
+  });
 
   const entries = [coreFile].concat(Array.from(dependencies), moduleFiles);
 
@@ -449,7 +449,7 @@ gulp.task('build-bundle-verbose', gulp.series(makeWebpackPkg({
 
 // public tasks (dependencies are needed for each task since they can be ran on their own)
 gulp.task('test-only', test);
-gulp.task('test-all-features-disabled', testTaskMaker({disableFeatures: require('./features.json'), oneBrowser: 'chrome', watch: false}))
+gulp.task('test-all-features-disabled', testTaskMaker({disableFeatures: require('./features.json'), oneBrowser: 'chrome', watch: false}));
 gulp.task('test', gulp.series(clean, lint, gulp.series('test-all-features-disabled', 'test-only')));
 
 gulp.task('test-coverage', gulp.series(clean, testCoverage));
@@ -464,12 +464,12 @@ gulp.task('serve', gulp.series(clean, lint, gulp.parallel('build-bundle-dev', wa
 gulp.task('serve-fast', gulp.series(clean, gulp.parallel('build-bundle-dev', watchFast)));
 gulp.task('serve-prod', gulp.series(clean, gulp.parallel('build-bundle-prod', startLocalServer)));
 gulp.task('serve-and-test', gulp.series(clean, gulp.parallel('build-bundle-dev', watchFast, testTaskMaker({watch: true}))));
-gulp.task('serve-e2e', gulp.series(clean, 'build-bundle-prod', gulp.parallel(() => startIntegServer(), startLocalServer)))
-gulp.task('serve-e2e-dev', gulp.series(clean, 'build-bundle-dev', gulp.parallel(() => startIntegServer(true), startLocalServer)))
+gulp.task('serve-e2e', gulp.series(clean, 'build-bundle-prod', gulp.parallel(() => startIntegServer(), startLocalServer)));
+gulp.task('serve-e2e-dev', gulp.series(clean, 'build-bundle-dev', gulp.parallel(() => startIntegServer(true), startLocalServer)));
 
 gulp.task('default', gulp.series(clean, 'build-bundle-prod'));
 
-gulp.task('e2e-test-only', () => runWebdriver({file: argv.file}))
+gulp.task('e2e-test-only', () => runWebdriver({file: argv.file}));
 gulp.task('e2e-test', gulp.series(clean, 'build-bundle-prod', testTaskMaker({e2e: true})));
 // other tasks
 gulp.task(bundleToStdout);
diff --git a/modules/1plusXRtdProvider.js b/modules/1plusXRtdProvider.js
index 5affafcf9d3..9d010c8d298 100644
--- a/modules/1plusXRtdProvider.js
+++ b/modules/1plusXRtdProvider.js
@@ -138,7 +138,7 @@ export const updateBidderConfig = (bidder, ortb2Updates, bidderConfigs) => {
 
   if (site) {
     // Legacy : cf. comment on buildOrtb2Updates first lines
-    const currentSite = deepAccess(bidderConfigCopy, 'ortb2.site')
+    const currentSite = deepAccess(bidderConfigCopy, 'ortb2.site');
     const updatedSite = mergeDeep(currentSite, site);
     deepSetValue(bidderConfigCopy, 'ortb2.site', updatedSite);
   }
diff --git a/modules/akamaiDapRtdProvider.js b/modules/akamaiDapRtdProvider.js
index f167cb7f3ea..1c2af70d737 100644
--- a/modules/akamaiDapRtdProvider.js
+++ b/modules/akamaiDapRtdProvider.js
@@ -202,7 +202,7 @@ export const dapUtils = {
     dapUtils.dapTokenize(configAsync, config.identity, onDone,
       function(token, status, xhr, onDone) {
         item.expires_at = now + DAP_DEFAULT_TOKEN_TTL;
-        let exp = dapUtils.dapExtractExpiryFromToken(token)
+        let exp = dapUtils.dapExtractExpiryFromToken(token);
         if (typeof exp == 'number') {
           item.expires_at = exp - 10;
         }
@@ -303,7 +303,7 @@ export const dapUtils = {
     dapUtils.dapEncryptedMembership(configAsync, token, onDone,
       function(encToken, status, xhr, onDone) {
         item.expires_at = now + DAP_DEFAULT_TOKEN_TTL;
-        let exp = dapUtils.dapExtractExpiryFromToken(encToken)
+        let exp = dapUtils.dapExtractExpiryFromToken(encToken);
         if (typeof exp == 'number') {
           item.expires_at = exp - 10;
         }
diff --git a/modules/bliinkBidAdapter.js b/modules/bliinkBidAdapter.js
index 495862013de..127b534c989 100644
--- a/modules/bliinkBidAdapter.js
+++ b/modules/bliinkBidAdapter.js
@@ -96,7 +96,7 @@ export function getKeywords() {
  * @return {({cpm, netRevenue: boolean, requestId, width: number, currency, ttl: number, creativeId, height: number}&{mediaType: string, vastXml})|null}
  */
 export const buildBid = (bidResponse) => {
-  const mediaType = deepAccess(bidResponse, 'creative.media_type')
+  const mediaType = deepAccess(bidResponse, 'creative.media_type');
   if (!mediaType) return null;
 
   let bid;
diff --git a/modules/byDataAnalyticsAdapter.js b/modules/byDataAnalyticsAdapter.js
index ccf57942d7a..84479ee618b 100644
--- a/modules/byDataAnalyticsAdapter.js
+++ b/modules/byDataAnalyticsAdapter.js
@@ -266,7 +266,7 @@ ascAdapter.getVisitorData = function (data = {}) {
   }
 
   const { clientId } = initOptions;
-  var userId = storage.getDataFromLocalStorage('userId')
+  var userId = storage.getDataFromLocalStorage('userId');
   if (!userId) {
     userId = generateUid();
     storage.setDataInLocalStorage('userId', userId);
diff --git a/modules/c1xBidAdapter.js b/modules/c1xBidAdapter.js
index 8b579f52299..8c9407825ba 100644
--- a/modules/c1xBidAdapter.js
+++ b/modules/c1xBidAdapter.js
@@ -78,7 +78,7 @@ export const c1xAdapter = {
       url: URL,
       data: payloadString,
       bids: bidIdTags
-    })
+    });
     return bidRequest;
   },
 
diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 590062c76bd..82035d1550e 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -513,7 +513,7 @@ function buildCdbRequest(context, bidRequests, bidderRequest) {
       ext: {
         schain: schain
       }
-    }
+    };
   };
   request.user = {
     ext: bidderRequest.userExt
diff --git a/modules/eplanningBidAdapter.js b/modules/eplanningBidAdapter.js
index a6adab1e9b9..0d37b72f4ad 100644
--- a/modules/eplanningBidAdapter.js
+++ b/modules/eplanningBidAdapter.js
@@ -38,14 +38,14 @@ export const spec = {
     const spaces = getSpaces(bidRequests, urlConfig.ml);
     // TODO: do the fallbacks make sense here?
     const pageUrl = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
-    const domain = bidderRequest.refererInfo.domain || window.location.host
+    const domain = bidderRequest.refererInfo.domain || window.location.host;
     if (urlConfig.t) {
       url = 'https://' + urlConfig.isv + '/layers/t_pbjs_2.json';
       params = {};
     } else {
       url = 'https://' + (urlConfig.sv || DEFAULT_SV) + '/pbjs/1/' + urlConfig.ci + '/' + dfpClientId + '/' + domain + '/' + sec;
       // TODO: does the fallback make sense here?
-      const referrerUrl = bidderRequest.refererInfo.ref || bidderRequest.refererInfo.topmostLocation
+      const referrerUrl = bidderRequest.refererInfo.ref || bidderRequest.refererInfo.topmostLocation;
 
       if (storage.hasLocalStorage()) {
         registerViewabilityAllBids(bidRequests);
@@ -150,7 +150,7 @@ export const spec = {
 
     return syncs;
   },
-}
+};
 
 function getUserAgent() {
   return window.navigator.userAgent;
diff --git a/modules/hadronAnalyticsAdapter.js b/modules/hadronAnalyticsAdapter.js
index 073dd15ea49..52829cf754d 100644
--- a/modules/hadronAnalyticsAdapter.js
+++ b/modules/hadronAnalyticsAdapter.js
@@ -10,7 +10,7 @@ import {getRefererInfo} from '../src/refererDetection.js';
  * hadronAnalyticsAdapter.js - Audigent Hadron Analytics Adapter
  */
 
-const HADRON_ANALYTICS_URL = 'https://analytics.hadron.ad.gt/api/v1/analytics'
+const HADRON_ANALYTICS_URL = 'https://analytics.hadron.ad.gt/api/v1/analytics';
 const HADRONID_ANALYTICS_VER = 'pbadgt0';
 const DEFAULT_PARTNER_ID = 0;
 const AU_GVLID = 561;
@@ -152,7 +152,7 @@ hadronAnalyticsAdapter.enableAnalytics = function(conf = {}) {
   }
 
   hadronAnalyticsAdapter.originEnableAnalytics(conf);
-}
+};
 
 function flush() {
   // Don't send anything if no partner id was declared
diff --git a/modules/improvedigitalBidAdapter.js b/modules/improvedigitalBidAdapter.js
index a362f85654c..4996f0efaf0 100644
--- a/modules/improvedigitalBidAdapter.js
+++ b/modules/improvedigitalBidAdapter.js
@@ -123,7 +123,7 @@ export const spec = {
 
     if (bidderRequest) {
       // GDPR
-      const gdprConsent = deepAccess(bidderRequest, 'gdprConsent')
+      const gdprConsent = deepAccess(bidderRequest, 'gdprConsent');
       if (gdprConsent) {
         if (typeof gdprConsent.gdprApplies === 'boolean') {
           deepSetValue(request, 'regs.ext.gdpr', Number(gdprConsent.gdprApplies));
@@ -508,7 +508,7 @@ const ID_REQUEST = {
       const url = deepAccess(bidderRequest, 'refererInfo.page');
       if (url) {
         site.page = url;
-        site.domain = bidderRequest.refererInfo.domain
+        site.domain = bidderRequest.refererInfo.domain;
       }
       const configSiteSettings = config.getConfig('site') || {};
       const fpdSiteSettings = deepAccess(bidderRequest, 'ortb2.site') || {};
diff --git a/modules/imuIdSystem.js b/modules/imuIdSystem.js
index 24b11dc1667..41ff95b6702 100644
--- a/modules/imuIdSystem.js
+++ b/modules/imuIdSystem.js
@@ -146,7 +146,7 @@ export const imuIdSubmodule = {
     }
 
     if (!localData.id) {
-      return {callback: callImuidApi(apiUrl)}
+      return {callback: callImuidApi(apiUrl)};
     }
     if (localData.expired) {
       callImuidApi(apiUrl)();
diff --git a/modules/kueezBidAdapter.js b/modules/kueezBidAdapter.js
index 4e0278603fd..24d339d1938 100644
--- a/modules/kueezBidAdapter.js
+++ b/modules/kueezBidAdapter.js
@@ -309,7 +309,7 @@ function generateSharedParams(sharedParams, bidderRequest) {
     wrapper_type: 'prebidjs',
     wrapper_vendor: '$$PREBID_GLOBAL$$',
     wrapper_version: '$prebid.version$'
-  }
+  };
 
   if (syncEnabled) {
     const allowedSyncMethod = getSyncMethod(filterSettings, bidderCode);
@@ -352,7 +352,7 @@ function generateSharedParams(sharedParams, bidderRequest) {
     params.userIds = JSON.stringify(userIds);
   }
 
-  return params
+  return params;
 }
 
 /**
diff --git a/modules/mediafuseBidAdapter.js b/modules/mediafuseBidAdapter.js
index 5a96c8b286c..e61c2e65c39 100644
--- a/modules/mediafuseBidAdapter.js
+++ b/modules/mediafuseBidAdapter.js
@@ -177,7 +177,7 @@ export const spec = {
       payload['iab_support'] = {
         omidpn: 'Mediafuse',
         omidpv: '$prebid.version$'
-      }
+      };
     }
 
     if (member > 0) {
@@ -185,7 +185,7 @@ export const spec = {
     }
 
     if (appDeviceObjBid) {
-      payload.device = appDeviceObj
+      payload.device = appDeviceObj;
     }
     if (appIdObjBid) {
       payload.app = appIdObj;
@@ -227,7 +227,7 @@ export const spec = {
     }
 
     if (bidderRequest && bidderRequest.uspConsent) {
-      payload.us_privacy = bidderRequest.uspConsent
+      payload.us_privacy = bidderRequest.uspConsent;
     }
 
     if (bidderRequest && bidderRequest.refererInfo) {
@@ -237,7 +237,7 @@ export const spec = {
         rd_top: bidderRequest.refererInfo.reachedTop,
         rd_ifs: bidderRequest.refererInfo.numIframes,
         rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
-      }
+      };
       payload.referrer_detection = refererinfo;
     }
 
@@ -386,7 +386,7 @@ export const spec = {
       reloadViewabilityScriptWithCorrectParameters(bid);
     }
   }
-}
+};
 
 function isPopulatedArray(arr) {
   return !!(isArray(arr) && arr.length > 0);
@@ -404,7 +404,7 @@ function reloadViewabilityScriptWithCorrectParameters(bid) {
   if (viewJsPayload) {
     let prebidParams = 'pbjs_adid=' + bid.adId + ';pbjs_auc=' + bid.adUnitCode;
 
-    let jsTrackerSrc = getViewabilityScriptUrlFromPayload(viewJsPayload)
+    let jsTrackerSrc = getViewabilityScriptUrlFromPayload(viewJsPayload);
 
     let newJsTrackerSrc = jsTrackerSrc.replace('dom_id=%native_dom_id%', prebidParams);
 
@@ -498,7 +498,7 @@ function formatRequest(payload, bidderRequest) {
   if (getParameterByName('apn_test').toUpperCase() === 'TRUE' || config.getConfig('apn_test') === true) {
     options.customHeaders = {
       'X-Is-Test': 1
-    }
+    };
   }
 
   if (payload.tags.length > MAX_IMPS_PER_REQUEST) {
@@ -733,7 +733,7 @@ function bidToTag(bid) {
     tag.code = bid.params.invCode;
   }
   tag.allow_smaller_sizes = bid.params.allowSmallerSizes || false;
-  tag.use_pmt_rule = bid.params.usePaymentRule || false
+  tag.use_pmt_rule = bid.params.usePaymentRule || false;
   tag.prebid = true;
   tag.disable_psa = true;
   let bidFloor = getBidFloor(bid);
diff --git a/modules/newspassidBidAdapter.js b/modules/newspassidBidAdapter.js
index ee6ece2b033..409cb55e6a0 100644
--- a/modules/newspassidBidAdapter.js
+++ b/modules/newspassidBidAdapter.js
@@ -66,7 +66,7 @@ export const spec = {
     this.loadConfiguredData(bid);
     logInfo('isBidRequestValid : ', config.getConfig(), bid);
     let adUnitCode = bid.adUnitCode; // adunit[n].code
-    let err1 = 'VALIDATION FAILED : missing {param} : siteId, placementId and publisherId are REQUIRED'
+    let err1 = 'VALIDATION FAILED : missing {param} : siteId, placementId and publisherId are REQUIRED';
     if (!(bid.params.hasOwnProperty('placementId'))) {
       logError(err1.replace('{param}', 'placementId'), adUnitCode);
       return false;
diff --git a/modules/openxOrtbBidAdapter.js b/modules/openxOrtbBidAdapter.js
index bbe0e827b8e..62066ebe4f1 100644
--- a/modules/openxOrtbBidAdapter.js
+++ b/modules/openxOrtbBidAdapter.js
@@ -157,7 +157,7 @@ function createVideoRequest(bid, bidderRequest) {
     method: 'POST',
     url: REQUEST_URL,
     data: data
-  }
+  };
 }
 
 function getBaseRequest(bid, bidderRequest) {
@@ -191,7 +191,7 @@ function getBaseRequest(bid, bidderRequest) {
     utils.deepSetValue(req, 'ext.delDomain', bid.params.delDomain);
   }
   if (bid.params.test) {
-    req.test = 1
+    req.test = 1;
   }
   if (bidderRequest.gdprConsent) {
     if (bidderRequest.gdprConsent.gdprApplies !== undefined) {
@@ -309,7 +309,7 @@ function interpretResponse(resp, req) {
         response.meta.paf.content_id = utils.deepAccess(bid, 'ext.paf.content_id');
       }
 
-      return response
+      return response;
     })];
   });
 
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 9c7c3c921b0..d99013c61f3 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -360,7 +360,7 @@ function _appendSiteAppDevice(request, pageUrl, accountId) {
   // ORTB specifies app OR site
   if (typeof config.getConfig('app') === 'object') {
     request.app = config.getConfig('app');
-    request.app.publisher = {id: accountId}
+    request.app.publisher = {id: accountId};
   } else {
     request.site = {};
     if (isPlainObject(config.getConfig('site'))) {
@@ -531,7 +531,7 @@ Object.assign(ORTB2.prototype, {
         if (bid.mediaTypes != null) {
           logWarn(`Prebid Server adapter does not (yet) support bidder-specific mediaTypes for the same adUnit. Size mapping configuration will be ignored for adUnit: ${adUnit.code}, bidder: ${bid.bidder}`);
         }
-      })
+      });
 
       // in case there is a duplicate imp.id, add '-2' suffix to the second imp.id.
       // e.g. if there are 2 adUnits (case of twin adUnit codes) with code 'test',
@@ -599,7 +599,7 @@ Object.assign(ORTB2.prototype, {
             }, {});
         }
       }
-      const nativeReq = deepAccess(adUnit, 'nativeOrtbRequest')
+      const nativeReq = deepAccess(adUnit, 'nativeOrtbRequest');
       if (FEATURES.NATIVE && nativeReq) {
         const defaultRequest = {
           // TODO: determine best way to pass these and if we allow defaults
@@ -727,7 +727,7 @@ Object.assign(ORTB2.prototype, {
 
       if (floor) {
         imp.bidfloor = floor.floor;
-        imp.bidfloorcur = floor.currency
+        imp.bidfloorcur = floor.currency;
       }
 
       if (imp.banner || imp.video || imp.native) {
@@ -766,11 +766,11 @@ Object.assign(ORTB2.prototype, {
     }
 
     // This is no longer overwritten unless name and version explicitly overwritten by extPrebid (mergeDeep)
-    request.ext.prebid = Object.assign(request.ext.prebid, {channel: {name: 'pbjs', version: $$PREBID_GLOBAL$$.version}})
+    request.ext.prebid = Object.assign(request.ext.prebid, {channel: {name: 'pbjs', version: $$PREBID_GLOBAL$$.version}});
 
     // set debug flag if in debug mode
     if (getConfig('debug')) {
-      request.ext.prebid = Object.assign(request.ext.prebid, {debug: true})
+      request.ext.prebid = Object.assign(request.ext.prebid, {debug: true});
     }
 
     // s2sConfig video.ext.prebid is passed through openrtb to PBS
@@ -1010,7 +1010,7 @@ Object.assign(ORTB2.prototype, {
             if (isPlainObject(ortb) && Array.isArray(ortb.assets)) {
               bidObject.native = {
                 ortb,
-              }
+              };
             } else {
               logError('prebid server native response contained no assets');
             }
diff --git a/modules/shinezBidAdapter.js b/modules/shinezBidAdapter.js
index 923ecec7e4b..0ce2eed6479 100644
--- a/modules/shinezBidAdapter.js
+++ b/modules/shinezBidAdapter.js
@@ -382,7 +382,7 @@ function generateGeneralParams(generalObject, bidderRequest) {
     ua: navigator.userAgent,
     session_id: getBidIdParameter('auctionId', generalObject),
     tmax: timeout
-  }
+  };
 
   const userIdsParam = getBidIdParameter('userId', generalObject);
   if (userIdsParam) {
@@ -431,5 +431,5 @@ function generateGeneralParams(generalObject, bidderRequest) {
     generalParams.page_url = generalParams.page_url || config.getConfig('pageUrl') || deepAccess(window, 'location.href');
   }
 
-  return generalParams
+  return generalParams;
 }
diff --git a/modules/spotxBidAdapter.js b/modules/spotxBidAdapter.js
index d044df74cfe..8a18d4973d3 100644
--- a/modules/spotxBidAdapter.js
+++ b/modules/spotxBidAdapter.js
@@ -268,7 +268,7 @@ export const spec = {
               ext: bid.userId.id5id.ext || {}
             }]
           }
-        )
+        );
       }
 
       // Add common id if available
@@ -297,14 +297,14 @@ export const spec = {
               }
             }]
           }
-        )
+        );
       }
 
       // Only add the user object if it's not empty
       if (!isEmpty(userExt)) {
         requestPayload.user = { ext: userExt };
       }
-      const urlQueryParams = 'src_sys=prebid'
+      const urlQueryParams = 'src_sys=prebid';
       return {
         method: 'POST',
         url: URL + channelId + '?' + urlQueryParams,
@@ -365,7 +365,7 @@ export const spec = {
             bid.vastXml = spotxBid.adm;
           } else {
             bid.cache_key = spotxBid.ext.cache_key;
-            bid.vastUrl = 'https://search.spotxchange.com/ad/vast.html?key=' + spotxBid.ext.cache_key
+            bid.vastUrl = 'https://search.spotxchange.com/ad/vast.html?key=' + spotxBid.ext.cache_key;
             bid.videoCacheKey = spotxBid.ext.cache_key;
           }
 
@@ -453,7 +453,7 @@ function outstreamRender(bid) {
         loadExternalScript(easiUrl, BIDDER_CODE, undefined, undefined, attributes);
       }
     } catch (err) {
-      logError('[SPOTX][renderer] Error:' + err.message)
+      logError('[SPOTX][renderer] Error:' + err.message);
     }
   }
 }
diff --git a/modules/taboolaBidAdapter.js b/modules/taboolaBidAdapter.js
index e94e7aba7ca..8db98409a76 100644
--- a/modules/taboolaBidAdapter.js
+++ b/modules/taboolaBidAdapter.js
@@ -107,7 +107,7 @@ export const spec = {
     }
 
     if (config.getConfig('coppa')) {
-      regs.coppa = 1
+      regs.coppa = 1;
     }
 
     const ortb2 = bidderRequest.ortb2 || {
diff --git a/modules/userId/index.js b/modules/userId/index.js
index f925e637178..14ebe6a57e8 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -843,7 +843,7 @@ function initSubmodules(dest, submodules, consentData, forceRefresh = false) {
   submodules = submodules.filter((submod) => !submod.config.storage || storageTypes.has(submod.config.storage.type));
 
   if (!submodules.length) {
-    logWarn(`${MODULE_NAME} - no ID module is configured for one of the available storage types:`, Array.from(storageTypes))
+    logWarn(`${MODULE_NAME} - no ID module is configured for one of the available storage types:`, Array.from(storageTypes));
     return [];
   }
 
diff --git a/modules/videoheroesBidAdapter.js b/modules/videoheroesBidAdapter.js
index 089f1256937..4818d9e1c58 100644
--- a/modules/videoheroesBidAdapter.js
+++ b/modules/videoheroesBidAdapter.js
@@ -85,7 +85,7 @@ export const spec = {
     };
 
     if (bidderRequest.refererInfo.ref) {
-      data.site.ref = bidderRequest.refererInfo.ref
+      data.site.ref = bidderRequest.refererInfo.ref;
     }
 
     if (bidderRequest.gdprConsent) {
diff --git a/modules/weboramaRtdProvider.js b/modules/weboramaRtdProvider.js
index 35440849db4..533e669fcaa 100644
--- a/modules/weboramaRtdProvider.js
+++ b/modules/weboramaRtdProvider.js
@@ -199,7 +199,7 @@ function initSubSection(moduleParams, subSection, ...requiredFields) {
     });
   } catch (e) {
     logError(`unable to initialize: error on ${subSection} configuration: ${e}`);
-    return false
+    return false;
   }
 
   logMessage(`weborama ${subSection} initialized with success`);
@@ -213,7 +213,7 @@ const globalDefaults = {
   sendToBidders: true,
   onData: () => {
     /* do nothing */ },
-}
+};
 
 /** normalize submodule configuration
  * @param {ModuleParams} moduleParams
@@ -558,7 +558,7 @@ function getDataFromLocalStorage(weboDataConf, cacheGet, cacheSet, defaultLocalS
     }
   }
 
-  const profile = cacheGet()
+  const profile = cacheGet();
 
   if (profile) {
     return [profile, false];
diff --git a/src/config.js b/src/config.js
index 5e89210dfcb..0922a2a2bea 100644
--- a/src/config.js
+++ b/src/config.js
@@ -456,7 +456,7 @@ export function newConfig() {
 
     if (options.init) {
       if (topic === ALL_TOPICS) {
-        callback(getConfig())
+        callback(getConfig());
       } else {
         // eslint-disable-next-line standard/no-callback-literal
         callback({[topic]: getConfig(topic)});
diff --git a/src/native.js b/src/native.js
index 4ba4505d441..bd20aa5d399 100644
--- a/src/native.js
+++ b/src/native.js
@@ -351,7 +351,7 @@ export function getNativeTargeting(bid, {index = auctionManager.index} = {}) {
       value = placeholder;
     }
 
-    let assetSendTargetingKeys = deepAccess(adUnit, `nativeParams.${asset}.sendTargetingKeys`)
+    let assetSendTargetingKeys = deepAccess(adUnit, `nativeParams.${asset}.sendTargetingKeys`);
     if (typeof assetSendTargetingKeys !== 'boolean') {
       assetSendTargetingKeys = deepAccess(adUnit, `nativeParams.ext.${asset}.sendTargetingKeys`);
     }

From 865cb34533696ee5c2109926b86c390e9ef1507b Mon Sep 17 00:00:00 2001
From: Pgb-Criteo <92986445+Pgb-Criteo@users.noreply.github.com>
Date: Thu, 11 Aug 2022 02:45:49 +0200
Subject: [PATCH 129/569] Criteo Adapter: Add Price floor support (#8815)

---
 modules/criteoBidAdapter.js                |  41 +++++-
 test/spec/modules/criteoBidAdapter_spec.js | 145 ++++++++++++++++++++-
 2 files changed, 184 insertions(+), 2 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 82035d1550e..c7f843f421d 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -502,6 +502,9 @@ function buildCdbRequest(context, bidRequests, bidderRequest) {
 
         slot.video = video;
       }
+
+      enrichSlotWithFloors(slot, bidRequest)
+
       return slot;
     }),
   };
@@ -537,7 +540,7 @@ function buildCdbRequest(context, bidRequests, bidderRequest) {
   return request;
 }
 
-function parseSizes(sizes, parser) {
+function parseSizes(sizes, parser = s => s) {
   if (sizes == undefined) {
     return [];
   }
@@ -635,6 +638,42 @@ for (var i = 0; i < 10; ++i) {
 </script>`;
 }
 
+function enrichSlotWithFloors(slot, bidRequest) {
+  try {
+    const slotFloors = {};
+
+    if (bidRequest.getFloor) {
+      if (bidRequest.mediaTypes?.banner) {
+        slotFloors.banner = {};
+        const bannerSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'))
+        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = bidRequest.getFloor({size: bannerSize, mediaType: BANNER}));
+      }
+
+      if (bidRequest.mediaTypes?.video) {
+        slotFloors.video = {};
+        const videoSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'))
+        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = bidRequest.getFloor({size: videoSize, mediaType: VIDEO}));
+      }
+
+      if (bidRequest.mediaTypes?.native) {
+        slotFloors.native = {};
+        slotFloors.native['*'] = bidRequest.getFloor({size: '*', mediaType: NATIVE});
+      }
+
+      if (Object.keys(slotFloors).length > 0) {
+        if (!slot.ext) {
+          slot.ext = {}
+        }
+        Object.assign(slot.ext, {
+          floors: slotFloors
+        });
+      }
+    }
+  } catch (e) {
+    logError('Could not parse floors from Prebid: ' + e);
+  }
+}
+
 export function canFastBid(fastBidVersion) {
   return fastBidVersion !== FAST_BID_VERSION_NONE;
 }
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index 19e97ea85bb..7252232676f 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -13,7 +13,7 @@ import * as utils from 'src/utils.js';
 import * as refererDetection from 'src/refererDetection.js';
 import { config } from '../../../src/config.js';
 import * as storageManager from 'src/storageManager.js';
-import { NATIVE, VIDEO } from '../../../src/mediaTypes.js';
+import {BANNER, NATIVE, VIDEO} from '../../../src/mediaTypes.js';
 
 describe('The Criteo bidding adapter', function () {
   let utilsMock, sandbox;
@@ -1238,6 +1238,149 @@ describe('The Criteo bidding adapter', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.regs.coppa).to.be.undefined;
     });
+
+    it('should properly build a banner request with floors', function () {
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [728, 90]]
+            }
+          },
+          params: {
+            networkId: 456,
+          },
+
+          getFloor: inputParams => {
+            if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+              return {
+                currency: 'USD',
+                floor: 1.0};
+            } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+              return {
+                currency: 'USD',
+                floor: 2.0};
+            } else {
+              return {}
+            }
+          }
+        },
+      ];
+      const bidderRequest = {};
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.slots[0].ext.floors).to.deep.equal({
+        'banner': {
+          '300x250': {'currency': 'USD', 'floor': 1},
+          '728x90': {'currency': 'USD', 'floor': 2}
+        }});
+    });
+
+    it('should properly build a video request with several player sizes with floors', function () {
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          mediaTypes: {
+            video: {
+              playerSize: [[300, 250], [728, 90]]
+            }
+          },
+          params: {
+            networkId: 456,
+          },
+
+          getFloor: inputParams => {
+            if (inputParams.mediaType === VIDEO && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+              return {
+                currency: 'USD',
+                floor: 1.0};
+            } else if (inputParams.mediaType === VIDEO && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+              return {
+                currency: 'USD',
+                floor: 2.0};
+            } else {
+              return {}
+            }
+          }
+        },
+      ];
+      const bidderRequest = {};
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.slots[0].ext.floors).to.deep.equal({
+        'video': {
+          '300x250': {'currency': 'USD', 'floor': 1},
+          '728x90': {'currency': 'USD', 'floor': 2}
+        }});
+    });
+
+    it('should properly build a multi format request with floors', function () {
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [728, 90]]
+            },
+            video: {
+              playerSize: [640, 480],
+            },
+            native: {}
+          },
+          params: {
+            networkId: 456,
+          },
+          ortb2Imp: {
+            ext: {
+              data: {
+                someContextAttribute: 'abc'
+              }
+            }
+          },
+
+          getFloor: inputParams => {
+            if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+              return {
+                currency: 'USD',
+                floor: 1.0};
+            } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+              return {
+                currency: 'USD',
+                floor: 2.0};
+            } else if (inputParams.mediaType === VIDEO && inputParams.size[0] === 640 && inputParams.size[1] === 480) {
+              return {
+                currency: 'EUR',
+                floor: 3.2};
+            } else if (inputParams.mediaType === NATIVE && inputParams.size === '*') {
+              return {
+                currency: 'YEN',
+                floor: 4.99};
+            } else {
+              return {}
+            }
+          }
+        },
+      ];
+      const bidderRequest = {};
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.slots[0].ext.data.someContextAttribute).to.deep.equal('abc');
+      expect(request.data.slots[0].ext.floors).to.deep.equal({
+        'banner': {
+          '300x250': {'currency': 'USD', 'floor': 1},
+          '728x90': {'currency': 'USD', 'floor': 2}
+        },
+        'video': {
+          '640x480': {'currency': 'EUR', 'floor': 3.2}
+        },
+        'native': {
+          '*': {'currency': 'YEN', 'floor': 4.99}
+        }});
+    });
   });
 
   describe('interpretResponse', function () {

From 5ef54f7b2234cba7595ea4446f68b821af670bd6 Mon Sep 17 00:00:00 2001
From: caseywhitmire <60086994+caseywhitmire@users.noreply.github.com>
Date: Thu, 11 Aug 2022 05:11:28 -0700
Subject: [PATCH 130/569] Various files: fix LGTM trailing semi-colon (#8821)

* Update ozoneBidAdapter

* Update criteoBidAdapter

* Update sspBCBidAdapter

* Update pubmaticBidAdapter.js

* Update ttdBidAdapter.js

* Update tripleliftBidAdapter.js

* Update colossussspBidAdapter.js

* Update sirdataRtdProvider.js

* Update smartxBidAdapter.js

* Update mobfoxpbBidAdapter.js

* Update 33acrossBidAdapter.js

* Update gridNMBidAdapter.js

* Update consentManagementUsp.js

* Update adapterManager.js

* Update adapterManager.js

* Update apacdexBidAdapter.js

* Update microadBidAdapter.js

* Update pubmaticAnalyticsAdapter.js

* Update hadronRtdProvider.js

* Update adagioBidAdapter.js

* Update operaadsBidAdapter.js

* Update auction.js

* Update appnexusBidAdapter.js

* Update utils.js

* Update adgenerationBidAdapter.js

* Update pulsepointBidAdapter.js

* Update consumableBidAdapter.js

* Update boldwinBidAdapter.js

* Update relaidoBidAdapter.js

* Update rubiconBidAdapter.js

* Update vrtcalBidAdapter.js

* Update oguryBidAdapter.js

* Update riseBidAdapter.js

* Update gridBidAdapter.js

* Update merkleIdSystem.js
---
 modules/33acrossBidAdapter.js       |  6 +++---
 modules/adagioBidAdapter.js         |  2 +-
 modules/adgenerationBidAdapter.js   |  2 +-
 modules/apacdexBidAdapter.js        |  6 +++---
 modules/appnexusBidAdapter.js       | 18 +++++++++---------
 modules/boldwinBidAdapter.js        |  8 ++++----
 modules/colossussspBidAdapter.js    |  4 ++--
 modules/consentManagementUsp.js     |  2 +-
 modules/consumableBidAdapter.js     |  2 +-
 modules/criteoBidAdapter.js         |  2 +-
 modules/gridBidAdapter.js           |  2 +-
 modules/gridNMBidAdapter.js         |  2 +-
 modules/hadronRtdProvider.js        |  2 +-
 modules/merkleIdSystem.js           |  4 ++--
 modules/microadBidAdapter.js        |  2 +-
 modules/mobfoxpbBidAdapter.js       |  4 ++--
 modules/oguryBidAdapter.js          |  2 +-
 modules/operaadsBidAdapter.js       |  2 +-
 modules/ozoneBidAdapter.js          |  4 ++--
 modules/pubmaticAnalyticsAdapter.js |  2 +-
 modules/pubmaticBidAdapter.js       |  8 ++++----
 modules/pulsepointBidAdapter.js     |  2 +-
 modules/relaidoBidAdapter.js        |  4 ++--
 modules/riseBidAdapter.js           |  4 ++--
 modules/rubiconBidAdapter.js        |  4 ++--
 modules/sirdataRtdProvider.js       |  6 +++---
 modules/smartxBidAdapter.js         |  4 ++--
 modules/sspBCBidAdapter.js          |  4 ++--
 modules/tripleliftBidAdapter.js     |  2 +-
 modules/ttdBidAdapter.js            |  8 ++++----
 modules/vrtcalBidAdapter.js         |  2 +-
 src/adapterManager.js               |  6 +++---
 src/auction.js                      |  4 ++--
 src/utils.js                        |  2 +-
 34 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/modules/33acrossBidAdapter.js b/modules/33acrossBidAdapter.js
index ad2b092baa8..89c00897571 100644
--- a/modules/33acrossBidAdapter.js
+++ b/modules/33acrossBidAdapter.js
@@ -322,7 +322,7 @@ function _createServerRequest({ bidRequests, gdprConsent = {}, uspConsent, pageU
     'url': url,
     'data': JSON.stringify(ttxRequest),
     'options': options
-  }
+  };
 }
 
 // BUILD REQUESTS: SET EXTENSIONS
@@ -438,7 +438,7 @@ function _buildBannerORTB(bidRequest) {
   return {
     format,
     ext
-  }
+  };
 }
 
 // BUILD REQUESTS: VIDEO
@@ -452,7 +452,7 @@ function _buildVideoORTB(bidRequest) {
     ...videoBidderParams // Bidder Specific overrides
   };
 
-  const video = {}
+  const video = {};
 
   const { w, h } = _getSize(videoParams.playerSize[0]);
   video.w = w;
diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index afc15bb2d17..5c07cbe2844 100644
--- a/modules/adagioBidAdapter.js
+++ b/modules/adagioBidAdapter.js
@@ -1124,7 +1124,7 @@ export const spec = {
         ...globalFeatures,
         print_number: getPrintNumber(adagioBid.adUnitCode, adagioBidderRequest).toString(),
         adunit_position: getSlotPosition(adagioBid.params.adUnitElementId) // adUnitElementId à déplacer ???
-      }
+      };
 
       adagioBid.params.pageviewId = internal.getPageviewId();
       adagioBid.params.prebidVersion = '$prebid.version$';
diff --git a/modules/adgenerationBidAdapter.js b/modules/adgenerationBidAdapter.js
index c91c4ad1ae0..21395724609 100644
--- a/modules/adgenerationBidAdapter.js
+++ b/modules/adgenerationBidAdapter.js
@@ -200,7 +200,7 @@ function createNativeAd(body) {
     native.clickTrackers = body.native_ad.link.clicktrackers || [];
     native.impressionTrackers = body.native_ad.imptrackers || [];
     if (body.beaconurl && body.beaconurl != '') {
-      native.impressionTrackers.push(body.beaconurl)
+      native.impressionTrackers.push(body.beaconurl);
     }
   }
   return native;
diff --git a/modules/apacdexBidAdapter.js b/modules/apacdexBidAdapter.js
index a6ab1ea03da..10593855c59 100644
--- a/modules/apacdexBidAdapter.js
+++ b/modules/apacdexBidAdapter.js
@@ -103,7 +103,7 @@ export const spec = {
 
     var pageUrl = _extractTopWindowUrlFromBidderRequest(bidderRequest);
     payload.site = {};
-    payload.site.page = pageUrl
+    payload.site.page = pageUrl;
     payload.site.referrer = _extractTopWindowReferrerFromBidderRequest(bidderRequest);
     // TODO: does it make sense to fall back to window.location for the domain?
     payload.site.hostname = bidderRequest.refererInfo?.domain || parseDomain(pageUrl);
@@ -124,12 +124,12 @@ export const spec = {
 
     // Apply schain.
     if (schain) {
-      payload.schain = schain
+      payload.schain = schain;
     }
 
     // Apply eids.
     if (eids) {
-      payload.eids = eids
+      payload.eids = eids;
     }
 
     // Apply geo
diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index 056326eb824..cf73b69991f 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -215,7 +215,7 @@ export const spec = {
       payload['iab_support'] = {
         omidpn: 'Appnexus',
         omidpv: '$prebid.version$'
-      }
+      };
     }
 
     if (member > 0) {
@@ -223,7 +223,7 @@ export const spec = {
     }
 
     if (appDeviceObjBid) {
-      payload.device = appDeviceObj
+      payload.device = appDeviceObj;
     }
     if (appIdObjBid) {
       payload.app = appIdObj;
@@ -265,7 +265,7 @@ export const spec = {
     }
 
     if (bidderRequest && bidderRequest.uspConsent) {
-      payload.us_privacy = bidderRequest.uspConsent
+      payload.us_privacy = bidderRequest.uspConsent;
     }
 
     if (bidderRequest && bidderRequest.refererInfo) {
@@ -275,7 +275,7 @@ export const spec = {
         rd_top: bidderRequest.refererInfo.reachedTop,
         rd_ifs: bidderRequest.refererInfo.numIframes,
         rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
-      }
+      };
       let pubPageUrl = bidderRequest.refererInfo.canonicalUrl;
       if (isStr(pubPageUrl) && pubPageUrl !== '') {
         refererinfo.rd_can = pubPageUrl;
@@ -410,7 +410,7 @@ export const spec = {
           if (includes(s2sCfg.bidders, adUnit.bids[0].bidder)) {
             s2sEndpointUrl = deepAccess(s2sCfg, 'endpoint.p1Consent');
           }
-        })
+        });
       }
 
       if (s2sEndpointUrl && s2sEndpointUrl.match('/openrtb2/prebid')) {
@@ -455,7 +455,7 @@ export const spec = {
       reloadViewabilityScriptWithCorrectParameters(bid);
     }
   }
-}
+};
 
 function isPopulatedArray(arr) {
   return !!(isArray(arr) && arr.length > 0);
@@ -473,7 +473,7 @@ function reloadViewabilityScriptWithCorrectParameters(bid) {
   if (viewJsPayload) {
     let prebidParams = 'pbjs_adid=' + bid.adId + ';pbjs_auc=' + bid.adUnitCode;
 
-    let jsTrackerSrc = getViewabilityScriptUrlFromPayload(viewJsPayload)
+    let jsTrackerSrc = getViewabilityScriptUrlFromPayload(viewJsPayload);
 
     let newJsTrackerSrc = jsTrackerSrc.replace('dom_id=%native_dom_id%', prebidParams);
 
@@ -567,7 +567,7 @@ function formatRequest(payload, bidderRequest) {
   if (getParameterByName('apn_test').toUpperCase() === 'TRUE' || config.getConfig('apn_test') === true) {
     options.customHeaders = {
       'X-Is-Test': 1
-    }
+    };
   }
 
   if (payload.tags.length > MAX_IMPS_PER_REQUEST) {
@@ -805,7 +805,7 @@ function bidToTag(bid) {
     tag.code = bid.params.invCode;
   }
   tag.allow_smaller_sizes = bid.params.allowSmallerSizes || false;
-  tag.use_pmt_rule = bid.params.usePaymentRule || false
+  tag.use_pmt_rule = bid.params.usePaymentRule || false;
   tag.prebid = true;
   tag.disable_psa = true;
   let bidFloor = getBidFloor(bid);
diff --git a/modules/boldwinBidAdapter.js b/modules/boldwinBidAdapter.js
index ec9aeb2b888..3915df8b976 100644
--- a/modules/boldwinBidAdapter.js
+++ b/modules/boldwinBidAdapter.js
@@ -57,7 +57,7 @@ export const spec = {
     let location;
     // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
     try {
-      location = new URL(bidderRequest.refererInfo.page)
+      location = new URL(bidderRequest.refererInfo.page);
       winTop = window.top;
     } catch (e) {
       location = winTop.location;
@@ -78,7 +78,7 @@ export const spec = {
         request.ccpa = bidderRequest.uspConsent;
       }
       if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent
+        request.gdpr = bidderRequest.gdprConsent;
       }
     }
     const len = validBidRequests.length;
@@ -91,10 +91,10 @@ export const spec = {
       if (mediaTypes) {
         if (mediaTypes[BANNER] && mediaTypes[BANNER].sizes) {
           placement.adFormat = BANNER;
-          sizes = mediaTypes[BANNER].sizes
+          sizes = mediaTypes[BANNER].sizes;
         } else if (mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize) {
           placement.adFormat = VIDEO;
-          sizes = mediaTypes[VIDEO].playerSize
+          sizes = mediaTypes[VIDEO].playerSize;
           placement.minduration = mediaTypes[VIDEO].minduration;
           placement.maxduration = mediaTypes[VIDEO].maxduration;
           placement.mimes = mediaTypes[VIDEO].mimes;
diff --git a/modules/colossussspBidAdapter.js b/modules/colossussspBidAdapter.js
index 4594b8c3ce6..9a0ff3a5422 100644
--- a/modules/colossussspBidAdapter.js
+++ b/modules/colossussspBidAdapter.js
@@ -105,8 +105,8 @@ export const spec = {
         request.ccpa = bidderRequest.uspConsent;
       }
       if (bidderRequest.gdprConsent) {
-        request.gdpr_consent = bidderRequest.gdprConsent.consentString || 'ALL'
-        request.gdpr_require = bidderRequest.gdprConsent.gdprApplies ? 1 : 0
+        request.gdpr_consent = bidderRequest.gdprConsent.consentString || 'ALL';
+        request.gdpr_require = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
       }
     }
 
diff --git a/modules/consentManagementUsp.js b/modules/consentManagementUsp.js
index cde32a2f1c0..2b18e59032c 100644
--- a/modules/consentManagementUsp.js
+++ b/modules/consentManagementUsp.js
@@ -304,4 +304,4 @@ function enableConsentManagement(configFromUser = false) {
   loadConsentData(); // immediately look up consent data to make it available without requiring an auction
 }
 config.getConfig('consentManagement', config => setConsentConfig(config.consentManagement));
-setTimeout(() => !addedConsentHook && enableConsentManagement())
+setTimeout(() => !addedConsentHook && enableConsentManagement());
diff --git a/modules/consumableBidAdapter.js b/modules/consumableBidAdapter.js
index 9a5f5f4675b..f6c470d82a9 100644
--- a/modules/consumableBidAdapter.js
+++ b/modules/consumableBidAdapter.js
@@ -4,7 +4,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'consumable';
 
-const BASE_URI = 'https://e.serverbid.com/api/v2'
+const BASE_URI = 'https://e.serverbid.com/api/v2';
 
 let siteId = 0;
 let bidder = 'consumable';
diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index c7f843f421d..1c269b2bba4 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -503,7 +503,7 @@ function buildCdbRequest(context, bidRequests, bidderRequest) {
         slot.video = video;
       }
 
-      enrichSlotWithFloors(slot, bidRequest)
+      enrichSlotWithFloors(slot, bidRequest);
 
       return slot;
     }),
diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index 40b79784595..d1743ac63af 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -282,7 +282,7 @@ export const spec = {
         ext: {
           gdpr: gdprConsent.gdprApplies ? 1 : 0
         }
-      }
+      };
     }
 
     if (uspConsent) {
diff --git a/modules/gridNMBidAdapter.js b/modules/gridNMBidAdapter.js
index b44f94f0495..bfe5f3952bc 100644
--- a/modules/gridNMBidAdapter.js
+++ b/modules/gridNMBidAdapter.js
@@ -208,7 +208,7 @@ export const spec = {
           ext: {
             gdpr: gdprConsent.gdprApplies ? 1 : 0
           }
-        }
+        };
       }
 
       if (uspConsent) {
diff --git a/modules/hadronRtdProvider.js b/modules/hadronRtdProvider.js
index a6aa0197d55..0bd4e6f8344 100644
--- a/modules/hadronRtdProvider.js
+++ b/modules/hadronRtdProvider.js
@@ -30,7 +30,7 @@ export const storage = getStorageManager({gvlid: AU_GVLID, moduleName: SUBMODULE
  */
 const urlAddParams = (url, params) => {
   return url + (url.indexOf('?') > -1 ? '&' : '?') + params
-}
+};
 
 /**
  * Deep set an object unless value present.
diff --git a/modules/merkleIdSystem.js b/modules/merkleIdSystem.js
index 19602c27093..6a10c2a94eb 100644
--- a/modules/merkleIdSystem.js
+++ b/modules/merkleIdSystem.js
@@ -159,7 +159,7 @@ export const merkleIdSubmodule = {
 
     if (typeof configParams.endpoint !== 'string') {
       logWarn('User ID - merkleId submodule endpoint string is not defined');
-      configParams.endpoint = ID_URL
+      configParams.endpoint = ID_URL;
     }
 
     if (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) {
@@ -188,7 +188,7 @@ export const merkleIdSubmodule = {
       refreshNeeded = storedDate && (Date.now() - storedDate.getTime() > refreshInSeconds * 1000);
       if (refreshNeeded) {
         logInfo('User ID - merkleId needs refreshing id');
-        const resp = generateId(configParams, configStorage)
+        const resp = generateId(configParams, configStorage);
         return {callback: resp};
       }
     }
diff --git a/modules/microadBidAdapter.js b/modules/microadBidAdapter.js
index b2eaf96f414..1b31000df43 100644
--- a/modules/microadBidAdapter.js
+++ b/modules/microadBidAdapter.js
@@ -33,7 +33,7 @@ const AUDIENCE_IDS = [
   {type: 13, bidKey: 'userId.idl_env'},
   {type: 14, bidKey: 'userId.criteoId'},
   {type: 15, bidKey: 'userId.pubcid'}
-]
+];
 
 function createCBT() {
   const randomValue = Math.floor(Math.random() * Math.pow(10, 18)).toString(16);
diff --git a/modules/mobfoxpbBidAdapter.js b/modules/mobfoxpbBidAdapter.js
index df900318881..9ff50e2531f 100644
--- a/modules/mobfoxpbBidAdapter.js
+++ b/modules/mobfoxpbBidAdapter.js
@@ -69,7 +69,7 @@ export const spec = {
         request.ccpa = bidderRequest.uspConsent;
       }
       if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent
+        request.gdpr = bidderRequest.gdprConsent;
       }
     }
 
@@ -82,7 +82,7 @@ export const spec = {
         schain: bid.schain || {},
         bidfloor: getBidFloor(bid)
       };
-      const mediaType = bid.mediaTypes
+      const mediaType = bid.mediaTypes;
 
       if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
         placement.traffic = BANNER;
diff --git a/modules/oguryBidAdapter.js b/modules/oguryBidAdapter.js
index e0630c7e412..f0ed3c24a31 100644
--- a/modules/oguryBidAdapter.js
+++ b/modules/oguryBidAdapter.js
@@ -209,6 +209,6 @@ export const spec = {
   onBidWon,
   getWindowContext,
   onTimeout
-}
+};
 
 registerBidder(spec);
diff --git a/modules/operaadsBidAdapter.js b/modules/operaadsBidAdapter.js
index b75090cdec6..aa548debf32 100644
--- a/modules/operaadsBidAdapter.js
+++ b/modules/operaadsBidAdapter.js
@@ -549,7 +549,7 @@ function createImp(bidRequest) {
   const floorDetail = getBidFloor(bidRequest, {
     mediaType: mediaType || '*',
     size: size || '*'
-  })
+  });
 
   impItem.bidfloor = floorDetail.floor;
   impItem.bidfloorcur = floorDetail.currency;
diff --git a/modules/ozoneBidAdapter.js b/modules/ozoneBidAdapter.js
index 2f229720208..3e59c2c8def 100644
--- a/modules/ozoneBidAdapter.js
+++ b/modules/ozoneBidAdapter.js
@@ -16,7 +16,7 @@ import {getPriceBucketString} from '../src/cpmBucketManager.js';
 import { Renderer } from '../src/Renderer.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 const BIDDER_CODE = 'ozone';
-const ORIGIN = 'https://elb.the-ozone-project.com' // applies only to auction & cookie
+const ORIGIN = 'https://elb.the-ozone-project.com'; // applies only to auction & cookie
 const AUCTIONURI = '/openrtb2/auction';
 const OZONECOOKIESYNC = '/static/load-cookie.html';
 const OZONE_RENDERER_URL = 'https://prebid.the-ozone-project.com/ozone-renderer.js';
@@ -98,7 +98,7 @@ export const spec = {
     this.loadWhitelabelData(bid);
     logInfo('isBidRequestValid : ', config.getConfig(), bid);
     let adUnitCode = bid.adUnitCode; // adunit[n].code
-    let err1 = 'VALIDATION FAILED : missing {param} : siteId, placementId and publisherId are REQUIRED'
+    let err1 = 'VALIDATION FAILED : missing {param} : siteId, placementId and publisherId are REQUIRED';
     if (!(bid.params.hasOwnProperty('placementId'))) {
       logError(err1.replace('{param}', 'placementId'), adUnitCode);
       return false;
diff --git a/modules/pubmaticAnalyticsAdapter.js b/modules/pubmaticAnalyticsAdapter.js
index 48b570a683b..38bcc4521be 100755
--- a/modules/pubmaticAnalyticsAdapter.js
+++ b/modules/pubmaticAnalyticsAdapter.js
@@ -384,7 +384,7 @@ function bidResponseHandler(args) {
 
   if (bid.bidder && args.bidderCode && bid.bidder !== args.bidderCode) {
     bid = copyRequiredBidDetails(args);
-    cache.auctions[args.auctionId].adUnitCodes[args.adUnitCode].bids[args.requestId].push(bid)
+    cache.auctions[args.auctionId].adUnitCodes[args.adUnitCode].bids[args.requestId].push(bid);
   }
   bid.adId = args.adId;
   bid.source = formatSource(bid.source || args.source);
diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index bdc8010618c..922fedd5092 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -608,7 +608,7 @@ function _addDealCustomTargetings(imp, bid) {
       if (dctr.substring(dctrLen, dctrLen - 1) === '|') {
         dctr = dctr.substring(0, dctrLen - 1);
       }
-      imp.ext['key_val'] = dctr.trim()
+      imp.ext['key_val'] = dctr.trim();
     } else {
       logWarn(LOG_WARN_PREFIX + 'Ignoring param : dctr with value : ' + dctr + ', expects string-value, found empty or non-string value');
     }
@@ -811,7 +811,7 @@ function _checkMediaType(bid, newBid) {
   if (bid.ext && bid.ext['bidtype'] != undefined) {
     newBid.mediaType = MEDIATYPE[bid.ext.bidtype];
   } else {
-    logInfo(LOG_WARN_PREFIX + 'bid.ext.bidtype does not exist, checking alternatively for mediaType')
+    logInfo(LOG_WARN_PREFIX + 'bid.ext.bidtype does not exist, checking alternatively for mediaType');
     var adm = bid.adm;
     var admStr = '';
     var videoRegex = new RegExp(/VAST\s+version/);
@@ -1097,7 +1097,7 @@ export const spec = {
       if (bidderRequest && allowAlternateBidder == true) {
         let allowedBiddersList = bidderSettings.get(bidderRequest.bidderCode, 'allowedAlternateBidderCodes');
         if (isArray(allowedBiddersList)) {
-          allowedBiddersList = allowedBiddersList.map(val => val.trim().toLowerCase()).filter(val => !!val).filter(uniques)
+          allowedBiddersList = allowedBiddersList.map(val => val.trim().toLowerCase()).filter(val => !!val).filter(uniques);
           biddersList = allowedBiddersList.includes('*') ? allBiddersList : [...biddersList, ...allowedBiddersList];
         } else {
           biddersList = allBiddersList;
@@ -1168,7 +1168,7 @@ export const spec = {
       mergeDeep(payload, {user: commonFpd.user});
     }
     if (commonFpd.bcat) {
-      blockedIabCategories = blockedIabCategories.concat(commonFpd.bcat)
+      blockedIabCategories = blockedIabCategories.concat(commonFpd.bcat);
     }
     if (commonFpd.ext?.prebid?.bidderparams?.[bidderRequest.bidderCode]?.acat) {
       const acatParams = commonFpd.ext.prebid.bidderparams[bidderRequest.bidderCode].acat;
diff --git a/modules/pulsepointBidAdapter.js b/modules/pulsepointBidAdapter.js
index 7b66bb7600f..52931be0078 100644
--- a/modules/pulsepointBidAdapter.js
+++ b/modules/pulsepointBidAdapter.js
@@ -96,7 +96,7 @@ function bidResponseAvailable(request, response) {
   const idToImpMap = {};
   const idToBidMap = {};
   const idToSlotConfig = {};
-  const bidResponse = response.body
+  const bidResponse = response.body;
   // extract the request bids and the response bids, keyed by impr-id
   const ortbRequest = request.data;
   ortbRequest.imp.forEach(imp => {
diff --git a/modules/relaidoBidAdapter.js b/modules/relaidoBidAdapter.js
index c9e9fc00eb7..2e6097dc100 100644
--- a/modules/relaidoBidAdapter.js
+++ b/modules/relaidoBidAdapter.js
@@ -71,11 +71,11 @@ function buildRequests(validBidRequests, bidderRequest) {
     }
 
     if (!bidder) {
-      bidder = bidRequest.bidder
+      bidder = bidRequest.bidder;
     }
 
     if (!bidder) {
-      bidder = bidRequest.bidder
+      bidder = bidRequest.bidder;
     }
 
     if (!count) {
diff --git a/modules/riseBidAdapter.js b/modules/riseBidAdapter.js
index 504de2e209a..7d4049bf1a2 100644
--- a/modules/riseBidAdapter.js
+++ b/modules/riseBidAdapter.js
@@ -384,7 +384,7 @@ function generateGeneralParams(generalObject, bidderRequest) {
     ua: navigator.userAgent,
     session_id: getBidIdParameter('auctionId', generalObject),
     tmax: timeout
-  }
+  };
 
   const userIdsParam = getBidIdParameter('userId', generalObject);
   if (userIdsParam) {
@@ -430,5 +430,5 @@ function generateGeneralParams(generalObject, bidderRequest) {
     generalParams.page_url = deepAccess(bidderRequest, 'refererInfo.page') || deepAccess(window, 'location.href');
   }
 
-  return generalParams
+  return generalParams;
 }
diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index 192d5406b86..4817d62348a 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -939,7 +939,7 @@ function parseSizes(bid, mediaType) {
   } else if (typeof deepAccess(bid, 'mediaTypes.banner.sizes') !== 'undefined') {
     sizes = mapSizes(bid.mediaTypes.banner.sizes);
   } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
-    sizes = mapSizes(bid.sizes)
+    sizes = mapSizes(bid.sizes);
   } else {
     logWarn('Rubicon: no sizes are setup or found');
   }
@@ -1045,7 +1045,7 @@ function applyFPD(bidRequest, mediaType, data) {
     let val = validate(obj, key, name);
     let loc = (MAP[key] && isParent) ? `${MAP[key]}` : (key === 'data') ? `${MAP[name]}iab` : `${MAP[name]}${key}`;
     data[loc] = (data[loc]) ? data[loc].concat(',', val) : val;
-  }
+  };
 
   if (mediaType === BANNER) {
     ['site', 'user'].forEach(name => {
diff --git a/modules/sirdataRtdProvider.js b/modules/sirdataRtdProvider.js
index 532d938375e..369276e7638 100644
--- a/modules/sirdataRtdProvider.js
+++ b/modules/sirdataRtdProvider.js
@@ -200,7 +200,7 @@ export function addSegmentData(reqBids, data, moduleConfig, onDone) {
         if (typeof n.setTargeting !== 'undefined' && sirdataMergedList && sirdataMergedList.length > 0) {
           n.setTargeting('sd_rtd', sirdataMergedList);
         }
-      })
+      });
     } catch (e) {
       logError(e);
     }
@@ -224,7 +224,7 @@ export function addSegmentData(reqBids, data, moduleConfig, onDone) {
         curationData = {'segments': [], 'categories': []};
         sirdataMergedList = [];
 
-        let minScore = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('contextualMinRelevancyScore') ? moduleConfig.params.bidders[bidderIndex].contextualMinRelevancyScore : globalMinScore)
+        let minScore = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('contextualMinRelevancyScore') ? moduleConfig.params.bidders[bidderIndex].contextualMinRelevancyScore : globalMinScore);
 
         if (!biddersParamsExist || (indexFound && (!moduleConfig.params.bidders[bidderIndex].hasOwnProperty('adUnitCodes') || moduleConfig.params.bidders[bidderIndex].adUnitCodes.indexOf(adUnit.code) !== -1))) {
           switch (bid.bidder) {
@@ -476,7 +476,7 @@ export function addSegmentData(reqBids, data, moduleConfig, onDone) {
           }
         }
       } catch (e) {
-        logError(e)
+        logError(e);
       }
     })
   });
diff --git a/modules/smartxBidAdapter.js b/modules/smartxBidAdapter.js
index f3188c1f110..e5f71265e34 100644
--- a/modules/smartxBidAdapter.js
+++ b/modules/smartxBidAdapter.js
@@ -221,7 +221,7 @@ export const spec = {
                 name: provider,
                 value: targetingstring,
               }
-            })
+            });
           }
         }
 
@@ -230,7 +230,7 @@ export const spec = {
         requestPayload.user = {
           ext: userExt,
           data: targetingarr
-        }
+        };
       }
 
       return {
diff --git a/modules/sspBCBidAdapter.js b/modules/sspBCBidAdapter.js
index 0a19410c78f..ffe2bef054c 100644
--- a/modules/sspBCBidAdapter.js
+++ b/modules/sspBCBidAdapter.js
@@ -338,7 +338,7 @@ const mapImpression = slot => {
   if (!adUnitsCalled[adUnitCode]) {
     // this is a new adunit - assign & save pbsize
     adSizesCalled[slotSize] = adSizesCalled[slotSize] ? adSizesCalled[slotSize] += 1 : 1;
-    adUnitsCalled[adUnitCode] = `${slotSize}_${adSizesCalled[slotSize]}`
+    adUnitsCalled[adUnitCode] = `${slotSize}_${adSizesCalled[slotSize]}`;
   }
 
   ext.data = Object.assign({ pbsize: adUnitsCalled[adUnitCode] }, ext.data);
@@ -682,7 +682,7 @@ const spec = {
                   site: site.id,
                   slot: site.slot,
                   cpm: bid.cpm.toPrecision(4),
-                }
+                };
                 const jsTracker = '<script type="text/javascript" async="true" src="' + TRACKER_URL + '" ' + Object.keys(jsData).reduce((acc, current) => { return acc + ` data-wpar-${current}="${jsData[current]}"` }, '') + '><\/script>';
                 if (bid.native.javascriptTrackers) {
                   bid.native.javascriptTrackers.push(jsTracker);
diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index a5a93024ff9..67c254f2e76 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -101,7 +101,7 @@ export const tripleliftAdapterSpec = {
       url: syncEndpoint
     }];
   }
-}
+};
 
 function _getSyncType(syncOptions) {
   if (!syncOptions) return;
diff --git a/modules/ttdBidAdapter.js b/modules/ttdBidAdapter.js
index b95b379d74d..3a23c75b01b 100644
--- a/modules/ttdBidAdapter.js
+++ b/modules/ttdBidAdapter.js
@@ -221,7 +221,7 @@ function banner(bid) {
 
   const battr = utils.deepAccess(bid, 'ortb2Imp.battr');
   if (battr) {
-    banner.battr = battr
+    banner.battr = battr;
   }
 
   return banner;
@@ -245,7 +245,7 @@ function video(bid) {
   const maxbitrate = utils.deepAccess(bid, 'mediaTypes.video.maxbitrate');
 
   if (!minduration || !utils.isInteger(minduration)) {
-    minduration = 0
+    minduration = 0;
   }
   let video = {
     minduration: minduration,
@@ -293,7 +293,7 @@ function video(bid) {
 
   const battr = utils.deepAccess(bid, 'ortb2Imp.battr');
   if (battr) {
-    video.battr = battr
+    video.battr = battr;
   }
 
   return video;
@@ -364,7 +364,7 @@ export const spec = {
         return false;
       }
       if (!mediaTypesVideo.protocols) {
-        utils.logWarn(BIDDER_CODE + ': mediaTypes.video.protocols should be an array of supported protocols. See the Open RTB v2.5 spec for valid values')
+        utils.logWarn(BIDDER_CODE + ': mediaTypes.video.protocols should be an array of supported protocols. See the Open RTB v2.5 spec for valid values');
         return false;
       }
     }
diff --git a/modules/vrtcalBidAdapter.js b/modules/vrtcalBidAdapter.js
index 88a5c8c8525..36276973c20 100644
--- a/modules/vrtcalBidAdapter.js
+++ b/modules/vrtcalBidAdapter.js
@@ -87,7 +87,7 @@ export const spec = {
         params.imp[0].banner.h = bid.sizes[0][1];
       }
 
-      return {method: 'POST', url: 'https://rtb.vrtcal.com/bidder_prebid.vap?ssp=1804', data: JSON.stringify(params), options: {withCredentials: false, crossOrigin: true}}
+      return {method: 'POST', url: 'https://rtb.vrtcal.com/bidder_prebid.vap?ssp=1804', data: JSON.stringify(params), options: {withCredentials: false, crossOrigin: true}};
     });
 
     return requests;
diff --git a/src/adapterManager.js b/src/adapterManager.js
index 03f3848e81b..e5fea72b108 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -275,7 +275,7 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
         }
       });
     }
-  })
+  });
 
   // client adapters
   let adUnitsClientCopy = getAdUnitCopyForClientAdapters(adUnits);
@@ -386,7 +386,7 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
       } else {
         logError('missing ' + s2sConfig.adapter);
       }
-      counter++
+      counter++;
     }
   });
 
@@ -473,7 +473,7 @@ adapterManager.aliasBidAdapter = function (bidderCode, alias, options) {
       });
       nonS2SAlias.forEach(bidderCode => {
         logError('bidderCode "' + bidderCode + '" is not an existing bidder.', 'adapterManager.aliasBidAdapter');
-      })
+      });
     } else {
       try {
         let newAdapter;
diff --git a/src/auction.js b/src/auction.js
index a1d6261201f..b7deeccfd82 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -359,7 +359,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
     getBidsReceived: () => _bidsReceived,
     getNoBids: () => _noBids,
     getFPD: () => ortb2Fragments
-  }
+  };
 }
 
 export const addBidResponse = hook('sync', function(adUnitCode, bid) {
@@ -566,7 +566,7 @@ function getPreparedBidForAuction({adUnitCode, bid, auctionId}, {index = auction
 
   // a publisher can also define a renderer for a mediaType
   const bidObjectMediaType = bidObject.mediaType;
-  const mediaTypes = index.getMediaTypes(bidObject)
+  const mediaTypes = index.getMediaTypes(bidObject);
   const bidMediaType = mediaTypes && mediaTypes[bidObjectMediaType];
 
   var mediaTypeRenderer = bidMediaType && bidMediaType.renderer;
diff --git a/src/utils.js b/src/utils.js
index 9434a163133..08f06324503 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -52,7 +52,7 @@ export const internal = {
   deepEqual
 };
 
-let prebidInternal = {}
+let prebidInternal = {};
 /**
  * Returns object that is used as internal prebid namespace
  */

From 358f96a8f660bff81779f403bf70a143c96c3b71 Mon Sep 17 00:00:00 2001
From: guiann <guillaume.andouard@adyoulike.com>
Date: Thu, 11 Aug 2022 14:24:19 +0200
Subject: [PATCH 131/569] AdYouLike bidder adapter: update pageUrl and referrer
 values (#8822)

* add required clickurl in every native adrequest

* allows the native response to be given as is to prebid if possible

* add unit tests on new Native case

* Handle meta object in bid response with default addomains array

* fix icon retrieval in Native case

* Update priorities in case of multiple mediatypes given

* improve robustness and fix associated unit test on picture urls

* add support for params.size parameter

* add unit test on new size format

* Makes sure the playerSize format is consistent

* enable Vast response on bidder adapter

* fix lint errors

* add test on Vast format case

* add userId to bidrequest

* revert package-lock.json changes

* improve multiple mediatype handling

* Expose adyoulike GVL id

* fix icurl issue when retreiving icon for Native mediatype

* update unit tests on icon url in native mediatype

* target video endpoint when video mediatype is present

* add unit test on video endpoint

* detect if bid request has video

* remove console log

* Add size information in Video bid + unit tests

* Remove unused method (old video retrieval)

* update pagereferrer and pageUrl values

Co-authored-by: GuillaumeA <guillaume.andouard@openweb.com>
---
 modules/adyoulikeBidAdapter.js                | 18 +++++++++++-------
 test/spec/modules/adyoulikeBidAdapter_spec.js | 11 ++++++++---
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/modules/adyoulikeBidAdapter.js b/modules/adyoulikeBidAdapter.js
index 8d5397fe507..0f373749a7f 100644
--- a/modules/adyoulikeBidAdapter.js
+++ b/modules/adyoulikeBidAdapter.js
@@ -118,6 +118,10 @@ export const spec = {
       payload.uspConsent = bidderRequest.uspConsent;
     }
 
+    if (bidderRequest.ortb2) {
+      payload.ortb2 = bidderRequest.ortb2;
+    }
+
     if (deepAccess(bidderRequest, 'userId')) {
       payload.userId = createEidsArray(bidderRequest.userId);
     }
@@ -221,16 +225,21 @@ function createEndpoint(bidRequests, bidderRequest, hasVideo) {
 /* Create endpoint query string */
 function createEndpointQS(bidderRequest) {
   const qs = {};
-
   if (bidderRequest) {
     const ref = bidderRequest.refererInfo;
     if (ref?.location) {
-      // TODO: is 'location' the right value here?
+      // RefererUrl will be removed in a future version.
       qs.RefererUrl = encodeURIComponent(ref.location);
       if (ref.numIframes > 0) {
         qs.SafeFrame = true;
       }
     }
+
+    const siteInfo = bidderRequest.ortb2?.site;
+    if (siteInfo) {
+      qs.PageUrl = encodeURIComponent(siteInfo.page);
+      qs.PageReferrer = encodeURIComponent(siteInfo.ref || ref?.location);
+    }
   }
 
   const can = bidderRequest?.refererInfo?.canonicalUrl;
@@ -238,11 +247,6 @@ function createEndpointQS(bidderRequest) {
     qs.CanonicalUrl = encodeURIComponent(can);
   }
 
-  const domain = bidderRequest?.refererInfo?.domain;
-  if (domain) {
-    qs.PublisherDomain = encodeURIComponent(domain);
-  }
-
   return qs;
 }
 
diff --git a/test/spec/modules/adyoulikeBidAdapter_spec.js b/test/spec/modules/adyoulikeBidAdapter_spec.js
index 12278900ab0..bab0776a5f4 100644
--- a/test/spec/modules/adyoulikeBidAdapter_spec.js
+++ b/test/spec/modules/adyoulikeBidAdapter_spec.js
@@ -6,6 +6,7 @@ import { newBidder } from 'src/adapters/bidderFactory.js';
 describe('Adyoulike Adapter', function () {
   const canonicalUrl = 'https://canonical.url/?t=%26';
   const referrerUrl = 'http://referrer.url/?param=value';
+  const pageUrl = 'http://page.url/?param=value';
   const domain = 'domain:123';
   const defaultDC = 'hb-api';
   const consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
@@ -17,7 +18,8 @@ describe('Adyoulike Adapter', function () {
       consentString: consentString,
       gdprApplies: true
     },
-    refererInfo: {location: referrerUrl, canonicalUrl, domain}
+    refererInfo: {location: referrerUrl, canonicalUrl, domain},
+    ortb2: {site: {page: pageUrl, ref: referrerUrl}}
   };
   const bidRequestWithEmptyPlacement = [
     {
@@ -601,7 +603,8 @@ describe('Adyoulike Adapter', function () {
       expect(request.method).to.equal('POST');
       expect(request.url).to.contains('CanonicalUrl=' + encodeURIComponent(canonicalUrl));
       expect(request.url).to.contains('RefererUrl=' + encodeURIComponent(referrerUrl));
-      expect(request.url).to.contains('PublisherDomain=' + encodeURIComponent(domain));
+      expect(request.url).to.contains('PageUrl=' + encodeURIComponent(pageUrl));
+      expect(request.url).to.contains('PageReferrer=' + encodeURIComponent(referrerUrl));
 
       expect(payload.Version).to.equal('1.0');
       expect(payload.Bids['bid_id_0'].PlacementID).to.be.equal('placement_0');
@@ -698,12 +701,14 @@ describe('Adyoulike Adapter', function () {
       expect(request.method).to.equal('POST');
       expect(request.url).to.contains('CanonicalUrl=' + encodeURIComponent(canonicalUrl));
       expect(request.url).to.contains('RefererUrl=' + encodeURIComponent(referrerUrl));
-      expect(request.url).to.contains('PublisherDomain=' + encodeURIComponent(domain));
+      expect(request.url).to.contains('PageUrl=' + encodeURIComponent(pageUrl));
+      expect(request.url).to.contains('PageReferrer=' + encodeURIComponent(referrerUrl));
 
       expect(payload.Version).to.equal('1.0');
       expect(payload.Bids['bid_id_0'].PlacementID).to.be.equal('placement_0');
       expect(payload.PageRefreshed).to.equal(false);
       expect(payload.Bids['bid_id_0'].TransactionID).to.be.equal('bid_id_0_transaction_id');
+      expect(payload.ortb2).to.deep.equal({site: {page: pageUrl, ref: referrerUrl}});
     });
 
     it('sends bid request to endpoint with single placement without canonical', function () {

From 05096318681f1f41f6735e009cd14a9fa5b544a0 Mon Sep 17 00:00:00 2001
From: relaido <63339139+relaido@users.noreply.github.com>
Date: Thu, 11 Aug 2022 21:59:13 +0900
Subject: [PATCH 132/569] Relaido Bid Adapter: Add support for banner. (#8761)

* add relaido adapter

* remove event listener

* fixed UserSyncs and e.data

* fix conflicts

* Add support for banner, and removed PC access judgement process in banner validation.

Co-authored-by: ishigami_shingo <s.ishigami@relaido.co.jp>
Co-authored-by: cmertv-sishigami <s.ishigami@cmertv.com>
Co-authored-by: t_bun <t.bun@cmertv.com>
Co-authored-by: n.maeura <n.maeura@cmertv.com>
---
 modules/relaidoBidAdapter.js                | 37 ++++++-----
 test/spec/modules/relaidoBidAdapter_spec.js | 73 +++++++++++----------
 2 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/modules/relaidoBidAdapter.js b/modules/relaidoBidAdapter.js
index 2e6097dc100..347cf66ee2b 100644
--- a/modules/relaidoBidAdapter.js
+++ b/modules/relaidoBidAdapter.js
@@ -1,4 +1,4 @@
-import { deepAccess, logWarn, getBidIdParameter, parseQueryStringParameters, triggerPixel, generateUUID, isArray, isNumber } from '../src/utils.js';
+import { deepAccess, logWarn, getBidIdParameter, parseQueryStringParameters, triggerPixel, generateUUID, isArray, isNumber, parseSizesInput } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { Renderer } from '../src/Renderer.js';
@@ -7,7 +7,7 @@ import sha1 from 'crypto-js/sha1';
 
 const BIDDER_CODE = 'relaido';
 const BIDDER_DOMAIN = 'api.relaido.jp';
-const ADAPTER_VERSION = '1.0.9';
+const ADAPTER_VERSION = '1.1.0';
 const DEFAULT_TTL = 300;
 const UUID_KEY = 'relaido_uuid';
 
@@ -92,6 +92,7 @@ function buildRequests(validBidRequests, bidderRequest) {
       player: bidRequest.params.player,
       width: width,
       height: height,
+      banner_sizes: getBannerSizes(bidRequest),
       media_type: mediaType
     });
   }
@@ -139,20 +140,24 @@ function interpretResponse(serverResponse, bidRequest) {
       dealId: body.dealId || '',
       ttl: body.ttl || DEFAULT_TTL,
       netRevenue: true,
-      mediaType: res.mediaType || VIDEO,
       meta: {
         advertiserDomains: res.adomain || [],
         mediaType: VIDEO
       }
     };
 
-    if (bidResponse.mediaType === VIDEO) {
+    if (res.vast && res.mediaType === VIDEO) {
+      bidResponse.mediaType = VIDEO;
       bidResponse.vastXml = res.vast;
       bidResponse.renderer = newRenderer(res.bidId, playerUrl);
-    } else {
+    } else if (res.vast && res.mediaType === BANNER) {
+      bidResponse.mediaType = BANNER;
       const playerTag = createPlayerTag(playerUrl);
       const renderTag = createRenderTag(res.width, res.height, res.vast);
       bidResponse.ad = `<div id="rop-prebid">${playerTag}${renderTag}</div>`;
+    } else if (res.adTag) {
+      bidResponse.mediaType = BANNER;
+      bidResponse.ad = decodeURIComponent(res.adTag);
     }
     bidResponses.push(bidResponse);
   }
@@ -246,9 +251,6 @@ function outstreamRender(bid) {
 }
 
 function isBannerValid(bid) {
-  if (!isMobile()) {
-    return false;
-  }
   const sizes = getValidSizes(deepAccess(bid, 'mediaTypes.banner.sizes'));
   if (sizes.length > 0) {
     return true;
@@ -286,14 +288,6 @@ function getCanonicalUrlHash(refererInfo) {
   return sha1(canonicalUrl).toString();
 }
 
-export function isMobile() {
-  const ua = navigator.userAgent;
-  if (ua.indexOf('iPhone') > -1 || ua.indexOf('iPod') > -1 || (ua.indexOf('Android') > -1 && ua.indexOf('Tablet') == -1)) {
-    return true;
-  }
-  return false;
-}
-
 function hasBannerMediaType(bid) {
   return !!deepAccess(bid, 'mediaTypes.banner');
 }
@@ -330,6 +324,17 @@ function getValidSizes(sizes) {
   return result;
 }
 
+function getBannerSizes(bidRequest) {
+  if (!hasBannerMediaType(bidRequest)) {
+    return null;
+  }
+  const sizes = deepAccess(bidRequest, 'mediaTypes.banner.sizes');
+  if (!isArray(sizes)) {
+    return null;
+  }
+  return parseSizesInput(sizes).join(',');
+}
+
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
diff --git a/test/spec/modules/relaidoBidAdapter_spec.js b/test/spec/modules/relaidoBidAdapter_spec.js
index 9aec1f179a4..6a6e79c633d 100644
--- a/test/spec/modules/relaidoBidAdapter_spec.js
+++ b/test/spec/modules/relaidoBidAdapter_spec.js
@@ -5,13 +5,8 @@ import { BANNER, VIDEO } from 'src/mediaTypes.js';
 import { getStorageManager } from '../../../src/storageManager.js';
 
 const UUID_KEY = 'relaido_uuid';
-const DEFAULT_USER_AGENT = window.navigator.userAgent;
-const MOBILE_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.5 Mobile/15E148 Safari/604.1';
 const relaido_uuid = 'hogehoge';
 
-const setUADefault = () => { window.navigator.__defineGetter__('userAgent', function () { return DEFAULT_USER_AGENT }) };
-const setUAMobile = () => { window.navigator.__defineGetter__('userAgent', function () { return MOBILE_USER_AGENT }) };
-
 const storage = getStorageManager();
 storage.setCookie(UUID_KEY, relaido_uuid);
 
@@ -19,6 +14,7 @@ describe('RelaidoAdapter', function () {
   let bidRequest;
   let bidderRequest;
   let serverResponse;
+  let serverResponseBanner;
   let serverRequest;
   let generateUUIDStub;
   let triggerPixelStub;
@@ -77,6 +73,27 @@ describe('RelaidoAdapter', function () {
         uuid: relaido_uuid,
       }
     };
+    serverResponseBanner = {
+      body: {
+        status: 'ok',
+        ads: [{
+          placementId: 100000,
+          width: 640,
+          height: 360,
+          bidId: '2ed93003f7bb99',
+          price: 500,
+          model: 'vcpm',
+          currency: 'JPY',
+          creativeId: 1000,
+          adTag: '%3Cdiv%3E%3Cimg%20src%3D%22https%3A%2F%2Frelaido%2Ftest.jpg%22%20%2F%3E%3C%2Fdiv%3E',
+          syncUrl: 'https://relaido/sync.html',
+          adomain: ['relaido.co.jp', 'www.cmertv.co.jp'],
+          mediaType: 'banner'
+        }],
+        syncUrl: 'https://api-dev.ulizaex.com/tr/v1/prebid/sync.html',
+        uuid: relaido_uuid,
+      }
+    };
     serverRequest = {
       method: 'POST',
       data: {
@@ -84,7 +101,8 @@ describe('RelaidoAdapter', function () {
           bidId: bidRequest.bidId,
           width: bidRequest.mediaTypes.video.playerSize[0][0] || bidRequest.mediaTypes.video.playerSize[0],
           height: bidRequest.mediaTypes.video.playerSize[0][1] || bidRequest.mediaTypes.video.playerSize[1],
-          mediaType: 'video'}]
+          mediaType: 'video'
+        }]
       }
     };
   });
@@ -127,7 +145,6 @@ describe('RelaidoAdapter', function () {
     });
 
     it('should return true when the required params are passed by banner', function () {
-      setUAMobile();
       bidRequest.mediaTypes = {
         banner: {
           sizes: [
@@ -136,11 +153,9 @@ describe('RelaidoAdapter', function () {
         }
       };
       expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-      setUADefault();
     });
 
     it('should return false when missing 300x250 over and 1x1 by banner', function () {
-      setUAMobile();
       bidRequest.mediaTypes = {
         banner: {
           sizes: [
@@ -150,11 +165,9 @@ describe('RelaidoAdapter', function () {
         }
       };
       expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
-      setUADefault();
     });
 
     it('should return true when 300x250 by banner', function () {
-      setUAMobile();
       bidRequest.mediaTypes = {
         banner: {
           sizes: [
@@ -163,11 +176,9 @@ describe('RelaidoAdapter', function () {
         }
       };
       expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-      setUADefault();
     });
 
     it('should return true when 1x1 by banner', function () {
-      setUAMobile();
       bidRequest.mediaTypes = {
         banner: {
           sizes: [
@@ -176,11 +187,9 @@ describe('RelaidoAdapter', function () {
         }
       };
       expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-      setUADefault();
     });
 
     it('should return true when 300x250 over by banner', function () {
-      setUAMobile();
       bidRequest.mediaTypes = {
         banner: {
           sizes: [
@@ -190,7 +199,6 @@ describe('RelaidoAdapter', function () {
         }
       };
       expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
-      setUADefault();
     });
 
     it('should return false when the placementId params are missing', function () {
@@ -206,23 +214,10 @@ describe('RelaidoAdapter', function () {
     });
 
     it('should return false when the mediaType banner params are missing', function () {
-      setUAMobile();
       bidRequest.mediaTypes = {
         banner: {}
       };
       expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
-      setUADefault();
-    });
-
-    it('should return false when the non-mobile', function () {
-      bidRequest.mediaTypes = {
-        banner: {
-          sizes: [
-            [300, 250]
-          ]
-        }
-      };
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
     });
 
     it('should return false when the mediaTypes params are missing', function () {
@@ -255,7 +250,6 @@ describe('RelaidoAdapter', function () {
     });
 
     it('should build bid requests by banner', function () {
-      setUAMobile();
       bidRequest.mediaTypes = {
         video: {
           context: 'outstream',
@@ -275,10 +269,10 @@ describe('RelaidoAdapter', function () {
       expect(data.bids).to.have.lengthOf(1);
       const request = data.bids[0];
       expect(request.media_type).to.equal('banner');
+      expect(request.banner_sizes).to.equal('640x360,1x1');
     });
 
     it('should take 1x1 size', function () {
-      setUAMobile();
       bidRequest.mediaTypes = {
         video: {
           context: 'outstream',
@@ -321,7 +315,7 @@ describe('RelaidoAdapter', function () {
   });
 
   describe('spec.interpretResponse', function () {
-    it('should build bid response by video', function () {
+    it('should build bid response by video and serverResponse contains vast', function () {
       const bidResponses = spec.interpretResponse(serverResponse, serverRequest);
       expect(bidResponses).to.have.lengthOf(1);
       const response = bidResponses[0];
@@ -338,7 +332,7 @@ describe('RelaidoAdapter', function () {
       expect(response.ad).to.be.undefined;
     });
 
-    it('should build bid response by banner', function () {
+    it('should build bid response by banner and serverResponse contains vast', function () {
       serverResponse.body.ads[0].mediaType = 'banner';
       const bidResponses = spec.interpretResponse(serverResponse, serverRequest);
       expect(bidResponses).to.have.lengthOf(1);
@@ -356,6 +350,19 @@ describe('RelaidoAdapter', function () {
       expect(response.ad).to.include(`window.RelaidoPlayer.renderAd`);
     });
 
+    it('should build bid response by banner and serverResponse contains adTag', function () {
+      const bidResponses = spec.interpretResponse(serverResponseBanner, serverRequest);
+      expect(bidResponses).to.have.lengthOf(1);
+      const response = bidResponses[0];
+      expect(response.requestId).to.equal(serverRequest.data.bids[0].bidId);
+      expect(response.cpm).to.equal(serverResponseBanner.body.ads[0].price);
+      expect(response.currency).to.equal(serverResponseBanner.body.ads[0].currency);
+      expect(response.creativeId).to.equal(serverResponseBanner.body.ads[0].creativeId);
+      expect(response.vastXml).to.be.undefined;
+      expect(response.playerUrl).to.be.undefined;
+      expect(response.ad).to.include(`<div><img src="https://relaido/test.jpg" /></div>`);
+    });
+
     it('should build bid response by video and playerUrl in ads', function () {
       serverResponse.body.ads[0].playerUrl = 'https://relaido/player-customized.js';
       const bidResponses = spec.interpretResponse(serverResponse, serverRequest);

From 5289c297415d835449a17316c77f21b27a424563 Mon Sep 17 00:00:00 2001
From: inna <innayare@gmail.com>
Date: Thu, 11 Aug 2022 16:28:57 +0300
Subject: [PATCH 133/569] Rise bid adapter - support multi seller end points
 (#8771)

* add Rise adapter

* fixes

* change param isOrg to org

* Rise adapter

* change email for rise

* fix circle failed

* bump

* bump

* bump

* remove space

* Upgrade Rise adapter to 5.0

* support rtbDomain seller end point

* removed hb. from rtbDomain end point

* added rtbDomain to docs

Co-authored-by: Noam Tzuberi <noam.tzuberi@ironsrc.com>
Co-authored-by: noamtzu <noamtzu@gmail.com>
Co-authored-by: Noam Tzuberi <noamtzu@users.noreply.github.com>
Co-authored-by: Laslo Chechur <laslo.chechur@ironsrc.com>
Co-authored-by: OronW <41260031+OronW@users.noreply.github.com>
Co-authored-by: lasloche <62240785+lasloche@users.noreply.github.com>
Co-authored-by: Inna Yaretsky <innayaretsky@Inna-MacBook-Pro.local>
---
 modules/riseBidAdapter.js                |  9 ++++++---
 modules/riseBidAdapter.md                |  4 +++-
 test/spec/modules/riseBidAdapter_spec.js | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/modules/riseBidAdapter.js b/modules/riseBidAdapter.js
index 7d4049bf1a2..c1360b79066 100644
--- a/modules/riseBidAdapter.js
+++ b/modules/riseBidAdapter.js
@@ -8,7 +8,7 @@ const BIDDER_CODE = 'rise';
 const ADAPTER_VERSION = '6.0.0';
 const TTL = 360;
 const CURRENCY = 'USD';
-const SELLER_ENDPOINT = 'https://hb.yellowblue.io/';
+const DEFAULT_SELLER_ENDPOINT = 'https://hb.yellowblue.io/';
 const MODES = {
   PRODUCTION: 'hb-multi',
   TEST: 'hb-multi-test'
@@ -42,13 +42,14 @@ export const spec = {
     // use data from the first bid, to create the general params for all bids
     const generalObject = validBidRequests[0];
     const testMode = generalObject.params.testMode;
+    const rtbDomain = generalObject.params.rtbDomain;
 
     combinedRequestsObject.params = generateGeneralParams(generalObject, bidderRequest);
     combinedRequestsObject.bids = generateBidsParams(validBidRequests, bidderRequest);
 
     return {
       method: 'POST',
-      url: getEndpoint(testMode),
+      url: getEndpoint(testMode, rtbDomain),
       data: combinedRequestsObject
     }
   },
@@ -223,9 +224,11 @@ function isSyncMethodAllowed(syncRule, bidderCode) {
 /**
  * Get the seller endpoint
  * @param testMode {boolean}
+ * @param rtbDomain {string}
  * @returns {string}
  */
-function getEndpoint(testMode) {
+function getEndpoint(testMode, rtbDomain) {
+  const SELLER_ENDPOINT = rtbDomain ? `https://${rtbDomain}/` : DEFAULT_SELLER_ENDPOINT;
   return testMode
     ? SELLER_ENDPOINT + MODES.TEST
     : SELLER_ENDPOINT + MODES.PRODUCTION;
diff --git a/modules/riseBidAdapter.md b/modules/riseBidAdapter.md
index 83f8adfd645..2920fd28528 100644
--- a/modules/riseBidAdapter.md
+++ b/modules/riseBidAdapter.md
@@ -24,6 +24,7 @@ The adapter supports Video(instream).
 | `floorPrice` | optional | Number |  Minimum price in USD. Misuse of this parameter can impact revenue | 2.00
 | `placementId` | optional | String |  A unique placement identifier  | "12345678"
 | `testMode` | optional | Boolean |  This activates the test mode  | false
+| `rtbDomain` | optional | String |  Sets the seller end point  | "www.test.com"
 
 # Test Parameters
 ```javascript
@@ -43,7 +44,8 @@ var adUnits = [
             org: '56f91cd4d3e3660002000033', // Required
             floorPrice: 2.00, // Optional
             placementId: '12345678', // Optional
-            testMode: false // Optional
+            testMode: false // Optional,
+            rtbDomain: "www.test.com" //Optional
           }
         }]
       }
diff --git a/test/spec/modules/riseBidAdapter_spec.js b/test/spec/modules/riseBidAdapter_spec.js
index e3ef59e87ac..7daedb9015a 100644
--- a/test/spec/modules/riseBidAdapter_spec.js
+++ b/test/spec/modules/riseBidAdapter_spec.js
@@ -7,6 +7,9 @@ import * as utils from 'src/utils.js';
 
 const ENDPOINT = 'https://hb.yellowblue.io/hb-multi';
 const TEST_ENDPOINT = 'https://hb.yellowblue.io/hb-multi-test';
+const RTB_DOMAIN_TEST = 'testseller.com';
+const RTB_DOMAIN_ENDPOINT = `https://${RTB_DOMAIN_TEST}/hb-multi`;
+const RTB_DOMAIN_TEST_ENDPOINT = `https://${RTB_DOMAIN_TEST}/hb-multi-test`;
 const TTL = 360;
 /* eslint no-console: ["error", { allow: ["log", "warn", "error"] }] */
 
@@ -122,6 +125,20 @@ describe('riseAdapter', function () {
       expect(request.method).to.equal('POST');
     });
 
+    it('sends bid request to rtbDomain ENDPOINT via POST', function () {
+      bidRequests[0].params.rtbDomain = RTB_DOMAIN_TEST;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.equal(RTB_DOMAIN_ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('sends bid request to rtbDomain TEST ENDPOINT via POST', function () {
+      testModeBidRequests[0].params.rtbDomain = RTB_DOMAIN_TEST;
+      const request = spec.buildRequests(testModeBidRequests, bidderRequest);
+      expect(request.url).to.equal(RTB_DOMAIN_TEST_ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
     it('should send the correct bid Id', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.bids[0].bidId).to.equal('299ffc8cca0b87');

From 20b799460f4fc401781b32c6a4e291b76e5f8a11 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 11 Aug 2022 14:30:25 +0000
Subject: [PATCH 134/569] Prebid 7.10.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0e221a988fd..e636de7dba5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.10.0-pre",
+  "version": "7.10.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index f3bbc12d2d5..b98bca78f78 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.10.0-pre",
+  "version": "7.10.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 453207a4b13c78539cc45d0c027886e27fc32870 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 11 Aug 2022 14:30:25 +0000
Subject: [PATCH 135/569] Increment version to 7.10.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e636de7dba5..0e221a988fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.10.0",
+  "version": "7.10.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index b98bca78f78..f3bbc12d2d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.10.0",
+  "version": "7.10.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 32c0629d0b53704dcad5d71c80672640a698bb2f Mon Sep 17 00:00:00 2001
From: tarasmatokhniuk <4teras@gmail.com>
Date: Thu, 11 Aug 2022 18:44:01 +0300
Subject: [PATCH 136/569] Adtargetme Bid Adapter: initial release (#8622)

* Adtargetme first release

* fixed unused variable

removed unused variable
TEST_MODE_BANNER_SID.

* fixed CircleCI

* Adtargetme adapter: rename Adtargetme to AdserverAdtarget

* add spec

add spec for renamed adapter

* fixed

* optimize ortb2 data

* Update adtrgtmeBidAdapter.js

* Update adtrgtmeBidAdapter.js
---
 modules/adtrgtmeBidAdapter.js                | 333 ++++++++
 modules/adtrgtmeBidAdapter.md                |  69 ++
 test/spec/modules/adtrgtmeBidAdapter_spec.js | 802 +++++++++++++++++++
 3 files changed, 1204 insertions(+)
 create mode 100644 modules/adtrgtmeBidAdapter.js
 create mode 100644 modules/adtrgtmeBidAdapter.md
 create mode 100644 test/spec/modules/adtrgtmeBidAdapter_spec.js

diff --git a/modules/adtrgtmeBidAdapter.js b/modules/adtrgtmeBidAdapter.js
new file mode 100644
index 00000000000..4dc95ce6bc1
--- /dev/null
+++ b/modules/adtrgtmeBidAdapter.js
@@ -0,0 +1,333 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { deepAccess, isFn, isStr, isNumber, isArray, isEmpty, isPlainObject, generateUUID, logWarn } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { hasPurpose1Consent } from '../src/utils/gpdr.js';
+
+const INTEGRATION_METHOD = 'prebid.js';
+const BIDDER_CODE = 'adtrgtme';
+const ENDPOINT = 'https://z.cdn.adtarget.market/ssp?prebid&s=';
+const ADAPTER_VERSION = '1.0.0';
+const PREBID_VERSION = '$prebid.version$';
+const DEFAULT_BID_TTL = 300;
+const DEFAULT_CURRENCY = 'USD';
+
+function transformSizes(sizes) {
+  const getSize = (size) => {
+    return {
+      w: parseInt(size[0]),
+      h: parseInt(size[1])
+    }
+  }
+  if (isArray(sizes) && sizes.length === 2 && !isArray(sizes[0])) {
+    return [ getSize(sizes) ];
+  }
+  return sizes.map(getSize);
+}
+
+function extractUserSyncUrls(syncOptions, pixels) {
+  let itemsRegExp = /(img|iframe)[\s\S]*?src\s*=\s*("|')(.*?)\2/gi;
+  let tagNameRegExp = /\w*(?=\s)/;
+  let srcRegExp = /src=("|')(.*?)\1/;
+  let userSyncObjects = [];
+
+  if (pixels) {
+    let matchedItems = pixels.match(itemsRegExp);
+    if (matchedItems) {
+      matchedItems.forEach(item => {
+        let tagName = item.match(tagNameRegExp)[0];
+        let url = item.match(srcRegExp)[2];
+        if (tagName && url) {
+          let tagType = tagName.toLowerCase() === 'img' ? 'image' : 'iframe';
+          if ((!syncOptions.iframeEnabled && tagType === 'iframe') ||
+                (!syncOptions.pixelEnabled && tagType === 'image')) {
+            return;
+          }
+          userSyncObjects.push({
+            type: tagType,
+            url: url
+          });
+        }
+      });
+    }
+  }
+  return userSyncObjects;
+}
+
+function isSecure(bid) {
+  return deepAccess(bid, 'params.bidOverride.imp.secure') || (document.location.protocol === 'https:') ? 1 : 0;
+};
+
+function getMediaType(bid) {
+  return deepAccess(bid, 'mediaTypes.banner') ? BANNER : false;
+}
+
+function validateAppendObject(validationFunction, allowedKeys, inputObject, appendToObject) {
+  const outputObject = {
+    ...appendToObject
+  };
+  if (allowedKeys.length > 0 && typeof validationFunction === 'function') {
+    for (const objectKey in inputObject) {
+      if (allowedKeys.indexOf(objectKey) !== -1 && validationFunction(inputObject[objectKey])) {
+        outputObject[objectKey] = inputObject[objectKey]
+      }
+    }
+  }
+  return outputObject;
+};
+
+function getTtl(bidderRequest) {
+  const ttl = config.getConfig('adtrgtme.ttl');
+  const validateTTL = (ttl) => {
+    return (isNumber(ttl) && ttl > 0 && ttl < 3600) ? ttl : DEFAULT_BID_TTL
+  };
+  return ttl ? validateTTL(ttl) : validateTTL(deepAccess(bidderRequest, 'params.ttl'));
+};
+
+function getFloorModuleData(bid) {
+  const getFloorRequestObject = {
+    currency: deepAccess(bid, 'params.bidOverride.cur') || DEFAULT_CURRENCY,
+    mediaType: BANNER,
+    size: '*'
+  };
+  return (isFn(bid.getFloor)) ? bid.getFloor(getFloorRequestObject) : false;
+};
+
+function generateOpenRtbObject(bidderRequest, bid) {
+  if (bidderRequest) {
+    let outBoundBidRequest = {
+      id: generateUUID(),
+      cur: [getFloorModuleData(bidderRequest).currency || deepAccess(bid, 'params.bidOverride.cur') || DEFAULT_CURRENCY],
+      imp: [],
+      site: {
+        page: deepAccess(bidderRequest, 'refererInfo.page')
+      },
+      device: {
+        dnt: 0,
+        ua: navigator.userAgent,
+        ip: deepAccess(bid, 'params.bidOverride.device.ip') || deepAccess(bid, 'params.ext.ip') || undefined
+      },
+      regs: {
+        ext: {
+          'us_privacy': bidderRequest.uspConsent ? bidderRequest.uspConsent : '',
+          gdpr: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies ? 1 : 0
+        }
+      },
+      source: {
+        ext: {
+          hb: 1,
+          adapterver: ADAPTER_VERSION,
+          prebidver: PREBID_VERSION,
+          integration: {
+            name: INTEGRATION_METHOD,
+            ver: PREBID_VERSION
+          }
+        },
+        fd: 1
+      },
+      user: {
+        ext: {
+          consent: bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies
+            ? bidderRequest.gdprConsent.consentString : ''
+        }
+      }
+    };
+
+    outBoundBidRequest.site.id = bid.params.sid;
+
+    if (bidderRequest.ortb2) {
+      outBoundBidRequest = appendFirstPartyData(outBoundBidRequest, bid);
+    };
+
+    if (deepAccess(bid, 'schain')) {
+      outBoundBidRequest.source.ext.schain = bid.schain;
+      outBoundBidRequest.source.ext.schain.nodes[0].rid = outBoundBidRequest.id;
+    };
+
+    return outBoundBidRequest;
+  };
+};
+
+function appendImpObject(bid, openRtbObject) {
+  const mediaTypeMode = getMediaType(bid);
+
+  if (openRtbObject && bid) {
+    const impObject = {
+      id: bid.bidId,
+      secure: isSecure(bid),
+      bidfloor: getFloorModuleData(bid).floor || deepAccess(bid, 'params.bidOverride.imp.bidfloor') || 0.000001
+    };
+
+    if (mediaTypeMode === BANNER) {
+      impObject.banner = {
+        mimes: bid.mediaTypes.banner.mimes || ['text/html', 'text/javascript', 'application/javascript', 'image/jpg'],
+        format: transformSizes(bid.sizes)
+      };
+      if (bid.mediaTypes.banner.pos) {
+        impObject.banner.pos = bid.mediaTypes.banner.pos;
+      };
+    };
+
+    impObject.ext = {
+      dfp_ad_unit_code: bid.adUnitCode
+    };
+
+    if (deepAccess(bid, 'params.zid')) {
+      impObject.tagid = bid.params.zid;
+    }
+
+    if (deepAccess(bid, 'ortb2Imp.ext.data') && isPlainObject(bid.ortb2Imp.ext.data)) {
+      impObject.ext.data = bid.ortb2Imp.ext.data;
+    };
+
+    if (deepAccess(bid, 'ortb2Imp.instl') && isNumber(bid.ortb2Imp.instl) && (bid.ortb2Imp.instl === 1)) {
+      impObject.instl = bid.ortb2Imp.instl;
+    };
+
+    openRtbObject.imp.push(impObject);
+  };
+};
+
+function appendFirstPartyData(outBoundBidRequest, bid) {
+  const ortb2Object = bid.ortb2;
+  const siteObject = deepAccess(ortb2Object, 'site') || undefined;
+  const siteContentObject = deepAccess(siteObject, 'content') || undefined;
+  const userObject = deepAccess(ortb2Object, 'user') || undefined;
+
+  if (siteObject && isPlainObject(siteObject)) {
+    const allowedSiteStringKeys = ['name', 'domain', 'page', 'ref', 'keywords'];
+    const allowedSiteArrayKeys = ['cat', 'sectioncat', 'pagecat'];
+    const allowedSiteObjectKeys = ['ext'];
+    outBoundBidRequest.site = validateAppendObject(isStr, allowedSiteStringKeys, siteObject, outBoundBidRequest.site);
+    outBoundBidRequest.site = validateAppendObject(isArray, allowedSiteArrayKeys, siteObject, outBoundBidRequest.site);
+    outBoundBidRequest.site = validateAppendObject(isPlainObject, allowedSiteObjectKeys, siteObject, outBoundBidRequest.site);
+  };
+
+  if (siteContentObject && isPlainObject(siteContentObject)) {
+    const allowedContentStringKeys = ['id', 'title', 'language'];
+    const allowedContentArrayKeys = ['cat'];
+    outBoundBidRequest.site.content = validateAppendObject(isStr, allowedContentStringKeys, siteContentObject, outBoundBidRequest.site.content);
+    outBoundBidRequest.site.content = validateAppendObject(isArray, allowedContentArrayKeys, siteContentObject, outBoundBidRequest.site.content);
+  };
+
+  if (userObject && isPlainObject(userObject)) {
+    const allowedUserStrings = ['id', 'buyeruid', 'gender', 'keywords', 'customdata'];
+    const allowedUserObjects = ['ext'];
+    outBoundBidRequest.user = validateAppendObject(isStr, allowedUserStrings, userObject, outBoundBidRequest.user);
+    outBoundBidRequest.user.ext = validateAppendObject(isPlainObject, allowedUserObjects, userObject, outBoundBidRequest.user.ext);
+  };
+
+  return outBoundBidRequest;
+};
+
+function generateServerRequest({payload, requestOptions, bidderRequest}) {
+  return {
+    url: (config.getConfig('adtrgtme.endpoint') || ENDPOINT) + (payload.site.id || ''),
+    method: 'POST',
+    data: payload,
+    options: requestOptions,
+    bidderRequest: bidderRequest
+  };
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: [],
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function(bid) {
+    const params = bid.params;
+    if (isPlainObject(params) && isNumber(params.sid)) {
+      return true;
+    } else {
+      logWarn('Adtrgtme bidder params missing or incorrect');
+      return false;
+    }
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    if (isEmpty(validBidRequests) || isEmpty(bidderRequest)) {
+      logWarn('Adtrgtme Adapter: buildRequests called with empty request');
+      return undefined;
+    };
+
+    const requestOptions = {
+      contentType: 'application/json',
+      customHeaders: {
+        'x-openrtb-version': '2.5'
+      }
+    };
+
+    requestOptions.withCredentials = hasPurpose1Consent(bidderRequest.gdprConsent);
+
+    if (config.getConfig('adtrgtme.singleRequestMode') === true) {
+      const payload = generateOpenRtbObject(bidderRequest, validBidRequests[0]);
+      validBidRequests.forEach(bid => {
+        appendImpObject(bid, payload);
+      });
+
+      return generateServerRequest({payload, requestOptions, bidderRequest});
+    }
+
+    return validBidRequests.map(bid => {
+      const payloadClone = generateOpenRtbObject(bidderRequest, bid);
+      appendImpObject(bid, payloadClone);
+
+      return generateServerRequest({payload: payloadClone, requestOptions, bidderRequest: bid});
+    });
+  },
+
+  interpretResponse: function(serverResponse, { data, bidderRequest }) {
+    const response = [];
+    if (!serverResponse.body || !Array.isArray(serverResponse.body.seatbid)) {
+      return response;
+    }
+
+    let seatbids = serverResponse.body.seatbid;
+    seatbids.forEach(seatbid => {
+      let bid;
+
+      try {
+        bid = seatbid.bid[0];
+      } catch (e) {
+        return response;
+      }
+
+      let cpm = bid.price;
+
+      let bidResponse = {
+        adId: deepAccess(bid, 'adId') ? bid.adId : bid.impid || bid.crid,
+        ad: bid.adm,
+        adUnitCode: bidderRequest.adUnitCode,
+        requestId: bid.impid,
+        cpm: cpm,
+        width: bid.w,
+        height: bid.h,
+        creativeId: bid.crid || 0,
+        currency: bid.cur || DEFAULT_CURRENCY,
+        dealId: bid.dealid ? bid.dealid : null,
+        netRevenue: true,
+        ttl: getTtl(bidderRequest),
+        mediaType: BANNER,
+        meta: {
+          advertiserDomains: bid.adomain,
+          mediaType: BANNER,
+        }
+      };
+
+      response.push(bidResponse);
+    });
+
+    return response;
+  },
+
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent = {}, uspConsent = '') {
+    const bidResponse = !isEmpty(serverResponses) && serverResponses[0].body;
+    if (bidResponse && bidResponse.ext && bidResponse.ext.pixels) {
+      return extractUserSyncUrls(syncOptions, bidResponse.ext.pixels);
+    }
+    return [];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/adtrgtmeBidAdapter.md b/modules/adtrgtmeBidAdapter.md
new file mode 100644
index 00000000000..d136b17067d
--- /dev/null
+++ b/modules/adtrgtmeBidAdapter.md
@@ -0,0 +1,69 @@
+# Overview
+
+**Module Name**: adtrgtme Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: info@adtarget.me
+
+# Description
+The Adtrgtme Bid Adapter is an OpenRTB interface that support display demand from Adtarget 
+
+# Supported Features:
+* Media Types: Banner 
+* Multi-format adUnits
+* Price floors module
+* Advertiser domains
+
+# Mandatory Bidder Parameters
+The minimal requirements for the 'adtrgtme' bid adapter to generate an outbound bid-request to our Adtrgtme are:
+1. At least 1 banner adUnit 
+2. Your Adtrgtme site id **bidder.params**.**sid**
+
+## Example:
+```javascript
+const adUnits = [{
+    code: 'your-placement',
+    mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+    bids: [
+        {
+            bidder: 'adtrgtme',
+            params: {
+                sid: 1220291391, // Site/App ID provided from SSP
+            }
+        }
+    ]
+}];
+```
+
+# Optional: Price floors module & bidfloor
+The adtargerme adapter supports the Prebid.org Price Floors module and will use it to define the outbound bidfloor and currency.
+By default the adapter will always check the existance of Module price floor.
+If a module price floor does not exist you can set a custom bid floor for your impression using "params.bidOverride.imp.bidfloor".
+
+```javascript
+const adUnits = [{
+    code: 'your-placement',
+    mediaTypes: {
+        banner: {
+            sizes: [
+                [300, 250]
+            ]
+        }
+    },
+    bids: [{
+        bidder: 'adtrgtme',
+        params: {
+            sid: 1220291391,
+            bidOverride :{
+                imp: {
+                    bidfloor: 5.00 // bidOverride bidfloor
+                }
+            }
+            }
+        }
+    }]
+}];
+```
\ No newline at end of file
diff --git a/test/spec/modules/adtrgtmeBidAdapter_spec.js b/test/spec/modules/adtrgtmeBidAdapter_spec.js
new file mode 100644
index 00000000000..fce270b4ea7
--- /dev/null
+++ b/test/spec/modules/adtrgtmeBidAdapter_spec.js
@@ -0,0 +1,802 @@
+import { expect } from 'chai';
+import { config } from 'src/config.js';
+import { BANNER } from 'src/mediaTypes.js';
+import { spec } from 'modules/adtrgtmeBidAdapter.js';
+
+const DEFAULT_SID = 1220291391;
+const DEFAULT_ZID = 1836455615;
+const DEFAULT_BID_ID = '84ab500420319d';
+
+const DEFAULT_AD_UNIT_CODE = '/1220291391/header-banner';
+const DEFAULT_AD_UNIT_TYPE = BANNER;
+const DEFAULT_PARAMS_BID_OVERRIDE = {};
+
+const ADAPTER_VERSION = '1.0.0';
+const PREBID_VERSION = '$prebid.version$';
+const INTEGRATION_METHOD = 'prebid.js';
+
+// Utility functions
+const generateBidRequest = ({bidId, adUnitCode, bidOverrideObject, zid, ortb2}) => {
+  const bidRequest = {
+    adUnitCode,
+    auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+    bidId,
+    bidderRequestsCount: 1,
+    bidder: 'adtrgtme',
+    bidderRequestId: '7101db09af0db2',
+    bidderWinsCount: 0,
+    mediaTypes: {},
+    params: {
+      bidOverride: bidOverrideObject
+    },
+    src: 'client',
+    transactionId: '5b17b67d-7704-4732-8cc9-5b1723e9bcf9',
+    ortb2
+  };
+
+  const bannerObj = {
+    sizes: [[300, 250]]
+  };
+
+  bidRequest.mediaTypes.banner = bannerObj;
+  bidRequest.sizes = [[300, 250]];
+
+  bidRequest.params.sid = DEFAULT_SID;
+  if (typeof zid == 'number') {
+    bidRequest.params.zid = zid;
+  }
+
+  return bidRequest;
+}
+
+let generateBidderRequest = (bidRequestArray, adUnitCode, ortb2 = {}) => {
+  const bidderRequest = {
+    adUnitCode: adUnitCode || 'default-adUnitCode',
+    auctionId: 'd4c83a3b-18e4-4208-b98b-63848449c7aa',
+    auctionStart: new Date().getTime(),
+    bidderCode: 'adtrgtme',
+    bidderRequestId: '112f1c7c5d399a',
+    bids: bidRequestArray,
+    refererInfo: {
+      page: 'https://publisher-test.com',
+      reachedTop: true,
+      isAmp: false,
+      numIframes: 0,
+      stack: ['https://publisher-test.com'],
+    },
+    gdprConsent: {
+      consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA',
+      vendorData: {},
+      gdprApplies: true
+    },
+    start: new Date().getTime(),
+    timeout: 1000,
+    ortb2
+  };
+
+  return bidderRequest;
+};
+
+const generateBuildRequestMock = ({bidId, adUnitCode, adUnitType, zid, bidOverrideObject, pubIdMode, ortb2}) => {
+  const bidRequestConfig = {
+    bidId: bidId || DEFAULT_BID_ID,
+    adUnitCode: adUnitCode || DEFAULT_AD_UNIT_CODE,
+    adUnitType: adUnitType || DEFAULT_AD_UNIT_TYPE,
+    zid: zid || DEFAULT_ZID,
+    bidOverrideObject: bidOverrideObject || DEFAULT_PARAMS_BID_OVERRIDE,
+
+    pubIdMode: pubIdMode || false,
+    ortb2: ortb2 || {}
+  };
+  const bidRequest = generateBidRequest(bidRequestConfig);
+  const validBidRequests = [bidRequest];
+  const bidderRequest = generateBidderRequest(validBidRequests, adUnitCode, ortb2);
+
+  return { bidRequest, validBidRequests, bidderRequest }
+};
+
+const generateAdmPayload = (admPayloadType) => {
+  let ADM_PAYLOAD;
+  switch (admPayloadType) {
+    case 'banner':
+      ADM_PAYLOAD = '<script>logInfo(\'ad\'); AdPlacement </script>'; // banner
+      break;
+    default: '<script>logInfo(\'ad\'); AdPlacement </script>'; break;
+  };
+
+  return ADM_PAYLOAD;
+};
+
+const generateResponseMock = (admPayloadType) => {
+  const bidResponse = {
+    id: 'fc0c35df-21fb-4f93-9ebd-88759dbe31f9',
+    impid: '274395c06a24e5',
+    adm: generateAdmPayload(admPayloadType),
+    price: 1,
+    w: 300,
+    h: 250,
+    crid: 'ssp-placement-name',
+    adomain: ['advertiser-domain.com']
+  };
+
+  const serverResponse = {
+    body: {
+      id: 'fc0c35df-21fb-4f93-9ebd-88759dbe31f9',
+      seatbid: [{ bid: [ bidResponse ], seat: 13107 }]
+    }
+  };
+  const { validBidRequests, bidderRequest } = generateBuildRequestMock({adUnitType: admPayloadType});
+  const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+
+  return {serverResponse, data, bidderRequest};
+}
+
+// Unit tests
+describe('adtrgtme Bid Adapter:', () => {
+  it('PLACEHOLDER TO PASS GULP', () => {
+    const obj = {};
+    expect(obj).to.be.an('object');
+  });
+
+  describe('Validate basic properties', () => {
+    it('should define the correct bidder code', () => {
+      expect(spec.code).to.equal('adtrgtme')
+    });
+  });
+
+  describe('getUserSyncs()', () => {
+    const IMAGE_PIXEL_URL = 'http://image-pixel.com/foo/bar?1234&baz=true';
+    const IFRAME_ONE_URL = 'http://image-iframe.com/foo/bar?1234&baz=true';
+    const IFRAME_TWO_URL = 'http://image-iframe-two.com/foo/bar?1234&baz=true';
+
+    let serverResponses = [];
+    beforeEach(() => {
+      serverResponses[0] = {
+        body: {
+          ext: {
+            pixels: `<script>document.write('<iframe src="${IFRAME_ONE_URL}"></iframe>` +
+                    `<img src="${IMAGE_PIXEL_URL}"></iframe>` +
+                    `<iframe src="${IFRAME_TWO_URL}"></iframe>');</script>`
+          }
+        }
+      }
+    });
+
+    after(() => {
+      serverResponses = undefined;
+    });
+
+    it('for only iframe enabled syncs', () => {
+      let syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: false
+      };
+      let pixelsObjects = spec.getUserSyncs(syncOptions, serverResponses);
+      expect(pixelsObjects.length).to.equal(2);
+      expect(pixelsObjects).to.deep.equal(
+        [
+          {type: 'iframe', 'url': IFRAME_ONE_URL},
+          {type: 'iframe', 'url': IFRAME_TWO_URL}
+        ]
+      )
+    });
+
+    it('for only pixel enabled syncs', () => {
+      let syncOptions = {
+        iframeEnabled: false,
+        pixelEnabled: true
+      };
+      let pixelsObjects = spec.getUserSyncs(syncOptions, serverResponses);
+      expect(pixelsObjects.length).to.equal(1);
+      expect(pixelsObjects).to.deep.equal(
+        [
+          {type: 'image', 'url': IMAGE_PIXEL_URL}
+        ]
+      )
+    });
+
+    it('for both pixel and iframe enabled syncs', () => {
+      let syncOptions = {
+        iframeEnabled: true,
+        pixelEnabled: true
+      };
+      let pixelsObjects = spec.getUserSyncs(syncOptions, serverResponses);
+      expect(pixelsObjects.length).to.equal(3);
+      expect(pixelsObjects).to.deep.equal(
+        [
+          {type: 'iframe', 'url': IFRAME_ONE_URL},
+          {type: 'image', 'url': IMAGE_PIXEL_URL},
+          {type: 'iframe', 'url': IFRAME_TWO_URL}
+        ]
+      )
+    });
+  });
+
+  // Validate Bid Requests
+  describe('isBidRequestValid()', () => {
+    const INVALID_INPUT = [
+      {},
+      {params: {}},
+      {params: {sid: '1234', zid: '4321'}},
+      {params: {sid: '1220291391', zid: 4321}},
+      {params: {zid: ''}},
+      {params: {sid: '', zid: ''}},
+    ];
+
+    INVALID_INPUT.forEach(input => {
+      it(`should determine that the bid is INVALID for the input ${JSON.stringify(input)}`, () => {
+        expect(spec.isBidRequestValid(input)).to.be.false;
+      });
+    });
+
+    it('should determine that the bid is VALID if sid and zid are present on the params object', () => {
+      const validBid = {
+        params: {
+          sid: 1220291391,
+          zid: 1836455615
+        }
+      };
+      expect(spec.isBidRequestValid(validBid)).to.be.true;
+    });
+  });
+
+  describe('Price Floor module support:', () => {
+    it('should get bidfloor from getFloor method', () => {
+      const { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      bidRequest.params.bidOverride = {cur: 'EUR'};
+      bidRequest.getFloor = (floorObj) => {
+        return {
+          floor: bidRequest.floors.values[floorObj.mediaType + '|300x250'],
+          currency: floorObj.currency,
+          mediaType: floorObj.mediaType
+        }
+      };
+      bidRequest.floors = {
+        currency: 'EUR',
+        values: {
+          'banner|300x250': 5.55
+        }
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.cur).to.deep.equal(['EUR']);
+      expect(data.imp[0].bidfloor).is.a('number');
+      expect(data.imp[0].bidfloor).to.equal(5.55);
+    });
+  });
+
+  describe('Schain module support:', () => {
+    it('should send Global or Bidder specific schain', function () {
+      const { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const globalSchain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{
+          asi: 'some-platform.com',
+          sid: '111111',
+          rid: bidRequest.bidId,
+          hp: 1
+        }]
+      };
+      bidRequest.schain = globalSchain;
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      const schain = data.source.ext.schain;
+      expect(schain.nodes.length).to.equal(1);
+      expect(schain).to.equal(globalSchain);
+    });
+  });
+
+  describe('First party data module - "Site" support (ortb2):', () => {
+    // Should not allow invalid "site" data types
+    const INVALID_ORTB2_TYPES = [ null, [], 123, 'unsupportedKeyName', true, false, undefined ];
+    INVALID_ORTB2_TYPES.forEach(param => {
+      it(`should not allow invalid site types to be added to bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = { site: param }
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site[param]).to.be.undefined;
+      });
+    });
+
+    // Should add valid "site" params
+    const VALID_SITE_STRINGS = ['name', 'domain', 'page', 'ref', 'keywords'];
+    const VALID_SITE_ARRAYS = ['cat', 'sectioncat', 'pagecat'];
+
+    VALID_SITE_STRINGS.forEach(param => {
+      it(`should allow supported site keys to be added bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            [param]: 'something'
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site[param]).to.exist;
+        expect(data.site[param]).to.be.a('string');
+        expect(data.site[param]).to.be.equal(ortb2.site[param]);
+      });
+    });
+
+    VALID_SITE_ARRAYS.forEach(param => {
+      it(`should determine that the ortb2.site Array key is valid and append to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            [param]: ['something']
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site[param]).to.exist;
+        expect(data.site[param]).to.be.a('array');
+        expect(data.site[param]).to.be.equal(ortb2.site[param]);
+      });
+    });
+
+    // Should not allow invalid "site.content" data types
+    INVALID_ORTB2_TYPES.forEach(param => {
+      it(`should determine that the ortb2.site.content key is invalid and should not be added to bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            content: param
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site.content).to.be.undefined;
+      });
+    });
+
+    // Should not allow invalid "site.content" keys
+    it(`should not allow invalid ortb2.site.content object keys to be added to bid-request: {custom object}`, () => {
+      const ortb2 = {
+        site: {
+          content: {
+            fake: 'news',
+            unreal: 'param',
+            counterfit: 'data'
+          }
+        }
+      };
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.site.content).to.be.a('object');
+    });
+
+    // Should append valid "site.content" keys
+    const VALID_CONTENT_STRINGS = ['id', 'title', 'language'];
+    VALID_CONTENT_STRINGS.forEach(param => {
+      it(`should determine that the ortb2.site String key is valid and append to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            content: {
+              [param]: 'something'
+            }
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site.content[param]).to.exist;
+        expect(data.site.content[param]).to.be.a('string');
+        expect(data.site.content[param]).to.be.equal(ortb2.site.content[param]);
+      });
+    });
+
+    const VALID_CONTENT_ARRAYS = ['cat'];
+    VALID_CONTENT_ARRAYS.forEach(param => {
+      it(`should determine that the ortb2.site Array key is valid and append to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          site: {
+            content: {
+              [param]: ['something', 'something-else']
+            }
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.site.content[param]).to.be.a('array');
+        expect(data.site.content[param]).to.be.equal(ortb2.site.content[param]);
+      });
+    });
+  });
+
+  describe('First party data module - "User" support (ortb2):', () => {
+    // Global ortb2.user validations
+    // Should not allow invalid "user" data types
+    const INVALID_ORTB2_TYPES = [ null, [], 'unsupportedKeyName', true, false, undefined ];
+    INVALID_ORTB2_TYPES.forEach(param => {
+      it(`should not allow invalid site types to be added to bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = { user: param }
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user[param]).to.be.undefined;
+      });
+    });
+
+    // Should add valid "user" params
+    const VALID_USER_STRINGS = ['id', 'buyeruid', 'gender', 'keywords', 'customdata'];
+    VALID_USER_STRINGS.forEach(param => {
+      it(`should allow supported user string keys to be added bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          user: {
+            [param]: 'something'
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user[param]).to.exist;
+        expect(data.user[param]).to.be.a('string');
+        expect(data.user[param]).to.be.equal(ortb2.user[param]);
+      });
+    });
+
+    const VALID_USER_OBJECTS = ['ext'];
+    VALID_USER_OBJECTS.forEach(param => {
+      it(`should allow supported user extObject keys to be added to the bid-request: ${JSON.stringify(param)}`, () => {
+        const ortb2 = {
+          user: {
+            [param]: {a: '123', b: '456'}
+          }
+        };
+        const { validBidRequests, bidderRequest } = generateBuildRequestMock({ortb2});
+        const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        expect(data.user[param]).to.exist;
+        expect(data.user[param]).to.be.a('object');
+        expect(data.user[param]).to.be.deep.include({[param]: {a: '123', b: '456'}});
+        config.setConfig({ortb2: {}});
+      });
+    });
+
+    // adUnit.ortb2Imp.ext.data
+    it(`should allow adUnit.ortb2Imp.ext.data object to be added to the bid-request`, () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({})
+      validBidRequests[0].ortb2Imp = {
+        ext: {
+          data: {
+            pbadslot: 'homepage-top-rect',
+            adUnitSpecificAttribute: '123'
+          }
+        }
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].ext.data).to.deep.equal(validBidRequests[0].ortb2Imp.ext.data);
+    });
+    // adUnit.ortb2Imp.instl
+    it(`should allow adUnit.ortb2Imp.instl numeric boolean "1" to be added to the bid-request`, () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({})
+      validBidRequests[0].ortb2Imp = {
+        instl: 1
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].instl).to.deep.equal(validBidRequests[0].ortb2Imp.instl);
+    });
+
+    it(`should prevent adUnit.ortb2Imp.instl boolean "true" to be added to the bid-request`, () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({})
+      validBidRequests[0].ortb2Imp = {
+        instl: true
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].instl).to.not.exist;
+    });
+
+    it(`should prevent adUnit.ortb2Imp.instl boolean "false" to be added to the bid-request`, () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({})
+      validBidRequests[0].ortb2Imp = {
+        instl: false
+      };
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].instl).to.not.exist;
+    });
+  });
+
+  describe('GDPR & Consent:', () => {
+    it('should return request objects that do not send cookies if purpose 1 consent is not provided', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      bidderRequest.gdprConsent = {
+        consentString: 'BOtmiBKOtmiBKABABAENAFAAAAACeAAA',
+        apiVersion: 2,
+        vendorData: {
+          purpose: {
+            consents: {
+              '1': false
+            }
+          }
+        },
+        gdprApplies: true
+      };
+      const options = spec.buildRequests(validBidRequests, bidderRequest)[0].options;
+      expect(options.withCredentials).to.be.false;
+    });
+  });
+
+  describe('Endpoint & Impression Request Mode:', () => {
+    it('should route request to config override endpoint', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const sid = validBidRequests[0].params.sid;
+      const testOverrideEndpoint = 'http://new_bidder_host.com/ssp?s=';
+      config.setConfig({
+        adtrgtme: {
+          endpoint: testOverrideEndpoint
+        }
+      });
+      const response = spec.buildRequests(validBidRequests, bidderRequest)[0];
+      expect(response).to.deep.include(
+        {
+          method: 'POST',
+          url: testOverrideEndpoint + sid
+        });
+    });
+
+    it('should route request to endpoint + sid', () => {
+      config.setConfig({
+        adtrgtme: {}
+      });
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const sid = validBidRequests[0].params.sid;
+      const response = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(response[0]).to.deep.include({
+        method: 'POST',
+        url: 'https://z.cdn.adtarget.market/ssp?prebid&s=' + sid
+      });
+    });
+
+    it('should return a single request object for single request mode', () => {
+      let { bidRequest, validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const BID_ID_2 = '84ab50xxxxx';
+      const BID_ZID_2 = 98876543210;
+      const AD_UNIT_CODE_2 = 'test-ad-unit-code-123';
+      const { bidRequest: bidRequest2 } = generateBuildRequestMock({bidId: BID_ID_2, zid: BID_ZID_2, adUnitCode: AD_UNIT_CODE_2});
+      validBidRequests = [bidRequest, bidRequest2];
+      bidderRequest.bids = validBidRequests;
+
+      config.setConfig({
+        adtrgtme: {
+          singleRequestMode: true
+        }
+      });
+
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+
+      expect(data.imp).to.be.an('array').with.lengthOf(2);
+
+      expect(data.imp[0]).to.deep.include({
+        id: DEFAULT_BID_ID,
+        ext: {
+          dfp_ad_unit_code: DEFAULT_AD_UNIT_CODE
+        }
+      });
+
+      expect(data.imp[1]).to.deep.include({
+        id: BID_ID_2,
+        tagid: BID_ZID_2,
+        ext: {
+          dfp_ad_unit_code: AD_UNIT_CODE_2
+        }
+      });
+    });
+  });
+
+  describe('Validate request filtering:', () => {
+    it('should not return request when no bids are present', function () {
+      let request = spec.buildRequests([]);
+      expect(request).to.be.undefined;
+    });
+
+    it('buildRequests(): should return an array with the correct amount of request objects', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const response = spec.buildRequests(validBidRequests, bidderRequest).bidderRequest;
+      expect(response.bids).to.be.an('array').to.have.lengthOf(1);
+    });
+  });
+
+  describe('Request Headers validation:', () => {
+    it('should return request objects with the relevant custom headers and content type declaration', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      bidderRequest.gdprConsent.gdprApplies = false;
+      const options = spec.buildRequests(validBidRequests, bidderRequest).options;
+      expect(options).to.deep.equal(
+        {
+          contentType: 'application/json',
+          customHeaders: {
+            'x-openrtb-version': '2.5'
+          },
+          withCredentials: true
+        });
+    });
+  });
+
+  describe('Request Payload oRTB bid validation:', () => {
+    it('should generate a valid openRTB bid-request object in the data field', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+      expect(data.site).to.deep.include({
+        id: bidderRequest.bids[0].params.sid,
+        page: bidderRequest.refererInfo.page
+      });
+
+      expect(data.device).to.deep.equal({
+        dnt: 0,
+        ua: navigator.userAgent,
+        ip: undefined
+      });
+
+      expect(data.regs).to.deep.equal({
+        ext: {
+          'us_privacy': '',
+          gdpr: 1
+        }
+      });
+
+      expect(data.source).to.deep.equal({
+        ext: {
+          hb: 1,
+          adapterver: ADAPTER_VERSION,
+          prebidver: PREBID_VERSION,
+          integration: {
+            name: INTEGRATION_METHOD,
+            ver: PREBID_VERSION
+          }
+        },
+        fd: 1
+      });
+
+      expect(data.cur).to.deep.equal(['USD']);
+    });
+
+    it('should generate a valid openRTB imp.ext object in the bid-request', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const bid = validBidRequests[0];
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+      expect(data.imp[0].ext).to.deep.equal({
+        dfp_ad_unit_code: DEFAULT_AD_UNIT_CODE
+      });
+    });
+
+    it('should use siteId value as site.id in the outbound bid-request when using "pubId" integration mode', () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({pubIdMode: true});
+      validBidRequests[0].params.sid = 9876543210;
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+      expect(data.site.id).to.equal(9876543210);
+    });
+
+    it('should use placementId value as imp.tagid in the outbound bid-request when using "zid"', () => {
+      let { validBidRequests, bidderRequest } = generateBuildRequestMock({}),
+        TEST_ZID = 54321;
+      validBidRequests[0].params.zid = TEST_ZID;
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+      expect(data.imp[0].tagid).to.deep.equal(TEST_ZID);
+    });
+  });
+
+  describe('Request Payload oRTB bid.imp validation:', () => {
+    // Validate Banner imp imp when adtrgtme.mode=undefined
+    it('should generate a valid "Banner" imp object', () => {
+      config.setConfig({
+        adtrgtme: {}
+      });
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].banner).to.deep.equal({
+        mimes: ['text/html', 'text/javascript', 'application/javascript', 'image/jpg'],
+        format: [{w: 300, h: 250}]
+      });
+    });
+
+    // Validate Banner imp
+    it('should generate a valid "Banner" imp object', () => {
+      config.setConfig({
+        adtrgtme: { mode: 'banner' }
+      });
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const data = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+      expect(data.imp[0].banner).to.deep.equal({
+        mimes: ['text/html', 'text/javascript', 'application/javascript', 'image/jpg'],
+        format: [{w: 300, h: 250}]
+      });
+    });
+  });
+
+  describe('interpretResponse()', () => {
+    describe('for mediaTypes: "banner"', () => {
+      it('should insert banner payload into response[0].ad', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].ad).to.equal('<script>logInfo(\'ad\'); AdPlacement </script>');
+        expect(response[0].mediaType).to.equal('banner');
+      })
+    });
+
+    describe('Support Advertiser domains', () => {
+      it('should append bid-response adomain to meta.advertiserDomains', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].meta.advertiserDomains).to.be.a('array');
+        expect(response[0].meta.advertiserDomains[0]).to.equal('advertiser-domain.com');
+      })
+    });
+
+    describe('bid response Ad ID / Creative ID', () => {
+      it('should use adId if it exists in the bid-response', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const adId = 'bid-response-adId';
+        serverResponse.body.seatbid[0].bid[0].adId = adId;
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].adId).to.equal(adId);
+      });
+
+      it('should use impid if adId does not exist in the bid-response', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const impid = '25b6c429c1f52f';
+        serverResponse.body.seatbid[0].bid[0].impid = impid;
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].adId).to.equal(impid);
+      });
+
+      it('should use crid if adId & impid do not exist in the bid-response', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const crid = 'passback-12579';
+        serverResponse.body.seatbid[0].bid[0].impid = undefined;
+        serverResponse.body.seatbid[0].bid[0].crid = crid;
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].adId).to.equal(crid);
+      });
+    });
+
+    describe('Time To Live (ttl)', () => {
+      const UNSUPPORTED_TTL_FORMATS = ['string', [1, 2, 3], true, false, null, undefined];
+      UNSUPPORTED_TTL_FORMATS.forEach(param => {
+        it('should not allow unsupported global adtrgtme.ttl formats and default to 300', () => {
+          const { serverResponse, bidderRequest } = generateResponseMock('banner');
+          config.setConfig({
+            adtrgtme: { ttl: param }
+          });
+          const response = spec.interpretResponse(serverResponse, {bidderRequest});
+          expect(response[0].ttl).to.equal(300);
+        });
+
+        it('should not allow unsupported params.ttl formats and default to 300', () => {
+          const { serverResponse, bidderRequest } = generateResponseMock('banner');
+          bidderRequest.bids[0].params.ttl = param;
+          const response = spec.interpretResponse(serverResponse, {bidderRequest});
+          expect(response[0].ttl).to.equal(300);
+        });
+      });
+
+      const UNSUPPORTED_TTL_VALUES = [-1, 3601];
+      UNSUPPORTED_TTL_VALUES.forEach(param => {
+        it('should not allow invalid global adtrgtme.ttl values 3600 < ttl < 0 and default to 300', () => {
+          const { serverResponse, bidderRequest } = generateResponseMock('banner');
+          config.setConfig({
+            adtrgtme: { ttl: param }
+          });
+          const response = spec.interpretResponse(serverResponse, {bidderRequest});
+          expect(response[0].ttl).to.equal(300);
+        });
+
+        it('should not allow invalid params.ttl values 3600 < ttl < 0 and default to 300', () => {
+          const { serverResponse, bidderRequest } = generateResponseMock('banner');
+          bidderRequest.bids[0].params.ttl = param;
+          const response = spec.interpretResponse(serverResponse, {bidderRequest});
+          expect(response[0].ttl).to.equal(300);
+        });
+      });
+
+      it('should give presedence to Gloabl ttl over params.ttl ', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        config.setConfig({
+          adtrgtme: { ttl: 500 }
+        });
+        bidderRequest.bids[0].params.ttl = 400;
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].ttl).to.equal(500);
+      });
+    });
+
+    describe('Aliasing support', () => {
+      it('should return undefined as the bidder code value', () => {
+        const { serverResponse, bidderRequest } = generateResponseMock('banner');
+        const response = spec.interpretResponse(serverResponse, {bidderRequest});
+        expect(response[0].bidderCode).to.be.undefined;
+      });
+    });
+  });
+});

From 8a47629bbe1bd304fcb0739090fc77d95af0961b Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Thu, 11 Aug 2022 09:13:26 -0700
Subject: [PATCH 137/569] update pre version (#8823)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f3bbc12d2d5..19748040d79 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.10.0-pre",
+  "version": "7.11.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 941f0daffa39f71615433020239a05a3ad2c6302 Mon Sep 17 00:00:00 2001
From: Olivier <osazos@adagio.io>
Date: Thu, 11 Aug 2022 19:29:04 +0200
Subject: [PATCH 138/569] AdagioBidAdapter: use `refererInfo.topmostLocation`
 only (#8824)

---
 modules/adagioBidAdapter.js                | 5 ++---
 test/spec/modules/adagioBidAdapter_spec.js | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index 5c07cbe2844..ac01b317ab3 100644
--- a/modules/adagioBidAdapter.js
+++ b/modules/adagioBidAdapter.js
@@ -271,9 +271,8 @@ function getDevice() {
 function getSite(bidderRequest) {
   const { refererInfo } = bidderRequest;
   return {
-    // TODO: do these fallbacks make sense?
-    domain: refererInfo.domain || parseDomain(refererInfo.topmostLocation) || '',
-    page: refererInfo.page || refererInfo.topmostLocation || '',
+    domain: parseDomain(refererInfo.topmostLocation) || '',
+    page: refererInfo.topmostLocation || '',
     referrer: refererInfo.ref || getWindowSelf().document.referrer || '',
     top: refererInfo.reachedTop
   };
diff --git a/test/spec/modules/adagioBidAdapter_spec.js b/test/spec/modules/adagioBidAdapter_spec.js
index 15f79b407d1..36bb5fb1e4d 100644
--- a/test/spec/modules/adagioBidAdapter_spec.js
+++ b/test/spec/modules/adagioBidAdapter_spec.js
@@ -1391,6 +1391,7 @@ describe('Adagio bid adapter', () => {
         refererInfo: {
           numIframes: 0,
           reachedTop: true,
+          topmostLocation: 'https://test.io/article/a.html',
           page: 'https://test.io/article/a.html',
           domain: 'test.io',
           ref: 'https://google.com'
@@ -1417,6 +1418,7 @@ describe('Adagio bid adapter', () => {
         numIframes: 0,
         reachedTop: true,
         page: 'http://level.io/',
+        topmostLocation: 'http://level.io/',
         stack: [
           'http://level.io/',
           'http://example.com/iframe1.html',

From 0e3dd1c31a4e81e22ee6dd9db46f7f7776c81eb7 Mon Sep 17 00:00:00 2001
From: Gena <wertixvost@gmail.com>
Date: Fri, 12 Aug 2022 19:25:03 +0200
Subject: [PATCH 139/569] Add OCM alias (#8814)

---
 modules/adtelligentBidAdapter.js                | 4 +++-
 test/spec/modules/adtelligentBidAdapter_spec.js | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/adtelligentBidAdapter.js b/modules/adtelligentBidAdapter.js
index 6c6fca13d7b..03d4e634062 100644
--- a/modules/adtelligentBidAdapter.js
+++ b/modules/adtelligentBidAdapter.js
@@ -22,6 +22,7 @@ const HOST_GETTERS = {
   streamkey: () => 'ghb.hb.streamkey.net',
   janet: () => 'ghb.bidder.jmgads.com',
   pgam: () => 'ghb.pgamssp.com',
+  ocm: () => 'ghb.cenarius.orangeclickmedia.com',
 }
 const getUri = function (bidderCode) {
   let bidderWithoutSuffix = bidderCode.split('_')[0];
@@ -40,7 +41,8 @@ export const spec = {
   aliases: ['onefiftytwomedia', 'appaloosa', 'bidsxchange', 'streamkey', 'janet',
     { code: 'selectmedia', gvlid: 775 },
     { code: 'navelix', gvlid: 380 },
-    'pgam'
+    'pgam',
+    'ocm',
   ],
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid: function (bid) {
diff --git a/test/spec/modules/adtelligentBidAdapter_spec.js b/test/spec/modules/adtelligentBidAdapter_spec.js
index 2600b7c4595..a9b9724da3a 100644
--- a/test/spec/modules/adtelligentBidAdapter_spec.js
+++ b/test/spec/modules/adtelligentBidAdapter_spec.js
@@ -19,6 +19,7 @@ const aliasEP = {
   streamkey: 'https://ghb.hb.streamkey.net/v2/auction/',
   janet: 'https://ghb.bidder.jmgads.com/v2/auction/',
   pgam: 'https://ghb.pgamssp.com/v2/auction/',
+  ocm: 'https://ghb.cenarius.orangeclickmedia.com/v2/auction/',
 };
 
 const DEFAULT_ADATPER_REQ = { bidderCode: 'adtelligent' };

From b3710cbfa19591e9c0ef31c43e257e152693c896 Mon Sep 17 00:00:00 2001
From: Brian Schmidt <brian.schmidt@openx.com>
Date: Fri, 12 Aug 2022 14:42:55 -0700
Subject: [PATCH 140/569] make openxAnalyticsAdapter do nothing (#8828)

---
 modules/openxAnalyticsAdapter.js              | 749 +-----------------
 modules/openxAnalyticsAdapter.md              |   4 +
 .../modules/openxAnalyticsAdapter_spec.js     | 644 +--------------
 3 files changed, 15 insertions(+), 1382 deletions(-)

diff --git a/modules/openxAnalyticsAdapter.js b/modules/openxAnalyticsAdapter.js
index 7cc71fe898e..3c5517223af 100644
--- a/modules/openxAnalyticsAdapter.js
+++ b/modules/openxAnalyticsAdapter.js
@@ -1,128 +1,19 @@
 import {
-  _each,
-  _map,
-  deepAccess,
-  flatten,
-  getWindowLocation,
-  isEmpty,
-  logError,
-  logInfo,
-  logMessage,
-  logWarn,
-  parseQS,
-  parseSizesInput,
-  uniques
+  logWarn
 } from '../src/utils.js';
 import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
-import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
-import {ajax} from '../src/ajax.js';
-import {find, includes} from '../src/polyfill.js';
 
-export const AUCTION_STATES = {
-  INIT: 'initialized', // auction has initialized
-  ENDED: 'ended', // all auction requests have been accounted for
-  COMPLETED: 'completed' // all slots have rendered
-};
-
-const ADAPTER_VERSION = '0.1';
-const SCHEMA_VERSION = '0.1';
-
-const AUCTION_END_WAIT_TIME = 1000;
-const URL_PARAM = '';
-const ANALYTICS_TYPE = 'endpoint';
-const ENDPOINT = 'https://prebid.openx.net/ox/analytics/';
-
-// Event Types
-const {
-  EVENTS: { AUCTION_INIT, BID_REQUESTED, BID_RESPONSE, BID_TIMEOUT, AUCTION_END, BID_WON }
-} = CONSTANTS;
-const SLOT_LOADED = 'slotOnload';
-
-const UTM_TAGS = [
-  'utm_campaign',
-  'utm_source',
-  'utm_medium',
-  'utm_term',
-  'utm_content'
-];
-const UTM_TO_CAMPAIGN_PROPERTIES = {
-  'utm_campaign': 'name',
-  'utm_source': 'source',
-  'utm_medium': 'medium',
-  'utm_term': 'term',
-  'utm_content': 'content'
-};
-
-/**
- * @typedef {Object} OxAnalyticsConfig
- * @property {string} orgId
- * @property {string} publisherPlatformId
- * @property {number} publisherAccountId
- * @property {string} configId
- * @property {string} optimizerConfig
- * @property {number} sampling
- * @property {Object} campaign
- * @property {number} payloadWaitTime
- * @property {number} payloadWaitTimePadding
- * @property {Array<string>} adUnits
- */
-
-/**
- * @type {OxAnalyticsConfig}
- */
-const DEFAULT_ANALYTICS_CONFIG = {
-  orgId: void (0),
-  publisherPlatformId: void (0),
-  publisherAccountId: void (0),
-  sampling: 0.05, // default sampling rate of 5%
-  testCode: 'default',
-  campaign: {},
-  adUnits: [],
-  payloadWaitTime: AUCTION_END_WAIT_TIME,
-  payloadWaitTimePadding: 2000
-};
-
-// Initialization
-/**
- * @type {OxAnalyticsConfig}
- */
-let analyticsConfig;
-let auctionMap = {};
-let auctionOrder = 1; // tracks the number of auctions ran on the page
-
-let googletag = window.googletag || {};
-googletag.cmd = googletag.cmd || [];
-
-let openxAdapter = Object.assign(adapter({ urlParam: URL_PARAM, analyticsType: ANALYTICS_TYPE }));
+let openxAdapter = Object.assign(adapter({ urlParam: '', analyticsType: 'endpoint' }));
 
 openxAdapter.originEnableAnalytics = openxAdapter.enableAnalytics;
 
 openxAdapter.enableAnalytics = function(adapterConfig = {options: {}}) {
-  if (isValidConfig(adapterConfig)) {
-    analyticsConfig = {...DEFAULT_ANALYTICS_CONFIG, ...adapterConfig.options};
-
-    // campaign properties defined by config will override utm query parameters
-    analyticsConfig.campaign = {...buildCampaignFromUtmCodes(), ...analyticsConfig.campaign};
-
-    logInfo('OpenX Analytics enabled with config', analyticsConfig);
+  logWarn('OpenX Analytics has been deprecated, this adapter will be removed in Prebid 8');
 
-    // override track method with v2 handlers
-    openxAdapter.track = prebidAnalyticsEventHandler;
+  openxAdapter.track = prebidAnalyticsEventHandler;
 
-    googletag.cmd.push(function () {
-      let pubads = googletag.pubads();
-
-      if (pubads.addEventListener) {
-        pubads.addEventListener(SLOT_LOADED, args => {
-          openxAdapter.track({eventType: SLOT_LOADED, args});
-          logInfo('OX: SlotOnLoad event triggered');
-        });
-      }
-    });
-
-    openxAdapter.originEnableAnalytics(adapterConfig);
-  }
+  openxAdapter.originEnableAnalytics(adapterConfig);
 };
 
 adapterManager.registerAnalyticsAdapter({
@@ -132,635 +23,5 @@ adapterManager.registerAnalyticsAdapter({
 
 export default openxAdapter;
 
-/**
- * Test Helper Functions
- */
-
-// reset the cache for unit tests
-openxAdapter.reset = function() {
-  auctionMap = {};
-  auctionOrder = 1;
-};
-
-/**
- * Private Functions
- */
-
-function isValidConfig({options: analyticsOptions}) {
-  let hasOrgId = analyticsOptions && analyticsOptions.orgId !== void (0);
-
-  const fieldValidations = [
-    // tuple of property, type, required
-    ['orgId', 'string', hasOrgId],
-    ['publisherPlatformId', 'string', !hasOrgId],
-    ['publisherAccountId', 'number', !hasOrgId],
-    ['configId', 'string', false],
-    ['optimizerConfig', 'string', false],
-    ['sampling', 'number', false],
-    ['adIdKey', 'string', false],
-    ['payloadWaitTime', 'number', false],
-    ['payloadWaitTimePadding', 'number', false],
-  ];
-
-  let failedValidation = find(fieldValidations, ([property, type, required]) => {
-    // if required, the property has to exist
-    // if property exists, type check value
-    return (required && !analyticsOptions.hasOwnProperty(property)) ||
-      /* eslint-disable valid-typeof */
-      (analyticsOptions.hasOwnProperty(property) && typeof analyticsOptions[property] !== type);
-  });
-  if (failedValidation) {
-    let [property, type, required] = failedValidation;
-
-    if (required) {
-      logError(`OpenXAnalyticsAdapter: Expected '${property}' to exist and of type '${type}'`);
-    } else {
-      logError(`OpenXAnalyticsAdapter: Expected '${property}' to be type '${type}'`);
-    }
-  }
-
-  return !failedValidation;
-}
-
-function buildCampaignFromUtmCodes() {
-  const location = getWindowLocation();
-  const queryParams = parseQS(location && location.search);
-  let campaign = {};
-
-  UTM_TAGS.forEach(function(utmKey) {
-    let utmValue = queryParams[utmKey];
-    if (utmValue) {
-      let key = UTM_TO_CAMPAIGN_PROPERTIES[utmKey];
-      campaign[key] = decodeURIComponent(utmValue);
-    }
-  });
-  return campaign;
-}
-
-function detectMob() {
-  if (
-    navigator.userAgent.match(/Android/i) ||
-    navigator.userAgent.match(/webOS/i) ||
-    navigator.userAgent.match(/iPhone/i) ||
-    navigator.userAgent.match(/iPad/i) ||
-    navigator.userAgent.match(/iPod/i) ||
-    navigator.userAgent.match(/BlackBerry/i) ||
-    navigator.userAgent.match(/Windows Phone/i)
-  ) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function detectOS() {
-  if (navigator.userAgent.indexOf('Android') != -1) return 'Android';
-  if (navigator.userAgent.indexOf('like Mac') != -1) return 'iOS';
-  if (navigator.userAgent.indexOf('Win') != -1) return 'Windows';
-  if (navigator.userAgent.indexOf('Mac') != -1) return 'Macintosh';
-  if (navigator.userAgent.indexOf('Linux') != -1) return 'Linux';
-  if (navigator.appVersion.indexOf('X11') != -1) return 'Unix';
-  return 'Others';
-}
-
-function detectBrowser() {
-  var isChrome =
-    /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
-  var isCriOS = navigator.userAgent.match('CriOS');
-  var isSafari =
-    /Safari/.test(navigator.userAgent) &&
-    /Apple Computer/.test(navigator.vendor);
-  var isFirefox = /Firefox/.test(navigator.userAgent);
-  var isIE =
-    /Trident/.test(navigator.userAgent) || /MSIE/.test(navigator.userAgent);
-  var isEdge = /Edge/.test(navigator.userAgent);
-  if (isIE) return 'Internet Explorer';
-  if (isEdge) return 'Microsoft Edge';
-  if (isCriOS) return 'Chrome';
-  if (isSafari) return 'Safari';
-  if (isFirefox) return 'Firefox';
-  if (isChrome) return 'Chrome';
-  return 'Others';
-}
-
 function prebidAnalyticsEventHandler({eventType, args}) {
-  logMessage(eventType, Object.assign({}, args));
-  switch (eventType) {
-    case AUCTION_INIT:
-      onAuctionInit(args);
-      break;
-    case BID_REQUESTED:
-      onBidRequested(args);
-      break;
-    case BID_RESPONSE:
-      onBidResponse(args);
-      break;
-    case BID_TIMEOUT:
-      onBidTimeout(args);
-      break;
-    case AUCTION_END:
-      onAuctionEnd(args);
-      break;
-    case BID_WON:
-      onBidWon(args);
-      break;
-    case SLOT_LOADED:
-      onSlotLoadedV2(args);
-      break;
-  }
-}
-
-/**
- * @typedef {Object} PbAuction
- * @property {string} auctionId - Auction ID of the request this bid responded to
- * @property {number} timestamp //: 1586675964364
- * @property {number} auctionEnd - timestamp of when auction ended //: 1586675964364
- * @property {string} auctionStatus //: "inProgress"
- * @property {Array<Adunit>} adUnits //: [{…}]
- * @property {string} adUnitCodes //: ["video1"]
- * @property {string} labels //: undefined
- * @property {Array<BidRequest>} bidderRequests //: (2) [{…}, {…}]
- * @property {Array<BidRequest>} noBids //: []
- * @property {Array<BidResponse>} bidsReceived //: []
- * @property {Array<BidResponse>} winningBids //: []
- * @property {number} timeout //: 3000
- * @property {Object} config //: {publisherPlatformId: "a3aece0c-9e80-4316-8deb-faf804779bd1", publisherAccountId: 537143056, sampling: 1}/*
- */
-
-function onAuctionInit({auctionId, timestamp: startTime, timeout, adUnitCodes}) {
-  auctionMap[auctionId] = {
-    id: auctionId,
-    startTime,
-    endTime: void (0),
-    timeout,
-    auctionOrder,
-    userIds: [],
-    adUnitCodesCount: adUnitCodes.length,
-    adunitCodesRenderedCount: 0,
-    state: AUCTION_STATES.INIT,
-    auctionSendDelayTimer: void (0),
-  };
-
-  // setup adunit properties in map
-  auctionMap[auctionId].adUnitCodeToAdUnitMap = adUnitCodes.reduce((obj, adunitCode) => {
-    obj[adunitCode] = {
-      code: adunitCode,
-      adPosition: void (0),
-      bidRequestsMap: {}
-    };
-    return obj;
-  }, {});
-
-  auctionOrder++;
-}
-
-/**
- * @typedef {Object} PbBidRequest
- * @property {string} auctionId - Auction ID of the request this bid responded to
- * @property {number} auctionStart //: 1586675964364
- * @property {Object} refererInfo
- * @property {PbBidderRequest} bids
- * @property {number} start - Start timestamp of the bidder request
- *
- */
-
-/**
- * @typedef {Object} PbBidderRequest
- * @property {string} adUnitCode - Name of div or google adunit path
- * @property {string} bidder - Bame of bidder
- * @property {string} bidId - Identifies the bid request
- * @property {Object} mediaTypes
- * @property {Object} params
- * @property {string} src
- * @property {Object} userId - Map of userId module to module object
- */
-
-/**
- * Tracks the bid request
- * @param {PbBidRequest} bidRequest
- */
-function onBidRequested(bidRequest) {
-  const {auctionId, bids: bidderRequests, start, timeout} = bidRequest;
-  const auction = auctionMap[auctionId];
-  const adUnitCodeToAdUnitMap = auction.adUnitCodeToAdUnitMap;
-
-  bidderRequests.forEach(bidderRequest => {
-    const { adUnitCode, bidder, bidId: requestId, mediaTypes, params, src, userId } = bidderRequest;
-
-    auction.userIds.push(userId);
-    adUnitCodeToAdUnitMap[adUnitCode].bidRequestsMap[requestId] = {
-      bidder,
-      params,
-      mediaTypes,
-      source: src,
-      startTime: start,
-      timedOut: false,
-      timeLimit: timeout,
-      bids: {}
-    };
-  });
-}
-
-/**
- *
- * @param {BidResponse} bidResponse
- */
-function onBidResponse(bidResponse) {
-  let {
-    auctionId,
-    adUnitCode,
-    requestId,
-    cpm,
-    creativeId,
-    requestTimestamp,
-    responseTimestamp,
-    ts,
-    mediaType,
-    dealId,
-    ttl,
-    netRevenue,
-    currency,
-    originalCpm,
-    originalCurrency,
-    width,
-    height,
-    timeToRespond: latency,
-    adId,
-    meta
-  } = bidResponse;
-
-  auctionMap[auctionId].adUnitCodeToAdUnitMap[adUnitCode].bidRequestsMap[requestId].bids[adId] = {
-    cpm,
-    creativeId,
-    requestTimestamp,
-    responseTimestamp,
-    ts,
-    adId,
-    meta,
-    mediaType,
-    dealId,
-    ttl,
-    netRevenue,
-    currency,
-    originalCpm,
-    originalCurrency,
-    width,
-    height,
-    latency,
-    winner: false,
-    rendered: false,
-    renderTime: 0,
-  };
-}
-
-function onBidTimeout(args) {
-  _each(args, ({auctionId, adUnitCode, bidId: requestId}) => {
-    let timedOutRequest = deepAccess(auctionMap,
-      `${auctionId}.adUnitCodeToAdUnitMap.${adUnitCode}.bidRequestsMap.${requestId}`);
-
-    if (timedOutRequest) {
-      timedOutRequest.timedOut = true;
-    }
-  });
-}
-/**
- *
- * @param {PbAuction} endedAuction
- */
-function onAuctionEnd(endedAuction) {
-  let auction = auctionMap[endedAuction.auctionId];
-
-  if (!auction) {
-    return;
-  }
-
-  clearAuctionTimer(auction);
-  auction.endTime = endedAuction.auctionEnd;
-  auction.state = AUCTION_STATES.ENDED;
-  delayedSend(auction);
-}
-
-/**
- *
- * @param {BidResponse} bidResponse
- */
-function onBidWon(bidResponse) {
-  const { auctionId, adUnitCode, requestId, adId } = bidResponse;
-  let winningBid = deepAccess(auctionMap,
-    `${auctionId}.adUnitCodeToAdUnitMap.${adUnitCode}.bidRequestsMap.${requestId}.bids.${adId}`);
-
-  if (winningBid) {
-    winningBid.winner = true;
-    const auction = auctionMap[auctionId];
-    if (auction.sent) {
-      const endpoint = (analyticsConfig.endpoint || ENDPOINT) + 'event';
-      const bidder = auction.adUnitCodeToAdUnitMap[adUnitCode].bidRequestsMap[requestId].bidder;
-      ajax(`${endpoint}?t=win&b=${adId}&a=${analyticsConfig.orgId}&bidder=${bidder}&ts=${auction.startTime}`,
-        () => {
-          logInfo(`Openx Analytics - Sending complete impression event for ${adId} at ${Date.now()}`)
-        });
-    } else {
-      logInfo(`Openx Analytics - impression event for ${adId} will be sent with auction data`)
-    }
-  }
-}
-
-/**
- *
- * @param {GoogleTagSlot} slot
- * @param {string} serviceName
- */
-function onSlotLoadedV2({ slot }) {
-  const renderTime = Date.now();
-  const elementId = slot.getSlotElementId();
-  const bidId = slot.getTargeting('hb_adid')[0];
-
-  let [auction, adUnit, bid] = getPathToBidResponseByBidId(bidId);
-
-  if (!auction) {
-    // attempt to get auction by adUnitCode
-    auction = getAuctionByGoogleTagSLot(slot);
-
-    if (!auction) {
-      return; // slot is not participating in an active prebid auction
-    }
-  }
-
-  clearAuctionTimer(auction);
-
-  // track that an adunit code has completed within an auction
-  auction.adunitCodesRenderedCount++;
-
-  // mark adunit as rendered
-  if (bid) {
-    let {x, y} = getPageOffset();
-    bid.rendered = true;
-    bid.renderTime = renderTime;
-    adUnit.adPosition = isAtf(elementId, x, y) ? 'ATF' : 'BTF';
-  }
-
-  if (auction.adunitCodesRenderedCount === auction.adUnitCodesCount) {
-    auction.state = AUCTION_STATES.COMPLETED;
-  }
-
-  // prepare to send regardless if auction is complete or not as a failsafe in case not all events are tracked
-  // add additional padding when not all slots are rendered
-  delayedSend(auction);
-}
-
-function isAtf(elementId, scrollLeft = 0, scrollTop = 0) {
-  let elem = document.querySelector('#' + elementId);
-  let isAtf = false;
-  if (elem) {
-    let bounding = elem.getBoundingClientRect();
-    if (bounding) {
-      let windowWidth = (window.innerWidth || document.documentElement.clientWidth);
-      let windowHeight = (window.innerHeight || document.documentElement.clientHeight);
-
-      // intersection coordinates
-      let left = Math.max(0, bounding.left + scrollLeft);
-      let right = Math.min(windowWidth, bounding.right + scrollLeft);
-      let top = Math.max(0, bounding.top + scrollTop);
-      let bottom = Math.min(windowHeight, bounding.bottom + scrollTop);
-
-      let intersectionWidth = right - left;
-      let intersectionHeight = bottom - top;
-
-      let intersectionArea = (intersectionHeight > 0 && intersectionWidth > 0) ? (intersectionHeight * intersectionWidth) : 0;
-      let adSlotArea = (bounding.right - bounding.left) * (bounding.bottom - bounding.top);
-
-      if (adSlotArea > 0) {
-        // Atleast 50% of intersection in window
-        isAtf = intersectionArea * 2 >= adSlotArea;
-      }
-    }
-  } else {
-    logWarn('OX: DOM element not for id ' + elementId);
-  }
-  return isAtf;
-}
-
-// backwards compatible pageOffset from https://developer.mozilla.org/en-US/docs/Web/API/Window/scrollX
-function getPageOffset() {
-  var x = (window.pageXOffset !== undefined)
-    ? window.pageXOffset
-    : (document.documentElement || document.body.parentNode || document.body).scrollLeft;
-
-  var y = (window.pageYOffset !== undefined)
-    ? window.pageYOffset
-    : (document.documentElement || document.body.parentNode || document.body).scrollTop;
-  return {x, y};
-}
-
-function delayedSend(auction) {
-  if (auction.sent) {
-    return;
-  }
-  const delayTime = auction.adunitCodesRenderedCount === auction.adUnitCodesCount
-    ? analyticsConfig.payloadWaitTime
-    : analyticsConfig.payloadWaitTime + analyticsConfig.payloadWaitTimePadding;
-
-  auction.auctionSendDelayTimer = setTimeout(() => {
-    auction.sent = true; // any BidWon emitted after this will be recorded separately
-    let payload = JSON.stringify([buildAuctionPayload(auction)]);
-
-    ajax(analyticsConfig.endpoint || ENDPOINT, () => {
-      logInfo(`OpenX Analytics - Sending complete auction at ${Date.now()}`);
-    }, payload, { contentType: 'application/json' });
-  }, delayTime);
-}
-
-function clearAuctionTimer(auction) {
-  // reset the delay timer to send the auction data
-  if (auction.auctionSendDelayTimer) {
-    clearTimeout(auction.auctionSendDelayTimer);
-    auction.auctionSendDelayTimer = void (0);
-  }
-}
-
-/**
- * Returns the path to a bid (auction, adunit, bidRequest, and bid) based on a bidId
- * @param {string} bidId
- * @returns {Array<*>}
- */
-function getPathToBidResponseByBidId(bidId) {
-  let auction;
-  let adUnit;
-  let bidResponse;
-
-  if (!bidId) {
-    return [];
-  }
-
-  _each(auctionMap, currentAuction => {
-    // skip completed auctions
-    if (currentAuction.state === AUCTION_STATES.COMPLETED) {
-      return;
-    }
-
-    _each(currentAuction.adUnitCodeToAdUnitMap, (currentAdunit) => {
-      _each(currentAdunit.bidRequestsMap, currentBiddRequest => {
-        _each(currentBiddRequest.bids, (currentBidResponse, bidResponseId) => {
-          if (bidId === bidResponseId) {
-            auction = currentAuction;
-            adUnit = currentAdunit;
-            bidResponse = currentBidResponse;
-          }
-        });
-      });
-    });
-  });
-  return [auction, adUnit, bidResponse];
-}
-
-function getAuctionByGoogleTagSLot(slot) {
-  let slotAdunitCodes = [slot.getSlotElementId(), slot.getAdUnitPath()];
-  let slotAuction;
-
-  _each(auctionMap, auction => {
-    if (auction.state === AUCTION_STATES.COMPLETED) {
-      return;
-    }
-
-    _each(auction.adUnitCodeToAdUnitMap, (bidderRequestIdMap, adUnitCode) => {
-      if (includes(slotAdunitCodes, adUnitCode)) {
-        slotAuction = auction;
-      }
-    });
-  });
-
-  return slotAuction;
-}
-
-function buildAuctionPayload(auction) {
-  let {startTime, endTime, state, timeout, auctionOrder, userIds, adUnitCodeToAdUnitMap, id} = auction;
-  const auctionId = id;
-  let {orgId, publisherPlatformId, publisherAccountId, campaign, testCode, configId, optimizerConfig} = analyticsConfig;
-
-  return {
-    auctionId,
-    adapterVersion: ADAPTER_VERSION,
-    schemaVersion: SCHEMA_VERSION,
-    orgId,
-    publisherPlatformId,
-    publisherAccountId,
-    configId,
-    optimizerConfig,
-    campaign,
-    state,
-    startTime,
-    endTime,
-    timeLimit: timeout,
-    auctionOrder,
-    deviceType: detectMob() ? 'Mobile' : 'Desktop',
-    deviceOSType: detectOS(),
-    browser: detectBrowser(),
-    testCode: testCode,
-    // return an array of module name that have user data
-    userIdProviders: buildUserIdProviders(userIds),
-    adUnits: buildAdUnitsPayload(adUnitCodeToAdUnitMap),
-  };
-
-  function buildAdUnitsPayload(adUnitCodeToAdUnitMap) {
-    return _map(adUnitCodeToAdUnitMap, (adUnit) => {
-      let {code, adPosition} = adUnit;
-
-      return {
-        code,
-        adPosition,
-        bidRequests: buildBidRequestPayload(adUnit.bidRequestsMap)
-      };
-
-      function buildBidRequestPayload(bidRequestsMap) {
-        return _map(bidRequestsMap, (bidRequest) => {
-          let {bidder, source, bids, mediaTypes, timeLimit, timedOut} = bidRequest;
-          return {
-            bidder,
-            source,
-            hasBidderResponded: Object.keys(bids).length > 0,
-            availableAdSizes: getMediaTypeSizes(mediaTypes),
-            availableMediaTypes: getMediaTypes(mediaTypes),
-            timeLimit,
-            timedOut,
-            bidResponses: _map(bidRequest.bids, (bidderBidResponse) => {
-              let {
-                adId,
-                cpm,
-                creativeId,
-                ts,
-                meta,
-                mediaType,
-                dealId,
-                ttl,
-                netRevenue,
-                currency,
-                width,
-                height,
-                latency,
-                winner,
-                rendered,
-                renderTime
-              } = bidderBidResponse;
-
-              return {
-                bidId: adId,
-                microCpm: cpm * 1000000,
-                netRevenue,
-                currency,
-                mediaType,
-                height,
-                width,
-                size: `${width}x${height}`,
-                dealId,
-                latency,
-                ttl,
-                winner,
-                creativeId,
-                ts,
-                rendered,
-                renderTime,
-                meta
-              }
-            })
-          }
-        });
-      }
-    });
-  }
-
-  function buildUserIdProviders(userIds) {
-    return _map(userIds, (userId) => {
-      return _map(userId, (id, module) => {
-        return hasUserData(module, id) ? module : false
-      }).filter(module => module);
-    }).reduce(flatten, []).filter(uniques).sort();
-  }
-
-  function hasUserData(module, idOrIdObject) {
-    let normalizedId;
-
-    switch (module) {
-      case 'digitrustid':
-        normalizedId = deepAccess(idOrIdObject, 'data.id');
-        break;
-      case 'lipb':
-        normalizedId = idOrIdObject.lipbid;
-        break;
-      default:
-        normalizedId = idOrIdObject;
-    }
-
-    return !isEmpty(normalizedId);
-  }
-
-  function getMediaTypeSizes(mediaTypes) {
-    return _map(mediaTypes, (mediaTypeConfig, mediaType) => {
-      return parseSizesInput(mediaTypeConfig.sizes)
-        .map(size => `${mediaType}_${size}`);
-    }).reduce(flatten, []);
-  }
-
-  function getMediaTypes(mediaTypes) {
-    return _map(mediaTypes, (mediaTypeConfig, mediaType) => mediaType);
-  }
 }
diff --git a/modules/openxAnalyticsAdapter.md b/modules/openxAnalyticsAdapter.md
index af40486f2a4..357e1520eb4 100644
--- a/modules/openxAnalyticsAdapter.md
+++ b/modules/openxAnalyticsAdapter.md
@@ -5,6 +5,10 @@
 
 ---
 
+# NOTE: OPENX NO LONGER OFFERS ANALYTICS
+# THIS ADAPTER NO LONGER FUNCTIONS AND 
+# WILL BE REMOVED IN PREBID 8
+
 # About this Guide
 This implementation guide walks through the flow of onboarding an alpha Publisher to test OpenX’s new Analytics Adapter.
 
diff --git a/test/spec/modules/openxAnalyticsAdapter_spec.js b/test/spec/modules/openxAnalyticsAdapter_spec.js
index 47663a41f47..1b1adeb8807 100644
--- a/test/spec/modules/openxAnalyticsAdapter_spec.js
+++ b/test/spec/modules/openxAnalyticsAdapter_spec.js
@@ -1,653 +1,21 @@
 import { expect } from 'chai';
-import openxAdapter, {AUCTION_STATES} from 'modules/openxAnalyticsAdapter.js';
-import * as events from 'src/events.js';
-import CONSTANTS from 'src/constants.json';
+import openxAdapter from 'modules/openxAnalyticsAdapter.js';
 import * as utils from 'src/utils.js';
-import { server } from 'test/mocks/xhr.js';
-import {find} from 'src/polyfill.js';
-
-const {
-  EVENTS: { AUCTION_INIT, BID_REQUESTED, BID_RESPONSE, BID_TIMEOUT, BID_WON, AUCTION_END }
-} = CONSTANTS;
-const SLOT_LOADED = 'slotOnload';
-const CURRENT_TIME = 1586000000000;
 
 describe('openx analytics adapter', function() {
-  describe('when validating the configuration', function () {
+  describe('deprecation message', function () {
     let spy;
     beforeEach(function () {
-      spy = sinon.spy(utils, 'logError');
+      spy = sinon.spy(utils, 'logWarn');
     });
 
     afterEach(function() {
-      utils.logError.restore();
+      utils.logWarn.restore();
     });
 
-    it('should require organization id when no configuration is passed', function() {
+    it('should warn on enable', function() {
       openxAdapter.enableAnalytics();
-      expect(spy.firstCall.args[0]).to.match(/publisherPlatformId/);
-      expect(spy.firstCall.args[0]).to.match(/to exist/);
-    });
-
-    it('should require publisher id when no orgId is passed', function() {
-      openxAdapter.enableAnalytics({
-        provider: 'openx',
-        options: {
-          publisherAccountId: 12345
-        }
-      });
-      expect(spy.firstCall.args[0]).to.match(/publisherPlatformId/);
-      expect(spy.firstCall.args[0]).to.match(/to exist/);
-    });
-
-    it('should validate types', function() {
-      openxAdapter.enableAnalytics({
-        provider: 'openx',
-        options: {
-          orgId: 'test platformId',
-          sampling: 'invalid-float'
-        }
-      });
-
-      expect(spy.firstCall.args[0]).to.match(/sampling/);
-      expect(spy.firstCall.args[0]).to.match(/type 'number'/);
-    });
-  });
-
-  describe('when tracking analytic events', function () {
-    const AD_UNIT_CODE = 'test-div-1';
-    const SLOT_LOAD_WAIT_TIME = 10;
-
-    const DEFAULT_V2_ANALYTICS_CONFIG = {
-      orgId: 'test-org-id',
-      publisherAccountId: 123,
-      publisherPlatformId: 'test-platform-id',
-      configId: 'my_config',
-      optimizerConfig: 'my my optimizer',
-      sample: 1.0,
-      payloadWaitTime: SLOT_LOAD_WAIT_TIME,
-      payloadWaitTimePadding: SLOT_LOAD_WAIT_TIME
-    };
-
-    const auctionInit = {
-      auctionId: 'test-auction-id',
-      timestamp: CURRENT_TIME,
-      timeout: 3000,
-      adUnitCodes: [AD_UNIT_CODE],
-    };
-
-    const bidRequestedOpenX = {
-      auctionId: 'test-auction-id',
-      auctionStart: CURRENT_TIME,
-      timeout: 2000,
-      bids: [
-        {
-          adUnitCode: AD_UNIT_CODE,
-          bidId: 'test-openx-request-id',
-          bidder: 'openx',
-          params: { unit: 'test-openx-ad-unit-id' },
-          userId: {
-            tdid: 'test-tradedesk-id',
-            empty_id: '',
-            null_id: null,
-            bla_id: '',
-            digitrustid: { data: { id: '1' } },
-            lipbid: { lipb: '2' }
-          }
-        }
-      ],
-      start: CURRENT_TIME + 10
-    };
-
-    const bidRequestedCloseX = {
-      auctionId: 'test-auction-id',
-      auctionStart: CURRENT_TIME,
-      timeout: 1000,
-      bids: [
-        {
-          adUnitCode: AD_UNIT_CODE,
-          bidId: 'test-closex-request-id',
-          bidder: 'closex',
-          params: { unit: 'test-closex-ad-unit-id' },
-          userId: {
-            bla_id: '2',
-            tdid: 'test-tradedesk-id'
-          }
-        }
-      ],
-      start: CURRENT_TIME + 20
-    };
-
-    const bidResponseOpenX = {
-      adUnitCode: AD_UNIT_CODE,
-      cpm: 0.5,
-      netRevenue: true,
-      requestId: 'test-openx-request-id',
-      mediaType: 'banner',
-      width: 300,
-      height: 250,
-      adId: 'test-openx-ad-id',
-      auctionId: 'test-auction-id',
-      creativeId: 'openx-crid',
-      currency: 'USD',
-      timeToRespond: 100,
-      responseTimestamp: CURRENT_TIME + 30,
-      ts: 'test-openx-ts'
-    };
-
-    const bidResponseCloseX = {
-      adUnitCode: AD_UNIT_CODE,
-      cpm: 0.3,
-      netRevenue: true,
-      requestId: 'test-closex-request-id',
-      mediaType: 'video',
-      width: 300,
-      height: 250,
-      adId: 'test-closex-ad-id',
-      auctionId: 'test-auction-id',
-      creativeId: 'closex-crid',
-      currency: 'USD',
-      timeToRespond: 200,
-      dealId: 'test-closex-deal-id',
-      responseTimestamp: CURRENT_TIME + 40,
-      ts: 'test-closex-ts'
-    };
-
-    const bidTimeoutOpenX = {
-      0: {
-        adUnitCode: AD_UNIT_CODE,
-        auctionId: 'test-auction-id',
-        bidId: 'test-openx-request-id'
-      }};
-
-    const bidTimeoutCloseX = {
-      0: {
-        adUnitCode: AD_UNIT_CODE,
-        auctionId: 'test-auction-id',
-        bidId: 'test-closex-request-id'
-      }
-    };
-
-    const bidWonOpenX = {
-      requestId: 'test-openx-request-id',
-      adId: 'test-openx-ad-id',
-      adUnitCode: AD_UNIT_CODE,
-      auctionId: 'test-auction-id'
-    };
-
-    const auctionEnd = {
-      auctionId: 'test-auction-id',
-      timestamp: CURRENT_TIME,
-      auctionEnd: CURRENT_TIME + 100,
-      timeout: 3000,
-      adUnitCodes: [AD_UNIT_CODE],
-    };
-
-    const bidWonCloseX = {
-      requestId: 'test-closex-request-id',
-      adId: 'test-closex-ad-id',
-      adUnitCode: AD_UNIT_CODE,
-      auctionId: 'test-auction-id'
-    };
-
-    function simulateAuction(events) {
-      let highestBid;
-
-      events.forEach(event => {
-        const [eventType, args] = event;
-        if (eventType === BID_RESPONSE) {
-          highestBid = highestBid || args;
-          if (highestBid.cpm < args.cpm) {
-            highestBid = args;
-          }
-        }
-
-        if (eventType === SLOT_LOADED) {
-          const slotLoaded = {
-            slot: {
-              getAdUnitPath: () => {
-                return '/12345678/test_ad_unit';
-              },
-              getSlotElementId: () => {
-                return AD_UNIT_CODE;
-              },
-              getTargeting: (key) => {
-                if (key === 'hb_adid') {
-                  return highestBid ? [highestBid.adId] : [];
-                } else {
-                  return [];
-                }
-              }
-            }
-          };
-          openxAdapter.track({ eventType, args: slotLoaded });
-        } else {
-          openxAdapter.track({ eventType, args });
-        }
-      });
-    }
-
-    let clock;
-
-    beforeEach(function() {
-      sinon.stub(events, 'getEvents').returns([]);
-      clock = sinon.useFakeTimers(CURRENT_TIME);
-    });
-
-    afterEach(function() {
-      events.getEvents.restore();
-      clock.restore();
-    });
-
-    describe('when there is an auction', function () {
-      let auction;
-      let auction2;
-      beforeEach(function () {
-        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
-
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [SLOT_LOADED]
-        ]);
-
-        simulateAuction([
-          [AUCTION_INIT, {...auctionInit, auctionId: 'second-auction-id'}],
-          [SLOT_LOADED]
-        ]);
-
-        clock.tick(SLOT_LOAD_WAIT_TIME);
-        auction = JSON.parse(server.requests[0].requestBody)[0];
-        auction2 = JSON.parse(server.requests[1].requestBody)[0];
-      });
-
-      afterEach(function () {
-        openxAdapter.reset();
-        openxAdapter.disableAnalytics();
-      });
-
-      it('should track auction start time', function () {
-        expect(auction.startTime).to.equal(auctionInit.timestamp);
-      });
-
-      it('should track auction time limit', function () {
-        expect(auction.timeLimit).to.equal(auctionInit.timeout);
-      });
-
-      it('should track the \'default\' test code', function () {
-        expect(auction.testCode).to.equal('default');
-      });
-
-      it('should track auction count', function () {
-        expect(auction.auctionOrder).to.equal(1);
-        expect(auction2.auctionOrder).to.equal(2);
-      });
-
-      it('should track the orgId', function () {
-        expect(auction.orgId).to.equal(DEFAULT_V2_ANALYTICS_CONFIG.orgId);
-      });
-
-      it('should track the orgId', function () {
-        expect(auction.publisherPlatformId).to.equal(DEFAULT_V2_ANALYTICS_CONFIG.publisherPlatformId);
-      });
-
-      it('should track the orgId', function () {
-        expect(auction.publisherAccountId).to.equal(DEFAULT_V2_ANALYTICS_CONFIG.publisherAccountId);
-      });
-
-      it('should track the optimizerConfig', function () {
-        expect(auction.optimizerConfig).to.equal(DEFAULT_V2_ANALYTICS_CONFIG.optimizerConfig);
-      });
-
-      it('should track the configId', function () {
-        expect(auction.configId).to.equal(DEFAULT_V2_ANALYTICS_CONFIG.configId);
-      });
-
-      it('should track the auction Id', function () {
-        expect(auction.auctionId).to.equal(auctionInit.auctionId);
-      });
-    });
-
-    describe('when there is a custom test code', function () {
-      let auction;
-      beforeEach(function () {
-        openxAdapter.enableAnalytics({
-          options: {
-            ...DEFAULT_V2_ANALYTICS_CONFIG,
-            testCode: 'test-code'
-          }
-        });
-
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [SLOT_LOADED],
-        ]);
-        clock.tick(SLOT_LOAD_WAIT_TIME);
-        auction = JSON.parse(server.requests[0].requestBody)[0];
-      });
-
-      afterEach(function () {
-        openxAdapter.reset();
-        openxAdapter.disableAnalytics();
-      });
-
-      it('should track the custom test code', function () {
-        expect(auction.testCode).to.equal('test-code');
-      });
-    });
-
-    describe('when there is campaign (utm) data', function () {
-      let auction;
-      beforeEach(function () {
-
-      });
-
-      afterEach(function () {
-        openxAdapter.reset();
-        utils.getWindowLocation.restore();
-        openxAdapter.disableAnalytics();
-      });
-
-      it('should track values from query params when they exist', function () {
-        sinon.stub(utils, 'getWindowLocation').returns({search: '?' +
-            'utm_campaign=test%20campaign-name&' +
-            'utm_source=test-source&' +
-            'utm_medium=test-medium&'
-        });
-
-        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
-
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [SLOT_LOADED],
-        ]);
-        clock.tick(SLOT_LOAD_WAIT_TIME);
-        auction = JSON.parse(server.requests[0].requestBody)[0];
-
-        // ensure that value are URI decoded
-        expect(auction.campaign.name).to.equal('test campaign-name');
-        expect(auction.campaign.source).to.equal('test-source');
-        expect(auction.campaign.medium).to.equal('test-medium');
-        expect(auction.campaign.content).to.be.undefined;
-        expect(auction.campaign.term).to.be.undefined;
-      });
-
-      it('should override query params if configuration parameters exist', function () {
-        sinon.stub(utils, 'getWindowLocation').returns({search: '?' +
-            'utm_campaign=test-campaign-name&' +
-            'utm_source=test-source&' +
-            'utm_medium=test-medium&' +
-            'utm_content=test-content&' +
-            'utm_term=test-term'
-        });
-
-        openxAdapter.enableAnalytics({
-          options: {
-            ...DEFAULT_V2_ANALYTICS_CONFIG,
-            campaign: {
-              name: 'test-config-name',
-              source: 'test-config-source',
-              medium: 'test-config-medium'
-            }
-          }
-        });
-
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [SLOT_LOADED],
-        ]);
-        clock.tick(SLOT_LOAD_WAIT_TIME);
-        auction = JSON.parse(server.requests[0].requestBody)[0];
-
-        expect(auction.campaign.name).to.equal('test-config-name');
-        expect(auction.campaign.source).to.equal('test-config-source');
-        expect(auction.campaign.medium).to.equal('test-config-medium');
-        expect(auction.campaign.content).to.equal('test-content');
-        expect(auction.campaign.term).to.equal('test-term');
-      });
-    });
-
-    describe('when there are bid requests', function () {
-      let auction;
-      let openxBidder;
-      let closexBidder;
-
-      beforeEach(function () {
-        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
-
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedCloseX],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [SLOT_LOADED],
-        ]);
-        clock.tick(SLOT_LOAD_WAIT_TIME * 2);
-        auction = JSON.parse(server.requests[0].requestBody)[0];
-        openxBidder = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'openx');
-        closexBidder = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'closex');
-      });
-
-      afterEach(function () {
-        openxAdapter.reset();
-        openxAdapter.disableAnalytics();
-      });
-
-      it('should track the bidder', function () {
-        expect(openxBidder.bidder).to.equal('openx');
-        expect(closexBidder.bidder).to.equal('closex');
-      });
-
-      it('should track the adunit code', function () {
-        expect(auction.adUnits[0].code).to.equal(AD_UNIT_CODE);
-      });
-
-      it('should track the user ids', function () {
-        expect(auction.userIdProviders).to.deep.equal(['bla_id', 'digitrustid', 'lipbid', 'tdid']);
-      });
-
-      it('should not have responded', function () {
-        expect(openxBidder.hasBidderResponded).to.equal(false);
-        expect(closexBidder.hasBidderResponded).to.equal(false);
-      });
-    });
-
-    describe('when there are request timeouts', function () {
-      let auction;
-      let openxBidRequest;
-      let closexBidRequest;
-
-      beforeEach(function () {
-        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
-
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedCloseX],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_TIMEOUT, bidTimeoutCloseX],
-          [BID_TIMEOUT, bidTimeoutOpenX],
-          [AUCTION_END, auctionEnd]
-        ]);
-        clock.tick(SLOT_LOAD_WAIT_TIME * 2);
-        auction = JSON.parse(server.requests[0].requestBody)[0];
-
-        openxBidRequest = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'openx');
-        closexBidRequest = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'closex');
-      });
-
-      afterEach(function () {
-        openxAdapter.reset();
-        openxAdapter.disableAnalytics();
-      });
-
-      it('should track the timeout', function () {
-        expect(openxBidRequest.timedOut).to.equal(true);
-        expect(closexBidRequest.timedOut).to.equal(true);
-      });
-
-      it('should track the timeout value ie timeLimit', function () {
-        expect(openxBidRequest.timeLimit).to.equal(2000);
-        expect(closexBidRequest.timeLimit).to.equal(1000);
-      });
-    });
-
-    describe('when there are bid responses', function () {
-      let auction;
-      let openxBidResponse;
-      let closexBidResponse;
-
-      beforeEach(function () {
-        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
-
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedCloseX],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX],
-          [BID_RESPONSE, bidResponseCloseX],
-          [AUCTION_END, auctionEnd]
-        ]);
-
-        clock.tick(SLOT_LOAD_WAIT_TIME * 2);
-        auction = JSON.parse(server.requests[0].requestBody)[0];
-
-        openxBidResponse = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'openx').bidResponses[0];
-        closexBidResponse = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'closex').bidResponses[0];
-      });
-
-      afterEach(function () {
-        openxAdapter.reset();
-        openxAdapter.disableAnalytics();
-      });
-
-      it('should track the cpm in microCPM', function () {
-        expect(openxBidResponse.microCpm).to.equal(bidResponseOpenX.cpm * 1000000);
-        expect(closexBidResponse.microCpm).to.equal(bidResponseCloseX.cpm * 1000000);
-      });
-
-      it('should track if the bid is in net revenue', function () {
-        expect(openxBidResponse.netRevenue).to.equal(bidResponseOpenX.netRevenue);
-        expect(closexBidResponse.netRevenue).to.equal(bidResponseCloseX.netRevenue);
-      });
-
-      it('should track the mediaType', function () {
-        expect(openxBidResponse.mediaType).to.equal(bidResponseOpenX.mediaType);
-        expect(closexBidResponse.mediaType).to.equal(bidResponseCloseX.mediaType);
-      });
-
-      it('should track the currency', function () {
-        expect(openxBidResponse.currency).to.equal(bidResponseOpenX.currency);
-        expect(closexBidResponse.currency).to.equal(bidResponseCloseX.currency);
-      });
-
-      it('should track the ad width and height', function () {
-        expect(openxBidResponse.width).to.equal(bidResponseOpenX.width);
-        expect(openxBidResponse.height).to.equal(bidResponseOpenX.height);
-
-        expect(closexBidResponse.width).to.equal(bidResponseCloseX.width);
-        expect(closexBidResponse.height).to.equal(bidResponseCloseX.height);
-      });
-
-      it('should track the bid dealId', function () {
-        expect(openxBidResponse.dealId).to.equal(bidResponseOpenX.dealId); // no deal id defined
-        expect(closexBidResponse.dealId).to.equal(bidResponseCloseX.dealId); // deal id defined
-      });
-
-      it('should track the bid\'s latency', function () {
-        expect(openxBidResponse.latency).to.equal(bidResponseOpenX.timeToRespond);
-        expect(closexBidResponse.latency).to.equal(bidResponseCloseX.timeToRespond);
-      });
-
-      it('should not have any bid winners', function () {
-        expect(openxBidResponse.winner).to.equal(false);
-        expect(closexBidResponse.winner).to.equal(false);
-      });
-
-      it('should track the bid currency', function () {
-        expect(openxBidResponse.currency).to.equal(bidResponseOpenX.currency);
-        expect(closexBidResponse.currency).to.equal(bidResponseCloseX.currency);
-      });
-
-      it('should track the auction end time', function () {
-        expect(auction.endTime).to.equal(auctionEnd.auctionEnd);
-      });
-
-      it('should track that the auction ended', function () {
-        expect(auction.state).to.equal(AUCTION_STATES.ENDED);
-      });
-    });
-
-    describe('when there are bidder wins', function () {
-      let auction;
-      beforeEach(function () {
-        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
-
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_REQUESTED, bidRequestedCloseX],
-          [BID_RESPONSE, bidResponseOpenX],
-          [BID_RESPONSE, bidResponseCloseX],
-          [AUCTION_END, auctionEnd],
-          [BID_WON, bidWonOpenX]
-        ]);
-
-        clock.tick(SLOT_LOAD_WAIT_TIME * 2);
-        auction = JSON.parse(server.requests[0].requestBody)[0];
-      });
-
-      afterEach(function () {
-        openxAdapter.reset();
-        openxAdapter.disableAnalytics();
-      });
-
-      it('should track that bidder as the winner', function () {
-        let openxBidder = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'openx');
-        expect(openxBidder.bidResponses[0]).to.contain({winner: true});
-      });
-
-      it('should track that bidder as the losers', function () {
-        let closexBidder = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'closex');
-        expect(closexBidder.bidResponses[0]).to.contain({winner: false});
-      });
-    });
-
-    describe('when a winning bid renders', function () {
-      let auction;
-      beforeEach(function () {
-        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
-
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_REQUESTED, bidRequestedCloseX],
-          [BID_RESPONSE, bidResponseOpenX],
-          [BID_RESPONSE, bidResponseCloseX],
-          [AUCTION_END, auctionEnd],
-          [BID_WON, bidWonOpenX],
-          [SLOT_LOADED]
-        ]);
-
-        clock.tick(SLOT_LOAD_WAIT_TIME * 2);
-        auction = JSON.parse(server.requests[0].requestBody)[0];
-      });
-
-      afterEach(function () {
-        openxAdapter.reset();
-        openxAdapter.disableAnalytics();
-      });
-
-      it('should track that winning bid rendered', function () {
-        let openxBidder = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'openx');
-        expect(openxBidder.bidResponses[0]).to.contain({rendered: true});
-      });
-
-      it('should track that winning bid render time', function () {
-        let openxBidder = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'openx');
-        expect(openxBidder.bidResponses[0]).to.contain({renderTime: CURRENT_TIME});
-      });
-
-      it('should track that the auction completed', function () {
-        expect(auction.state).to.equal(AUCTION_STATES.COMPLETED);
-      });
+      expect(spy.firstCall.args[0]).to.match(/OpenX Analytics has been deprecated/);
     });
   });
 });

From d836669df6529bf12f804c2d80cb0806084439e0 Mon Sep 17 00:00:00 2001
From: AndriiTokarGL <111281550+AndriiTokarGL@users.noreply.github.com>
Date: Mon, 15 Aug 2022 16:57:43 +0300
Subject: [PATCH 141/569] Aniview Bid Adapter: add a new alias (#8832)

---
 modules/aniviewBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/aniviewBidAdapter.js b/modules/aniviewBidAdapter.js
index 00280379133..84552638421 100644
--- a/modules/aniviewBidAdapter.js
+++ b/modules/aniviewBidAdapter.js
@@ -306,7 +306,7 @@ function getUserSyncs(syncOptions, serverResponses) {
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
-  aliases: ['avantisvideo', 'selectmediavideo', 'vidcrunch', 'openwebvideo', 'didnavideo', 'ottadvisors'],
+  aliases: ['avantisvideo', 'selectmediavideo', 'vidcrunch', 'openwebvideo', 'didnavideo', 'ottadvisors', 'pgammedia'],
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid,
   buildRequests,

From 9eda78a179ad4d5477fa9d5ebe8bd760fa925c95 Mon Sep 17 00:00:00 2001
From: pm-nitin-shirsat <107102698+pm-nitin-shirsat@users.noreply.github.com>
Date: Mon, 15 Aug 2022 19:28:30 +0530
Subject: [PATCH 142/569] Pubmatic bid adapter: improved site object handling
 (#8820)

* UOE-7836: Vanilla JS: Stop overwriting site.page site.ref and site.domain

* UOE-7836: Vanilla JS: Stop overwriting site.page site.ref and site.domain in PrebidServerBidAdapter

* Rename variable name

* Revert changes from PrebidServerBidAdapter file

* Test cases written for the ticket UOE-7666 - stop overriding page, domain, site
---
 modules/pubmaticBidAdapter.js                |  6 ++-
 test/spec/modules/pubmaticBidAdapter_spec.js | 57 ++++++++++++++++++--
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index 922fedd5092..b71fa5c8ed2 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -185,7 +185,7 @@ _each(NATIVE_ASSETS, anAsset => { NATIVE_ASSET_ID_TO_KEY_MAP[anAsset.ID] = anAss
 // loading NATIVE_ASSET_KEY_TO_ASSET_MAP
 _each(NATIVE_ASSETS, anAsset => { NATIVE_ASSET_KEY_TO_ASSET_MAP[anAsset.KEY] = anAsset });
 
-function _getDomainFromURL(url) {
+export function _getDomainFromURL(url) {
   let anchor = document.createElement('a');
   anchor.href = url;
   return anchor.hostname;
@@ -1162,7 +1162,11 @@ export const spec = {
     // First Party Data
     const commonFpd = (bidderRequest && bidderRequest.ortb2) || {};
     if (commonFpd.site) {
+      const { page, domain, ref } = payload.site;
       mergeDeep(payload, {site: commonFpd.site});
+      payload.site.page = page;
+      payload.site.domain = domain;
+      payload.site.ref = ref;
     }
     if (commonFpd.user) {
       mergeDeep(payload, {user: commonFpd.user});
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
index f3a49a6a925..688bec5b5e9 100644
--- a/test/spec/modules/pubmaticBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {spec, checkVideoPlacement} from 'modules/pubmaticBidAdapter.js';
+import {spec, checkVideoPlacement, _getDomainFromURL} from 'modules/pubmaticBidAdapter.js';
 import * as utils from 'src/utils.js';
 import {config} from 'src/config.js';
 import { createEidsArray } from 'modules/userId/eids.js';
@@ -1688,17 +1688,66 @@ describe('PubMatic adapter', function () {
       describe('FPD', function() {
         let newRequest;
 
-        it('ortb2.site should be merged in the request', function() {
+        describe('ortb2.site should not override page, domain & ref values', function() {
+          it('When above properties are present in ortb2.site', function() {
+            const ortb2 = {
+              site: {
+                domain: 'page.example.com',
+                page: 'https://page.example.com/here.html',
+                ref: 'https://page.example.com/here.html'
+              }
+            };
+            const request = spec.buildRequests(bidRequests, {ortb2});
+            let data = JSON.parse(request.data);
+            expect(data.site.domain).not.equal('page.example.com');
+            expect(data.site.page).not.equal('https://page.example.com/here.html');
+            expect(data.site.ref).not.equal('https://page.example.com/here.html');
+          });
+
+          it('When above properties are absent in ortb2.site', function () {
+            const ortb2 = {
+              site: {}
+            };
+            let request = spec.buildRequests(bidRequests, {
+              auctionId: 'new-auction-id',
+              ortb2
+            });
+            let data = JSON.parse(request.data);
+            let response = spec.interpretResponse(bidResponses, request);
+            expect(data.site.page).to.equal(bidRequests[0].params.kadpageurl);
+            expect(data.site.domain).to.equal(_getDomainFromURL(data.site.page));
+            expect(response[0].referrer).to.equal(data.site.ref);
+          });
+
+          it('With some extra properties in ortb2.site', function() {
+            const ortb2 = {
+              site: {
+                domain: 'page.example.com',
+                page: 'https://page.example.com/here.html',
+                ref: 'https://page.example.com/here.html',
+                cat: ['IAB2'],
+                sectioncat: ['IAB2-2']
+              }
+            };
+            const request = spec.buildRequests(bidRequests, {ortb2});
+            let data = JSON.parse(request.data);
+            expect(data.site.domain).not.equal('page.example.com');
+            expect(data.site.page).not.equal('https://page.example.com/here.html');
+            expect(data.site.ref).not.equal('https://page.example.com/here.html');
+            expect(data.site.cat).to.deep.equal(['IAB2']);
+            expect(data.site.sectioncat).to.deep.equal(['IAB2-2']);
+          });
+        });
+
+        it('ortb2.site should be merged except page, domain & ref in the request', function() {
           const ortb2 = {
             site: {
-              domain: 'page.example.com',
               cat: ['IAB2'],
               sectioncat: ['IAB2-2']
             }
           };
           const request = spec.buildRequests(bidRequests, {ortb2});
           let data = JSON.parse(request.data);
-          expect(data.site.domain).to.equal('page.example.com');
           expect(data.site.cat).to.deep.equal(['IAB2']);
           expect(data.site.sectioncat).to.deep.equal(['IAB2-2']);
         });

From 902cfc087b85ee6162a7f49544f57f07ab26f06e Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Mon, 15 Aug 2022 07:00:39 -0700
Subject: [PATCH 143/569] Build system: fix "test-coverage" (#8819)

---
 babelConfig.js      |  14 +-
 karma.conf.maker.js |  13 +-
 package-lock.json   | 367 ++++++++++++++++++++++++++++++--------------
 package.json        |   4 +-
 4 files changed, 265 insertions(+), 133 deletions(-)

diff --git a/babelConfig.js b/babelConfig.js
index 2592d8dc776..a88491c0cae 100644
--- a/babelConfig.js
+++ b/babelConfig.js
@@ -22,9 +22,15 @@ module.exports = function (options = {}) {
         }
       ]
     ],
-    'plugins': [
-      [path.resolve(__dirname, './plugins/pbjsGlobals.js'), options],
-      [useLocal('@babel/plugin-transform-runtime')],
-    ],
+    'plugins': (() => {
+      const plugins = [
+        [path.resolve(__dirname, './plugins/pbjsGlobals.js'), options],
+        [useLocal('@babel/plugin-transform-runtime')],
+      ];
+      if (options.codeCoverage) {
+        plugins.push([useLocal('babel-plugin-istanbul')])
+      }
+      return plugins;
+    })(),
   }
 }
diff --git a/karma.conf.maker.js b/karma.conf.maker.js
index 82ede90b141..81930f42544 100644
--- a/karma.conf.maker.js
+++ b/karma.conf.maker.js
@@ -22,20 +22,9 @@ function newWebpackConfig(codeCoverage, disableFeatures) {
     .flatMap((r) => r.use)
     .filter((use) => use.loader === 'babel-loader')
     .forEach((use) => {
-      use.options = babelConfig({test: true, disableFeatures});
+      use.options = babelConfig({test: true, codeCoverage, disableFeatures});
     });
 
-  if (codeCoverage) {
-    webpackConfig.module.rules.push({
-      enforce: 'post',
-      exclude: /(node_modules)|(test)|(integrationExamples)|(build)|polyfill.js|(src\/adapters\/analytics\/ga.js)/,
-      use: {
-        loader: '@jsdevtools/coverage-istanbul-loader',
-        options: { esModules: true }
-      },
-      test: /\.js$/
-    })
-  }
   return webpackConfig;
 }
 
diff --git a/package-lock.json b/package-lock.json
index 0e221a988fd..749fafaebc4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "7.8.0-pre",
+      "version": "7.10.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
@@ -26,7 +26,6 @@
       },
       "devDependencies": {
         "@babel/eslint-parser": "^7.16.5",
-        "@jsdevtools/coverage-istanbul-loader": "^3.0.3",
         "@wdio/browserstack-service": "^7.16.0",
         "@wdio/cli": "^7.5.2",
         "@wdio/concise-reporter": "^7.5.2",
@@ -37,6 +36,7 @@
         "ajv": "6.12.3",
         "assert": "^2.0.0",
         "babel-loader": "^8.0.5",
+        "babel-plugin-istanbul": "^6.1.1",
         "babel-register": "^6.26.0",
         "body-parser": "^1.19.0",
         "chai": "^4.2.0",
@@ -1837,6 +1837,92 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
@@ -1978,19 +2064,6 @@
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
-    "node_modules/@jsdevtools/coverage-istanbul-loader": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz",
-      "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==",
-      "dev": true,
-      "dependencies": {
-        "convert-source-map": "^1.7.0",
-        "istanbul-lib-instrument": "^4.0.3",
-        "loader-utils": "^2.0.0",
-        "merge-source-map": "^1.1.0",
-        "schema-utils": "^2.7.0"
-      }
-    },
     "node_modules/@polka/url": {
       "version": "1.0.0-next.21",
       "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
@@ -4459,6 +4532,38 @@
         "object.assign": "^4.1.0"
       }
     },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
+      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/babel-plugin-polyfill-corejs2": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
@@ -10016,6 +10121,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/get-pkg-repo": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz",
@@ -14128,21 +14242,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.7.5",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/istanbul-lib-report": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
@@ -15405,20 +15504,6 @@
         "node": ">=6.11.5"
       }
     },
-    "node_modules/loader-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
     "node_modules/locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -16546,24 +16631,6 @@
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
       "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
     },
-    "node_modules/merge-source-map": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/merge-source-map/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -21427,6 +21494,20 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/text-extensions": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
@@ -24734,6 +24815,70 @@
       "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==",
       "dev": true
     },
+    "@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        }
+      }
+    },
     "@istanbuljs/schema": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
@@ -24844,19 +24989,6 @@
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
-    "@jsdevtools/coverage-istanbul-loader": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz",
-      "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==",
-      "dev": true,
-      "requires": {
-        "convert-source-map": "^1.7.0",
-        "istanbul-lib-instrument": "^4.0.3",
-        "loader-utils": "^2.0.0",
-        "merge-source-map": "^1.1.0",
-        "schema-utils": "^2.7.0"
-      }
-    },
     "@polka/url": {
       "version": "1.0.0-next.21",
       "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
@@ -26886,6 +27018,34 @@
         "object.assign": "^4.1.0"
       }
     },
+    "babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "dependencies": {
+        "istanbul-lib-instrument": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
+          "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.12.3",
+            "@babel/parser": "^7.14.7",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.2.0",
+            "semver": "^6.3.0"
+          }
+        }
+      }
+    },
     "babel-plugin-polyfill-corejs2": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
@@ -31285,6 +31445,12 @@
         "has-symbols": "^1.0.1"
       }
     },
+    "get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true
+    },
     "get-pkg-repo": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz",
@@ -34570,18 +34736,6 @@
       "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "dev": true
     },
-    "istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.7.5",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
-        "semver": "^6.3.0"
-      }
-    },
     "istanbul-lib-report": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
@@ -35534,17 +35688,6 @@
       "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
       "dev": true
     },
-    "loader-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-      "dev": true,
-      "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      }
-    },
     "locate-path": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -36476,23 +36619,6 @@
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
       "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
     },
-    "merge-source-map": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -40338,6 +40464,17 @@
         }
       }
     },
+    "test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "requires": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      }
+    },
     "text-extensions": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
diff --git a/package.json b/package.json
index 19748040d79..58898eb0110 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,6 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.5",
-    "@jsdevtools/coverage-istanbul-loader": "^3.0.3",
     "@wdio/browserstack-service": "^7.16.0",
     "@wdio/cli": "^7.5.2",
     "@wdio/concise-reporter": "^7.5.2",
@@ -46,6 +45,7 @@
     "ajv": "6.12.3",
     "assert": "^2.0.0",
     "babel-loader": "^8.0.5",
+    "babel-plugin-istanbul": "^6.1.1",
     "babel-register": "^6.26.0",
     "body-parser": "^1.19.0",
     "chai": "^4.2.0",
@@ -114,9 +114,9 @@
   },
   "dependencies": {
     "@babel/core": "^7.16.7",
+    "@babel/plugin-transform-runtime": "^7.18.9",
     "@babel/preset-env": "^7.16.8",
     "@babel/runtime": "^7.18.9",
-    "@babel/plugin-transform-runtime": "^7.18.9",
     "core-js": "^3.13.0",
     "core-js-pure": "^3.13.0",
     "criteo-direct-rsa-validate": "^1.1.0",

From 335a90782bc5f709a039b5b6a85811098e0b544f Mon Sep 17 00:00:00 2001
From: CPMStar <josh@cpmstar.com>
Date: Mon, 15 Aug 2022 09:20:48 -0700
Subject: [PATCH 144/569] CPMStar Bid Adapter : change request method to post &
 added data to endpoint (#8810)

* added cpmstarBidAdapter with meta.advertiserDomains support

* fix linting

* Updated modules/cpmstarBidAdapter: Changed request method to post and included the mediaType.video and adUnitCode data to the request body.

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
Co-authored-by: = <=>
---
 modules/cpmstarBidAdapter.js                | 32 ++++++++++++++-------
 test/spec/modules/cpmstarBidAdapter_spec.js |  2 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/modules/cpmstarBidAdapter.js b/modules/cpmstarBidAdapter.js
index 6e32c5c4713..e8e1a846f35 100755
--- a/modules/cpmstarBidAdapter.js
+++ b/modules/cpmstarBidAdapter.js
@@ -1,4 +1,5 @@
-import { deepAccess, getBidIdParameter, logWarn, logError } from '../src/utils.js';
+
+import * as utils from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { VIDEO, BANNER } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
@@ -25,11 +26,11 @@ export const spec = {
 
   getMediaType: function (bidRequest) {
     if (bidRequest == null) return BANNER;
-    return !deepAccess(bidRequest, 'mediaTypes.video') ? BANNER : VIDEO;
+    return !utils.deepAccess(bidRequest, 'mediaTypes.video') ? BANNER : VIDEO;
   },
 
   getPlayerSize: function (bidRequest) {
-    var playerSize = deepAccess(bidRequest, 'mediaTypes.video.playerSize');
+    var playerSize = utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize');
     if (playerSize == null) return [640, 440];
     if (playerSize[0] != null) playerSize = playerSize[0];
     if (playerSize == null || playerSize[0] == null || playerSize[1] == null) return [640, 440];
@@ -46,15 +47,14 @@ export const spec = {
 
     for (var i = 0; i < validBidRequests.length; i++) {
       var bidRequest = validBidRequests[i];
-      // TODO: is 'page' the right value here?
-      var referer = encodeURIComponent(bidderRequest.refererInfo.page);
-      var e = getBidIdParameter('endpoint', bidRequest.params);
+      var referer = encodeURIComponent(bidderRequest.refererInfo.referer);
+      var e = utils.getBidIdParameter('endpoint', bidRequest.params);
       var ENDPOINT = e == 'dev' ? ENDPOINT_DEV : e == 'staging' ? ENDPOINT_STAGING : ENDPOINT_PRODUCTION;
       var mediaType = spec.getMediaType(bidRequest);
       var playerSize = spec.getPlayerSize(bidRequest);
       var videoArgs = '&fv=0' + (playerSize ? ('&w=' + playerSize[0] + '&h=' + playerSize[1]) : '');
       var url = ENDPOINT + '?media=' + mediaType + (mediaType == VIDEO ? videoArgs : '') +
-        '&json=c_b&mv=1&poolid=' + getBidIdParameter('placementId', bidRequest.params) +
+        '&json=c_b&mv=1&poolid=' + utils.getBidIdParameter('placementId', bidRequest.params) +
         '&reachedTop=' + encodeURIComponent(bidderRequest.refererInfo.reachedTop) +
         '&requestid=' + bidRequest.bidId +
         '&referer=' + encodeURIComponent(referer);
@@ -93,10 +93,20 @@ export const spec = {
         url += '&tfcd=' + (config.getConfig('coppa') ? 1 : 0);
       }
 
+      let body = {};
+      let adUnitCode = bidRequest.adUnitCode;
+      if (adUnitCode) {
+        body.adUnitCode = adUnitCode;
+      }
+      if (mediaType == VIDEO) {
+        body.video = utils.deepAccess(bidRequest, 'mediaTypes.video');
+      }
+
       requests.push({
-        method: 'GET',
+        method: 'POST',
         url: url,
         bidRequest: bidRequest,
+        data: body
       });
     }
 
@@ -117,13 +127,13 @@ export const spec = {
       var raw = serverResponse.body[i];
       var rawBid = raw.creatives[0];
       if (!rawBid) {
-        logWarn('cpmstarBidAdapter: server response failed check');
+        utils.logWarn('cpmstarBidAdapter: server response failed check');
         return;
       }
       var cpm = (parseFloat(rawBid.cpm) || 0);
 
       if (!cpm) {
-        logWarn('cpmstarBidAdapter: server response failed check. Missing cpm')
+        utils.logWarn('cpmstarBidAdapter: server response failed check. Missing cpm')
         return;
       }
 
@@ -156,7 +166,7 @@ export const spec = {
         bidResponse.mediaType = VIDEO;
         bidResponse.vastXml = rawBid.creativemacros.HTML5VID_VASTSTRING;
       } else {
-        return logError('bad response', rawBid);
+        return utils.logError('bad response', rawBid);
       }
 
       bidResponses.push(bidResponse);
diff --git a/test/spec/modules/cpmstarBidAdapter_spec.js b/test/spec/modules/cpmstarBidAdapter_spec.js
index dd076d060b9..285fca9690a 100755
--- a/test/spec/modules/cpmstarBidAdapter_spec.js
+++ b/test/spec/modules/cpmstarBidAdapter_spec.js
@@ -14,7 +14,7 @@ const valid_bid_requests = [{
 
 const bidderRequest = {
   refererInfo: {
-    page: 'referer',
+    referer: 'referer',
     reachedTop: false,
   }
 };

From 6b0021c02c80b32c0e9b688064f8ff1790270057 Mon Sep 17 00:00:00 2001
From: Jeremy Sadwith <jeremy@kargo.com>
Date: Mon, 15 Aug 2022 12:35:10 -0400
Subject: [PATCH 145/569] Kargo Bid Adapter: Pull Page URL from refererInfo
 (#8825)

* Kargo Bid Adapter: Use currency from Bid Response

* Kargo Bid Adapter: Fix failed test

* Kargo Bid Adapter: adding media type to bid response, supporting vastXml response (#8426)

* kargo adapter - adding mediaType to bid response, conditionally set vastXml field

* kargo adapter - updating tests

* Kargo Bid Adapter: onTimeout Support (#6)

* Adding additional param

* Adding response time function

* Remove debug

* Updating response time log to be set by bid response

* Adding screen width/height to request

* Test fix

* Test fix

* Removing interpretResponse signaling

* Simplifying send data function

* Kargo Analytics Adapter: Update with bid response time support

* Renaming event route for auction data

* Reset bid response data sent bool

* Using array to store logged auctions

* Update to use timeToResponse

* Test fix

* Kargo: Pull page URL from refererInfo

* Test fix: Page URL

* Removing extra bracket

Co-authored-by: Wei Wong <wwong@kargo.com>
Co-authored-by: Andy Rusiecki <andy.rusiecki@gmail.com>
---
 modules/kargoBidAdapter.js                |  9 ++++-----
 test/spec/modules/kargoBidAdapter_spec.js | 13 +++++++++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/modules/kargoBidAdapter.js b/modules/kargoBidAdapter.js
index 72342903d87..deeb1cb8630 100644
--- a/modules/kargoBidAdapter.js
+++ b/modules/kargoBidAdapter.js
@@ -60,7 +60,7 @@ export const spec = {
         height: window.screen.height
       },
       prebidRawBidRequests: validBidRequests
-    }, spec._getAllMetadata(tdid, bidderRequest.uspConsent, bidderRequest.gdprConsent));
+    }, spec._getAllMetadata(bidderRequest, tdid));
     const encodedParams = encodeURIComponent(JSON.stringify(transformedParams));
     return Object.assign({}, bidderRequest, {
       method: 'GET',
@@ -215,11 +215,10 @@ export const spec = {
     return crb.clientId;
   },
 
-  _getAllMetadata(tdid, usp, gdpr) {
+  _getAllMetadata(bidderRequest, tdid) {
     return {
-      userIDs: spec._getUserIds(tdid, usp, gdpr),
-      // TODO: this should probably look at refererInfo
-      pageURL: window.location.href,
+      userIDs: spec._getUserIds(tdid, bidderRequest.uspConsent, bidderRequest.gdprConsent),
+      pageURL: bidderRequest.refererInfo && bidderRequest.refererInfo.page,
       rawCRB: storage.getCookie('krg_crb'),
       rawCRBLocalStorage: spec._getLocalStorageSafely('krg_crb')
     };
diff --git a/test/spec/modules/kargoBidAdapter_spec.js b/test/spec/modules/kargoBidAdapter_spec.js
index e900b91ed11..169ee520f33 100644
--- a/test/spec/modules/kargoBidAdapter_spec.js
+++ b/test/spec/modules/kargoBidAdapter_spec.js
@@ -276,7 +276,7 @@ describe('kargo adapter tests', function () {
           optOut: false,
           usp: '1---'
         },
-        pageURL: window.location.href,
+        pageURL: 'https://www.prebid.org',
         prebidRawBidRequests: [
           {
             bidId: 1,
@@ -327,10 +327,19 @@ describe('kargo adapter tests', function () {
       if (excludeTdid) {
         delete clonedBids[0].userId.tdid;
       }
-      var payload = { timeout: 200, uspConsent: '1---', foo: 'bar' };
+      var payload = {
+        timeout: 200,
+        uspConsent: '1---',
+        foo: 'bar',
+        refererInfo: {
+          page: 'https://www.prebid.org',
+        },
+      };
+
       if (gdpr) {
         payload['gdprConsent'] = gdpr
       }
+
       var request = spec.buildRequests(clonedBids, payload);
       expected.sessionId = getSessionId();
       sessionIds.push(expected.sessionId);

From 6e36e363aa843603a8b7cb29da3242d84e5f4b9d Mon Sep 17 00:00:00 2001
From: caseywhitmire <60086994+caseywhitmire@users.noreply.github.com>
Date: Mon, 15 Aug 2022 12:33:13 -0700
Subject: [PATCH 146/569] Various Files: Fix LGTM trailing semi-colon (#8830)

* Update showheroes-bsBidAdapter.js

* Update adyoulikeBidAdapter.js

* Update sonobiBidAdapter.js

* Update mediakeysBidAdapter.js

* Update revcontentBidAdapter.js

* Update vidazooBidAdapter.js

* Update tpmnBidAdapter.js

* Update yandexBidAdapter.js

* Update yieldoneBidAdapter.js

* Update karma.conf.maker.js

* Update trustpidSystem.js

* Update iqmBidAdapter.js

* Update yieldmoBidAdapter.js

* Update tappxBidAdapter.js

* Update e_volutionBidAdapter.js

* Update adrelevantisBidAdapter.js

* Update goldbachBidAdapter.js

* Update Renderer.js

* Update priceFloors.js

* Update bizzclickBidAdapter.js

* Update nobidBidAdapter.js

* Update openxBidAdapter.js

* Update yahoosspBidAdapter.js

* Update rtbhouseBidAdapter.js

* Update admixerBidAdapter.js

* Update gamoshiBidAdapter.js

* Update pubxaiAnalyticsAdapter.js

* Update impactifyBidAdapter.js

* Update pubwiseAnalyticsAdapter.js

* Update sizeMappingV2.js

* Update pubwiseBidAdapter.js

* Update theAdxBidAdapter.js

* Update staqAnalyticsAdapter.js

* Update adtelligentBidAdapter.js

* Update novatiqIdSystem.js

* Update cwireBidAdapter.js

* Update datablocksBidAdapter.js

* Update gothamadsBidAdapter.js

* Update krushmediaBidAdapter.js

* Update vidoomyBidAdapter.js

* Update adtrueBidAdapter.js

* Update userSync.js

* Update targetVideoBidAdapter.js

* Update open8BidAdapter.js

* Update gumgumBidAdapter.js

* Update mgidBidAdapter.js

* Update inskinBidAdapter.js

* Update adxpremiumAnalyticsAdapter.js

* Update emx_digitalBidAdapter.js

* Update betweenBidAdapter.js

* Update pixfutureBidAdapter.js

* Update winrBidAdapter.js

* Update luponmediaBidAdapter.js

* Update interactiveOffersBidAdapter.js

* Update intentIqIdSystem.js

* Update lkqdBidAdapter.js

* Update loganBidAdapter.js

* Update dfpAdServerVideo.js

* Update targeting.js

* Update livewrappedAnalyticsAdapter.js

* Update adnowBidAdapter.js

* Update cleanmedianetBidAdapter.js

* Update sonobiAnalyticsAdapter.js

* Update apstreamBidAdapter.js

* Update quantcastIdSystem.js

* Update prebidmanagerAnalyticsAdapter.js

* Update brightMountainMediaBidAdapter.js

* Update dgkeywordRtdProvider.js

* Update h12mediaBidAdapter.js

* Update permutiveRtdProvider_example.html

* Update dspxBidAdapter.js

* Update radsBidAdapter.js

* Update id5AnalyticsAdapter.js

* Update richaudienceBidAdapter.js

* Update cpmstarBidAdapter.js

* Update vdoaiBidAdapter.js

* Update smaatoBidAdapter.js

* Update adtargetBidAdapter.js

* Update openwebBidAdapter.js

* Update malltvBidAdapter.js

* Update gjirafaBidAdapter.js

* Update integr8BidAdapter.js

* Update fabrickIdSystem.js

* Update sizeMapping.js

* Update adpod.js

* Update adriverBidAdapter.js

* Update trionBidAdapter.js

* Update ebdrBidAdapter.js

* Update getintentBidAdapter.js

* Update pubxBidAdapter.js

* Update schain.js

* Update underdogmediaBidAdapter.js

* Update bidfactory.js

* eslint: update semi-colon rule

Missing semi-colons will now cause an error.

* Update .eslintrc.js
---
 .../gpt/permutiveRtdProvider_example.html        |  2 +-
 karma.conf.maker.js                              |  2 +-
 modules/admixerBidAdapter.js                     |  2 +-
 modules/adnowBidAdapter.js                       |  2 +-
 modules/adpod.js                                 |  2 +-
 modules/adrelevantisBidAdapter.js                |  4 ++--
 modules/adriverBidAdapter.js                     |  2 +-
 modules/adtargetBidAdapter.js                    |  2 +-
 modules/adtelligentBidAdapter.js                 |  2 +-
 modules/adtrueBidAdapter.js                      |  2 +-
 modules/adxpremiumAnalyticsAdapter.js            |  2 +-
 modules/adyoulikeBidAdapter.js                   |  2 +-
 modules/apstreamBidAdapter.js                    |  4 ++--
 modules/betweenBidAdapter.js                     |  2 +-
 modules/bizzclickBidAdapter.js                   |  2 +-
 modules/brightMountainMediaBidAdapter.js         |  2 +-
 modules/cleanmedianetBidAdapter.js               |  2 +-
 modules/cpmstarBidAdapter.js                     |  6 +++---
 modules/cwireBidAdapter.js                       |  2 +-
 modules/datablocksBidAdapter.js                  |  2 +-
 modules/dfpAdServerVideo.js                      |  4 ++--
 modules/dgkeywordRtdProvider.js                  |  2 +-
 modules/dspxBidAdapter.js                        |  2 +-
 modules/e_volutionBidAdapter.js                  |  6 +++---
 modules/ebdrBidAdapter.js                        |  2 +-
 modules/emx_digitalBidAdapter.js                 |  2 +-
 modules/fabrickIdSystem.js                       |  4 ++--
 modules/gamoshiBidAdapter.js                     |  2 +-
 modules/getintentBidAdapter.js                   |  2 +-
 modules/gjirafaBidAdapter.js                     |  4 ++--
 modules/goldbachBidAdapter.js                    | 16 ++++++++--------
 modules/gothamadsBidAdapter.js                   |  4 ++--
 modules/gumgumBidAdapter.js                      |  6 +++---
 modules/h12mediaBidAdapter.js                    |  2 +-
 modules/id5AnalyticsAdapter.js                   |  2 +-
 modules/impactifyBidAdapter.js                   |  2 +-
 modules/inskinBidAdapter.js                      |  2 +-
 modules/integr8BidAdapter.js                     |  4 ++--
 modules/intentIqIdSystem.js                      |  4 ++--
 modules/interactiveOffersBidAdapter.js           |  2 +-
 modules/iqmBidAdapter.js                         |  2 +-
 modules/krushmediaBidAdapter.js                  |  4 ++--
 modules/livewrappedAnalyticsAdapter.js           |  6 +++---
 modules/lkqdBidAdapter.js                        |  6 +++---
 modules/loganBidAdapter.js                       |  4 ++--
 modules/luponmediaBidAdapter.js                  |  6 +++---
 modules/malltvBidAdapter.js                      |  4 ++--
 modules/mediakeysBidAdapter.js                   |  4 ++--
 modules/mgidBidAdapter.js                        |  4 ++--
 modules/nobidBidAdapter.js                       |  4 ++--
 modules/novatiqIdSystem.js                       |  2 +-
 modules/open8BidAdapter.js                       |  2 +-
 modules/openwebBidAdapter.js                     |  2 +-
 modules/openxBidAdapter.js                       |  6 +++---
 modules/pixfutureBidAdapter.js                   |  2 +-
 modules/prebidmanagerAnalyticsAdapter.js         |  2 +-
 modules/priceFloors.js                           |  2 +-
 modules/pubwiseAnalyticsAdapter.js               |  2 +-
 modules/pubwiseBidAdapter.js                     |  6 +++---
 modules/pubxBidAdapter.js                        |  2 +-
 modules/pubxaiAnalyticsAdapter.js                |  4 ++--
 modules/quantcastIdSystem.js                     |  2 +-
 modules/radsBidAdapter.js                        |  2 +-
 modules/revcontentBidAdapter.js                  |  2 +-
 modules/richaudienceBidAdapter.js                |  2 +-
 modules/rtbhouseBidAdapter.js                    |  2 +-
 modules/schain.js                                |  2 +-
 modules/showheroes-bsBidAdapter.js               |  2 +-
 modules/sizeMappingV2.js                         |  2 +-
 modules/smaatoBidAdapter.js                      |  4 ++--
 modules/sonobiAnalyticsAdapter.js                |  2 +-
 modules/sonobiBidAdapter.js                      |  6 +++---
 modules/staqAnalyticsAdapter.js                  |  2 +-
 modules/tappxBidAdapter.js                       |  4 ++--
 modules/targetVideoBidAdapter.js                 |  2 +-
 modules/theAdxBidAdapter.js                      |  4 ++--
 modules/tpmnBidAdapter.js                        |  2 +-
 modules/trionBidAdapter.js                       |  4 ++--
 modules/trustpidSystem.js                        |  2 +-
 modules/underdogmediaBidAdapter.js               |  2 +-
 modules/vdoaiBidAdapter.js                       |  2 +-
 modules/vidazooBidAdapter.js                     |  2 +-
 modules/vidoomyBidAdapter.js                     |  2 +-
 modules/winrBidAdapter.js                        |  2 +-
 modules/yahoosspBidAdapter.js                    |  4 ++--
 modules/yandexBidAdapter.js                      |  2 +-
 modules/yieldmoBidAdapter.js                     |  6 +++---
 modules/yieldoneBidAdapter.js                    |  4 ++--
 src/Renderer.js                                  |  2 +-
 src/bidfactory.js                                |  2 +-
 src/sizeMapping.js                               |  2 +-
 src/targeting.js                                 |  2 +-
 src/userSync.js                                  |  2 +-
 93 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/integrationExamples/gpt/permutiveRtdProvider_example.html b/integrationExamples/gpt/permutiveRtdProvider_example.html
index dbb4d2af0d6..118cc678726 100644
--- a/integrationExamples/gpt/permutiveRtdProvider_example.html
+++ b/integrationExamples/gpt/permutiveRtdProvider_example.html
@@ -23,7 +23,7 @@
               }
             }
 
-            setLocalStorageData()
+            setLocalStorageData();
 
             var div_1_sizes = [
                 [300, 250],
diff --git a/karma.conf.maker.js b/karma.conf.maker.js
index 81930f42544..fd8f2e6fdd8 100644
--- a/karma.conf.maker.js
+++ b/karma.conf.maker.js
@@ -176,7 +176,7 @@ module.exports = function(codeCoverage, browserstack, watchMode, file, disableFe
     concurrency: 6,
 
     plugins: plugins
-  }
+  };
 
   // To ensure that, we are able to run single spec file
   // here we are adding preprocessors, when file is passed
diff --git a/modules/admixerBidAdapter.js b/modules/admixerBidAdapter.js
index b9cde172ebe..8fcee60f9f9 100644
--- a/modules/admixerBidAdapter.js
+++ b/modules/admixerBidAdapter.js
@@ -52,7 +52,7 @@ export const spec = {
           consentString: bidderRequest.gdprConsent.consentString,
           // will check if the gdprApplies field was populated with a boolean value (ie from page config).  If it's undefined, then default to true
           gdprApplies: (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : true
-        }
+        };
       }
       if (bidderRequest.uspConsent) {
         payload.uspConsent = bidderRequest.uspConsent;
diff --git a/modules/adnowBidAdapter.js b/modules/adnowBidAdapter.js
index 484b6202479..f83dbf68a1f 100644
--- a/modules/adnowBidAdapter.js
+++ b/modules/adnowBidAdapter.js
@@ -67,7 +67,7 @@ export const spec = {
       if (mediaType === BANNER) {
         data.sizes = parseSizesInput(
           req.mediaTypes && req.mediaTypes.banner && req.mediaTypes.banner.sizes
-        ).join('|')
+        ).join('|');
       } else {
         data.width = data.height = 200;
 
diff --git a/modules/adpod.js b/modules/adpod.js
index b7c459fd66f..f1ab4bd2ef1 100644
--- a/modules/adpod.js
+++ b/modules/adpod.js
@@ -243,7 +243,7 @@ export function callPrebidCacheHook(fn, auctionInstance, bidResponse, afterBidAd
     let brandCategoryExclusion = config.getConfig('adpod.brandCategoryExclusion');
     let adServerCatId = deepAccess(bidResponse, 'meta.adServerCatId');
     if (!adServerCatId && brandCategoryExclusion) {
-      logWarn('Detected a bid without meta.adServerCatId while setConfig({adpod.brandCategoryExclusion}) was enabled.  This bid has been rejected:', bidResponse)
+      logWarn('Detected a bid without meta.adServerCatId while setConfig({adpod.brandCategoryExclusion}) was enabled.  This bid has been rejected:', bidResponse);
       afterBidAdded();
     } else {
       if (config.getConfig('adpod.deferCaching') === false) {
diff --git a/modules/adrelevantisBidAdapter.js b/modules/adrelevantisBidAdapter.js
index 193c92cbb19..40cfe18f025 100644
--- a/modules/adrelevantisBidAdapter.js
+++ b/modules/adrelevantisBidAdapter.js
@@ -209,7 +209,7 @@ export const spec = {
 
     return params;
   }
-}
+};
 
 function isPopulatedArray(arr) {
   return !!(isArray(arr) && arr.length > 0);
@@ -444,7 +444,7 @@ function bidToTag(bid) {
     tag.cpm = bid.params.cpm;
   }
   tag.allow_smaller_sizes = bid.params.allowSmallerSizes || false;
-  tag.use_pmt_rule = bid.params.usePaymentRule || false
+  tag.use_pmt_rule = bid.params.usePaymentRule || false;
   tag.prebid = true;
   tag.disable_psa = true;
   if (bid.params.position) {
diff --git a/modules/adriverBidAdapter.js b/modules/adriverBidAdapter.js
index 5ab417520e9..e95f83d2c7b 100644
--- a/modules/adriverBidAdapter.js
+++ b/modules/adriverBidAdapter.js
@@ -32,7 +32,7 @@ export const spec = {
 
     let timeout = null;
     if (bidderRequest) {
-      timeout = bidderRequest.timeout
+      timeout = bidderRequest.timeout;
     }
 
     const payload = {
diff --git a/modules/adtargetBidAdapter.js b/modules/adtargetBidAdapter.js
index c4f2bc65655..89ba4878acf 100644
--- a/modules/adtargetBidAdapter.js
+++ b/modules/adtargetBidAdapter.js
@@ -137,7 +137,7 @@ function bidToTag(bidRequests, adapterRequest) {
     tag.UserIds = deepAccess(bidRequests[0], 'userId');
   }
 
-  const bids = []
+  const bids = [];
 
   for (let i = 0, length = bidRequests.length; i < length; i++) {
     const bid = prepareBidRequests(bidRequests[i]);
diff --git a/modules/adtelligentBidAdapter.js b/modules/adtelligentBidAdapter.js
index 03d4e634062..2ee5b0f72a3 100644
--- a/modules/adtelligentBidAdapter.js
+++ b/modules/adtelligentBidAdapter.js
@@ -190,7 +190,7 @@ function bidToTag(bidRequests, adapterRequest) {
   }
 
   // end publisher env
-  const bids = []
+  const bids = [];
 
   for (let i = 0, length = bidRequests.length; i < length; i++) {
     const bid = prepareBidRequests(bidRequests[i]);
diff --git a/modules/adtrueBidAdapter.js b/modules/adtrueBidAdapter.js
index b0aafc3ae4e..2ec5cd59e1d 100644
--- a/modules/adtrueBidAdapter.js
+++ b/modules/adtrueBidAdapter.js
@@ -45,7 +45,7 @@ const VIDEO_CUSTOM_PARAMS = {
   'placement': DATA_TYPES.NUMBER,
   'minbitrate': DATA_TYPES.NUMBER,
   'maxbitrate': DATA_TYPES.NUMBER
-}
+};
 
 const NATIVE_ASSETS = {
   'TITLE': {ID: 1, KEY: 'title', TYPE: 0},
diff --git a/modules/adxpremiumAnalyticsAdapter.js b/modules/adxpremiumAnalyticsAdapter.js
index 456180a964b..9161c6338f4 100644
--- a/modules/adxpremiumAnalyticsAdapter.js
+++ b/modules/adxpremiumAnalyticsAdapter.js
@@ -263,7 +263,7 @@ adxpremiumAnalyticsAdapter.enableAnalytics = function (config) {
   }
 
   adxpremiumAnalyticsAdapter.originEnableAnalytics(config); // call the base class function
-}
+};
 
 adapterManager.registerAnalyticsAdapter({
   adapter: adxpremiumAnalyticsAdapter,
diff --git a/modules/adyoulikeBidAdapter.js b/modules/adyoulikeBidAdapter.js
index 0f373749a7f..b0b132abd1c 100644
--- a/modules/adyoulikeBidAdapter.js
+++ b/modules/adyoulikeBidAdapter.js
@@ -444,7 +444,7 @@ function getNativeAssets(response, nativeConfig) {
 /* Create bid from response */
 function createBid(response, bidRequests) {
   if (!response || (!response.Ad && !response.Native && !response.Vast)) {
-    return
+    return;
   }
 
   const request = bidRequests && bidRequests[response.BidID];
diff --git a/modules/apstreamBidAdapter.js b/modules/apstreamBidAdapter.js
index 5ae0d5c56fd..30abb17bfde 100644
--- a/modules/apstreamBidAdapter.js
+++ b/modules/apstreamBidAdapter.js
@@ -267,7 +267,7 @@ var dsuModule = (function() {
 
   return {
     readOrCreateDsu: readOrCreateDsu
-  }
+  };
 })();
 
 function serializeSizes(sizes) {
@@ -343,7 +343,7 @@ function getBids(bids) {
     const bidId = bid.bidId;
 
     let mediaType = '';
-    const mediaTypes = Object.keys(bid.mediaTypes)
+    const mediaTypes = Object.keys(bid.mediaTypes);
     switch (mediaTypes[0]) {
       case 'video':
         mediaType = 'v';
diff --git a/modules/betweenBidAdapter.js b/modules/betweenBidAdapter.js
index 9e57d0f5cd3..2ca829b796b 100644
--- a/modules/betweenBidAdapter.js
+++ b/modules/betweenBidAdapter.js
@@ -90,7 +90,7 @@ export const spec = {
         }
       }
 
-      requests.push({data: params})
+      requests.push({data: params});
     })
     return {
       method: 'POST',
diff --git a/modules/bizzclickBidAdapter.js b/modules/bizzclickBidAdapter.js
index 7b32ffd84b0..4ef2b6dd9f8 100644
--- a/modules/bizzclickBidAdapter.js
+++ b/modules/bizzclickBidAdapter.js
@@ -256,7 +256,7 @@ const addNativeParameters = bidRequest => {
         wmin = sizes[0];
         hmin = sizes[1];
       }
-      asset[props.name] = {}
+      asset[props.name] = {};
       if (bidParams.len) asset[props.name]['len'] = bidParams.len;
       if (props.type) asset[props.name]['type'] = props.type;
       if (wmin) asset[props.name]['wmin'] = wmin;
diff --git a/modules/brightMountainMediaBidAdapter.js b/modules/brightMountainMediaBidAdapter.js
index bfe1e8ecb29..6db06744c24 100644
--- a/modules/brightMountainMediaBidAdapter.js
+++ b/modules/brightMountainMediaBidAdapter.js
@@ -99,7 +99,7 @@ export const spec = {
     let response;
 
     try {
-      response = serverResponse.body
+      response = serverResponse.body;
       bid = response.seatbid[0].bid[0];
     } catch (e) {
       response = null;
diff --git a/modules/cleanmedianetBidAdapter.js b/modules/cleanmedianetBidAdapter.js
index f7d74c0df64..ba72eec3d95 100644
--- a/modules/cleanmedianetBidAdapter.js
+++ b/modules/cleanmedianetBidAdapter.js
@@ -104,7 +104,7 @@ export const spec = {
           ext: {
             consent: bidderRequest.gdprConsent.consentString
           }
-        }
+        };
       }
 
       const imp = {
diff --git a/modules/cpmstarBidAdapter.js b/modules/cpmstarBidAdapter.js
index e8e1a846f35..64fe85fdbbc 100755
--- a/modules/cpmstarBidAdapter.js
+++ b/modules/cpmstarBidAdapter.js
@@ -73,7 +73,7 @@ export const spec = {
             fixedEncodeURIComponent(node.name || '') + ',' +
             fixedEncodeURIComponent(node.domain || '');
         }
-        url += '&schain=' + schainString
+        url += '&schain=' + schainString;
       }
 
       if (bidderRequest.gdprConsent) {
@@ -133,7 +133,7 @@ export const spec = {
       var cpm = (parseFloat(rawBid.cpm) || 0);
 
       if (!cpm) {
-        utils.logWarn('cpmstarBidAdapter: server response failed check. Missing cpm')
+        utils.logWarn('cpmstarBidAdapter: server response failed check. Missing cpm');
         return;
       }
 
@@ -152,7 +152,7 @@ export const spec = {
       };
 
       if (rawBid.hasOwnProperty('dealId')) {
-        bidResponse.dealId = rawBid.dealId
+        bidResponse.dealId = rawBid.dealId;
       }
 
       if (mediaType == BANNER && rawBid.code) {
diff --git a/modules/cwireBidAdapter.js b/modules/cwireBidAdapter.js
index 47f3020fec3..a11899609bc 100644
--- a/modules/cwireBidAdapter.js
+++ b/modules/cwireBidAdapter.js
@@ -303,5 +303,5 @@ export const spec = {
 
     return bidResponses;
   },
-}
+};
 registerBidder(spec);
diff --git a/modules/datablocksBidAdapter.js b/modules/datablocksBidAdapter.js
index f0e0c32990a..4e21e08ba57 100644
--- a/modules/datablocksBidAdapter.js
+++ b/modules/datablocksBidAdapter.js
@@ -361,7 +361,7 @@ export const spec = {
         stack: bidderRequest.refererInfo.stack,
         timeout: config.getConfig('bidderTimeout')
       },
-    }
+    };
 
     // ADD REF URL IF FOUND
     if (self === top && document.referrer) {
diff --git a/modules/dfpAdServerVideo.js b/modules/dfpAdServerVideo.js
index 37f038d2a67..072715b4bd6 100644
--- a/modules/dfpAdServerVideo.js
+++ b/modules/dfpAdServerVideo.js
@@ -91,7 +91,7 @@ export function buildDfpVideoUrl(options) {
   };
 
   const urlSearchComponent = urlComponents.search;
-  const urlSzParam = urlSearchComponent && urlSearchComponent.sz
+  const urlSzParam = urlSearchComponent && urlSearchComponent.sz;
   if (urlSzParam) {
     derivedParams.sz = urlSzParam + '|' + derivedParams.sz;
   }
@@ -186,7 +186,7 @@ export function buildAdpodVideoUrl({code, params, callback} = {}) {
     let initialValue = {
       [adpodUtils.TARGETING_KEY_PB_CAT_DUR]: undefined,
       [adpodUtils.TARGETING_KEY_CACHE_ID]: undefined
-    }
+    };
     let customParams = {};
     if (targeting[code]) {
       customParams = targeting[code].reduce((acc, curValue) => {
diff --git a/modules/dgkeywordRtdProvider.js b/modules/dgkeywordRtdProvider.js
index 171766ac4ce..cea33014144 100644
--- a/modules/dgkeywordRtdProvider.js
+++ b/modules/dgkeywordRtdProvider.js
@@ -48,7 +48,7 @@ export function getDgKeywordsAndSet(reqBidsConfigObj, callback, moduleConfig, us
               keywords['opectx'] = res['t'];
             }
             if (Object.keys(keywords).length > 0) {
-              const targetBidKeys = {}
+              const targetBidKeys = {};
               for (let bid of setKeywordTargetBidders) {
                 // set keywords to params
                 bid.params.keywords = keywords;
diff --git a/modules/dspxBidAdapter.js b/modules/dspxBidAdapter.js
index 6af0236d3bb..8850eb282b5 100644
--- a/modules/dspxBidAdapter.js
+++ b/modules/dspxBidAdapter.js
@@ -99,7 +99,7 @@ export const spec = {
         method: 'GET',
         url: endpoint,
         data: objectToQueryString(payload),
-      }
+      };
     });
   },
   interpretResponse: function(serverResponse, bidRequest) {
diff --git a/modules/e_volutionBidAdapter.js b/modules/e_volutionBidAdapter.js
index 8e829a39a57..5f1b46ff9eb 100644
--- a/modules/e_volutionBidAdapter.js
+++ b/modules/e_volutionBidAdapter.js
@@ -72,7 +72,7 @@ export const spec = {
     let location;
     // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
     try {
-      location = new URL(bidderRequest.refererInfo.page)
+      location = new URL(bidderRequest.refererInfo.page);
       winTop = window.top;
     } catch (e) {
       location = winTop.location;
@@ -93,7 +93,7 @@ export const spec = {
         request.ccpa = bidderRequest.uspConsent;
       }
       if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent
+        request.gdpr = bidderRequest.gdprConsent;
       }
     }
     const len = validBidRequests.length;
@@ -106,7 +106,7 @@ export const spec = {
         bidId: bid.bidId,
         bidfloor: getBidFloor(bid),
         eids: []
-      }
+      };
 
       if (bid.userId) {
         getUserId(placement.eids, bid.userId.id5id, 'id5-sync.com');
diff --git a/modules/ebdrBidAdapter.js b/modules/ebdrBidAdapter.js
index 62a3b171b74..a7b1991df9b 100644
--- a/modules/ebdrBidAdapter.js
+++ b/modules/ebdrBidAdapter.js
@@ -31,7 +31,7 @@ export const spec = {
           h: whArr[1]
         },
         bidfloor: bidFloor
-      })
+      });
       ebdrReq[bid.bidId] = {mediaTypes: _mediaTypes,
         w: whArr[0],
         h: whArr[1]
diff --git a/modules/emx_digitalBidAdapter.js b/modules/emx_digitalBidAdapter.js
index d904ebda9c8..eb69e76a837 100644
--- a/modules/emx_digitalBidAdapter.js
+++ b/modules/emx_digitalBidAdapter.js
@@ -287,7 +287,7 @@ export const spec = {
     emxData = emxAdapter.getGdpr(bidderRequest, Object.assign({}, emxData));
     emxData = emxAdapter.getSupplyChain(bidderRequest, Object.assign({}, emxData));
     if (bidderRequest && bidderRequest.uspConsent) {
-      emxData.us_privacy = bidderRequest.uspConsent
+      emxData.us_privacy = bidderRequest.uspConsent;
     }
 
     // adding eid support
diff --git a/modules/fabrickIdSystem.js b/modules/fabrickIdSystem.js
index 24eac8517b0..dfc2985b0db 100644
--- a/modules/fabrickIdSystem.js
+++ b/modules/fabrickIdSystem.js
@@ -70,7 +70,7 @@ export const fabrickIdSubmodule = {
           }
         }
         // pull off the trailing &
-        url = url.slice(0, -1)
+        url = url.slice(0, -1);
         const referer = _getRefererInfo(configParams);
         const refs = new Map();
         _setReferrer(refs, referer.topmostLocation);
@@ -174,7 +174,7 @@ export function appendUrl(url, paramName, s, configParams) {
         s = s.substring(0, thisMaxRefLen - 2);
       }
     }
-    return `${url}${s}`
+    return `${url}${s}`;
   } else {
     return url;
   }
diff --git a/modules/gamoshiBidAdapter.js b/modules/gamoshiBidAdapter.js
index 26afe6e6b87..ae320db1251 100644
--- a/modules/gamoshiBidAdapter.js
+++ b/modules/gamoshiBidAdapter.js
@@ -259,7 +259,7 @@ export const spec = {
     let gdpr = gdprApplies ? 1 : 0;
 
     if (gdprApplies && gdprConsent.consentString) {
-      consentString = encodeURIComponent(gdprConsent.consentString)
+      consentString = encodeURIComponent(gdprConsent.consentString);
     }
 
     if (uspConsent) {
diff --git a/modules/getintentBidAdapter.js b/modules/getintentBidAdapter.js
index 98659cc25e2..25322d81f9b 100644
--- a/modules/getintentBidAdapter.js
+++ b/modules/getintentBidAdapter.js
@@ -97,7 +97,7 @@ export const spec = {
     return bids;
   }
 
-}
+};
 
 function buildUrl(bid) {
   return 'https://' + BID_HOST + (bid.is_video ? BID_VIDEO_PATH : BID_BANNER_PATH);
diff --git a/modules/gjirafaBidAdapter.js b/modules/gjirafaBidAdapter.js
index af70c0c67f0..91ed5c9b3fb 100644
--- a/modules/gjirafaBidAdapter.js
+++ b/modules/gjirafaBidAdapter.js
@@ -74,7 +74,7 @@ export const spec = {
       placements: placements,
       contents: contents,
       data: data
-    }
+    };
 
     return [{
       method: 'POST',
@@ -113,7 +113,7 @@ export const spec = {
     }
     return bidResponses;
   }
-}
+};
 
 /**
 * Generate size param for bid request using sizes array
diff --git a/modules/goldbachBidAdapter.js b/modules/goldbachBidAdapter.js
index a6e5c59ced2..21c56643353 100644
--- a/modules/goldbachBidAdapter.js
+++ b/modules/goldbachBidAdapter.js
@@ -207,7 +207,7 @@ export const spec = {
       payload['iab_support'] = {
         omidpn: 'Appnexus',
         omidpv: '$prebid.version$'
-      }
+      };
     }
 
     if (member > 0) {
@@ -215,7 +215,7 @@ export const spec = {
     }
 
     if (appDeviceObjBid) {
-      payload.device = appDeviceObj
+      payload.device = appDeviceObj;
     }
     if (appIdObjBid) {
       payload.app = appIdObj;
@@ -246,7 +246,7 @@ export const spec = {
     }
 
     if (bidderRequest && bidderRequest.uspConsent) {
-      payload.us_privacy = bidderRequest.uspConsent
+      payload.us_privacy = bidderRequest.uspConsent;
     }
 
     if (bidderRequest && bidderRequest.refererInfo) {
@@ -256,7 +256,7 @@ export const spec = {
         rd_top: bidderRequest.refererInfo.reachedTop,
         rd_ifs: bidderRequest.refererInfo.numIframes,
         rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
-      }
+      };
       payload.referrer_detection = refererinfo;
     }
 
@@ -441,7 +441,7 @@ export const spec = {
       reloadViewabilityScriptWithCorrectParameters(bid);
     }
   }
-}
+};
 
 function isPopulatedArray(arr) {
   return !!(isArray(arr) && arr.length > 0);
@@ -459,7 +459,7 @@ function reloadViewabilityScriptWithCorrectParameters(bid) {
   if (viewJsPayload) {
     let prebidParams = 'pbjs_adid=' + bid.adId + ';pbjs_auc=' + bid.adUnitCode;
 
-    let jsTrackerSrc = getViewabilityScriptUrlFromPayload(viewJsPayload)
+    let jsTrackerSrc = getViewabilityScriptUrlFromPayload(viewJsPayload);
 
     let newJsTrackerSrc = jsTrackerSrc.replace('dom_id=%native_dom_id%', prebidParams);
 
@@ -553,7 +553,7 @@ function formatRequest(payload, bidderRequest) {
   if (getParameterByName('apn_test').toUpperCase() === 'TRUE' || config.getConfig('apn_test') === true) {
     options.customHeaders = {
       'X-Is-Test': 1
-    }
+    };
   }
 
   if (payload.tags.length > MAX_IMPS_PER_REQUEST) {
@@ -766,7 +766,7 @@ function bidToTag(bid) {
     tag.code = bid.params.invCode;
   }
   tag.allow_smaller_sizes = bid.params.allowSmallerSizes || false;
-  tag.use_pmt_rule = bid.params.usePaymentRule || false
+  tag.use_pmt_rule = bid.params.usePaymentRule || false;
   tag.prebid = true;
   tag.disable_psa = true;
   let bidFloor = getBidFloor(bid);
diff --git a/modules/gothamadsBidAdapter.js b/modules/gothamadsBidAdapter.js
index 37433e547a9..6b549f347bb 100644
--- a/modules/gothamadsBidAdapter.js
+++ b/modules/gothamadsBidAdapter.js
@@ -139,7 +139,7 @@ export const spec = {
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
   interpretResponse: (serverResponse) => {
-    if (!serverResponse || !serverResponse.body) return []
+    if (!serverResponse || !serverResponse.body) return [];
     let GothamAdsResponse = serverResponse.body;
 
     let bids = [];
@@ -273,7 +273,7 @@ const addNativeParameters = bidRequest => {
         hmin = sizes[1];
       }
 
-      asset[props.name] = {}
+      asset[props.name] = {};
 
       if (bidParams.len) asset[props.name]['len'] = bidParams.len;
       if (props.type) asset[props.name]['type'] = props.type;
diff --git a/modules/gumgumBidAdapter.js b/modules/gumgumBidAdapter.js
index b77f82030e1..fe15602c0c0 100644
--- a/modules/gumgumBidAdapter.js
+++ b/modules/gumgumBidAdapter.js
@@ -321,7 +321,7 @@ function buildRequests(validBidRequests, bidderRequest) {
     data.to = to;
 
     // ADTS-169 add adUnitCode to requests
-    if (adUnitCode) data.aun = adUnitCode
+    if (adUnitCode) data.aun = adUnitCode;
 
     // ADTS-134 Retrieve ID envelopes
     for (const eid in eids) data[eid] = eids[eid];
@@ -374,7 +374,7 @@ function buildRequests(validBidRequests, bidderRequest) {
         data.pi = 8;
       }
     } else { // legacy params
-      data = { ...data, ...handleLegacyParams(params, sizes) }
+      data = { ...data, ...handleLegacyParams(params, sizes) };
     }
 
     if (gdprConsent) {
@@ -400,7 +400,7 @@ function buildRequests(validBidRequests, bidderRequest) {
       url: BID_ENDPOINT,
       method: 'GET',
       data: Object.assign(data, _getBrowserParams(topWindowUrl), _getDigiTrustQueryParams(userId))
-    })
+    });
   });
   return bids;
 }
diff --git a/modules/h12mediaBidAdapter.js b/modules/h12mediaBidAdapter.js
index 29d8bfa5e0f..c58f15c9a81 100644
--- a/modules/h12mediaBidAdapter.js
+++ b/modules/h12mediaBidAdapter.js
@@ -198,7 +198,7 @@ function getIsHidden(elem) {
     } catch (o) {
       return false;
     }
-  } while ((m < 250) && (lastElem != null) && (elemHidden === false))
+  } while ((m < 250) && (lastElem != null) && (elemHidden === false));
   return elemHidden;
 }
 
diff --git a/modules/id5AnalyticsAdapter.js b/modules/id5AnalyticsAdapter.js
index 5ae04eb57ce..d35cdf29fca 100644
--- a/modules/id5AnalyticsAdapter.js
+++ b/modules/id5AnalyticsAdapter.js
@@ -141,7 +141,7 @@ const ENABLE_FUNCTION = (config) => {
     logInfo('id5Analytics: Tracking events', _this.eventsToTrack);
     if (sampling > 0 && _this.random() < (1 / sampling)) {
       // Init the module only if we got lucky
-      logInfo('id5Analytics: Selected by sampling. Starting up!')
+      logInfo('id5Analytics: Selected by sampling. Starting up!');
 
       // Clean start
       _this.eventBuffer = {};
diff --git a/modules/impactifyBidAdapter.js b/modules/impactifyBidAdapter.js
index bb3ad63085c..0717cf43741 100644
--- a/modules/impactifyBidAdapter.js
+++ b/modules/impactifyBidAdapter.js
@@ -25,7 +25,7 @@ const getDeviceType = () => {
     return 4;
   }
   return 2;
-}
+};
 
 const createOpenRtbRequest = (validBidRequests, bidderRequest) => {
   // Create request and set imp bids inside
diff --git a/modules/inskinBidAdapter.js b/modules/inskinBidAdapter.js
index b76a759a047..f3464765bde 100644
--- a/modules/inskinBidAdapter.js
+++ b/modules/inskinBidAdapter.js
@@ -184,7 +184,7 @@ export const spec = {
           bid.currency = 'USD';
           bid.creativeId = decision.adId;
           bid.ttl = 360;
-          bid.meta = { advertiserDomains: decision.adomain ? decision.adomain : [] }
+          bid.meta = { advertiserDomains: decision.adomain ? decision.adomain : [] };
           bid.netRevenue = true;
 
           bidResponses.push(bid);
diff --git a/modules/integr8BidAdapter.js b/modules/integr8BidAdapter.js
index 3ba68ffb6d6..a85e9b0a55c 100644
--- a/modules/integr8BidAdapter.js
+++ b/modules/integr8BidAdapter.js
@@ -78,7 +78,7 @@ export const spec = {
       placements: placements,
       contents: contents,
       data: data
-    }
+    };
 
     return [{
       method: 'POST',
@@ -117,7 +117,7 @@ export const spec = {
     }
     return bidResponses;
   }
-}
+};
 
 /**
 * Generate size param for bid request using sizes array
diff --git a/modules/intentIqIdSystem.js b/modules/intentIqIdSystem.js
index 1347fa04bd5..563435dee65 100644
--- a/modules/intentIqIdSystem.js
+++ b/modules/intentIqIdSystem.js
@@ -118,7 +118,7 @@ export const intentIqIdSubmodule = {
       logError('User ID - intentIqId submodule requires a valid partner to be defined');
       return;
     }
-    if (!FIRST_PARTY_DATA_KEY.includes(configParams.partner)) { FIRST_PARTY_DATA_KEY += '_' + configParams.partner }
+    if (!FIRST_PARTY_DATA_KEY.includes(configParams.partner)) { FIRST_PARTY_DATA_KEY += '_' + configParams.partner; }
     let rrttStrtTime = 0;
 
     // Read Intent IQ 1st party id or generate it if none exists
@@ -169,7 +169,7 @@ export const intentIqIdSubmodule = {
               shouldUpdateLs = true;
             }
             if (shouldUpdateLs === true) {
-              partnerData.date = Date.now()
+              partnerData.date = Date.now();
               storeData(FIRST_PARTY_KEY, JSON.stringify(firstPartyData));
               storeData(FIRST_PARTY_DATA_KEY, JSON.stringify(partnerData));
             }
diff --git a/modules/interactiveOffersBidAdapter.js b/modules/interactiveOffersBidAdapter.js
index 25dcd4f3cd1..1fad231dff2 100644
--- a/modules/interactiveOffersBidAdapter.js
+++ b/modules/interactiveOffersBidAdapter.js
@@ -169,7 +169,7 @@ function parseResponseOpenRTBToPrebidjs(openRTBResponse) {
               mediaType: 'banner',
               primaryCatId: bid.cat[0] || '',
               secondaryCatIds: bid.cat
-            }
+            };
             prebidResponse.push(prebid);
           });
         }
diff --git a/modules/iqmBidAdapter.js b/modules/iqmBidAdapter.js
index 68b027c1bec..1c36bafd3ce 100644
--- a/modules/iqmBidAdapter.js
+++ b/modules/iqmBidAdapter.js
@@ -245,7 +245,7 @@ function getSite(bidderRequest) {
 function _buildVideoORTB(bidRequest) {
   const videoAdUnit = deepAccess(bidRequest, 'mediaTypes.video');
   const videoBidderParams = deepAccess(bidRequest, 'params.video', {});
-  const video = {}
+  const video = {};
 
   const videoParams = {
     ...videoAdUnit,
diff --git a/modules/krushmediaBidAdapter.js b/modules/krushmediaBidAdapter.js
index 6c7b75bbce2..876f0ebabc6 100644
--- a/modules/krushmediaBidAdapter.js
+++ b/modules/krushmediaBidAdapter.js
@@ -57,7 +57,7 @@ export const spec = {
     let location;
     // TODO: this odd try-catch block was copied in several adapters; it doesn't seem to be correct for cross-origin
     try {
-      location = new URL(bidderRequest.refererInfo.page)
+      location = new URL(bidderRequest.refererInfo.page);
       winTop = window.top;
     } catch (e) {
       location = winTop.location;
@@ -80,7 +80,7 @@ export const spec = {
         request.ccpa = bidderRequest.uspConsent;
       }
       if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent
+        request.gdpr = bidderRequest.gdprConsent;
       }
     }
 
diff --git a/modules/livewrappedAnalyticsAdapter.js b/modules/livewrappedAnalyticsAdapter.js
index 2721031948d..fe69220e123 100644
--- a/modules/livewrappedAnalyticsAdapter.js
+++ b/modules/livewrappedAnalyticsAdapter.js
@@ -67,10 +67,10 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
             auc: bidRequest.auc,
             buc: bidRequest.buc,
             lw: bidRequest.lw
-          }
+          };
 
           logInfo(bidRequest);
-        })
+        });
         logInfo(livewrappedAnalyticsAdapter.requestEvents);
         break;
       case CONSTANTS.EVENTS.BID_RESPONSE:
@@ -183,7 +183,7 @@ livewrappedAnalyticsAdapter.sendEvents = function() {
   }
 
   ajax(initOptions.endpoint || URL, undefined, JSON.stringify(events), {method: 'POST'});
-}
+};
 
 function getAdblockerRecovered() {
   try {
diff --git a/modules/lkqdBidAdapter.js b/modules/lkqdBidAdapter.js
index 6d2766ff2f1..1dbe89f5a49 100644
--- a/modules/lkqdBidAdapter.js
+++ b/modules/lkqdBidAdapter.js
@@ -38,7 +38,7 @@ export const spec = {
     const UA = navigator.userAgent;
     const USP = BIDDER_REQUEST.uspConsent || null;
     // TODO: does the fallback make sense here?
-    const REFERER = BIDDER_REQUEST?.refererInfo?.domain || window.location.host
+    const REFERER = BIDDER_REQUEST?.refererInfo?.domain || window.location.host;
     const BIDDER_GDPR = BIDDER_REQUEST.gdprConsent && BIDDER_REQUEST.gdprConsent.gdprApplies ? 1 : null;
     const BIDDER_GDPRS = BIDDER_REQUEST.gdprConsent && BIDDER_REQUEST.gdprConsent.consentString ? BIDDER_REQUEST.gdprConsent.consentString : null;
 
@@ -74,7 +74,7 @@ export const spec = {
             us_privacy: USP
           }
         }
-      }
+      };
 
       if (isSet(DNT)) {
         requestData.device.dnt = DNT;
@@ -94,7 +94,7 @@ export const spec = {
           id: bid.params.aid,
           name: bid.params.appname,
           bundle: bid.params.bundleid
-        }
+        };
 
         if (bid.params.contentId) {
           requestData.app.content = {
diff --git a/modules/loganBidAdapter.js b/modules/loganBidAdapter.js
index ec5006b7c8c..7aa82e3046c 100644
--- a/modules/loganBidAdapter.js
+++ b/modules/loganBidAdapter.js
@@ -72,7 +72,7 @@ export const spec = {
         request.ccpa = bidderRequest.uspConsent;
       }
       if (bidderRequest.gdprConsent) {
-        request.gdpr = bidderRequest.gdprConsent
+        request.gdpr = bidderRequest.gdprConsent;
       }
     }
 
@@ -85,7 +85,7 @@ export const spec = {
         schain: bid.schain || {},
         bidfloor: getBidFloor(bid)
       };
-      const mediaType = bid.mediaTypes
+      const mediaType = bid.mediaTypes;
 
       if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
         placement.sizes = mediaType[BANNER].sizes;
diff --git a/modules/luponmediaBidAdapter.js b/modules/luponmediaBidAdapter.js
index 31e2120d364..835c04ba074 100755
--- a/modules/luponmediaBidAdapter.js
+++ b/modules/luponmediaBidAdapter.js
@@ -176,7 +176,7 @@ export const spec = {
       responses.forEach(csResp => {
         if (csResp.body && csResp.body.ext && csResp.body.ext.usersyncs) {
           try {
-            let response = csResp.body.ext.usersyncs
+            let response = csResp.body.ext.usersyncs;
             let bidders = response.bidder_status;
             for (let synci in bidders) {
               let thisSync = bidders[synci];
@@ -314,7 +314,7 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
     },
     user: {
     }
-  }
+  };
 
   let bidFloor;
   if (isFn(bidRequest.getFloor) && !config.getConfig('disableFloors')) {
@@ -566,7 +566,7 @@ function parseSizes(bid, mediaType) {
   } else if (typeof deepAccess(bid, 'mediaTypes.banner.sizes') !== 'undefined') {
     sizes = mapSizes(bid.mediaTypes.banner.sizes);
   } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
-    sizes = mapSizes(bid.sizes)
+    sizes = mapSizes(bid.sizes);
   } else {
     logWarn('LuponMedia: no sizes are setup or found');
   }
diff --git a/modules/malltvBidAdapter.js b/modules/malltvBidAdapter.js
index 6466aa4feed..cee8e888986 100644
--- a/modules/malltvBidAdapter.js
+++ b/modules/malltvBidAdapter.js
@@ -81,7 +81,7 @@ export const spec = {
       data: data,
       gdpr_applies: gdrpApplies,
       gdpr_consent: gdprConsent,
-    }
+    };
 
     return [{
       method: 'POST',
@@ -120,7 +120,7 @@ export const spec = {
     }
     return bidResponses;
   }
-}
+};
 
 /**
 * Generate size param for bid request using sizes array
diff --git a/modules/mediakeysBidAdapter.js b/modules/mediakeysBidAdapter.js
index cc8ffc6d29e..8c2b2c32e1c 100644
--- a/modules/mediakeysBidAdapter.js
+++ b/modules/mediakeysBidAdapter.js
@@ -420,7 +420,7 @@ function createVideoImp(bid) {
     }
   });
 
-  return video
+  return video;
 }
 
 /**
@@ -703,7 +703,7 @@ export const spec = {
               agencyName: deepAccess(bid, 'ext.agency_name', null),
               primaryCatId: getPrimaryCatFromResponse(bid.cat),
               mediaType
-            }
+            };
 
             const newBid = {
               requestId: bid.impid,
diff --git a/modules/mgidBidAdapter.js b/modules/mgidBidAdapter.js
index 56cf1e9645e..2653f157196 100644
--- a/modules/mgidBidAdapter.js
+++ b/modules/mgidBidAdapter.js
@@ -88,7 +88,7 @@ export const spec = {
           let v = nativeParams[k];
           const supportProp = spec.NATIVE_ASSET_KEY_TO_ASSET_MAP.hasOwnProperty(k);
           if (supportProp) {
-            assetsCount++
+            assetsCount++;
           }
           if (!isPlainObject(v) || (!supportProp && deepAccess(v, 'required'))) {
             nativeOk = false;
@@ -152,7 +152,7 @@ export const spec = {
         impObj.bidfloor = floorData.floor;
       }
       if (floorData.cur) {
-        impObj.bidfloorcur = floorData.cur
+        impObj.bidfloorcur = floorData.cur;
       }
       for (let mediaTypes in bid.mediaTypes) {
         switch (mediaTypes) {
diff --git a/modules/nobidBidAdapter.js b/modules/nobidBidAdapter.js
index 877afb08293..20878b545e4 100644
--- a/modules/nobidBidAdapter.js
+++ b/modules/nobidBidAdapter.js
@@ -147,7 +147,7 @@ function nobidBuildRequests(bids, bidderRequest) {
     if (eids && eids.length > 0) state['eids'] = eids;
     if (bidderRequest && bidderRequest.ortb2) state['ortb2'] = bidderRequest.ortb2;
     return state;
-  }
+  };
   function newAdunit(adunitObject, adunits) {
     var getAdUnit = function(divid, adunits) {
       for (var i = 0; i < adunits.length; i++) {
@@ -438,7 +438,7 @@ export const spec = {
             type: 'image',
             url: element
           });
-        })
+        });
       }
       return syncs;
     } else {
diff --git a/modules/novatiqIdSystem.js b/modules/novatiqIdSystem.js
index 661a14ca0ef..7bd1ee8acd9 100644
--- a/modules/novatiqIdSystem.js
+++ b/modules/novatiqIdSystem.js
@@ -245,7 +245,7 @@ export const novatiqIdSubmodule = {
     } else {
       srcId = configParams.sourceid;
     }
-    return srcId
+    return srcId;
   }
 };
 submodule('userId', novatiqIdSubmodule);
diff --git a/modules/open8BidAdapter.js b/modules/open8BidAdapter.js
index 7fa97235525..5fa1dd0a143 100644
--- a/modules/open8BidAdapter.js
+++ b/modules/open8BidAdapter.js
@@ -68,7 +68,7 @@ export const spec = {
       meta: {
         advertiserDomains: ad.adomain || []
       }
-    }
+    };
 
     if (ad.adType === AD_TYPE.VIDEO) {
       const videoAd = bidderResponse.ad.video;
diff --git a/modules/openwebBidAdapter.js b/modules/openwebBidAdapter.js
index f07b37e16e1..296bfc682f1 100644
--- a/modules/openwebBidAdapter.js
+++ b/modules/openwebBidAdapter.js
@@ -149,7 +149,7 @@ function bidToTag(bidRequests, adapterRequest) {
     tag.UserEids = deepAccess(bidRequests[0], 'userIdAsEids');
   }
   // end publisher env
-  const bids = []
+  const bids = [];
 
   for (let i = 0, length = bidRequests.length; i < length; i++) {
     const bid = prepareBidRequests(bidRequests[i]);
diff --git a/modules/openxBidAdapter.js b/modules/openxBidAdapter.js
index 251e6fb50e3..14525cd0cfc 100644
--- a/modules/openxBidAdapter.js
+++ b/modules/openxBidAdapter.js
@@ -353,7 +353,7 @@ function appendUserIdsToQueryParams(queryParams, userIds) {
         case 'lipb':
           queryParams[key] = userIdObjectOrValue.lipbid;
           if (Array.isArray(userIdObjectOrValue.segments) && userIdObjectOrValue.segments.length > 0) {
-            const liveIntentSegments = 'liveintent:' + userIdObjectOrValue.segments.join('|')
+            const liveIntentSegments = 'liveintent:' + userIdObjectOrValue.segments.join('|');
             queryParams.sm = `${queryParams.sm ? queryParams.sm + ',' : ''}${liveIntentSegments}`;
           }
           break;
@@ -502,7 +502,7 @@ function generateVideoParameters(bid, bidderRequest) {
         video: openRtbParams
       }
     ]
-  }
+  };
 
   queryParams['openrtb'] = JSON.stringify(openRtbReq);
 
@@ -525,7 +525,7 @@ function generateVideoParameters(bid, bidderRequest) {
 
   let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
   if (gpid) {
-    queryParams.aucs = encodeURIComponent(gpid)
+    queryParams.aucs = encodeURIComponent(gpid);
   }
 
   // each video bid makes a separate request
diff --git a/modules/pixfutureBidAdapter.js b/modules/pixfutureBidAdapter.js
index bffd5badded..4c4935e93a4 100644
--- a/modules/pixfutureBidAdapter.js
+++ b/modules/pixfutureBidAdapter.js
@@ -211,7 +211,7 @@ function bidToTag(bid) {
     tag.code = bid.params.invCode;
   }
   tag.allow_smaller_sizes = bid.params.allowSmallerSizes || false;
-  tag.use_pmt_rule = bid.params.usePaymentRule || false
+  tag.use_pmt_rule = bid.params.usePaymentRule || false;
   tag.prebid = true;
   tag.disable_psa = true;
   let bidFloor = getBidFloor(bid);
diff --git a/modules/prebidmanagerAnalyticsAdapter.js b/modules/prebidmanagerAnalyticsAdapter.js
index 708d2b79243..1180a74db30 100644
--- a/modules/prebidmanagerAnalyticsAdapter.js
+++ b/modules/prebidmanagerAnalyticsAdapter.js
@@ -9,7 +9,7 @@ import CONSTANTS from '../src/constants.json';
  * prebidmanagerAnalyticsAdapter.js - analytics adapter for prebidmanager
  */
 export const storage = getStorageManager({gvlid: undefined, moduleName: 'prebidmanager'});
-const DEFAULT_EVENT_URL = 'https://endpoint.prebidmanager.com/endpoint'
+const DEFAULT_EVENT_URL = 'https://endpoint.prebidmanager.com/endpoint';
 const analyticsType = 'endpoint';
 const analyticsName = 'Prebid Manager Analytics: ';
 
diff --git a/modules/priceFloors.js b/modules/priceFloors.js
index 900276e6b4e..c972e024780 100644
--- a/modules/priceFloors.js
+++ b/modules/priceFloors.js
@@ -700,7 +700,7 @@ export function addBidResponseHook(fn, adUnitCode, bid) {
     return fn.call(this, adUnitCode, bid);
   }
 
-  const matchingBidRequest = auctionManager.index.getBidRequest(bid)
+  const matchingBidRequest = auctionManager.index.getBidRequest(bid);
 
   // get the matching rule
   let floorInfo = getFirstMatchingFloor(floorData.data, matchingBidRequest, {...bid, size: [bid.width, bid.height]});
diff --git a/modules/pubwiseAnalyticsAdapter.js b/modules/pubwiseAnalyticsAdapter.js
index 7976bcef58d..19a74c7c245 100644
--- a/modules/pubwiseAnalyticsAdapter.js
+++ b/modules/pubwiseAnalyticsAdapter.js
@@ -295,7 +295,7 @@ pubwiseAnalytics.handleEvent = function(eventType, data) {
   if (eventType === CONSTANTS.EVENTS.AUCTION_END || eventType === CONSTANTS.EVENTS.BID_WON) {
     flushEvents();
   }
-}
+};
 
 pubwiseAnalytics.storeSessionID = function (userSessID) {
   storage.setDataInLocalStorage(localStorageSessName(), userSessID);
diff --git a/modules/pubwiseBidAdapter.js b/modules/pubwiseBidAdapter.js
index 1c015a24536..7721fe10459 100644
--- a/modules/pubwiseBidAdapter.js
+++ b/modules/pubwiseBidAdapter.js
@@ -161,7 +161,7 @@ export const spec = {
     }
 
     if (bid.params.isTest) {
-      payload.test = Number(bid.params.isTest) // should be 1 or 0
+      payload.test = Number(bid.params.isTest); // should be 1 or 0
     }
     payload.site.publisher.id = bid.params.siteId.trim();
     payload.user.gender = (conf.gender ? conf.gender.trim() : UNDEFINED);
@@ -207,7 +207,7 @@ export const spec = {
       deepSetValue(payload, 'regs.coppa', 1);
     }
 
-    var options = {contentType: 'text/plain'}
+    var options = {contentType: 'text/plain'};
 
     _logInfo('buildRequests payload', payload);
     _logInfo('buildRequests bidderRequest', bidderRequest);
@@ -463,7 +463,7 @@ function _createImpressionObject(bid, conf) {
       }
     }
   } else {
-    _logWarn('MediaTypes are Required for all Adunit Configs', bid)
+    _logWarn('MediaTypes are Required for all Adunit Configs', bid);
   }
 
   _addFloorFromFloorModule(impObj, bid);
diff --git a/modules/pubxBidAdapter.js b/modules/pubxBidAdapter.js
index 18d2bb11404..17c4ba3848e 100644
--- a/modules/pubxBidAdapter.js
+++ b/modules/pubxBidAdapter.js
@@ -76,7 +76,7 @@ export const spec = {
       } else {
         kwString = kwContents;
       }
-      kwEnc = encodeURIComponent(kwString)
+      kwEnc = encodeURIComponent(kwString);
     } else { }
     if (titleContent) {
       if (titleContent.length > 30) {
diff --git a/modules/pubxaiAnalyticsAdapter.js b/modules/pubxaiAnalyticsAdapter.js
index bd92162b8cb..f7e73dd5fdd 100644
--- a/modules/pubxaiAnalyticsAdapter.js
+++ b/modules/pubxaiAnalyticsAdapter.js
@@ -140,7 +140,7 @@ export function getOS() {
 // add sampling rate
 pubxaiAnalyticsAdapter.shouldFireEventRequest = function (samplingRate = 1) {
   return (Math.floor((Math.random() * samplingRate + 1)) === parseInt(samplingRate));
-}
+};
 
 function send(data, status) {
   if (pubxaiAnalyticsAdapter.shouldFireEventRequest(initOptions.samplingRate)) {
@@ -158,7 +158,7 @@ function send(data, status) {
       data.initOptions.auctionId = data.auctionInit.auctionId;
       delete data.auctionInit;
 
-      data.pmcDetail = {}
+      data.pmcDetail = {};
       Object.assign(data.pmcDetail, {
         bidDensity: storage ? storage.getItem('pbx:dpbid') : null,
         maxBid: storage ? storage.getItem('pbx:mxbid') : null,
diff --git a/modules/quantcastIdSystem.js b/modules/quantcastIdSystem.js
index b803096cd31..97cd01f98da 100644
--- a/modules/quantcastIdSystem.js
+++ b/modules/quantcastIdSystem.js
@@ -211,7 +211,7 @@ export const quantcastIdSubmodule = {
       });
     }
 
-    return { id: fpa ? { quantcastId: fpa } : undefined }
+    return { id: fpa ? { quantcastId: fpa } : undefined };
   }
 };
 
diff --git a/modules/radsBidAdapter.js b/modules/radsBidAdapter.js
index 938fd566159..fcb8c3a8c2a 100644
--- a/modules/radsBidAdapter.js
+++ b/modules/radsBidAdapter.js
@@ -65,7 +65,7 @@ export const spec = {
         method: 'GET',
         url: endpoint,
         data: objectToQueryString(payload),
-      }
+      };
     });
   },
   interpretResponse: function(serverResponse, bidRequest) {
diff --git a/modules/revcontentBidAdapter.js b/modules/revcontentBidAdapter.js
index c7c82cd323e..5e33a9a0fd7 100644
--- a/modules/revcontentBidAdapter.js
+++ b/modules/revcontentBidAdapter.js
@@ -232,7 +232,7 @@ function buildImp(bid, id) {
       w: sizes[0][0],
       h: sizes[0][1],
       format: sizes.map(wh => parseGPTSingleSizeArrayToRtbSize(wh)),
-    }
+    };
   } else if (nativeReq) {
     const assets = _map(bid.nativeParams, (bidParams, key) => {
       const props = NATIVE_PARAMS[key];
diff --git a/modules/richaudienceBidAdapter.js b/modules/richaudienceBidAdapter.js
index 564b67641a2..1faed74d84e 100755
--- a/modules/richaudienceBidAdapter.js
+++ b/modules/richaudienceBidAdapter.js
@@ -132,7 +132,7 @@ export const spec = {
 
       bidResponses.push(bidResponse);
     }
-    return bidResponses
+    return bidResponses;
   },
   /***
    * User Syncs
diff --git a/modules/rtbhouseBidAdapter.js b/modules/rtbhouseBidAdapter.js
index 1ae73e192b8..961f0fcacae 100644
--- a/modules/rtbhouseBidAdapter.js
+++ b/modules/rtbhouseBidAdapter.js
@@ -68,7 +68,7 @@ export const spec = {
       if (schain) {
         request.ext = {
           schain: schain,
-        }
+        };
       }
     }
 
diff --git a/modules/schain.js b/modules/schain.js
index d409e74df48..ef1c6da78ce 100644
--- a/modules/schain.js
+++ b/modules/schain.js
@@ -19,7 +19,7 @@ _each(MODE, mode => MODES.push(mode));
 
 // validate the supply chain object
 export function isSchainObjectValid(schainObject, returnOnError) {
-  let failPrefix = 'Detected something wrong within an schain config:'
+  let failPrefix = 'Detected something wrong within an schain config:';
   let failMsg = '';
 
   function appendFailMsg(msg) {
diff --git a/modules/showheroes-bsBidAdapter.js b/modules/showheroes-bsBidAdapter.js
index 98451ebbb2f..f9ce3a450cf 100644
--- a/modules/showheroes-bsBidAdapter.js
+++ b/modules/showheroes-bsBidAdapter.js
@@ -314,7 +314,7 @@ function outstreamRender(bid) {
         logError('[ShowHeroes][renderer] Error: spot not found');
       }
     } catch (err) {
-      logError('[ShowHeroes][renderer] Error:' + err.message)
+      logError('[ShowHeroes][renderer] Error:' + err.message);
     }
   }
 }
diff --git a/modules/sizeMappingV2.js b/modules/sizeMappingV2.js
index 4a1518ab72e..05475b3e143 100644
--- a/modules/sizeMappingV2.js
+++ b/modules/sizeMappingV2.js
@@ -98,7 +98,7 @@ export function checkAdUnitSetupHook(adUnits) {
         */
         if (!isArrayOfNums(config.minViewPort, 2)) {
           logError(`Ad unit ${adUnitCode}: Invalid declaration of 'minViewPort' in 'mediaTypes.${mediaType}.sizeConfig[${index}]'. ${conditionalLogMessages[mediaType]}`);
-          isValid = false
+          isValid = false;
           return;
         }
         /*
diff --git a/modules/smaatoBidAdapter.js b/modules/smaatoBidAdapter.js
index a24f296102f..c783f35d915 100644
--- a/modules/smaatoBidAdapter.js
+++ b/modules/smaatoBidAdapter.js
@@ -63,7 +63,7 @@ const buildOpenRtbBidRequest = (bidRequest, bidderRequest) => {
   if (deepAccess(bidRequest, 'params.app')) {
     const geo = deepAccess(bidRequest, 'params.app.geo');
     deepSetValue(requestTemplate, 'device.geo', geo);
-    const ifa = deepAccess(bidRequest, 'params.app.ifa')
+    const ifa = deepAccess(bidRequest, 'params.app.ifa');
     deepSetValue(requestTemplate, 'device.ifa', ifa);
   }
 
@@ -210,7 +210,7 @@ export const spec = {
           }
         };
 
-        const videoContext = deepAccess(JSON.parse(bidRequest.data).imp[0], 'video.ext.context')
+        const videoContext = deepAccess(JSON.parse(bidRequest.data).imp[0], 'video.ext.context');
         if (videoContext === ADPOD) {
           resultingBid.vastXml = bid.adm;
           resultingBid.mediaType = VIDEO;
diff --git a/modules/sonobiAnalyticsAdapter.js b/modules/sonobiAnalyticsAdapter.js
index 75d481aba9e..0057944b201 100644
--- a/modules/sonobiAnalyticsAdapter.js
+++ b/modules/sonobiAnalyticsAdapter.js
@@ -255,7 +255,7 @@ sonobiAdapter.sendData = function (auction, data) {
       contentType: 'text/plain'
     }
   );
-}
+};
 
 function _logInfo(message, meta) {
   logInfo(buildLogMessage(message), meta);
diff --git a/modules/sonobiBidAdapter.js b/modules/sonobiBidAdapter.js
index 5309dbdad5a..c6100ac8b40 100644
--- a/modules/sonobiBidAdapter.js
+++ b/modules/sonobiBidAdapter.js
@@ -129,7 +129,7 @@ export const spec = {
     }
 
     if (validBidRequests[0].schain) {
-      payload.schain = JSON.stringify(validBidRequests[0].schain)
+      payload.schain = JSON.stringify(validBidRequests[0].schain);
     }
     if (deepAccess(validBidRequests[0], 'userId') && Object.keys(validBidRequests[0].userId).length > 0) {
       const userIds = deepClone(validBidRequests[0].userId);
@@ -217,7 +217,7 @@ export const spec = {
         ] = bid.sbi_size.split('x');
         let aDomains = [];
         if (bid.sbi_adomain) {
-          aDomains = [bid.sbi_adomain]
+          aDomains = [bid.sbi_adomain];
         }
         const bids = {
           requestId: bidId,
@@ -255,7 +255,7 @@ export const spec = {
           ));
           let videoSize = deepAccess(bidRequest, 'params.sizes');
           if (Array.isArray(videoSize) && Array.isArray(videoSize[0])) { // handle case of multiple sizes
-            videoSize = videoSize[0] // Only take the first size for outstream
+            videoSize = videoSize[0]; // Only take the first size for outstream
           }
           if (videoSize) {
             bids.width = videoSize[0];
diff --git a/modules/staqAnalyticsAdapter.js b/modules/staqAnalyticsAdapter.js
index 69d23a3a604..13996adfb7e 100644
--- a/modules/staqAnalyticsAdapter.js
+++ b/modules/staqAnalyticsAdapter.js
@@ -21,7 +21,7 @@ const STAQ_EVENTS = {
   BID_WON: 'bidWon',
   AUCTION_END: 'auctionEnd',
   TIMEOUT: 'adapterTimedOut'
-}
+};
 
 function buildRequestTemplate(connId) {
   // TODO: what should these pick from refererInfo?
diff --git a/modules/tappxBidAdapter.js b/modules/tappxBidAdapter.js
index b8f7a5559f8..3cd77e7b853 100644
--- a/modules/tappxBidAdapter.js
+++ b/modules/tappxBidAdapter.js
@@ -295,9 +295,9 @@ function buildOneRequest(validBidRequests, bidderRequest) {
     if (
       ((bannerMediaType.sizes[0].indexOf(480) >= 0) && (bannerMediaType.sizes[0].indexOf(320) >= 0)) ||
       ((bannerMediaType.sizes[0].indexOf(768) >= 0) && (bannerMediaType.sizes[0].indexOf(1024) >= 0))) {
-      banner.pos = 7
+      banner.pos = 7;
     } else {
-      banner.pos = 4
+      banner.pos = 4;
     }
 
     banner.api = api;
diff --git a/modules/targetVideoBidAdapter.js b/modules/targetVideoBidAdapter.js
index f8cb58218cd..bc775e78647 100644
--- a/modules/targetVideoBidAdapter.js
+++ b/modules/targetVideoBidAdapter.js
@@ -132,7 +132,7 @@ function createVideoTag(bid) {
   tag.ad_types = [VIDEO];
   tag.uuid = bid.bidId;
   tag.allow_smaller_sizes = false;
-  tag.use_pmt_rule = false
+  tag.use_pmt_rule = false;
   tag.prebid = true;
   tag.disable_psa = true;
   tag.hb_source = 1;
diff --git a/modules/theAdxBidAdapter.js b/modules/theAdxBidAdapter.js
index 03c6ea62cb7..3f7823d2fd1 100644
--- a/modules/theAdxBidAdapter.js
+++ b/modules/theAdxBidAdapter.js
@@ -206,7 +206,7 @@ export const spec = {
         let bidWidth = nullify(bid.w);
         let bidHeight = nullify(bid.h);
 
-        let creative = null
+        let creative = null;
         let videoXml = null;
         let mediaType = null;
         let native = null;
@@ -389,7 +389,7 @@ let extractValidSize = (bidRequest, bidderRequest) => {
       requestedSizes = mediaTypes.video.sizes;
     }
   } else if (!isEmpty(bidRequest.sizes)) {
-    requestedSizes = bidRequest.sizes
+    requestedSizes = bidRequest.sizes;
   }
 
   // Ensure the size array is normalized
diff --git a/modules/tpmnBidAdapter.js b/modules/tpmnBidAdapter.js
index 8687ab06f4c..4dcdf1ef529 100644
--- a/modules/tpmnBidAdapter.js
+++ b/modules/tpmnBidAdapter.js
@@ -87,7 +87,7 @@ export const spec = {
       syncArr.push({
         type: 'iframe',
         url: IFRAMESYNC + policyParam
-      })
+      });
     } else {
       syncArr.push({
         type: 'image',
diff --git a/modules/trionBidAdapter.js b/modules/trionBidAdapter.js
index 5750406116b..b6375243a5a 100644
--- a/modules/trionBidAdapter.js
+++ b/modules/trionBidAdapter.js
@@ -53,7 +53,7 @@ export const spec = {
         bid.currency = result.currency;
         bid.netRevenue = result.netRevenue;
         if (result.adomain) {
-          bid.meta = {advertiserDomains: result.adomain}
+          bid.meta = {advertiserDomains: result.adomain};
         }
         bidResponses.push(bid);
       }
@@ -125,7 +125,7 @@ function buildTrionUrlParams(bid, bidderRequest) {
     intT = getStorageData(BASE_KEY + 'int_t');
   }
   if (intT) {
-    setStorageData(BASE_KEY + 'int_t', intT)
+    setStorageData(BASE_KEY + 'int_t', intT);
   }
   setStorageData(BASE_KEY + 'lps', pubId + ':' + sectionId);
   var trionUrl = '';
diff --git a/modules/trustpidSystem.js b/modules/trustpidSystem.js
index fc2bab19913..9d457d645b2 100644
--- a/modules/trustpidSystem.js
+++ b/modules/trustpidSystem.js
@@ -88,7 +88,7 @@ function getTrustpidFromStorage() {
     return {
       trustpid: null,
       acr: null
-    }
+    };
   }
 
   let fcIdConnectObject;
diff --git a/modules/underdogmediaBidAdapter.js b/modules/underdogmediaBidAdapter.js
index 2ca4de7a555..53fe83b1dd0 100644
--- a/modules/underdogmediaBidAdapter.js
+++ b/modules/underdogmediaBidAdapter.js
@@ -98,7 +98,7 @@ export const spec = {
         }
 
         var sizeNotFound = true;
-        const bidParamSizes = bidParam.mediaTypes && bidParam.mediaTypes.banner && bidParam.mediaTypes.banner.sizes ? bidParam.mediaTypes.banner.sizes : bidParam.sizes
+        const bidParamSizes = bidParam.mediaTypes && bidParam.mediaTypes.banner && bidParam.mediaTypes.banner.sizes ? bidParam.mediaTypes.banner.sizes : bidParam.sizes;
         parseSizesInput(bidParamSizes).forEach(size => {
           if (size === mid.width + 'x' + mid.height) {
             sizeNotFound = false;
diff --git a/modules/vdoaiBidAdapter.js b/modules/vdoaiBidAdapter.js
index e149a56f988..a57eae5f328 100644
--- a/modules/vdoaiBidAdapter.js
+++ b/modules/vdoaiBidAdapter.js
@@ -102,7 +102,7 @@ export const spec = {
       if (response.adDomain) {
         bidResponse.meta = {
           advertiserDomains: response.adDomain
-        }
+        };
       }
       bidResponses.push(bidResponse);
     }
diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index 1f84c9f4b16..39d37d55a91 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -97,7 +97,7 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
     }
   }
   if (bidderRequest.uspConsent) {
-    data.usPrivacy = bidderRequest.uspConsent
+    data.usPrivacy = bidderRequest.uspConsent;
   }
 
   const dto = {
diff --git a/modules/vidoomyBidAdapter.js b/modules/vidoomyBidAdapter.js
index ebecb5a46ae..146ea6dd4bd 100644
--- a/modules/vidoomyBidAdapter.js
+++ b/modules/vidoomyBidAdapter.js
@@ -110,7 +110,7 @@ const buildRequests = (validBidRequests, bidderRequest) => {
       method: 'GET',
       url: ENDPOINT,
       data: queryParams
-    }
+    };
   });
   return serverRequests;
 };
diff --git a/modules/winrBidAdapter.js b/modules/winrBidAdapter.js
index 3b86e5b59dc..cd807917944 100644
--- a/modules/winrBidAdapter.js
+++ b/modules/winrBidAdapter.js
@@ -208,7 +208,7 @@ export const spec = {
     }
 
     if (appDeviceObjBid) {
-      payload.device = appDeviceObj
+      payload.device = appDeviceObj;
     }
     if (appIdObjBid) {
       payload.app = appIdObj;
diff --git a/modules/yahoosspBidAdapter.js b/modules/yahoosspBidAdapter.js
index d1b7b08c202..38bb141070c 100644
--- a/modules/yahoosspBidAdapter.js
+++ b/modules/yahoosspBidAdapter.js
@@ -408,7 +408,7 @@ function appendFirstPartyData(outBoundBidRequest, bid) {
         newDataObject = validateAppendObject('object', allowedContentDataObjectKeys, dataObject, newDataObject);
         outBoundBidRequest.site.content.data = [];
         outBoundBidRequest.site.content.data.push(newDataObject);
-      })
+      });
     };
   };
 
@@ -428,7 +428,7 @@ function appendFirstPartyData(outBoundBidRequest, bid) {
           }
         };
         outBoundBidRequest.app.content.data.push(newDataObject);
-      })
+      });
     };
   };
 
diff --git a/modules/yandexBidAdapter.js b/modules/yandexBidAdapter.js
index ae2fb16c8ac..7da2872a3a6 100644
--- a/modules/yandexBidAdapter.js
+++ b/modules/yandexBidAdapter.js
@@ -65,7 +65,7 @@ export const spec = {
           withCredentials,
         },
         bidRequest,
-      }
+      };
     });
   },
 
diff --git a/modules/yieldmoBidAdapter.js b/modules/yieldmoBidAdapter.js
index a0d634e34b4..3149dcb7f5c 100644
--- a/modules/yieldmoBidAdapter.js
+++ b/modules/yieldmoBidAdapter.js
@@ -531,13 +531,13 @@ function validateVideoParams(bid) {
       error += ' when ' + conditionStr;
     }
     throw new Error(error);
-  }
+  };
 
   const paramInvalid = (paramStr, value, expectedStr) => {
     expectedStr = expectedStr ? ', expected: ' + expectedStr : '';
     value = JSON.stringify(value);
     throw new Error(`"${paramStr}"=${value} is invalid${expectedStr}`);
-  }
+  };
 
   const isDefined = val => typeof val !== 'undefined';
   const validate = (fieldPath, validateCb, errorCb, errorCbParam) => {
@@ -563,7 +563,7 @@ function validateVideoParams(bid) {
       }
       return value;
     }
-  }
+  };
 
   try {
     validate('video.context', val => !isEmpty(val), paramRequired);
diff --git a/modules/yieldoneBidAdapter.js b/modules/yieldoneBidAdapter.js
index 98a95b6758e..c07911c9e1f 100644
--- a/modules/yieldoneBidAdapter.js
+++ b/modules/yieldoneBidAdapter.js
@@ -90,7 +90,7 @@ export const spec = {
         method: 'GET',
         url: ENDPOINT_URL,
         data: payload,
-      }
+      };
     });
   },
   interpretResponse: function(serverResponse, bidRequest) {
@@ -212,7 +212,7 @@ function getMediaType(bidRequest, enabledOldFormat = true) {
   }
 
   if (hasBannerType && hasVideoType) {
-    const playerParams = deepAccess(bidRequest, 'params.playerParams')
+    const playerParams = deepAccess(bidRequest, 'params.playerParams');
     if (playerParams) {
       return VIDEO;
     } else {
diff --git a/src/Renderer.js b/src/Renderer.js
index 3375edcd6c3..97e37084e89 100644
--- a/src/Renderer.js
+++ b/src/Renderer.js
@@ -60,7 +60,7 @@ export function Renderer(options) {
       this.cmd.unshift(runRender) // should render run first ?
       loadExternalScript(url, moduleCode, this.callback, this.documentContext);
     }
-  }.bind(this) // bind the function to this object to avoid 'this' errors
+  }.bind(this); // bind the function to this object to avoid 'this' errors
 }
 
 Renderer.install = function({ url, config, id, callback, loaded, adUnitCode, renderNow }) {
diff --git a/src/bidfactory.js b/src/bidfactory.js
index 95d69cf0adb..4c2e4cf3ffb 100644
--- a/src/bidfactory.js
+++ b/src/bidfactory.js
@@ -59,7 +59,7 @@ function Bid(statusCode, {src = 'client', bidder = '', bidId, transactionId, auc
       transactionId: this.transactionId,
       auctionId: this.auctionId
     }
-  }
+  };
 }
 
 // Bid factory function.
diff --git a/src/sizeMapping.js b/src/sizeMapping.js
index 4333608ca95..cfd2861785c 100644
--- a/src/sizeMapping.js
+++ b/src/sizeMapping.js
@@ -111,7 +111,7 @@ export function resolveStatus({labels = [], labelAll = false, activeLabels = []}
     results.filterResults = {
       before: oldSizes,
       after: mediaTypes.banner.sizes
-    }
+    };
   }
 
   return results;
diff --git a/src/targeting.js b/src/targeting.js
index cb10b3f0121..d2b3e9f8470 100644
--- a/src/targeting.js
+++ b/src/targeting.js
@@ -63,7 +63,7 @@ export const getHighestCpmBidsFromBidPool = hook('sync', function(bidsReceived,
   }
 
   return bidsReceived;
-})
+});
 
 /**
 * A descending sort function that will sort the list of objects based on the following two dimensions:
diff --git a/src/userSync.js b/src/userSync.js
index 674114e11f6..dec8f650930 100644
--- a/src/userSync.js
+++ b/src/userSync.js
@@ -311,7 +311,7 @@ export function newUserSync(userSyncDependencies) {
       }
     }
     return true;
-  }
+  };
   return publicApi;
 }
 

From 2bc9f9d4eb7671596b4d04df77d796d64470d056 Mon Sep 17 00:00:00 2001
From: asurovenko-zeta <80847074+asurovenko-zeta@users.noreply.github.com>
Date: Tue, 16 Aug 2022 15:45:11 +0600
Subject: [PATCH 147/569] Zeta ssp adapter: added multiimp request support
 (#8813)

* multiimp ability

* add some test

* fix tests

* fix tests 2

Co-authored-by: Surovenko Alexey <surovenko.alexey@gmail.com>
---
 modules/zeta_global_sspBidAdapter.js          | 45 +++++++-------
 .../modules/zeta_global_sspBidAdapter_spec.js | 59 +++++++++++++++++++
 2 files changed, 83 insertions(+), 21 deletions(-)

diff --git a/modules/zeta_global_sspBidAdapter.js b/modules/zeta_global_sspBidAdapter.js
index d80265b28bb..4689683fbc7 100644
--- a/modules/zeta_global_sspBidAdapter.js
+++ b/modules/zeta_global_sspBidAdapter.js
@@ -69,31 +69,34 @@ export const spec = {
    */
   buildRequests: function (validBidRequests, bidderRequest) {
     const secure = 1; // treat all requests as secure
-    const request = validBidRequests[0];
-    const params = request.params;
-    const impData = {
-      id: request.bidId,
-      secure: secure
-    };
-    if (request.mediaTypes) {
-      for (const mediaType in request.mediaTypes) {
-        switch (mediaType) {
-          case BANNER:
-            impData.banner = buildBanner(request);
-            break;
-          case VIDEO:
-            impData.video = buildVideo(request);
-            break;
+    const params = validBidRequests[0].params;
+    const imps = validBidRequests.map(request => {
+      const impData = {
+        id: request.bidId,
+        secure: secure
+      };
+      if (request.mediaTypes) {
+        for (const mediaType in request.mediaTypes) {
+          switch (mediaType) {
+            case BANNER:
+              impData.banner = buildBanner(request);
+              break;
+            case VIDEO:
+              impData.video = buildVideo(request);
+              break;
+          }
         }
       }
-    }
-    if (!impData.banner && !impData.video) {
-      impData.banner = buildBanner(request);
-    }
+      if (!impData.banner && !impData.video) {
+        impData.banner = buildBanner(request);
+      }
+      return impData;
+    });
+
     let payload = {
       id: bidderRequest.auctionId,
       cur: [DEFAULT_CUR],
-      imp: [impData],
+      imp: imps,
       site: params.site ? params.site : {},
       device: {...(bidderRequest.ortb2?.device || {}), ...params.device},
       user: params.user ? params.user : {},
@@ -126,7 +129,7 @@ export const spec = {
       deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
     }
 
-    provideEids(request, payload);
+    provideEids(validBidRequests[0], payload);
     const url = params.shortname ? ENDPOINT_URL.concat('?shortname=', params.shortname) : ENDPOINT_URL;
     return {
       method: 'POST',
diff --git a/test/spec/modules/zeta_global_sspBidAdapter_spec.js b/test/spec/modules/zeta_global_sspBidAdapter_spec.js
index a70c1c79828..3bd17697f2d 100644
--- a/test/spec/modules/zeta_global_sspBidAdapter_spec.js
+++ b/test/spec/modules/zeta_global_sspBidAdapter_spec.js
@@ -44,6 +44,48 @@ describe('Zeta Ssp Bid Adapter', function () {
     test: 1
   };
 
+  const multiImpRequest = [
+    {
+      bidId: 12345,
+      auctionId: 67890,
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        }
+      },
+      refererInfo: {
+        page: 'http://www.zetaglobal.com/page?param=value',
+        domain: 'www.zetaglobal.com',
+      },
+      gdprConsent: {
+        gdprApplies: 1,
+        consentString: 'consentString'
+      },
+      uspConsent: 'someCCPAString',
+      params: params,
+      userIdAsEids: eids
+    }, {
+      bidId: 54321,
+      auctionId: 67890,
+      mediaTypes: {
+        banner: {
+          sizes: [[600, 400]],
+        }
+      },
+      refererInfo: {
+        page: 'http://www.zetaglobal.com/page?param=value',
+        domain: 'www.zetaglobal.com',
+      },
+      gdprConsent: {
+        gdprApplies: 1,
+        consentString: 'consentString'
+      },
+      uspConsent: 'someCCPAString',
+      params: params,
+      userIdAsEids: eids
+    }
+  ];
+
   const bannerRequest = [{
     bidId: 12345,
     auctionId: 67890,
@@ -285,4 +327,21 @@ describe('Zeta Ssp Bid Adapter', function () {
     expect(payload.ext.tags.someTag).to.eql(444);
     expect(payload.ext.tags.shortname).to.be.undefined;
   });
+
+  it('Test multi imp', function () {
+    const request = spec.buildRequests(multiImpRequest, multiImpRequest[0]);
+    const payload = JSON.parse(request.data);
+    expect(request.url).to.eql('https://ssp.disqus.com/bid/prebid?shortname=test_shortname');
+
+    expect(payload.imp.length).to.eql(2);
+
+    expect(payload.imp[0].id).to.eql(12345);
+    expect(payload.imp[1].id).to.eql(54321);
+
+    expect(payload.imp[0].banner.w).to.eql(300);
+    expect(payload.imp[0].banner.h).to.eql(250);
+
+    expect(payload.imp[1].banner.w).to.eql(600);
+    expect(payload.imp[1].banner.h).to.eql(400);
+  });
 });

From 9f01c38ba5e7074b3358a10003d0bb7363ce35ed Mon Sep 17 00:00:00 2001
From: vishal-dw <109065778+vishal-dw@users.noreply.github.com>
Date: Tue, 16 Aug 2022 19:24:07 +0530
Subject: [PATCH 148/569] Datawrkz Bid Adapter: initial adapter release (#8754)

* New Bid Adapter: datawrkz

* New Bid Adapter: datawrkz. Test case formatting

* New Bid Adatpter: datawrkz - updated import statements
---
 modules/datawrkzBidAdapter.js                | 633 ++++++++++++++++++
 modules/datawrkzBidAdapter.md                | 160 +++++
 test/spec/modules/datawrkzBidAdapter_spec.js | 656 +++++++++++++++++++
 3 files changed, 1449 insertions(+)
 create mode 100644 modules/datawrkzBidAdapter.js
 create mode 100644 modules/datawrkzBidAdapter.md
 create mode 100644 test/spec/modules/datawrkzBidAdapter_spec.js

diff --git a/modules/datawrkzBidAdapter.js b/modules/datawrkzBidAdapter.js
new file mode 100644
index 00000000000..a4ee6bcaace
--- /dev/null
+++ b/modules/datawrkzBidAdapter.js
@@ -0,0 +1,633 @@
+import { deepAccess, getBidIdParameter, isArray, getUniqueIdentifierStr, contains } from '../src/utils.js';
+import { config } from '../src/config.js';
+import { Renderer } from '../src/Renderer.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { createBid } from '../src/bidfactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import CONSTANTS from '../src/constants.json';
+import { OUTSTREAM, INSTREAM } from '../src/video.js';
+
+const BIDDER_CODE = 'datawrkz';
+const ALIASES = [];
+const ENDPOINT_URL = 'https://at.datawrkz.com/exchange/openrtb23/';
+const RENDERER_URL = 'https://js.datawrkz.com/prebid/osRenderer.min.js';
+const OUTSTREAM_TYPES = ['inline', 'slider_top_left', 'slider_top_right', 'slider_bottom_left', 'slider_bottom_right', 'interstitial_close', 'listicle']
+const OUTSTREAM_MIMES = ['video/mp4']
+const SUPPORTED_AD_TYPES = [BANNER, NATIVE, VIDEO];
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ALIASES,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {object} bid The bid to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function(bid) {
+    return !!(bid.params && bid.params.site_id && (deepAccess(bid, 'mediaTypes.video.context') != 'adpod'));
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {BidRequest[]} bidRequests A non-empty list of bid requests which should be sent to the Server.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let requests = [];
+
+    if (validBidRequests.length > 0) {
+      validBidRequests.forEach(bidRequest => {
+        if (!bidRequest.mediaTypes) return;
+        if (bidRequest.mediaTypes.banner && ((bidRequest.mediaTypes.banner.sizes && bidRequest.mediaTypes.banner.sizes.length != 0) ||
+          (bidRequest.sizes))) {
+          requests.push(buildBannerRequest(bidRequest, bidderRequest));
+        } else if (bidRequest.mediaTypes.native) {
+          requests.push(buildNativeRequest(bidRequest, bidderRequest));
+        } else if (bidRequest.mediaTypes.video) {
+          requests.push(buildVideoRequest(bidRequest, bidderRequest));
+        }
+      });
+    }
+    return requests;
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function(serverResponse, request) {
+    var bidResponses = [];
+    let bidRequest = request.bidRequest
+    let bidResponse = serverResponse.body;
+
+    // valid object?
+    if ((!bidResponse || !bidResponse.id) || (!bidResponse.seatbid || bidResponse.seatbid.length === 0 ||
+     !bidResponse.seatbid[0].bid || bidResponse.seatbid[0].bid.length === 0)) {
+      return [];
+    }
+
+    if (getMediaTypeOfResponse(bidRequest) == BANNER) {
+      bidResponses = buildBannerResponse(bidRequest, bidResponse);
+    } else if (getMediaTypeOfResponse(bidRequest) == NATIVE) {
+      bidResponses = buildNativeResponse(bidRequest, bidResponse);
+    } else if (getMediaTypeOfResponse(bidRequest) == VIDEO) {
+      bidResponses = buildVideoResponse(bidRequest, bidResponse);
+    }
+    return bidResponses;
+  },
+}
+
+/* Generate bid request for banner adunit */
+function buildBannerRequest(bidRequest, bidderRequest) {
+  let bidFloor = Number(getBidIdParameter('bidfloor', bidRequest.params));
+
+  let adW = 0;
+  let adH = 0;
+
+  let bannerSizes = deepAccess(bidRequest, 'mediaTypes.banner.sizes');
+  let bidSizes = isArray(bannerSizes) ? bannerSizes : bidRequest.sizes;
+  if (isArray(bidSizes)) {
+    if (bidSizes.length === 2 && typeof bidSizes[0] === 'number' && typeof bidSizes[1] === 'number') {
+      adW = parseInt(bidSizes[0]);
+      adH = parseInt(bidSizes[1]);
+    } else {
+      adW = parseInt(bidSizes[0][0]);
+      adH = parseInt(bidSizes[0][1]);
+    }
+  }
+
+  var deals = [];
+  if (bidRequest.params.deals && bidRequest.params.deals.length > 0) {
+    deals = bidRequest.params.deals;
+  }
+
+  const imp = [{
+    id: bidRequest.bidId,
+    banner: {
+      w: adW,
+      h: adH
+    },
+    bidfloor: bidFloor,
+    pmp: {
+      deals: deals
+    }
+  }];
+
+  bidRequest.requestedMediaType = BANNER;
+  const scriptUrl = generateScriptUrl(bidRequest);
+  const payloadString = generatePayload(imp, bidderRequest);
+
+  return {
+    method: 'POST',
+    url: scriptUrl,
+    data: payloadString,
+    bidRequest
+  };
+}
+
+/* Generate bid request for native adunit */
+function buildNativeRequest(bidRequest, bidderRequest) {
+  let counter = 0;
+  let assets = [];
+
+  let bidFloor = Number(getBidIdParameter('bidfloor', bidRequest.params));
+
+  let title = deepAccess(bidRequest, 'mediaTypes.native.title');
+  if (title && title.len) {
+    assets.push(generateNativeTitleObj(title, ++counter));
+  }
+  let image = deepAccess(bidRequest, 'mediaTypes.native.image');
+  if (image) {
+    assets.push(generateNativeImgObj(image, 'image', ++counter));
+  }
+  let icon = deepAccess(bidRequest, 'mediaTypes.native.icon');
+  if (icon) {
+    assets.push(generateNativeImgObj(icon, 'icon', ++counter));
+  }
+  let sponsoredBy = deepAccess(bidRequest, 'mediaTypes.native.sponsoredBy');
+  if (sponsoredBy) {
+    assets.push(generateNativeDataObj(sponsoredBy, 'sponsored', ++counter));
+  }
+  let cta = deepAccess(bidRequest, 'mediaTypes.native.cta');
+  if (cta) {
+    assets.push(generateNativeDataObj(cta, 'cta', ++counter));
+  }
+  let body = deepAccess(bidRequest, 'mediaTypes.native.body');
+  if (body) {
+    assets.push(generateNativeDataObj(body, 'desc', ++counter));
+  }
+
+  let request = JSON.stringify({assets: assets})
+  const native = {
+    request: request
+  }
+
+  var deals = [];
+  if (bidRequest.params.deals && bidRequest.params.deals.length > 0) {
+    deals = bidRequest.params.deals;
+  }
+
+  const imp = [{
+    id: bidRequest.bidId,
+    native: native,
+    bidfloor: bidFloor,
+    pmp: {
+      deals: deals
+    }
+  }];
+
+  bidRequest.requestedMediaType = NATIVE;
+  bidRequest.assets = assets;
+  const scriptUrl = generateScriptUrl(bidRequest);
+  const payloadString = generatePayload(imp, bidderRequest);
+
+  return {
+    method: 'POST',
+    url: scriptUrl,
+    data: payloadString,
+    bidRequest
+  };
+}
+
+/* Generate bid request for video adunit */
+function buildVideoRequest(bidRequest, bidderRequest) {
+  let bidFloor = Number(getBidIdParameter('bidfloor', bidRequest.params));
+
+  let sizeObj = getVideoAdUnitSize(bidRequest);
+
+  const video = {
+    w: sizeObj.adW,
+    h: sizeObj.adH,
+    api: deepAccess(bidRequest, 'mediaTypes.video.api'),
+    mimes: deepAccess(bidRequest, 'mediaTypes.video.mimes'),
+    protocols: deepAccess(bidRequest, 'mediaTypes.video.protocols'),
+    playbackmethod: deepAccess(bidRequest, 'mediaTypes.video.playbackmethod'),
+    minduration: deepAccess(bidRequest, 'mediaTypes.video.minduration'),
+    maxduration: deepAccess(bidRequest, 'mediaTypes.video.maxduration'),
+    startdelay: deepAccess(bidRequest, 'mediaTypes.video.startdelay'),
+    minbitrate: deepAccess(bidRequest, 'mediaTypes.video.minbitrate'),
+    maxbitrate: deepAccess(bidRequest, 'mediaTypes.video.maxbitrate'),
+    delivery: deepAccess(bidRequest, 'mediaTypes.video.delivery'),
+    linearity: deepAccess(bidRequest, 'mediaTypes.video.linearity'),
+    placement: deepAccess(bidRequest, 'mediaTypes.video.placement'),
+    skip: deepAccess(bidRequest, 'mediaTypes.video.skip'),
+    skipafter: deepAccess(bidRequest, 'mediaTypes.video.skipafter')
+  };
+
+  let context = deepAccess(bidRequest, 'mediaTypes.video.context');
+  if (context == 'outstream' && !bidRequest.renderer) video.mimes = OUTSTREAM_MIMES
+
+  var imp = [];
+  var deals = [];
+  if (bidRequest.params.deals && bidRequest.params.deals.length > 0) {
+    deals = bidRequest.params.deals;
+  }
+
+  if (context != 'adpod') {
+    imp.push({
+      id: bidRequest.bidId,
+      video: video,
+      bidfloor: bidFloor,
+      pmp: {
+        deals: deals
+      }
+    });
+  }
+  bidRequest.requestedMediaType = VIDEO;
+  const scriptUrl = generateScriptUrl(bidRequest);
+  const payloadString = generatePayload(imp, bidderRequest);
+
+  return {
+    method: 'POST',
+    url: scriptUrl,
+    data: payloadString,
+    bidRequest
+  };
+}
+
+/* Convert video player size to bid request compatible format */
+function getVideoAdUnitSize(bidRequest) {
+  var adH = 0;
+  var adW = 0;
+  let playerSize = deepAccess(bidRequest, 'mediaTypes.video.playerSize');
+  if (isArray(playerSize)) {
+    if (playerSize.length === 2 && typeof playerSize[0] === 'number' && typeof playerSize[1] === 'number') {
+      adW = parseInt(playerSize[0]);
+      adH = parseInt(playerSize[1]);
+    } else {
+      adW = parseInt(playerSize[0][0]);
+      adH = parseInt(playerSize[0][1]);
+    }
+  }
+  return {adH: adH, adW: adW}
+}
+
+/* Get mediatype of the adunit from request */
+function getMediaTypeOfResponse(bidRequest) {
+  if (bidRequest.requestedMediaType == BANNER) return BANNER;
+  else if (bidRequest.requestedMediaType == NATIVE) return NATIVE;
+  else if (bidRequest.requestedMediaType == VIDEO) return VIDEO;
+  else return '';
+}
+
+/* Generate endpoint url */
+function generateScriptUrl(bidRequest) {
+  let queryParams = 'hb=1';
+  let siteId = getBidIdParameter('site_id', bidRequest.params);
+  return ENDPOINT_URL + siteId + '?' + queryParams;
+}
+
+/* Generate request payload for the adunit */
+function generatePayload(imp, bidderRequest) {
+  let domain = window.location.host;
+  let page = window.location.host + window.location.pathname + location.search + location.hash;
+
+  const site = {
+    domain: domain,
+    page: page,
+    publisher: {}
+  };
+
+  let regs = {ext: {}}
+
+  if (bidderRequest.uspConsent) {
+    regs.ext.us_privacy = bidderRequest.uspConsent;
+  }
+  if (bidderRequest.gdprConsent && typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') {
+    regs.ext.gdpr = bidderRequest.gdprConsent.gdprApplies ? '1' : '0';
+  }
+
+  if (config.getConfig('coppa') === true) {
+    regs.coppa = '1';
+  }
+
+  const device = {
+    ua: window.navigator.userAgent
+  };
+
+  const payload = {
+    id: getUniqueIdentifierStr(),
+    imp: imp,
+    site: site,
+    device: device,
+    regs: regs
+  };
+
+  return JSON.stringify(payload);
+}
+
+/* Generate image asset object */
+function generateNativeImgObj(obj, type, id) {
+  let adW = 0;
+  let adH = 0;
+  let bidSizes = obj.sizes;
+
+  var typeId;
+  if (type == 'icon') typeId = 1;
+  else if (type == 'image') typeId = 3;
+
+  if (isArray(bidSizes)) {
+    if (bidSizes.length === 2 && typeof bidSizes[0] === 'number' && typeof bidSizes[1] === 'number') {
+      adW = parseInt(bidSizes[0]);
+      adH = parseInt(bidSizes[1]);
+    } else {
+      adW = parseInt(bidSizes[0][0]);
+      adH = parseInt(bidSizes[0][1]);
+    }
+  }
+
+  let required = obj.required ? 1 : 0;
+  let image = {
+    type: parseInt(typeId),
+    w: adW,
+    h: adH
+  }
+  return {
+    id: id,
+    required: required,
+    img: image
+  };
+}
+
+/* Generate title asset object */
+function generateNativeTitleObj(obj, id) {
+  let required = obj.required ? 1 : 0;
+  let title = {
+    len: obj.len
+  };
+  return {
+    id: id,
+    required: required,
+    title: title
+  };
+}
+
+/* Generate data asset object */
+function generateNativeDataObj(obj, type, id) {
+  var typeId;
+  switch (type) {
+    case 'sponsored': typeId = 1;
+      break;
+    case 'desc' : typeId = 2;
+      break;
+    case 'cta' : typeId = 12;
+      break;
+  }
+
+  let required = obj.required ? 1 : 0;
+  let data = {
+    type: typeId
+  };
+  if (typeId == 2 && obj.len) {
+    data.len = parseInt(obj.len);
+  }
+  return {
+    id: id,
+    required: required,
+    data: data
+  };
+}
+
+/* Convert banner bid response to compatible format */
+function buildBannerResponse(bidRequest, bidResponse) {
+  const bidResponses = [];
+  bidResponse.seatbid[0].bid.forEach(function (bidderBid) {
+    let responseCPM;
+    let placementCode = '';
+
+    if (bidRequest) {
+      let bidResponse = createBid(1);
+      placementCode = bidRequest.placementCode;
+      bidRequest.status = CONSTANTS.STATUS.GOOD;
+      responseCPM = parseFloat(bidderBid.price);
+      if (responseCPM === 0 || isNaN(responseCPM)) {
+        let bid = createBid(2);
+        bid.requestId = bidRequest.bidId;
+        bid.bidderCode = bidRequest.bidder;
+        bidResponses.push(bid);
+        return;
+      }
+      let bidSizes = (deepAccess(bidRequest, 'mediaTypes.banner.sizes')) ? deepAccess(bidRequest, 'mediaTypes.banner.sizes') : bidRequest.sizes;
+      bidResponse.requestId = bidRequest.bidId
+      bidResponse.transactionId = bidRequest.transactionId
+      bidResponse.placementCode = placementCode;
+      bidResponse.cpm = responseCPM;
+      bidResponse.size = bidSizes;
+      bidResponse.width = parseInt(bidderBid.w);
+      bidResponse.height = parseInt(bidderBid.h);
+      let responseAd = bidderBid.adm;
+      let responseNurl = '<img src="' + bidderBid.nurl + '" height="0px" width="0px">';
+      bidResponse.ad = decodeURIComponent(responseAd + responseNurl);
+      bidResponse.creativeId = bidderBid.id;
+      bidResponse.bidderCode = bidRequest.bidder;
+      bidResponse.ttl = 300;
+      bidResponse.netRevenue = true;
+      bidResponse.currency = 'USD';
+      bidResponse.mediaType = BANNER;
+      bidResponses.push(bidResponse);
+    }
+  });
+  return bidResponses;
+}
+
+/* Convert native bid response to compatible format */
+function buildNativeResponse(bidRequest, response) {
+  const bidResponses = [];
+  response.seatbid[0].bid.forEach(function (bidderBid) {
+    let responseCPM;
+    let placementCode = '';
+
+    if (bidRequest) {
+      let bidResponse = createBid(1);
+      placementCode = bidRequest.placementCode;
+      bidRequest.status = CONSTANTS.STATUS.GOOD;
+      responseCPM = parseFloat(bidderBid.price);
+      if (responseCPM === 0 || isNaN(responseCPM)) {
+        let bid = createBid(2);
+        bid.requestId = bidRequest.bidId;
+        bid.bidderCode = bidRequest.bidder;
+        bidResponses.push(bid);
+        return;
+      }
+      bidResponse.requestId = bidRequest.bidId
+      bidResponse.transactionId = bidRequest.transactionId
+      bidResponse.placementCode = placementCode;
+      bidResponse.cpm = responseCPM;
+
+      let nativeResponse = JSON.parse(bidderBid.adm).native;
+
+      const native = {
+        clickUrl: nativeResponse.link.url,
+        impressionTrackers: nativeResponse.imptrackers
+      };
+
+      nativeResponse.assets.forEach(function(asset) {
+        let keyVal = getNativeAssestObj(asset, bidRequest.assets);
+        native[keyVal.key] = keyVal.value;
+      });
+
+      bidResponse.creativeId = bidderBid.id;
+      bidResponse.bidderCode = bidRequest.bidder;
+      bidResponse.ttl = 300;
+      if (bidRequest.sizes) { bidResponse.size = bidRequest.sizes; }
+      bidResponse.netRevenue = true;
+      bidResponse.currency = 'USD';
+      bidResponse.native = native;
+      bidResponse.mediaType = NATIVE;
+      bidResponses.push(bidResponse);
+    }
+  });
+  return bidResponses;
+}
+
+/* Convert video bid response to compatible format */
+function buildVideoResponse(bidRequest, response) {
+  const bidResponses = [];
+  response.seatbid[0].bid.forEach(function (bidderBid) {
+    let responseCPM;
+    let placementCode = '';
+
+    if (bidRequest) {
+      let bidResponse = createBid(1);
+      placementCode = bidRequest.placementCode;
+      bidRequest.status = CONSTANTS.STATUS.GOOD;
+      responseCPM = parseFloat(bidderBid.price);
+      if (responseCPM === 0 || isNaN(responseCPM)) {
+        let bid = createBid(2);
+        bid.requestId = bidRequest.bidId;
+        bid.bidderCode = bidRequest.bidder;
+        bidResponses.push(bid);
+        return;
+      }
+      let context = bidRequest.mediaTypes.video.context;
+
+      bidResponse.requestId = bidRequest.bidId
+      bidResponse.transactionId = bidRequest.transactionId
+      bidResponse.placementCode = placementCode;
+      bidResponse.cpm = responseCPM;
+
+      let vastXml = decodeURIComponent(bidderBid.adm);
+
+      bidResponse.creativeId = bidderBid.id;
+      bidResponse.bidderCode = bidRequest.bidder;
+      bidResponse.ttl = 300;
+      bidResponse.netRevenue = true;
+      bidResponse.currency = 'USD';
+      var ext = bidderBid.ext;
+      var vastUrl = '';
+      if (ext) {
+        vastUrl = ext.vast_url;
+      }
+      var adUnitCode = bidRequest.adUnitCode;
+      var sizeObj = getVideoAdUnitSize(bidRequest);
+
+      bidResponse.height = sizeObj.adH;
+      bidResponse.width = sizeObj.adW;
+
+      switch (context) {
+        case OUTSTREAM:
+          var outstreamType = contains(OUTSTREAM_TYPES, bidRequest.params.outstreamType) ? bidRequest.params.outstreamType : ''
+          bidResponse.outstreamType = outstreamType;
+          bidResponse.ad = vastXml;
+          if (!bidRequest.renderer) {
+            const renderer = Renderer.install({
+              id: bidderBid.id,
+              url: RENDERER_URL,
+              config: bidRequest.params.outstreamConfig || {},
+              loaded: false,
+              adUnitCode
+            });
+            renderer.setRender(outstreamRender)
+            bidResponse.renderer = renderer;
+          } else { bidResponse.adResponse = vastXml; }
+          break;
+        case INSTREAM:
+          bidResponse.vastUrl = vastUrl;
+          bidResponse.adserverTargeting = setTargeting(vastUrl);
+          break;
+      }
+      bidResponse.mediaType = VIDEO;
+      bidResponses.push(bidResponse);
+    }
+  });
+  return bidResponses;
+}
+
+/* Generate renderer for outstream ad unit */
+function outstreamRender(bid) {
+  bid.renderer.push(() => {
+    window.osRenderer({
+      adResponse: bid.ad,
+      height: bid.height,
+      width: bid.width,
+      targetId: bid.adUnitCode, // target div id to render video
+      outstreamType: bid.outstreamType,
+      options: bid.renderer.getConfig(),
+    });
+  });
+}
+
+/* Set targeting params used for instream video that is required to generate cache url  */
+function setTargeting(query) {
+  var targeting = {};
+  var hash;
+  var hashes = query.slice(query.indexOf('?') + 1).split('&');
+  for (var i = 0; i < hashes.length; i++) {
+    hash = hashes[i].split('=');
+    targeting['hb_' + hash[0]] = hash[1];
+  }
+  return targeting;
+}
+
+/* Get image type with respect to the id */
+function getAssetImageType(id, assets) {
+  for (var i = 0; i < assets.length; i++) {
+    if (assets[i].id == id) {
+      if (assets[i].img.type == 1) { return 'icon'; } else if (assets[i].img.type == 3) { return 'image'; }
+    }
+  }
+  return '';
+}
+
+/* Get type of data asset with respect to the id */
+function getAssetDataType(id, assets) {
+  for (var i = 0; i < assets.length; i++) {
+    if (assets[i].id == id) {
+      if (assets[i].data.type == 1) { return 'sponsored'; } else if (assets[i].data.type == 2) { return 'desc'; } else if (assets[i].data.type == 12) { return 'cta'; }
+    }
+  }
+  return '';
+}
+
+/* Convert response assests to compatible format */
+function getNativeAssestObj(obj, assets) {
+  if (obj.title) {
+    return {
+      key: 'title',
+      value: obj.title.text
+    }
+  }
+  if (obj.data) {
+    return {
+      key: getAssetDataType(obj.id, assets),
+      value: obj.data.value
+    }
+  }
+  if (obj.img) {
+    return {
+      key: getAssetImageType(obj.id, assets),
+      value: {
+        url: obj.img.url,
+        height: obj.img.h,
+        width: obj.img.w
+      }
+    }
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/datawrkzBidAdapter.md b/modules/datawrkzBidAdapter.md
new file mode 100644
index 00000000000..85ea43e6dd3
--- /dev/null
+++ b/modules/datawrkzBidAdapter.md
@@ -0,0 +1,160 @@
+# Overview
+
+```
+Module Name:  Datawrkz Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer:  pubops@datawrkz.com
+```
+
+# Description
+
+Module that connects to Datawrkz's demand sources. 
+Datawrkz bid adapter supports Banner, Video (instream and outstream) and Native ad units.
+
+# Bid Parameters
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `site_id` | required | String | Site id  | "test_site_id"
+| `deals` | optional | Array<Deal> | Array of deal objects | `[{id: "deal_1"},{id: "deal_2"}]`
+| `bidfloor` | optional | Float | Minimum bid for this impression expressed in CPM | `0.5`
+| `outstreamType` | optional | String | Type of outstream video to the played. Available options: inline, slider_top_left, slider_top_right, slider_bottom_left, slider_bottom_right, interstitial_close, and listicle | "inline"
+| `outstreamConfig` | optional | Object | Configuration settings for outstream ad unit | `{ad_unit_audio: 1, show_player_close_button_after: 5, hide_player_control: 0}`
+
+# Deal Object
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `id` | required | String | Deal id  | "test_deal_id"
+
+# outstreamConfig
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `ad_unit_audio` | optional | Integer | Set default audio option for the player. 0 to play audio on hover and 2 to mute | `0` or `2`
+| `show_player_close_button_after` | optional | Integer | Show player close button after specified seconds | `5`
+| `hide_player_control` | optional | Integer | Show/hide player controls. 0 to show player controls and 1 to hide | `1`
+
+# Test Parameters
+```
+var adUnits = [
+   // Banner adUnit
+   {
+      code: 'banner-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300,600]]
+        }
+      },
+      bids: [{
+         bidder: 'datawrkz',
+         params: {
+           site_id: 'site_id',
+           bidfloor: 0.5
+         }
+       }]
+   },
+   // Native adUnit
+   {
+      code: 'native-div',
+      sizes: [[1, 1]],
+      mediaTypes: {
+        native: {
+          title: {
+            required: true,
+            len: 80
+          },
+          image: {
+            required: true,
+            sizes: [300, 250]
+          },
+          icon: {
+            required: true,
+            sizes: [50, 50]
+          },
+          body: {
+            required: true,
+            len: 800
+          },
+          sponsoredBy: {
+            required: true
+          },
+          cta: {
+            required: true
+          }
+        }
+      },
+      bids: [{
+        bidder: 'datawrkz',
+        params: {
+          site_id: 'site_id',
+           bidfloor: 0.5
+        }
+      }]
+   },
+   // Video instream adUnit
+   {
+      code: 'video-instream',
+      sizes: [[640, 480]],
+      mediaTypes: {
+        video: {
+          playerSize: [[640, 480]],
+          context: 'instream',
+          api: [1, 2],
+          mimes: ["video/x-ms-wmv", "video/mp4"],
+          protocols: [1, 2, 3],
+          playbackmethod: [1, 2],
+          minduration: 20,
+          maxduration: 30,
+          startdelay: 5,
+          minbitrate: 300,
+          maxbitrate: 1500,
+          delivery: [2],
+          linearity: 1
+        },
+      },
+      bids: [{
+        bidder: 'datawrkz',
+        params: {
+          site_id: 'site_id',
+          bidfloor: 0.5
+        }
+      }]
+   },
+   // Video outstream adUnit
+   {
+     code: 'video-outstream',
+     sizes: [[300, 250]],
+     mediaTypes: {
+       video: {
+         playerSize: [[300, 250]],
+         context: 'outstream',
+         api: [1, 2],
+         mimes: ["video/mp4"],
+         protocols: [1, 2, 3],
+         playbackmethod: [1, 2],
+         minduration: 20,
+         maxduration: 30,
+         startdelay: 5,
+         minbitrate: 300,
+         maxbitrate: 1500,
+         delivery: [2],
+         linearity: 1
+       }
+     },
+     bids: [
+       {
+         bidder: 'datawrkz',
+         params: {
+           site_id: 'site_id',
+           bidfloor: 0.5,
+           outstreamType: 'slider_top_left',          //Supported types : inline, slider_top_left, slider_top_right, slider_bottom_left, slider_bottom_right, interstitial_close, listicle
+           outstreamConfig: {
+            ad_unit_audio: 1,                       // 0: audio on hover, 2: always muted
+            show_player_close_button_after: 5,     // show close button after 5 seconds
+            hide_player_control: 0                // 0 to show/ 1 to hide
+           }
+         }
+       }
+     ]
+   }
+];
+```
diff --git a/test/spec/modules/datawrkzBidAdapter_spec.js b/test/spec/modules/datawrkzBidAdapter_spec.js
new file mode 100644
index 00000000000..3ddc2bad1cf
--- /dev/null
+++ b/test/spec/modules/datawrkzBidAdapter_spec.js
@@ -0,0 +1,656 @@
+import { expect } from 'chai';
+import { config } from 'src/config.js';
+import { spec } from 'modules/datawrkzBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'datawrkz';
+const ENDPOINT_URL = 'https://at.datawrkz.com/exchange/openrtb23/';
+const SITE_ID = 'site_id';
+const FINAL_URL = ENDPOINT_URL + SITE_ID + '?hb=1';
+
+describe('datawrkzAdapterTests', function () {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': BIDDER_CODE,
+      'params': {
+        'site_id': SITE_ID,
+        'bidfloor': '1.0'
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when params not found', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when required site_id param not found', function () {
+      let bid = Object.assign({}, bid);
+      bid.params = {'bidfloor': '1.0'}
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when adunit is adpod video', function () {
+      let bid = Object.assign({}, bid);
+      bid.params = {'bidfloor': '1.0', 'site_id': SITE_ID};
+      bid.mediaTypes = {
+        'video': {
+          'context': 'adpod'
+        }
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const consentString = '1YA-';
+    const bidderRequest = {
+      'bidderCode': 'datawrkz',
+      'auctionId': '1d1a030790a475',
+      'bidderRequestId': '22edbae2733bf6',
+      'timeout': 3000,
+      'uspConsent': consentString,
+      'gdprConsent': {'gdprApplies': true},
+    };
+    const bannerBidRequests = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'banner': {'sizes': [[300, 250], [300, 600]]}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const bannerBidRequestsSingleArraySlotAndDeals = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00, 'deals': [{id: 'deal_1'}, {id: 'deal_2'}]},
+      'mediaTypes': {'banner': {}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'sizes': [300, 250],
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const nativeBidRequests = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'native': {
+        'title': {'required': true, 'len': 80},
+        'image': {'required': true, 'sizes': [[300, 250]]},
+        'icon': {'required': true, 'sizes': [[50, 50]]},
+        'sponsoredBy': {'required': true},
+        'cta': {'required': true},
+        'body': {'required': true, 'len': 100}
+      }},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const nativeBidRequestsSingleArraySlotAndDeals = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00, 'deals': [{id: 'deal_1'}, {id: 'deal_2'}]},
+      'mediaTypes': {'native': {
+        'title': {'len': 80},
+        'image': {'sizes': [300, 250]},
+        'icon': {'sizes': [50, 50]},
+        'sponsoredBy': {},
+        'cta': {},
+        'body': {'len': 100}
+      }},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const instreamVideoBidRequests = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'video': {'context': 'instream', 'playerSize': [[640, 480]]}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const instreamVideoBidRequestsSingleArraySlotAndDeals = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00, 'deals': [{id: 'deal_1'}, {id: 'deal_2'}]},
+      'mediaTypes': {'video': {'context': 'instream', 'playerSize': [640, 480]}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const outstreamVideoBidRequests = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'video': {'context': 'outstream', 'playerSize': [[640, 480]], 'mimes': ['video/mp4', 'video/x-flv']}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const outstreamVideoBidRequestsSingleArraySlotAndDeals = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00, 'deals': [{id: 'deal_1'}, {id: 'deal_2'}]},
+      'mediaTypes': {'video': {'context': 'outstream', 'playerSize': [640, 480], 'mimes': ['video/mp4', 'video/x-flv']}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+    const bidRequestsWithNoMediaType = [{
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+    }];
+
+    it('empty bid requests', function () {
+      const requests = spec.buildRequests([], bidderRequest);
+      assert.lengthOf(requests, 0);
+    });
+
+    it('mediaTypes missing in bid request', function () {
+      const requests = spec.buildRequests(bidRequestsWithNoMediaType, bidderRequest);
+      assert.lengthOf(requests, 0);
+    });
+
+    it('invalid media type in bid request', function () {
+      bidRequestsWithNoMediaType[0].mediaTypes = {'test': {}};
+      const requests = spec.buildRequests(bidRequestsWithNoMediaType, bidderRequest);
+      assert.lengthOf(requests, 0);
+    });
+
+    it('size missing in bid request for banner', function () {
+      delete bidRequestsWithNoMediaType[0].mediaTypes.test;
+      bidRequestsWithNoMediaType[0].mediaTypes.banner = {};
+      const requests = spec.buildRequests(bidRequestsWithNoMediaType, bidderRequest);
+      assert.lengthOf(requests, 0);
+    });
+
+    it('size array empty in bid request for banner', function () {
+      bidRequestsWithNoMediaType[0].mediaTypes.banner.sizes = [];
+      const requests = spec.buildRequests(bidRequestsWithNoMediaType, bidderRequest);
+      assert.lengthOf(requests, 0);
+    });
+
+    it('banner bidRequest with slot size as 2 dimensional array', function () {
+      sinon.stub(config, 'getConfig').withArgs('coppa').returns(true);
+      const requests = spec.buildRequests(bannerBidRequests, bidderRequest);
+      config.getConfig.restore();
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload.imp).to.exist;
+      expect(payload).to.nested.include({'imp[0].banner.w': 300});
+      expect(payload).to.nested.include({'imp[0].banner.h': 250});
+      expect(payload).to.nested.include({'regs.ext.us_privacy': consentString});
+      expect(payload).to.nested.include({'regs.ext.gdpr': '1'});
+      expect(payload).to.nested.include({'regs.coppa': '1'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('banner');
+    });
+
+    it('banner bidRequest with deals and slot size as 1 dimensional array', function () {
+      const requests = spec.buildRequests(bannerBidRequestsSingleArraySlotAndDeals, bidderRequest);
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload.imp).to.exist;
+      expect(payload).to.nested.include({'imp[0].banner.w': 300});
+      expect(payload).to.nested.include({'imp[0].banner.h': 250});
+      expect(payload).to.nested.include({'imp[0].pmp.deals[0].id': 'deal_1'});
+      expect(payload).to.nested.include({'imp[0].pmp.deals[1].id': 'deal_2'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('banner');
+    });
+
+    it('native bidRequest fields with slot size as 2 dimensional array', function () {
+      sinon.stub(config, 'getConfig').withArgs('coppa').returns(true);
+      const requests = spec.buildRequests(nativeBidRequests, bidderRequest);
+      config.getConfig.restore();
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload.imp[0].native.request).to.exist;
+      expect(payload).to.nested.include({'regs.ext.us_privacy': consentString});
+      expect(payload).to.nested.include({'regs.ext.gdpr': '1'});
+      expect(payload).to.nested.include({'regs.coppa': '1'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('native');
+    });
+
+    it('native bidRequest fields with deals and slot size as 1 dimensional array', function () {
+      const requests = spec.buildRequests(nativeBidRequestsSingleArraySlotAndDeals, bidderRequest);
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload.imp).to.exist;
+      expect(payload.imp[0].native.request).to.exist;
+      expect(payload).to.nested.include({'imp[0].pmp.deals[0].id': 'deal_1'});
+      expect(payload).to.nested.include({'imp[0].pmp.deals[1].id': 'deal_2'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('native');
+    });
+
+    it('instream video bidRequest fields with slot size as 2 dimensional array', function () {
+      sinon.stub(config, 'getConfig').withArgs('coppa').returns(true);
+      const requests = spec.buildRequests(instreamVideoBidRequests, bidderRequest);
+      config.getConfig.restore();
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload).to.nested.include({'regs.ext.us_privacy': consentString});
+      expect(payload).to.nested.include({'regs.ext.gdpr': '1'});
+      expect(payload).to.nested.include({'regs.coppa': '1'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('video');
+    });
+
+    it('instream video bidRequest with deals and slot size as 1 dimensional array', function () {
+      const requests = spec.buildRequests(instreamVideoBidRequestsSingleArraySlotAndDeals, bidderRequest);
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('video');
+    });
+
+    it('outstream video bidRequest fields with slot size as 2 dimensional array', function () {
+      sinon.stub(config, 'getConfig').withArgs('coppa').returns(true);
+      const requests = spec.buildRequests(outstreamVideoBidRequests, bidderRequest);
+      config.getConfig.restore();
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload).to.nested.include({'imp[0].video.w': 640});
+      expect(payload).to.nested.include({'imp[0].video.h': 480});
+      expect(payload).to.nested.include({'regs.ext.us_privacy': consentString});
+      expect(payload).to.nested.include({'regs.ext.gdpr': '1'});
+      expect(payload).to.nested.include({'regs.coppa': '1'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('video');
+    });
+
+    it('outstream video bidRequest fields with deals and slot size as 1 dimensional array', function () {
+      const requests = spec.buildRequests(outstreamVideoBidRequestsSingleArraySlotAndDeals, bidderRequest);
+      const payload = JSON.parse(requests[0].data);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(FINAL_URL);
+      expect(payload).to.nested.include({'imp[0].video.w': 640});
+      expect(payload).to.nested.include({'imp[0].video.h': 480});
+      expect(payload).to.nested.include({'imp[0].pmp.deals[0].id': 'deal_1'});
+      expect(payload).to.nested.include({'imp[0].pmp.deals[1].id': 'deal_2'});
+      expect(requests[0].bidRequest).to.exist;
+      expect(requests[0].bidRequest.requestedMediaType).to.equal('video');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const bidRequest = {
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'banner': {'sizes': [[300, 250], [300, 600]]}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+      'requestedMediaType': 'banner'
+    };
+    const nativeBidRequest = {
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'native': {
+        'title': {'required': true, 'len': 80},
+        'image': {'required': true, 'sizes': [300, 250]},
+        'icon': {'required': true, 'sizes': [50, 50]},
+        'sponsoredBy': {'required': true},
+        'cta': {'required': true},
+        'body': {'required': true}
+      }},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+      'requestedMediaType': 'native',
+      'assets': [
+        {'id': 1, 'required': 1, 'title': {'len': 80}},
+        {'id': 2, 'required': 1, 'img': {'type': 3, 'w': 300, 'h': 250}},
+        {'id': 3, 'required': 1, 'img': {'type': 1, 'w': 50, 'h': 50}},
+        {'id': 4, 'required': 1, 'data': {'type': 1}},
+        {'id': 5, 'required': 1, 'data': {'type': 12}},
+        {'id': 6, 'required': 1, 'data': {'type': 2, 'len': 100}}
+      ]
+    };
+    const instreamVideoBidRequest = {
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID, 'bidfloor': 1.00},
+      'mediaTypes': {'video': {'context': 'instream', 'playerSize': [640, 480]}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+      'requestedMediaType': 'video'
+    };
+    const outstreamVideoBidRequest = {
+      'bidder': BIDDER_CODE,
+      'params': {'site_id': SITE_ID,
+        'bidfloor': 1.00,
+        'outstreamType': 'slider_top_left',
+        'outstreamConfig':
+          {'ad_unit_audio': 1, 'show_player_close_button_after': 5, 'hide_player_control': 0}},
+      'mediaTypes': {'video': {'context': 'outstream', 'playerSize': [640, 480]}},
+      'adUnitCode': 'adUnitCode',
+      'transactionId': 'transactionId',
+      'bidId': 'bidId',
+      'bidderRequestId': 'bidderRequestId',
+      'auctionId': 'auctionId',
+      'requestedMediaType': 'video'
+    };
+    const request = {
+      'method': 'POST',
+      'url': FINAL_URL,
+      'data': '',
+      bidRequest
+    };
+
+    it('check empty response', function () {
+      const result = spec.interpretResponse({}, request);
+      expect(result).to.deep.equal([]);
+    });
+
+    it('check if id missing in response', function () {
+      const serverResponse = {'body': {'seatbid': [{}]}, 'headers': {}};
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.deep.equal([]);
+    });
+
+    it('check if seatbid present in response', function () {
+      const serverResponse = {'body': {'id': 'id'}, 'headers': {}};
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.deep.equal([]);
+    });
+
+    it('check empty array response seatbid', function () {
+      const serverResponse = {'body': {'id': 'id', 'seatbid': []}, 'headers': {}};
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.deep.equal([]);
+    });
+
+    it('check bid present in seatbid', function () {
+      const serverResponse = {'body': {'id': 'id', 'seatbid': [{}]}, 'headers': {}};
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(0);
+    });
+
+    it('check empty array bid in seatbid', function () {
+      const serverResponse = {'body': {'id': 'id', 'seatbid': [{'bid': []}]}, 'headers': {}};
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(0);
+    });
+
+    it('banner response missing bid price', function () {
+      const serverResponse = {'body': {'id': 'id', 'seatbid': [{'bid': [{'id': 1}]}]}, 'headers': {}};
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+    });
+
+    it('banner response', function () {
+      const serverResponse = {
+        'body': {
+          'id': 'id',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '1',
+                  'price': 1,
+                  'w': 300,
+                  'h': 250,
+                  'adm': 'test adm',
+                  'nurl': 'url'
+                }
+              ]
+            }
+          ]
+        },
+        'headers': {}
+      };
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].cpm).to.equal(1);
+      expect(result[0].size).to.equal(bidRequest.mediaTypes.banner.sizes);
+      expect(result[0].width).to.equal(300);
+      expect(result[0].height).to.equal(250);
+      expect(result[0].ad).to.equal(decodeURIComponent(serverResponse.body.seatbid[0].bid[0].adm + '<img src="' + serverResponse.body.seatbid[0].bid[0].nurl + '" height="0px" width="0px">'));
+      expect(result[0].creativeId).to.equal('1');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+      expect(result[0].transactionId).to.equal(request.bidRequest.transactionId);
+      expect(result[0].mediaType).to.equal('banner');
+    });
+
+    it('native response missing bid price', function () {
+      request.bidRequest = nativeBidRequest;
+      const serverResponse = {
+        'body': {
+          'id': 'id',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '1',
+                  'w': 300,
+                  'h': 250,
+                  'adm': '{"native": {"link": {"url": "test_url"}, "imptrackers": [], "assets": [' +
+                    '{"id": 1, "title": {"text": "Test title"}},' +
+                    '{"id": 2, "img": {"type": 3,"url": "https://test/image", "w": 300, "h": 250}},' +
+                    '{"id": 3, "img": {"type": 1, "url": "https://test/icon", "w": 50, "h": 50}},' +
+                    '{"id": 4, "data": {"type": 1, "value": "Test sponsored by"}},' +
+                    '{"id": 5, "data": {"type": 12, "value": "Test CTA"}},' +
+                    '{"id": 6, "data": {"type": 2, "value": "Test body"}}]}}'
+                }
+              ]
+            }
+          ]
+        },
+        'headers': {}
+      };
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+    });
+
+    it('native response', function () {
+      request.bidRequest = nativeBidRequest;
+      const serverResponse = {
+        'body': {
+          'id': 'id',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '1',
+                  'price': 1,
+                  'w': 300,
+                  'h': 250,
+                  'adm': '{"native": {"link": {"url": "test_url"}, "imptrackers": ["tracker1", "tracker2"], "assets": [' +
+                    '{"id": 1, "title": {"text": "Test title"}},' +
+                    '{"id": 2, "img": {"type": 3,"url": "https://test/image", "w": 300, "h": 250}},' +
+                    '{"id": 3, "img": {"type": 1, "url": "https://test/icon", "w": 50, "h": 50}},' +
+                    '{"id": 4, "data": {"type": 1, "value": "Test sponsored by"}},' +
+                    '{"id": 5, "data": {"type": 12, "value": "Test CTA"}},' +
+                    '{"id": 6, "data": {"type": 2, "value": "Test body"}}]}}'
+                }
+              ]
+            }
+          ]
+        },
+        'headers': {}
+      };
+
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].cpm).to.equal(1);
+      expect(result[0].native.clickUrl).to.equal('test_url');
+      expect(result[0].native.impressionTrackers).to.have.lengthOf(2);
+      expect(result[0].native.title).to.equal('Test title');
+      expect(result[0].native.image.url).to.equal('https://test/image');
+      expect(result[0].native.icon.url).to.equal('https://test/icon');
+      expect(result[0].native.sponsored).to.equal('Test sponsored by');
+      expect(result[0].native.cta).to.equal('Test CTA');
+      expect(result[0].native.desc).to.equal('Test body');
+      expect(result[0].creativeId).to.equal('1');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+      expect(result[0].transactionId).to.equal(request.bidRequest.transactionId);
+      expect(result[0].mediaType).to.equal('native');
+    });
+
+    it('video response missing bid price', function () {
+      request.bidRequest = instreamVideoBidRequest;
+      const serverResponse = {
+        'body': {
+          'id': 'id',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '1',
+                  'w': 640,
+                  'h': 480,
+                  'adm': '<VAST></VAST>',
+                  'ext': {
+                    'vast_url': 'vast_url'
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        'headers': {}
+      };
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+    });
+
+    it('instream video response', function () {
+      request.bidRequest = instreamVideoBidRequest;
+      const serverResponse = {
+        'body': {
+          'id': 'id',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '1',
+                  'price': 1,
+                  'w': 640,
+                  'h': 480,
+                  'adm': '<VAST></VAST>',
+                  'ext': {
+                    'vast_url': 'test_vast_url?kcid=123&kaid=12&protocol=3'
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        'headers': {}
+      };
+
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].cpm).to.equal(1);
+      expect(result[0].width).to.equal(640);
+      expect(result[0].height).to.equal(480);
+      expect(result[0].vastUrl).to.equal('test_vast_url?kcid=123&kaid=12&protocol=3');
+      expect(result[0].adserverTargeting.hb_kcid).to.equal('123');
+      expect(result[0].adserverTargeting.hb_kaid).to.equal('12');
+      expect(result[0].adserverTargeting.hb_protocol).to.equal('3');
+      expect(result[0].creativeId).to.equal('1');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+      expect(result[0].transactionId).to.equal(request.bidRequest.transactionId);
+      expect(result[0].mediaType).to.equal('video');
+    });
+
+    it('outstream video response', function () {
+      request.bidRequest = outstreamVideoBidRequest;
+      const serverResponse = {
+        'body': {
+          'id': 'id',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '1',
+                  'price': 1,
+                  'w': 640,
+                  'h': 480,
+                  'adm': '<VAST></VAST>',
+                  'ext': {
+                    'vast_url': 'vast_url'
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        'headers': {}
+      };
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result).to.have.lengthOf(1);
+      expect(result[0].requestId).to.equal('bidId');
+      expect(result[0].cpm).to.equal(1);
+      expect(result[0].width).to.equal(640);
+      expect(result[0].height).to.equal(480);
+      expect(result[0].outstreamType).to.equal('slider_top_left');
+      expect(result[0].ad).to.equal('<VAST></VAST>');
+      expect(result[0].renderer).to.exist;
+      expect(result[0].creativeId).to.equal('1');
+      expect(result[0].bidderCode).to.equal(request.bidRequest.bidder);
+      expect(result[0].transactionId).to.equal(request.bidRequest.transactionId);
+      expect(result[0].mediaType).to.equal('video');
+    });
+  });
+});

From 91ce750022daedff8bc70f5fee94088d7a6cda18 Mon Sep 17 00:00:00 2001
From: Saar Amrani <89377180+saar120@users.noreply.github.com>
Date: Tue, 16 Aug 2022 17:21:24 +0300
Subject: [PATCH 149/569] Vidazoo Bid Adapter: Cookie sync improvements 
 (#8834)

* feat(module): multi size request

* fix getUserSyncs
added tests

* update(module): package-lock.json from master

* feat(module): VidazooBidAdapter - send top query params to server

* feat(module): changed userSync url and passes cids from responses to usersync.

* feat(module): fixed failing test.

Co-authored-by: Udi Talias <udi.talias@gmail.com>
Co-authored-by: roman <shmoop207@gmail.com>
---
 modules/vidazooBidAdapter.js                | 10 ++--
 test/spec/modules/vidazooBidAdapter_spec.js | 59 +++++++++++++--------
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index 39d37d55a91..41f3f1f2888 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -1,4 +1,4 @@
-import { _each, deepAccess, parseSizesInput, parseUrl } from '../src/utils.js';
+import {_each, deepAccess, parseSizesInput, parseUrl, uniques} from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
@@ -191,17 +191,19 @@ function getUserSyncs(syncOptions, responses, gdprConsent = {}, uspConsent = '')
   let syncs = [];
   const { iframeEnabled, pixelEnabled } = syncOptions;
   const { gdprApplies, consentString = '' } = gdprConsent;
-  const params = `?gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${encodeURIComponent(consentString || '')}&us_privacy=${encodeURIComponent(uspConsent || '')}`
+
+  const cidArr = responses.filter(resp => deepAccess(resp, 'body.cid')).map(resp => resp.body.cid).filter(uniques);
+  const params = `?cid=${encodeURIComponent(cidArr.join(','))}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${encodeURIComponent(consentString || '')}&us_privacy=${encodeURIComponent(uspConsent || '')}`
   if (iframeEnabled) {
     syncs.push({
       type: 'iframe',
-      url: `https://prebid.cootlogix.com/api/sync/iframe/${params}`
+      url: `https://sync.cootlogix.com/api/sync/iframe/${params}`
     });
   }
   if (pixelEnabled) {
     syncs.push({
       type: 'image',
-      url: `https://prebid.cootlogix.com/api/sync/image/${params}`
+      url: `https://sync.cootlogix.com/api/sync/image/${params}`
     });
   }
   return syncs;
diff --git a/test/spec/modules/vidazooBidAdapter_spec.js b/test/spec/modules/vidazooBidAdapter_spec.js
index 1b4ed4b170d..d30b9f31417 100644
--- a/test/spec/modules/vidazooBidAdapter_spec.js
+++ b/test/spec/modules/vidazooBidAdapter_spec.js
@@ -1,4 +1,4 @@
-import { expect } from 'chai';
+import {expect} from 'chai';
 import {
   spec as adapter,
   SUPPORTED_ID_SYSTEMS,
@@ -15,8 +15,8 @@ import {
   getVidazooSessionId,
 } from 'modules/vidazooBidAdapter.js';
 import * as utils from 'src/utils.js';
-import { version } from 'package.json';
-import { useFakeTimers } from 'sinon';
+import {version} from 'package.json';
+import {useFakeTimers} from 'sinon';
 
 const SUB_DOMAIN = 'openrtb';
 
@@ -55,6 +55,7 @@ const BIDDER_REQUEST = {
 
 const SERVER_RESPONSE = {
   body: {
+    cid: 'testcid123',
     results: [{
       'ad': '<iframe>console.log("hello world")</iframe>',
       'price': 0.8,
@@ -84,7 +85,7 @@ const REQUEST = {
 
 function getTopWindowQueryParams() {
   try {
-    const parsedUrl = utils.parseUrl(window.top.document.URL, { decodeSearchAsString: true });
+    const parsedUrl = utils.parseUrl(window.top.document.URL, {decodeSearchAsString: true});
     return parsedUrl.search;
   } catch (e) {
     return '';
@@ -196,19 +197,27 @@ describe('VidazooBidAdapter', function () {
   });
   describe('getUserSyncs', function () {
     it('should have valid user sync with iframeEnabled', function () {
-      const result = adapter.getUserSyncs({ iframeEnabled: true }, [SERVER_RESPONSE]);
+      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
 
       expect(result).to.deep.equal([{
         type: 'iframe',
-        url: 'https://prebid.cootlogix.com/api/sync/iframe/?gdpr=0&gdpr_consent=&us_privacy='
+        url: 'https://sync.cootlogix.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
+      }]);
+    });
+
+    it('should have valid user sync with cid on response', function () {
+      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://sync.cootlogix.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
       }]);
     });
 
     it('should have valid user sync with pixelEnabled', function () {
-      const result = adapter.getUserSyncs({ pixelEnabled: true }, [SERVER_RESPONSE]);
+      const result = adapter.getUserSyncs({pixelEnabled: true}, [SERVER_RESPONSE]);
 
       expect(result).to.deep.equal([{
-        'url': 'https://prebid.cootlogix.com/api/sync/image/?gdpr=0&gdpr_consent=&us_privacy=',
+        'url': 'https://sync.cootlogix.com/api/sync/image/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy=',
         'type': 'image'
       }]);
     })
@@ -221,12 +230,12 @@ describe('VidazooBidAdapter', function () {
     });
 
     it('should return empty array when there is no ad', function () {
-      const responses = adapter.interpretResponse({ price: 1, ad: '' });
+      const responses = adapter.interpretResponse({price: 1, ad: ''});
       expect(responses).to.be.empty;
     });
 
     it('should return empty array when there is no price', function () {
-      const responses = adapter.interpretResponse({ price: null, ad: 'great ad' });
+      const responses = adapter.interpretResponse({price: null, ad: 'great ad'});
       expect(responses).to.be.empty;
     });
 
@@ -265,10 +274,14 @@ describe('VidazooBidAdapter', function () {
 
       const userId = (function () {
         switch (idSystemProvider) {
-          case 'lipb': return { lipbid: id };
-          case 'parrableId': return { eid: id };
-          case 'id5id': return { uid: id };
-          default: return id;
+          case 'lipb':
+            return {lipbid: id};
+          case 'parrableId':
+            return {eid: id};
+          case 'id5id':
+            return {uid: id};
+          default:
+            return id;
         }
       })();
 
@@ -285,18 +298,18 @@ describe('VidazooBidAdapter', function () {
 
   describe('alternate param names extractors', function () {
     it('should return undefined when param not supported', function () {
-      const cid = extractCID({ 'c_id': '1' });
-      const pid = extractPID({ 'p_id': '1' });
-      const subDomain = extractSubDomain({ 'sub_domain': 'prebid' });
+      const cid = extractCID({'c_id': '1'});
+      const pid = extractPID({'p_id': '1'});
+      const subDomain = extractSubDomain({'sub_domain': 'prebid'});
       expect(cid).to.be.undefined;
       expect(pid).to.be.undefined;
       expect(subDomain).to.be.undefined;
     });
 
     it('should return value when param supported', function () {
-      const cid = extractCID({ 'cID': '1' });
-      const pid = extractPID({ 'Pid': '2' });
-      const subDomain = extractSubDomain({ 'subDOMAIN': 'prebid' });
+      const cid = extractCID({'cID': '1'});
+      const pid = extractPID({'Pid': '2'});
+      const subDomain = extractSubDomain({'subDOMAIN': 'prebid'});
       expect(cid).to.be.equal('1');
       expect(pid).to.be.equal('2');
       expect(subDomain).to.be.equal('prebid');
@@ -409,7 +422,7 @@ describe('VidazooBidAdapter', function () {
         now
       });
       setStorageItem('myKey', 2020);
-      const { value, created } = getStorageItem('myKey');
+      const {value, created} = getStorageItem('myKey');
       expect(created).to.be.equal(now);
       expect(value).to.be.equal(2020);
       expect(typeof value).to.be.equal('number');
@@ -425,8 +438,8 @@ describe('VidazooBidAdapter', function () {
     });
 
     it('should parse JSON value', function () {
-      const data = JSON.stringify({ event: 'send' });
-      const { event } = tryParseJSON(data);
+      const data = JSON.stringify({event: 'send'});
+      const {event} = tryParseJSON(data);
       expect(event).to.be.equal('send');
     });
 

From 749afff9191a49fc33710e7e95514ecadcf3fcd6 Mon Sep 17 00:00:00 2001
From: Jason Piros <jasonpiros@gmail.com>
Date: Wed, 17 Aug 2022 07:05:23 -0700
Subject: [PATCH 150/569] consumableBidAdapter - add video support (#8793)

---
 modules/consumableBidAdapter.js               |  22 ++-
 .../spec/modules/consumableBidAdapter_spec.js | 139 ++++++++++++++++++
 2 files changed, 159 insertions(+), 2 deletions(-)

diff --git a/modules/consumableBidAdapter.js b/modules/consumableBidAdapter.js
index f6c470d82a9..6d502b24e81 100644
--- a/modules/consumableBidAdapter.js
+++ b/modules/consumableBidAdapter.js
@@ -1,6 +1,7 @@
 import { logWarn, createTrackPixelHtml, deepAccess, isArray, deepSetValue } from '../src/utils.js';
 import {config} from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'consumable';
 
@@ -11,6 +12,7 @@ let bidder = 'consumable';
 
 export const spec = {
   code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
 
   /**
    * Determines whether or not the given bid request is valid.
@@ -82,6 +84,10 @@ export const spec = {
         adTypes: bid.adTypes || getSize(sizes)
       }, bid.params);
 
+      if (bid.mediaTypes.video && bid.mediaTypes.video.playerSize) {
+        placement.video = bid.mediaTypes.video;
+      }
+
       if (placement.networkId && placement.siteId && placement.unitId && placement.unitName) {
         data.placements.push(placement);
       }
@@ -155,6 +161,13 @@ export const spec = {
 
           if (decision.mediaType) {
             bid.meta.mediaType = decision.mediaType;
+
+            if (decision.mediaType === 'video') {
+              bid.mediaType = 'video';
+              bid.vastUrl = decision.vastUrl || undefined;
+              bid.vastXml = decision.vastXml || undefined;
+              bid.videoCacheKey = decision.uuid || undefined;
+            }
           }
 
           bidResponses.push(bid);
@@ -240,8 +253,13 @@ function getSize(sizes) {
 }
 
 function retrieveAd(decision, unitId, unitName) {
-  let ad = decision.contents && decision.contents[0] && decision.contents[0].body + createTrackPixelHtml(decision.impressionUrl);
-
+  let ad;
+  if (decision.contents && decision.contents[0]) {
+    ad = decision.contents[0].body + createTrackPixelHtml(decision.impressionUrl);
+  }
+  if (decision.vastXml) {
+    ad = decision.vastXml;
+  }
   return ad;
 }
 
diff --git a/test/spec/modules/consumableBidAdapter_spec.js b/test/spec/modules/consumableBidAdapter_spec.js
index 4e860cb771d..f71cf26b3f9 100644
--- a/test/spec/modules/consumableBidAdapter_spec.js
+++ b/test/spec/modules/consumableBidAdapter_spec.js
@@ -129,6 +129,53 @@ const BIDDER_REQUEST_2 = {
   }
 };
 
+const BIDDER_REQUEST_VIDEO = {
+  bidderCode: 'consumable',
+  auctionId: 'a4713c32-3762-4798-b342-4ab810ca770d',
+  bidderRequestId: '109f2a181342a9',
+  bidRequest: [
+    {
+      bidder: 'consumable',
+      params: {
+        networkId: 9969,
+        siteId: 730181,
+        unitId: 123456,
+        unitName: 'cnsmbl-unit'
+      },
+      placementCode: 'div-gpt-ad-1487778092495-0',
+      mediaTypes: {
+        video: {
+          playerSize: [188, 106],
+          context: 'instream',
+          mimes: ['application/javascript', 'application/x-mpegurl', 'video/3gpp', 'video/mp4', 'video/mpeg', 'video/ogg', 'video/webm', 'video/x-m4v', 'video/x-ms-asf', 'video/x-ms-wmv', 'video/x-msvideo'],
+          minduration: 0,
+          maxduration: 120,
+          protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+          api: [1, 2],
+          linearity: 1
+        }
+      },
+      bidId: '6202d555b2f94537',
+      bidderRequestId: '109f2a181342a9',
+      auctionId: 'a4713c32-3762-4798-b342-4ab810ca770d'
+    }
+  ],
+  gdprConsent: {
+    consentString: 'consent-test',
+    gdprApplies: true
+  },
+  refererInfo: {
+    referer: 'http://example.com/page.html',
+    reachedTop: true,
+    numIframes: 2,
+    stack: [
+      'http://example.com/page.html',
+      'http://example.com/iframe1.html',
+      'http://example.com/iframe2.html'
+    ]
+  }
+};
+
 const BIDDER_REQUEST_EMPTY = {
   bidderCode: 'consumable',
   auctionId: 'b06458ef-4fe5-4a0b-a61b-bccbcedb7b11',
@@ -259,6 +306,58 @@ const AD_SERVER_RESPONSE_2 = {
   }
 };
 
+const AD_SERVER_RESPONSE_VIDEO_1 = {
+  'headers': null,
+  'body': {
+    'user': { 'key': 'ue1-2d33e91b71e74929b4aeecc23f4376f1' },
+    'pixels': [{ 'type': 'image', 'url': '//sync.serverbid.com/ss/' }],
+    'decisions': {
+      '6202d555b2f94537': {
+        'adId': 3866158402,
+        'creativeId': 'C1-somo-test-video',
+        'width': 640,
+        'height': 480,
+        'pricing': {
+          'clearPrice': 1.58
+        },
+        'vastUrl': 'https://x.serverbid.com/rtb/v?auc=217c051d06b011ed9cbc72b17f01ec03&sc=1.575&s=22&a=9dcab16d340d664310c2135a76989fe946a9d46e5d5f24ff5e2f17bffbb7704a43638bd3f600951e&n=9&r=0&t=1658158906595',
+        'uuid': 'f1e7287514ce11ed9c1de2b3ba87449a',
+        'bidderName': 'consumable',
+        'adomain': ['consumabletv.com'],
+        'cats': ['IAB3-1'],
+        'mediaType': 'video',
+        'networkId': 1
+      }
+    }
+  }
+};
+
+const AD_SERVER_RESPONSE_VIDEO_2 = {
+  'headers': null,
+  'body': {
+    'user': { 'key': 'ue1-2d33e91b71e74929b4aeecc23f4376f1' },
+    'pixels': [{ 'type': 'image', 'url': '//sync.serverbid.com/ss/' }],
+    'decisions': {
+      '6202d555b2f94537': {
+        'adId': 3866158402,
+        'creativeId': 'C1-somo-test-video',
+        'width': 640,
+        'height': 480,
+        'pricing': {
+          'clearPrice': 1.58
+        },
+        'vastXml': '<VAST version="3.0">',
+        'uuid': 'f1e7287514ce11ed9c1de2b3ba87449a',
+        'bidderName': 'consumable',
+        'adomain': ['consumabletv.com'],
+        'cats': ['IAB3-1'],
+        'mediaType': 'video',
+        'networkId': 1
+      }
+    }
+  }
+};
+
 const BUILD_REQUESTS_OUTPUT = {
   method: 'POST',
   url: 'https://e.serverbid.com/api/v2',
@@ -267,6 +366,14 @@ const BUILD_REQUESTS_OUTPUT = {
   bidderRequest: BIDDER_REQUEST_2
 };
 
+const BUILD_REQUESTS_VIDEO_OUTPUT = {
+  method: 'POST',
+  url: 'https://e.serverbid.com/api/v2',
+  data: '',
+  bidRequest: BIDDER_REQUEST_VIDEO.bidRequest,
+  bidderRequest: BIDDER_REQUEST_VIDEO
+};
+
 describe('Consumable BidAdapter', function () {
   let adapter = spec;
 
@@ -382,6 +489,13 @@ describe('Consumable BidAdapter', function () {
 
       expect(data.coppa).to.be.undefined;
     });
+
+    it('should contain video object for video requests', function () {
+      let request = spec.buildRequests(BIDDER_REQUEST_VIDEO.bidRequest, BIDDER_REQUEST_VIDEO);
+      let data = JSON.parse(request.data);
+
+      expect(data.placements[0].video).to.deep.equal(BIDDER_REQUEST_VIDEO.bidRequest[0].mediaTypes.video);
+    });
   });
   describe('interpretResponse validation', function () {
     it('response should have valid bidderCode', function () {
@@ -421,6 +535,31 @@ describe('Consumable BidAdapter', function () {
       });
     });
 
+    it('registers video bids with vastUrl', function () {
+      let bids = spec.interpretResponse(AD_SERVER_RESPONSE_VIDEO_1, BUILD_REQUESTS_VIDEO_OUTPUT);
+
+      bids.forEach(b => {
+        expect(b.mediaType).to.equal('video');
+        expect(b.meta).to.have.property('mediaType', 'video');
+        expect(b.vastUrl).to.equal('https://x.serverbid.com/rtb/v?auc=217c051d06b011ed9cbc72b17f01ec03&sc=1.575&s=22&a=9dcab16d340d664310c2135a76989fe946a9d46e5d5f24ff5e2f17bffbb7704a43638bd3f600951e&n=9&r=0&t=1658158906595');
+        expect(b.vastXml).to.be.undefined;
+        expect(b.videoCacheKey).to.equal('f1e7287514ce11ed9c1de2b3ba87449a');
+      });
+    })
+
+    it('registers video bids with vastXml', function () {
+      let bids = spec.interpretResponse(AD_SERVER_RESPONSE_VIDEO_2, BUILD_REQUESTS_VIDEO_OUTPUT);
+
+      bids.forEach(b => {
+        expect(b.mediaType).to.equal('video');
+        expect(b.meta).to.have.property('mediaType', 'video');
+        expect(b.vastXml).to.equal('<VAST version="3.0">');
+        expect(b.vastUrl).to.be.undefined;
+        expect(b.ad).to.equal('<VAST version="3.0">');
+        expect(b.videoCacheKey).to.equal('f1e7287514ce11ed9c1de2b3ba87449a');
+      });
+    })
+
     it('handles nobid responses', function () {
       let EMPTY_RESP = Object.assign({}, AD_SERVER_RESPONSE, {'body': {'decisions': null}})
       let bids = spec.interpretResponse(EMPTY_RESP, BUILD_REQUESTS_OUTPUT);

From 5e983cde34630acf35e354a8f25ebbbcbf5018d4 Mon Sep 17 00:00:00 2001
From: Vic R <103455651+victorlassomarketing@users.noreply.github.com>
Date: Wed, 17 Aug 2022 08:20:41 -0700
Subject: [PATCH 151/569] Lasso Bid Adapter: update version and request
 credential setting (#8848)

* update Lasso adapter request setting

* update empty ad response logic
---
 modules/lassoBidAdapter.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/lassoBidAdapter.js b/modules/lassoBidAdapter.js
index b2f3ccf9a7c..da48bc460c7 100644
--- a/modules/lassoBidAdapter.js
+++ b/modules/lassoBidAdapter.js
@@ -47,7 +47,7 @@ export const spec = {
         params: JSON.stringify(bidRequest.params),
         crumbs: JSON.stringify(bidRequest.crumbs),
         prebidVersion: '$prebid.version$',
-        version: 1,
+        version: 2,
         coppa: config.getConfig('coppa') == true ? 1 : 0,
         ccpa: bidderRequest.uspConsent || undefined
       }
@@ -57,7 +57,7 @@ export const spec = {
         url: getBidRequestUrl(aimXR),
         data: payload,
         options: {
-          withCredentials: false
+          withCredentials: true
         },
       };
     });
@@ -67,7 +67,7 @@ export const spec = {
     const response = serverResponse && serverResponse.body;
     const bidResponses = [];
 
-    if (!response) {
+    if (!response || !response.bid.ad) {
       return bidResponses;
     }
 

From 984b5cfa7752da9282620f17ecbcd7e2b3283631 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Wed, 17 Aug 2022 08:21:44 -0700
Subject: [PATCH 152/569] Prebid core: fix bug with some native assets being
 lost from ortb native responses (#8785)

* Prebid core: fix bug with some native assets being lost from ortb native responses

* Do not throw if native response contains assets that were not requested
---
 src/native.js            | 109 +++++++++++++++++++--------------------
 test/spec/native_spec.js |  96 ++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+), 57 deletions(-)

diff --git a/src/native.js b/src/native.js
index bd20aa5d399..470ac0b9a32 100644
--- a/src/native.js
+++ b/src/native.js
@@ -366,34 +366,9 @@ export function getNativeTargeting(bid, {index = auctionManager.index} = {}) {
   return keyValues;
 }
 
-/**
- * Constructs a message object containing asset values for each of the
- * requested data keys.
- */
-export function getAssetMessage(data, adObject) {
-  const message = {
-    message: 'assetResponse',
-    adId: data.adId,
-    assets: [],
-  };
-
-  if (adObject.native.hasOwnProperty('adTemplate')) {
-    message.adTemplate = getAssetValue(adObject.native['adTemplate']);
-  } if (adObject.native.hasOwnProperty('rendererUrl')) {
-    message.rendererUrl = getAssetValue(adObject.native['rendererUrl']);
-  }
-
-  data.assets.forEach(asset => {
-    const key = getKeyByValue(CONSTANTS.NATIVE_KEYS, asset);
-    const value = getAssetValue(adObject.native[key]);
-
-    message.assets.push({ key, value });
-  });
-
-  return message;
-}
+const getNativeRequest = (bidResponse) => auctionManager.index.getAdUnit(bidResponse)?.nativeOrtbRequest;
 
-export function getAllAssetsMessage(data, adObject, {getNativeReq = (bidResponse) => auctionManager.index.getAdUnit(bidResponse).nativeOrtbRequest} = {}) {
+function assetsMessage(data, adObject, keys, {getNativeReq = getNativeRequest} = {}) {
   const message = {
     message: 'assetResponse',
     adId: data.adId,
@@ -401,12 +376,12 @@ export function getAllAssetsMessage(data, adObject, {getNativeReq = (bidResponse
 
   // Pass to Prebid Universal Creative all assets, the legacy ones + the ortb ones (under ortb property)
   const ortbRequest = getNativeReq(adObject);
-  let nativeReq = adObject.native;
+  let nativeResp = adObject.native;
   const ortbResponse = adObject.native?.ortb;
   let legacyResponse = {};
   if (ortbRequest && ortbResponse) {
     legacyResponse = toLegacyResponse(ortbResponse, ortbRequest);
-    nativeReq = {
+    nativeResp = {
       ...adObject.native,
       ...legacyResponse
     };
@@ -416,20 +391,20 @@ export function getAllAssetsMessage(data, adObject, {getNativeReq = (bidResponse
   }
   message.assets = [];
 
-  Object.keys(nativeReq).forEach(function(key) {
-    if (key === 'adTemplate' && nativeReq[key]) {
-      message.adTemplate = getAssetValue(nativeReq[key]);
-    } else if (key === 'rendererUrl' && nativeReq[key]) {
-      message.rendererUrl = getAssetValue(nativeReq[key]);
+  (keys == null ? Object.keys(nativeResp) : keys).forEach(function(key) {
+    if (key === 'adTemplate' && nativeResp[key]) {
+      message.adTemplate = getAssetValue(nativeResp[key]);
+    } else if (key === 'rendererUrl' && nativeResp[key]) {
+      message.rendererUrl = getAssetValue(nativeResp[key]);
     } else if (key === 'ext') {
-      Object.keys(nativeReq[key]).forEach(extKey => {
-        if (nativeReq[key][extKey]) {
-          const value = getAssetValue(nativeReq[key][extKey]);
+      Object.keys(nativeResp[key]).forEach(extKey => {
+        if (nativeResp[key][extKey]) {
+          const value = getAssetValue(nativeResp[key][extKey]);
           message.assets.push({ key: extKey, value });
         }
       })
-    } else if (nativeReq[key] && CONSTANTS.NATIVE_KEYS.hasOwnProperty(key)) {
-      const value = getAssetValue(nativeReq[key]);
+    } else if (nativeResp[key] && CONSTANTS.NATIVE_KEYS.hasOwnProperty(key)) {
+      const value = getAssetValue(nativeResp[key]);
 
       message.assets.push({ key, value });
     }
@@ -437,6 +412,19 @@ export function getAllAssetsMessage(data, adObject, {getNativeReq = (bidResponse
   return message;
 }
 
+/**
+ * Constructs a message object containing asset values for each of the
+ * requested data keys.
+ */
+export function getAssetMessage(data, adObject, {getNativeReq = getNativeRequest} = {}) {
+  const keys = data.assets.map((k) => getKeyByValue(CONSTANTS.NATIVE_KEYS, k));
+  return assetsMessage(data, adObject, keys, {getNativeReq});
+}
+
+export function getAllAssetsMessage(data, adObject, {getNativeReq = getNativeRequest} = {}) {
+  return assetsMessage(data, adObject, null, {getNativeReq});
+}
+
 /**
  * Native assets can be a string or an object with a url prop. Returns the value
  * appropriate for sending in adserver targeting or placeholder replacement.
@@ -689,40 +677,47 @@ export function legacyPropertiesToOrtbNative(legacyNative) {
 }
 
 export function toOrtbNativeResponse(legacyResponse, ortbRequest) {
-  // copy the request, so we don't pollute it with response data below
-  ortbRequest = deepClone(ortbRequest);
-
   const ortbResponse = {
     ...legacyPropertiesToOrtbNative(legacyResponse),
     assets: []
   };
+
+  function useRequestAsset(predicate, fn) {
+    let asset = ortbRequest.assets.find(predicate);
+    if (asset != null) {
+      asset = deepClone(asset);
+      fn(asset);
+      ortbResponse.assets.push(asset);
+    }
+  }
+
   Object.keys(legacyResponse).filter(key => !!legacyResponse[key]).forEach(key => {
     const value = legacyResponse[key];
     switch (key) {
       // process titles
       case 'title':
-        const titleAsset = ortbRequest.assets.find(asset => asset.title != null);
-        titleAsset.title = {
-          text: value
-        };
-        ortbResponse.assets.push(titleAsset);
+        useRequestAsset(asset => asset.title != null, titleAsset => {
+          titleAsset.title = {
+            text: value
+          };
+        })
         break;
       case 'image':
       case 'icon':
         const imageType = key === 'image' ? NATIVE_IMAGE_TYPES.MAIN : NATIVE_IMAGE_TYPES.ICON;
-        const imageAsset = ortbRequest.assets.find(asset => asset.img != null && asset.img.type == imageType);
-        imageAsset.img = {
-          url: value
-        };
-        ortbResponse.assets.push(imageAsset);
+        useRequestAsset(asset => asset.img != null && asset.img.type === imageType, imageAsset => {
+          imageAsset.img = {
+            url: value
+          };
+        })
         break;
       default:
         if (key in PREBID_NATIVE_DATA_KEYS_TO_ORTB) {
-          const dataAsset = ortbRequest.assets.find(asset => asset.data != null && asset.data.type === NATIVE_ASSET_TYPES[PREBID_NATIVE_DATA_KEYS_TO_ORTB[key]]);
-          dataAsset.data = {
-            value
-          };
-          ortbResponse.assets.push(dataAsset);
+          useRequestAsset(asset => asset.data != null && asset.data.type === NATIVE_ASSET_TYPES[PREBID_NATIVE_DATA_KEYS_TO_ORTB[key]], dataAsset => {
+            dataAsset.data = {
+              value
+            };
+          })
         }
         break;
     }
diff --git a/test/spec/native_spec.js b/test/spec/native_spec.js
index a6f8e7ae891..19f417bd88f 100644
--- a/test/spec/native_spec.js
+++ b/test/spec/native_spec.js
@@ -400,6 +400,66 @@ describe('native.js', function () {
       value: bid.native.ext.foo,
     });
   });
+
+  const SAMPLE_ORTB_REQUEST = toOrtbNativeRequest({
+    title: 'vtitle',
+    body: 'vbody'
+  });
+  const SAMPLE_ORTB_RESPONSE = {
+    native: {
+      ortb: {
+        link: {
+          url: 'url'
+        },
+        assets: [
+          {
+            id: 0,
+            title: {
+              text: 'vtitle'
+            }
+          },
+          {
+            id: 1,
+            data: {
+              value: 'vbody'
+            }
+          }
+        ]
+      }
+    }
+  }
+  describe('getAllAssetsMessage', () => {
+    it('returns assets in legacy format for ortb responses', () => {
+      const actual = getAllAssetsMessage({}, SAMPLE_ORTB_RESPONSE, {getNativeReq: () => SAMPLE_ORTB_REQUEST});
+      expect(actual.assets).to.eql([
+        {
+          key: 'clickUrl',
+          value: 'url'
+        },
+        {
+          key: 'title',
+          value: 'vtitle'
+        },
+        {
+          key: 'body',
+          value: 'vbody'
+        },
+      ])
+    });
+  });
+  describe('getAssetsMessage', () => {
+    Object.entries({
+      'hb_native_title': {key: 'title', value: 'vtitle'},
+      'hb_native_body': {key: 'body', value: 'vbody'}
+    }).forEach(([tkey, assetVal]) => {
+      it(`returns ${tkey} asset in legacy format for ortb responses`, () => {
+        const actual = getAssetMessage({
+          assets: [tkey]
+        }, SAMPLE_ORTB_RESPONSE, {getNativeReq: () => SAMPLE_ORTB_REQUEST})
+        expect(actual.assets).to.eql([assetVal])
+      })
+    })
+  })
 });
 
 describe('validate native openRTB', function () {
@@ -1022,3 +1082,39 @@ describe('fireClickTrackers', () => {
     urls.forEach(url => sinon.assert.calledWith(fetchURL, url));
   })
 })
+
+describe('toOrtbNativeResponse', () => {
+  it('should work when there are unrequested assets in the response', () => {
+    const legacyResponse = {
+      'title': 'vtitle',
+      'body': 'vbody'
+    }
+    const request = toOrtbNativeRequest({
+      title: {
+        required: 'true'
+      },
+
+    });
+    const ortbResponse = toOrtbNativeResponse(legacyResponse, request);
+    expect(ortbResponse.assets.length).to.eql(1);
+  });
+
+  it('should not modify the request', () => {
+    const legacyResponse = {
+      title: 'vtitle'
+    }
+    const request = toOrtbNativeRequest({
+      title: {
+        required: true
+      }
+    });
+    const requestCopy = JSON.parse(JSON.stringify(request));
+    const response = toOrtbNativeResponse(legacyResponse, request);
+    expect(request).to.eql(requestCopy);
+    sinon.assert.match(response.assets[0], {
+      title: {
+        text: 'vtitle'
+      }
+    })
+  })
+})

From a4fdf7d98d7d0b1522d1fa3b1fbf47d2c5230e93 Mon Sep 17 00:00:00 2001
From: omerBrowsi <54346241+omerBrowsi@users.noreply.github.com>
Date: Wed, 17 Aug 2022 20:45:03 +0300
Subject: [PATCH 153/569] Browsi RTD Module: add support for page view billable
 events (#8829)

* real time data module,
browsi sub module for real time data,
new hook bidsBackCallback,
fix for config unsubscribe

* change timeout&primary ad server only to auctionDelay
update docs

* support multiple providers

* change promise to callbacks
configure submodule on submodules.json

* bug fixes

* use Prebid ajax

* tests fix

* browsi real time data provider improvements

* real time data module,
browsi sub module for real time data,
new hook bidsBackCallback,
fix for config unsubscribe

* change timeout&primary ad server only to auctionDelay
update docs

* support multiple providers

* change promise to callbacks
configure submodule on submodules.json

* bug fixes

* use Prebid ajax

* tests fix

* browsi real time data provider improvements

* Browsi RTD provider - add billiable event type

* Browsi RTD provider - add billiable event type

* lint fixes
---
 modules/browsiRtdProvider.js                | 34 ++++++++++++-----
 test/spec/modules/browsiRtdProvider_spec.js | 41 ++++++++++++++++++++-
 2 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/modules/browsiRtdProvider.js b/modules/browsiRtdProvider.js
index ffc946cbb33..d39e500e4f9 100644
--- a/modules/browsiRtdProvider.js
+++ b/modules/browsiRtdProvider.js
@@ -57,6 +57,16 @@ export function addBrowsiTag(data) {
   return script;
 }
 
+export function sendPageviewEvent(eventType) {
+  if (eventType === 'PAGEVIEW') {
+    events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+      vendor: 'browsi',
+      type: 'pageview',
+      billingId: generateUUID()
+    })
+  }
+}
+
 /**
  * collect required data from page
  * send data to browsi server to get predictions
@@ -262,10 +272,11 @@ function getPredictionsFromServer(url) {
           try {
             const data = JSON.parse(response);
             if (data && data.p && data.kn) {
-              setData({p: data.p, kn: data.kn, pmd: data.pmd});
+              setData({p: data.p, kn: data.kn, pmd: data.pmd, bet: data.bet});
             } else {
               setData({});
             }
+            sendPageviewEvent(data.bet);
             addBrowsiTag(data);
           } catch (err) {
             logError('unable to parse data');
@@ -336,19 +347,22 @@ export const browsiSubmodule = {
 
 function getTargetingData(uc, c, us, a) {
   const targetingData = getRTD(uc);
-  const auctionId = a.auctionId
+  const auctionId = a.auctionId;
+  const sendAdRequestEvent = _browsiData['bet'] === 'AD_REQUEST';
   uc.forEach(auc => {
     if (isNumber(_ic[auc])) {
       _ic[auc] = _ic[auc] + 1;
     }
-    const transactionId = a.adUnits.find(adUnit => adUnit.code === auc).transactionId;
-    events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
-      vendor: 'browsi',
-      type: 'adRequest',
-      billingId: generateUUID(),
-      transactionId: transactionId,
-      auctionId: auctionId
-    })
+    if (sendAdRequestEvent) {
+      const transactionId = a.adUnits.find(adUnit => adUnit.code === auc).transactionId;
+      events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+        vendor: 'browsi',
+        type: 'adRequest',
+        billingId: generateUUID(),
+        transactionId: transactionId,
+        auctionId: auctionId
+      })
+    }
   });
   logInfo('Browsi RTD provider returned targeting data', targetingData, 'for', uc)
   return targetingData;
diff --git a/test/spec/modules/browsiRtdProvider_spec.js b/test/spec/modules/browsiRtdProvider_spec.js
index c36b48c5105..19483047827 100644
--- a/test/spec/modules/browsiRtdProvider_spec.js
+++ b/test/spec/modules/browsiRtdProvider_spec.js
@@ -3,6 +3,7 @@ import {makeSlot} from '../integration/faker/googletag.js';
 import * as utils from '../../../src/utils'
 import * as events from '../../../src/events';
 import * as sinon from 'sinon';
+import {sendPageviewEvent} from '../../../modules/browsiRtdProvider.js';
 
 describe('browsi Real time  data sub module', function () {
   const conf = {
@@ -160,7 +161,19 @@ describe('browsi Real time  data sub module', function () {
     })
   })
 
-  describe('should emit billable event', function () {
+  describe('should emit ad request billable event', function () {
+    before(() => {
+      const data = {
+        p: {
+          'adUnit1': {ps: {0: 0.234}},
+          'adUnit2': {ps: {0: 0.134}}},
+        kn: 'bv',
+        pmd: undefined,
+        bet: 'AD_REQUEST'
+      };
+      browsiRTD.setData(data);
+    })
+
     beforeEach(() => {
       eventsEmitSpy.resetHistory();
     })
@@ -232,4 +245,30 @@ describe('browsi Real time  data sub module', function () {
       expect(callArguments).to.eql(expectedCall);
     })
   })
+
+  describe('should emit pageveiw billable event', function () {
+    beforeEach(() => {
+      eventsEmitSpy.resetHistory();
+    })
+    it('should send event if type is correct', function () {
+      sendPageviewEvent('PAGEVIEW')
+
+      const expectedCall = {
+        vendor: 'browsi',
+        type: 'pageview',
+      }
+
+      expect(eventsEmitSpy.callCount).to.equal(1);
+      const callArguments = eventsEmitSpy.getCalls()[0].args[1];
+      // billing id is random, we can't check its value
+      delete callArguments['billingId'];
+      expect(callArguments).to.eql(expectedCall);
+    })
+    it('should not send event if type is incorrect', function () {
+      sendPageviewEvent('AD_REQUEST');
+      sendPageviewEvent('INACTIVE');
+      sendPageviewEvent(undefined);
+      expect(eventsEmitSpy.callCount).to.equal(0);
+    })
+  })
 });

From 2fd7e0f5b88892ac0116050d4c386a621dacf64d Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Wed, 17 Aug 2022 11:02:09 -0700
Subject: [PATCH 154/569] Readme: remove dead dev dependency and maintenance
 badges (#8849)

* Readme: remove dead dev dependency badge and issue

* Remove maintainability and add back issues
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 11dc01e8f07..bbc0d79ab41 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 [![Build Status](https://circleci.com/gh/prebid/Prebid.js.svg?style=svg)](https://circleci.com/gh/prebid/Prebid.js)
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/prebid/Prebid.js.svg)](http://isitmaintained.com/project/prebid/Prebid.js "Percentage of issues still open")
-[![Code Climate](https://codeclimate.com/github/prebid/Prebid.js/badges/gpa.svg)](https://codeclimate.com/github/prebid/Prebid.js)
 [![Coverage Status](https://coveralls.io/repos/github/prebid/Prebid.js/badge.svg)](https://coveralls.io/github/prebid/Prebid.js)
-[![devDependencies Status](https://david-dm.org/prebid/Prebid.js/dev-status.svg)](https://david-dm.org/prebid/Prebid.js?type=dev)
 [![Total Alerts](https://img.shields.io/lgtm/alerts/g/prebid/Prebid.js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/prebid/Prebid.js/alerts/)
 
 # Prebid.js

From c5f33d36c691448dcba967a172f8dc75b4285082 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Wed, 17 Aug 2022 19:56:47 +0000
Subject: [PATCH 155/569] Prebid 7.11.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 749fafaebc4..01d037dee63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.10.0-pre",
+  "version": "7.11.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 58898eb0110..2b0a7215765 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.11.0-pre",
+  "version": "7.11.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 059b7c5cbf25806f09af9dc21604260b53507d7e Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Wed, 17 Aug 2022 19:56:48 +0000
Subject: [PATCH 156/569] Increment version to 7.12.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 01d037dee63..a6ae1e5a3e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.11.0",
+  "version": "7.12.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 2b0a7215765..a9a4c120c48 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.11.0",
+  "version": "7.12.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 94d34d1783fd6712613247d6696b8cc2ca9579a6 Mon Sep 17 00:00:00 2001
From: m-oranskaya <99481039+m-oranskaya@users.noreply.github.com>
Date: Thu, 18 Aug 2022 20:13:17 +1100
Subject: [PATCH 157/569] Adriver Bid and Id Modules: buyerid bug fix (#8768)

* initial commit

* adriver id submodule add

* add id system tests, fix adriver bid adapter tests

* adriver: fix buyerid

* remarks fixing

* removal of excess

* delete custom parameter

* bug fixes
---
 modules/adriverBidAdapter.js                | 17 +++++------------
 modules/adriverIdSystem.js                  |  3 ++-
 test/spec/modules/adriverBidAdapter_spec.js | 19 ++++++-------------
 test/spec/modules/adriverIdSystem_spec.js   | 11 +++--------
 4 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/modules/adriverBidAdapter.js b/modules/adriverBidAdapter.js
index e95f83d2c7b..b19c8318754 100644
--- a/modules/adriverBidAdapter.js
+++ b/modules/adriverBidAdapter.js
@@ -1,6 +1,6 @@
 // ADRIVER BID ADAPTER for Prebid 1.13
 import { logInfo, getWindowLocation, getBidIdParameter, _each } from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const BIDDER_CODE = 'adriver';
@@ -22,8 +22,6 @@ export const spec = {
   },
 
   buildRequests: function (validBidRequests, bidderRequest) {
-    logInfo('validBidRequests', validBidRequests);
-
     let win = getWindowLocation();
     let customID = Math.round(Math.random() * 999999999) + '-' + Math.round(new Date() / 1000) + '-1-46-';
     let siteId = getBidIdParameter('siteid', validBidRequests[0].params) + '';
@@ -99,22 +97,17 @@ export const spec = {
       });
     });
 
-    let userid = validBidRequests[0].userId;
-    let adrcidCookie = storage.getDataFromLocalStorage('adrcid') || validBidRequests[0].userId.adrcid;
-
+    let adrcidCookie = storage.getDataFromLocalStorage('adrcid') || validBidRequests[0].userId?.adrcid;
     if (adrcidCookie) {
-      payload.adrcid = adrcidCookie;
-      payload.id5 = userid.id5id;
-      payload.sharedid = userid.pubcid;
-      payload.unifiedid = userid.tdid;
+      payload.user.buyerid = adrcidCookie;
     }
     const payloadString = JSON.stringify(payload);
 
     return {
       method: 'POST',
       url: ADRIVER_BID_URL,
-      data: payloadString,
-    };
+      data: payloadString
+    }
   },
 
   interpretResponse: function (serverResponse, bidRequest) {
diff --git a/modules/adriverIdSystem.js b/modules/adriverIdSystem.js
index 6a492fac508..fb8ce99ec16 100644
--- a/modules/adriverIdSystem.js
+++ b/modules/adriverIdSystem.js
@@ -73,7 +73,8 @@ export const adriverIdSubmodule = {
             callback();
           }
         };
-        ajax(url, callbacks, undefined, {method: 'GET'});
+        let newUrl = url + '&cid=' + (storage.getDataFromLocalStorage('adrcid') || storage.getCookie('adrcid'));
+        ajax(newUrl, callbacks, undefined, {method: 'GET'});
       }
     };
     return {callback: resp};
diff --git a/test/spec/modules/adriverBidAdapter_spec.js b/test/spec/modules/adriverBidAdapter_spec.js
index 12c0a15fb06..33084877c14 100644
--- a/test/spec/modules/adriverBidAdapter_spec.js
+++ b/test/spec/modules/adriverBidAdapter_spec.js
@@ -297,25 +297,18 @@ describe('adriverAdapter', function () {
       { adrcid: undefined }
     ]
     cookieValues.forEach(cookieValue => describe('test cookie exist or not behavior', function () {
-      let expectedValues = {
-        adrcid: cookieValue.adrcid,
-        at: '',
-        cur: '',
-        tmax: '',
-        site: '',
-        id: '',
-        user: '',
-        device: '',
-        imp: ''
-      }
+      let expectedValues = [
+        'buyerid',
+        'ext'
+      ]
 
       it('check adrcid if it exists', function () {
         bidRequests[0].userId.adrcid = cookieValue.adrcid;
         const payload = JSON.parse(spec.buildRequests(bidRequests).data);
         if (cookieValue.adrcid) {
-          expect(Object.keys(payload)).to.have.members(Object.keys(expectedValues));
+          expect(Object.keys(payload.user)).to.have.members(expectedValues);
         } else {
-          expect(payload.adrcid).to.equal(undefined);
+          expect(payload.user.buyerid).to.equal(0);
         }
       });
     }));
diff --git a/test/spec/modules/adriverIdSystem_spec.js b/test/spec/modules/adriverIdSystem_spec.js
index 29d965d5ed4..bc7d3f191d2 100644
--- a/test/spec/modules/adriverIdSystem_spec.js
+++ b/test/spec/modules/adriverIdSystem_spec.js
@@ -32,7 +32,6 @@ describe('AdriverIdSystem', function () {
       expect(request.url).to.include('https://ad.adriver.ru/cgi-bin/json.cgi');
       request.respond(503, null, 'Unavailable');
       expect(logErrorStub.calledOnce).to.be.true;
-      expect(callbackSpy.calledOnce).to.be.true;
     });
 
     it('test call user sync url with the right params', function() {
@@ -67,16 +66,12 @@ describe('AdriverIdSystem', function () {
         let request = server.requests[0];
         request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ adrcid: response.adrcid }));
 
-        let expectedExpiration = new Date();
-        expectedExpiration.setTime(expectedExpiration.getTime() + 86400 * 1825 * 1000);
+        let now = new Date();
+        now.setTime(now.getTime() + 86400 * 1825 * 1000);
         const minimalDate = new Date(0).toString();
 
-        function dateStringFor(date, maxDeltaMs = 2000) {
-          return sinon.match((val) => Math.abs(date.getTime() - new Date(val).getTime()) <= maxDeltaMs)
-        }
-
         if (response.adrcid) {
-          expect(setCookieStub.calledWith('adrcid', response.adrcid, dateStringFor(expectedExpiration))).to.be.true;
+          expect(setCookieStub.calledWith('adrcid', response.adrcid, now.toUTCString())).to.be.true;
           expect(setLocalStorageStub.calledWith('adrcid', response.adrcid)).to.be.true;
         } else {
           expect(setCookieStub.calledWith('adrcid', '', minimalDate)).to.be.false;

From 940339a3ebb9d425af261ab1535d32b3717c49ac Mon Sep 17 00:00:00 2001
From: Love Sharma <sharmak.love@gmail.com>
Date: Thu, 18 Aug 2022 09:36:21 -0400
Subject: [PATCH 158/569] handle native response privacy link (#8838)

Co-authored-by: Zicong Zhou <zicong.zhou@indexexchange.com>
---
 src/native.js            |   1 +
 test/spec/native_spec.js | 144 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+)

diff --git a/src/native.js b/src/native.js
index 470ac0b9a32..0e48470d300 100644
--- a/src/native.js
+++ b/src/native.js
@@ -735,6 +735,7 @@ function toLegacyResponse(ortbResponse, ortbRequest) {
   const legacyResponse = {};
   const requestAssets = ortbRequest?.assets || [];
   legacyResponse.clickUrl = ortbResponse.link.url;
+  legacyResponse.privacyLink = ortbResponse.privacy;
   for (const asset of ortbResponse?.assets || []) {
     const requestAsset = requestAssets.find(reqAsset => asset.id === reqAsset.id);
     if (asset.title) {
diff --git a/test/spec/native_spec.js b/test/spec/native_spec.js
index 19f417bd88f..08491edeb64 100644
--- a/test/spec/native_spec.js
+++ b/test/spec/native_spec.js
@@ -44,6 +44,106 @@ const bid = {
   },
 };
 
+const ortbBid = {
+  adId: '123',
+  transactionId: 'au',
+  native: {
+    ortb: {
+      assets: [
+        {
+          id: 0,
+          title: {
+            text: 'Native Creative'
+          }
+        },
+        {
+          id: 1,
+          data: {
+            value: 'Cool description great stuff'
+          }
+        },
+        {
+          id: 2,
+          data: {
+            value: 'Do it'
+          }
+        },
+        {
+          id: 3,
+          img: {
+            url: 'http://cdn.example.com/p/creative-image/image.png',
+            h: 83,
+            w: 127
+          }
+        },
+        {
+          id: 4,
+          img: {
+            url: 'http://cdn.example.com/p/creative-image/icon.jpg',
+            h: 742,
+            w: 989
+          }
+        },
+        {
+          id: 5,
+          data: {
+            value: 'AppNexus',
+            type: 1
+          }
+        }
+      ],
+      link: {
+        url: 'https://www.link.example'
+      },
+      privacy: 'https://privacy-link.example',
+      ver: '1.2'
+    }
+  },
+};
+
+const ortbRequest = {
+  assets: [
+    {
+      id: 0,
+      required: 0,
+      title: {
+        len: 140
+      }
+    }, {
+      id: 1,
+      required: 0,
+      data: {
+        type: 2
+      }
+    }, {
+      id: 2,
+      required: 0,
+      data: {
+        type: 12
+      }
+    }, {
+      id: 3,
+      required: 0,
+      img: {
+        type: 3
+      }
+    }, {
+      id: 4,
+      required: 0,
+      img: {
+        type: 1
+      }
+    }, {
+      id: 5,
+      required: 0,
+      data: {
+        type: 1
+      }
+    }
+  ],
+  ver: '1.2'
+}
+
 const bidWithUndefinedFields = {
   transactionId: 'au',
   native: {
@@ -401,6 +501,50 @@ describe('native.js', function () {
     });
   });
 
+  it('creates native all asset message with OpenRTB format', function () {
+    const messageRequest = {
+      message: 'Prebid Native',
+      action: 'allAssetRequest',
+      adId: '123',
+    };
+
+    const message = getAllAssetsMessage(messageRequest, ortbBid, {getNativeReq: () => ortbRequest});
+
+    expect(message.assets.length).to.equal(8);
+    expect(message.assets).to.deep.include({
+      key: 'body',
+      value: bid.native.body,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'image',
+      value: bid.native.image.url,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'clickUrl',
+      value: bid.native.clickUrl,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'title',
+      value: bid.native.title,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'icon',
+      value: bid.native.icon.url,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'cta',
+      value: bid.native.cta,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'sponsoredBy',
+      value: bid.native.sponsoredBy,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'privacyLink',
+      value: ortbBid.native.ortb.privacy,
+    });
+  });
+
   const SAMPLE_ORTB_REQUEST = toOrtbNativeRequest({
     title: 'vtitle',
     body: 'vbody'

From 8ef12d1f21b3866f2b47c2a65c22ed49b767496d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9onard=20Labat?= <le.labat@criteo.com>
Date: Thu, 18 Aug 2022 15:49:58 +0200
Subject: [PATCH 159/569] Criteo Bid Adapter - Add support for banner+native
 multiformat ad unit (#8842)

Previously, the use of a native adunit was exclusive with the banner type.
---
 modules/criteoBidAdapter.js                | 32 +++++++-----
 test/spec/modules/criteoBidAdapter_spec.js | 61 +++++++++++++---------
 2 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 1c269b2bba4..98aa58f5a70 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -469,15 +469,20 @@ function buildCdbRequest(context, bidRequests, bidderRequest) {
       if (bidRequest.params.publisherSubId) {
         slot.publishersubid = bidRequest.params.publisherSubId;
       }
-      if (bidRequest.params.nativeCallback || deepAccess(bidRequest, `mediaTypes.${NATIVE}`)) {
+
+      if (bidRequest.params.nativeCallback || hasNativeMediaType(bidRequest)) {
         slot.native = true;
         if (!checkNativeSendId(bidRequest)) {
           logWarn(LOG_PREFIX + 'all native assets containing URL should be sent as placeholders with sendId(icon, image, clickUrl, displayUrl, privacyLink, privacyIcon)');
         }
-        slot.sizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'), parseNativeSize);
-      } else {
+      }
+
+      if (hasBannerMediaType(bidRequest)) {
         slot.sizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'), parseSize);
+      } else {
+        slot.sizes = [];
       }
+
       if (hasVideoMediaType(bidRequest)) {
         const video = {
           playersizes: parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'), parseSize),
@@ -554,17 +559,18 @@ function parseSize(size) {
   return size[0] + 'x' + size[1];
 }
 
-function parseNativeSize(size) {
-  if (size[0] === undefined && size[1] === undefined) {
-    return '2x2';
-  }
-  return size[0] + 'x' + size[1];
-}
-
 function hasVideoMediaType(bidRequest) {
   return deepAccess(bidRequest, 'mediaTypes.video') !== undefined;
 }
 
+function hasBannerMediaType(bidRequest) {
+  return deepAccess(bidRequest, 'mediaTypes.banner') !== undefined;
+}
+
+function hasNativeMediaType(bidRequest) {
+  return deepAccess(bidRequest, 'mediaTypes.native') !== undefined;
+}
+
 function hasValidVideoMediaType(bidRequest) {
   let isValid = true;
 
@@ -646,18 +652,18 @@ function enrichSlotWithFloors(slot, bidRequest) {
       if (bidRequest.mediaTypes?.banner) {
         slotFloors.banner = {};
         const bannerSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'))
-        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = bidRequest.getFloor({size: bannerSize, mediaType: BANNER}));
+        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = bidRequest.getFloor({ size: bannerSize, mediaType: BANNER }));
       }
 
       if (bidRequest.mediaTypes?.video) {
         slotFloors.video = {};
         const videoSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'))
-        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = bidRequest.getFloor({size: videoSize, mediaType: VIDEO}));
+        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = bidRequest.getFloor({ size: videoSize, mediaType: VIDEO }));
       }
 
       if (bidRequest.mediaTypes?.native) {
         slotFloors.native = {};
-        slotFloors.native['*'] = bidRequest.getFloor({size: '*', mediaType: NATIVE});
+        slotFloors.native['*'] = bidRequest.getFloor({ size: '*', mediaType: NATIVE });
       }
 
       if (Object.keys(slotFloors).length > 0) {
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index 7252232676f..7af5f5d77a2 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -13,7 +13,7 @@ import * as utils from 'src/utils.js';
 import * as refererDetection from 'src/refererDetection.js';
 import { config } from '../../../src/config.js';
 import * as storageManager from 'src/storageManager.js';
-import {BANNER, NATIVE, VIDEO} from '../../../src/mediaTypes.js';
+import { BANNER, NATIVE, VIDEO } from '../../../src/mediaTypes.js';
 
 describe('The Criteo bidding adapter', function () {
   let utilsMock, sandbox;
@@ -707,7 +707,7 @@ describe('The Criteo bidding adapter', function () {
       expect(ortbRequest.slots[0].sizes[0]).to.equal('undefinedxundefined');
     });
 
-    it('should properly detect and get sizes of native sizeless banner', function () {
+    it('should properly detect and forward native flag', function () {
       const bidRequests = [
         {
           mediaTypes: {
@@ -722,11 +722,10 @@ describe('The Criteo bidding adapter', function () {
       ];
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const ortbRequest = request.data;
-      expect(ortbRequest.slots[0].sizes).to.have.lengthOf(1);
-      expect(ortbRequest.slots[0].sizes[0]).to.equal('2x2');
+      expect(ortbRequest.slots[0].native).to.equal(true);
     });
 
-    it('should properly detect and get size of native sizeless banner', function () {
+    it('should properly detect and forward native flag', function () {
       const bidRequests = [
         {
           mediaTypes: {
@@ -741,8 +740,7 @@ describe('The Criteo bidding adapter', function () {
       ];
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const ortbRequest = request.data;
-      expect(ortbRequest.slots[0].sizes).to.have.lengthOf(1);
-      expect(ortbRequest.slots[0].sizes[0]).to.equal('2x2');
+      expect(ortbRequest.slots[0].native).to.equal(true);
     });
 
     it('should properly build a networkId request', function () {
@@ -1258,11 +1256,13 @@ describe('The Criteo bidding adapter', function () {
             if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
               return {
                 currency: 'USD',
-                floor: 1.0};
+                floor: 1.0
+              };
             } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
               return {
                 currency: 'USD',
-                floor: 2.0};
+                floor: 2.0
+              };
             } else {
               return {}
             }
@@ -1273,9 +1273,10 @@ describe('The Criteo bidding adapter', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.slots[0].ext.floors).to.deep.equal({
         'banner': {
-          '300x250': {'currency': 'USD', 'floor': 1},
-          '728x90': {'currency': 'USD', 'floor': 2}
-        }});
+          '300x250': { 'currency': 'USD', 'floor': 1 },
+          '728x90': { 'currency': 'USD', 'floor': 2 }
+        }
+      });
     });
 
     it('should properly build a video request with several player sizes with floors', function () {
@@ -1297,11 +1298,13 @@ describe('The Criteo bidding adapter', function () {
             if (inputParams.mediaType === VIDEO && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
               return {
                 currency: 'USD',
-                floor: 1.0};
+                floor: 1.0
+              };
             } else if (inputParams.mediaType === VIDEO && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
               return {
                 currency: 'USD',
-                floor: 2.0};
+                floor: 2.0
+              };
             } else {
               return {}
             }
@@ -1312,9 +1315,10 @@ describe('The Criteo bidding adapter', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.slots[0].ext.floors).to.deep.equal({
         'video': {
-          '300x250': {'currency': 'USD', 'floor': 1},
-          '728x90': {'currency': 'USD', 'floor': 2}
-        }});
+          '300x250': { 'currency': 'USD', 'floor': 1 },
+          '728x90': { 'currency': 'USD', 'floor': 2 }
+        }
+      });
     });
 
     it('should properly build a multi format request with floors', function () {
@@ -1347,19 +1351,23 @@ describe('The Criteo bidding adapter', function () {
             if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
               return {
                 currency: 'USD',
-                floor: 1.0};
+                floor: 1.0
+              };
             } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
               return {
                 currency: 'USD',
-                floor: 2.0};
+                floor: 2.0
+              };
             } else if (inputParams.mediaType === VIDEO && inputParams.size[0] === 640 && inputParams.size[1] === 480) {
               return {
                 currency: 'EUR',
-                floor: 3.2};
+                floor: 3.2
+              };
             } else if (inputParams.mediaType === NATIVE && inputParams.size === '*') {
               return {
                 currency: 'YEN',
-                floor: 4.99};
+                floor: 4.99
+              };
             } else {
               return {}
             }
@@ -1371,15 +1379,16 @@ describe('The Criteo bidding adapter', function () {
       expect(request.data.slots[0].ext.data.someContextAttribute).to.deep.equal('abc');
       expect(request.data.slots[0].ext.floors).to.deep.equal({
         'banner': {
-          '300x250': {'currency': 'USD', 'floor': 1},
-          '728x90': {'currency': 'USD', 'floor': 2}
+          '300x250': { 'currency': 'USD', 'floor': 1 },
+          '728x90': { 'currency': 'USD', 'floor': 2 }
         },
         'video': {
-          '640x480': {'currency': 'EUR', 'floor': 3.2}
+          '640x480': { 'currency': 'EUR', 'floor': 3.2 }
         },
         'native': {
-          '*': {'currency': 'YEN', 'floor': 4.99}
-        }});
+          '*': { 'currency': 'YEN', 'floor': 4.99 }
+        }
+      });
     });
   });
 

From 442931dd2f257826db611725120e0ee748423d74 Mon Sep 17 00:00:00 2001
From: wsusrasp <106743463+wsusrasp@users.noreply.github.com>
Date: Thu, 18 Aug 2022 16:51:46 +0200
Subject: [PATCH 160/569] Ras Bid Adapter: support for SlotSequence parameter
 (#8792)

* add rasbidadapter pos param

* Read pos off the adunit

* rename conflicting pos parameter for clarity
---
 modules/rasBidAdapter.js                |  8 ++++++++
 modules/rasBidAdapter.md                | 27 +++++++++++++------------
 test/spec/modules/rasBidAdapter_spec.js |  2 ++
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/modules/rasBidAdapter.js b/modules/rasBidAdapter.js
index 909b6a7b795..7bc3cf66b0d 100644
--- a/modules/rasBidAdapter.js
+++ b/modules/rasBidAdapter.js
@@ -1,3 +1,4 @@
+import * as utils from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { isEmpty, getAdUnitSizes, parseSizesInput, deepAccess } from '../src/utils.js';
@@ -92,11 +93,18 @@ const getSlots = (bidRequests) => {
   const batchSize = bidRequests.length;
   for (let i = 0; i < batchSize; i++) {
     const adunit = bidRequests[i];
+    const slotSequence = utils.deepAccess(adunit, 'params.slotSequence');
+
     const sizes = parseSizesInput(getAdUnitSizes(adunit)).join(',');
+
     queryString += `&slot${i}=${encodeURIComponent(adunit.params.slot)}&id${i}=${encodeURIComponent(adunit.bidId)}&composition${i}=CHILD`;
+
     if (sizes.length) {
       queryString += `&iusizes${i}=${encodeURIComponent(sizes)}`;
     }
+    if (slotSequence !== undefined) {
+      queryString += `&pos${i}=${encodeURIComponent(slotSequence)}`;
+    }
   }
   return queryString;
 };
diff --git a/modules/rasBidAdapter.md b/modules/rasBidAdapter.md
index 5cf75c3446d..384ba0b611f 100644
--- a/modules/rasBidAdapter.md
+++ b/modules/rasBidAdapter.md
@@ -34,17 +34,18 @@ var adUnits = [{
 
 # Parameters
 
-| Name | Scope | Type | Description | Example
-| --- | --- | --- | --- | ---
-| network | required | String | Specific identifier provided by RAS | `"4178463"`
-| site | required | String | Specific identifier name (case-insensitive) that is associated with this ad unit and provided by RAS | `"example_com"`
-| area | required | String | Ad unit category name; only case-insensitive alphanumeric with underscores and hyphens are allowed | `"sport"`
-| slot | required | String | Ad unit placement name (case-insensitive) provided by RAS | `"slot"`
-| pageContext | optional | Object | Web page context data | `{}`
-| pageContext.dr | optional | String | Document referrer URL address | `"https://example.com/"`
-| pageContext.du | optional | String | Document URL address | `"https://example.com/sport/football/article.html?id=932016a5-02fc-4d5c-b643-fafc2f270f06"`
+| Name | Scope | Type | Description                                                                                                                                                                                                                                                               | Example
+| --- | --- | --- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| ---
+| network | required | String | Specific identifier provided by RAS                                                                                                                                                                                                                                       | `"4178463"`
+| site | required | String | Specific identifier name (case-insensitive) that is associated with this ad unit and provided by RAS                                                                                                                                                                      | `"example_com"`
+| area | required | String | Ad unit category name; only case-insensitive alphanumeric with underscores and hyphens are allowed                                                                                                                                                                        | `"sport"`
+| slot | required | String | Ad unit placement name (case-insensitive) provided by RAS                                                                                                                                                                                                                 | `"slot"`
+| slotSequence  | optional | Number | Ad unit sequence position provided by RAS                                                                                                                                                                                                                            | `1`
+| pageContext | optional | Object | Web page context data                                                                                                                                                                                                                                                     | `{}`
+| pageContext.dr | optional | String | Document referrer URL address                                                                                                                                                                                                                                             | `"https://example.com/"`
+| pageContext.du | optional | String | Document URL address                                                                                                                                                                                                                                                      | `"https://example.com/sport/football/article.html?id=932016a5-02fc-4d5c-b643-fafc2f270f06"`
 | pageContext.dv | optional | String | Document virtual address as slash-separated path that may consist of any number of parts (case-insensitive alphanumeric with underscores and hyphens); first part should be the same as `site` value and second as `area` value; next parts may reflect website navigation | `"example_com/sport/football"`
-| pageContext.keyWords | optional | String[] | List of keywords associated with this ad unit; only case-insensitive alphanumeric with underscores and hyphens are allowed | `["euro", "lewandowski"]`
-| pageContext.keyValues | optional | Object | Key-values associated with this ad unit (case-insensitive); following characters are not allowed in the values: `" ' = ! + # * ~ ; ^ ( ) < > [ ] & @` | `{}`
-| pageContext.keyValues.ci | optional | String | Content unique identifier | `"932016a5-02fc-4d5c-b643-fafc2f270f06"`
-| pageContext.keyValues.adunit | optional | String | Ad unit name | `"example_com/sport"`
+| pageContext.keyWords | optional | String[] | List of keywords associated with this ad unit; only case-insensitive alphanumeric with underscores and hyphens are allowed                                                                                                                                                | `["euro", "lewandowski"]`
+| pageContext.keyValues | optional | Object | Key-values associated with this ad unit (case-insensitive); following characters are not allowed in the values: `" ' = ! + # * ~ ; ^ ( ) < > [ ] & @`                                                                                                                     | `{}`
+| pageContext.keyValues.ci | optional | String | Content unique identifier                                                                                                                                                                                                                                                 | `"932016a5-02fc-4d5c-b643-fafc2f270f06"`
+| pageContext.keyValues.adunit | optional | String | Ad unit name                                                                                                                                                                                                                                                              | `"example_com/sport"`
diff --git a/test/spec/modules/rasBidAdapter_spec.js b/test/spec/modules/rasBidAdapter_spec.js
index 324bf782672..8c378aaa416 100644
--- a/test/spec/modules/rasBidAdapter_spec.js
+++ b/test/spec/modules/rasBidAdapter_spec.js
@@ -58,6 +58,7 @@ describe('rasBidAdapter', function () {
         slot: 'test',
         area: 'areatest',
         site: 'test',
+        slotSequence: '0',
         network: '4178463'
       }
     };
@@ -140,6 +141,7 @@ describe('rasBidAdapter', function () {
       expect(requests[0].url).to.have.string('DV=test%2Fareatest');
       expect(requests[0].url).to.have.string('kwrd=val1%2Bval2');
       expect(requests[0].url).to.have.string('kvadunit=test%2Fareatest');
+      expect(requests[0].url).to.have.string('pos0=0');
     });
   });
 

From d77309aad8fc00faaddf42da163ace477c41e91e Mon Sep 17 00:00:00 2001
From: Catalin Ciocov <catalin.ciocov@gmail.com>
Date: Thu, 18 Aug 2022 17:54:53 +0300
Subject: [PATCH 161/569] Improve Digital adapter: refactor code to align with
 latest RAZR creative tags (#8827)

---
 modules/improvedigitalBidAdapter.js           | 78 ++++++++++++-------
 src/adloader.js                               |  3 +-
 .../modules/improvedigitalBidAdapter_spec.js  | 22 +++---
 3 files changed, 61 insertions(+), 42 deletions(-)

diff --git a/modules/improvedigitalBidAdapter.js b/modules/improvedigitalBidAdapter.js
index 4996f0efaf0..c8fc8eb7a2a 100644
--- a/modules/improvedigitalBidAdapter.js
+++ b/modules/improvedigitalBidAdapter.js
@@ -19,6 +19,7 @@ import {Renderer} from '../src/Renderer.js';
 import {createEidsArray} from './userId/eids.js';
 import {hasPurpose1Consent} from '../src/utils/gpdr.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import {loadExternalScript} from '../src/adloader.js';
 
 const BIDDER_CODE = 'improvedigital';
 const CREATIVE_TTL = 300;
@@ -212,7 +213,7 @@ export const spec = {
 
         ID_RESPONSE.buildAd(bid, bidRequest, bidObject);
 
-        ID_RAZR.addBidData({
+        ID_RAZR.forwardBid({
           bidRequest,
           bid
         });
@@ -640,37 +641,58 @@ const ID_OUTSTREAM = {
 };
 
 const ID_RAZR = {
-  RENDERER_URL: 'https://razr.improvedigital.com/renderer.js',
-  addBidData({bid, bidRequest}) {
-    if (this.isValidBid(bid)) {
-      bid.renderer = Renderer.install({
-        url: this.RENDERER_URL,
-        config: {bidRequest}
-      });
-      bid.renderer.setRender(this.render);
+  RENDERER_URL: 'https://cdn.360yield.com/razr/tag.js',
+
+  forwardBid({bidRequest, bid}) {
+    if (bid.mediaType !== BANNER) {
+      return;
     }
-  },
 
-  isValidBid(bid) {
-    return bid && /razr:\/\//.test(bid.ad);
+    const cfg = {
+      prebid: {
+        bidRequest,
+        bid
+      }
+    };
+
+    const cfgStr = JSON.stringify(cfg).replace(/<\/script>/g, '\\x3C/script>');
+    const s = `<script>window.__razr_config = ${cfgStr};</script>`;
+    bid.ad = bid.ad.replace(/<body[^>]*>/, match => match + s);
+
+    this.installListener();
   },
 
-  render(bid) {
-    const {bidRequest} = bid.renderer.getConfig();
-
-    const payload = {
-      type: 'prebid',
-      bidRequest,
-      bid,
-      config: mergeDeep(
-        {},
-        config.getConfig('improvedigital.rendererConfig'),
-        deepAccess(bidRequest, 'params.rendererConfig')
-      )
-    };
+  installListener() {
+    if (this._listenerInstalled) {
+      return;
+    }
+
+    window.addEventListener('message', function(e) {
+      const data = e.data?.razr?.load;
+      if (!data) {
+        return;
+      }
+
+      if (e.source) {
+        data.source = e.source;
+        if (data.id) {
+          e.source.postMessage({
+            razr: {
+              id: data.id
+            }
+          }, '*');
+        }
+      }
+
+      const ns = window.razr = window.razr || {};
+      ns.q = ns.q || [];
+      ns.q.push(data);
+
+      if (!ns.loaded) {
+        loadExternalScript(ID_RAZR.RENDERER_URL, BIDDER_CODE);
+      }
+    });
 
-    const razr = window.razr = window.razr || {};
-    razr.queue = razr.queue || [];
-    razr.queue.push(payload);
+    this._listenerInstalled = true;
   }
 };
diff --git a/src/adloader.js b/src/adloader.js
index 1e7995a9dc6..6b7427d3e52 100644
--- a/src/adloader.js
+++ b/src/adloader.js
@@ -18,7 +18,8 @@ const _approvedLoadExternalJSList = [
   'ftrackId',
   'inskin',
   'hadron',
-  'medianet'
+  'medianet',
+  'improvedigital'
 ]
 
 /**
diff --git a/test/spec/modules/improvedigitalBidAdapter_spec.js b/test/spec/modules/improvedigitalBidAdapter_spec.js
index a882f5ca5ef..19e91cbde96 100644
--- a/test/spec/modules/improvedigitalBidAdapter_spec.js
+++ b/test/spec/modules/improvedigitalBidAdapter_spec.js
@@ -1031,7 +1031,7 @@ describe('Improve Digital Adapter Tests', function () {
         width: 728,
         height: 90,
         ttl: 300,
-        ad: '<html><body style="margin:0%"><a href="https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com" target="_blank"><img style="border: 0;" border="0" width=728 height=90 src="https://creative.360yield.com/file/241121/728x90.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="510265" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
+        ad: '<html><body style="margin:0%"><script>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688,"keyValues":{"testKey":["testValue"]},"bidFloor":0.05,"bidFloorCur":"eUR","size":{"w":800,"h":600}},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]}},"sizes":[[300,250],[160,600]]},"bid":{"requestId":"33e9500b21129f","cpm":1.9200543539802946,"creativeId":"510265","currency":"EUR","dealId":320896,"meta":{"advertiserDomains":[]},"netRevenue":false,"ttl":300,"mediaType":"banner","ad":"<html><body style=\\"margin:0%\\"><a href=\\"https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com\\" target=\\"_blank\\"><img style=\\"border: 0;\\" border=\\"0\\" width=728 height=90 src=\\"https://creative.360yield.com/file/241121/728x90.jpg\\" alt=\\" \\"/></a><img src=\\"https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk\\" alt=\\" \\" style=\\"display:none\\"/><improvedigital_ad_output_information tp_id=\\"\\" buyer_id=\\"0\\" rtb_advertiser=\\"\\" campaign_id=\\"123159\\" line_item_id=\\"320896\\" creative_id=\\"510265\\" crid=\\"0\\" placement_id=\\"22135702\\"></improvedigital_ad_output_information></body></html>","width":728,"height":90}}};</script><a href="https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com" target="_blank"><img style="border: 0;" border="0" width=728 height=90 src="https://creative.360yield.com/file/241121/728x90.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="510265" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
         creativeId: '510265',
         dealId: 320896,
         netRevenue: false,
@@ -1042,6 +1042,12 @@ describe('Improve Digital Adapter Tests', function () {
       }
     ];
 
+    const multiFormatExpectedBid = [
+      Object.assign({}, expectedBid[0], {
+        ad: '<html><body style="margin:0%"><script>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]},"native":{},"video":{"context":"outstream","playerSize":[640,480]}},"sizes":[[300,250],[160,600]],"nativeParams":{"body":{"required":true}}},"bid":{"requestId":"33e9500b21129f","cpm":1.9200543539802946,"creativeId":"510265","currency":"EUR","dealId":320896,"meta":{"advertiserDomains":[]},"netRevenue":false,"ttl":300,"mediaType":"banner","ad":"<html><body style=\\"margin:0%\\"><a href=\\"https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com\\" target=\\"_blank\\"><img style=\\"border: 0;\\" border=\\"0\\" width=728 height=90 src=\\"https://creative.360yield.com/file/241121/728x90.jpg\\" alt=\\" \\"/></a><img src=\\"https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk\\" alt=\\" \\" style=\\"display:none\\"/><improvedigital_ad_output_information tp_id=\\"\\" buyer_id=\\"0\\" rtb_advertiser=\\"\\" campaign_id=\\"123159\\" line_item_id=\\"320896\\" creative_id=\\"510265\\" crid=\\"0\\" placement_id=\\"22135702\\"></improvedigital_ad_output_information></body></html>","width":728,"height":90}}};</script><a href="https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com" target="_blank"><img style="border: 0;" border="0" width=728 height=90 src="https://creative.360yield.com/file/241121/728x90.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="510265" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>'
+      })
+    ];
+
     const expectedTwoBids = [
       expectedBid[0],
       {
@@ -1051,7 +1057,7 @@ describe('Improve Digital Adapter Tests', function () {
         width: 300,
         height: 250,
         ttl: 300,
-        ad: '<html><body style="margin:0%"><a href="https://na-ice.360yield.com/click/.2RC3VhfEsdhtcsRiT8bWksMTmBbkfnj1AaD3C6Bht.Bp85KK5vjzZvJMpigI4ECdhllWuzbk2UhQt8VEGq1tg8m1OEot7Gs94PplWYs2ESdXpGAPFHiqdbZstOOhfiWL4D.k6lXfgNmbRhpL.SktYeEAiRaOZHQAX.22IEQ0swRnEdNyjHXYEkNIgpvMLqkZTv.JYM.iW9NwyJLIqk4Djh8X301iRLxexGBTl7-.n93WbkSCVY6uwdXSzoQrtK1r3fTrS34rdgpqFt6ZIBLKWI2ByLM2.aQqfvev5BCMOeyEKY8CcSg9SoDiPyQsvcz9bTckLtqs3AD3Qu8I.2rGn1NID7ljgg6-dERrorPK9A5XK67Pv34UqUe2xILQ6wvi52dX4p5d3yxsI9BMfnxzkn7MullVJdn-NiSB2rTe2MFozJc5G1nEwtpsMwZpBxl00PCcMsyETtaKbhqa3Gq5nCuce4AEhL6109IrZscUUzBMSKLSX16HlFfmPZ.gDnWCI3lO35UbGdL7lKjbT9mHYQ-//http%3A%2F%2Fblah.com" target="_blank"><img style="border: 0;" border="0" width=300 height=250 src="https://creative.360yield.com/file/238052/test_ads-300x250.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=.2RC3VqxeCtOU3G5i6Wejh69dm5JnKlRXeieMtJA63nfGMyuFoWTTjSU5PfHLg2PtnmDRFgHJgGE19QyjAGj6ZQVy0iUk-HF-.zsAlx.7Fx3m5fPE7RIYw.kjy-BvuprFqfU-qlm03KTks6zVLDSIspuxemNQ1HBhq6QZSm9qqAVY-1XS-KbImfb.fll3VvhJXy7Ru.KstgDfAJwt5vYxVab6efvjAIhOrrv6uXaywFVTtu9-gK5pKgIkdixxuYE2jLUyEh9GiRyRCH0jhhUVUmSfrjE4OuTq-7TmCYXQQ5Vk9AqOV.JybF8d35IeyAbF2aywwdZA2SGGEGeYIoOy.7D8TpuVqXxvnUyeKXlCfmzXcJs27W2sKGUTfpWc-TyhAOHKzwqrxP-QN5D1QRCXFWgAm.rwUBguE-oL1Q7NOaCsaRwINRwvQrastWNFUDEYzrB32NL-wIkILdh9e96JwhKiwGwJ1VqH.6RDDutUi9CLreYQl348exTfqL44Ia5VTLn7e0rA6s9V1tg55V7TX36" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="479163" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
+        ad: '<html><body style="margin:0%"><script>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688,"keyValues":{"testKey":["testValue"]},"bidFloor":0.05,"bidFloorCur":"eUR","size":{"w":800,"h":600}},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]}},"sizes":[[300,250],[160,600]]},"bid":{"requestId":"33e9500b21129f","cpm":1.9200543539802946,"creativeId":"479163","currency":"EUR","dealId":320896,"meta":{"advertiserDomains":[]},"netRevenue":false,"ttl":300,"mediaType":"banner","ad":"<html><body style=\\"margin:0%\\"><a href=\\"https://na-ice.360yield.com/click/.2RC3VhfEsdhtcsRiT8bWksMTmBbkfnj1AaD3C6Bht.Bp85KK5vjzZvJMpigI4ECdhllWuzbk2UhQt8VEGq1tg8m1OEot7Gs94PplWYs2ESdXpGAPFHiqdbZstOOhfiWL4D.k6lXfgNmbRhpL.SktYeEAiRaOZHQAX.22IEQ0swRnEdNyjHXYEkNIgpvMLqkZTv.JYM.iW9NwyJLIqk4Djh8X301iRLxexGBTl7-.n93WbkSCVY6uwdXSzoQrtK1r3fTrS34rdgpqFt6ZIBLKWI2ByLM2.aQqfvev5BCMOeyEKY8CcSg9SoDiPyQsvcz9bTckLtqs3AD3Qu8I.2rGn1NID7ljgg6-dERrorPK9A5XK67Pv34UqUe2xILQ6wvi52dX4p5d3yxsI9BMfnxzkn7MullVJdn-NiSB2rTe2MFozJc5G1nEwtpsMwZpBxl00PCcMsyETtaKbhqa3Gq5nCuce4AEhL6109IrZscUUzBMSKLSX16HlFfmPZ.gDnWCI3lO35UbGdL7lKjbT9mHYQ-//http%3A%2F%2Fblah.com\\" target=\\"_blank\\"><img style=\\"border: 0;\\" border=\\"0\\" width=300 height=250 src=\\"https://creative.360yield.com/file/238052/test_ads-300x250.jpg\\" alt=\\" \\"/></a><img src=\\"https://na-ice.360yield.com/imp_pixel?ic=.2RC3VqxeCtOU3G5i6Wejh69dm5JnKlRXeieMtJA63nfGMyuFoWTTjSU5PfHLg2PtnmDRFgHJgGE19QyjAGj6ZQVy0iUk-HF-.zsAlx.7Fx3m5fPE7RIYw.kjy-BvuprFqfU-qlm03KTks6zVLDSIspuxemNQ1HBhq6QZSm9qqAVY-1XS-KbImfb.fll3VvhJXy7Ru.KstgDfAJwt5vYxVab6efvjAIhOrrv6uXaywFVTtu9-gK5pKgIkdixxuYE2jLUyEh9GiRyRCH0jhhUVUmSfrjE4OuTq-7TmCYXQQ5Vk9AqOV.JybF8d35IeyAbF2aywwdZA2SGGEGeYIoOy.7D8TpuVqXxvnUyeKXlCfmzXcJs27W2sKGUTfpWc-TyhAOHKzwqrxP-QN5D1QRCXFWgAm.rwUBguE-oL1Q7NOaCsaRwINRwvQrastWNFUDEYzrB32NL-wIkILdh9e96JwhKiwGwJ1VqH.6RDDutUi9CLreYQl348exTfqL44Ia5VTLn7e0rA6s9V1tg55V7TX36\\" alt=\\" \\" style=\\"display:none\\"/><improvedigital_ad_output_information tp_id=\\"\\" buyer_id=\\"0\\" rtb_advertiser=\\"\\" campaign_id=\\"123159\\" line_item_id=\\"320896\\" creative_id=\\"479163\\" crid=\\"0\\" placement_id=\\"22135702\\"></improvedigital_ad_output_information></body></html>","width":300,"height":250}}};</script><a href="https://na-ice.360yield.com/click/.2RC3VhfEsdhtcsRiT8bWksMTmBbkfnj1AaD3C6Bht.Bp85KK5vjzZvJMpigI4ECdhllWuzbk2UhQt8VEGq1tg8m1OEot7Gs94PplWYs2ESdXpGAPFHiqdbZstOOhfiWL4D.k6lXfgNmbRhpL.SktYeEAiRaOZHQAX.22IEQ0swRnEdNyjHXYEkNIgpvMLqkZTv.JYM.iW9NwyJLIqk4Djh8X301iRLxexGBTl7-.n93WbkSCVY6uwdXSzoQrtK1r3fTrS34rdgpqFt6ZIBLKWI2ByLM2.aQqfvev5BCMOeyEKY8CcSg9SoDiPyQsvcz9bTckLtqs3AD3Qu8I.2rGn1NID7ljgg6-dERrorPK9A5XK67Pv34UqUe2xILQ6wvi52dX4p5d3yxsI9BMfnxzkn7MullVJdn-NiSB2rTe2MFozJc5G1nEwtpsMwZpBxl00PCcMsyETtaKbhqa3Gq5nCuce4AEhL6109IrZscUUzBMSKLSX16HlFfmPZ.gDnWCI3lO35UbGdL7lKjbT9mHYQ-//http%3A%2F%2Fblah.com" target="_blank"><img style="border: 0;" border="0" width=300 height=250 src="https://creative.360yield.com/file/238052/test_ads-300x250.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=.2RC3VqxeCtOU3G5i6Wejh69dm5JnKlRXeieMtJA63nfGMyuFoWTTjSU5PfHLg2PtnmDRFgHJgGE19QyjAGj6ZQVy0iUk-HF-.zsAlx.7Fx3m5fPE7RIYw.kjy-BvuprFqfU-qlm03KTks6zVLDSIspuxemNQ1HBhq6QZSm9qqAVY-1XS-KbImfb.fll3VvhJXy7Ru.KstgDfAJwt5vYxVab6efvjAIhOrrv6uXaywFVTtu9-gK5pKgIkdixxuYE2jLUyEh9GiRyRCH0jhhUVUmSfrjE4OuTq-7TmCYXQQ5Vk9AqOV.JybF8d35IeyAbF2aywwdZA2SGGEGeYIoOy.7D8TpuVqXxvnUyeKXlCfmzXcJs27W2sKGUTfpWc-TyhAOHKzwqrxP-QN5D1QRCXFWgAm.rwUBguE-oL1Q7NOaCsaRwINRwvQrastWNFUDEYzrB32NL-wIkILdh9e96JwhKiwGwJ1VqH.6RDDutUi9CLreYQl348exTfqL44Ia5VTLn7e0rA6s9V1tg55V7TX36" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="479163" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
         creativeId: '479163',
         dealId: 320896,
         netRevenue: false,
@@ -1091,7 +1097,7 @@ describe('Improve Digital Adapter Tests', function () {
 
     it('should return a well-formed display bid for multi-format ad unit', function () {
       const bids = spec.interpretResponse(serverResponse, {bidderRequest: multiFormatBidderRequest});
-      expect(bids).to.deep.equal(expectedBid);
+      expect(bids).to.deep.equal(multiFormatExpectedBid);
     });
 
     it('should return two bids', function () {
@@ -1233,16 +1239,6 @@ describe('Improve Digital Adapter Tests', function () {
       bids = spec.interpretResponse(videoResponse, {bidderRequest: multiFormatBidderRequest});
       expect(bids[0].mediaType).to.equal(VIDEO);
     });
-
-    it('should not affect non-RAZR bids', function () {
-      const bids = spec.interpretResponse(serverResponse, {bidderRequest});
-      expect(bids[0].renderer).to.not.exist;
-    });
-
-    it('should detect RAZR bids', function () {
-      const bids = spec.interpretResponse(serverResponseRazr, {bidderRequest});
-      expect(bids[0].renderer).to.exist;
-    });
   });
 
   describe('getUserSyncs', function () {

From 4e9ccd5b207f7195bdd420b7ed0af6a29b16fb0d Mon Sep 17 00:00:00 2001
From: Love Sharma <sharmak.love@gmail.com>
Date: Thu, 18 Aug 2022 10:57:33 -0400
Subject: [PATCH 162/569] IX Bid Adapter: Native OpenRTB Request Support
 (#8853)

* fix native click trackers to only fire on click

* fix unit tests for ix

* remove version for native requests

* remove unnecessary request conversion

Co-authored-by: Zicong Zhou <zicong.zhou@indexexchange.com>
---
 modules/ixBidAdapter.js                | 319 +------------------------
 test/spec/modules/ixBidAdapter_spec.js | 314 ++++++++++++++++--------
 2 files changed, 223 insertions(+), 410 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index ce4fdcc2431..61e518d306d 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -25,7 +25,6 @@ import {find} from '../src/polyfill.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {INSTREAM, OUTSTREAM} from '../src/video.js';
 import {Renderer} from '../src/Renderer.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'ix';
 const ALIAS_BIDDER_CODE = 'roundel';
@@ -100,93 +99,6 @@ const VIDEO_PARAMS_ALLOW_LIST = [
   'delivery', 'pos', 'companionad', 'api', 'companiontype', 'ext',
   'playerSize', 'w', 'h'
 ];
-const NATIVE_ASSET_TYPES = {
-  TITLE: 100,
-  IMG: 200,
-  VIDEO: 300,
-  DATA: 400
-};
-const NATIVE_IMAGE_TYPES = {
-  ICON: 1,
-  MAIN: 3
-};
-const NATIVE_DATA_TYPES = {
-  SPONSORED: 1,
-  DESC: 2,
-  RATING: 3,
-  LIKES: 4,
-  DOWNLOADS: 5,
-  PRICE: 6,
-  SALEPRICE: 7,
-  PHONE: 8,
-  ADDRESS: 9,
-  DESC2: 10,
-  DISPLAYURL: 11,
-  CTATEXT: 12
-};
-const NATIVE_DATA_MAP = {
-  [NATIVE_DATA_TYPES.SPONSORED]: 'sponsoredBy',
-  [NATIVE_DATA_TYPES.DESC]: 'body',
-  [NATIVE_DATA_TYPES.RATING]: 'rating',
-  [NATIVE_DATA_TYPES.LIKES]: 'likes',
-  [NATIVE_DATA_TYPES.DOWNLOADS]: 'downloads',
-  [NATIVE_DATA_TYPES.PRICE]: 'price',
-  [NATIVE_DATA_TYPES.SALEPRICE]: 'salePrice',
-  [NATIVE_DATA_TYPES.PHONE]: 'phone',
-  [NATIVE_DATA_TYPES.ADDRESS]: 'address',
-  [NATIVE_DATA_TYPES.DESC2]: 'body2',
-  [NATIVE_DATA_TYPES.DISPLAYURL]: 'displayUrl',
-  [NATIVE_DATA_TYPES.CTATEXT]: 'cta'
-};
-const NATIVE_ASSETS_MAP = {
-  'title': { assetType: NATIVE_ASSET_TYPES.TITLE },
-  'icon': { assetType: NATIVE_ASSET_TYPES.IMG, subtype: NATIVE_IMAGE_TYPES.ICON },
-  'image': { assetType: NATIVE_ASSET_TYPES.IMG, subtype: NATIVE_IMAGE_TYPES.MAIN },
-  'sponsoredBy': { assetType: NATIVE_ASSET_TYPES.DATA, subtype: NATIVE_DATA_TYPES.SPONSORED },
-  'body': { assetType: NATIVE_ASSET_TYPES.DATA, subtype: NATIVE_DATA_TYPES.DESC },
-  'rating': { assetType: NATIVE_ASSET_TYPES.DATA, subtype: NATIVE_DATA_TYPES.RATING },
-  'likes': { assetType: NATIVE_ASSET_TYPES.DATA, subtype: NATIVE_DATA_TYPES.LIKES },
-  'downloads': { assetType: NATIVE_ASSET_TYPES.DATA, subtype: NATIVE_DATA_TYPES.DOWNLOADS },
-  'price': { assetType: NATIVE_ASSET_TYPES.DATA, subtype: NATIVE_DATA_TYPES.PRICE },
-  'salePrice': { assetType: NATIVE_ASSET_TYPES.DATA, subtype: NATIVE_DATA_TYPES.SALEPRICE },
-  'phone': { assetType: NATIVE_ASSET_TYPES.DATA, subtype: NATIVE_DATA_TYPES.PHONE },
-  'address': { assetType: NATIVE_ASSET_TYPES.DATA, subtype: NATIVE_DATA_TYPES.ADDRESS },
-  'body2': { assetType: NATIVE_ASSET_TYPES.DATA, subtype: NATIVE_DATA_TYPES.DESC2 },
-  'displayUrl': { assetType: NATIVE_ASSET_TYPES.DATA, subtype: NATIVE_DATA_TYPES.DISPLAYURL },
-  'cta': { assetType: NATIVE_ASSET_TYPES.DATA, subtype: NATIVE_DATA_TYPES.CTATEXT },
-  'video': { assetType: NATIVE_ASSET_TYPES.VIDEO }
-};
-const NATIVE_ALLOWED_PROPERTIES = [
-  'rendererUrl',
-  'sendTargetingKeys',
-  'adTemplate',
-  'type',
-  'ext',
-  'privacyLink',
-  'clickUrl',
-  'privacyIcon'
-];
-const NATIVE_ASSET_DEFAULT = {
-  TITLE: {
-    LEN: 25
-  },
-  VIDEO: {
-    MIMES: [
-      'video/mp4',
-      'video/webm'
-    ],
-    MINDURATION: 0,
-    MAXDURATION: 120,
-    PROTOCOLS: [2, 3, 5, 6],
-  }
-};
-const NATIVE_EVENT_TYPES = {
-  IMRESSION: 1
-};
-const NATIVE_EVENT_TRACKING_METHOD = {
-  IMG: 1,
-  JS: 2
-};
 const LOCAL_STORAGE_KEY = 'ixdiag';
 let hasRegisteredHandler = false;
 export const storage = getStorageManager({gvlid: GLOBAL_VENDOR_ID, bidderCode: BIDDER_CODE});
@@ -307,50 +219,13 @@ function bidToVideoImp(bid) {
  */
 function bidToNativeImp(bid) {
   const imp = bidToImp(bid);
-  const nativeAdUnitRef = deepAccess(bid, 'mediaTypes.native');
-
-  const assets = [];
-
-  // Convert all native assets to imp object
-  for (const [adUnitProperty, adUnitValues] of Object.entries(nativeAdUnitRef)) {
-    if (!NATIVE_ASSETS_MAP[adUnitProperty]) {
-      continue;
-    }
-
-    const { assetType, subtype } = NATIVE_ASSETS_MAP[adUnitProperty];
-    let asset;
-    switch (assetType) {
-      case NATIVE_ASSET_TYPES.TITLE:
-        asset = createNativeTitleRequest(adUnitValues);
-        break;
-      case NATIVE_ASSET_TYPES.IMG:
-        asset = createNativeImgRequest(adUnitValues, subtype);
-        break;
-      case NATIVE_ASSET_TYPES.VIDEO:
-        asset = createNativeVideoRequest(adUnitValues);
-        break;
-      case NATIVE_ASSET_TYPES.DATA:
-        asset = createNativeDataRequest(adUnitValues, subtype);
-        break;
-    }
-    asset.id = assetType + (subtype || 0);
-    assets.push(asset);
-  }
-
-  if (assets.length === 0) {
-    logWarn('IX Bid Adapter: Native bid does not contain recognised assets in [mediaTypes.native]');
-    return {};
-  }
 
-  const request = {
-    assets: assets,
-    ver: '1.2',
-    eventtrackers: [{
-      event: 1,
-      methods: [1, 2]
-    }],
-    privacy: 1
-  };
+  const request = bid.nativeOrtbRequest
+  request.eventtrackers = [{
+    event: 1,
+    methods: [1, 2]
+  }];
+  request.privacy = 1;
 
   imp.native = {
     request: JSON.stringify(request),
@@ -365,80 +240,6 @@ function bidToNativeImp(bid) {
   return imp;
 }
 
-/**
- * Converts native bid asset to a native impression asset
- * @param   {object} bidAsset PBJS bid asset object
- * @returns {object}          IX impression asset object
- */
-function createNativeTitleRequest(bidAsset) {
-  return {
-    required: bidAsset.required ? 1 : 0,
-    title: {
-      len: bidAsset.len ? bidAsset.len : NATIVE_ASSET_DEFAULT.TITLE.LEN,
-      ext: bidAsset.ext
-    }
-  }
-}
-
-/**
- * Converts native bid asset to a native impression asset
- * @param   {object} bidAsset PBJS bid asset object
- * @param   {int}    type     The image type
- * @returns {object}          IX impression asset object
- */
-function createNativeImgRequest(bidAsset, type) {
-  let asset = {
-    required: bidAsset.required ? 1 : 0,
-    img: {
-      type: type,
-      mimes: bidAsset.mimes,
-      ext: bidAsset.ext
-    }
-  }
-
-  if (bidAsset.hasOwnProperty('sizes') && bidAsset.sizes.length === 2) {
-    asset.img.wmin = bidAsset.sizes[0];
-    asset.img.hmin = bidAsset.sizes[1];
-  }
-
-  return asset
-}
-
-/**
- * Converts native bid asset to a native impression asset
- * @param   {object} bidAsset PBJS bid asset object
- * @returns {object}          IX impression asset object
- */
-function createNativeVideoRequest(bidAsset) {
-  return {
-    required: bidAsset.required ? 1 : 0,
-    video: {
-      mimes: bidAsset.mimes ? bidAsset.mimes : NATIVE_ASSET_DEFAULT.VIDEO.MIMES,
-      minduration: bidAsset.minduration ? bidAsset.minduration : NATIVE_ASSET_DEFAULT.VIDEO.MINDURATION,
-      maxduration: bidAsset.maxduration ? bidAsset.maxduration : NATIVE_ASSET_DEFAULT.VIDEO.MAXDURATION,
-      protocols: bidAsset.protocols ? bidAsset.protocols : NATIVE_ASSET_DEFAULT.VIDEO.PROTOCOLS,
-      ext: bidAsset.ext
-    }
-  }
-}
-
-/**
- * Converts native bid asset to a native impression asset
- * @param   {object} bidAsset PBJS bid asset object
- * @param   {int}    type     The image type
- * @returns {object}          IX impression asset object
- */
-function createNativeDataRequest(bidAsset, type) {
-  return {
-    required: bidAsset.required ? 1 : 0,
-    data: {
-      type: type,
-      len: bidAsset.len,
-      ext: bidAsset.ext
-    }
-  }
-}
-
 /**
  * Converts an incoming PBJS bid to an IX Impression
  * @param {object} bid   PBJS bid object
@@ -559,7 +360,7 @@ function parseBid(rawBid, currency, bidRequest) {
     bid.mediaTypes = bidRequest.mediaTypes;
     bid.ttl = isValidExpiry ? rawBid.exp : VIDEO_TIME_TO_LIVE;
   } else if (parsedAdm && parsedAdm.native) {
-    bid.native = interpretNativeAdm(parsedAdm.native);
+    bid.native = {ortb: parsedAdm.native};
     bid.width = rawBid.w ? rawBid.w : 1;
     bid.height = rawBid.h ? rawBid.h : 1;
     bid.mediaType = NATIVE;
@@ -583,84 +384,6 @@ function parseBid(rawBid, currency, bidRequest) {
   return bid;
 }
 
-/**
- * Parse native adm and set native asset key names recognized by Prebid.js
- * @param {string} adm Native adm complience
- */
-function interpretNativeAdm(nativeResponse) {
-  const native = {
-    clickUrl: nativeResponse.link.url,
-    privacyLink: nativeResponse.privacy
-  };
-
-  for (const asset of nativeResponse.assets) {
-    const subtype = asset.id % 100;
-    const assetType = asset.id - subtype;
-
-    switch (assetType) {
-      case NATIVE_ASSET_TYPES.TITLE:
-        native.title = asset.title && asset.title.text;
-        break;
-      case NATIVE_ASSET_TYPES.IMG:
-        const image = {
-          url: asset.img && asset.img.url,
-          height: asset.img && asset.img.h,
-          width: asset.img && asset.img.w
-        };
-        native[subtype === NATIVE_IMAGE_TYPES.ICON ? 'icon' : 'image'] = image;
-        break;
-      case NATIVE_ASSET_TYPES.VIDEO:
-        native.video = asset.video && asset.video.vasttag;
-        break;
-      case NATIVE_ASSET_TYPES.DATA:
-        setDataAsset(native, asset, subtype);
-        break;
-      default:
-        logWarn(`IX Bid Adapter: native asset ID ${asset.id} could not be recognized`);
-    }
-  }
-
-  setTrackers(native, nativeResponse);
-  return native;
-}
-
-function setDataAsset(native, asset, type) {
-  if (!(type in NATIVE_DATA_MAP)) {
-    logWarn(`IX Bid Adapter: native data asset type ${type} is not supported`);
-    return;
-  }
-  native[NATIVE_DATA_MAP[type]] = asset.data && asset.data.value;
-}
-
-function setTrackers(native, nativeResponse) {
-  native.impressionTrackers = []
-
-  if (Array.isArray(nativeResponse.imptrackers)) {
-    native.impressionTrackers.push(...nativeResponse.imptrackers)
-  }
-
-  if (Array.isArray(nativeResponse.link.clicktrackers)) {
-    native.impressionTrackers.push(...nativeResponse.link.clicktrackers)
-  }
-
-  if (Array.isArray(nativeResponse.eventtrackers)) {
-    nativeResponse.eventtrackers.forEach(tracker => {
-      if (tracker.event !== NATIVE_EVENT_TYPES.IMRESSION) {
-        return
-      }
-
-      switch (tracker.method) {
-        case NATIVE_EVENT_TRACKING_METHOD.IMG:
-          native.impressionTrackers.push(tracker.url);
-          break;
-        case NATIVE_EVENT_TRACKING_METHOD.JS:
-          native.javascriptTrackers = `<script src=\"${tracker.url}\"></script>`;
-          break;
-      }
-    })
-  }
-}
-
 /**
  * Determines whether or not the given object is valid size format.
  *
@@ -758,25 +481,13 @@ function isValidBidFloorParams(bidFloor, bidFloorCur) {
     bidFloorCur.match(curRegex));
 }
 
-function nativeMediaTypeValid(nativeObj) {
-  if (nativeObj === undefined) {
-    return true;
-  }
-
-  let hasValidAsset = false;
-
-  for (const property in nativeObj) {
-    if (!(property in NATIVE_ASSETS_MAP) && !NATIVE_ALLOWED_PROPERTIES.includes(property)) {
-      logError('IX Bid Adapter: native', { bidder: BIDDER_CODE, code: ERROR_CODES.PROPERTY_NOT_INCLUDED });
-      return false;
-    }
-
-    if (property in NATIVE_ASSETS_MAP) {
-      hasValidAsset = true;
-    }
+function nativeMediaTypeValid(bid) {
+  const nativeMediaTypes = deepAccess(bid, 'mediaTypes.native');
+  if (nativeMediaTypes === undefined) {
+    return true
   }
 
-  return hasValidAsset;
+  return bid.nativeOrtbRequest && Array.isArray(bid.nativeOrtbRequest.assets) && bid.nativeOrtbRequest.assets.length > 0
 }
 
 /**
@@ -837,8 +548,6 @@ function getEidInfo(allEids) {
  *
  */
 function buildRequest(validBidRequests, bidderRequest, impressions, version) {
-  // convert Native ORTB definition to old-style prebid native definition
-  validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
   // Always use secure HTTPS protocol.
   let baseUrl = SECURE_BID_URL;
   // Get ids from Prebid User ID Modules
@@ -966,7 +675,6 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
   // Use the siteId in the first bid request as the main siteId.
   siteID = validBidRequests[0].params.siteId;
   payload.s = siteID;
-  payload.v = version;
   if (version) {
     payload.v = version;
   }
@@ -1603,7 +1311,6 @@ export const spec = {
     const paramsSize = deepAccess(bid, 'params.size');
     const mediaTypeBannerSizes = deepAccess(bid, 'mediaTypes.banner.sizes');
     const mediaTypeVideoRef = deepAccess(bid, 'mediaTypes.video');
-    const mediaTypeNativeRef = deepAccess(bid, 'mediaTypes.native');
     const mediaTypeVideoPlayerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
     const hasBidFloor = bid.params.hasOwnProperty('bidFloor');
     const hasBidFloorCur = bid.params.hasOwnProperty('bidFloorCur');
@@ -1670,7 +1377,7 @@ export const spec = {
       }
     }
 
-    return nativeMediaTypeValid(mediaTypeNativeRef);
+    return nativeMediaTypeValid(bid);
   },
 
   /**
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index 243b702f03d..7360024eed2 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -10,7 +10,6 @@ describe('IndexexchangeAdapter', function () {
   const IX_SECURE_ENDPOINT = 'https://htlb.casalemedia.com/openrtb/pbjs';
   const VIDEO_ENDPOINT_VERSION = 8.1;
   const BANNER_ENDPOINT_VERSION = 7.2;
-  const NATIVE_ENDPOINT_VERSION = undefined;
 
   const SAMPLE_SCHAIN = {
     'ver': '1.0',
@@ -378,6 +377,7 @@ describe('IndexexchangeAdapter', function () {
             required: false
           },
           title: {
+            len: 25,
             required: true
           },
           body: {
@@ -387,13 +387,20 @@ describe('IndexexchangeAdapter', function () {
             required: true
           },
           video: {
-            required: false
+            required: false,
+            mimes: ['video/mp4', 'video/webm'],
+            minduration: 0,
+            maxduration: 120,
+            protocols: [2, 3, 5, 6]
           },
           sponsoredBy: {
             required: true
           }
         }
       },
+      nativeOrtbRequest: {
+        assets: [{id: 0, required: 0, img: {type: 1}}, {id: 1, required: 1, title: {len: 140}}, {id: 2, required: 1, data: {type: 2}}, {id: 3, required: 1, img: {type: 3}}, {id: 4, required: false, video: {mimes: ['video/mp4', 'video/webm'], minduration: 0, maxduration: 120, protocols: [2, 3, 5, 6]}}]
+      },
       adUnitCode: 'div-gpt-ad-1460505748563-0',
       transactionId: '173f49a8-7549-4218-a23c-e7ba59b47231',
       bidId: '1a2b3c4f',
@@ -432,6 +439,9 @@ describe('IndexexchangeAdapter', function () {
           }
         }
       },
+      nativeOrtbRequest: {
+        assets: [{id: 0, required: 0, img: {type: 1}}, {id: 1, required: 1, title: {len: 140}}, {id: 2, required: 1, data: {type: 2}}, {id: 3, required: 1, img: {type: 3}}, {id: 4, required: false, video: {mimes: ['video/mp4', 'video/webm'], minduration: 0, maxduration: 120, protocols: [2, 3, 5, 6]}}]
+      },
       adUnitCode: 'div-gpt-ad-1460505748562-0',
       transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
       bidId: '1a2b3c4e',
@@ -442,7 +452,7 @@ describe('IndexexchangeAdapter', function () {
   ];
 
   const DEFAULT_NATIVE_IMP = {
-    request: '{"assets":[{"required":0,"img":{"type":1},"id":201},{"required":1,"title":{"len":25},"id":100},{"required":1,"data":{"type":2},"id":402},{"required":1,"img":{"type":3},"id":203},{"required":0,"video":{"mimes":["video/mp4","video/webm"],"minduration":0,"maxduration":120,"protocols":[2,3,5,6]},"id":300},{"required":1,"data":{"type":1},"id":401}],"ver":"1.2","eventtrackers":[{"event":1,"methods":[1,2]}],"privacy":1}',
+    request: '{"assets":[{"id":0,"required":0,"img":{"type":1}},{"id":1,"required":1,"title":{"len":140}},{"id":2,"required":1,"data":{"type":2}},{"id":3,"required":1,"img":{"type":3}},{"id":4,"required":false,"video":{"mimes":["video/mp4","video/webm"],"minduration":0,"maxduration":120,"protocols":[2,3,5,6]}}],"eventtrackers":[{"event":1,"methods":[1,2]}],"privacy":1}',
     ver: '1.2'
   }
 
@@ -588,7 +598,7 @@ describe('IndexexchangeAdapter', function () {
               advbrandid: 303325,
               advbrand: 'OECTA'
             },
-            adm: '{"native":{"ver":"1.2","assets":[{"id":201,"img":{"url":"https://cdn.liftoff.io/customers/1209/creatives/2501-icon-250x250.png","w":250,"h":250}},{"id":203,"img":{"url":"https://cdn.liftoff.io/customers/5a9cab9cc6/image/lambda_png/a0355879b06c09b09232.png","w":1200,"h":627}},{"id":401,"data":{"value":"autodoc.co.uk"}},{"id":402,"data":{"value":"Les pièces automobiles dont vous avez besoin, toujours sous la main."}},{"id":100,"title":{"text":"Autodoc"}},{"id":300,"video":{"vasttag":"<VAST>blah</VAST>"}}],"link":{"url":"https://play.google.com/store/apps/details?id=de.autodoc.gmbh","clicktrackers":["https://click.liftoff.io/v1/campaign_click/blah"]},"eventtrackers":[{"event":1,"method":1,"url":"https://impression-europe.liftoff.io/index/impression"},{"event":1,"method":1,"url":"https://a701.casalemedia.com/impression/v1"}],"privacy":"https://privacy.link.com"}}'
+            adm: '{"native":{"ver":"1.2","assets":[{"id":0,"img":{"url":"https://cdn.liftoff.io/customers/1209/creatives/2501-icon-250x250.png","w":250,"h":250}},{"id":1,"img":{"url":"https://cdn.liftoff.io/customers/5a9cab9cc6/image/lambda_png/a0355879b06c09b09232.png","w":1200,"h":627}},{"id":2,"data":{"value":"autodoc.co.uk"}},{"id":3,"data":{"value":"Les pièces automobiles dont vous avez besoin, toujours sous la main."}},{"id":4,"title":{"text":"Autodoc"}},{"id":5,"video":{"vasttag":"<VAST>blah</VAST>"}}],"link":{"url":"https://play.google.com/store/apps/details?id=de.autodoc.gmbh","clicktrackers":["https://click.liftoff.io/v1/campaign_click/blah"]},"eventtrackers":[{"event":1,"method":1,"url":"https://impression-europe.liftoff.io/index/impression"},{"event":1,"method":1,"url":"https://a701.casalemedia.com/impression/v1"}],"privacy":"https://privacy.link.com"}}'
           }
         ],
         seat: '3970'
@@ -864,7 +874,7 @@ describe('IndexexchangeAdapter', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
 
-    it('should return true when required params found for a banner or video ad', function () {
+    it('should return true when required params found for a banner, video or native ad', function () {
       expect(spec.isBidRequestValid(DEFAULT_BANNER_VALID_BID[0])).to.equal(true);
       expect(spec.isBidRequestValid(DEFAULT_VIDEO_VALID_BID[0])).to.equal(true);
       expect(spec.isBidRequestValid(DEFAULT_NATIVE_VALID_BID[0])).to.equal(true);
@@ -1064,15 +1074,12 @@ describe('IndexexchangeAdapter', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
 
-    it('should fail when native contains unrecongized properties', function () {
+    it('should fail if native openRTB object contains no valid assets', function () {
       let bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID[0]);
-      bid.mediaTypes.native.test = {}
+      bid.nativeOrtbRequest = {}
       expect(spec.isBidRequestValid(bid)).to.be.false;
-    });
 
-    it('should fail if native mediaTypes should contains no valid assets', function () {
-      let bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID[0]);
-      bid.mediaTypes.native = {}
+      bid.nativeOrtbRequest = {assets: []}
       expect(spec.isBidRequestValid(bid)).to.be.false;
     });
   });
@@ -2145,7 +2152,7 @@ describe('IndexexchangeAdapter', function () {
       it('should have native request', () => {
         const nativeImpression = JSON.parse(request[1].data.r).imp[0];
 
-        expect(request[1].data.v).to.equal(NATIVE_ENDPOINT_VERSION);
+        expect(request[1].data.hasOwnProperty('v')).to.equal(false);
         expect(nativeImpression.id).to.equal(DEFAULT_NATIVE_VALID_BID[0].bidId);
         expect(nativeImpression.native).to.deep.equal(DEFAULT_NATIVE_IMP);
       });
@@ -2491,7 +2498,7 @@ describe('IndexexchangeAdapter', function () {
       const request = spec.buildRequests(DEFAULT_NATIVE_VALID_BID, DEFAULT_OPTION);
       const query = request[0].data;
 
-      expect(query.v).to.equal(NATIVE_ENDPOINT_VERSION);
+      expect(query.hasOwnProperty('v')).to.equal(false);
       expect(query.s).to.equal(DEFAULT_NATIVE_VALID_BID[0].params.siteId);
       expect(query.r).to.exist;
       expect(query.ac).to.equal('j');
@@ -2516,92 +2523,148 @@ describe('IndexexchangeAdapter', function () {
       const request = spec.buildRequests(DEFAULT_NATIVE_VALID_BID, DEFAULT_OPTION);
       const nativeImpression = JSON.parse(request[0].data.r).imp[0];
 
-      expect(request[0].data.v).to.equal(NATIVE_ENDPOINT_VERSION);
+      expect(request[0].data.hasOwnProperty('v')).to.equal(false);
       expect(nativeImpression.id).to.equal(DEFAULT_NATIVE_VALID_BID[0].bidId);
       expect(nativeImpression.native).to.deep.equal(DEFAULT_NATIVE_IMP);
     });
 
     it('should build request with given asset properties', function() {
       let bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID)
-      bid[0].mediaTypes.native = {
-        title: {
-          len: 200
-        },
-        video: {
-          mimes: [
-            'javascript'
-          ],
-          minduration: 10,
-          maxduration: 60,
-          protocols: [1]
-        }
+      bid[0].nativeOrtbRequest = {
+        assets: [{id: 0, required: 0, title: {len: 140}}, {id: 1, required: 0, video: {mimes: ['javascript'], minduration: 10, maxduration: 60, protocols: [1]}}]
       }
       const request = spec.buildRequests(bid, DEFAULT_OPTION);
       const nativeImpression = JSON.parse(request[0].data.r).imp[0];
-      expect(nativeImpression.native).to.deep.equal({request: '{"assets":[{"required":0,"title":{"len":200},"id":100},{"required":0,"video":{"mimes":["javascript"],"minduration":10,"maxduration":60,"protocols":[1]},"id":300}],"ver":"1.2","eventtrackers":[{"event":1,"methods":[1,2]}],"privacy":1}', ver: '1.2'});
+      expect(nativeImpression.native).to.deep.equal({request: '{"assets":[{"id":0,"required":0,"title":{"len":140}},{"id":1,"required":0,"video":{"mimes":["javascript"],"minduration":10,"maxduration":60,"protocols":[1]}}],"eventtrackers":[{"event":1,"methods":[1,2]}],"privacy":1}', ver: '1.2'});
     });
 
     it('should build request with all possible Prebid asset properties', function() {
       let bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID)
-      bid[0].mediaTypes.native = {
-        title: {
-          required: false
-        },
-        body: {
-          required: false
-        },
-        body2: {
-          required: false
-        },
-        sponsoredBy: {
-          required: false
-        },
-        icon: {
-          required: false
-        },
-        image: {
-          required: false
-        },
-        clickUrl: {
-          required: false
-        },
-        displayUrl: {
-          required: false
-        },
-        privacyLink: {
-          required: false
-        },
-        privacyIcon: {
-          required: false
-        },
-        cta: {
-          required: false
-        },
-        rating: {
-          required: false
-        },
-        downloads: {
-          required: false
-        },
-        likes: {
-          required: false
-        },
-        price: {
-          required: false
-        },
-        salePrice: {
-          required: false
-        },
-        address: {
-          required: false
-        },
-        phone: {
-          required: false
-        },
+      bid[0].nativeOrtbRequest = {
+        'ver': '1.2',
+        'assets': [
+          {
+            'id': 0,
+            'required': 0,
+            'title': {
+              'len': 140
+            }
+          },
+          {
+            'id': 1,
+            'required': 0,
+            'data': {
+              'type': 2
+            }
+          },
+          {
+            'id': 2,
+            'required': 0,
+            'data': {
+              'type': 10
+            }
+          },
+          {
+            'id': 3,
+            'required': 0,
+            'data': {
+              'type': 1
+            }
+          },
+          {
+            'id': 4,
+            'required': 0,
+            'img': {
+              'type': 1
+            }
+          },
+          {
+            'id': 5,
+            'required': 0,
+            'img': {
+              'type': 3
+            }
+          },
+          {
+            'id': 6,
+            'required': 0
+          },
+          {
+            'id': 7,
+            'required': 0,
+            'data': {
+              'type': 11
+            }
+          },
+          {
+            'id': 8,
+            'required': 0
+          },
+          {
+            'id': 9,
+            'required': 0
+          },
+          {
+            'id': 10,
+            'required': 0,
+            'data': {
+              'type': 12
+            }
+          },
+          {
+            'id': 11,
+            'required': 0,
+            'data': {
+              'type': 3
+            }
+          },
+          {
+            'id': 12,
+            'required': 0,
+            'data': {
+              'type': 5
+            }
+          },
+          {
+            'id': 13,
+            'required': 0,
+            'data': {
+              'type': 4
+            }
+          },
+          {
+            'id': 14,
+            'required': 0,
+            'data': {
+              'type': 6
+            }
+          },
+          {
+            'id': 15,
+            'required': 0,
+            'data': {
+              'type': 7
+            }
+          },
+          {
+            'id': 16,
+            'required': 0,
+            'data': {
+              'type': 9
+            }
+          },
+          {
+            'id': 17,
+            'required': 0,
+            'data': {
+              'type': 8
+            }
+          }
+        ]
       }
       const request = spec.buildRequests(bid, DEFAULT_OPTION);
       const nativeImpression = JSON.parse(request[0].data.r).imp[0];
-      expect(nativeImpression.native).to.deep.equal({request: '{"assets":[{"required":0,"title":{"len":25},"id":100},{"required":0,"data":{"type":2},"id":402},{"required":0,"data":{"type":10},"id":410},{"required":0,"data":{"type":1},"id":401},{"required":0,"img":{"type":1},"id":201},{"required":0,"img":{"type":3},"id":203},{"required":0,"data":{"type":11},"id":411},{"required":0,"data":{"type":12},"id":412},{"required":0,"data":{"type":3},"id":403},{"required":0,"data":{"type":5},"id":405},{"required":0,"data":{"type":4},"id":404},{"required":0,"data":{"type":6},"id":406},{"required":0,"data":{"type":7},"id":407},{"required":0,"data":{"type":9},"id":409},{"required":0,"data":{"type":8},"id":408}],"ver":"1.2","eventtrackers":[{"event":1,"methods":[1,2]}],"privacy":1}', ver: '1.2'});
+      expect(nativeImpression.native).to.deep.equal({request: '{"ver":"1.2","assets":[{"id":0,"required":0,"title":{"len":140}},{"id":1,"required":0,"data":{"type":2}},{"id":2,"required":0,"data":{"type":10}},{"id":3,"required":0,"data":{"type":1}},{"id":4,"required":0,"img":{"type":1}},{"id":5,"required":0,"img":{"type":3}},{"id":6,"required":0},{"id":7,"required":0,"data":{"type":11}},{"id":8,"required":0},{"id":9,"required":0},{"id":10,"required":0,"data":{"type":12}},{"id":11,"required":0,"data":{"type":3}},{"id":12,"required":0,"data":{"type":5}},{"id":13,"required":0,"data":{"type":4}},{"id":14,"required":0,"data":{"type":6}},{"id":15,"required":0,"data":{"type":7}},{"id":16,"required":0,"data":{"type":9}},{"id":17,"required":0,"data":{"type":8}}],"eventtrackers":[{"event":1,"methods":[1,2]}],"privacy":1}', ver: '1.2'});
     })
   });
 
@@ -3091,27 +3154,70 @@ describe('IndexexchangeAdapter', function () {
             advertiserDomains: ['www.abc.com']
           },
           native: {
-            body: 'Les pièces automobiles dont vous avez besoin, toujours sous la main.',
-            clickUrl: 'https://play.google.com/store/apps/details?id=de.autodoc.gmbh',
-            icon: {
-              height: 250,
-              width: 250,
-              url: 'https://cdn.liftoff.io/customers/1209/creatives/2501-icon-250x250.png'
-            },
-            image: {
-              height: 627,
-              width: 1200,
-              url: 'https://cdn.liftoff.io/customers/5a9cab9cc6/image/lambda_png/a0355879b06c09b09232.png'
-            },
-            impressionTrackers: [
-              'https://click.liftoff.io/v1/campaign_click/blah',
-              'https://impression-europe.liftoff.io/index/impression',
-              'https://a701.casalemedia.com/impression/v1'
-            ],
-            privacyLink: 'https://privacy.link.com',
-            sponsoredBy: 'autodoc.co.uk',
-            title: 'Autodoc',
-            video: '<VAST>blah</VAST>'
+            ortb: {
+              assets: [
+                {
+                  'id': 0,
+                  'img': {
+                    'h': 250,
+                    'url': 'https://cdn.liftoff.io/customers/1209/creatives/2501-icon-250x250.png',
+                    'w': 250
+                  }
+                },
+                {
+                  'id': 1,
+                  'img': {
+                    'h': 627,
+                    'url': 'https://cdn.liftoff.io/customers/5a9cab9cc6/image/lambda_png/a0355879b06c09b09232.png',
+                    'w': 1200
+                  }
+                },
+                {
+                  'data': {
+                    'value': 'autodoc.co.uk'
+                  },
+                  'id': 2
+                },
+                {
+                  'data': {
+                    'value': 'Les pièces automobiles dont vous avez besoin, toujours sous la main.'
+                  },
+                  'id': 3
+                },
+                {
+                  'id': 4,
+                  'title': {
+                    'text': 'Autodoc'
+                  }
+                },
+                {
+                  'id': 5,
+                  'video': {
+                    'vasttag': '<VAST>blah</VAST>'
+                  }
+                }
+              ],
+              'eventtrackers': [
+                {
+                  'event': 1,
+                  'method': 1,
+                  'url': 'https://impression-europe.liftoff.io/index/impression'
+                },
+                {
+                  'event': 1,
+                  'method': 1,
+                  'url': 'https://a701.casalemedia.com/impression/v1'
+                }
+              ],
+              'link': {
+                'clicktrackers': [
+                  'https://click.liftoff.io/v1/campaign_click/blah'
+                ],
+                'url': 'https://play.google.com/store/apps/details?id=de.autodoc.gmbh'
+              },
+              'privacy': 'https://privacy.link.com',
+              'ver': '1.2'
+            }
           },
           ttl: 3600
         }

From 296a081949b11a09b789f17f1b7dba5a72b7d5b3 Mon Sep 17 00:00:00 2001
From: Mike Miller <mike@solitaired.com>
Date: Thu, 18 Aug 2022 13:46:13 -0400
Subject: [PATCH 163/569] Update Sonobi adapter with GVLID (#8860)

---
 modules/sonobiBidAdapter.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/sonobiBidAdapter.js b/modules/sonobiBidAdapter.js
index c6100ac8b40..3c841cc4d8a 100644
--- a/modules/sonobiBidAdapter.js
+++ b/modules/sonobiBidAdapter.js
@@ -11,6 +11,7 @@ const OUTSTREAM_REDNERER_URL = 'https://mtrx.go.sonobi.com/sbi_outstream_rendere
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 104,
   supportedMediaTypes: [BANNER, VIDEO],
   /**
    * Determines whether or not the given bid request is valid.

From ed74e44a6cec85a6eb572d19033b57e2cef7a482 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Thu, 18 Aug 2022 11:06:44 -0700
Subject: [PATCH 164/569] dgkeyword RTD provider: fix tests causing ID5 test
 failures (#8862)

---
 modules/dgkeywordRtdProvider.js                | 9 +++++++++
 test/spec/modules/dgkeywordRtdProvider_spec.js | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/dgkeywordRtdProvider.js b/modules/dgkeywordRtdProvider.js
index cea33014144..e2a29375f25 100644
--- a/modules/dgkeywordRtdProvider.js
+++ b/modules/dgkeywordRtdProvider.js
@@ -25,6 +25,15 @@ export function getDgKeywordsAndSet(reqBidsConfigObj, callback, moduleConfig, us
   const timeout = (moduleConfig && moduleConfig.params && moduleConfig.params.timeout && Number(moduleConfig.params.timeout) > 0) ? Number(moduleConfig.params.timeout) : PROFILE_TIMEOUT_MS;
   const url = (moduleConfig && moduleConfig.params && moduleConfig.params.url) ? moduleConfig.params.url : URL + encodeURIComponent(window.location.href);
   const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
+  callback = (function(cb) {
+    let done = false;
+    return function () {
+      if (!done) {
+        done = true;
+        return cb.apply(this, arguments);
+      }
+    }
+  })(callback);
   let isFinish = false;
   logMessage('[dgkeyword sub module]', adUnits, timeout);
   let setKeywordTargetBidders = getTargetBidderOfDgKeywords(adUnits);
diff --git a/test/spec/modules/dgkeywordRtdProvider_spec.js b/test/spec/modules/dgkeywordRtdProvider_spec.js
index a145f429557..5ecec48f6b4 100644
--- a/test/spec/modules/dgkeywordRtdProvider_spec.js
+++ b/test/spec/modules/dgkeywordRtdProvider_spec.js
@@ -293,8 +293,8 @@ describe('Digital Garage Keyword Module', function () {
         moduleConfig,
         null
       );
+      const request = server.requests[0];
       setTimeout(() => {
-        const request = server.requests[0];
         if (request) {
           request.respond(
             200,

From f69cc666f12d03fbb5b0c4342d17f71103dd1d2f Mon Sep 17 00:00:00 2001
From: Scott Menzer <scott@id5.io>
Date: Thu, 18 Aug 2022 19:02:43 -0400
Subject: [PATCH 165/569] Id5 id configurable fetch flow (#8784)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Paweł Kowalski <pkowalski@id5.io>
---
 modules/id5IdSystem.js                | 271 ++++++----
 modules/id5IdSystem.md                |  30 +-
 test/spec/modules/id5IdSystem_spec.js | 701 +++++++++++++++++++-------
 3 files changed, 705 insertions(+), 297 deletions(-)

diff --git a/modules/id5IdSystem.js b/modules/id5IdSystem.js
index 96ec1fed754..95ce5c94e46 100644
--- a/modules/id5IdSystem.js
+++ b/modules/id5IdSystem.js
@@ -7,19 +7,19 @@
 
 import {
   deepAccess,
-  logInfo,
   deepSetValue,
-  logError,
   isEmpty,
   isEmptyStr,
+  logError,
+  logInfo,
   logWarn,
   safeJSONParse
 } from '../src/utils.js';
-import { ajax } from '../src/ajax.js';
-import { submodule } from '../src/hook.js';
-import { getRefererInfo } from '../src/refererDetection.js';
-import { getStorageManager } from '../src/storageManager.js';
-import { uspDataHandler } from '../src/adapterManager.js';
+import {ajax} from '../src/ajax.js';
+import {submodule} from '../src/hook.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {uspDataHandler} from '../src/adapterManager.js';
 
 const MODULE_NAME = 'id5Id';
 const GVLID = 131;
@@ -28,10 +28,11 @@ export const ID5_STORAGE_NAME = 'id5id';
 export const ID5_PRIVACY_STORAGE_NAME = `${ID5_STORAGE_NAME}_privacy`;
 const LOCAL_STORAGE = 'html5';
 const LOG_PREFIX = 'User ID - ID5 submodule: ';
+const ID5_API_CONFIG_URL = 'https://id5-sync.com/api/config/prebid'
 
 // order the legacy cookie names in reverse priority order so the last
 // cookie in the array is the most preferred to use
-const LEGACY_COOKIE_NAMES = [ 'pbjs-id5id', 'id5id.1st', 'id5id' ];
+const LEGACY_COOKIE_NAMES = ['pbjs-id5id', 'id5id.1st', 'id5id'];
 
 export const storage = getStorageManager({gvlid: GVLID, moduleName: MODULE_NAME});
 
@@ -102,92 +103,27 @@ export const id5IdSubmodule = {
   /**
    * performs action to obtain id and return a value in the callback's response argument
    * @function getId
-   * @param {SubmoduleConfig} config
+   * @param {SubmoduleConfig} submoduleConfig
    * @param {ConsentData} consentData
    * @param {(Object|undefined)} cacheIdObj
    * @returns {IdResponse|undefined}
    */
-  getId(config, consentData, cacheIdObj) {
-    if (!hasRequiredConfig(config)) {
+  getId(submoduleConfig, consentData, cacheIdObj) {
+    if (!hasRequiredConfig(submoduleConfig)) {
       return undefined;
     }
 
-    const url = `https://id5-sync.com/g/v2/${config.params.partner}.json`;
-    const hasGdpr = (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) ? 1 : 0;
-    const usp = uspDataHandler.getConsentData();
-    const referer = getRefererInfo();
-    const signature = (cacheIdObj && cacheIdObj.signature) ? cacheIdObj.signature : getLegacyCookieSignature();
-    const data = {
-      'partner': config.params.partner,
-      'gdpr': hasGdpr,
-      'nbPage': incrementNb(config.params.partner),
-      'o': 'pbjs',
-      'rf': referer.topmostLocation,
-      'top': referer.reachedTop ? 1 : 0,
-      'u': referer.stack[0] || window.location.href,
-      'v': '$prebid.version$'
-    };
-
-    // pass in optional data, but only if populated
-    if (hasGdpr && typeof consentData.consentString !== 'undefined' && !isEmpty(consentData.consentString) && !isEmptyStr(consentData.consentString)) {
-      data.gdpr_consent = consentData.consentString;
-    }
-    if (typeof usp !== 'undefined' && !isEmpty(usp) && !isEmptyStr(usp)) {
-      data.us_privacy = usp;
-    }
-    if (typeof signature !== 'undefined' && !isEmptyStr(signature)) {
-      data.s = signature;
-    }
-    if (typeof config.params.pd !== 'undefined' && !isEmptyStr(config.params.pd)) {
-      data.pd = config.params.pd;
-    }
-    if (typeof config.params.provider !== 'undefined' && !isEmptyStr(config.params.provider)) {
-      data.provider = config.params.provider;
-    }
-
-    const abTestingConfig = getAbTestingConfig(config);
-    if (abTestingConfig.enabled === true) {
-      data.ab_testing = {
-        enabled: true,
-        control_group_pct: abTestingConfig.controlGroupPct // The server validates
-      };
-    }
-
-    const resp = function (callback) {
-      const callbacks = {
-        success: response => {
-          let responseObj;
-          if (response) {
-            try {
-              responseObj = JSON.parse(response);
-              logInfo(LOG_PREFIX + 'response received from the server', responseObj);
-
-              resetNb(config.params.partner);
-
-              if (responseObj.privacy) {
-                storeInLocalStorage(ID5_PRIVACY_STORAGE_NAME, JSON.stringify(responseObj.privacy), NB_EXP_DAYS);
-              }
-
-              // TODO: remove after requiring publishers to use localstorage and
-              // all publishers have upgraded
-              if (config.storage.type === LOCAL_STORAGE) {
-                removeLegacyCookies(config.params.partner);
-              }
-            } catch (error) {
-              logError(LOG_PREFIX + error);
-            }
-          }
-          callback(responseObj);
-        },
-        error: error => {
+    const resp = function (cbFunction) {
+      new IdFetchFlow(submoduleConfig, consentData, cacheIdObj, uspDataHandler.getConsentData()).execute()
+        .then(response => {
+          cbFunction(response)
+        })
+        .catch(error => {
           logError(LOG_PREFIX + 'getId fetch encountered an error', error);
-          callback();
-        }
-      };
-      logInfo(LOG_PREFIX + 'requesting an ID from the server', data);
-      ajax(url, callbacks, JSON.stringify(data), { method: 'POST', withCredentials: true });
+          cbFunction();
+        });
     };
-    return { callback: resp };
+    return {callback: resp};
   },
 
   /**
@@ -212,6 +148,139 @@ export const id5IdSubmodule = {
   }
 };
 
+class IdFetchFlow {
+  constructor(submoduleConfig, gdprConsentData, cacheIdObj, usPrivacyData) {
+    this.submoduleConfig = submoduleConfig
+    this.gdprConsentData = gdprConsentData
+    this.cacheIdObj = cacheIdObj
+    this.usPrivacyData = usPrivacyData
+  }
+
+  execute() {
+    return this.#callForConfig(this.submoduleConfig)
+      .then(fetchFlowConfig => {
+        return this.#callForExtensions(fetchFlowConfig.extensionsCall)
+          .then(extensionsData => {
+            return this.#callId5Fetch(fetchFlowConfig.fetchCall, extensionsData)
+          })
+      })
+      .then(fetchCallResponse => {
+        try {
+          resetNb(this.submoduleConfig.params.partner);
+          if (fetchCallResponse.privacy) {
+            storeInLocalStorage(ID5_PRIVACY_STORAGE_NAME, JSON.stringify(fetchCallResponse.privacy), NB_EXP_DAYS);
+          }
+        } catch (error) {
+          logError(LOG_PREFIX + error);
+        }
+        return fetchCallResponse;
+      })
+  }
+
+  #ajaxPromise(url, data, options) {
+    return new Promise((resolve, reject) => {
+      ajax(url,
+        {
+          success: function (res) {
+            resolve(res)
+          },
+          error: function (err) {
+            reject(err)
+          }
+        }, data, options)
+    })
+  }
+
+  // eslint-disable-next-line no-dupe-class-members
+  #callForConfig(submoduleConfig) {
+    let url = submoduleConfig.params.configUrl || ID5_API_CONFIG_URL; // override for debug/test purposes only
+    return this.#ajaxPromise(url, JSON.stringify(submoduleConfig), {method: 'POST'})
+      .then(response => {
+        let responseObj = JSON.parse(response);
+        logInfo(LOG_PREFIX + 'config response received from the server', responseObj);
+        return responseObj;
+      });
+  }
+
+  // eslint-disable-next-line no-dupe-class-members
+  #callForExtensions(extensionsCallConfig) {
+    if (extensionsCallConfig === undefined) {
+      return Promise.resolve(undefined)
+    }
+    let extensionsUrl = extensionsCallConfig.url
+    let method = extensionsCallConfig.method || 'GET'
+    let data = method === 'GET' ? undefined : JSON.stringify(extensionsCallConfig.body || {})
+    return this.#ajaxPromise(extensionsUrl, data, {'method': method})
+      .then(response => {
+        let responseObj = JSON.parse(response);
+        logInfo(LOG_PREFIX + 'extensions response received from the server', responseObj);
+        return responseObj;
+      })
+  }
+
+  // eslint-disable-next-line no-dupe-class-members
+  #callId5Fetch(fetchCallConfig, extensionsData) {
+    let url = fetchCallConfig.url;
+    let additionalData = fetchCallConfig.overrides || {};
+    let data = {
+      ...this.#createFetchRequestData(),
+      ...additionalData,
+      extensions: extensionsData
+    };
+    return this.#ajaxPromise(url, JSON.stringify(data), {method: 'POST', withCredentials: true})
+      .then(response => {
+        let responseObj = JSON.parse(response);
+        logInfo(LOG_PREFIX + 'fetch response received from the server', responseObj);
+        return responseObj;
+      });
+  }
+
+  // eslint-disable-next-line no-dupe-class-members
+  #createFetchRequestData() {
+    const params = this.submoduleConfig.params;
+    const hasGdpr = (this.gdprConsentData && typeof this.gdprConsentData.gdprApplies === 'boolean' && this.gdprConsentData.gdprApplies) ? 1 : 0;
+    const referer = getRefererInfo();
+    const signature = (this.cacheIdObj && this.cacheIdObj.signature) ? this.cacheIdObj.signature : getLegacyCookieSignature();
+    const nbPage = incrementNb(params.partner);
+    const data = {
+      'partner': params.partner,
+      'gdpr': hasGdpr,
+      'nbPage': nbPage,
+      'o': 'pbjs',
+      'rf': referer.topmostLocation,
+      'top': referer.reachedTop ? 1 : 0,
+      'u': referer.stack[0] || window.location.href,
+      'v': '$prebid.version$',
+      'storage': this.submoduleConfig.storage
+    };
+
+    // pass in optional data, but only if populated
+    if (hasGdpr && this.gdprConsentData.consentString !== undefined && !isEmpty(this.gdprConsentData.consentString) && !isEmptyStr(this.gdprConsentData.consentString)) {
+      data.gdpr_consent = this.gdprConsentData.consentString;
+    }
+    if (this.usPrivacyData !== undefined && !isEmpty(this.usPrivacyData) && !isEmptyStr(this.usPrivacyData)) {
+      data.us_privacy = this.usPrivacyData;
+    }
+    if (signature !== undefined && !isEmptyStr(signature)) {
+      data.s = signature;
+    }
+    if (params.pd !== undefined && !isEmptyStr(params.pd)) {
+      data.pd = params.pd;
+    }
+    if (params.provider !== undefined && !isEmptyStr(params.provider)) {
+      data.provider = params.provider;
+    }
+    const abTestingConfig = params.abTesting || {enabled: false};
+
+    if (abTestingConfig.enabled) {
+      data.ab_testing = {
+        enabled: true, control_group_pct: abTestingConfig.controlGroupPct // The server validates
+      };
+    }
+    return data
+  }
+}
+
 function hasRequiredConfig(config) {
   if (!config || !config.params || !config.params.partner || typeof config.params.partner !== 'number') {
     logError(LOG_PREFIX + 'partner required to be defined as a number');
@@ -242,25 +311,29 @@ export function expDaysStr(expDays) {
 export function nbCacheName(partnerId) {
   return `${ID5_STORAGE_NAME}_${partnerId}_nb`;
 }
+
 export function storeNbInCache(partnerId, nb) {
   storeInLocalStorage(nbCacheName(partnerId), nb, NB_EXP_DAYS);
 }
+
 export function getNbFromCache(partnerId) {
   let cacheNb = getFromLocalStorage(nbCacheName(partnerId));
   return (cacheNb) ? parseInt(cacheNb) : 0;
 }
+
 function incrementNb(partnerId) {
   const nb = (getNbFromCache(partnerId) + 1);
   storeNbInCache(partnerId, nb);
   return nb;
 }
+
 function resetNb(partnerId) {
   storeNbInCache(partnerId, 0);
 }
 
 function getLegacyCookieSignature() {
   let legacyStoredValue;
-  LEGACY_COOKIE_NAMES.forEach(function(cookie) {
+  LEGACY_COOKIE_NAMES.forEach(function (cookie) {
     if (storage.getCookie(cookie)) {
       legacyStoredValue = safeJSONParse(storage.getCookie(cookie)) || legacyStoredValue;
     }
@@ -268,21 +341,6 @@ function getLegacyCookieSignature() {
   return (legacyStoredValue && legacyStoredValue.signature) || '';
 }
 
-/**
- * Remove our legacy cookie values. Needed until we move all publishers
- * to html5 storage in a future release
- * @param {integer} partnerId
- */
-function removeLegacyCookies(partnerId) {
-  logInfo(LOG_PREFIX + 'removing legacy cookies');
-  LEGACY_COOKIE_NAMES.forEach(function(cookie) {
-    storage.setCookie(`${cookie}`, ' ', expDaysStr(-1));
-    storage.setCookie(`${cookie}_nb`, ' ', expDaysStr(-1));
-    storage.setCookie(`${cookie}_${partnerId}_nb`, ' ', expDaysStr(-1));
-    storage.setCookie(`${cookie}_last`, ' ', expDaysStr(-1));
-  });
-}
-
 /**
  * This will make sure we check for expiration before accessing local storage
  * @param {string} key
@@ -303,6 +361,7 @@ export function getFromLocalStorage(key) {
   storage.removeDataFromLocalStorage(key);
   return null;
 }
+
 /**
  * Ensure that we always set an expiration in local storage since
  * by default it's not required
@@ -315,14 +374,4 @@ export function storeInLocalStorage(key, value, expDays) {
   storage.setDataInLocalStorage(`${key}`, value);
 }
 
-/**
- * gets the existing abTesting config or generates a default config with abTesting off
- *
- * @param {SubmoduleConfig|undefined} config
- * @returns {Object} an object which always contains at least the property "enabled"
- */
-function getAbTestingConfig(config) {
-  return deepAccess(config, 'params.abTesting', { enabled: false });
-}
-
 submodule('userId', id5IdSubmodule);
diff --git a/modules/id5IdSystem.md b/modules/id5IdSystem.md
index 11f8ffc5609..cf90290b1d8 100644
--- a/modules/id5IdSystem.md
+++ b/modules/id5IdSystem.md
@@ -29,7 +29,8 @@ pbjs.setConfig({
         abTesting: {             // optional
           enabled: true,         // false by default
           controlGroupPct: 0.1   // valid values are 0.0 - 1.0 (inclusive)
-        }
+        }, 
+        disableExtensions: false // optional
       },
       storage: {
         type: 'html5',           // "html5" is the required storage type
@@ -43,21 +44,22 @@ pbjs.setConfig({
 });
 ```
 
-| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| Param under userSync.userIds[] | Scope | Type | Description                                                                                                                                                                                                                                                                    | Example |
 | --- | --- | --- | --- | --- |
-| name | Required | String | The name of this module: `"id5Id"` | `"id5Id"` |
-| params | Required | Object | Details for the ID5 ID. | |
-| params.partner | Required | Number | This is the ID5 Partner Number obtained from registering with ID5. | `173` |
-| params.pd | Optional | String | Partner-supplied data used for linking ID5 IDs across domains. See [our documentation](https://support.id5.io/portal/en/kb/articles/passing-partner-data-to-id5) for details on generating the string. Omit the parameter or leave as an empty string if no data to supply | `"MT1iNTBjY..."` |
-| params.provider | Optional | String | An identifier provided by ID5 to technology partners who manage Prebid setups on behalf of publishers. Reach out to [ID5](mailto:prebid@id5.io) if you have questions about this parameter  | `pubmatic-identity-hub` |
-| params.abTesting | Optional | Object | Allows publishers to easily run an A/B Test. If enabled and the user is in the Control Group, the ID5 ID will NOT be exposed to bid adapters for that request | Disabled by default |
-| params.abTesting.enabled | Optional | Boolean | Set this to `true` to turn on this feature | `true` or `false` |
+| name | Required | String | The name of this module: `"id5Id"`                                                                                                                                                                                                                                             | `"id5Id"` |
+| params | Required | Object | Details for the ID5 ID.                                                                                                                                                                                                                                                        | |
+| params.partner | Required | Number | This is the ID5 Partner Number obtained from registering with ID5.                                                                                                                                                                                                             | `173` |
+| params.pd | Optional | String | Partner-supplied data used for linking ID5 IDs across domains. See [our documentation](https://support.id5.io/portal/en/kb/articles/passing-partner-data-to-id5) for details on generating the string. Omit the parameter or leave as an empty string if no data to supply     | `"MT1iNTBjY..."` |
+| params.provider | Optional | String | An identifier provided by ID5 to technology partners who manage Prebid setups on behalf of publishers. Reach out to [ID5](mailto:prebid@id5.io) if you have questions about this parameter                                                                                     | `pubmatic-identity-hub` |
+| params.abTesting | Optional | Object | Allows publishers to easily run an A/B Test. If enabled and the user is in the Control Group, the ID5 ID will NOT be exposed to bid adapters for that request                                                                                                                  | Disabled by default |
+| params.abTesting.enabled | Optional | Boolean | Set this to `true` to turn on this feature                                                                                                                                                                                                                                     | `true` or `false` |
 | params.abTesting.controlGroupPct | Optional | Number | Must be a number between `0.0` and `1.0` (inclusive) and is used to determine the percentage of requests that fall into the control group (and thus not exposing the ID5 ID). For example, a value of `0.20` will result in 20% of requests without an ID5 ID and 80% with an ID. | `0.1` |
-| storage | Required | Object | Storage settings for how the User ID module will cache the ID5 ID locally | |
-| storage.type | Required | String | This is where the results of the user ID will be stored. ID5 **requires** `"html5"`. | `"html5"` |
-| storage.name | Required | String | The name of the local storage where the user ID will be stored. ID5 **requires** `"id5id"`. | `"id5id"` |
-| storage.expires | Optional | Integer | How long (in days) the user ID information will be stored. ID5 recommends `90`. | `90` |
-| storage.refreshInSeconds | Optional | Integer | How many seconds until the ID5 ID will be refreshed. ID5 strongly recommends 8 hours between refreshes | `8*3600` |
+| params.disableExtensions | Optional | Boolean | Set this to `true` to force turn off extensions call. Default `false`                                                                                                                                                                                                          | `true` or `false` |
+| storage | Required | Object | Storage settings for how the User ID module will cache the ID5 ID locally                                                                                                                                                                                                      | |
+| storage.type | Required | String | This is where the results of the user ID will be stored. ID5 **requires** `"html5"`.                                                                                                                                                                                           | `"html5"` |
+| storage.name | Required | String | The name of the local storage where the user ID will be stored. ID5 **requires** `"id5id"`.                                                                                                                                                                                    | `"id5id"` |
+| storage.expires | Optional | Integer | How long (in days) the user ID information will be stored. ID5 recommends `90`.                                                                                                                                                                                                | `90` |
+| storage.refreshInSeconds | Optional | Integer | How many seconds until the ID5 ID will be refreshed. ID5 strongly recommends 8 hours between refreshes                                                                                                                                                                         | `8*3600` |
 
 **ATTENTION:** As of Prebid.js v4.14.0, ID5 requires `storage.type` to be `"html5"` and `storage.name` to be `"id5id"`. Using other values will display a warning today, but in an upcoming release, it will prevent the ID5 module from loading. This change is to ensure the ID5 module in Prebid.js interoperates properly with the [ID5 API](https://github.com/id5io/id5-api.js) and to reduce the size of publishers' first-party cookies that are sent to their web servers. If you have any questions, please reach out to us at [prebid@id5.io](mailto:prebid@id5.io).
 
diff --git a/test/spec/modules/id5IdSystem_spec.js b/test/spec/modules/id5IdSystem_spec.js
index a54542f7278..8c0f8ad9cf3 100644
--- a/test/spec/modules/id5IdSystem_spec.js
+++ b/test/spec/modules/id5IdSystem_spec.js
@@ -5,28 +5,36 @@ import {
   ID5_PRIVACY_STORAGE_NAME,
   ID5_STORAGE_NAME,
   id5IdSubmodule,
-  nbCacheName, storage,
+  nbCacheName,
+  storage,
   storeInLocalStorage,
   storeNbInCache,
 } from 'modules/id5IdSystem.js';
 import {coreStorage, init, requestBidsHook, setSubmoduleRegistry} from 'modules/userId/index.js';
 import {config} from 'src/config.js';
-import {server} from 'test/mocks/xhr.js';
 import * as events from 'src/events.js';
 import CONSTANTS from 'src/constants.json';
 import * as utils from 'src/utils.js';
+import {uspDataHandler} from 'src/adapterManager.js';
 import 'src/prebid.js';
 import {hook} from '../../../src/hook.js';
 import {mockGdprConsent} from '../../helpers/consentData.js';
 
 let expect = require('chai').expect;
 
-describe('ID5 ID System', function() {
+describe('ID5 ID System', function () {
   const ID5_MODULE_NAME = 'id5Id';
   const ID5_EIDS_NAME = ID5_MODULE_NAME.toLowerCase();
   const ID5_SOURCE = 'id5-sync.com';
   const ID5_TEST_PARTNER_ID = 173;
   const ID5_ENDPOINT = `https://id5-sync.com/g/v2/${ID5_TEST_PARTNER_ID}.json`;
+  const ID5_API_CONFIG_URL = `https://id5-sync.com/api/config/prebid`;
+  const ID5_EXTENSIONS_ENDPOINT = 'https://extensions.id5-sync.com/test';
+  const ID5_API_CONFIG = {
+    fetchCall: {
+      url: ID5_ENDPOINT
+    }
+  };
   const ID5_NB_STORAGE_NAME = nbCacheName(ID5_TEST_PARTNER_ID);
   const ID5_STORED_ID = 'storedid5id';
   const ID5_STORED_SIGNATURE = '123456';
@@ -58,6 +66,7 @@ describe('ID5 ID System', function() {
       }
     }
   }
+
   function getId5ValueConfig(value) {
     return {
       name: ID5_MODULE_NAME,
@@ -68,6 +77,7 @@ describe('ID5 ID System', function() {
       }
     }
   }
+
   function getUserSyncConfig(userIds) {
     return {
       userSync: {
@@ -76,12 +86,15 @@ describe('ID5 ID System', function() {
       }
     }
   }
+
   function getFetchLocalStorageConfig() {
     return getUserSyncConfig([getId5FetchConfig(ID5_STORAGE_NAME, 'html5')]);
   }
+
   function getValueConfig(value) {
     return getUserSyncConfig([getId5ValueConfig(value)]);
   }
+
   function getAdUnitMock(code = 'adUnit-code') {
     return {
       code,
@@ -91,15 +104,81 @@ describe('ID5 ID System', function() {
     };
   }
 
+  function callSubmoduleGetId(config, consentData, cacheIdObj) {
+    return new Promise((resolve) => {
+      id5IdSubmodule.getId(config, consentData, cacheIdObj).callback((response) => {
+        resolve(response)
+      })
+    });
+  }
+
+  class XhrServerMock {
+    constructor(server) {
+      this.currentRequestIdx = 0
+      this.server = server
+    }
+
+    expectFirstRequest() {
+      return this.#expectRequest(0);
+    }
+
+    expectNextRequest() {
+      return this.#expectRequest(++this.currentRequestIdx)
+    }
+
+    expectConfigRequest() {
+      return this.expectFirstRequest()
+        .then(configRequest => {
+          expect(configRequest.url).is.eq(ID5_API_CONFIG_URL);
+          expect(configRequest.method).is.eq('POST');
+          return configRequest;
+        })
+    }
+
+    respondWithConfigAndExpectNext(configRequest, config = ID5_API_CONFIG) {
+      configRequest.respond(200, {'Content-Type': 'application/json'}, JSON.stringify(config));
+      return this.expectNextRequest()
+    }
+
+    expectFetchRequest() {
+      return this.expectConfigRequest()
+        .then(configRequest => {
+          return this.respondWithConfigAndExpectNext(configRequest, ID5_API_CONFIG);
+        }).then(request => {
+          expect(request.url).is.eq(ID5_API_CONFIG.fetchCall.url);
+          expect(request.method).is.eq('POST');
+          return request;
+        })
+    }
+
+    #expectRequest(index) {
+      let server = this.server
+      return new Promise(function (resolve) {
+        (function waitForCondition() {
+          if (server.requests && server.requests.length > index) return resolve(server.requests[index]);
+          setTimeout(waitForCondition, 30);
+        })();
+      })
+        .then(request => {
+          return request
+        });
+    }
+
+    hasReceivedAnyRequest() {
+      let requests = this.server.requests;
+      return requests && requests.length > 0;
+    }
+  }
+
   before(() => {
     hook.ready();
   });
 
-  describe('Check for valid publisher config', function() {
-    it('should fail with invalid config', function() {
+  describe('Check for valid publisher config', function () {
+    it('should fail with invalid config', function () {
       // no config
-      expect(id5IdSubmodule.getId()).to.be.eq(undefined);
-      expect(id5IdSubmodule.getId({ })).to.be.eq(undefined);
+      expect(id5IdSubmodule.getId()).is.eq(undefined);
+      expect(id5IdSubmodule.getId({})).is.eq(undefined);
 
       // valid params, invalid storage
       expect(id5IdSubmodule.getId({ params: { partner: 123 } })).to.be.eq(undefined);
@@ -113,7 +192,7 @@ describe('ID5 ID System', function() {
       expect(id5IdSubmodule.getId({ storage: { name: 'name', type: 'html5', }, params: { partner: 'abc' } })).to.be.eq(undefined);
     });
 
-    it('should warn with non-recommended storage params', function() {
+    it('should warn with non-recommended storage params', function () {
       let logWarnStub = sinon.stub(utils, 'logWarn');
 
       id5IdSubmodule.getId({ storage: { name: 'name', type: 'html5', }, params: { partner: 123 } });
@@ -126,189 +205,457 @@ describe('ID5 ID System', function() {
     });
   });
 
-  describe('Xhr Requests from getId()', function() {
-    const responseHeader = { 'Content-Type': 'application/json' };
-    let callbackSpy = sinon.spy();
+  describe('Xhr Requests from getId()', function () {
+    const responseHeader = {'Content-Type': 'application/json'};
 
-    beforeEach(function() {
-      callbackSpy.resetHistory();
+    beforeEach(function () {
     });
-    afterEach(function () {
 
+    afterEach(function () {
+      uspDataHandler.reset()
     });
 
     it('should call the ID5 server and handle a valid response', function () {
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, undefined).callback;
-      submoduleCallback(callbackSpy);
-
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(request.withCredentials).to.be.true;
-      expect(requestBody.partner).to.eq(ID5_TEST_PARTNER_ID);
-      expect(requestBody.o).to.eq('pbjs');
-      expect(requestBody.pd).to.be.undefined;
-      expect(requestBody.s).to.be.undefined;
-      expect(requestBody.provider).to.be.undefined
-      expect(requestBody.v).to.eq('$prebid.version$');
-      expect(requestBody.gdpr).to.exist;
-      expect(requestBody.gdpr_consent).to.be.undefined;
-      expect(requestBody.us_privacy).to.be.undefined;
-
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-      expect(callbackSpy.calledOnce).to.be.true;
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal(ID5_JSON_RESPONSE);
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let config = getId5FetchConfig();
+      let submoduleResponse = callSubmoduleGetId(config, undefined, undefined);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(fetchRequest.url).to.contain(ID5_ENDPOINT);
+          expect(fetchRequest.withCredentials).is.true;
+          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+          expect(requestBody.o).is.eq('pbjs');
+          expect(requestBody.pd).is.undefined;
+          expect(requestBody.s).is.undefined;
+          expect(requestBody.provider).is.undefined
+          expect(requestBody.v).is.eq('$prebid.version$');
+          expect(requestBody.gdpr).is.eq(0);
+          expect(requestBody.gdpr_consent).is.undefined;
+          expect(requestBody.us_privacy).is.undefined;
+          expect(requestBody.storage).is.deep.eq(config.storage)
+
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+        .then(submoduleResponse => {
+          expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
+        });
+    });
+
+    it('should call the ID5 server with gdpr data ', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let consentData = {
+        gdprApplies: true,
+        consentString: 'consentString'
+      }
+
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), consentData, undefined);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+          expect(requestBody.gdpr).to.eq(1);
+          expect(requestBody.gdpr_consent).is.eq(consentData.consentString);
+
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+        .then(submoduleResponse => {
+          expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
+        });
+    });
+
+    it('should call the ID5 server without gdpr data when gdpr not applies ', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let consentData = {
+        gdprApplies: false,
+        consentString: 'consentString'
+      }
+
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), consentData, undefined);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.gdpr).to.eq(0);
+          expect(requestBody.gdpr_consent).is.undefined
+
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+        .then(submoduleResponse => {
+          expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
+        });
+    });
+
+    it('should call the ID5 server with us privacy consent', function () {
+      let usPrivacyString = '1YN-';
+      uspDataHandler.setConsentData(usPrivacyString)
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let consentData = {
+        gdprApplies: true,
+        consentString: 'consentString'
+      }
+
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), consentData, undefined);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+          expect(requestBody.us_privacy).to.eq(usPrivacyString);
+
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+        .then(submoduleResponse => {
+          expect(submoduleResponse).is.deep.equal(ID5_JSON_RESPONSE);
+        });
     });
 
     it('should call the ID5 server with no signature field when no stored object', function () {
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, undefined).callback;
-      submoduleCallback(callbackSpy);
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.s).is.undefined;
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+    });
 
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(requestBody.s).to.be.undefined;
+    it('should call the ID5 server for config with submodule config object', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let id5FetchConfig = getId5FetchConfig();
+      id5FetchConfig.params.extraParam = {
+        x: 'X',
+        y: {
+          a: 1,
+          b: '3'
+        }
+      }
+      let submoduleResponse = callSubmoduleGetId(id5FetchConfig, undefined, undefined);
+
+      return xhrServerMock.expectConfigRequest()
+        .then(configRequest => {
+          let requestBody = JSON.parse(configRequest.requestBody)
+          expect(requestBody).is.deep.eq(id5FetchConfig)
+          return xhrServerMock.respondWithConfigAndExpectNext(configRequest)
+        })
+        .then(fetchRequest => {
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+    });
 
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+    it('should call the ID5 server for config with overridden url', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let id5FetchConfig = getId5FetchConfig();
+      id5FetchConfig.params.configUrl = 'http://localhost/x/y/z'
+
+      let submoduleResponse = callSubmoduleGetId(id5FetchConfig, undefined, undefined);
+
+      return xhrServerMock.expectFirstRequest()
+        .then(configRequest => {
+          expect(configRequest.url).is.eq('http://localhost/x/y/z')
+          return xhrServerMock.respondWithConfigAndExpectNext(configRequest)
+        })
+        .then(fetchRequest => {
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
     });
 
-    it('should call the ID5 server with signature field from stored object', function () {
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
+    it('should call the ID5 server with additional data when provided', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
+
+      return xhrServerMock.expectConfigRequest()
+        .then(configRequest => {
+          return xhrServerMock.respondWithConfigAndExpectNext(configRequest, {
+            fetchCall: {
+              url: ID5_ENDPOINT,
+              overrides: {
+                arg1: '123',
+                arg2: {
+                  x: '1',
+                  y: 2
+                }
+              }
+            }
+          });
+        })
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+          expect(requestBody.o).is.eq('pbjs');
+          expect(requestBody.v).is.eq('$prebid.version$');
+          expect(requestBody.arg1).is.eq('123')
+          expect(requestBody.arg2).is.deep.eq({
+            x: '1',
+            y: 2
+          })
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+    });
 
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(requestBody.s).to.eq(ID5_STORED_SIGNATURE);
+    it('should call the ID5 server with extensions', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
+
+      return xhrServerMock.expectConfigRequest()
+        .then(configRequest => {
+          return xhrServerMock.respondWithConfigAndExpectNext(configRequest, {
+            fetchCall: {
+              url: ID5_ENDPOINT
+            },
+            extensionsCall: {
+              url: ID5_EXTENSIONS_ENDPOINT,
+              method: 'GET'
+            }
+          });
+        })
+        .then(extensionsRequest => {
+          expect(extensionsRequest.url).is.eq(ID5_EXTENSIONS_ENDPOINT)
+          expect(extensionsRequest.method).is.eq('GET')
+          extensionsRequest.respond(200, responseHeader, JSON.stringify({
+            lb: 'ex'
+          }))
+          return xhrServerMock.expectNextRequest();
+        })
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+          expect(requestBody.o).is.eq('pbjs');
+          expect(requestBody.v).is.eq('$prebid.version$');
+          expect(requestBody.extensions).is.deep.eq({
+            lb: 'ex'
+          })
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+    });
+
+    it('should call the ID5 server with extensions fetched with POST', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, undefined);
+
+      return xhrServerMock.expectConfigRequest()
+        .then(configRequest => {
+          return xhrServerMock.respondWithConfigAndExpectNext(configRequest, {
+            fetchCall: {
+              url: ID5_ENDPOINT
+            },
+            extensionsCall: {
+              url: ID5_EXTENSIONS_ENDPOINT,
+              method: 'POST',
+              body: {
+                x: '1',
+                y: 2
+              }
+            }
+          });
+        })
+        .then(extensionsRequest => {
+          expect(extensionsRequest.url).is.eq(ID5_EXTENSIONS_ENDPOINT)
+          expect(extensionsRequest.method).is.eq('POST')
+          let requestBody = JSON.parse(extensionsRequest.requestBody)
+          expect(requestBody).is.deep.eq({
+            x: '1',
+            y: 2
+          })
+          extensionsRequest.respond(200, responseHeader, JSON.stringify({
+            lb: 'post',
+          }))
+          return xhrServerMock.expectNextRequest();
+        })
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.partner).is.eq(ID5_TEST_PARTNER_ID);
+          expect(requestBody.o).is.eq('pbjs');
+          expect(requestBody.v).is.eq('$prebid.version$');
+          expect(requestBody.extensions).is.deep.eq({
+            lb: 'post'
+          })
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+    });
 
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+    it('should call the ID5 server with signature field from stored object', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.s).is.eq(ID5_STORED_SIGNATURE);
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
     });
 
     it('should call the ID5 server with pd field when pd config is set', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
       const pubData = 'b50ca08271795a8e7e4012813f23d505193d75c0f2e2bb99baa63aa822f66ed3';
 
       let id5Config = getId5FetchConfig();
       id5Config.params.pd = pubData;
 
-      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
-
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(requestBody.pd).to.eq(pubData);
+      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
 
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.pd).is.eq(pubData);
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse;
+        })
     });
 
     it('should call the ID5 server with no pd field when pd config is not set', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
       let id5Config = getId5FetchConfig();
       id5Config.params.pd = undefined;
 
-      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
+      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
 
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(requestBody.pd).to.be.undefined;
-
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.pd).is.undefined;
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse;
+        })
     });
 
     it('should call the ID5 server with nb=1 when no stored value exists and reset after', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
       coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
 
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
-
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(requestBody.nbPage).to.eq(1);
-
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-
-      expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(0);
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.nbPage).is.eq(1);
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+        .then(() => {
+          expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(0);
+        })
     });
 
     it('should call the ID5 server with incremented nb when stored value exists and reset after', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
       storeNbInCache(ID5_TEST_PARTNER_ID, 1);
 
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
-
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(requestBody.nbPage).to.eq(2);
-
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-
-      expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(0);
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.nbPage).is.eq(2);
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        })
+        .then(() => {
+          expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(0);
+        })
     });
 
     it('should call the ID5 server with ab_testing object when abTesting is turned on', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
       let id5Config = getId5FetchConfig();
-      id5Config.params.abTesting = { enabled: true, controlGroupPct: 0.234 }
-
-      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
+      id5Config.params.abTesting = {enabled: true, controlGroupPct: 0.234}
 
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(requestBody.ab_testing.enabled).to.eq(true);
-      expect(requestBody.ab_testing.control_group_pct).to.eq(0.234);
+      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
 
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.ab_testing.enabled).is.eq(true);
+          expect(requestBody.ab_testing.control_group_pct).is.eq(0.234);
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse;
+        });
     });
 
     it('should call the ID5 server without ab_testing object when abTesting is turned off', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
       let id5Config = getId5FetchConfig();
-      id5Config.params.abTesting = { enabled: false, controlGroupPct: 0.55 }
-
-      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
+      id5Config.params.abTesting = {enabled: false, controlGroupPct: 0.55}
 
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(requestBody.ab_testing).to.be.undefined;
+      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
 
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.ab_testing).is.undefined;
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        });
     });
 
     it('should call the ID5 server without ab_testing when when abTesting is not set', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
       let id5Config = getId5FetchConfig();
 
-      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
-
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(requestBody.ab_testing).to.be.undefined;
+      let submoduleResponse = callSubmoduleGetId(id5Config, undefined, ID5_STORED_OBJ);
 
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      return xhrServerMock.expectFetchRequest()
+        .then(fetchRequest => {
+          let requestBody = JSON.parse(fetchRequest.requestBody);
+          expect(requestBody.ab_testing).is.undefined;
+          fetchRequest.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+          return submoduleResponse
+        });
     });
 
     it('should store the privacy object from the ID5 server response', function () {
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
 
-      let request = server.requests[0];
-
-      let responseObject = utils.deepClone(ID5_JSON_RESPONSE);
-      responseObject.privacy = {
+      const privacy = {
         jurisdiction: 'gdpr',
         id5_consent: true
       };
-      request.respond(200, responseHeader, JSON.stringify(responseObject));
-      expect(getFromLocalStorage(ID5_PRIVACY_STORAGE_NAME)).to.be.eq(JSON.stringify(responseObject.privacy));
-      coreStorage.removeDataFromLocalStorage(ID5_PRIVACY_STORAGE_NAME);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(request => {
+          let responseObject = utils.deepClone(ID5_JSON_RESPONSE);
+          responseObject.privacy = privacy;
+          request.respond(200, responseHeader, JSON.stringify(responseObject));
+          return submoduleResponse
+        })
+        .then(() => {
+          expect(getFromLocalStorage(ID5_PRIVACY_STORAGE_NAME)).is.eq(JSON.stringify(privacy));
+          coreStorage.removeDataFromLocalStorage(ID5_PRIVACY_STORAGE_NAME);
+        })
     });
 
     it('should not store a privacy object if not part of ID5 server response', function () {
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
       coreStorage.removeDataFromLocalStorage(ID5_PRIVACY_STORAGE_NAME);
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, ID5_STORED_OBJ).callback;
-      submoduleCallback(callbackSpy);
-
-      let request = server.requests[0];
-
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-      expect(getFromLocalStorage(ID5_PRIVACY_STORAGE_NAME)).to.be.null;
+      let submoduleResponse = callSubmoduleGetId(getId5FetchConfig(), undefined, ID5_STORED_OBJ);
+
+      return xhrServerMock.expectFetchRequest()
+        .then(request => {
+          let responseObject = utils.deepClone(ID5_JSON_RESPONSE);
+          responseObject.privacy = undefined;
+          request.respond(200, responseHeader, JSON.stringify(responseObject));
+          return submoduleResponse
+        })
+        .then(() => {
+          expect(getFromLocalStorage(ID5_PRIVACY_STORAGE_NAME)).is.null;
+        });
     });
 
     describe('when legacy cookies are set', () => {
@@ -327,11 +674,11 @@ describe('ID5 ID System', function() {
     })
   });
 
-  describe('Request Bids Hook', function() {
+  describe('Request Bids Hook', function () {
     let adUnits;
     let sandbox;
 
-    beforeEach(function() {
+    beforeEach(function () {
       sandbox = sinon.sandbox.create();
       mockGdprConsent(sandbox);
       sinon.stub(events, 'getEvents').returns([]);
@@ -340,7 +687,7 @@ describe('ID5 ID System', function() {
       coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
       adUnits = [getAdUnitMock()];
     });
-    afterEach(function() {
+    afterEach(function () {
       events.getEvents.restore();
       coreStorage.removeDataFromLocalStorage(ID5_STORAGE_NAME);
       coreStorage.removeDataFromLocalStorage(`${ID5_STORAGE_NAME}_last`);
@@ -359,8 +706,8 @@ describe('ID5 ID System', function() {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property(`userId.${ID5_EIDS_NAME}`);
-            expect(bid.userId.id5id.uid).to.equal(ID5_STORED_ID);
-            expect(bid.userIdAsEids[0]).to.deep.equal({
+            expect(bid.userId.id5id.uid).is.equal(ID5_STORED_ID);
+            expect(bid.userIdAsEids[0]).is.deep.equal({
               source: ID5_SOURCE,
               uids: [{
                 id: ID5_STORED_ID,
@@ -373,7 +720,7 @@ describe('ID5 ID System', function() {
           });
         });
         done();
-      }, { adUnits });
+      }, {adUnits});
     });
 
     it('should add config value ID to bids', function (done) {
@@ -385,15 +732,15 @@ describe('ID5 ID System', function() {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property(`userId.${ID5_EIDS_NAME}`);
-            expect(bid.userId.id5id.uid).to.equal(ID5_STORED_ID);
-            expect(bid.userIdAsEids[0]).to.deep.equal({
+            expect(bid.userId.id5id.uid).is.equal(ID5_STORED_ID);
+            expect(bid.userIdAsEids[0]).is.deep.equal({
               source: ID5_SOURCE,
-              uids: [{ id: ID5_STORED_ID, atype: 1 }]
+              uids: [{id: ID5_STORED_ID, atype: 1}]
             });
           });
         });
         done();
-      }, { adUnits });
+      }, {adUnits});
     });
 
     it('should set nb=1 in cache when no stored nb value exists and cached ID', function (done) {
@@ -405,7 +752,7 @@ describe('ID5 ID System', function() {
       config.setConfig(getFetchLocalStorageConfig());
 
       requestBidsHook((adUnitConfig) => {
-        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(1);
+        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(1);
         done()
       }, {adUnits});
     });
@@ -419,19 +766,20 @@ describe('ID5 ID System', function() {
       config.setConfig(getFetchLocalStorageConfig());
 
       requestBidsHook(() => {
-        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(2);
+        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(2);
         done()
       }, {adUnits});
     });
 
     it('should call ID5 servers with signature and incremented nb post auction if refresh needed', function () {
-      storeInLocalStorage(ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ), 1);
+      let xhrServerMock = new XhrServerMock(sinon.createFakeServer())
+      let initialLocalStorageValue = JSON.stringify(ID5_STORED_OBJ);
+      storeInLocalStorage(ID5_STORAGE_NAME, initialLocalStorageValue, 1);
       storeInLocalStorage(`${ID5_STORAGE_NAME}_last`, expDaysStr(-1), 1);
-      storeNbInCache(ID5_TEST_PARTNER_ID, 1);
 
+      storeNbInCache(ID5_TEST_PARTNER_ID, 1);
       let id5Config = getFetchLocalStorageConfig();
       id5Config.userSync.userIds[0].storage.refreshInSeconds = 2;
-
       init(config);
       setSubmoduleRegistry([id5IdSubmodule]);
       config.setConfig(id5Config);
@@ -441,53 +789,62 @@ describe('ID5 ID System', function() {
           resolve()
         }, {adUnits});
       }).then(() => {
-        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(2);
-        expect(server.requests).to.be.empty;
+        expect(xhrServerMock.hasReceivedAnyRequest()).is.false;
         events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
-        return new Promise((resolve) => setTimeout(resolve))
-      }).then(() => {
-        let request = server.requests[0];
+        return xhrServerMock.expectFetchRequest()
+      }).then(request => {
         let requestBody = JSON.parse(request.requestBody);
-        expect(request.url).to.contain(ID5_ENDPOINT);
-        expect(requestBody.s).to.eq(ID5_STORED_SIGNATURE);
-        expect(requestBody.nbPage).to.eq(2);
-
-        const responseHeader = { 'Content-Type': 'application/json' };
+        expect(requestBody.s).is.eq(ID5_STORED_SIGNATURE);
+        expect(requestBody.nbPage).is.eq(2);
+        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(2);
+        const responseHeader = {'Content-Type': 'application/json'};
         request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
 
-        expect(decodeURIComponent(getFromLocalStorage(ID5_STORAGE_NAME))).to.be.eq(JSON.stringify(ID5_JSON_RESPONSE));
-        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(0);
+        return new Promise(function (resolve) {
+          (function waitForCondition() {
+            if (getFromLocalStorage(ID5_STORAGE_NAME) !== initialLocalStorageValue) return resolve();
+            setTimeout(waitForCondition, 30);
+          })();
+        })
+      }).then(() => {
+        expect(decodeURIComponent(getFromLocalStorage(ID5_STORAGE_NAME))).is.eq(JSON.stringify(ID5_JSON_RESPONSE));
+        expect(getNbFromCache(ID5_TEST_PARTNER_ID)).is.eq(0);
       })
     });
   });
 
-  describe('Decode stored object', function() {
-    const expectedDecodedObject = { id5id: { uid: ID5_STORED_ID, ext: { linkType: ID5_STORED_LINK_TYPE } } };
+  describe('Decode stored object', function () {
+    const expectedDecodedObject = {id5id: {uid: ID5_STORED_ID, ext: {linkType: ID5_STORED_LINK_TYPE}}};
 
-    it('should properly decode from a stored object', function() {
-      expect(id5IdSubmodule.decode(ID5_STORED_OBJ, getId5FetchConfig())).to.deep.equal(expectedDecodedObject);
+    it('should properly decode from a stored object', function () {
+      expect(id5IdSubmodule.decode(ID5_STORED_OBJ, getId5FetchConfig())).is.deep.equal(expectedDecodedObject);
     });
-    it('should return undefined if passed a string', function() {
-      expect(id5IdSubmodule.decode('somestring', getId5FetchConfig())).to.eq(undefined);
+    it('should return undefined if passed a string', function () {
+      expect(id5IdSubmodule.decode('somestring', getId5FetchConfig())).is.eq(undefined);
     });
   });
 
-  describe('A/B Testing', function() {
-    const expectedDecodedObjectWithIdAbOff = { id5id: { uid: ID5_STORED_ID, ext: { linkType: ID5_STORED_LINK_TYPE } } };
-    const expectedDecodedObjectWithIdAbOn = { id5id: { uid: ID5_STORED_ID, ext: { linkType: ID5_STORED_LINK_TYPE, abTestingControlGroup: false } } };
-    const expectedDecodedObjectWithoutIdAbOn = { id5id: { uid: '', ext: { linkType: 0, abTestingControlGroup: true } } };
+  describe('A/B Testing', function () {
+    const expectedDecodedObjectWithIdAbOff = {id5id: {uid: ID5_STORED_ID, ext: {linkType: ID5_STORED_LINK_TYPE}}};
+    const expectedDecodedObjectWithIdAbOn = {
+      id5id: {
+        uid: ID5_STORED_ID,
+        ext: {linkType: ID5_STORED_LINK_TYPE, abTestingControlGroup: false}
+      }
+    };
+    const expectedDecodedObjectWithoutIdAbOn = {id5id: {uid: '', ext: {linkType: 0, abTestingControlGroup: true}}};
     let testConfig, storedObject;
 
-    beforeEach(function() {
+    beforeEach(function () {
       testConfig = getId5FetchConfig();
       storedObject = utils.deepClone(ID5_STORED_OBJ);
     });
 
-    describe('A/B Testing Config is Set', function() {
+    describe('A/B Testing Config is Set', function () {
       let randStub;
 
-      beforeEach(function() {
-        randStub = sinon.stub(Math, 'random').callsFake(function() {
+      beforeEach(function () {
+        randStub = sinon.stub(Math, 'random').callsFake(function () {
           return 0.25;
         });
       });
@@ -495,39 +852,39 @@ describe('ID5 ID System', function() {
         randStub.restore();
       });
 
-      describe('Decode', function() {
+      describe('Decode', function () {
         let logErrorSpy;
 
-        beforeEach(function() {
+        beforeEach(function () {
           logErrorSpy = sinon.spy(utils, 'logError');
         });
-        afterEach(function() {
+        afterEach(function () {
           logErrorSpy.restore();
         });
 
         it('should not set abTestingControlGroup extension when A/B testing is off', function () {
           let decoded = id5IdSubmodule.decode(storedObject, testConfig);
-          expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOff);
+          expect(decoded).is.deep.equal(expectedDecodedObjectWithIdAbOff);
         });
 
         it('should set abTestingControlGroup to false when A/B testing is on but in normal group', function () {
-          storedObject.ab_testing = { result: 'normal' };
+          storedObject.ab_testing = {result: 'normal'};
           let decoded = id5IdSubmodule.decode(storedObject, testConfig);
-          expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOn);
+          expect(decoded).is.deep.equal(expectedDecodedObjectWithIdAbOn);
         });
 
         it('should not expose ID when everyone is in control group', function () {
-          storedObject.ab_testing = { result: 'control' };
+          storedObject.ab_testing = {result: 'control'};
           storedObject.universal_uid = '';
           storedObject.link_type = 0;
           let decoded = id5IdSubmodule.decode(storedObject, testConfig);
-          expect(decoded).to.deep.equal(expectedDecodedObjectWithoutIdAbOn);
+          expect(decoded).is.deep.equal(expectedDecodedObjectWithoutIdAbOn);
         });
 
         it('should log A/B testing errors', function () {
-          storedObject.ab_testing = { result: 'error' };
+          storedObject.ab_testing = {result: 'error'};
           let decoded = id5IdSubmodule.decode(storedObject, testConfig);
-          expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOff);
+          expect(decoded).is.deep.equal(expectedDecodedObjectWithIdAbOff);
           sinon.assert.calledOnce(logErrorSpy);
         });
       });

From 4a3daec6f1854f1b323140b84e8edb8e93d4b699 Mon Sep 17 00:00:00 2001
From: JacobKlein26 <42449375+JacobKlein26@users.noreply.github.com>
Date: Thu, 18 Aug 2022 22:28:54 -0400
Subject: [PATCH 166/569] NextMillenium Bid Adapter: Remove ortb2 referrerInfo
 (#8868)

* remove ortb2, get device/site manually

* updated tests

* remove fallbacks

* no need to craete variable if there is no fallback (return in place)

* removed one test case

Co-authored-by: Yakov Klein <yakovklein@Yakovs-MacBook-Air.local>
---
 modules/nextMillenniumBidAdapter.js           | 31 +++++++++++++++----
 .../modules/nextMillenniumBidAdapter_spec.js  |  9 ++----
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index f873e5b5c29..87d2e53568f 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -26,11 +26,12 @@ export const spec = {
     _each(validBidRequests, function(bid) {
       window.nmmRefreshCounts[bid.adUnitCode] = window.nmmRefreshCounts[bid.adUnitCode] || 0;
       const id = getPlacementId(bid)
+      let sizes = bid.sizes
+      if (sizes && !Array.isArray(sizes[0])) sizes = [sizes]
+
+      const site = getSiteObj()
+      const device = getDeviceObj()
 
-      if (bid.sizes && !Array.isArray(bid.sizes[0])) bid.sizes = [bid.sizes]
-      if (!bid.ortb2) bid.ortb2 = {}
-      if (!bid.ortb2.device) bid.ortb2.device = {}
-      bid.ortb2.device.referrer = (getRefererInfo && getRefererInfo().ref) || ''
       const postBody = {
         'id': bid.auctionId,
         'ext': {
@@ -46,10 +47,11 @@ export const spec = {
             'scrollTop': window.pageYOffset || document.documentElement.scrollTop
           }
         },
-        ...bid.ortb2,
+        device,
+        site,
         'imp': [{
           'banner': {
-            'format': (bid.sizes || []).map(s => { return {w: s[0], h: s[1]} })
+            'format': (sizes || []).map(s => { return {w: s[0], h: s[1]} })
           },
           'ext': {
             'prebid': {
@@ -198,4 +200,21 @@ function getTopWindow(curWindow, nesting = 0) {
   }
 }
 
+function getSiteObj() {
+  const refInfo = (getRefererInfo && getRefererInfo()) || {}
+
+  return {
+    page: refInfo.page,
+    ref: refInfo.ref,
+    domain: refInfo.domain
+  }
+}
+
+function getDeviceObj() {
+  return {
+    w: window.innerWidth || window.document.documentElement.clientWidth || window.document.body.clientWidth || 0,
+    h: window.innerHeight || window.document.documentElement.clientHeight || window.document.body.clientHeight || 0,
+  }
+}
+
 registerBidder(spec);
diff --git a/test/spec/modules/nextMillenniumBidAdapter_spec.js b/test/spec/modules/nextMillenniumBidAdapter_spec.js
index 40005356fd8..303025888dc 100644
--- a/test/spec/modules/nextMillenniumBidAdapter_spec.js
+++ b/test/spec/modules/nextMillenniumBidAdapter_spec.js
@@ -104,9 +104,9 @@ describe('nextMillenniumBidAdapterTests', function() {
     expect(JSON.parse(request[0].data).ext.nextMillennium.refresh_count).to.equal(3);
   });
 
-  it('Check if ORTB was added', function() {
+  it('Check if domain was added', function() {
     const request = spec.buildRequests(bidRequestData)
-    expect(JSON.parse(request[0].data).site.domain).to.equal('example.com')
+    expect(JSON.parse(request[0].data).site.domain).to.exist
   })
 
   it('Check if elOffsets was added', function() {
@@ -114,11 +114,6 @@ describe('nextMillenniumBidAdapterTests', function() {
     expect(JSON.parse(request[0].data).ext.nextMillennium.elOffsets).to.be.an('object')
   })
 
-  it('Check if refferer was added', function() {
-    const request = spec.buildRequests(bidRequestData)
-    expect(JSON.parse(request[0].data).device.referrer).to.exist
-  })
-
   it('Check if imp object was added', function() {
     const request = spec.buildRequests(bidRequestData)
     expect(JSON.parse(request[0].data).imp).to.be.an('array')

From 6f0a824d40d706d044b9b4c0070aed0c04bd5942 Mon Sep 17 00:00:00 2001
From: caseywhitmire <60086994+caseywhitmire@users.noreply.github.com>
Date: Fri, 19 Aug 2022 08:26:29 -0700
Subject: [PATCH 167/569] adserver.js : remove unused code (#8855)

---
 src/adserver.js | 56 -------------------------------------------------
 1 file changed, 56 deletions(-)

diff --git a/src/adserver.js b/src/adserver.js
index 8d99b29c3ef..db7aaaa1dc8 100644
--- a/src/adserver.js
+++ b/src/adserver.js
@@ -1,61 +1,5 @@
-import { formatQS } from './utils.js';
-import { targeting } from './targeting.js';
 import {hook} from './hook.js';
 
-// Adserver parent class
-const AdServer = function(attr) {
-  this.name = attr.adserver;
-  this.code = attr.code;
-  this.getWinningBidByCode = function() {
-    return targeting.getWinningBids(this.code)[0];
-  };
-};
-
-// DFP ad server
-// TODO: this seems to be unused?
-export function dfpAdserver(options, urlComponents) {
-  var adserver = new AdServer(options);
-  adserver.urlComponents = urlComponents;
-
-  var dfpReqParams = {
-    'env': 'vp',
-    'gdfp_req': '1',
-    'impl': 's',
-    'unviewed_position_start': '1'
-  };
-
-  var dfpParamsWithVariableValue = ['output', 'iu', 'sz', 'url', 'correlator', 'description_url', 'hl'];
-
-  var getCustomParams = function(targeting) {
-    return encodeURIComponent(formatQS(targeting));
-  };
-
-  adserver.appendQueryParams = function() {
-    var bid = adserver.getWinningBidByCode();
-    if (bid) {
-      this.urlComponents.search.description_url = encodeURIComponent(bid.vastUrl);
-      this.urlComponents.search.cust_params = getCustomParams(bid.adserverTargeting);
-      this.urlComponents.search.correlator = Date.now();
-    }
-  };
-
-  adserver.verifyAdserverTag = function() {
-    for (var key in dfpReqParams) {
-      if (!this.urlComponents.search.hasOwnProperty(key) || this.urlComponents.search[key] !== dfpReqParams[key]) {
-        return false;
-      }
-    }
-    for (var i in dfpParamsWithVariableValue) {
-      if (!this.urlComponents.search.hasOwnProperty(dfpParamsWithVariableValue[i])) {
-        return false;
-      }
-    }
-    return true;
-  };
-
-  return adserver;
-};
-
 /**
  * return the GAM PPID, if available (eid for the userID configured with `userSync.ppidSource`)
  */

From 3a029f684ee3992233e4de1cfa5b1cfbe19d6667 Mon Sep 17 00:00:00 2001
From: philan15 <37775368+philan15@users.noreply.github.com>
Date: Fri, 19 Aug 2022 19:21:46 +0300
Subject: [PATCH 168/569] Displayio Bid Adapter: custom render; fix eids
 payload (#8847)

* Custom render; call pubmatic get user id function is removed

* use refererInfo; remove call createEidsArray
---
 modules/displayioBidAdapter.js                | 189 +++++++++---------
 test/spec/modules/displayioBidAdapter_spec.js |  68 ++-----
 2 files changed, 108 insertions(+), 149 deletions(-)

diff --git a/modules/displayioBidAdapter.js b/modules/displayioBidAdapter.js
index e039d461fc7..c3c6597dd1b 100644
--- a/modules/displayioBidAdapter.js
+++ b/modules/displayioBidAdapter.js
@@ -1,16 +1,16 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {Renderer} from '../src/Renderer.js';
+import {getWindowFromDocument, logWarn} from '../src/utils.js';
 
-const BIDDER_VERSION = '1.0.0';
+const ADAPTER_VERSION = '1.1.0';
 const BIDDER_CODE = 'displayio';
-const GVLID = 999;
 const BID_TTL = 300;
 const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
 const DEFAULT_CURRENCY = 'USD';
 
 export const spec = {
   code: BIDDER_CODE,
-  gvlid: GVLID,
   supportedMediaTypes: SUPPORTED_AD_TYPES,
   isBidRequestValid: function(bid) {
     return !!(bid.params && bid.params.placementId && bid.params.siteId &&
@@ -20,7 +20,7 @@ export const spec = {
     return bidRequests.map(bid => {
       let url = '//' + bid.params.adsSrvDomain + '/srv?method=getPlacement&app=' +
         bid.params.siteId + '&placement=' + bid.params.placementId;
-      const data = this._getPayload(bid, bidderRequest);
+      const data = getPayload(bid, bidderRequest);
       return {
         method: 'POST',
         headers: {'Content-Type': 'application/json;charset=utf-8'},
@@ -42,117 +42,112 @@ export const spec = {
         height: adData.h,
         netRevenue: true,
         ttl: BID_TTL,
-        creativeId: adData.adId || 0,
-        currency: DEFAULT_CURRENCY,
+        creativeId: adData.adId || 1,
+        currency: adData.cur || DEFAULT_CURRENCY,
         referrer: data.data.ref,
-        mediaType: ads[0].ad.subtype,
+        mediaType: ads[0].ad.subtype === 'videoVast' ? VIDEO : BANNER,
         ad: adData.markup,
-        placement: data.placement,
+        adUnitCode: data.adUnitCode,
+        renderURL: data.renderURL,
         adData: adData
       };
-      if (bidResponse.vastUrl === 'videoVast') {
-        bidResponse.vastUrl = adData.videos[0].url
+
+      if (bidResponse.mediaType === VIDEO) {
+        bidResponse.vastUrl = adData.videos[0] && adData.videos[0].url
+      }
+
+      if (bidResponse.renderURL) {
+        bidResponse.renderer = newRenderer(bidResponse);
       }
       bidResponses.push(bidResponse);
     }
     return bidResponses;
-  },
-  _getPayload: function (bid, bidderRequest) {
-    const connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection;
-    const userSession = 'us_web_xxxxxxxxxxxx'.replace(/[x]/g, c => {
-      let r = Math.random() * 16 | 0;
-      let v = c === 'x' ? r : (r & 0x3 | 0x8);
-      return v.toString(16);
-    });
-    const { params } = bid;
-    const { siteId, placementId } = params;
-    const { refererInfo, uspConsent, gdprConsent } = bidderRequest;
-    const mediation = {consent: '-1', gdpr: '-1'};
-    if (gdprConsent) {
-      if (gdprConsent.consentString !== undefined) {
-        mediation.consent = gdprConsent.consentString;
-      }
-      if (gdprConsent.gdprApplies !== undefined) {
-        mediation.gdpr = gdprConsent.gdprApplies ? '1' : '0';
-      }
+  }
+};
+
+function getPayload (bid, bidderRequest) {
+  const connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection;
+  const userSession = 'us_web_xxxxxxxxxxxx'.replace(/[x]/g, c => {
+    let r = Math.random() * 16 | 0;
+    let v = c === 'x' ? r : (r & 0x3 | 0x8);
+    return v.toString(16);
+  });
+  const { params, adUnitCode, bidId } = bid;
+  const { siteId, placementId, renderURL, pageCategory, keywords } = params;
+  const { refererInfo, uspConsent, gdprConsent } = bidderRequest;
+  const mediation = {consent: '-1', gdpr: '-1'};
+  if (gdprConsent && 'gdprApplies' in gdprConsent) {
+    if (gdprConsent.consentString !== undefined) {
+      mediation.consent = gdprConsent.consentString;
     }
-    const payload = {
-      userSession,
+    if (gdprConsent.gdprApplies !== undefined) {
+      mediation.gdpr = gdprConsent.gdprApplies ? '1' : '0';
+    }
+  }
+  return {
+    userSession,
+    data: {
+      id: bidId,
+      action: 'getPlacement',
+      app: siteId,
+      placement: placementId,
+      adUnitCode,
+      renderURL,
       data: {
-        id: bid.bidId,
-        action: 'getPlacement',
-        app: siteId,
-        placement: placementId,
-        data: {
-          pagecat: params.pageCategory ? params.pageCategory.split(',').map(k => k.trim()) : [],
-          keywords: params.keywords ? params.keywords.split(',').map(k => k.trim()) : [],
-          lang_content: document.documentElement.lang,
-          lang: window.navigator.language,
-          // TODO: are these the correct refererInfo values?
-          domain: refererInfo.domain,
-          page: refererInfo.page,
-          ref: refererInfo.ref,
-          userids: _getUserIDs(),
-          geo: '',
-        },
-        complianceData: {
-          child: '-1',
-          us_privacy: uspConsent,
-          dnt: window.navigator.doNotTrack,
-          iabConsent: {},
-          mediation: {
-            consent: mediation.consent,
-            gdpr: mediation.gdpr,
-          }
-        },
-        integration: 'JS',
-        omidpn: 'Displayio',
-        mediationPlatform: 0,
-        prebidVersion: BIDDER_VERSION,
-        device: {
-          w: window.screen.width,
-          h: window.screen.height,
-          connection_type: connection ? connection.effectiveType : '',
+        pagecat: pageCategory ? pageCategory.split(',').map(k => k.trim()) : [],
+        keywords: keywords ? keywords.split(',').map(k => k.trim()) : [],
+        lang_content: document.documentElement.lang,
+        lang: window.navigator.language,
+        domain: refererInfo.domain,
+        page: refererInfo.page,
+        ref: refererInfo.referer,
+        userids: bid.userIdAsEids || {},
+        geo: '',
+      },
+      complianceData: {
+        child: '-1',
+        us_privacy: uspConsent,
+        dnt: window.doNotTrack === '1' || window.navigator.doNotTrack === '1' || false,
+        iabConsent: {},
+        mediation: {
+          consent: mediation.consent,
+          gdpr: mediation.gdpr,
         }
+      },
+      integration: 'JS',
+      omidpn: 'Displayio',
+      mediationPlatform: 0,
+      prebidVersion: ADAPTER_VERSION,
+      device: {
+        w: window.screen.width,
+        h: window.screen.height,
+        connection_type: connection ? connection.effectiveType : '',
       }
     }
-    if (navigator.permissions) {
-      navigator.permissions.query({ name: 'geolocation' })
-        .then((result) => {
-          if (result.state === 'granted') {
-            payload.data.data.geo = _getGeoData();
-          }
-        });
-    }
-    return payload
   }
-};
+}
+
+function newRenderer(bid) {
+  const renderer = Renderer.install({
+    id: bid.requestId,
+    url: bid.renderURL,
+    adUnitCode: bid.adUnitCode
+  });
 
-function _getUserIDs () {
-  let ids = {};
   try {
-    ids = window.owpbjs.getUserIdsAsEids();
-  } catch (e) {}
-  return ids;
+    renderer.setRender(webisRender);
+  } catch (err) {
+    logWarn('Prebid Error calling setRender on renderer', err);
+  }
+
+  return renderer;
 }
 
-async function _getGeoData () {
-  let geoData = null;
-  const getCurrentPosition = () => {
-    return new Promise((resolve, reject) =>
-      navigator.geolocation.getCurrentPosition(resolve, reject)
-    );
-  }
-  try {
-    const position = await getCurrentPosition();
-    let {latitude, longitude, accuracy} = position.coords;
-    geoData = {
-      'lat': latitude,
-      'lng': longitude,
-      'precision': accuracy
-    };
-  } catch (e) {}
-  return geoData
+function webisRender(bid, doc) {
+  bid.renderer.push(() => {
+    const win = getWindowFromDocument(doc) || window;
+    win.webis.init(bid.adData, bid.adUnitCode, bid.params);
+  })
 }
 
 registerBidder(spec);
diff --git a/test/spec/modules/displayioBidAdapter_spec.js b/test/spec/modules/displayioBidAdapter_spec.js
index dfeb67fb467..56b8b85384b 100644
--- a/test/spec/modules/displayioBidAdapter_spec.js
+++ b/test/spec/modules/displayioBidAdapter_spec.js
@@ -1,5 +1,5 @@
-import { expect } from 'chai'
 import {spec} from 'modules/displayioBidAdapter.js'
+import {BANNER} from '/src/mediaTypes'
 
 describe('Displayio adapter', function () {
   const BIDDER = 'displayio'
@@ -12,10 +12,7 @@ describe('Displayio adapter', function () {
     mediaTypes: {
       banner: {
         sizes: [[320, 480]]
-      },
-      video: {
-        sizes: [[360, 640]]
-      },
+      }
     },
     params: {
       siteId: 1,
@@ -128,53 +125,6 @@ describe('Displayio adapter', function () {
     })
   })
 
-  describe('_getPayload', function () {
-    const payload = spec._getPayload(bidRequests[0], bidderRequest)
-    it('should not be empty', function() {
-      expect(payload).to.not.be.empty
-    })
-
-    it('should have userSession', function() {
-      expect(payload.userSession).to.be.a('string')
-    })
-
-    it('should have data object', function() {
-      expect(payload.data).to.be.a('object')
-    })
-
-    it('should have complianceData object', function() {
-      expect(payload.data.complianceData).to.be.a('object')
-    })
-
-    it('should have device object', function() {
-      expect(payload.data.device).to.be.a('object')
-    })
-
-    it('should have omidpn', function() {
-      expect(payload.data.omidpn).to.be.a('string')
-    })
-
-    it('should have integration', function() {
-      expect(payload.data.integration).to.be.a('string')
-    })
-
-    it('should have bidId', function() {
-      expect(payload.data.id).to.not.be.empty
-    })
-
-    it('should have action getPlacement', function() {
-      expect(payload.data.action).to.be.equal('getPlacement')
-    })
-
-    it('should have app parameter', function() {
-      expect(payload.data.app).to.be.a('number')
-    })
-
-    it('should have placement parameter', function() {
-      expect(payload.data.placement).to.be.a('number')
-    })
-  })
-
   describe('interpretResponse', function () {
     const response = {
       body: {
@@ -199,6 +149,8 @@ describe('Displayio adapter', function () {
       data: {
         data: {
           id: 'id_001',
+          adUnitCode: 'test-div',
+          renderURL: 'testprebid.com/render.js',
           data: {
             ref: 'testprebid.com'
           }
@@ -235,5 +187,17 @@ describe('Displayio adapter', function () {
     it('should have ad', function() {
       expect(ir.ad).to.be.a('string')
     })
+
+    it('should have mediaType', function() {
+      expect(ir.mediaType).to.be.equal(BANNER)
+    })
+
+    it('should have adUnitCode', function() {
+      expect(ir.adUnitCode).to.be.a('string')
+    })
+
+    it('should have renderURL', function() {
+      expect(ir.renderURL).to.be.a('string')
+    })
   })
 })

From 7e5548e4de15edb3b554fcd6c8a19a26c0bd36e2 Mon Sep 17 00:00:00 2001
From: Gena <wertixvost@gmail.com>
Date: Fri, 19 Aug 2022 21:46:50 +0200
Subject: [PATCH 169/569] VidCrunch LLC bidder (#8872)

---
 modules/adtelligentBidAdapter.js                | 2 ++
 test/spec/modules/adtelligentBidAdapter_spec.js | 1 +
 2 files changed, 3 insertions(+)

diff --git a/modules/adtelligentBidAdapter.js b/modules/adtelligentBidAdapter.js
index 2ee5b0f72a3..3dad2e98bcf 100644
--- a/modules/adtelligentBidAdapter.js
+++ b/modules/adtelligentBidAdapter.js
@@ -23,6 +23,7 @@ const HOST_GETTERS = {
   janet: () => 'ghb.bidder.jmgads.com',
   pgam: () => 'ghb.pgamssp.com',
   ocm: () => 'ghb.cenarius.orangeclickmedia.com',
+  vidcrunchllc: () => 'ghb.platform.vidcrunch.com',
 }
 const getUri = function (bidderCode) {
   let bidderWithoutSuffix = bidderCode.split('_')[0];
@@ -43,6 +44,7 @@ export const spec = {
     { code: 'navelix', gvlid: 380 },
     'pgam',
     'ocm',
+    { code: 'vidcrunchllc', gvlid: 1145 },
   ],
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid: function (bid) {
diff --git a/test/spec/modules/adtelligentBidAdapter_spec.js b/test/spec/modules/adtelligentBidAdapter_spec.js
index a9b9724da3a..d0ef69ccf08 100644
--- a/test/spec/modules/adtelligentBidAdapter_spec.js
+++ b/test/spec/modules/adtelligentBidAdapter_spec.js
@@ -20,6 +20,7 @@ const aliasEP = {
   janet: 'https://ghb.bidder.jmgads.com/v2/auction/',
   pgam: 'https://ghb.pgamssp.com/v2/auction/',
   ocm: 'https://ghb.cenarius.orangeclickmedia.com/v2/auction/',
+  vidcrunchllc: 'https://ghb.platform.vidcrunch.com/v2/auction/',
 };
 
 const DEFAULT_ADATPER_REQ = { bidderCode: 'adtelligent' };

From 0b71a3364cf774a87f630157ab78c1a4f0670c18 Mon Sep 17 00:00:00 2001
From: matthieularere-msq
 <63732822+matthieularere-msq@users.noreply.github.com>
Date: Mon, 22 Aug 2022 17:51:05 +0200
Subject: [PATCH 170/569] bidWatch Analytics Adapter : limit bandwidth usage +
 refactory (#8774)

* bidWatch Analytics Adapter : code refactory

* Update bidwatchAnalyticsAdapter_spec.js

* Update bidwatchAnalyticsAdapter_spec.js
---
 modules/bidwatchAnalyticsAdapter.js           | 171 ++++++++++++------
 .../modules/bidwatchAnalyticsAdapter_spec.js  |  40 ++--
 2 files changed, 140 insertions(+), 71 deletions(-)

diff --git a/modules/bidwatchAnalyticsAdapter.js b/modules/bidwatchAnalyticsAdapter.js
index ef63fee53d5..9983eb58289 100644
--- a/modules/bidwatchAnalyticsAdapter.js
+++ b/modules/bidwatchAnalyticsAdapter.js
@@ -12,6 +12,7 @@ const {
     BID_WON,
     BID_RESPONSE,
     BID_REQUESTED,
+    BID_TIMEOUT,
   }
 } = CONSTANTS;
 
@@ -20,80 +21,125 @@ let allEvents = {}
 let auctionEnd = {}
 let initOptions = {}
 let endpoint = 'https://default'
-let objectToSearchForBidderCode = ['bidderRequests', 'bidsReceived', 'noBids']
+let requestsAttributes = ['adUnitCode', 'auctionId', 'bidder', 'bidderCode', 'bidId', 'cpm', 'creativeId', 'currency', 'width', 'height', 'mediaType', 'netRevenue', 'originalCpm', 'originalCurrency', 'requestId', 'size', 'source', 'status', 'timeToRespond', 'transactionId', 'ttl', 'sizes', 'mediaTypes', 'src', 'params', 'userId', 'labelAny', 'bids'];
 
 function getAdapterNameForAlias(aliasName) {
   return adapterManager.aliasRegistry[aliasName] || aliasName;
 }
 
-function cleanArgObject(arg, removead) {
-  if (typeof arg['bidderCode'] == 'string') { arg['originalBidder'] = getAdapterNameForAlias(arg['bidderCode']); }
-  if (typeof arg['creativeId'] == 'number') {
-    arg['creativeId'] = arg['creativeId'].toString();
-  }
-  if (removead && typeof arg['ad'] != 'undefined') {
-    arg['ad'] = 'emptied';
-  }
-  if (typeof arg['gdprConsent'] != 'undefined' && typeof arg['gdprConsent']['vendorData'] != 'undefined') {
-    arg['gdprConsent']['vendorData'] = 'emptied';
+function filterAttributes(arg, removead) {
+  let response = {};
+  if (typeof arg == 'object') {
+    if (typeof arg['bidderCode'] == 'string') {
+      response['originalBidder'] = getAdapterNameForAlias(arg['bidderCode']);
+    } else if (typeof arg['bidder'] == 'string') {
+      response['originalBidder'] = getAdapterNameForAlias(arg['bidder']);
+    }
+    if (!removead && typeof arg['ad'] != 'undefined') {
+      response['ad'] = arg['ad'];
+    }
+    if (typeof arg['gdprConsent'] != 'undefined') {
+      response['gdprConsent'] = {};
+      if (typeof arg['gdprConsent']['consentString'] != 'undefined') { response['gdprConsent']['consentString'] = arg['gdprConsent']['consentString']; }
+    }
+    requestsAttributes.forEach((attr) => {
+      if (typeof arg[attr] != 'undefined') { response[attr] = arg[attr]; }
+    });
+    if (typeof response['creativeId'] == 'number') { response['creativeId'] = response['creativeId'].toString(); }
   }
-  return arg;
+  return response;
 }
 
-function cleanArgs(arg, removead) {
-  Object.keys(arg).forEach(key => {
-    arg[key] = cleanArgObject(arg[key], removead);
+function cleanAuctionEnd(args) {
+  let response = {};
+  let filteredObj;
+  let objects = ['bidderRequests', 'bidsReceived', 'noBids'];
+  objects.forEach((attr) => {
+    if (Array.isArray(args[attr])) {
+      response[attr] = [];
+      args[attr].forEach((obj) => {
+        filteredObj = filterAttributes(obj, true);
+        if (typeof obj['bids'] == 'object') {
+          filteredObj['bids'] = [];
+          obj['bids'].forEach((bid) => {
+            filteredObj['bids'].push(filterAttributes(bid, true));
+          });
+        }
+        response[attr].push(filteredObj);
+      });
+    }
   });
-  return arg
+  return response;
+}
+
+function cleanCreatives(args) {
+  return filterAttributes(args, false);
 }
 
-function checkBidderCode(args, removead) {
-  if (typeof args == 'object') {
-    for (let i = 0; i < objectToSearchForBidderCode.length; i++) {
-      if (typeof args[objectToSearchForBidderCode[i]] == 'object') { args[objectToSearchForBidderCode[i]] = cleanArgs(args[objectToSearchForBidderCode[i]], removead) }
+function enhanceMediaType(arg) {
+  saveEvents['bidRequested'].forEach((bidRequested) => {
+    if (bidRequested['auctionId'] == arg['auctionId'] && Array.isArray(bidRequested['bids'])) {
+      bidRequested['bids'].forEach((bid) => {
+        if (bid['transactionId'] == arg['transactionId'] && bid['bidId'] == arg['requestId']) { arg['mediaTypes'] = bid['mediaTypes']; }
+      });
     }
-  }
-  if (typeof args['bidderCode'] == 'string') { args['originalBidder'] = getAdapterNameForAlias(args['bidderCode']); } else if (typeof args['bidder'] == 'string') { args['originalBidder'] = getAdapterNameForAlias(args['bidder']); }
-  if (typeof args['creativeId'] == 'number') { args['creativeId'] = args['creativeId'].toString(); }
+  });
+  return arg;
+}
 
-  return args
+function addBidResponse(args) {
+  let eventType = BID_RESPONSE;
+  let argsCleaned = cleanCreatives(JSON.parse(JSON.stringify(args))); ;
+  if (allEvents[eventType] == undefined) { allEvents[eventType] = [] }
+  allEvents[eventType].push(argsCleaned);
 }
 
-function addEvent(eventType, args) {
-  let argsCleaned;
-  if (eventType && args) {
-    if (allEvents[eventType] == undefined) { allEvents[eventType] = [] }
-    if (saveEvents[eventType] == undefined) { saveEvents[eventType] = [] }
-    argsCleaned = checkBidderCode(JSON.parse(JSON.stringify(args)), false);
-    allEvents[eventType].push(argsCleaned);
-    saveEvents[eventType].push(argsCleaned);
-    argsCleaned = checkBidderCode(JSON.parse(JSON.stringify(args)), true);
-    if (['auctionend', 'bidtimeout'].includes(eventType.toLowerCase())) {
-      if (auctionEnd[eventType] == undefined) { auctionEnd[eventType] = [] }
-      auctionEnd[eventType].push(argsCleaned);
-    }
-  }
+function addBidRequested(args) {
+  let eventType = BID_REQUESTED;
+  let argsCleaned = filterAttributes(args, true);
+  if (saveEvents[eventType] == undefined) { saveEvents[eventType] = [] }
+  saveEvents[eventType].push(argsCleaned);
+}
+
+function addTimeout(args) {
+  let eventType = BID_TIMEOUT;
+  if (saveEvents[eventType] == undefined) { saveEvents[eventType] = [] }
+  saveEvents[eventType].push(args);
+  let argsCleaned = [];
+  let argsDereferenced = JSON.parse(JSON.stringify(args));
+  argsDereferenced.forEach((attr) => {
+    argsCleaned.push(filterAttributes(JSON.parse(JSON.stringify(attr)), false));
+  });
+  if (auctionEnd[eventType] == undefined) { auctionEnd[eventType] = [] }
+  auctionEnd[eventType].push(argsCleaned);
+}
+
+function addAuctionEnd(args) {
+  let eventType = AUCTION_END;
+  if (saveEvents[eventType] == undefined) { saveEvents[eventType] = [] }
+  saveEvents[eventType].push(args);
+  let argsCleaned = cleanAuctionEnd(JSON.parse(JSON.stringify(args)));
+  if (auctionEnd[eventType] == undefined) { auctionEnd[eventType] = [] }
+  auctionEnd[eventType].push(argsCleaned);
 }
 
 function handleBidWon(args) {
-  args = cleanArgObject(JSON.parse(JSON.stringify(args)), true);
+  args = enhanceMediaType(filterAttributes(JSON.parse(JSON.stringify(args)), true));
   let increment = args['cpm'];
   if (typeof saveEvents['auctionEnd'] == 'object') {
-    for (let i = 0; i < saveEvents['auctionEnd'].length; i++) {
-      let tmpAuction = saveEvents['auctionEnd'][i];
-      if (tmpAuction['auctionId'] == args['auctionId'] && typeof tmpAuction['bidsReceived'] == 'object') {
-        for (let j = 0; j < tmpAuction['bidsReceived'].length; j++) {
-          let tmpBid = tmpAuction['bidsReceived'][j];
-          if (tmpBid['transactionId'] == args['transactionId'] && tmpBid['adId'] != args['adId']) {
-            if (args['cpm'] < tmpBid['cpm']) {
+    saveEvents['auctionEnd'].forEach((auction) => {
+      if (auction['auctionId'] == args['auctionId'] && typeof auction['bidsReceived'] == 'object') {
+        auction['bidsReceived'].forEach((bid) => {
+          if (bid['transactionId'] == args['transactionId'] && bid['adId'] != args['adId']) {
+            if (args['cpm'] < bid['cpm']) {
               increment = 0;
-            } else if (increment > args['cpm'] - tmpBid['cpm']) {
-              increment = args['cpm'] - tmpBid['cpm'];
+            } else if (increment > args['cpm'] - bid['cpm']) {
+              increment = args['cpm'] - bid['cpm'];
             }
           }
-        }
+        });
       }
-    }
+    });
   }
   args['cpmIncrement'] = increment;
   if (typeof saveEvents.bidRequested == 'object' && saveEvents.bidRequested.length > 0 && saveEvents.bidRequested[0].gdprConsent) { args.gdpr = saveEvents.bidRequested[0].gdprConsent; }
@@ -101,12 +147,16 @@ function handleBidWon(args) {
 }
 
 function handleAuctionEnd() {
-  ajax(endpoint + '.bidwatch.io/analytics/auctions', null, JSON.stringify(auctionEnd), {method: 'POST', withCredentials: true});
-  auctionEnd = {}
-  if (typeof allEvents['bidResponse'] != 'undefined') {
-    for (let i = 0; i < allEvents['bidResponse'].length; i++) { ajax(endpoint + '.bidwatch.io/analytics/creatives', null, JSON.stringify(allEvents['bidResponse'][i]), {method: 'POST', withCredentials: true}); }
-  }
-  allEvents = {}
+  ajax(endpoint + '.bidwatch.io/analytics/auctions', function (data) {
+    let list = JSON.parse(data);
+    if (Array.isArray(list) && typeof allEvents['bidResponse'] != 'undefined') {
+      allEvents['bidResponse'].forEach((bidResponse) => {
+        if (list.includes(bidResponse['originalBidder'] + '_' + bidResponse['creativeId'])) { ajax(endpoint + '.bidwatch.io/analytics/creatives', null, JSON.stringify(bidResponse), {method: 'POST', withCredentials: true}); }
+      });
+    }
+    allEvents = {};
+  }, JSON.stringify(auctionEnd), {method: 'POST', withCredentials: true});
+  auctionEnd = {};
 }
 
 let bidwatchAnalytics = Object.assign(adapter({url, analyticsType}), {
@@ -116,17 +166,20 @@ let bidwatchAnalytics = Object.assign(adapter({url, analyticsType}), {
   }) {
     switch (eventType) {
       case AUCTION_END:
-        addEvent(eventType, args);
+        addAuctionEnd(args);
         handleAuctionEnd();
         break;
       case BID_WON:
         handleBidWon(args);
         break;
       case BID_RESPONSE:
-        addEvent(eventType, args);
+        addBidResponse(args);
         break;
       case BID_REQUESTED:
-        addEvent(eventType, args);
+        addBidRequested(args);
+        break;
+      case BID_TIMEOUT:
+        addTimeout(args);
         break;
     }
   }});
diff --git a/test/spec/modules/bidwatchAnalyticsAdapter_spec.js b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
index f827f068bb3..dddb29dbfd9 100644
--- a/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
+++ b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
@@ -260,15 +260,15 @@ describe('BidWatch Analytics', function () {
   describe('main test flow', function () {
     beforeEach(function () {
       sinon.stub(events, 'getEvents').returns([]);
+      sinon.spy(bidwatchAnalytics, 'track');
     });
-
     afterEach(function () {
       events.getEvents.restore();
+      bidwatchAnalytics.disableAnalytics();
+      bidwatchAnalytics.track.restore();
     });
 
-    it('should catch events of interest', function () {
-      sinon.spy(bidwatchAnalytics, 'track');
-
+    it('test auctionEnd', function () {
       adapterManager.registerAnalyticsAdapter({
         code: 'bidwatch',
         adapter: bidwatchAnalytics
@@ -280,6 +280,9 @@ describe('BidWatch Analytics', function () {
           domain: 'test'
         }
       });
+
+      events.emit(constants.EVENTS.BID_REQUESTED, auctionEnd['bidderRequests'][0]);
+      events.emit(constants.EVENTS.BID_RESPONSE, auctionEnd['bidsReceived'][0]);
       events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeout);
       events.emit(constants.EVENTS.AUCTION_END, auctionEnd);
       expect(server.requests.length).to.equal(1);
@@ -287,18 +290,31 @@ describe('BidWatch Analytics', function () {
       expect(message).to.have.property('auctionEnd').exist;
       expect(message.auctionEnd).to.have.lengthOf(1);
       expect(message.auctionEnd[0]).to.have.property('bidsReceived').and.to.have.lengthOf(1);
-      expect(message.auctionEnd[0].bidsReceived[0]).to.have.property('ad');
-      expect(message.auctionEnd[0].bidsReceived[0].ad).to.equal('emptied');
+      expect(message.auctionEnd[0].bidsReceived[0]).not.to.have.property('ad');
       expect(message.auctionEnd[0]).to.have.property('bidderRequests').and.to.have.lengthOf(1);
       expect(message.auctionEnd[0].bidderRequests[0]).to.have.property('gdprConsent');
-      expect(message.auctionEnd[0].bidderRequests[0].gdprConsent).to.have.property('vendorData');
-      expect(message.auctionEnd[0].bidderRequests[0].gdprConsent.vendorData).to.equal('emptied');
+      expect(message.auctionEnd[0].bidderRequests[0].gdprConsent).not.to.have.property('vendorData');
+      sinon.assert.callCount(bidwatchAnalytics.track, 4);
+    });
+
+    it('test bidWon', function() {
+      adapterManager.registerAnalyticsAdapter({
+        code: 'bidwatch',
+        adapter: bidwatchAnalytics
+      });
+
+      adapterManager.enableAnalytics({
+        provider: 'bidwatch',
+        options: {
+          domain: 'test'
+        }
+      });
       events.emit(constants.EVENTS.BID_WON, bidWon);
-      expect(server.requests.length).to.equal(2);
-      message = JSON.parse(server.requests[1].requestBody);
-      expect(message).to.have.property('ad').and.to.equal('emptied');
+      expect(server.requests.length).to.equal(1);
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message).not.to.have.property('ad');
       expect(message).to.have.property('cpmIncrement').and.to.equal(27.4276);
-      sinon.assert.callCount(bidwatchAnalytics.track, 3);
+      sinon.assert.callCount(bidwatchAnalytics.track, 1);
     });
   });
 });

From a61f4bfdc31c6ade12c19489b6edbe2126711277 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Aug 2022 13:37:11 -0400
Subject: [PATCH 171/569] Bump tibdex/github-app-token from 1.3.0 to 1.6
 (#8878)

Bumps [tibdex/github-app-token](https://github.com/tibdex/github-app-token) from 1.3.0 to 1.6.
- [Release notes](https://github.com/tibdex/github-app-token/releases)
- [Commits](https://github.com/tibdex/github-app-token/compare/36464acb844fc53b9b8b2401da68844f6b05ebb0...f717b5ecd4534d3c4df4ce9b5c1c2214f0f7cd06)

---
updated-dependencies:
- dependency-name: tibdex/github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/issue_tracker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/issue_tracker.yml b/.github/workflows/issue_tracker.yml
index fa33ffe5c53..05d08b2b0d7 100644
--- a/.github/workflows/issue_tracker.yml
+++ b/.github/workflows/issue_tracker.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@36464acb844fc53b9b8b2401da68844f6b05ebb0
+        uses: tibdex/github-app-token@f717b5ecd4534d3c4df4ce9b5c1c2214f0f7cd06
         with:
           app_id: ${{ secrets.ISSUE_APP_ID }}
           private_key: ${{ secrets.ISSUE_APP_PEM }}

From 5be582f2e35650e0bf4dbe212bde9e936edfe75c Mon Sep 17 00:00:00 2001
From: Denis Logachov <denis@adkernel.com>
Date: Mon, 22 Aug 2022 20:44:12 +0300
Subject: [PATCH 172/569] Adkernel Bid Adapter: add impression-level FPD
 support (#8880)

---
 modules/adkernelBidAdapter.js                | 40 ++++++++++++++------
 test/spec/modules/adkernelBidAdapter_spec.js | 13 ++++++-
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index 78f00784462..ff7d3be6ebf 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -14,11 +14,12 @@ import {
   isPlainObject,
   isStr,
   mergeDeep,
-  parseGPTSingleSizeArrayToRtbSize
+  parseGPTSingleSizeArrayToRtbSize,
+  getDefinedParams
 } from '../src/utils.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {find, includes} from '../src/polyfill.js';
+import {find} from '../src/polyfill.js';
 import {config} from '../src/config.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
@@ -28,10 +29,11 @@ import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
  *
  * Please contact prebid@adkernel.com and we'll add your adapter as an alias.
  */
-
-const VIDEO_TARGETING = Object.freeze(['mimes', 'minduration', 'maxduration', 'protocols',
-  'startdelay', 'linearity', 'boxingallowed', 'playbackmethod', 'delivery',
-  'pos', 'api', 'ext']);
+const VIDEO_PARAMS = ['pos', 'context', 'placement', 'api', 'mimes', 'protocols', 'playbackmethod', 'minduration', 'maxduration',
+  'startdelay', 'linearity', 'skip', 'skipmin', 'skipafter', 'minbitrate', 'maxbitrate', 'delivery', 'playbackend', 'boxingallowed'];
+const VIDEO_FPD = ['battr', 'pos'];
+const NATIVE_FPD = ['battr', 'api'];
+const BANNER_FPD = ['btype', 'battr', 'pos', 'api'];
 const VERSION = '1.6';
 const SYNC_IFRAME = 1;
 const SYNC_IMAGE = 2;
@@ -275,18 +277,18 @@ function buildImp(bidRequest, secure) {
       format: sizes.map(wh => parseGPTSingleSizeArrayToRtbSize(wh)),
       topframe: 0
     };
+    populateImpFpd(imp.banner, bidRequest, BANNER_FPD);
     mediaType = BANNER;
   } else if (deepAccess(bidRequest, 'mediaTypes.video')) {
     let video = deepAccess(bidRequest, 'mediaTypes.video');
-    imp.video = {};
+    imp.video = getDefinedParams(video, VIDEO_PARAMS);
+    populateImpFpd(imp.video, bidRequest, VIDEO_FPD);
     if (video.playerSize) {
       sizes = video.playerSize[0];
       imp.video = Object.assign(imp.video, parseGPTSingleSizeArrayToRtbSize(sizes) || {});
-    }
-    if (bidRequest.params.video) {
-      Object.keys(bidRequest.params.video)
-        .filter(key => includes(VIDEO_TARGETING, key))
-        .forEach(key => imp.video[key] = bidRequest.params.video[key]);
+    } else if (video.w && video.h) {
+      imp.video.w = video.w;
+      imp.video.h = video.h;
     }
     mediaType = VIDEO;
   } else if (deepAccess(bidRequest, 'mediaTypes.native')) {
@@ -295,6 +297,7 @@ function buildImp(bidRequest, secure) {
       ver: '1.1',
       request: JSON.stringify(nativeRequest)
     };
+    populateImpFpd(imp.native, bidRequest, NATIVE_FPD);
     mediaType = NATIVE;
   } else {
     throw new Error('Unsupported bid received');
@@ -338,6 +341,19 @@ function buildNativeRequest(nativeReq) {
   return request;
 }
 
+/**
+ * Populate impression-level FPD from bid request
+ * @param target {Object}
+ * @param bidRequest {BidRequest}
+ * @param props {String[]}
+ */
+function populateImpFpd(target, bidRequest, props) {
+  if (bidRequest.ortb2Imp === undefined) {
+    return;
+  }
+  Object.assign(target, getDefinedParams(bidRequest.ortb2Imp, props));
+}
+
 /**
  *  Builds image asset request
  */
diff --git a/test/spec/modules/adkernelBidAdapter_spec.js b/test/spec/modules/adkernelBidAdapter_spec.js
index 4b0eebdf519..45498d2734a 100644
--- a/test/spec/modules/adkernelBidAdapter_spec.js
+++ b/test/spec/modules/adkernelBidAdapter_spec.js
@@ -17,6 +17,9 @@ describe('Adkernel adapter', function () {
         banner: {
           sizes: [[300, 250], [300, 200]]
         }
+      },
+      ortb2Imp: {
+        battr: [6, 7, 9]
       }
     }, bid2_zone2 = {
       bidder: 'adkernel',
@@ -95,12 +98,12 @@ describe('Adkernel adapter', function () {
       params: {
         zoneId: 1,
         host: 'rtb.adkernel.com',
-        video: {api: [1, 2]}
       },
       mediaTypes: {
         video: {
           context: 'instream',
-          playerSize: [[640, 480]]
+          playerSize: [[640, 480]],
+          api: [1, 2]
         }
       },
       adUnitCode: 'ad-unit-1'
@@ -293,6 +296,7 @@ describe('Adkernel adapter', function () {
 
   describe('banner request building', function () {
     let bidRequest, bidRequests, _;
+
     before(function () {
       [_, bidRequests] = buildRequest([bid1_zone1]);
       bidRequest = bidRequests[0];
@@ -337,6 +341,11 @@ describe('Adkernel adapter', function () {
       expect(bidRequest.device).to.have.property('dnt', 1);
     });
 
+    it('should copy FPD to imp.banner', function() {
+      expect(bidRequest.imp[0].banner).to.have.property('battr');
+      expect(bidRequest.imp[0].banner.battr).to.be.eql([6, 7, 9]);
+    });
+
     it('shouldn\'t contain gdpr nor ccpa information for default request', function () {
       let [_, bidRequests] = buildRequest([bid1_zone1]);
       expect(bidRequests[0]).to.not.have.property('regs');

From 47c8ead2fe1d51282000dfe1df55b1dfa92aa53b Mon Sep 17 00:00:00 2001
From: Jason Piros <jasonpiros@gmail.com>
Date: Mon, 22 Aug 2022 15:21:33 -0700
Subject: [PATCH 173/569] consumableBidAdapter: remove impressionUrl (#8883)

---
 modules/consumableBidAdapter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/consumableBidAdapter.js b/modules/consumableBidAdapter.js
index 6d502b24e81..87cb6052630 100644
--- a/modules/consumableBidAdapter.js
+++ b/modules/consumableBidAdapter.js
@@ -1,4 +1,4 @@
-import { logWarn, createTrackPixelHtml, deepAccess, isArray, deepSetValue } from '../src/utils.js';
+import { logWarn, deepAccess, isArray, deepSetValue } from '../src/utils.js';
 import {config} from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
@@ -255,7 +255,7 @@ function getSize(sizes) {
 function retrieveAd(decision, unitId, unitName) {
   let ad;
   if (decision.contents && decision.contents[0]) {
-    ad = decision.contents[0].body + createTrackPixelHtml(decision.impressionUrl);
+    ad = decision.contents[0].body;
   }
   if (decision.vastXml) {
     ad = decision.vastXml;

From 73c13cde704ef396a152ed9dcb8596779473107d Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Tue, 23 Aug 2022 09:03:58 -0400
Subject: [PATCH 174/569] Prebid Core: Add ttl buffer to videoCache.js (#8861)

* Update videoCache.js

* Update videoCache.js

* Update videoCache_spec.js

* Update videoCache_spec.js

* master into ttl-buffer (#8869)

* Update Sonobi adapter with GVLID (#8860)

* dgkeyword RTD provider: fix tests causing ID5 test failures (#8862)

Co-authored-by: Mike Miller <mike@solitaired.com>
Co-authored-by: Demetrio Girardi <dgirardi@prebid.org>

* Revert "master into ttl-buffer (#8869)" (#8879)

This reverts commit b253980d38b6c801bc359066258b5988ce938865.

* Name the constant

Co-authored-by: Mike Miller <mike@solitaired.com>
Co-authored-by: Demetrio Girardi <dgirardi@prebid.org>
---
 src/videoCache.js            | 10 ++++++++--
 test/spec/videoCache_spec.js | 14 +++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/videoCache.js b/src/videoCache.js
index 219bca34726..f69a20f0139 100644
--- a/src/videoCache.js
+++ b/src/videoCache.js
@@ -13,6 +13,12 @@ import { ajax } from './ajax.js';
 import { config } from './config.js';
 import {auctionManager} from './auctionManager.js';
 
+/**
+ * Might be useful to be configurable in the future
+ * Depending on publisher needs
+ */
+const ttlBufferInSeconds = 15;
+
 /**
  * @typedef {object} CacheableUrlBid
  * @property {string} vastUrl A URL which loads some valid VAST XML.
@@ -63,11 +69,11 @@ function wrapURI(uri, impUrl) {
 function toStorageRequest(bid, {index = auctionManager.index} = {}) {
   const vastValue = bid.vastXml ? bid.vastXml : wrapURI(bid.vastUrl, bid.vastImpUrl);
   const auction = index.getAuction(bid);
-
+  const ttlWithBuffer = Number(bid.ttl) + ttlBufferInSeconds;
   let payload = {
     type: 'xml',
     value: vastValue,
-    ttlseconds: Number(bid.ttl)
+    ttlseconds: ttlWithBuffer
   };
 
   if (config.getConfig('cache.vasttrack')) {
diff --git a/test/spec/videoCache_spec.js b/test/spec/videoCache_spec.js
index fdb4103baed..5885dfb7cdf 100644
--- a/test/spec/videoCache_spec.js
+++ b/test/spec/videoCache_spec.js
@@ -155,12 +155,12 @@ describe('The video cache', function () {
         puts: [{
           type: 'xml',
           value: vastXml1,
-          ttlseconds: 25,
+          ttlseconds: 40,
           key: customKey1
         }, {
           type: 'xml',
           value: vastXml2,
-          ttlseconds: 25,
+          ttlseconds: 40,
           key: customKey2
         }]
       };
@@ -205,7 +205,7 @@ describe('The video cache', function () {
         puts: [{
           type: 'xml',
           value: vastXml1,
-          ttlseconds: 25,
+          ttlseconds: 40,
           key: customKey1,
           bidid: '12345abc',
           aid: '1234-56789-abcde',
@@ -213,7 +213,7 @@ describe('The video cache', function () {
         }, {
           type: 'xml',
           value: vastXml2,
-          ttlseconds: 25,
+          ttlseconds: 40,
           key: customKey2,
           bidid: 'cba54321',
           aid: '1234-56789-abcde',
@@ -276,7 +276,7 @@ describe('The video cache', function () {
         puts: [{
           type: 'xml',
           value: vastXml1,
-          ttlseconds: 25,
+          ttlseconds: 40,
           key: customKey1,
           bidid: '12345abc',
           bidder: 'appnexus',
@@ -285,7 +285,7 @@ describe('The video cache', function () {
         }, {
           type: 'xml',
           value: vastXml2,
-          ttlseconds: 25,
+          ttlseconds: 40,
           key: customKey2,
           bidid: 'cba54321',
           bidder: 'rubicon',
@@ -309,7 +309,7 @@ describe('The video cache', function () {
         puts: [{
           type: 'xml',
           value: expectedValue,
-          ttlseconds: 25
+          ttlseconds: 40
         }],
       });
     }

From 8d88902ff6f1479ac991d78d611e482f49c9c81c Mon Sep 17 00:00:00 2001
From: pm-azhar-mulla <75726247+pm-azhar-mulla@users.noreply.github.com>
Date: Tue, 23 Aug 2022 21:06:16 +0530
Subject: [PATCH 175/569] Added support to log extra bids from same bidder
 (#8886)

Co-authored-by: pm-azhar-mulla <azhar@L1119.local>
---
 modules/pubmaticAnalyticsAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/pubmaticAnalyticsAdapter.js b/modules/pubmaticAnalyticsAdapter.js
index 38bcc4521be..c8dc7cef15d 100755
--- a/modules/pubmaticAnalyticsAdapter.js
+++ b/modules/pubmaticAnalyticsAdapter.js
@@ -382,7 +382,7 @@ function bidResponseHandler(args) {
     return;
   }
 
-  if (bid.bidder && args.bidderCode && bid.bidder !== args.bidderCode) {
+  if ((bid.bidder && args.bidderCode && bid.bidder !== args.bidderCode) || (bid.bidder === args.bidderCode && bid.status === SUCCESS)) {
     bid = copyRequiredBidDetails(args);
     cache.auctions[args.auctionId].adUnitCodes[args.adUnitCode].bids[args.requestId].push(bid);
   }

From 07232521ed1d8185adc99a25a4eb4c266281d756 Mon Sep 17 00:00:00 2001
From: Ignat Khaylov <ignat@ignat.one>
Date: Wed, 24 Aug 2022 11:23:30 +0300
Subject: [PATCH 176/569] BetweenBidAdapter: default value for the cur
 parameter (#8870)

* BetweenBidAdapter: default value for the cur parameter

* fix linting

Co-authored-by: Ignat Khaylov <ignat@Ignats-MacBook-Pro.local>
Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/betweenBidAdapter.js                |  6 +++---
 test/spec/modules/betweenBidAdapter_spec.js | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/modules/betweenBidAdapter.js b/modules/betweenBidAdapter.js
index 2ca829b796b..ea28420481d 100644
--- a/modules/betweenBidAdapter.js
+++ b/modules/betweenBidAdapter.js
@@ -59,9 +59,9 @@ export const spec = {
       if (i.params.itu !== undefined) {
         params.itu = i.params.itu;
       }
-      if (i.params.cur !== undefined) {
-        params.cur = i.params.cur;
-      }
+
+      params.cur = i.params.cur || 'USD';
+
       if (i.params.subid !== undefined) {
         params.subid = i.params.subid;
       }
diff --git a/test/spec/modules/betweenBidAdapter_spec.js b/test/spec/modules/betweenBidAdapter_spec.js
index 3baa92e35d5..a4b89ab1b65 100644
--- a/test/spec/modules/betweenBidAdapter_spec.js
+++ b/test/spec/modules/betweenBidAdapter_spec.js
@@ -85,6 +85,23 @@ describe('betweenBidAdapterTests', function () {
 
     expect(req_data.cur).to.equal('THX');
   });
+  it('validate default cur USD', function() {
+    let bidRequestData = [{
+      bidId: 'bid1234',
+      bidder: 'between',
+      params: {
+        w: 240,
+        h: 400,
+        s: 1112
+      },
+      sizes: [[240, 400]]
+    }];
+
+    let request = spec.buildRequests(bidRequestData);
+    let req_data = JSON.parse(request.data)[0].data;
+
+    expect(req_data.cur).to.equal('USD');
+  });
   it('validate subid param', function() {
     let bidRequestData = [{
       bidId: 'bid1234',

From 8a82e0935d7797513537e3f081a6f7afa0de0bdb Mon Sep 17 00:00:00 2001
From: BaronJHYu <254878848@qq.com>
Date: Wed, 24 Aug 2022 22:17:01 +0800
Subject: [PATCH 177/569] Mediago Bid Adapter: initial adapter release (#8856)

* Mediago Bid Adapter:new adapter

* remove console

* change spec file to fix CircleCI

* change spec file to fix CircleCI

* change spec file

* Update mediagoBidAdapter.js

* Update mediagoBidAdapter.js

* rerun CurcleCi

Co-authored-by: BaronYu <baronwei11@gmail.com>
---
 modules/mediagoBidAdapter.js                | 462 ++++++++++++++++++++
 modules/mediagoBidAdapter.md                |  34 ++
 test/spec/modules/mediagoBidAdapter_spec.js |  97 ++++
 3 files changed, 593 insertions(+)
 create mode 100644 modules/mediagoBidAdapter.js
 create mode 100644 modules/mediagoBidAdapter.md
 create mode 100644 test/spec/modules/mediagoBidAdapter_spec.js

diff --git a/modules/mediagoBidAdapter.js b/modules/mediagoBidAdapter.js
new file mode 100644
index 00000000000..28ca4e0bc50
--- /dev/null
+++ b/modules/mediagoBidAdapter.js
@@ -0,0 +1,462 @@
+/**
+ * gulp serve --modules=mediagoBidAdapter,pubCommonId --nolint   --notest
+ */
+
+import * as utils from '../src/utils.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+// import { config } from '../src/config.js';
+// import { isPubcidEnabled } from './pubCommonId.js';
+
+const BIDDER_CODE = 'mediago';
+// const PROTOCOL = window.document.location.protocol;
+const ENDPOINT_URL =
+  // ((PROTOCOL === 'https:') ? 'https' : 'http') +
+  'https://rtb-us.mediago.io/api/bid?tn=';
+const TIME_TO_LIVE = 500;
+// const ENDPOINT_URL = '/api/bid?tn=';
+const storage = getStorageManager();
+let globals = {};
+let itemMaps = {};
+
+/**
+ * 获取随机id
+ * @param  {number} a random number from 0 to 15
+ * @return {string}   random number or random string
+ */
+// function getRandomId(
+//   a // placeholder
+// ) {
+//   // if the placeholder was passed, return
+//   // a random number from 0 to 15
+//   return a
+//     ? (
+//       a ^ // unless b is 8,
+//         ((Math.random() * // in which case
+//           16) >> // a random number from
+//           (a / 4))
+//     ) // 8 to 11
+//       .toString(16) // in hexadecimal
+//     : ( // or otherwise a concatenated string:
+//       [1e7] + // 10000000 +
+//         1e3 + // -1000 +
+//         4e3 + // -4000 +
+//         8e3 + // -80000000 +
+//         1e11
+//     ) // -100000000000,
+//       .replace(
+//         // replacing
+//         /[018]/g, // zeroes, ones, and eights with
+//         getRandomId // random hex digits
+//       );
+// }
+
+/* ----- mguid:start ------ */
+const COOKIE_KEY_MGUID = '__mguid_';
+
+/**
+ * 获取用户id
+ * @return {string}
+ */
+const getUserID = () => {
+  const i = storage.getCookie(COOKIE_KEY_MGUID);
+
+  if (i === null) {
+    const uuid = utils.generateUUID();
+    storage.setCookie(COOKIE_KEY_MGUID, uuid);
+    return uuid;
+  }
+  return i;
+};
+
+/* ----- mguid:end ------ */
+
+/**
+ * 获取一个对象的某个值，如果没有则返回空字符串
+ * @param  {Object}    obj  对象
+ * @param  {...string} keys 键名
+ * @return {any}
+ */
+function getProperty(obj, ...keys) {
+  let o = obj;
+
+  for (let key of keys) {
+    // console.log(key, o);
+    if (o && o[key]) {
+      o = o[key];
+    } else {
+      return '';
+    }
+  }
+  return o;
+}
+
+/**
+ * 是不是移动设备或者平板
+ * @return {boolean}
+ */
+function isMobileAndTablet() {
+  let check = false;
+  (function (a) {
+    let reg1 = new RegExp(
+      [
+        '(android|bbd+|meego)',
+        '.+mobile|avantgo|bada/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)',
+        '|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone',
+        '|p(ixi|re)/|plucker|pocket|psp|series(4|6)0|symbian|treo|up.(browser|link)|vodafone|wap',
+        '|windows ce|xda|xiino|android|ipad|playbook|silk',
+      ].join(''),
+      'i'
+    );
+    let reg2 = new RegExp(
+      [
+        '1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)',
+        '|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )',
+        '|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55/|capi|ccwa|cdm-|cell',
+        '|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)',
+        '|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene',
+        '|gf-5|g-mo|go(.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c',
+        '|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|/)|ibro|idea|ig01|ikom',
+        '|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |/)|klon|kpt |kwc-|kyo(c|k)',
+        '|le(no|xi)|lg( g|/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50/|ma(te|ui|xo)|mc(01|21|ca)',
+        '|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]',
+        '|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)',
+        '|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio',
+        '|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55/|sa(ge|ma|mm|ms',
+        '|ny|va)|sc(01|h-|oo|p-)|sdk/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al',
+        '|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)',
+        '|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(.b|g1|si)|utst|',
+        'v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)',
+        '|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-',
+        '|your|zeto|zte-',
+      ].join(''),
+      'i'
+    );
+    if (reg1.test(a) || reg2.test(a.substr(0, 4))) {
+      check = true;
+    }
+  })(navigator.userAgent || navigator.vendor || window.opera);
+  return check;
+}
+
+/**
+ * 获取底价
+ * @param {*} bid
+ * @param {*} mediaType
+ * @param {*} sizes
+ * @returns
+ */
+// function getBidFloor(bid, mediaType, sizes) {
+//   var floor;
+//   var size = sizes.length === 1 ? sizes[0] : "*";
+//   if (typeof bid.getFloor === "function") {
+//     const floorInfo = bid.getFloor({ currency: "USD", mediaType, size });
+//     if (
+//       typeof floorInfo === "object" &&
+//       floorInfo.currency === "USD" &&
+//       !isNaN(parseFloat(floorInfo.floor))
+//     ) {
+//       floor = parseFloat(floorInfo.floor);
+//     }
+//   }
+//   return floor;
+// }
+function getBidFloor(bid) {
+  if (!utils.isFn(bid.getFloor)) {
+    return utils.deepAccess(bid, 'params.bidfloor', 0);
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*',
+    });
+    return bidFloor.floor;
+  } catch (_) {
+    return 0;
+  }
+}
+
+/**
+ * 将尺寸转为RTB识别的尺寸
+ *
+ * @param  {Array|Object} requestSizes 配置尺寸
+ * @return {Object}
+ */
+function transformSizes(requestSizes) {
+  let sizes = [];
+  let sizeObj = {};
+
+  if (
+    utils.isArray(requestSizes) &&
+    requestSizes.length === 2 &&
+    !utils.isArray(requestSizes[0])
+  ) {
+    sizeObj.width = parseInt(requestSizes[0], 10);
+    sizeObj.height = parseInt(requestSizes[1], 10);
+    sizes.push(sizeObj);
+  } else if (typeof requestSizes === 'object') {
+    for (let i = 0; i < requestSizes.length; i++) {
+      let size = requestSizes[i];
+      sizeObj = {};
+      sizeObj.width = parseInt(size[0], 10);
+      sizeObj.height = parseInt(size[1], 10);
+      sizes.push(sizeObj);
+    }
+  }
+
+  return sizes;
+}
+
+// 支持的广告尺寸
+const mediagoAdSize = [
+  { w: 300, h: 250 },
+  { w: 300, h: 600 },
+  { w: 728, h: 90 },
+  { w: 970, h: 250 },
+  { w: 320, h: 50 },
+  { w: 160, h: 600 },
+  { w: 320, h: 180 },
+  { w: 320, h: 100 },
+  { w: 336, h: 280 },
+];
+
+/**
+ * 获取广告位配置
+ * @param {Array}  validBidRequests an an array of bids
+ * @param {Object} bidderRequest  The master bidRequest object
+ * @return {Object}
+ */
+function getItems(validBidRequests, bidderRequest) {
+  let items = [];
+  items = validBidRequests.map((req, i) => {
+    let ret = {};
+    let mediaTypes = getProperty(req, 'mediaTypes');
+
+    let sizes = transformSizes(getProperty(req, 'sizes'));
+    let matchSize;
+
+    // 确认尺寸是否符合我们要求
+    for (let size of sizes) {
+      matchSize = mediagoAdSize.find(
+        (item) => size.width === item.w && size.height === item.h
+      );
+      if (matchSize) {
+        break;
+      }
+    }
+    if (!matchSize) {
+      return {};
+    }
+
+    const bidFloor = getBidFloor(req);
+    // const gpid =
+    //   utils.deepAccess(req, 'ortb2Imp.ext.gpid') ||
+    //   utils.deepAccess(req, 'ortb2Imp.ext.data.pbadslot') ||
+    //   utils.deepAccess(req, 'params.placementId', 0);
+    // console.log("wjh getItems:", req, bidFloor, gpid);
+
+    // if (mediaTypes.native) {}
+    // banner广告类型
+    if (mediaTypes.banner) {
+      let id = '' + (i + 1);
+      ret = {
+        id: id,
+        bidfloor: bidFloor,
+        banner: {
+          h: matchSize.h,
+          w: matchSize.w,
+          pos: 1,
+        },
+        ext: {
+        //   gpid: gpid, // 加入后无法返回广告
+        },
+      };
+      itemMaps[id] = {
+        req,
+        ret,
+      };
+    }
+
+    return ret;
+  });
+  return items;
+}
+
+/**
+ * 获取rtb请求参数
+ *
+ * @param {Array}  validBidRequests an an array of bids
+ * @param {Object} bidderRequest  The master bidRequest object
+ * @return {Object}
+ */
+function getParam(validBidRequests, bidderRequest) {
+  const pubcid = utils.deepAccess(validBidRequests[0], 'crumbs.pubcid');
+  // console.log('wjh getParam', validBidRequests, bidderRequest);
+  let isMobile = isMobileAndTablet() ? 1 : 0;
+  let isTest = 0;
+  let auctionId = getProperty(bidderRequest, 'auctionId');
+  let items = getItems(validBidRequests, bidderRequest);
+
+  const domain = document.domain;
+  const location = utils.deepAccess(bidderRequest, 'refererInfo.referer');
+
+  const timeout = bidderRequest.timeout || 2000;
+
+  if (items && items.length) {
+    let c = {
+      id: 'mgprebidjs_' + auctionId,
+      test: +isTest,
+      at: 1,
+      cur: ['USD'],
+      device: {
+        connectiontype: 0,
+        // ip: '64.188.178.115',
+        js: 1,
+        // language: "en",
+        // os: "Microsoft Windows",
+        // ua: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.19043",
+        os: navigator.platform || '',
+        ua: navigator.userAgent,
+        language: /en/.test(navigator.language) ? 'en' : navigator.language,
+      },
+      ext: {},
+      user: {
+        buyeruid: getUserID(),
+        id: pubcid,
+      },
+      site: {
+        name: domain,
+        domain: domain,
+        page: location,
+        ref: location,
+        mobile: isMobile,
+        cat: [], // todo
+        publisher: {
+          // todo
+          id: domain,
+          name: domain,
+        },
+      },
+      imp: items,
+      tmax: timeout,
+    };
+    return c;
+  } else {
+    return null;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  // aliases: ['ex'], // short code
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    // console.log('mediago', {
+    //   bid
+    // });
+    if (bid.params.token) {
+      globals['token'] = bid.params.token;
+    }
+    return !!bid.params.token;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {Array}  validBidRequests an an array of bids
+   * @param {Object} bidderRequest  The master bidRequest object
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let payload = getParam(validBidRequests, bidderRequest);
+
+    const payloadString = JSON.stringify(payload);
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL + globals['token'],
+      data: payloadString,
+    };
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bids = getProperty(serverResponse, 'body', 'seatbid', 0, 'bid');
+    const cur = getProperty(serverResponse, 'body', 'cur');
+
+    const bidResponses = [];
+    for (let bid of bids) {
+      let impid = getProperty(bid, 'impid');
+      if (itemMaps[impid]) {
+        let bidId = getProperty(itemMaps[impid], 'req', 'bidId');
+        const bidResponse = {
+          requestId: bidId,
+          cpm: getProperty(bid, 'price'),
+          width: getProperty(bid, 'w'),
+          height: getProperty(bid, 'h'),
+          creativeId: getProperty(bid, 'crid'),
+          dealId: '',
+          currency: cur,
+          netRevenue: true,
+          ttl: TIME_TO_LIVE,
+          // referrer: REFERER,
+          ad: getProperty(bid, 'adm'),
+          nurl: getProperty(bid, 'nurl'),
+          //   adserverTargeting: {
+          //     granularityMultiplier: 0.1,
+          //     priceGranularity: "pbHg",
+          //     pbMg: "0.01",
+          //   },
+          //   pbMg: "0.01",
+          //   granularityMultiplier: 0.1,
+          //   priceGranularity: "pbHg",
+        };
+        bidResponses.push(bidResponse);
+      }
+    }
+
+    return bidResponses;
+  },
+
+  /**
+   * Register bidder specific code, which will execute if bidder timed out after an auction
+   * @param {data} Containing timeout specific data
+   */
+  //   onTimeout: function (data) {
+  //     // console.log('onTimeout', data);
+  //     // Bidder specifc code
+  //   },
+
+  /**
+   * Register bidder specific code, which will execute if a bid from this bidder won the auction
+   * @param {Bid} The bid that won the auction
+   */
+  onBidWon: function (bid) {
+    // console.log('onBidWon： ', bid, config.getConfig('priceGranularity'));
+    // Bidder specific code
+    if (bid['nurl']) {
+      utils.triggerPixel(bid['nurl']);
+    }
+  },
+
+  /**
+   * Register bidder specific code, which will execute when the adserver targeting has been set for a bid from this bidder
+   * @param {Bid} The bid of which the targeting has been set
+   */
+//   onSetTargeting: function (bid) {
+//     // console.log('onSetTargeting', bid);
+//     // Bidder specific code
+//   },
+};
+registerBidder(spec);
diff --git a/modules/mediagoBidAdapter.md b/modules/mediagoBidAdapter.md
new file mode 100644
index 00000000000..464ea59f11c
--- /dev/null
+++ b/modules/mediagoBidAdapter.md
@@ -0,0 +1,34 @@
+# Overview
+
+```
+Module Name: MediaGo Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: fangsimin@baidu.com
+```
+
+# Description
+
+Module that connects to MediaGo's demand sources
+
+# Test Parameters
+
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+            bids: [
+                {
+                    bidder: "mediago",
+                    params: {
+                        token: ''  // required, send email to ext_mediago_am@baidu.com to get the corresponding token
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/test/spec/modules/mediagoBidAdapter_spec.js b/test/spec/modules/mediagoBidAdapter_spec.js
new file mode 100644
index 00000000000..e77af544429
--- /dev/null
+++ b/test/spec/modules/mediagoBidAdapter_spec.js
@@ -0,0 +1,97 @@
+import { expect } from 'chai';
+import { spec } from 'modules/mediagoBidAdapter.js';
+
+describe('mediago:BidAdapterTests', function () {
+  let bidRequestData = {
+    bidderCode: 'mediago',
+    auctionId: '7fae02a9-0195-472f-ba94-708d3bc2c0d9',
+    bidderRequestId: '4fec04e87ad785',
+    bids: [
+      {
+        bidder: 'mediago',
+        params: {
+          token: '85a6b01e41ac36d49744fad726e3655d',
+          bidfloor: 0.01,
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        adUnitCode: 'regular_iframe',
+        transactionId: '7b26fdae-96e6-4c35-a18b-218dda11397d',
+        sizes: [[300, 250]],
+        bidId: '54d73f19c9d47a', // todo
+        bidderRequestId: '4fec04e87ad785', // todo
+        auctionId: '883a346a-6d62-4adb-a600-0f3a869061d1',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0,
+      },
+    ],
+  };
+  let request = [];
+
+  it('mediago:validate_pub_params', function () {
+    expect(
+      spec.isBidRequestValid({
+        bidder: 'mediago',
+        params: {
+          token: ['85a6b01e41ac36d49744fad726e3655d'],
+        },
+      })
+    ).to.equal(true);
+  });
+
+  it('mediago:validate_generated_params', function () {
+    request = spec.buildRequests(bidRequestData.bids, bidRequestData);
+    let req_data = JSON.parse(request.data);
+    expect(req_data.imp).to.have.lengthOf(1);
+  });
+
+  it('mediago:validate_response_params', function () {
+    let adm = "<link rel=\"stylesheet\" href=\"https://cdn.mediago.io/js/style/style_banner_300*250.css\"><div id=\"mgcontainer-99afea272c2b0e8626489674ddb7a0bb\" class=\"mediago-placement imgTopTitleBottom\" style=\"position:relative;width:298px;height:248px;overflow:hidden\"><a href=\"https://trace.mediago.io/api/bidder/track?tn=39934c2bda4debbe4c680be1dd02f5d3&price=djUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk&evt=102&rid=6e28cfaf115a354ea1ad8e1304d6d7b8&campaignid=1339145&impid=44-300x250-1&offerid=24054386&test=0&time=1660789795&cp=jZDh1xu6_QqJLlKVtCkiHIP_TER6gL9jeTrlHCBoxOM&clickid=44_6e28cfaf115a354ea1ad8e1304d6d7b8_44-300x250-1&acid=599&trackingid=99afea272c2b0e8626489674ddb7a0bb&uid=a865b9ae-fa9e-4c09-8204-2db99ac7c8f7&jt=2&url=oxZA2i2aUVY76Xy2t3HffaK_ZtBDsgFwFc_Nbnw-bz3yCxmoUyZvATKnFc9ZkUfT1eQizhtczCwDzjHwwwDgTehUnp1EwdY4g1LRcuOwlRpXnVTt3zPQdaVx5nVDw25by7lQ0q469LCv2eEFDTAv_FOuVT32WiOx_ArOIlxCnDGpjPLUNyxm3cTZFGOJn4B7&bm=2&la=en&cn=us&cid=3998296&info=Si3oM-qfCbw2iZRYs01BkUWyH6c5CQWHrA8CQLE0VHcXAcf4ljY9dyLzQ4vAlTWd6-j_ou4ySor3e70Ll7wlKiiauQKaUkZqNoTizHm73C4FK8DYJSTP3VkhJV8RzrYk&sid=128__110__1__12__28__38__163__96__58__24__47__99&sp=djUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk&scp=zK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg&acu=USD&scu=USD&sgcp=zK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg&gprice=djUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk&gcp=zK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg&ah=&pb=&de=wjh.popin.cc&cat=&iv=0\" target=\"_blank\" class=\"mediago-placement-track\" style=\"display: inline-block;\"><img alt=\"Ranger's spot giant lion - vet is shocked when looking at the ultrasound\" src=\"https://d2cli4kgl5uxre.cloudfront.net/ML/ff32b6f9b3bbc45c00b78b6674a2952e__scv1__300x175.png\" style=\"height:70%;width:100%;border-width:0;border:none;\"><h3 class=\"title\" style=\"font-size:16px;\">Ranger's spot giant lion - vet is shocked when looking at the ultrasound</h3></a><span class=\"source\"><a class=\"sourcename\" href=\"//www.mediago.io\" target=\"_blank\"><span>Ad</span> </a><a class=\"mgmgsrcnameadslabelurl\" href=\"//www.mediago.io/privacy\" target=\"_blank\"><span>soo-healthy</span></a></span></div>";
+    let temp = '%3Cscr';
+    temp += 'ipt%3E';
+    temp += '!function()%7B%22use%20strict%22%3Bfunction%20f(t)%7Breturn(f%3D%22function%22%3D%3Dtypeof%20Symbol%26%26%22symbol%22%3D%3Dtypeof%20Symbol.iterator%3Ffunction(t)%7Breturn%20typeof%20t%7D%3Afunction(t)%7Breturn%20t%26%26%22function%22%3D%3Dtypeof%20Symbol%26%26t.constructor%3D%3D%3DSymbol%26%26t!%3D%3DSymbol.prototype%3F%22symbol%22%3Atypeof%20t%7D)(t)%7Dfunction%20l(t)%7Bvar%20e%3D0%3Carguments.length%26%26void%200!%3D%3Dt%3Ft%3A%7B%7D%3Btry%7Be.random_t%3D(new%20Date).getTime()%2Cg(function(t)%7Bvar%20e%3D1%3Carguments.length%26%26void%200!%3D%3Darguments%5B1%5D%3Farguments%5B1%5D%3A%22%22%3Bif(%22object%22!%3D%3Df(t))return%20e%3Bvar%20n%3Dfunction(t)%7Bfor(var%20e%2Cn%3D%5B%5D%2Co%3D0%2Ci%3DObject.keys(t)%3Bo%3Ci.length%3Bo%2B%2B)e%3Di%5Bo%5D%2Cn.push(%22%22.concat(e%2C%22%3D%22).concat(t%5Be%5D))%3Breturn%20n%7D(t).join(%22%26%22)%2Co%3De.indexOf(%22%23%22)%2Ci%3De%2Ct%3D%22%22%3Breturn-1!%3D%3Do%26%26(i%3De.slice(0%2Co)%2Ct%3De.slice(o))%2Cn%26%26(i%26%26-1!%3D%3Di.indexOf(%22%3F%22)%3Fi%2B%3D%22%26%22%2Bn%3Ai%2B%3D%22%3F%22%2Bn)%2Ci%2Bt%7D(e%2C%22https%3A%2F%2Ftrace.mediago.io%2Fapi%2Flog%2Ftrack%22))%7Dcatch(t)%7B%7D%7Dfunction%20g(t%2Ce%2Cn)%7B(t%3Dt%3Ft.split(%22%3B%3B%3B%22)%3A%5B%5D).map(function(t)%7Btry%7B0%3C%3Dt.indexOf(%22%2Fapi%2Fbidder%2Ftrack%22)%26%26n%26%26(t%2B%3D%22%26inIframe%3D%22.concat(!(!self.frameElement%7C%7C%22IFRAME%22!%3Dself.frameElement.tagName)%7C%7Cwindow.frames.length!%3Dparent.frames.length%7C%7Cself!%3Dtop)%2Ct%2B%3D%22%26pos_x%3D%22.concat(n.left%2C%22%26pos_y%3D%22).concat(n.top%2C%22%26page_w%3D%22).concat(n.page_width%2C%22%26page_h%3D%22).concat(n.page_height))%7Dcatch(t)%7Bl(%7Btn%3As%2Cwinloss%3A1%2Cfe%3A2%2Cpos_err_c%3A1002%2Cpos_err_m%3At.toString()%7D)%7Dvar%20e%3Dnew%20Image%3Be.src%3Dt%2Ce.style.display%3D%22none%22%2Ce.style.visibility%3D%22hidden%22%2Ce.width%3D0%2Ce.height%3D0%2Cdocument.body.appendChild(e)%7D)%7Dvar%20d%3D%5B%22https%3A%2F%2Ftrace.mediago.io%2Fapi%2Fbidder%2Ftrack%3Ftn%3D39934c2bda4debbe4c680be1dd02f5d3%26price%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26evt%3D101%26rid%3D6e28cfaf115a354ea1ad8e1304d6d7b8%26campaignid%3D1339145%26impid%3D44-300x250-1%26offerid%3D24054386%26test%3D0%26time%3D1660789795%26cp%3DjZDh1xu6_QqJLlKVtCkiHIP_TER6gL9jeTrlHCBoxOM%26acid%3D599%26trackingid%3D99afea272c2b0e8626489674ddb7a0bb%26uid%3Da865b9ae-fa9e-4c09-8204-2db99ac7c8f7%26bm%3D2%26la%3Den%26cn%3Dus%26cid%3D3998296%26info%3DSi3oM-qfCbw2iZRYs01BkUWyH6c5CQWHrA8CQLE0VHcXAcf4ljY9dyLzQ4vAlTWd6-j_ou4ySor3e70Ll7wlKiiauQKaUkZqNoTizHm73C4FK8DYJSTP3VkhJV8RzrYk%26sid%3D128__110__1__12__28__38__163__96__58__24__47__99%26sp%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26scp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26acu%3DUSD%26scu%3DUSD%26sgcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26gprice%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26gcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26ah%3D%26de%3Dwjh.popin.cc%26iv%3D0%22%2C%22%24%7BITRACKER2%7D%22%2C%22%24%7BITRACKER3%7D%22%2C%22%24%7BITRACKER4%7D%22%2C%22%24%7BITRACKER5%7D%22%2C%22%24%7BITRACKER6%7D%22%5D%2Cp%3D%5B%22https%3A%2F%2Ftrace.mediago.io%2Fapi%2Fbidder%2Ftrack%3Ftn%3D39934c2bda4debbe4c680be1dd02f5d3%26price%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26evt%3D104%26rid%3D6e28cfaf115a354ea1ad8e1304d6d7b8%26campaignid%3D1339145%26impid%3D44-300x250-1%26offerid%3D24054386%26test%3D0%26time%3D1660789795%26cp%3DjZDh1xu6_QqJLlKVtCkiHIP_TER6gL9jeTrlHCBoxOM%26acid%3D599%26trackingid%3D99afea272c2b0e8626489674ddb7a0bb%26uid%3Da865b9ae-fa9e-4c09-8204-2db99ac7c8f7%26sid%3D128__110__1__12__28__38__163__96__58__24__47__99%26format%3D%26crid%3Dff32b6f9b3bbc45c00b78b6674a2952e%26bm%3D2%26la%3Den%26cn%3Dus%26cid%3D3998296%26info%3DSi3oM-qfCbw2iZRYs01BkUWyH6c5CQWHrA8CQLE0VHcXAcf4ljY9dyLzQ4vAlTWd6-j_ou4ySor3e70Ll7wlKiiauQKaUkZqNoTizHm73C4FK8DYJSTP3VkhJV8RzrYk%26sp%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26scp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26acu%3DUSD%26scu%3DUSD%26sgcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26gprice%3DdjUJcggeuWWfbm28q4WXHdgMFkO28DrGw49FnubQ0Bk%26gcp%3DzK0DRYY1UV-syqSpmcMYBpOebtoQJV9ZEJT0JFqbTQg%26ah%3D%26de%3Dwjh.popin.cc%26iv%3D0%22%2C%22%24%7BVTRACKER2%7D%22%2C%22%24%7BVTRACKER3%7D%22%2C%22%24%7BVTRACKER4%7D%22%2C%22%24%7BVTRACKER5%7D%22%2C%22%24%7BVTRACKER6%7D%22%5D%2Cs%3D%22f9f2b1ef23fe2759c2cad0953029a94b%22%2Cn%3Ddocument.getElementById(%22mgcontainer-99afea272c2b0e8626489674ddb7a0bb%22)%3Bn%26%26function()%7Bvar%20a%3Dn.getElementsByClassName(%22mediago-placement-track%22)%3Bif(a%26%26a.length)%7Bvar%20t%2Ce%3Dfunction(t)%7Bvar%20e%2Cn%2Co%2Ci%2Cc%2Cr%3B%22object%22%3D%3D%3Df(r%3Da%5Bt%5D)%26%26(e%3Dfunction(t)%7Btry%7Bvar%20e%3Dt.getBoundingClientRect()%2Cn%3De%26%26e.top%7C%7C-1%2Co%3De%26%26e.left%7C%7C-1%2Ci%3Ddocument.body.scrollWidth%7C%7C-1%2Ce%3Ddocument.body.scrollHeight%7C%7C-1%3Breturn%7Btop%3An.toFixed(0)%2Cleft%3Ao.toFixed(0)%2Cpage_width%3Ai%2Cpage_height%3Ae%7D%7Dcatch(o)%7Breturn%20l(%7Btn%3As%2Cwinloss%3A1%2Cfe%3A2%2Cpos_err_c%3A1001%2Cpos_err_m%3Ao.toString()%7D)%2C%7Btop%3A%22-1%22%2Cleft%3A%22-1%22%2Cpage_width%3A%22-1%22%2Cpage_height%3A%22-1%22%7D%7D%7D(r)%2C(n%3Dd%5Bt%5D)%26%26g(n%2C0%2Ce)%2Co%3Dp%5Bt%5D%2Ci%3D!1%2C(c%3Dfunction()%7BsetTimeout(function()%7Bvar%20t%2Ce%3B!i%26%26(t%3Dr%2Ce%3Dwindow.innerHeight%7C%7Cdocument.documentElement.clientHeight%7C%7Cdocument.body.clientHeight%2C(t.getBoundingClientRect()%26%26t.getBoundingClientRect().top)%3C%3De-.75*(t.offsetHeight%7C%7Ct.clientHeight))%3F(i%3D!0%2Co%26%26g(o))%3Ac()%7D%2C500)%7D)())%7D%3Bfor(t%20in%20a)e(t)%7D%7D()%7D()';
+    temp += '%3B%3C%2Fscri';
+    temp += 'pt%3E';
+    adm += decodeURIComponent(temp);
+    let serverResponse = {
+      body: {
+        id: 'mgprebidjs_0b6572fc-ceba-418f-b6fd-33b41ad0ac8a',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '6e28cfaf115a354ea1ad8e1304d6d7b8',
+                impid: '1',
+                price: 0.087581,
+                adm: adm,
+                cid: '1339145',
+                crid: 'ff32b6f9b3bbc45c00b78b6674a2952e',
+                w: 300,
+                h: 250,
+              },
+            ],
+          },
+        ],
+        cur: 'USD',
+      },
+    };
+
+    let bids = spec.interpretResponse(serverResponse);
+    // console.log({
+    //   bids
+    // });
+    expect(bids).to.have.lengthOf(1);
+
+    let bid = bids[0];
+
+    expect(bid.creativeId).to.equal('ff32b6f9b3bbc45c00b78b6674a2952e');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.currency).to.equal('USD');
+  });
+});

From 9d8de1d468f46cb7863bf7ecf86d601e038869dc Mon Sep 17 00:00:00 2001
From: Alexander <32703851+pro-nsk@users.noreply.github.com>
Date: Wed, 24 Aug 2022 23:11:20 +0700
Subject: [PATCH 178/569] Alkimi Bid Adapter: add adUnitCode parameter to
 bidder (#8897)

* Alkimi bid adapter

* Alkimi bid adapter

* Alkimi bid adapter

* alkimi adapter

* onBidWon change

* sign utils

* auction ID as bid request ID

* unit test fixes

* change maintainer info

* Updated the ad unit params

* features support added

* transfer adUnitCode

* transfer adUnitCode: test

Co-authored-by: Alexander Bogdanov <akascheev@asteriosoft.com>
Co-authored-by: Kalidas Engaiahraj <kalidas@alkimiexchange.com>
Co-authored-by: mihanikw2g <92710748+mihanikw2g@users.noreply.github.com>
Co-authored-by: Nikulin Mikhail <mnikulin@asteriosoft.com>
---
 modules/alkimiBidAdapter.js                | 3 ++-
 test/spec/modules/alkimiBidAdapter_spec.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/alkimiBidAdapter.js b/modules/alkimiBidAdapter.js
index ac8b5af9533..fe5a050f436 100644
--- a/modules/alkimiBidAdapter.js
+++ b/modules/alkimiBidAdapter.js
@@ -31,7 +31,8 @@ export const spec = {
         bidFloor: bidRequest.params.bidFloor,
         width: sizes[0].width,
         height: sizes[0].height,
-        impMediaType: getFormatType(bidRequest)
+        impMediaType: getFormatType(bidRequest),
+        adUnitCode: bidRequest.adUnitCode
       })
       bidIds.push(bidRequest.bidId)
     })
diff --git a/test/spec/modules/alkimiBidAdapter_spec.js b/test/spec/modules/alkimiBidAdapter_spec.js
index c98c81b706e..1ae9bb56df4 100644
--- a/test/spec/modules/alkimiBidAdapter_spec.js
+++ b/test/spec/modules/alkimiBidAdapter_spec.js
@@ -6,6 +6,7 @@ const REQUEST = {
   'bidId': '456',
   'bidder': 'alkimi',
   'sizes': [[300, 250]],
+  'adUnitCode': 'bannerAdUnitCode',
   'mediaTypes': {
     'banner': {
       'sizes': [[300, 250]]
@@ -138,7 +139,7 @@ describe('alkimiBidAdapter', function () {
       expect(bidderRequest.data.requestId).to.equal('123')
       expect(bidderRequest.data.referer).to.equal('http://test.com/path.html')
       expect(bidderRequest.data.schain).to.deep.contains({ver: '1.0', complete: 1, nodes: [{asi: 'alkimi-onboarding.com', sid: '00001', hp: 1}]})
-      expect(bidderRequest.data.signRequest.bids).to.deep.contains({ token: 'e64782a4-8e68-4c38-965b-80ccf115d46f', pos: 7, bidFloor: 0.1, width: 300, height: 250, impMediaType: 'Banner' })
+      expect(bidderRequest.data.signRequest.bids).to.deep.contains({ token: 'e64782a4-8e68-4c38-965b-80ccf115d46f', pos: 7, bidFloor: 0.1, width: 300, height: 250, impMediaType: 'Banner', adUnitCode: 'bannerAdUnitCode' })
       expect(bidderRequest.data.signRequest.randomUUID).to.equal(undefined)
       expect(bidderRequest.data.bidIds).to.deep.contains('456')
       expect(bidderRequest.data.signature).to.equal(undefined)

From d88091c7689c47f964d52ad1f8a23b9eea1f9fc3 Mon Sep 17 00:00:00 2001
From: prebidtappx <77485538+prebidtappx@users.noreply.github.com>
Date: Wed, 24 Aug 2022 18:12:37 +0200
Subject: [PATCH 179/569] Tappx Bid Adapter: fix host info http regex (#8896)

* Fix: creating host correctly when http or https are added from the beginning

* Fix :: Changed double quotes for single quotes

Co-authored-by: Jordi Arnau <jarnau@tappx.com>
---
 modules/tappxBidAdapter.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/tappxBidAdapter.js b/modules/tappxBidAdapter.js
index 3cd77e7b853..11aa6c76c76 100644
--- a/modules/tappxBidAdapter.js
+++ b/modules/tappxBidAdapter.js
@@ -484,9 +484,18 @@ export function _getHostInfo(validBidRequests) {
 
   domainInfo.domain = hostParam.split('/', 1)[0];
 
+  let regexHostParamHttps = new RegExp(`^https:\/\/`);
+  let regexHostParamHttp = new RegExp(`^http:\/\/`);
+
   let regexNewEndpoints = new RegExp(`^(vz.*|zz.*)\\.[a-z]{3}\\.tappx\\.com$`, 'i');
   let regexClassicEndpoints = new RegExp(`^([a-z]{3}|testing)\\.[a-z]{3}\\.tappx\\.com$`, 'i');
 
+  if (regexHostParamHttps.test(hostParam)) {
+    hostParam = hostParam.replace('https://', '');
+  } else if (regexHostParamHttp.test(hostParam)) {
+    hostParam = hostParam.replace('http://', '');
+  }
+
   if (regexNewEndpoints.test(domainInfo.domain)) {
     domainInfo.newEndpoint = true;
     domainInfo.endpoint = domainInfo.domain.split('.', 1)[0]

From 5362745c08efcd374767f566a8c9bb1758093789 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Wed, 24 Aug 2022 12:38:29 -0600
Subject: [PATCH 180/569] Prebid core: optimize getRefererInfo to run only once
 per page (#8864)

---
 src/refererDetection.js                       | 13 ++++++++++++-
 test/spec/modules/enrichmentFpdModule_spec.js |  3 ++-
 test/spec/modules/fpdModule_spec.js           |  3 ++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/refererDetection.js b/src/refererDetection.js
index 15c080f5c69..28da182c7ab 100644
--- a/src/refererDetection.js
+++ b/src/refererDetection.js
@@ -11,6 +11,8 @@
 import { config } from './config.js';
 import {logWarn} from './utils.js';
 
+let RI = new WeakMap();
+
 /**
  * Prepend a URL with the page's protocol (http/https), if necessary.
  */
@@ -252,10 +254,19 @@ export function detectReferer(win) {
     };
   }
 
-  return refererInfo;
+  return function() {
+    if (!RI.has(win)) {
+      RI.set(win, Object.freeze(refererInfo()));
+    }
+    return RI.get(win);
+  }
 }
 
 /**
  * @type {function(): refererInfo}
  */
 export const getRefererInfo = detectReferer(window);
+
+export function resetRefererInfo() {
+  RI = new WeakMap();
+}
diff --git a/test/spec/modules/enrichmentFpdModule_spec.js b/test/spec/modules/enrichmentFpdModule_spec.js
index 7d7e463c015..3cc18f952cc 100644
--- a/test/spec/modules/enrichmentFpdModule_spec.js
+++ b/test/spec/modules/enrichmentFpdModule_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { getRefererInfo } from 'src/refererDetection.js';
+import {getRefererInfo, resetRefererInfo} from 'src/refererDetection.js';
 import { processFpd, coreStorage } from 'modules/enrichmentFpdModule.js';
 
 describe('the first party data enrichment module', function() {
@@ -20,6 +20,7 @@ describe('the first party data enrichment module', function() {
   });
 
   beforeEach(function() {
+    resetRefererInfo();
     querySelectorStub = sinon.stub(window.top.document, 'querySelector');
     querySelectorStub.withArgs("link[rel='canonical']").returns(canonical);
     querySelectorStub.withArgs("meta[name='keywords']").returns(keywords);
diff --git a/test/spec/modules/fpdModule_spec.js b/test/spec/modules/fpdModule_spec.js
index 498bed29243..cf2ad4afe6f 100644
--- a/test/spec/modules/fpdModule_spec.js
+++ b/test/spec/modules/fpdModule_spec.js
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import {config} from 'src/config.js';
-import {getRefererInfo} from 'src/refererDetection.js';
+import {getRefererInfo, resetRefererInfo} from 'src/refererDetection.js';
 import {processFpd, registerSubmodules, startAuctionHook, reset} from 'modules/fpdModule/index.js';
 import * as enrichmentModule from 'modules/enrichmentFpdModule.js';
 import * as validationModule from 'modules/validationFpdModule/index.js';
@@ -70,6 +70,7 @@ describe('the first party data module', function () {
     });
 
     beforeEach(function() {
+      resetRefererInfo();
       querySelectorStub = sinon.stub(window.top.document, 'querySelector');
       querySelectorStub.withArgs("link[rel='canonical']").returns(canonical);
       querySelectorStub.withArgs("meta[name='keywords']").returns(keywords);

From 66fc005e1deaeee3fc1132ee324aee6efba54183 Mon Sep 17 00:00:00 2001
From: Jason Quaccia <jlquaccia@gmail.com>
Date: Thu, 25 Aug 2022 03:52:32 -0700
Subject: [PATCH 181/569] Prebid Core: Batch Video Cache Requests feature
 (#8765)

* batch video cache request integration

* got rid of console log statement

* removed video.html

* addressed feedback

* removed video file and uncommented test

* reverted package-lock.json

* retriggering circle ci

* addressed changes

* got rid of video html test file

* removed unused methods from spec file

* refactored auction.js and updated tests

* updated test

* removed video file

* fixed test

* moved logic where batch config options are referenced into the returned func of batchingCache

* removed test video file

* reverted a few other changes

* moved batch config code outside of batchingCache func

* always forget to remove this file after haha

Co-authored-by: Jason Quaccia <jasonquaccia@RWC-WS233.local>
---
 src/auction.js               | 73 ++++++++++++++++++++++++++++--------
 test/spec/videoCache_spec.js | 30 +++++++++++++++
 2 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/src/auction.js b/src/auction.js
index b7deeccfd82..da805ae41dd 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -514,28 +514,71 @@ function tryAddVideoBid(auctionInstance, bidResponse, afterBidAdded, {index = au
   }
 }
 
-export const callPrebidCache = hook('async', function(auctionInstance, bidResponse, afterBidAdded, videoMediaType) {
-  store([bidResponse], function (error, cacheIds) {
-    if (error) {
-      logWarn(`Failed to save to the video cache: ${error}. Video bid must be discarded.`);
-
-      doCallbacksIfTimedout(auctionInstance, bidResponse);
-    } else {
-      if (cacheIds[0].uuid === '') {
-        logWarn(`Supplied video cache key was already in use by Prebid Cache; caching attempt was rejected. Video bid must be discarded.`);
+const storeInCache = (batch) => {
+  store(batch.map(entry => entry.bidResponse), function (error, cacheIds) {
+    cacheIds.forEach((cacheId, i) => {
+      const { auctionInstance, bidResponse, afterBidAdded } = batch[i];
+      if (error) {
+        logWarn(`Failed to save to the video cache: ${error}. Video bid must be discarded.`);
 
         doCallbacksIfTimedout(auctionInstance, bidResponse);
       } else {
-        bidResponse.videoCacheKey = cacheIds[0].uuid;
+        if (cacheId.uuid === '') {
+          logWarn(`Supplied video cache key was already in use by Prebid Cache; caching attempt was rejected. Video bid must be discarded.`);
 
-        if (!bidResponse.vastUrl) {
-          bidResponse.vastUrl = getCacheUrl(bidResponse.videoCacheKey);
+          doCallbacksIfTimedout(auctionInstance, bidResponse);
+        } else {
+          bidResponse.videoCacheKey = cacheId.uuid;
+
+          if (!bidResponse.vastUrl) {
+            bidResponse.vastUrl = getCacheUrl(bidResponse.videoCacheKey);
+          }
+          addBidToAuction(auctionInstance, bidResponse);
+          afterBidAdded();
         }
-        addBidToAuction(auctionInstance, bidResponse);
-        afterBidAdded();
       }
-    }
+    });
   });
+};
+
+let batchSize, batchTimeout;
+config.getConfig('cache', (cacheConfig) => {
+  batchSize = typeof cacheConfig.cache.batchSize === 'number' && cacheConfig.cache.batchSize > 0
+    ? cacheConfig.cache.batchSize
+    : 1;
+  batchTimeout = typeof cacheConfig.cache.batchTimeout === 'number' && cacheConfig.cache.batchTimeout > 0
+    ? cacheConfig.cache.batchTimeout
+    : 0;
+});
+
+export const batchingCache = (timeout = setTimeout, cache = storeInCache) => {
+  let batches = [[]];
+  let debouncing = false;
+  const noTimeout = cb => cb();
+
+  return function(auctionInstance, bidResponse, afterBidAdded) {
+    const batchFunc = batchTimeout > 0 ? timeout : noTimeout;
+    if (batches[batches.length - 1].length >= batchSize) {
+      batches.push([]);
+    }
+
+    batches[batches.length - 1].push({auctionInstance, bidResponse, afterBidAdded});
+
+    if (!debouncing) {
+      debouncing = true;
+      batchFunc(() => {
+        batches.forEach(cache);
+        batches = [[]];
+        debouncing = false;
+      }, batchTimeout);
+    }
+  }
+};
+
+const batchAndStore = batchingCache();
+
+export const callPrebidCache = hook('async', function(auctionInstance, bidResponse, afterBidAdded, videoMediaType) {
+  batchAndStore(auctionInstance, bidResponse, afterBidAdded);
 }, 'callPrebidCache');
 
 // Postprocess the bids so that all the universal properties exist, no matter which bidder they came from.
diff --git a/test/spec/videoCache_spec.js b/test/spec/videoCache_spec.js
index 5885dfb7cdf..a13028c966a 100644
--- a/test/spec/videoCache_spec.js
+++ b/test/spec/videoCache_spec.js
@@ -4,6 +4,7 @@ import { config } from 'src/config.js';
 import { server } from 'test/mocks/xhr.js';
 import {auctionManager} from '../../src/auctionManager.js';
 import {AuctionIndex} from '../../src/auctionIndex.js';
+import { batchingCache } from '../../src/auction.js';
 
 const should = chai.should();
 
@@ -297,6 +298,35 @@ describe('The video cache', function () {
       JSON.parse(request.requestBody).should.deep.equal(payload);
     });
 
+    it('should wait the duration of the batchTimeout and pass the correct batchSize if batched requests are enabled in the config', () => {
+      const mockAfterBidAdded = function() {};
+      let callback = null;
+      let mockTimeout = sinon.stub().callsFake((cb) => { callback = cb });
+
+      config.setConfig({
+        cache: {
+          url: 'https://prebid.adnxs.com/pbc/v1/cache',
+          batchSize: 3,
+          batchTimeout: 20
+        }
+      });
+
+      let stubCache = sinon.stub();
+      const batchAndStore = batchingCache(mockTimeout, stubCache);
+      for (let i = 0; i < 3; i++) {
+        batchAndStore({}, {}, mockAfterBidAdded);
+      }
+
+      sinon.assert.calledOnce(mockTimeout);
+      sinon.assert.calledWith(mockTimeout, sinon.match.any, 20);
+
+      const expectedBatch = [{ afterBidAdded: mockAfterBidAdded, auctionInstance: { }, bidResponse: { } }, { afterBidAdded: mockAfterBidAdded, auctionInstance: { }, bidResponse: { } }, { afterBidAdded: mockAfterBidAdded, auctionInstance: { }, bidResponse: { } }];
+
+      callback();
+
+      sinon.assert.calledWith(stubCache, expectedBatch);
+    });
+
     function assertRequestMade(bid, expectedValue) {
       store([bid], function () { });
 

From fb790f7fda84ca8332116d9e3a356e60da735d99 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 25 Aug 2022 13:36:20 +0000
Subject: [PATCH 182/569] Prebid 7.12.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a6ae1e5a3e8..6cd1eedebd1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.12.0-pre",
+  "version": "7.12.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index a9a4c120c48..85c913baf21 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.12.0-pre",
+  "version": "7.12.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 5a92113c4152b68bfb054bd472556c2e925cffc9 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 25 Aug 2022 13:36:20 +0000
Subject: [PATCH 183/569] Increment version to 7.13.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6cd1eedebd1..160f2fbfe5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.12.0",
+  "version": "7.13.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 85c913baf21..5f68825a89d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.12.0",
+  "version": "7.13.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From fab2dc6ec49d3fbad635fc062679ea48db9aaecf Mon Sep 17 00:00:00 2001
From: AcuityAdsIntegrations
 <72594990+AcuityAdsIntegrations@users.noreply.github.com>
Date: Thu, 25 Aug 2022 21:48:12 +0300
Subject: [PATCH 184/569] AcuityAds Bid Adapter: initial adapter release
 (#8854)

---
 modules/acuityAdsBidAdapter.js                | 207 +++++++++
 modules/acuityAdsBidAdapter.md                |  79 ++++
 test/spec/modules/acuityAdsBidAdapter_spec.js | 398 ++++++++++++++++++
 3 files changed, 684 insertions(+)
 create mode 100644 modules/acuityAdsBidAdapter.js
 create mode 100644 modules/acuityAdsBidAdapter.md
 create mode 100644 test/spec/modules/acuityAdsBidAdapter_spec.js

diff --git a/modules/acuityAdsBidAdapter.js b/modules/acuityAdsBidAdapter.js
new file mode 100644
index 00000000000..f469fe48c60
--- /dev/null
+++ b/modules/acuityAdsBidAdapter.js
@@ -0,0 +1,207 @@
+import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'acuityads';
+const AD_URL = 'https://prebid.admanmedia.com/pbjs';
+const SYNC_URL = 'https://cs.admanmedia.com';
+
+function isBidResponseValid(bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
+    return false;
+  }
+
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.vastUrl || bid.vastXml);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
+    default:
+      return false;
+  }
+}
+
+function getPlacementReqData(bid) {
+  const { params, bidId, mediaTypes } = bid;
+  const schain = bid.schain || {};
+  const { placementId } = params;
+  const bidfloor = getBidFloor(bid);
+
+  const placement = {
+    bidId,
+    schain,
+    bidfloor
+  };
+
+  placement.placementId = placementId;
+  placement.type = 'publisher';
+
+  if (mediaTypes && mediaTypes[BANNER]) {
+    placement.adFormat = BANNER;
+    placement.sizes = mediaTypes[BANNER].sizes;
+  } else if (mediaTypes && mediaTypes[VIDEO]) {
+    placement.adFormat = VIDEO;
+    placement.playerSize = mediaTypes[VIDEO].playerSize;
+    placement.minduration = mediaTypes[VIDEO].minduration;
+    placement.maxduration = mediaTypes[VIDEO].maxduration;
+    placement.mimes = mediaTypes[VIDEO].mimes;
+    placement.protocols = mediaTypes[VIDEO].protocols;
+    placement.startdelay = mediaTypes[VIDEO].startdelay;
+    placement.placement = mediaTypes[VIDEO].placement;
+    placement.skip = mediaTypes[VIDEO].skip;
+    placement.skipafter = mediaTypes[VIDEO].skipafter;
+    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+    placement.delivery = mediaTypes[VIDEO].delivery;
+    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+    placement.api = mediaTypes[VIDEO].api;
+    placement.linearity = mediaTypes[VIDEO].linearity;
+  } else if (mediaTypes && mediaTypes[NATIVE]) {
+    placement.native = mediaTypes[NATIVE];
+    placement.adFormat = NATIVE;
+  }
+
+  return placement;
+}
+
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return deepAccess(bid, 'params.bidfloor', 0);
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*',
+    });
+    return bidFloor.floor;
+  } catch (err) {
+    logError(err);
+    return 0;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid = {}) => {
+    const { params, bidId, mediaTypes } = bid;
+    let valid = Boolean(bidId && params && params.placementId);
+
+    if (mediaTypes && mediaTypes[BANNER]) {
+      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
+    } else if (mediaTypes && mediaTypes[VIDEO]) {
+      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
+    } else if (mediaTypes && mediaTypes[NATIVE]) {
+      valid = valid && Boolean(mediaTypes[NATIVE]);
+    } else {
+      valid = false;
+    }
+    return valid;
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let deviceWidth = 0;
+    let deviceHeight = 0;
+
+    let winLocation;
+    try {
+      const winTop = window.top;
+      deviceWidth = winTop.screen.width;
+      deviceHeight = winTop.screen.height;
+      winLocation = winTop.location;
+    } catch (e) {
+      logMessage(e);
+      winLocation = window.location;
+    }
+
+    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
+    let refferLocation;
+    try {
+      refferLocation = refferUrl && new URL(refferUrl);
+    } catch (e) {
+      logMessage(e);
+    }
+    // TODO: does the fallback make sense here?
+    let location = refferLocation || winLocation;
+    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+    const host = location.host;
+    const page = location.pathname;
+    const secure = location.protocol === 'https:' ? 1 : 0;
+    const placements = [];
+    const request = {
+      deviceWidth,
+      deviceHeight,
+      language,
+      secure,
+      host,
+      page,
+      placements,
+      coppa: config.getConfig('coppa') === true ? 1 : 0,
+      ccpa: bidderRequest.uspConsent || undefined,
+      gdpr: bidderRequest.gdprConsent || undefined,
+      tmax: config.getConfig('bidderTimeout')
+    };
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      placements.push(getPlacementReqData(bid));
+    }
+
+    return {
+      method: 'POST',
+      url: AD_URL,
+      data: request
+    };
+  },
+
+  interpretResponse: (serverResponse) => {
+    let response = [];
+    for (let i = 0; i < serverResponse.body.length; i++) {
+      let resItem = serverResponse.body[i];
+      if (isBidResponseValid(resItem)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/acuityAdsBidAdapter.md b/modules/acuityAdsBidAdapter.md
new file mode 100644
index 00000000000..a19e0a6b0ba
--- /dev/null
+++ b/modules/acuityAdsBidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: AcuityAds Bidder Adapter
+Module Type: AcuityAds Bidder Adapter
+Maintainer: sa-support@brightcom.com
+```
+
+# Description
+
+Connects to AcuityAds exchange for bids.
+AcuityAds bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'acuityads',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'acuityads',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'acuityads',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/test/spec/modules/acuityAdsBidAdapter_spec.js b/test/spec/modules/acuityAdsBidAdapter_spec.js
new file mode 100644
index 00000000000..18ea574c1ce
--- /dev/null
+++ b/test/spec/modules/acuityAdsBidAdapter_spec.js
@@ -0,0 +1,398 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/acuityAdsBidAdapter';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'acuityads'
+
+describe('AcuityAdsBidAdapter', function () {
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative',
+      }
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    refererInfo: {
+      referer: 'https://test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://prebid.admanmedia.com/pbjs');
+    });
+
+    it('Returns general data valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('string');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      serverRequest = spec.buildRequests([], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.placements).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.admanmedia.com/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.admanmedia.com/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+  });
+});

From 2a162842da342b45edf0c633a741ee6b5fd5110b Mon Sep 17 00:00:00 2001
From: eknis <tem.eknis@gmail.com>
Date: Fri, 26 Aug 2022 23:43:38 +0900
Subject: [PATCH 185/569] ImRtdProvider: add segment max (#8902)

* imRtdProvider: add segment max param

* imRtdProvider: refactoring

* imRtdProvider: refactoring
---
 modules/imRtdProvider.js                | 27 ++++++++++++++++++-------
 modules/imRtdProvider.md                |  4 +++-
 test/spec/modules/imRtdProvider_spec.js | 15 +++++++++-----
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/modules/imRtdProvider.js b/modules/imRtdProvider.js
index 0ed239019cf..bc01896d062 100644
--- a/modules/imRtdProvider.js
+++ b/modules/imRtdProvider.js
@@ -37,28 +37,40 @@ function setImDataInCookie(value) {
   );
 }
 
+/**
+ * @param {Object} segments
+ * @param {Object} moduleConfig
+ */
+function getSegments(segments, moduleConfig) {
+  if (!segments) return;
+  const maxSegments = !Number.isNaN(moduleConfig.params.maxSegments) ? moduleConfig.params.maxSegments : 200;
+  return segments.slice(0, maxSegments);
+}
+
 /**
 * @param {string} bidderName
 */
 export function getBidderFunction(bidderName) {
   const biddersFunction = {
-    pubmatic: function (bid, data) {
+    pubmatic: function (bid, data, moduleConfig) {
       if (data.im_segments && data.im_segments.length) {
+        const segments = getSegments(data.im_segments, moduleConfig);
         const dctr = deepAccess(bid, 'params.dctr');
         deepSetValue(
           bid,
           'params.dctr',
-          `${dctr ? dctr + '|' : ''}im_segments=${data.im_segments.join(',')}`
+          `${dctr ? dctr + '|' : ''}im_segments=${segments.join(',')}`
         );
       }
       return bid
     },
-    fluct: function (bid, data) {
+    fluct: function (bid, data, moduleConfig) {
       if (data.im_segments && data.im_segments.length) {
+        const segments = getSegments(data.im_segments, moduleConfig);
         deepSetValue(
           bid,
           'params.kv.imsids',
-          data.im_segments
+          segments
         );
       }
       return bid
@@ -88,14 +100,15 @@ export function setRealTimeData(bidConfig, moduleConfig, data) {
   const utils = {deepSetValue, deepAccess, logInfo, logError, mergeDeep};
 
   if (data.im_segments) {
+    const segments = getSegments(data.im_segments, moduleConfig);
     const ortb2 = bidConfig.ortb2Fragments?.global || {};
-    deepSetValue(ortb2, 'user.ext.data.im_segments', data.im_segments);
+    deepSetValue(ortb2, 'user.ext.data.im_segments', segments);
 
     if (moduleConfig.params.setGptKeyValues || !moduleConfig.params.hasOwnProperty('setGptKeyValues')) {
       window.googletag = window.googletag || {cmd: []};
       window.googletag.cmd = window.googletag.cmd || [];
       window.googletag.cmd.push(() => {
-        window.googletag.pubads().setTargeting('im_segments', data.im_segments);
+        window.googletag.pubads().setTargeting('im_segments', segments);
       });
     }
   }
@@ -107,7 +120,7 @@ export function setRealTimeData(bidConfig, moduleConfig, data) {
       if (overwriteFunction) {
         overwriteFunction(bid, data, utils, config);
       } else if (bidderFunction) {
-        bidderFunction(bid, data);
+        bidderFunction(bid, data, moduleConfig);
       }
     })
   });
diff --git a/modules/imRtdProvider.md b/modules/imRtdProvider.md
index 7ece2b996b4..8f31d3eb545 100644
--- a/modules/imRtdProvider.md
+++ b/modules/imRtdProvider.md
@@ -21,7 +21,8 @@ pbjs.setConfig(
                 waitForIt: true,
                 params: {
                     cid: 5126, // Set your Intimate Merger Customer ID here for production
-                    setGptKeyValues: true
+                    setGptKeyValues: true,
+                    maxSegments: 200 // maximum number is 200
                 }
             }
         ]
@@ -39,3 +40,4 @@ pbjs.setConfig(
 | params | Required | Object | Details of module params. | |
 | params.cid | Required | Number | This is the Customer ID value obtained via Intimate Merger. | `5126` |
 | params.setGptKeyValues | Optional | Boolean | This is set targeting for GPT/GAM. Default setting is true. | `true` |
+| params.maxSegments | Optional | Number | This is set maximum number of rtd segments at once. Default setting is 200. | `200` |
diff --git a/test/spec/modules/imRtdProvider_spec.js b/test/spec/modules/imRtdProvider_spec.js
index b580e5b6516..89328b91529 100644
--- a/test/spec/modules/imRtdProvider_spec.js
+++ b/test/spec/modules/imRtdProvider_spec.js
@@ -27,7 +27,8 @@ describe('imRtdProvider', function () {
   const moduleConfig = {
     params: {
       cid: 5126,
-      setGptKeyValues: true
+      setGptKeyValues: true,
+      maxSegments: 2
     }
   }
 
@@ -60,11 +61,11 @@ describe('imRtdProvider', function () {
 
       it(`should return bid with correct key data: ${bidderName}`, function () {
         const bid = {bidder: bidderName};
-        expect(getBidderFunction(bidderName)(bid, {'im_segments': ['12345', '67890']})).to.equal(bid);
+        expect(getBidderFunction(bidderName)(bid, {'im_segments': ['12345', '67890']}, {params: {}})).to.equal(bid);
       });
       it(`should return bid without data: ${bidderName}`, function () {
         const bid = {bidder: bidderName};
-        expect(getBidderFunction(bidderName)(bid, '')).to.equal(bid);
+        expect(getBidderFunction(bidderName)(bid, '', {params: {}})).to.equal(bid);
       });
     });
     it(`should return null with unexpected bidder`, function () {
@@ -73,7 +74,7 @@ describe('imRtdProvider', function () {
     describe('fluct bidder function', function () {
       it('should return a bid w/o im_segments if not any exists', function () {
         const bid = {bidder: 'fluct'};
-        expect(getBidderFunction('fluct')(bid, '')).to.eql(bid);
+        expect(getBidderFunction('fluct')(bid, '', {params: {}})).to.eql(bid);
       });
       it('should return a bid w/ im_segments if any exists', function () {
         const bid = {
@@ -84,7 +85,11 @@ describe('imRtdProvider', function () {
             }
           }
         };
-        expect(getBidderFunction('fluct')(bid, {im_segments: ['12345', '67890']}))
+        expect(getBidderFunction('fluct')(
+          bid,
+          {im_segments: ['12345', '67890', '09876']},
+          {params: {maxSegments: 2}}
+        ))
           .to.eql(
             {
               bidder: 'fluct',

From cc3b3db43d435e0f73d5c5d494df792ec4703b31 Mon Sep 17 00:00:00 2001
From: probably-kira <yulia.puchnina@gmail.com>
Date: Fri, 26 Aug 2022 11:28:40 -0400
Subject: [PATCH 186/569] Lifestreet Bid adapter: initial release (#8340)

* Lifestreet adapter with meta support added

* Added tests

* fix linting error

* Fixed typo in tests

* CR fix: import functions from utils instead of using *

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/lifestreetBidAdapter.js               | 143 +++++++++++
 .../spec/modules/lifestreetBidAdapter_spec.js | 232 ++++++++++++++++++
 2 files changed, 375 insertions(+)
 create mode 100644 modules/lifestreetBidAdapter.js
 create mode 100644 test/spec/modules/lifestreetBidAdapter_spec.js

diff --git a/modules/lifestreetBidAdapter.js b/modules/lifestreetBidAdapter.js
new file mode 100644
index 00000000000..6a8b783ce21
--- /dev/null
+++ b/modules/lifestreetBidAdapter.js
@@ -0,0 +1,143 @@
+import { isInteger } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'lifestreet';
+const ADAPTER_VERSION = '$prebid.version$';
+
+const urlTemplate = template`https://ads.lfstmedia.com/gate/${'adapter'}/${'slot'}?adkey=${'adkey'}&ad_size=${'ad_size'}&__location=${'location'}&__referrer=${'referrer'}&__wn=${'wn'}&__sf=${'sf'}&__fif=${'fif'}&__if=${'if'}&__stamp=${'stamp'}&__pp=1&__hb=1&_prebid_json=1&__gz=1&deferred_format=vast_2_0,vast_3_0&__hbver=${'hbver'}`;
+
+/**
+ * A helper function for template to generate string from boolean
+ */
+function boolToString(value) {
+  return value ? '1' : '0';
+}
+
+/**
+ * A helper function to form URL from the template
+ */
+function template(strings, ...keys) {
+  return function(...values) {
+    let dict = values[values.length - 1] || {};
+    let result = [strings[0]];
+    keys.forEach(function(key, i) {
+      let value = isInteger(key) ? values[key] : dict[key];
+      result.push(value, strings[i + 1]);
+    });
+    return result.join('');
+  };
+}
+
+/**
+ * Creates a bid requests for a given bid.
+ *
+ * @param {BidRequest} bid The bid params to use for formatting a request
+ */
+function formatBidRequest(bid, bidderRequest = {}) {
+  const {params} = bid;
+  const {referer} = (bidderRequest.refererInfo || {});
+  let url = urlTemplate({
+    adapter: 'prebid',
+    slot: params.slot,
+    adkey: params.adkey,
+    ad_size: params.ad_size,
+    location: referer,
+    referrer: referer,
+    wn: boolToString(/fb_http/i.test(window.name)),
+    sf: boolToString(window['sfAPI'] || window['$sf']),
+    fif: boolToString(window['inDapIF'] === true),
+    if: boolToString(window !== window.top),
+    stamp: new Date().getTime(),
+    hbver: ADAPTER_VERSION
+  });
+
+  if (bidderRequest.gdprConsent) {
+    if (bidderRequest.gdprConsent.gdprApplies !== undefined) {
+      const gdpr = '&__gdpr=' + (bidderRequest.gdprConsent.gdprApplies ? '1' : '0');
+      url += gdpr;
+    }
+    if (bidderRequest.gdprConsent.consentString !== undefined) {
+      url += `&__consent=${bidderRequest.gdprConsent.consentString}`;
+    }
+  }
+
+  // ccpa support
+  if (bidderRequest.uspConsent) {
+    url += `&__us_privacy=${bidderRequest.uspConsent}`
+  }
+
+  return {
+    method: 'GET',
+    url: url,
+    bidId: bid.bidId
+  };
+}
+
+function isResponseValid(response) {
+  return !/^\s*\{\s*"advertisementAvailable"\s*:\s*false/i.test(response.content) &&
+    response.content.indexOf('<VAST version="2.0"></VAST>') === -1 && /* (typeof response.cpm !== 'undefined') && */
+    response.status === 1;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['lsm'],
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  isBidRequestValid: (bid = {}) => {
+    const {params = {}} = bid;
+    return !!(params.slot && params.adkey && params.ad_size);
+  },
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    return validBidRequests.map(bid => {
+      return formatBidRequest(bid, bidderRequest)
+    });
+  },
+
+  interpretResponse: (serverResponse, bidRequest) => {
+    const bidResponses = [];
+    let response = serverResponse.body;
+    if (!isResponseValid(response)) {
+      return bidResponses;
+    }
+
+    const isVideo = response.content_type.indexOf('vast') > -1;
+    const mediaType = isVideo ? VIDEO : BANNER;
+
+    const bidResponse = {
+      requestId: bidRequest.bidId,
+      cpm: response.cpm,
+      currency: response.currency ? response.currency : 'USD',
+      width: response.width,
+      height: response.height,
+      creativeId: response.creativeId,
+      netRevenue: response.netRevenue ? response.netRevenue : true,
+      ttl: response.ttl ? response.ttl : 86400,
+      mediaType,
+      meta: {
+        mediaType,
+        advertiserDomains: response.advertiserDomains
+      }
+    };
+
+    if (response.hasOwnProperty('dealId')) {
+      bidResponse.dealId = response.dealId;
+    }
+    if (isVideo) {
+      if (typeof response.vastUrl !== 'undefined') {
+        bidResponse.vastUrl = response.vastUrl;
+      } else {
+        bidResponse.vastXml = response.content;
+      }
+    } else {
+      bidResponse.ad = response.content;
+    }
+
+    bidResponses.push(bidResponse);
+    return bidResponses;
+  }
+};
+
+registerBidder(spec);
diff --git a/test/spec/modules/lifestreetBidAdapter_spec.js b/test/spec/modules/lifestreetBidAdapter_spec.js
new file mode 100644
index 00000000000..d66727da644
--- /dev/null
+++ b/test/spec/modules/lifestreetBidAdapter_spec.js
@@ -0,0 +1,232 @@
+import { expect } from 'chai';
+import { BANNER, VIDEO } from 'src/mediaTypes.js';
+import { spec } from 'modules/lifestreetBidAdapter.js';
+
+describe('lifestreetBidAdapter', function() {
+  let bidRequests;
+  let videoBidRequests;
+  let bidResponses;
+  let videoBidResponses;
+  beforeEach(function() {
+    bidRequests = [
+      {
+        bidder: 'lifestreet',
+        params: {
+          slot: 'slot166704',
+          adkey: '78c',
+          ad_size: '160x600'
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [
+              [160, 600],
+              [300, 600]
+            ]
+          }
+        },
+        sizes: [
+          [160, 600],
+          [300, 600]
+        ]
+      }
+    ];
+
+    bidResponses = {
+      body: {
+        cpm: 0.1,
+        netRevenue: true,
+        content_type: 'display_flash',
+        width: 160,
+        currency: 'USD',
+        ttl: 86400,
+        content: '<iframe src=\'https://ads.lfstmedia.com/displayAd?__ads=ip37346-u0T8r2uJ8245jv6i2QE8Qu&adt=5748927953915945176&seq=2&plc=K73sUSWIH9WwpIQiGybtg8lYdYFld5NvswMmfGBMz6U&__df=true&clickUrl=https%3A%2F%2Fads.lfstmedia.com%2Fclick%2Fcmp15299%2F5748927953915945176%2F2%3F__ads%3Dip37346-u0T8r2uJ8245jv6i2QE8Qu%26adkey%3D6bd%26slot%3Dslot166704%26__stamp%3D1583331395140%26ad%3Dcrv197050%26_cx%3D%24%24CX%24%24%26_cy%3D%24%24CY%24%24%26_celt%3D%24%24ELT-ID%24%24%26redirectURL%3D\' width=\'160\' height=\'600\' frameBorder=\'0\' scrolling=\'no\' framespacing=\'0\' marginheight=\'0\' marginwidth=\'0\'><!--test--><\/iframe>\n',
+        creativeId: 7985076,
+        height: 600,
+        status: 1
+      }
+    };
+    videoBidRequests = [
+      {
+        bidder: 'lifestreet',
+        params: {
+          slot: 'slot1227631',
+          adkey: 'a98',
+          ad_size: '640x480'
+        },
+        mediaTypes: {
+          video: {
+            sizes: [
+              [640, 480],
+            ]
+          }
+        }
+      }
+    ]
+
+    videoBidResponses = {
+      body: {
+        cpm: 0.1,
+        netRevenue: true,
+        content_type: 'vast_3_0',
+        width: 640,
+        currency: 'USD',
+        ttl: 86400,
+        content: '<iframe src="https://ads.lfstmedia.com/displayAd?__ads=ip38770-u0T8r2uJ8245jv6i2QE8Qu&adt=7734389071973843496&seq=2&plc=QEw02HSSpFZCrGaMUP5rN01QQtwPM5iEI5EQzt1nV4E&__df=true&clickUrl=https%3A%2F%2Fads.lfstmedia.com%2Fclick%2Fcmp20228%2F7734389071973843496%2F2%3F__ads%3Dip38770-u0T8r2uJ8245jv6i2QE8Qu%26adkey%3Dcdc%26slot%3Dslot1227631%26__stamp%3D1583766419183%26ad%3Dcrv225652%26_cx%3D%24%24CX%24%24%26_cy%3D%24%24CY%24%24%26_celt%3D%24%24ELT-ID%24%24%26redirectURL%3D" width="640" height="480" frameBorder="0" scrolling="no" framespacing="0" marginheight="0" marginwidth="0"><!--test--><\/iframe>\n',
+        creativeId: 108323592,
+        height: 480,
+        status: 1
+      }
+    };
+  });
+  describe('implementation', function() {
+    describe('Bid validations', function() {
+      it('valid bid case', function() {
+        const validBid = {
+          bidder: 'lifestreet',
+          params: {
+            slot: 'slot166704',
+            adkey: '78c',
+            ad_size: '160x600'
+          }
+        };
+        expect(spec.isBidRequestValid(validBid)).to.equal(true);
+      });
+
+      it('invalid bid case', function() {
+        expect(spec.isBidRequestValid()).to.equal(false);
+      });
+
+      it('invalid bid case: slot not passed', function() {
+        var validBid = {
+          bidder: 'lifestreet',
+          params: {
+            adkey: '78c',
+            ad_size: '160x600'
+          }
+        };
+        expect(spec.isBidRequestValid(validBid)).to.equal(false);
+      });
+
+      it('invalid bid case: adkey not passed', function() {
+        const validBid = {
+          bidder: 'lifestreet',
+          params: {
+            slot: 'slot166704',
+            ad_size: '160x600'
+          }
+        };
+        expect(spec.isBidRequestValid(validBid)).to.equal(false);
+      });
+
+      it('invalid bid case: ad_size is not passed', function() {
+        const validBid = {
+          bidder: 'lifestreet',
+          params: {
+            slot: 'slot166704',
+            adkey: '78c'
+          }
+        };
+        expect(spec.isBidRequestValid(validBid)).to.equal(false);
+      });
+    });
+
+    describe('buildRequests spec method', function () {
+      it('method exists and is a function', function () {
+        expect(spec.buildRequests).to.exist.and.to.be.a('function');
+      });
+
+      it('should not return request when no bids are present', function () {
+        const [request] = spec.buildRequests([]);
+        expect(request).to.be.undefined;
+      });
+
+      it('should return an url and request method ', function () {
+        const [request] = spec.buildRequests(bidRequests);
+        expect(request.method).to.equal('GET');
+        expect(request.url).to.be.a('string');
+      });
+
+      it('should return an url that contains all required fields', function () {
+        const [request] = spec.buildRequests(bidRequests);
+        expect(request.url).to.have.string('adkey');
+        expect(request.url).to.have.string('slot');
+        expect(request.url).to.have.string('ad_size');
+      });
+
+      it('should add GDPR consent information to the request', function () {
+        let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+        let bidderRequest = {
+          bidderCode: 'lifestreet',
+          auctionId: '1d1a030790a875',
+          bidderRequestId: '22edbae2744bf6',
+          timeout: 3000,
+          gdprConsent: {
+            consentString: consentString,
+            gdprApplies: true
+          }
+        };
+        bidderRequest.bids = bidRequests;
+
+        const [request] = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request.url).to.have.string('__gdpr=1');
+        expect(request.url).to.have.string(`__consent=${consentString}`);
+      });
+
+      it('should add US privacy string to request', function() {
+        let consentString = '1YA-';
+        let bidderRequest = {
+          bidderCode: 'lifestreet',
+          auctionId: '1d1a030790a875',
+          bidderRequestId: '22edbae2744bf6',
+          timeout: 3000,
+          uspConsent: consentString
+        };
+        bidderRequest.bids = bidRequests;
+
+        const [request] = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request.url).to.have.string(`__us_privacy=${consentString}`);
+      });
+    });
+
+    describe('server response', function() {
+      it('should return valid proper values', function() {
+        const request = spec.buildRequests(bidRequests);
+        const response = spec.interpretResponse(bidResponses, request);
+        expect(response).to.be.an('array').with.length.above(0);
+        expect(response[0].cpm).to.equal(bidResponses.body.cpm);
+        expect(response[0].width).to.equal(bidResponses.body.width);
+        expect(response[0].height).to.equal(bidResponses.body.height);
+        expect(response[0].creativeId).to.equal(bidResponses.body.creativeId);
+        expect(response[0].currency).to.equal('USD');
+        expect(response[0].netRevenue).to.equal(true);
+        expect(response[0].ttl).to.equal(bidResponses.body.ttl);
+      });
+
+      it('should return proper mediaType for BANNER', function() {
+        const request = spec.buildRequests(bidRequests);
+        const [response] = spec.interpretResponse(bidResponses, request);
+        expect(response.mediaType).to.equal(BANNER);
+      });
+
+      it('should return proper mediaType for VIDEO', function() {
+        const request = spec.buildRequests(videoBidRequests);
+        const [response] = spec.interpretResponse(videoBidResponses, request);
+        expect(response.mediaType).to.equal(VIDEO);
+      });
+
+      it('should return a VAST XML for VIDEO', function() {
+        const request = spec.buildRequests(videoBidRequests);
+        const [response] = spec.interpretResponse(videoBidResponses, request);
+        expect(response.vastXml).to.be.a('string');
+        expect(response.vastXml).to.have.string('iframe');
+      });
+
+      it('should return an ad content for BANNER', function() {
+        const request = spec.buildRequests(bidRequests);
+        const [response] = spec.interpretResponse(bidResponses, request);
+        expect(response.ad).to.be.a('string');
+        expect(response.ad).to.have.string('iframe');
+      });
+    });
+  });
+});

From 1e7a82135810ff7aeaa82b7daf8dc350693929ee Mon Sep 17 00:00:00 2001
From: jkthomas <tom.januszek@gmail.com>
Date: Fri, 26 Aug 2022 16:40:57 +0100
Subject: [PATCH 187/569] TrustPid module: Refactor - update acronyms handling
 (#8877)

* feature: Add trustpid user id module

* refactor: Update trustpidSystem module, comments and md file

* refactor: Update trustpidSystem file to handle domain setting regardless of message events

* refactor: Update trustpidSystem module and dependent tests and docs

* refactor: Update trustpid undefined checks and returns

* tests: Update trustpid tests

* docs: Update trustpid docs typo

* refactor: Update trustpid acronyms logic

* TrustPid: Remove deprecated acronyms logic

* fix: rollback autoformatted changes

Co-authored-by: Tomasz Januszek <tomasz@teavaro.com>
---
 modules/trustpidSystem.js                | 48 ++--------------
 modules/trustpidSystem.md                | 20 +++----
 modules/userId/userId.md                 |  4 +-
 test/spec/modules/trustpidSystem_spec.js | 72 +++++++++---------------
 4 files changed, 45 insertions(+), 99 deletions(-)

diff --git a/modules/trustpidSystem.js b/modules/trustpidSystem.js
index 9d457d645b2..cb61ffcc8b5 100644
--- a/modules/trustpidSystem.js
+++ b/modules/trustpidSystem.js
@@ -10,7 +10,6 @@ import { getStorageManager } from '../src/storageManager.js';
 
 const MODULE_NAME = 'trustpid';
 const LOG_PREFIX = 'Trustpid module'
-let mnoAcronym = '';
 let mnoDomain = '';
 
 export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME});
@@ -30,7 +29,6 @@ function messageHandler(event) {
         let domainURL = URL[1].split('/');
         mnoDomain = domainURL[0];
         logInfo(`${LOG_PREFIX}: Message handler set domain to ${mnoDomain}`);
-        getDomainAcronym(mnoDomain);
       }
     }
   } catch (e) {
@@ -38,27 +36,13 @@ function messageHandler(event) {
   }
 }
 
-/**
- * Properly sets the trustpid acronym depending on the domain value.
- * @param domain
- */
-function getDomainAcronym(domain) {
-  const prefix = '-';
-  const acronym = window.FC_CONF?.TELCO_ACRONYM?.[domain];
-  if (!acronym) {
-    logInfo(`${LOG_PREFIX}: No acronym found for domain: ${domain}`);
-    return;
-  }
-  mnoAcronym = prefix + acronym;
-}
-
 // Set a listener to handle the iframe response message.
 window.addEventListener('message', messageHandler, false);
 
 /**
- * Get the "umid" from html5 local storage to make it available to the UserId module.
+ * Get the "atid" from html5 local storage to make it available to the UserId module.
  * @param config
- * @returns {{trustpid: (*|string), acr: (string)}}
+ * @returns {{trustpid: (*|string)}}
  */
 function getTrustpidFromStorage() {
   // Get the domain either from localStorage or global
@@ -69,25 +53,6 @@ function getTrustpidFromStorage() {
     logInfo(`${LOG_PREFIX}: Local storage domain not found, returning null`);
     return {
       trustpid: null,
-      acr: null,
-    };
-  }
-
-  // Get the acronym from global
-  let acronym = mnoAcronym;
-  // if acronym is empty, but "domain" is available, get the acronym from domain
-  if (!acronym) {
-    getDomainAcronym(domain);
-    acronym = mnoAcronym;
-  }
-
-  logInfo(`${LOG_PREFIX}: Domain acronym found: ${acronym}`);
-
-  // Domain is correct in both local storage and idGraph, but no acronym is existing for the domain
-  if (!acronym) {
-    return {
-      trustpid: null,
-      acr: null
     };
   }
 
@@ -106,10 +71,9 @@ function getTrustpidFromStorage() {
   logInfo(`${LOG_PREFIX}: Local storage fcIdConnectObject for domain: ${JSON.stringify(fcIdConnectObject)}`);
 
   return {
-    trustpid: (fcIdConnectObject && fcIdConnectObject.umid)
-      ? fcIdConnectObject.umid
+    trustpid: (fcIdConnectObject && fcIdConnectObject.atid)
+      ? fcIdConnectObject.atid
       : null,
-    acr: acronym,
   };
 }
 
@@ -138,7 +102,7 @@ export const trustpidSubmodule = {
     const data = getTrustpidFromStorage();
     if (data.trustpid) {
       logInfo(`${LOG_PREFIX}: Local storage ID value ${JSON.stringify(data)}`);
-      return {id: {trustpid: data.trustpid + data.acr}};
+      return {id: {trustpid: data.trustpid}};
     } else {
       if (!config) {
         config = {};
@@ -165,7 +129,7 @@ export const trustpidSubmodule = {
             }, delayStep);
           }
         } else {
-          const dataToReturn = { trustpid: data.trustpid + data.acr };
+          const dataToReturn = { trustpid: data.trustpid };
           logInfo(`${LOG_PREFIX}: Returning ID value data of ${JSON.stringify(dataToReturn)}`);
           callback(dataToReturn);
         }
diff --git a/modules/trustpidSystem.md b/modules/trustpidSystem.md
index c1ad1ab567b..38daf9fa3ac 100644
--- a/modules/trustpidSystem.md
+++ b/modules/trustpidSystem.md
@@ -10,13 +10,13 @@ gulp build --modules=userId,adfBidAdapter,ixBidAdapter,prebidServerBidAdapter,tr
 
 ## Parameter Descriptions
 
-| Params under userSync.userIds[] | Type | Description | Example |
-| --- | --- | --- | --- |
-| name | String | The name of the module | `"trustpid"` |
-| params | Object | Object with configuration parameters for trustpid User Id submodule | - |
-| params.maxDelayTime | Integer | Max amount of time (in seconds) before looking into storage for data | 2500 |
-| bidders | Array of Strings | An array of bidder codes to which this user ID may be sent. Currently required and supporting AdformOpenRTB | [`"adf"`, `"adformPBS"`, `"ix"`] |
-| storage | Object | Local storage configuration object | - |
-| storage.type | String | Type of the storage that would be used to store user ID. Must be `"html5"` to utilise HTML5 local storage. | `"html5"` |
-| storage.name | String | The name of the key in local storage where the user ID will be stored. | `"trustpid"` |
-| storage.expires | Integer | How long (in days) the user ID information will be stored. For safety reasons, this information is required.| `1` |
\ No newline at end of file
+| Params under userSync.userIds[] | Type             | Description                                                                                                  | Example                          |
+| ------------------------------- | ---------------- | ------------------------------------------------------------------------------------------------------------ | -------------------------------- |
+| name                            | String           | The name of the module                                                                                       | `"trustpid"`                     |
+| params                          | Object           | Object with configuration parameters for trustpid User Id submodule                                          | -                                |
+| params.maxDelayTime             | Integer          | Max amount of time (in seconds) before looking into storage for data                                         | 2500                             |
+| bidders                         | Array of Strings | An array of bidder codes to which this user ID may be sent. Currently required and supporting AdformOpenRTB  | [`"adf"`, `"adformPBS"`, `"ix"`] |
+| storage                         | Object           | Local storage configuration object                                                                           | -                                |
+| storage.type                    | String           | Type of the storage that would be used to store user ID. Must be `"html5"` to utilise HTML5 local storage.   | `"html5"`                        |
+| storage.name                    | String           | The name of the key in local storage where the user ID will be stored.                                       | `"trustpid"`                     |
+| storage.expires                 | Integer          | How long (in days) the user ID information will be stored. For safety reasons, this information is required. | `1`                              |
diff --git a/modules/userId/userId.md b/modules/userId/userId.md
index 4a6a9b515a8..f25383af975 100644
--- a/modules/userId/userId.md
+++ b/modules/userId/userId.md
@@ -151,7 +151,7 @@ pbjs.setConfig({
                   },
         {
              name: "dacId"
-        }, 
+        },
         {
             name: "gravitompId"
         }
@@ -372,4 +372,4 @@ pbjs.setConfig({
         syncDelay: 5000
     }
 });
-```
+```
\ No newline at end of file
diff --git a/test/spec/modules/trustpidSystem_spec.js b/test/spec/modules/trustpidSystem_spec.js
index a3e41d7a58e..38e861d977f 100644
--- a/test/spec/modules/trustpidSystem_spec.js
+++ b/test/spec/modules/trustpidSystem_spec.js
@@ -22,14 +22,6 @@ describe('trustpid System', () => {
   });
 
   describe('trustpid getId()', () => {
-    before(() => {
-      window.FC_CONF = {
-        TELCO_ACRONYM: {
-          'domain.with.acronym': 'acronymValue',
-        }
-      };
-    });
-
     afterEach(() => {
       storage.removeDataFromLocalStorage(connectDataKey);
       storage.removeDataFromLocalStorage(connectDomainKey);
@@ -52,7 +44,7 @@ describe('trustpid System', () => {
     it('tests if localstorage & JSON works properly ', () => {
       const idGraph = {
         'domain': 'domainValue',
-        'umid': 'umidValue',
+        'atid': 'atidValue',
       };
       storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
       expect(JSON.parse(storage.getDataFromLocalStorage(connectDataKey))).to.have.property('connectId');
@@ -61,7 +53,7 @@ describe('trustpid System', () => {
     it('returns {callback: func} if domains don\'t match', () => {
       const idGraph = {
         'domain': 'domainValue',
-        'umid': 'umidValue',
+        'atid': 'atidValue',
       };
       storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('differentDomainValue'));
       storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
@@ -70,33 +62,33 @@ describe('trustpid System', () => {
 
     it('returns {id: {trustpid: data.trustpid}} if we have the right data stored in the localstorage ', () => {
       const idGraph = {
-        'domain': 'domain.with.acronym',
-        'umid': 'umidValue',
+        'domain': 'test.domain',
+        'atid': 'atidValue',
       };
-      storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('domain.with.acronym'));
+      storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('test.domain'));
       storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
       const response = trustpidSubmodule.getId();
       expect(response).to.have.property('id');
       expect(response.id).to.have.property('trustpid');
-      expect(response.id.trustpid).to.be.equal('umidValue-acronymValue');
+      expect(response.id.trustpid).to.be.equal('atidValue');
     });
 
     it('returns {trustpid: data.trustpid} if we have the right data stored in the localstorage right after the callback is called', (done) => {
       const idGraph = {
-        'domain': 'domain.with.acronym',
-        'umid': 'umidValue',
+        'domain': 'test.domain',
+        'atid': 'atidValue',
       };
       const response = trustpidSubmodule.getId();
       expect(response).to.have.property('callback');
       expect(response.callback.toString()).contain('result(callback)');
 
       if (typeof response.callback === 'function') {
-        storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('domain.with.acronym'));
+        storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('test.domain'));
         storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
         response.callback(function (result) {
           expect(result).to.not.be.null;
           expect(result).to.have.property('trustpid');
-          expect(result.trustpid).to.be.equal('umidValue-acronymValue');
+          expect(result.trustpid).to.be.equal('atidValue');
           done()
         })
       }
@@ -104,8 +96,8 @@ describe('trustpid System', () => {
 
     it('returns null if domains don\'t match', (done) => {
       const idGraph = {
-        'domain': 'domain.with.acronym',
-        'umid': 'umidValue',
+        'domain': 'test.domain',
+        'atid': 'atidValue',
       };
       storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('differentDomainValue'));
       storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
@@ -127,8 +119,8 @@ describe('trustpid System', () => {
 
     it('returns {trustpid: data.trustpid} if we have the right data stored in the localstorage right after 500ms delay', (done) => {
       const idGraph = {
-        'domain': 'domain.with.acronym',
-        'umid': 'umidValue',
+        'domain': 'test.domain',
+        'atid': 'atidValue',
       };
 
       const response = trustpidSubmodule.getId();
@@ -137,13 +129,13 @@ describe('trustpid System', () => {
 
       if (typeof response.callback === 'function') {
         setTimeout(() => {
-          storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('domain.with.acronym'));
+          storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('test.domain'));
           storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
         }, 500);
         response.callback(function (result) {
           expect(result).to.not.be.null;
           expect(result).to.have.property('trustpid');
-          expect(result.trustpid).to.be.equal('umidValue-acronymValue');
+          expect(result.trustpid).to.be.equal('atidValue');
           done()
         })
       }
@@ -151,8 +143,8 @@ describe('trustpid System', () => {
 
     it('returns null if we have the data stored in the localstorage after 500ms delay and the max (waiting) delay is only 200ms ', (done) => {
       const idGraph = {
-        'domain': 'domain.with.acronym',
-        'umid': 'umidValue',
+        'domain': 'test.domain',
+        'atid': 'atidValue',
       };
 
       const response = trustpidSubmodule.getId({params: {maxDelayTime: 200}});
@@ -161,7 +153,7 @@ describe('trustpid System', () => {
 
       if (typeof response.callback === 'function') {
         setTimeout(() => {
-          storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('domain.with.acronym'));
+          storage.setDataInLocalStorage(connectDomainKey, JSON.stringify('test.domain'));
           storage.setDataInLocalStorage(connectDataKey, JSON.stringify(getStorageData(idGraph)));
         }, 500);
         response.callback(function (result) {
@@ -202,17 +194,7 @@ describe('trustpid System', () => {
     });
   });
 
-  describe('trustpid messageHandler for acronyms', () => {
-    before(() => {
-      window.FC_CONF = {
-        TELCO_ACRONYM: {
-          'domain1': 'abcd',
-          'domain2': 'efgh',
-          'domain3': 'ijkl',
-        }
-      };
-    });
-
+  describe('trustpid messageHandler', () => {
     afterEach(() => {
       storage.removeDataFromLocalStorage(connectDataKey);
       storage.removeDataFromLocalStorage(connectDomainKey);
@@ -223,16 +205,16 @@ describe('trustpid System', () => {
     })
 
     const domains = [
-      {domain: 'domain1', acronym: 'abcd'},
-      {domain: 'domain2', acronym: 'efgh'},
-      {domain: 'domain3', acronym: 'ijkl'},
+      'domain1',
+      'domain2',
+      'domain3',
     ];
 
-    domains.forEach(({domain, acronym}) => {
-      it(`correctly sets trustpid value and acronym to ${acronym} for ${domain}`, (done) => {
+    domains.forEach(domain => {
+      it(`correctly sets trustpid value for domain name ${domain}`, (done) => {
         const idGraph = {
           'domain': domain,
-          'umid': 'umidValue',
+          'atid': 'atidValue',
         };
 
         storage.setDataInLocalStorage(connectDomainKey, JSON.stringify(domain));
@@ -247,7 +229,7 @@ describe('trustpid System', () => {
         const response = trustpidSubmodule.getId();
         expect(response).to.have.property('id');
         expect(response.id).to.have.property('trustpid');
-        expect(response.id.trustpid).to.be.equal(`umidValue-${acronym}`);
+        expect(response.id.trustpid).to.be.equal('atidValue');
         done();
       });
     });

From 3bbc890542ed597aa09ff3e83dabd1b2ceb078f2 Mon Sep 17 00:00:00 2001
From: nllerandi3lift <75995508+nllerandi3lift@users.noreply.github.com>
Date: Sat, 27 Aug 2022 00:17:16 -0400
Subject: [PATCH 188/569] Triplelift Bid Adapter: ingest all userIds (#8900)

* alt outstream support

* removes consoleLog

* rename video ttl

* multi-imp

* simplify video if statement in buildPostBody

* distinguish banner from video bid; temp solution for testing

* adds tests for mediatype

* remove console log

* individual instream/outstream tests

* simplify some functions

* nitpick

* adds media_type check

* adds placement options to outstream

* checks instream placement values

* TL-19850 Finished log error logic around floors functionality

* deprecates getlegacyFpd

* remove console log

* TL-19850 Changed functionlity of tests

* restore logErrorSpy aftereach

* removing pub name from test

* TL-29693 Adding functionality to support all universal user IDs

* TL-29693 Adding functionality to support all universal user IDs

* TL-29693 Adding functionality to support all universal user IDs

* refactors some stuff

* try catch and some tests

Co-authored-by: Dan Goldin <dgoldin@triplelift.com>
Co-authored-by: Patrick Loughrey <patrickloughrey@patrickhreysmbp.mynetworksettings.com>
Co-authored-by: Patrick Loughrey <ploughrey@triplelift.com>
---
 modules/tripleliftBidAdapter.js               | 21 ++++++++++++++++++-
 .../spec/modules/tripleliftBidAdapter_spec.js | 18 ++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index 67c254f2e76..7f6ec90c7b9 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -139,7 +139,8 @@ function _buildPostBody(bidRequests, bidderRequest) {
     ...getUnifiedIdEids([bidRequests[0]]),
     ...getIdentityLinkEids([bidRequests[0]]),
     ...getCriteoEids([bidRequests[0]]),
-    ...getPubCommonEids([bidRequests[0]])
+    ...getPubCommonEids([bidRequests[0]]),
+    ...getUniversalEids(bidRequests[0])
   ];
 
   if (eids.length > 0) {
@@ -312,6 +313,24 @@ function getPubCommonEids(bidRequest) {
   return getEids(bidRequest, 'pubcid', 'pubcid.org', 'pubcid');
 }
 
+function getUniversalEids(bidRequest) {
+  let common = ['adserver.org', 'liveramp.com', 'criteo.com', 'pubcid.org'];
+  let eids = [];
+  if (bidRequest.userIdAsEids) {
+    bidRequest.userIdAsEids.forEach(id => {
+      try {
+        if (common.indexOf(id.source) === -1) {
+          let uids = id.uids.map(uid => ({ id: uid.id, ext: { rtiPartner: id.source } }));
+          eids.push({ source: id.source, uids });
+        }
+      } catch (err) {
+        logWarn(`Triplelift: Error attempting to add ${id} to bid request`, err);
+      }
+    });
+  }
+  return eids;
+}
+
 function getEids(bidRequest, type, source, rtiPartner) {
   return bidRequest
     .map(getUserId(type)) // bids -> userIds of a certain type
diff --git a/test/spec/modules/tripleliftBidAdapter_spec.js b/test/spec/modules/tripleliftBidAdapter_spec.js
index bfcfce1ccb4..e485ae3998f 100644
--- a/test/spec/modules/tripleliftBidAdapter_spec.js
+++ b/test/spec/modules/tripleliftBidAdapter_spec.js
@@ -714,6 +714,24 @@ describe('triplelift adapter', function () {
       expect(payload.user).to.deep.equal({ext: {eids: [{source: 'criteo.com', uids: [{id, ext: {rtiPartner: 'criteoId'}}]}]}});
     });
 
+    it('should add adqueryId to the payload if included', function () {
+      const id = '%7B%22qid%22%3A%229c985f8cc31d9b3c000d%22%7D';
+      bidRequests[0].userIdAsEids = [{ source: 'adquery.io', uids: [{ id }] }];
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      const payload = request.data;
+      expect(payload).to.exist;
+      expect(payload.user).to.deep.equal({ext: {eids: [{source: 'adquery.io', uids: [{id, ext: {rtiPartner: 'adquery.io'}}]}]}});
+    });
+
+    it('should add amxRtbId to the payload if included', function () {
+      const id = 'Ok9JQkBM-UFlAXEZQ-UUNBQlZOQzgrUFhW-UUNBQkRQTUBPQVpVWVxNXlZUUF9AUFhAUF9PXFY/';
+      bidRequests[0].userIdAsEids = [{ source: 'amxrtb.com', uids: [{ id }] }];
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      const payload = request.data;
+      expect(payload).to.exist;
+      expect(payload.user).to.deep.equal({ext: {eids: [{source: 'amxrtb.com', uids: [{id, ext: {rtiPartner: 'amxrtb.com'}}]}]}});
+    });
+
     it('should add tdid, idl_env and criteoId to the payload if both are included', function () {
       const tdidId = '6bca7f6b-a98a-46c0-be05-6020f7604598';
       const idlEnvId = 'XY6104gr0njcH9UDIR7ysFFJcm2XNpqeJTYslleJ_cMlsFOfZI';

From 93f0304dc6167a830f0f3281c645954fba810e9a Mon Sep 17 00:00:00 2001
From: SebRobert <srobert@beop.io>
Date: Sat, 27 Aug 2022 18:38:53 +0200
Subject: [PATCH 189/569] BeOp Bid Adapter: Fix tracker on BidWon and
 BidTimeout notice (#8745)

* Don't know why params are in an array in that bid object. Make it work for both if it is fixed later

* Update params reading method to adapt to arrays for all params
---
 modules/beopBidAdapter.js                |  8 ++++----
 test/spec/modules/beopBidAdapter_spec.js | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/modules/beopBidAdapter.js b/modules/beopBidAdapter.js
index b4ac0f2a5a3..f8a53a293de 100644
--- a/modules/beopBidAdapter.js
+++ b/modules/beopBidAdapter.js
@@ -99,12 +99,12 @@ export const spec = {
 }
 
 function buildTrackingParams(data, info, value) {
-  const accountId = data.params.accountId;
+  let params = Array.isArray(data.params) ? data.params[0] : data.params;
   const pageUrl = getPageUrl(null, window);
   return {
-    pid: accountId === undefined ? data.ad.match(/account: \“([a-f\d]{24})\“/)[1] : accountId,
-    nid: data.params.networkId,
-    nptnid: data.params.networkPartnerId,
+    pid: params.accountId === undefined ? data.ad.match(/account: \“([a-f\d]{24})\“/)[1] : params.accountId,
+    nid: params.networkId,
+    nptnid: params.networkPartnerId,
     bid: data.bidId || data.requestId,
     sl_n: data.adUnitCode,
     aid: data.auctionId,
diff --git a/test/spec/modules/beopBidAdapter_spec.js b/test/spec/modules/beopBidAdapter_spec.js
index 9de13afc2ee..c6001c3ba2e 100644
--- a/test/spec/modules/beopBidAdapter_spec.js
+++ b/test/spec/modules/beopBidAdapter_spec.js
@@ -204,5 +204,16 @@ describe('BeOp Bid Adapter tests', () => {
       expect(triggerPixelStub.getCall(0).args[0]).to.include('se_ac=won');
       expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.include('pid=5a8af500c9e77c00017e4cad');
     });
+    it('should call triggerPixel utils function on bid won and work even if params is an array', function () {
+      spec.onBidWon({});
+      spec.onBidWon();
+      expect(triggerPixelStub.getCall(0)).to.be.null;
+      spec.onBidWon({params: [{accountId: '5a8af500c9e77c00017e4cad'}], cpm: 1.2});
+      expect(triggerPixelStub.getCall(0)).to.not.be.null;
+      expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.include('https://t.beop.io');
+      expect(triggerPixelStub.getCall(0).args[0]).to.include('se_ca=bid');
+      expect(triggerPixelStub.getCall(0).args[0]).to.include('se_ac=won');
+      expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.include('pid=5a8af500c9e77c00017e4cad');
+    });
   });
 });

From 0139bf98fc53c41c6dc8e3eb1ee5e3978919bbf5 Mon Sep 17 00:00:00 2001
From: Jason Piros <jasonpiros@gmail.com>
Date: Mon, 29 Aug 2022 07:00:55 -0700
Subject: [PATCH 190/569] consumableBidAdapter: add price floor support (#8899)

---
 modules/consumableBidAdapter.js               | 24 ++++++++++++++++++-
 .../spec/modules/consumableBidAdapter_spec.js | 19 +++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/modules/consumableBidAdapter.js b/modules/consumableBidAdapter.js
index 87cb6052630..c91f1a7f906 100644
--- a/modules/consumableBidAdapter.js
+++ b/modules/consumableBidAdapter.js
@@ -1,4 +1,4 @@
-import { logWarn, deepAccess, isArray, deepSetValue } from '../src/utils.js';
+import { logWarn, deepAccess, isArray, deepSetValue, isFn, isPlainObject } from '../src/utils.js';
 import {config} from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
@@ -84,6 +84,8 @@ export const spec = {
         adTypes: bid.adTypes || getSize(sizes)
       }, bid.params);
 
+      placement.bidfloor = getBidFloor(bid, sizes);
+
       if (bid.mediaTypes.video && bid.mediaTypes.video.playerSize) {
         placement.video = bid.mediaTypes.video;
       }
@@ -272,4 +274,24 @@ function handleEids(data, validBidRequests) {
   }
 }
 
+function getBidFloor(bid, sizes) {
+  if (!isFn(bid.getFloor)) {
+    return bid.params.bidFloor ? bid.params.bidFloor : null;
+  }
+
+  let floor;
+
+  let floorInfo = bid.getFloor({
+    currency: 'USD',
+    mediaType: bid.mediaTypes.video ? 'video' : 'banner',
+    size: sizes.length === 1 ? sizes[0] : '*'
+  });
+
+  if (isPlainObject(floorInfo) && floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
+    floor = parseFloat(floorInfo.floor);
+  }
+
+  return floor;
+}
+
 registerBidder(spec);
diff --git a/test/spec/modules/consumableBidAdapter_spec.js b/test/spec/modules/consumableBidAdapter_spec.js
index f71cf26b3f9..d1b310624a6 100644
--- a/test/spec/modules/consumableBidAdapter_spec.js
+++ b/test/spec/modules/consumableBidAdapter_spec.js
@@ -496,6 +496,25 @@ describe('Consumable BidAdapter', function () {
 
       expect(data.placements[0].video).to.deep.equal(BIDDER_REQUEST_VIDEO.bidRequest[0].mediaTypes.video);
     });
+
+    it('sets bidfloor param if present', function () {
+      let bidderRequest1 = deepClone(BIDDER_REQUEST_1);
+      let bidderRequest2 = deepClone(BIDDER_REQUEST_2);
+      bidderRequest1.bidRequest[0].params.bidFloor = 0.05;
+      bidderRequest2.bidRequest[0].getFloor = function() {
+        return {
+          currency: 'USD',
+          floor: 0.15
+        }
+      };
+      let request1 = spec.buildRequests(bidderRequest1.bidRequest, BIDDER_REQUEST_1);
+      let data1 = JSON.parse(request1.data);
+      let request2 = spec.buildRequests(bidderRequest2.bidRequest, BIDDER_REQUEST_2);
+      let data2 = JSON.parse(request2.data);
+
+      expect(data1.placements[0].bidfloor).to.equal(0.05);
+      expect(data2.placements[0].bidfloor).to.equal(0.15);
+    });
   });
   describe('interpretResponse validation', function () {
     it('response should have valid bidderCode', function () {

From fb8c62fd37d6992dbb4b1d9035adfbc943ddf293 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Mon, 29 Aug 2022 09:45:17 -0600
Subject: [PATCH 191/569] Prebid core: optimize sizeMapping to reduce
 computation when not in use (#8866)

---
 src/sizeMapping.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/sizeMapping.js b/src/sizeMapping.js
index cfd2861785c..00a24bbdb5d 100644
--- a/src/sizeMapping.js
+++ b/src/sizeMapping.js
@@ -1,6 +1,7 @@
 import { config } from './config.js';
 import {logWarn, logInfo, isPlainObject, deepAccess, deepClone, getWindowTop} from './utils.js';
 import {includes} from './polyfill.js';
+import {BANNER} from './mediaTypes.js';
 
 let sizeConfig = [];
 
@@ -75,22 +76,19 @@ export function resolveStatus({labels = [], labelAll = false, activeLabels = []}
     } else {
       mediaTypes = {};
     }
-  } else {
-    mediaTypes = deepClone(mediaTypes);
   }
 
   let oldSizes = deepAccess(mediaTypes, 'banner.sizes');
   if (maps.shouldFilter && oldSizes) {
+    mediaTypes = deepClone(mediaTypes);
     mediaTypes.banner.sizes = oldSizes.filter(size => maps.sizesSupported[size]);
   }
 
-  let allMediaTypes = Object.keys(mediaTypes);
-
   let results = {
     active: (
-      allMediaTypes.every(type => type !== 'banner')
+      !mediaTypes.hasOwnProperty(BANNER)
     ) || (
-      allMediaTypes.some(type => type === 'banner') && deepAccess(mediaTypes, 'banner.sizes.length') > 0 && (
+      deepAccess(mediaTypes, 'banner.sizes.length') > 0 && (
         labels.length === 0 || (
           (!labelAll && (
             labels.some(label => maps.labels[label]) ||

From 4471abb9dbfe8a2badc8b4aa950fa4141b45f4b3 Mon Sep 17 00:00:00 2001
From: shahinrahbariasl <56240400+shahinrahbariasl@users.noreply.github.com>
Date: Mon, 29 Aug 2022 14:50:19 -0400
Subject: [PATCH 192/569] IX Bid Adapter: Add banner pos support (#8892)

* IX Bid Adapter: Add source tid and banner pos support

* add missing semi

* remove extra comma

* update to check banner pos being int

* remove source tid logic

Co-authored-by: shahin.rahbariasl <shahin.rahbariasl@indexexchange.com>
---
 modules/ixBidAdapter.js                | 6 ++++++
 test/spec/modules/ixBidAdapter_spec.js | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 61e518d306d..c30065d6aab 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -781,6 +781,11 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
         },
       };
 
+      const position = impressions[transactionIds[adUnitIndex]].pos;
+      if (isInteger(position)) {
+        _bannerImpression.banner.pos = position;
+      }
+
       if (dfpAdUnitCode || gpid || tid) {
         _bannerImpression.ext = {};
         _bannerImpression.ext.dfp_ad_unit_code = dfpAdUnitCode;
@@ -1054,6 +1059,7 @@ function createBannerImps(validBidRequest, missingBannerSizes, bannerImps) {
   bannerImps[validBidRequest.transactionId].tid = deepAccess(validBidRequest, 'ortb2Imp.ext.tid');
   bannerImps[validBidRequest.transactionId].pbadslot = deepAccess(validBidRequest, 'ortb2Imp.ext.data.pbadslot');
   bannerImps[validBidRequest.transactionId].tagId = deepAccess(validBidRequest, 'params.tagId');
+  bannerImps[validBidRequest.transactionId].pos = deepAccess(validBidRequest, 'mediaTypes.banner.pos');
 
   const adUnitCode = validBidRequest.adUnitCode;
   const divId = document.getElementById(adUnitCode) ? adUnitCode : getGptSlotInfoForAdUnitCode(adUnitCode).divId;
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index 7360024eed2..3dbcea5bb0c 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -171,7 +171,8 @@ describe('IndexexchangeAdapter', function () {
       sizes: [[300, 250], [300, 600]],
       mediaTypes: {
         banner: {
-          sizes: [[300, 250], [300, 600]]
+          sizes: [[300, 250], [300, 600]],
+          pos: 0
         }
       },
       ortb2Imp: {
@@ -1839,6 +1840,7 @@ describe('IndexexchangeAdapter', function () {
       expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
       expect(impression.banner.format).to.be.length(2);
       expect(impression.banner.topframe).to.be.oneOf([0, 1]);
+      expect(impression.banner.pos).to.equal(0);
       expect(impression.ext.tid).to.equal(DEFAULT_BANNER_VALID_BID[0].transactionId);
 
       impression.banner.format.map(({ w, h, ext }, index) => {
@@ -2448,11 +2450,13 @@ describe('IndexexchangeAdapter', function () {
       bid.mediaTypes.video.protocols = [6];
       bid.mediaTypes.video.mimes = ['video/mp4'];
       bid.mediaTypes.video.api = 2;
+      bid.mediaTypes.video.pos = 0;
       const request = spec.buildRequests([bid], {})[0];
       const impression = JSON.parse(request.data.r).imp[0];
 
       expect(impression.video.protocols[0]).to.equal(6);
       expect(impression.video.api).to.equal(2);
+      expect(impression.video.pos).to.equal(0);
       expect(impression.video.mimes[0]).to.equal('video/mp4');
     });
 

From ece711e73114e73a452541edcaa073281f8cd801 Mon Sep 17 00:00:00 2001
From: Antonio Gargaro <38767071+AntonioGargaro@users.noreply.github.com>
Date: Mon, 29 Aug 2022 19:53:30 +0100
Subject: [PATCH 193/569] Permutive RTD Module: merge external submodule params
 (#8881)

* fix(permutive-rtd): merge external submodule params

* fix(permutive-rtd): use ls storage wrapper
---
 modules/permutiveRtdProvider.js               |  63 ++++++-
 .../spec/modules/permutiveRtdProvider_spec.js | 154 +++++++++++++++++-
 2 files changed, 207 insertions(+), 10 deletions(-)

diff --git a/modules/permutiveRtdProvider.js b/modules/permutiveRtdProvider.js
index 79c709f9bcc..a2cd7847564 100644
--- a/modules/permutiveRtdProvider.js
+++ b/modules/permutiveRtdProvider.js
@@ -8,14 +8,18 @@
 import {getGlobal} from '../src/prebidGlobal.js';
 import {submodule} from '../src/hook.js';
 import {getStorageManager} from '../src/storageManager.js';
-import {deepAccess, deepSetValue, isFn, logError, mergeDeep} from '../src/utils.js';
+import {deepAccess, deepSetValue, isFn, logError, mergeDeep, isPlainObject, safeJSONParse} from '../src/utils.js';
 import {includes} from '../src/polyfill.js';
 
 const MODULE_NAME = 'permutive'
 
+export const PERMUTIVE_SUBMODULE_CONFIG_KEY = 'permutive-prebid-rtd'
+
 export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME})
 
-function init (moduleConfig, userConsent) {
+function init(moduleConfig, userConsent) {
+  readPermutiveModuleConfigFromCache()
+
   return true
 }
 
@@ -43,20 +47,63 @@ export function initSegments (reqBidsConfigObj, callback, customModuleConfig) {
   }
 }
 
+function liftIntoParams(params) {
+  return isPlainObject(params) ? { params } : {}
+}
+
+let cachedPermutiveModuleConfig = {}
+
 /**
- * Merges segments into existing bidder config
+ * Access the submodules RTD params that are cached to LocalStorage by the Permutive SDK. This lets the RTD submodule
+ * apply publisher defined params set in the Permutive platform, so they may still be applied if the Permutive SDK has
+ * not initialised before this submodule is initialised.
+ */
+function readPermutiveModuleConfigFromCache() {
+  const params = safeJSONParse(storage.getDataFromLocalStorage(PERMUTIVE_SUBMODULE_CONFIG_KEY))
+  return cachedPermutiveModuleConfig = liftIntoParams(params)
+}
+
+/**
+ * Access the submodules RTD params attached to the Permutive SDK.
+ *
+ * @return The Permutive config available by the Permutive SDK or null if the operation errors.
+ */
+function getParamsFromPermutive() {
+  try {
+    return liftIntoParams(window.permutive.addons.prebid.getPermutiveRtdConfig())
+  } catch (e) {
+    return null
+  }
+}
+
+/**
+ * Merges segments into existing bidder config in reverse priority order. The highest priority is 1.
+ *
+ *   1. customModuleConfig <- set by publisher with pbjs.setConfig
+ *   2. permutiveRtdConfig <- set by the publisher using the Permutive platform
+ *   3. defaultConfig
+ *
+ * As items with a higher priority will be deeply merged into the previous config, deep merges are performed by
+ * reversing the priority order.
+ *
  * @param {Object} customModuleConfig - Publisher config for module
- * @return {Object} Merged defatul and custom config
+ * @return {Object} Deep merges of the default, Permutive and custom config.
  */
-function getModuleConfig (customModuleConfig) {
+export function getModuleConfig(customModuleConfig) {
+  // Use the params from Permutive if available, otherwise fallback to the cached value set by Permutive.
+  const permutiveModuleConfig = getParamsFromPermutive() || cachedPermutiveModuleConfig
+
   return mergeDeep({
     waitForIt: false,
     params: {
       maxSegs: 500,
       acBidders: [],
-      overwrites: {}
-    }
-  }, customModuleConfig)
+      overwrites: {},
+    },
+  },
+  permutiveModuleConfig,
+  customModuleConfig,
+  )
 }
 
 /**
diff --git a/test/spec/modules/permutiveRtdProvider_spec.js b/test/spec/modules/permutiveRtdProvider_spec.js
index 4e59cd35741..9282ec3ac24 100644
--- a/test/spec/modules/permutiveRtdProvider_spec.js
+++ b/test/spec/modules/permutiveRtdProvider_spec.js
@@ -5,9 +5,11 @@ import {
   initSegments,
   isAcEnabled,
   isPermutiveOnPage,
-  setBidderRtb
+  setBidderRtb,
+  getModuleConfig,
+  PERMUTIVE_SUBMODULE_CONFIG_KEY,
 } from 'modules/permutiveRtdProvider.js'
-import { deepAccess } from '../../../src/utils.js'
+import { deepAccess, deepSetValue, mergeDeep } from '../../../src/utils.js'
 import { config } from 'src/config.js'
 
 describe('permutiveRtdProvider', function () {
@@ -29,6 +31,154 @@ describe('permutiveRtdProvider', function () {
     })
   })
 
+  describe('getModuleConfig', function () {
+    beforeEach(function () {
+      // Reads data from the cache
+      permutiveSubmodule.init()
+    })
+
+    const liftToParams = (params) => ({ params })
+
+    const getDefaultConfig = () => ({
+      waitForIt: false,
+      params: {
+        maxSegs: 500,
+        acBidders: [],
+        overwrites: {},
+      },
+    })
+
+    const storeConfigInCacheAndInit = (data) => {
+      const dataToStore = { [PERMUTIVE_SUBMODULE_CONFIG_KEY]: data }
+      setLocalStorage(dataToStore)
+      // Reads data from the cache
+      permutiveSubmodule.init()
+
+      // Cleanup
+      return () => removeLocalStorage(dataToStore)
+    }
+
+    const setWindowPermutivePrebid = (getPermutiveRtdConfig) => {
+      // Read from Permutive
+      const backup = window.permutive
+
+      deepSetValue(window, 'permutive.addons.prebid', {
+        getPermutiveRtdConfig,
+      })
+
+      // Cleanup
+      return () => window.permutive = backup
+    }
+
+    it('should return default values', function () {
+      const config = getModuleConfig({})
+      expect(config).to.deep.equal(getDefaultConfig())
+    })
+
+    it('should override deeply on custom config', function () {
+      const defaultConfig = getDefaultConfig()
+
+      const customModuleConfig = { waitForIt: true, params: { acBidders: ['123'] } }
+      const config = getModuleConfig(customModuleConfig)
+
+      expect(config).to.deep.equal(mergeDeep(defaultConfig, customModuleConfig))
+    })
+
+    it('should override deeply on cached config', function () {
+      const defaultConfig = getDefaultConfig()
+
+      const cachedParamsConfig = { acBidders: ['123'] }
+      const cleanupCache = storeConfigInCacheAndInit(cachedParamsConfig)
+
+      const config = getModuleConfig({})
+
+      expect(config).to.deep.equal(mergeDeep(defaultConfig, liftToParams(cachedParamsConfig)))
+
+      // Cleanup
+      cleanupCache()
+    })
+
+    it('should override deeply on Permutive Rtd config', function () {
+      const defaultConfig = getDefaultConfig()
+
+      const permutiveRtdConfigParams = { acBidders: ['123'], overwrites: { '123': true } }
+      const cleanupPermutive = setWindowPermutivePrebid(function () {
+        return permutiveRtdConfigParams
+      })
+
+      const config = getModuleConfig({})
+
+      expect(config).to.deep.equal(mergeDeep(defaultConfig, liftToParams(permutiveRtdConfigParams)))
+
+      // Cleanup
+      cleanupPermutive()
+    })
+
+    it('should NOT use cached Permutive Rtd config if window.permutive is available', function () {
+      const defaultConfig = getDefaultConfig()
+
+      // As Permutive is available on the window object, this value won't be used.
+      const cachedParamsConfig = { acBidders: ['123'] }
+      const cleanupCache = storeConfigInCacheAndInit(cachedParamsConfig)
+
+      const permutiveRtdConfigParams = { acBidders: ['456'], overwrites: { '123': true } }
+      const cleanupPermutive = setWindowPermutivePrebid(function () {
+        return permutiveRtdConfigParams
+      })
+
+      const config = getModuleConfig({})
+
+      expect(config).to.deep.equal(mergeDeep(defaultConfig, liftToParams(permutiveRtdConfigParams)))
+
+      // Cleanup
+      cleanupCache()
+      cleanupPermutive()
+    })
+
+    it('should handle calling Permutive method throwing error', function () {
+      const defaultConfig = getDefaultConfig()
+
+      const cleanupPermutive = setWindowPermutivePrebid(function () {
+        throw new Error()
+      })
+
+      const config = getModuleConfig({})
+
+      expect(config).to.deep.equal(defaultConfig)
+
+      // Cleanup
+      cleanupPermutive()
+    })
+
+    it('should override deeply in priority order', function () {
+      const defaultConfig = getDefaultConfig()
+
+      // As Permutive is available on the window object, this value won't be used.
+      const cachedConfig = { acBidders: ['123'] }
+      const cleanupCache = storeConfigInCacheAndInit(cachedConfig)
+
+      // Read from Permutive
+      const permutiveRtdConfig = { acBidders: ['456'] }
+      const cleanupPermutive = setWindowPermutivePrebid(function () {
+        return permutiveRtdConfig
+      })
+
+      const customModuleConfig = { params: { acBidders: ['789'], maxSegs: 499 } }
+      const config = getModuleConfig(customModuleConfig)
+
+      // The configs are in reverse priority order as configs are merged left to right. So the priority is,
+      // 1. customModuleConfig <- set by publisher with pbjs.setConfig
+      // 2. permutiveRtdConfig <- set by the publisher using Permutive.
+      // 3. defaultConfig
+      const configMergedInPriorityOrder = mergeDeep(defaultConfig, liftToParams(permutiveRtdConfig), customModuleConfig)
+      expect(config).to.deep.equal(configMergedInPriorityOrder)
+
+      // Cleanup
+      cleanupCache()
+      cleanupPermutive()
+    })
+  })
+
   describe('ortb2 config', function () {
     beforeEach(function () {
       config.resetConfig()

From ab65e436a35758966c76017ee1394846b31eb917 Mon Sep 17 00:00:00 2001
From: Yohan Boutin <yohan@seedtag.com>
Date: Tue, 30 Aug 2022 15:19:38 +0200
Subject: [PATCH 194/569] Seedtag Bid Adapter: update documentation (#8921)

* remove video from documentation

* add example for inArticle
---
 modules/seedtagBidAdapter.md | 81 +++++++++++-------------------------
 1 file changed, 25 insertions(+), 56 deletions(-)

diff --git a/modules/seedtagBidAdapter.md b/modules/seedtagBidAdapter.md
index f4249fb2e89..061a254c5fa 100644
--- a/modules/seedtagBidAdapter.md
+++ b/modules/seedtagBidAdapter.md
@@ -8,19 +8,18 @@ Maintainer: prebid@seedtag.com
 
 # Description
 
-Module that connects to Seedtag demand sources to fetch bids.
+Prebidjs seedtag bidder
 
-# Test Parameters
-
-## Sample Banner Ad Unit
+# Sample integration
 
+## InScreen
 ```js
 const adUnits = [
   {
-    code: '/21804003197/prebid_test_300x250',
+    code: '/21804003197/prebid_test_320x100',
     mediaTypes: {
       banner: {
-        sizes: [[300, 250]]
+        sizes: [[320, 100]]
       }
     },
     bids: [
@@ -29,8 +28,7 @@ const adUnits = [
         params: {
           publisherId: '0000-0000-01',      // required
           adUnitId: '0000',                 // required
-          placement: 'banner',              // required
-          adPosition: 0                     // optional
+          placement: 'inScreen',              // required
         }
       }
     ]
@@ -38,55 +36,26 @@ const adUnits = [
 ]
 ```
 
-## Sample inStream Video Ad Unit
-
+## InArticle
 ```js
-var adUnits = [{
-  code: 'video',
-  mediaTypes: {
-    video: {
-      context: 'instream',   // required
-      playerSize: [600, 300], // required
-      mimes: ['video/mp4'], // recommended
-      minduration: 5,       // optional
-      maxduration: 60,      // optional
-      boxingallowed: 1,     // optional
-      skip: 1,              // optional
-      startdelay: 1,        // optional
-      linearity: 1,         // optional
-      battr: [1, 2],        // optional
-      maxbitrate: 10,       // optional
-      playbackmethod: [1],  // optional
-      delivery: [1],        // optional
-      placement: 1,         // optional
-    }
-  },
-  bids: [
-    {
-      bidder: 'seedtag',
-      params: {
-        publisherId: '0000-0000-01',    // required
-        adUnitId: '0000',               // required
-        placement: 'video',             // required
-        adPosition: 0,                  // optional
-        video: { // optional
-          context: 'instream',   // optional
-          playerSize: [600, 300], // optional
-          mimes: ['video/mp4'], // optional
-          minduration: 5,       // optional
-          maxduration: 60,      // optional
-          boxingallowed: 1,     // optional
-          skip: 1,              // optional
-          startdelay: 1,        // optional
-          linearity: 1,         // optional
-          battr: [1, 2],        // optional
-          maxbitrate: 10,       // optional
-          playbackmethod: [1],  // optional
-          delivery: [1],        // optional
-          placement: 1,         // optional
+const adUnits = [
+  {
+    code: '/21804003197/prebid_test_300x250',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [1, 1]]
+      }
+    },
+    bids: [
+      {
+        bidder: 'seedtag',
+        params: {
+          publisherId: '0000-0000-01',      // required
+          adUnitId: '0000',                 // required
+          placement: 'inArticle',              // required
         }
       }
-    }
-  ]
-}];
+    ]
+  }
+]
 ```

From 9abed445d9778ff29720bc88feca244e31763f62 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 30 Aug 2022 09:43:17 -0600
Subject: [PATCH 195/569] Prebid core: accept custom Promise constructor
 (#8915)

---
 src/utils/promise.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/utils/promise.js b/src/utils/promise.js
index 229056786d2..97c64a96f8b 100644
--- a/src/utils/promise.js
+++ b/src/utils/promise.js
@@ -1,10 +1,12 @@
+import {getGlobal} from '../prebidGlobal.js';
+
 const SUCCESS = 0;
 const FAIL = 1;
 
 /**
  * A version of Promise that runs callbacks synchronously when it can (i.e. after it's been fulfilled or rejected).
  */
-export class GreedyPromise extends Promise {
+export class GreedyPromise extends (getGlobal().Promise || Promise) {
   #result;
   #callbacks;
   #parent = null;

From 29448af9642533c7a49ecc0f376201be382996e3 Mon Sep 17 00:00:00 2001
From: kapil-tuptewar <91458408+kapil-tuptewar@users.noreply.github.com>
Date: Tue, 30 Aug 2022 21:14:50 +0530
Subject: [PATCH 196/569] Sending epoch time and tmax in translator request
 (#8919)

Co-authored-by: Kapil Tuptewar <kapiltuptewar@L1290.local>
---
 modules/pubmaticBidAdapter.js                | 14 ++++++++++++++
 test/spec/modules/pubmaticBidAdapter_spec.js | 16 ++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index b71fa5c8ed2..7f346b1c7b0 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -1174,6 +1174,7 @@ export const spec = {
     if (commonFpd.bcat) {
       blockedIabCategories = blockedIabCategories.concat(commonFpd.bcat);
     }
+
     if (commonFpd.ext?.prebid?.bidderparams?.[bidderRequest.bidderCode]?.acat) {
       const acatParams = commonFpd.ext.prebid.bidderparams[bidderRequest.bidderCode].acat;
       _allowedIabCategoriesValidation(payload, acatParams);
@@ -1181,6 +1182,19 @@ export const spec = {
       _allowedIabCategoriesValidation(payload, allowedIabCategories);
     }
     _blockedIabCategoriesValidation(payload, blockedIabCategories);
+
+    // Check if bidderRequest has timeout property if present send timeout as tmax value to translator request
+    // bidderRequest has timeout property if publisher sets during calling requestBids function from page
+    // if not bidderRequest contains global value set by Prebid
+    if (bidderRequest?.timeout) {
+      payload.tmax = bidderRequest.timeout || config.getConfig('bidderTimeout');
+    } else {
+      payload.tmax = window?.PWT?.versionDetails?.timeout;
+    }
+
+    // Sending epoch timestamp in request.ext object
+    payload.ext.epoch = new Date().getTime();
+
     // Note: Do not move this block up
     // if site object is set in Prebid config then we need to copy required fields from site into app and unset the site object
     if (typeof config.getConfig('app') === 'object') {
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
index 688bec5b5e9..3f341fd259f 100644
--- a/test/spec/modules/pubmaticBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -1103,8 +1103,24 @@ describe('PubMatic adapter', function () {
         expect(data.imp[0].ext.key_val).to.exist.and.to.equal(bidRequests[0].params.dctr);
         expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
         expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
+        expect(data.ext.epoch).to.exist;
   		});
 
+      it('Set tmax from global config if not set by requestBids method', function() {
+        let sandbox = sinon.sandbox.create();
+        sandbox.stub(config, 'getConfig').callsFake((key) => {
+			  var config = {
+            bidderTimeout: 3000
+			  };
+			  return config[key];
+        });
+        let request = spec.buildRequests(bidRequests, {
+			  auctionId: 'new-auction-id', timeout: 3000
+        });
+        let data = JSON.parse(request.data);
+        expect(data.tmax).to.deep.equal(3000);
+        sandbox.restore();
+      });
       describe('Marketplace parameters', function() {
         let bidderSettingStub;
         beforeEach(function() {

From 7d3ad07c97e39fb1f6f5df481f6c0dac369ecda0 Mon Sep 17 00:00:00 2001
From: piotrj-rtbh <109736938+piotrj-rtbh@users.noreply.github.com>
Date: Tue, 30 Aug 2022 17:45:49 +0200
Subject: [PATCH 197/569] RTB House Bid Adapter: Add SDA support based on ortb2
 object (#8918)

* RTBHouse Bid Adapter: add global vendor list id

* structured user agent - browsers.brands

* fix lint errors

* Added sda into rtbhouse adapter

* spreading ortb2: user & site props

* examples reverted

Co-authored-by: Leandro Otani <leandro.otani@rtbhouse.com>
Co-authored-by: rtbh-lotani <83652735+rtbh-lotani@users.noreply.github.com>
Co-authored-by: Tomasz Swirski <tomasz.swirski@rtbhouse.com>
---
 modules/rtbhouseBidAdapter.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/modules/rtbhouseBidAdapter.js b/modules/rtbhouseBidAdapter.js
index 961f0fcacae..fdf64483da7 100644
--- a/modules/rtbhouseBidAdapter.js
+++ b/modules/rtbhouseBidAdapter.js
@@ -81,6 +81,30 @@ export const spec = {
       }
     }
 
+    const ortb2Params = bidderRequest && bidderRequest.ortb2;
+    if (ortb2Params?.user) {
+      request.user = {
+        ...request.user,
+        ...(ortb2Params.user.data && {
+          data: { ...request.user?.data, ...ortb2Params.user.data },
+        }),
+        ...(ortb2Params.user.ext && {
+          ext: { ...request.user?.ext, ...ortb2Params.user.ext },
+        }),
+      };
+    }
+    if (ortb2Params?.site) {
+      request.site = {
+        ...request.site,
+        ...(ortb2Params.site.content && {
+          content: { ...request.site?.content, ...ortb2Params.site.content },
+        }),
+        ...(ortb2Params.site.ext && {
+          ext: { ...request.site?.ext, ...ortb2Params.site.ext },
+        }),
+      };
+    }
+
     return {
       method: 'POST',
       url: 'https://' + validBidRequests[0].params.region + '.' + ENDPOINT_URL,

From ad1617470ad5acd9f2060db9706ed87509dd3998 Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Tue, 30 Aug 2022 11:54:05 -0400
Subject: [PATCH 198/569] Prebid Core: rewording PR template (#8882)

* Update PULL_REQUEST_TEMPLATE.md

* Update PULL_REQUEST_TEMPLATE.md
---
 .github/PULL_REQUEST_TEMPLATE.md | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9fdb04ba556..09ef5c445f2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,15 @@
 <!--
-Thank you for your pull request. Please make sure this PR is scoped to one change, and that any added or changed code includes tests with greater than 80% code coverage. See https://github.com/prebid/Prebid.js/blob/master/CONTRIBUTING.md#testing-prebidjs for documentation on testing Prebid.js.
+Thank you for your pull request! 
+
+Please title your pull request like this: 'Module: Change', eg 'Fraggles Bid Adapter: support fragglerock'
+
+Please make sure this PR is scoped to one change or you may be asked to resubmit. 
+ 
+Please make sure any added or changed code includes tests with greater than 80% code coverage. 
+
+See https://github.com/prebid/Prebid.js/blob/master/CONTRIBUTING.md#testing-prebidjs for documentation on testing Prebid.js.
+
+For any user facing change, submit a link to a PR on the docs repo at https://github.com/prebid/prebid.github.io/
 -->
 
 ## Type of change
@@ -11,14 +21,16 @@ Thank you for your pull request. Please make sure this PR is scoped to one chang
 - [ ] Refactoring (no functional changes, no api changes)
 - [ ] Build related changes
 - [ ] CI related changes
+
 - [ ] Does this change affect user-facing APIs or examples documented on http://prebid.org?
 - [ ] Other
 
 ## Description of change
 <!-- Describe the change proposed in this pull request -->
 
-<!-- For new bidder adapters, please provide the following -->
-- test parameters for validating bids
+<!-- For new bidder adapters, please provide the following
+- contact email of the adapter’s maintainer
+- test parameters for validating bids:
 ```
 {
   bidder: '<bidder name>',
@@ -28,14 +40,8 @@ Thank you for your pull request. Please make sure this PR is scoped to one chang
 }
 ```
 
-Be sure to test the integration with your adserver using the [Hello World](/integrationExamples/gpt/hello_world.html) sample page.
-
-- contact email of the adapter’s maintainer
-- [ ] official adapter submission
-
-For any changes that affect user-facing APIs or example code documented on http://prebid.org, please provide:
+Be sure to test the integration with your adserver using the [Hello World](/integrationExamples/gpt/hello_world.html) sample page. -->
 
-- A link to a PR on the docs repo at https://github.com/prebid/prebid.github.io/
 
 ## Other information
 <!-- References to related PR or issue #s, @mentions of the person or team responsible for reviewing changes, etc. -->

From 7dfeed558027ae098e967bc767edf64450649f2b Mon Sep 17 00:00:00 2001
From: Artur Nabiullin <80909609+zyk70n@users.noreply.github.com>
Date: Tue, 30 Aug 2022 21:18:03 +0300
Subject: [PATCH 199/569] Insticator Bid adapter: fix User ID cookie expiration
 time (#8924)

Co-authored-by: Artur Nabiullin <artur.nabiullin@gmail.com>
---
 modules/insticatorBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/insticatorBidAdapter.js b/modules/insticatorBidAdapter.js
index 5b7a64bc102..150e9d3c5c2 100644
--- a/modules/insticatorBidAdapter.js
+++ b/modules/insticatorBidAdapter.js
@@ -43,7 +43,7 @@ function setUserId(userId) {
   }
 
   if (storage.cookiesAreEnabled()) {
-    const expires = new Date(Date.now() + USER_ID_COOKIE_EXP).toISOString();
+    const expires = new Date(Date.now() + USER_ID_COOKIE_EXP).toUTCString();
     storage.setCookie(USER_ID_KEY, userId, expires);
   }
 }

From 70fd413e971931a9bf32bbc5bf6962f8b1e49382 Mon Sep 17 00:00:00 2001
From: caseywhitmire <60086994+caseywhitmire@users.noreply.github.com>
Date: Tue, 30 Aug 2022 14:08:31 -0700
Subject: [PATCH 200/569] Various files: fix LGTM semi-colon insertion (#8922)

* Update adriverBidAdapter.js

* Update datawrkzBidAdapter.js

* Update id5IdSystem.js
---
 modules/adriverBidAdapter.js  |  2 +-
 modules/datawrkzBidAdapter.js | 26 +++++++++++++-------------
 modules/id5IdSystem.js        |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/adriverBidAdapter.js b/modules/adriverBidAdapter.js
index b19c8318754..1af0cffa700 100644
--- a/modules/adriverBidAdapter.js
+++ b/modules/adriverBidAdapter.js
@@ -107,7 +107,7 @@ export const spec = {
       method: 'POST',
       url: ADRIVER_BID_URL,
       data: payloadString
-    }
+    };
   },
 
   interpretResponse: function (serverResponse, bidRequest) {
diff --git a/modules/datawrkzBidAdapter.js b/modules/datawrkzBidAdapter.js
index a4ee6bcaace..71870d6437d 100644
--- a/modules/datawrkzBidAdapter.js
+++ b/modules/datawrkzBidAdapter.js
@@ -162,10 +162,10 @@ function buildNativeRequest(bidRequest, bidderRequest) {
     assets.push(generateNativeDataObj(body, 'desc', ++counter));
   }
 
-  let request = JSON.stringify({assets: assets})
+  let request = JSON.stringify({assets: assets});
   const native = {
     request: request
-  }
+  };
 
   var deals = [];
   if (bidRequest.params.deals && bidRequest.params.deals.length > 0) {
@@ -220,7 +220,7 @@ function buildVideoRequest(bidRequest, bidderRequest) {
   };
 
   let context = deepAccess(bidRequest, 'mediaTypes.video.context');
-  if (context == 'outstream' && !bidRequest.renderer) video.mimes = OUTSTREAM_MIMES
+  if (context == 'outstream' && !bidRequest.renderer) video.mimes = OUTSTREAM_MIMES;
 
   var imp = [];
   var deals = [];
@@ -293,7 +293,7 @@ function generatePayload(imp, bidderRequest) {
     publisher: {}
   };
 
-  let regs = {ext: {}}
+  let regs = {ext: {}};
 
   if (bidderRequest.uspConsent) {
     regs.ext.us_privacy = bidderRequest.uspConsent;
@@ -346,7 +346,7 @@ function generateNativeImgObj(obj, type, id) {
     type: parseInt(typeId),
     w: adW,
     h: adH
-  }
+  };
   return {
     id: id,
     required: required,
@@ -413,8 +413,8 @@ function buildBannerResponse(bidRequest, bidResponse) {
         return;
       }
       let bidSizes = (deepAccess(bidRequest, 'mediaTypes.banner.sizes')) ? deepAccess(bidRequest, 'mediaTypes.banner.sizes') : bidRequest.sizes;
-      bidResponse.requestId = bidRequest.bidId
-      bidResponse.transactionId = bidRequest.transactionId
+      bidResponse.requestId = bidRequest.bidId;
+      bidResponse.transactionId = bidRequest.transactionId;
       bidResponse.placementCode = placementCode;
       bidResponse.cpm = responseCPM;
       bidResponse.size = bidSizes;
@@ -454,8 +454,8 @@ function buildNativeResponse(bidRequest, response) {
         bidResponses.push(bid);
         return;
       }
-      bidResponse.requestId = bidRequest.bidId
-      bidResponse.transactionId = bidRequest.transactionId
+      bidResponse.requestId = bidRequest.bidId;
+      bidResponse.transactionId = bidRequest.transactionId;
       bidResponse.placementCode = placementCode;
       bidResponse.cpm = responseCPM;
 
@@ -506,8 +506,8 @@ function buildVideoResponse(bidRequest, response) {
       }
       let context = bidRequest.mediaTypes.video.context;
 
-      bidResponse.requestId = bidRequest.bidId
-      bidResponse.transactionId = bidRequest.transactionId
+      bidResponse.requestId = bidRequest.bidId;
+      bidResponse.transactionId = bidRequest.transactionId;
       bidResponse.placementCode = placementCode;
       bidResponse.cpm = responseCPM;
 
@@ -531,7 +531,7 @@ function buildVideoResponse(bidRequest, response) {
 
       switch (context) {
         case OUTSTREAM:
-          var outstreamType = contains(OUTSTREAM_TYPES, bidRequest.params.outstreamType) ? bidRequest.params.outstreamType : ''
+          var outstreamType = contains(OUTSTREAM_TYPES, bidRequest.params.outstreamType) ? bidRequest.params.outstreamType : '';
           bidResponse.outstreamType = outstreamType;
           bidResponse.ad = vastXml;
           if (!bidRequest.renderer) {
@@ -542,7 +542,7 @@ function buildVideoResponse(bidRequest, response) {
               loaded: false,
               adUnitCode
             });
-            renderer.setRender(outstreamRender)
+            renderer.setRender(outstreamRender);
             bidResponse.renderer = renderer;
           } else { bidResponse.adResponse = vastXml; }
           break;
diff --git a/modules/id5IdSystem.js b/modules/id5IdSystem.js
index 95ce5c94e46..c2c4a97c62e 100644
--- a/modules/id5IdSystem.js
+++ b/modules/id5IdSystem.js
@@ -28,7 +28,7 @@ export const ID5_STORAGE_NAME = 'id5id';
 export const ID5_PRIVACY_STORAGE_NAME = `${ID5_STORAGE_NAME}_privacy`;
 const LOCAL_STORAGE = 'html5';
 const LOG_PREFIX = 'User ID - ID5 submodule: ';
-const ID5_API_CONFIG_URL = 'https://id5-sync.com/api/config/prebid'
+const ID5_API_CONFIG_URL = 'https://id5-sync.com/api/config/prebid';
 
 // order the legacy cookie names in reverse priority order so the last
 // cookie in the array is the most preferred to use
@@ -277,7 +277,7 @@ class IdFetchFlow {
         enabled: true, control_group_pct: abTestingConfig.controlGroupPct // The server validates
       };
     }
-    return data
+    return data;
   }
 }
 

From 253ef8f4531295f37a211621b037bd28093a4f86 Mon Sep 17 00:00:00 2001
From: Jason Quaccia <jlquaccia@gmail.com>
Date: Tue, 30 Aug 2022 14:38:56 -0700
Subject: [PATCH 201/569] Enrichment FPD Module: Support for GPC Detection
 (#8925)

* support for gpc detection

* updated test name and some other minor changes

* adjusted test

Co-authored-by: Jason Quaccia <jasonquaccia@RWC-WS233.local>
---
 modules/enrichmentFpdModule.js                | 11 +++++++++++
 test/spec/modules/enrichmentFpdModule_spec.js | 14 ++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/modules/enrichmentFpdModule.js b/modules/enrichmentFpdModule.js
index 139b03d6189..ed9381f4e4d 100644
--- a/modules/enrichmentFpdModule.js
+++ b/modules/enrichmentFpdModule.js
@@ -124,6 +124,16 @@ function setKeywords() {
   if (keywords && keywords.content) mergeDeep(ortb2, { site: { keywords: keywords.content.replace(/\s/g, '') } });
 }
 
+/**
+ * Checks the Global Privacy Control status, and if exists and is true, merges into regs.ext.gpc
+ */
+function setGpc() {
+  const gpcValue = navigator.globalPrivacyControl;
+  if (gpcValue) {
+    mergeDeep(ortb2, { regs: { ext: { gpc: 1 } } })
+  }
+}
+
 /**
  * Resets modules global ortb2 data
  */
@@ -135,6 +145,7 @@ function runEnrichments() {
   setDomain();
   setDimensions();
   setKeywords();
+  setGpc();
 
   return ortb2;
 }
diff --git a/test/spec/modules/enrichmentFpdModule_spec.js b/test/spec/modules/enrichmentFpdModule_spec.js
index 3cc18f952cc..6aff2d3ceff 100644
--- a/test/spec/modules/enrichmentFpdModule_spec.js
+++ b/test/spec/modules/enrichmentFpdModule_spec.js
@@ -99,4 +99,18 @@ describe('the first party data enrichment module', function() {
     expect(validated.device).to.deep.equal({ w: 1200, h: 700 });
     expect(validated.site.keywords).to.be.undefined;
   });
+
+  it('should store a reference to gpc witin ortb2.regs.ext if it has been enabled', function() {
+    let validated;
+    width = 800;
+    height = 500;
+
+    validated = processFpd({}, {}).global;
+    expect(validated.regs).to.equal(undefined);
+
+    const globalPrivacyControlStub = sinon.stub(window, 'navigator').value({globalPrivacyControl: true});
+    validated = processFpd({}, {}).global;
+    expect(validated.regs.ext.gpc).to.equal(1);
+    globalPrivacyControlStub.restore();
+  });
 });

From f4da5713e8322c952eedda9319b18cf21b5417bc Mon Sep 17 00:00:00 2001
From: ecdrsvc <82906140+ecdrsvc@users.noreply.github.com>
Date: Wed, 31 Aug 2022 02:39:24 -0400
Subject: [PATCH 202/569] Mabidder Bid Adapter: initial adapter release (#8851)

* initial adapter

* rename

* updates

* use mabidder as bidder name

* remove unused imports

* updates

* update name

* unit tests

* update request format

* reorganize request structure

* update buildRequest function and documentation

* update bid request parameters

* update test params

* update interpret resonse

* update isBidRequestValid function

* reset package-lock change

* add newline to end of file

* fix implicit operand conversion
---
 modules/mabidderBidAdapter.js                |  60 +++++++++
 modules/mabidderBidAdapter.md                |  31 +++++
 test/spec/modules/mabidderBidAdapter_spec.js | 125 +++++++++++++++++++
 3 files changed, 216 insertions(+)
 create mode 100644 modules/mabidderBidAdapter.js
 create mode 100644 modules/mabidderBidAdapter.md
 create mode 100644 test/spec/modules/mabidderBidAdapter_spec.js

diff --git a/modules/mabidderBidAdapter.js b/modules/mabidderBidAdapter.js
new file mode 100644
index 00000000000..12da791d2c4
--- /dev/null
+++ b/modules/mabidderBidAdapter.js
@@ -0,0 +1,60 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+const BIDDER_CODE = 'mabidder';
+export const baseUrl = 'https://prebid.ecdrsvc.com/bid';
+export const spec = {
+  supportedMediaTypes: [BANNER],
+  code: BIDDER_CODE,
+  isBidRequestValid: function(bid) {
+    if (typeof bid.params === 'undefined') {
+      return false;
+    }
+    return !!(bid.params.ppid && bid.sizes && Array.isArray(bid.sizes) && Array.isArray(bid.sizes[0]))
+  },
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const fpd = bidderRequest.ortb2;
+    const bids = [];
+    validBidRequests.forEach(bidRequest => {
+      const sizes = [];
+      bidRequest.sizes.forEach(size => {
+        sizes.push({
+          width: size[0],
+          height: size[1]
+        });
+      });
+      bids.push({
+        bidId: bidRequest.bidId,
+        sizes: sizes,
+        ppid: bidRequest.params.ppid,
+        mediaType: BANNER
+      })
+    });
+    const req = {
+      url: baseUrl,
+      method: 'POST',
+      data: {
+        v: $$PREBID_GLOBAL$$.version,
+        bids: bids,
+        url: bidderRequest.refererInfo.page || '',
+        referer: bidderRequest.refererInfo.ref || '',
+        fpd: fpd || {}
+      }
+    };
+
+    return req;
+  },
+  interpretResponse: function(serverResponse, request) {
+    const bidResponses = [];
+    if (serverResponse.body) {
+      const body = serverResponse.body;
+      if (!body || typeof body !== 'object' || !body.Responses || !(body.Responses.length > 0)) {
+        return [];
+      }
+      body.Responses.forEach((bidResponse) => {
+        bidResponses.push(bidResponse);
+      });
+    }
+    return bidResponses;
+  }
+}
+registerBidder(spec);
diff --git a/modules/mabidderBidAdapter.md b/modules/mabidderBidAdapter.md
new file mode 100644
index 00000000000..ee57cb8cab2
--- /dev/null
+++ b/modules/mabidderBidAdapter.md
@@ -0,0 +1,31 @@
+#Overview
+
+```
+Module Name: mabidder Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: lmprebidadapter@loblaw.ca
+```
+
+# Description
+
+Module that connects to MediaAisle demand sources
+
+# Test Parameters
+```
+var adUnits = [
+    {
+        code: 'test_banner',
+        mediaTypes: {
+            banner: {
+                sizes: [300, 250]
+            }
+        },
+        bids: [{
+            bidder: 'mabidder',
+            params: {
+                ppid: 'test'
+            }
+        }],
+    }
+];
+```
diff --git a/test/spec/modules/mabidderBidAdapter_spec.js b/test/spec/modules/mabidderBidAdapter_spec.js
new file mode 100644
index 00000000000..cd9599b375c
--- /dev/null
+++ b/test/spec/modules/mabidderBidAdapter_spec.js
@@ -0,0 +1,125 @@
+import { expect } from 'chai'
+import { baseUrl, spec } from 'modules/mabidderBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+import { BANNER } from '../../../src/mediaTypes.js';
+
+describe('mabidderBidAdapter', () => {
+  const adapter = newBidder(spec)
+  const bidRequestBanner = {
+    'bidId': '12345',
+    'bidder': 'mabidder',
+    'sizes': [[300, 250]],
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 250]]
+      }
+    },
+    'params': {
+      'ppid': 'string1',
+    }
+
+  }
+
+  describe('inherited functions', () => {
+    it('exists and is a function', () => {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+
+  describe('isBidRequestValid', () => {
+    it('should return true when required params are found', () => {
+      expect(spec.isBidRequestValid(bidRequestBanner)).to.equal(true)
+    })
+
+    it('should return false when required params are not found', () => {
+      let bid = Object.assign({}, bidRequestBanner)
+      const ppid = bid.params.ppid
+      delete bid.params.ppid
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+      bid.params.ppid = ppid
+
+      bid = Object.assign({}, bidRequestBanner)
+      const params = bidRequestBanner.params
+      delete bid.params
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+      bidRequestBanner.params = params
+    })
+  })
+
+  describe('buildRequests', () => {
+    const bidRequests = [bidRequestBanner]
+    const req = spec.buildRequests(bidRequests, {
+      auctionId: '123',
+      refererInfo: {
+        referer: 'http://test.com/path.html'
+      }
+    })
+
+    it('sends bid request to ENDPOINT via POST', () => {
+      expect(req.method).to.equal('POST')
+      expect(req.url.indexOf('https://')).to.equal(0)
+      expect(req.url).to.equal(baseUrl)
+    })
+
+    it('contains prebid version parameter', () => {
+      expect(req.data.v).to.equal($$PREBID_GLOBAL$$.version)
+    })
+
+    it('sends the correct bid parameters for banner', () => {
+      expect(req.data.bids[0].bidId).to.equal(bidRequestBanner.bidId)
+      expect(req.data.bids[0].ppid).to.equal(bidRequestBanner.params.ppid)
+      expect(req.data.bids[0].sizes[0].width).to.equal(bidRequestBanner.sizes[0][0])
+      expect(req.data.bids[0].sizes[0].height).to.equal(bidRequestBanner.sizes[0][1])
+    })
+
+    it('accepts an optional fpd parameter', () => {
+      expect(req.data.fpd).to.exist.and.to.be.a('Object')
+    })
+  })
+
+  describe('interpretResponse', () => {
+    it('handles banner request and should get correct bid response', () => {
+      const BIDDER_RESPONSE_BANNER = {
+        'Responses': [{
+          'width': 300,
+          'height': 250,
+          'creativeId': '123abc',
+          'ad': '<!-- Creative -->',
+          'cpm': 0.5,
+          'requestId': 'abc123',
+          'ttl': 60,
+          'netRevenue': true,
+          'currency': 'USD',
+          'mediaType': BANNER,
+          'meta': {
+            'advertiserDomains': ['https://loblaws.ca']
+          }
+        }]
+      }
+      const results = spec.interpretResponse({ body: BIDDER_RESPONSE_BANNER }, {})
+      const response = results[0]
+      expect(results.length).to.equal(BIDDER_RESPONSE_BANNER.Responses.length)
+      expect(response).to.have.property('ad').equal('<!-- Creative -->')
+      expect(response).to.have.property('requestId').equal('abc123')
+      expect(response).to.have.property('cpm').equal(0.5)
+      expect(response).to.have.property('currency').equal('USD')
+      expect(response).to.have.property('width').equal(300)
+      expect(response).to.have.property('height').equal(250)
+      expect(response).to.have.property('ttl').equal(60)
+      expect(response).to.have.property('creativeId').equal('123abc')
+      expect(response).to.have.property('mediaType').equal(BANNER)
+      expect(response).to.have.property('meta')
+      expect(response.meta).to.have.property('advertiserDomains')
+      expect(response.meta.advertiserDomains).to.be.an('array')
+      expect(response.meta.advertiserDomains[0]).equal('https://loblaws.ca')
+    })
+
+    it('handles no bid response by returning empty array', () => {
+      let result = spec.interpretResponse({ body: undefined }, {})
+      expect(result).to.deep.equal([])
+
+      result = spec.interpretResponse({ body: '' }, {})
+      expect(result).to.deep.equal([])
+    })
+  })
+})

From 0f2abb47e0a93cc12abecef77485a01d4ae8061d Mon Sep 17 00:00:00 2001
From: shahinrahbariasl <56240400+shahinrahbariasl@users.noreply.github.com>
Date: Wed, 31 Aug 2022 05:23:14 -0400
Subject: [PATCH 203/569] IX Bid Adapter: deprecate detecMissingSize config
 (#8906)

* IX Bid Adapter: deprecate detecMissingSize config

* remvoe extra space

Co-authored-by: shahin.rahbariasl <shahin.rahbariasl@indexexchange.com>
---
 modules/ixBidAdapter.js                | 24 ++----------------------
 modules/ixBidAdapter.md                | 20 +-------------------
 test/spec/modules/ixBidAdapter_spec.js | 19 +------------------
 3 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index c30065d6aab..48cead83c0d 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -586,8 +586,6 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
   r.ext = {};
   r.ext.source = 'prebid';
   r.ext.ixdiag = {};
-  r.ext.ixdiag.msd = 0;
-  r.ext.ixdiag.msi = 0;
   r.imp = [];
   r.at = 1;
 
@@ -732,12 +730,6 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     if (typeof otherIxConfig.timeout === 'number') {
       payload.t = otherIxConfig.timeout;
     }
-
-    if (typeof otherIxConfig.detectMissingSizes === 'boolean') {
-      r.ext.ixdiag.dms = otherIxConfig.detectMissingSizes;
-    } else {
-      r.ext.ixdiag.dms = true;
-    }
   }
 
   for (let adUnitIndex = 0; adUnitIndex < transactionIds.length; adUnitIndex++) {
@@ -746,7 +738,7 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     }
 
     const adUnitImpressions = impressions[transactionIds[adUnitIndex]];
-    const { missingCount = 0, missingImps: missingBannerImpressions = [], ixImps = [] } = adUnitImpressions;
+    const { missingImps: missingBannerImpressions = [], ixImps = [] } = adUnitImpressions;
     let wasAdUnitImpressionsTrimmed = false;
     let remainingRequestSize = MAX_REQUEST_SIZE - currentRequestSize;
     const sourceImpressions = { ixImps, missingBannerImpressions };
@@ -802,8 +794,6 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
       }
 
       r.imp.push(_bannerImpression);
-      r.ext.ixdiag.msd += missingCount;
-      r.ext.ixdiag.msi += missingBannerImpressions.length;
     } else {
       // set imp.ext.gpid to resolved gpid for each imp
       impressionObjects.forEach(imp => deepSetValue(imp, 'ext.gpid', gpid));
@@ -887,8 +877,6 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
 
       currentRequestSize = baseRequestSize;
       r.imp = [];
-      r.ext.ixdiag.msd = 0;
-      r.ext.ixdiag.msi = 0;
       isFpdAdded = false;
     }
   }
@@ -1040,12 +1028,6 @@ function createVideoImps(validBidRequest, videoImps) {
  * @param {object}  bannerImps reference to created banner impressions
  */
 function createBannerImps(validBidRequest, missingBannerSizes, bannerImps) {
-  const DEFAULT_IX_CONFIG = {
-    detectMissingSizes: true,
-  };
-
-  const ixConfig = { ...DEFAULT_IX_CONFIG, ...config.getConfig('ix') };
-
   let imp = bidToBannerImp(validBidRequest);
 
   const bannerSizeDefined = includesSize(deepAccess(validBidRequest, 'mediaTypes.banner.sizes'), deepAccess(validBidRequest, 'params.size'));
@@ -1074,9 +1056,7 @@ function createBannerImps(validBidRequest, missingBannerSizes, bannerImps) {
     bannerImps[validBidRequest.transactionId].ixImps.push(imp);
   }
 
-  if (ixConfig.hasOwnProperty('detectMissingSizes') && ixConfig.detectMissingSizes) {
-    updateMissingSizes(validBidRequest, missingBannerSizes, imp);
-  }
+  updateMissingSizes(validBidRequest, missingBannerSizes, imp);
 }
 
 /**
diff --git a/modules/ixBidAdapter.md b/modules/ixBidAdapter.md
index 790e895bedf..638cb11c5ab 100644
--- a/modules/ixBidAdapter.md
+++ b/modules/ixBidAdapter.md
@@ -362,25 +362,7 @@ pbjs.setConfig({
 });
 ```
 #### The **detectMissingSizes** feature
-By default, the IX bidding adapter bids on all banner sizes available in the ad unit when configured to at least one banner size. If you want the IX bidding adapter to only bid on the banner size it’s configured to, switch off this feature using `detectMissingSizes`.
-```
-pbjs.setConfig({
-    ix: {
-        detectMissingSizes: false
-    }
-});
-```
-OR
-```
-pbjs.setBidderConfig({
-    bidders: ["ix"],
-    config: {
-        ix: {
-            detectMissingSizes: false
-        }
-    }
-});
-```
+`detectMissingSize` config is now deprecated and IX bidding adapter bids on all banner sizes available in the ad unit when configured to at least one banner size.
 
 **Native**
 
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index 3dbcea5bb0c..60ea2df0510 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -2325,15 +2325,7 @@ describe('IndexexchangeAdapter', function () {
     });
 
     describe('detect missing sizes', function () {
-      beforeEach(function () {
-        config.setConfig({
-          ix: {
-            detectMissingSizes: false
-          }
-        });
-      })
-
-      it('request should not contain missing sizes if detectMissingSizes = false', function () {
+      it('request should always contain missing sizes', function () {
         const bid1 = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
         bid1.mediaTypes.banner.sizes = LARGE_SET_OF_SIZES;
 
@@ -2693,15 +2685,6 @@ describe('IndexexchangeAdapter', function () {
         expect(videoImp.video.w).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.size[0]);
         expect(videoImp.video.h).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.size[1]);
       });
-
-      it('should get missing sizes count 0 when params.size not used', function () {
-        const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
-        delete bid.params.size;
-        const request = spec.buildRequests([bid], {});
-        const diagObj = JSON.parse(request[0].data.r).ext.ixdiag;
-        expect(diagObj.msd).to.equal(0);
-        expect(diagObj.msi).to.equal(0);
-      });
     });
 
     describe('both banner and video bidder params set', function () {

From 2df09cc30cef6a8a72ee085023825043b419a61b Mon Sep 17 00:00:00 2001
From: omerBrowsi <54346241+omerBrowsi@users.noreply.github.com>
Date: Wed, 31 Aug 2022 16:47:57 +0300
Subject: [PATCH 204/569] Browsi RTD Module: billable events bugfix (#8926)

* real time data module,
browsi sub module for real time data,
new hook bidsBackCallback,
fix for config unsubscribe

* change timeout&primary ad server only to auctionDelay
update docs

* support multiple providers

* change promise to callbacks
configure submodule on submodules.json

* bug fixes

* use Prebid ajax

* tests fix

* browsi real time data provider improvements

* real time data module,
browsi sub module for real time data,
new hook bidsBackCallback,
fix for config unsubscribe

* change timeout&primary ad server only to auctionDelay
update docs

* support multiple providers

* change promise to callbacks
configure submodule on submodules.json

* bug fixes

* use Prebid ajax

* tests fix

* browsi real time data provider improvements

* Browsi RTD provider - add billiable event type

* Browsi RTD provider - add billiable event type

* lint fixes

* fix for case where variable is null
---
 modules/browsiRtdProvider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/browsiRtdProvider.js b/modules/browsiRtdProvider.js
index d39e500e4f9..0996fc9905b 100644
--- a/modules/browsiRtdProvider.js
+++ b/modules/browsiRtdProvider.js
@@ -348,7 +348,7 @@ export const browsiSubmodule = {
 function getTargetingData(uc, c, us, a) {
   const targetingData = getRTD(uc);
   const auctionId = a.auctionId;
-  const sendAdRequestEvent = _browsiData['bet'] === 'AD_REQUEST';
+  const sendAdRequestEvent = (_browsiData && _browsiData['bet'] === 'AD_REQUEST');
   uc.forEach(auc => {
     if (isNumber(_ic[auc])) {
       _ic[auc] = _ic[auc] + 1;

From 9ebaaa1dd4a6f1aeb72d4e8c0034cc20f9deb313 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Wed, 31 Aug 2022 11:10:05 -0600
Subject: [PATCH 205/569] Prebid Core: Start Github CoreQL Code Scans (#8923)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Create codeql-analysis.yml

* Update codeql-analysis.yml

* Update instream.html

* Update emx_digitalBidAdapter_spec.js

* Update index.js

* Update index.js

* Update index.js

* Merge master  (#8873)

* Readme: remove dead dev dependency and maintenance badges (#8849)

* Readme: remove dead dev dependency badge and issue

* Remove maintainability and add back issues

* Prebid 7.11.0 release

* Increment version to 7.12.0-pre

* Adriver Bid and Id Modules: buyerid bug fix (#8768)

* initial commit

* adriver id submodule add

* add id system tests, fix adriver bid adapter tests

* adriver: fix buyerid

* remarks fixing

* removal of excess

* delete custom parameter

* bug fixes

* handle native response privacy link (#8838)

Co-authored-by: Zicong Zhou <zicong.zhou@indexexchange.com>

* Criteo Bid Adapter - Add support for banner+native multiformat ad unit (#8842)

Previously, the use of a native adunit was exclusive with the banner type.

* Ras Bid Adapter: support for SlotSequence parameter (#8792)

* add rasbidadapter pos param

* Read pos off the adunit

* rename conflicting pos parameter for clarity

* Improve Digital adapter: refactor code to align with latest RAZR creative tags (#8827)

* IX Bid Adapter: Native OpenRTB Request Support (#8853)

* fix native click trackers to only fire on click

* fix unit tests for ix

* remove version for native requests

* remove unnecessary request conversion

Co-authored-by: Zicong Zhou <zicong.zhou@indexexchange.com>

* Update Sonobi adapter with GVLID (#8860)

* dgkeyword RTD provider: fix tests causing ID5 test failures (#8862)

* Id5 id configurable fetch flow (#8784)

Co-authored-by: Paweł Kowalski <pkowalski@id5.io>

* NextMillenium Bid Adapter: Remove ortb2 referrerInfo (#8868)

* remove ortb2, get device/site manually

* updated tests

* remove fallbacks

* no need to craete variable if there is no fallback (return in place)

* removed one test case

Co-authored-by: Yakov Klein <yakovklein@Yakovs-MacBook-Air.local>

* adserver.js : remove unused code (#8855)

* Displayio Bid Adapter: custom render; fix eids payload (#8847)

* Custom render; call pubmatic get user id function is removed

* use refererInfo; remove call createEidsArray

* VidCrunch LLC bidder (#8872)

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
Co-authored-by: Prebid.js automated release <prebidjs-release@prebid.org>
Co-authored-by: m-oranskaya <99481039+m-oranskaya@users.noreply.github.com>
Co-authored-by: Love Sharma <sharmak.love@gmail.com>
Co-authored-by: Zicong Zhou <zicong.zhou@indexexchange.com>
Co-authored-by: Léonard Labat <le.labat@criteo.com>
Co-authored-by: wsusrasp <106743463+wsusrasp@users.noreply.github.com>
Co-authored-by: Catalin Ciocov <catalin.ciocov@gmail.com>
Co-authored-by: Mike Miller <mike@solitaired.com>
Co-authored-by: Demetrio Girardi <dgirardi@prebid.org>
Co-authored-by: Scott Menzer <scott@id5.io>
Co-authored-by: Paweł Kowalski <pkowalski@id5.io>
Co-authored-by: JacobKlein26 <42449375+JacobKlein26@users.noreply.github.com>
Co-authored-by: Yakov Klein <yakovklein@Yakovs-MacBook-Air.local>
Co-authored-by: caseywhitmire <60086994+caseywhitmire@users.noreply.github.com>
Co-authored-by: philan15 <37775368+philan15@users.noreply.github.com>
Co-authored-by: Gena <wertixvost@gmail.com>

* Revert "Merge master  (#8873)" (#8911)

This reverts commit 07c53690a504380ad41a62c011961801676eae8e.

* Update code scan config

* Update viewability

* Sanitize JSON for adgeneration

Co-authored-by: Patrick McCann <patmmccann@gmail.com>
Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
Co-authored-by: Prebid.js automated release <prebidjs-release@prebid.org>
Co-authored-by: m-oranskaya <99481039+m-oranskaya@users.noreply.github.com>
Co-authored-by: Love Sharma <sharmak.love@gmail.com>
Co-authored-by: Zicong Zhou <zicong.zhou@indexexchange.com>
Co-authored-by: Léonard Labat <le.labat@criteo.com>
Co-authored-by: wsusrasp <106743463+wsusrasp@users.noreply.github.com>
Co-authored-by: Catalin Ciocov <catalin.ciocov@gmail.com>
Co-authored-by: Mike Miller <mike@solitaired.com>
Co-authored-by: Scott Menzer <scott@id5.io>
Co-authored-by: Paweł Kowalski <pkowalski@id5.io>
Co-authored-by: JacobKlein26 <42449375+JacobKlein26@users.noreply.github.com>
Co-authored-by: Yakov Klein <yakovklein@Yakovs-MacBook-Air.local>
Co-authored-by: caseywhitmire <60086994+caseywhitmire@users.noreply.github.com>
Co-authored-by: philan15 <37775368+philan15@users.noreply.github.com>
Co-authored-by: Gena <wertixvost@gmail.com>
---
 .github/codeql/codeql-config.yml      |  4 ++
 .github/workflows/codeql-analysis.yml | 73 +++++++++++++++++++++++++++
 modules/adgenerationBidAdapter.js     |  4 +-
 modules/consentManagement.js          |  2 +-
 modules/consentManagementUsp.js       |  2 +-
 modules/viewability.js                | 28 +++++-----
 src/utils.js                          | 27 ++++++++++
 test/pages/instream.html              |  4 +-
 8 files changed, 124 insertions(+), 20 deletions(-)
 create mode 100644 .github/codeql/codeql-config.yml
 create mode 100644 .github/workflows/codeql-analysis.yml

diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
new file mode 100644
index 00000000000..2e8465003e4
--- /dev/null
+++ b/.github/codeql/codeql-config.yml
@@ -0,0 +1,4 @@
+paths:
+  - src
+  - modules
+  - libraries
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 00000000000..9b7c39d53d0
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,73 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '22 11 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        config-file: ./.github/codeql/codeql-config.yml
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
diff --git a/modules/adgenerationBidAdapter.js b/modules/adgenerationBidAdapter.js
index 21395724609..0e4e9ef6805 100644
--- a/modules/adgenerationBidAdapter.js
+++ b/modules/adgenerationBidAdapter.js
@@ -1,4 +1,4 @@
-import {tryAppendQueryString, getBidIdParameter} from '../src/utils.js';
+import {tryAppendQueryString, getBidIdParameter, escapeUnsafeChars} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
@@ -230,7 +230,7 @@ function insertVASTMethodForAPV(targetId, vastXml) {
   };
   let script = document.createElement(`script`);
   script.type = 'text/javascript';
-  script.innerHTML = `(function(){ new APV.VideoAd(${JSON.stringify(apvVideoAdParam)}).load('${vastXml.replace(/\r?\n/g, '')}'); })();`;
+  script.innerHTML = `(function(){ new APV.VideoAd(${escapeUnsafeChars(JSON.stringify(apvVideoAdParam))}).load('${vastXml.replace(/\r?\n/g, '')}'); })();`;
   return script.outerHTML;
 }
 
diff --git a/modules/consentManagement.js b/modules/consentManagement.js
index f7ae575a7ae..44a0d7d65c6 100644
--- a/modules/consentManagement.js
+++ b/modules/consentManagement.js
@@ -145,7 +145,7 @@ function lookupIabConsent({onSuccess, onError}) {
       if (json[cmpDataPkgName] && json[cmpDataPkgName].callId) {
         const payload = json[cmpDataPkgName];
         // TODO - clean up this logic (move listeners?); we have duplicate messages responses because 2 eventlisteners are active from the 2 cmp requests running in parallel
-        if (typeof cmpCallbacks[payload.callId] !== 'undefined') {
+        if (cmpCallbacks.hasOwnProperty(payload.callId)) {
           cmpCallbacks[payload.callId](payload.returnValue, payload.success);
         }
       }
diff --git a/modules/consentManagementUsp.js b/modules/consentManagementUsp.js
index 2b18e59032c..3dcb236ac84 100644
--- a/modules/consentManagementUsp.js
+++ b/modules/consentManagementUsp.js
@@ -150,7 +150,7 @@ function lookupUspConsent({onSuccess, onError}) {
     function readPostMessageResponse(event) {
       const res = event && event.data && event.data.__uspapiReturn;
       if (res && res.callId) {
-        if (typeof uspapiCallbacks[res.callId] !== 'undefined') {
+        if (uspapiCallbacks.hasOwnProperty(res.callId)) {
           uspapiCallbacks[res.callId](res.returnValue, res.success);
           delete uspapiCallbacks[res.callId];
         }
diff --git a/modules/viewability.js b/modules/viewability.js
index 39b2ee3da16..3e77994c4de 100644
--- a/modules/viewability.js
+++ b/modules/viewability.js
@@ -13,7 +13,7 @@ export function init() {
   listenMessagesFromCreative();
 }
 
-const observers = {};
+const observers = new Map();
 
 function isValid(vid, element, tracker, criteria) {
   if (!element) {
@@ -36,7 +36,7 @@ function isValid(vid, element, tracker, criteria) {
     return false;
   }
 
-  if (!vid || observers[vid]) {
+  if (!vid || observers.has(vid)) {
     logWarn(`${MODULE_NAME}: must provide an unregistered vid`, vid);
     return false;
   }
@@ -46,7 +46,7 @@ function isValid(vid, element, tracker, criteria) {
 
 function stopObserving(observer, vid, element) {
   observer.unobserve(element);
-  observers[vid].done = true;
+  observers.get(vid).done = true;
 }
 
 function fireViewabilityTracker(element, tracker) {
@@ -96,21 +96,21 @@ export function startMeasurement(vid, element, tracker, criteria) {
     viewable = entries[0].isIntersecting;
 
     if (viewable) {
-      observers[vid].timeoutId = window.setTimeout(() => {
+      observers.get(vid).timeoutId = window.setTimeout(() => {
         viewabilityCriteriaMet(observer, vid, element, tracker);
       }, criteria.timeInView);
-    } else if (observers[vid].timeoutId) {
-      window.clearTimeout(observers[vid].timeoutId);
+    } else if (observers.get(vid).timeoutId) {
+      window.clearTimeout(observers.get(vid).timeoutId);
     }
   };
 
   observer = new IntersectionObserver(stateChange, options);
-  observers[vid] = {
+  observers.set(vid, {
     observer: observer,
     element: element,
     timeoutId: null,
     done: false,
-  };
+  });
 
   observer.observe(element);
 
@@ -122,19 +122,19 @@ export function startMeasurement(vid, element, tracker, criteria) {
  * @param {string} vid unique viewability identifier
  */
 export function stopMeasurement(vid) {
-  if (!vid || !observers[vid]) {
+  if (!vid || !observers.has(vid)) {
     logWarn(`${MODULE_NAME}: must provide a registered vid`, vid);
     return;
   }
 
-  observers[vid].observer.unobserve(observers[vid].element);
-  if (observers[vid].timeoutId) {
-    window.clearTimeout(observers[vid].timeoutId);
+  observers.get(vid).observer.unobserve(observers.get(vid).element);
+  if (observers.get(vid).timeoutId) {
+    window.clearTimeout(observers.get(vid).timeoutId);
   }
 
   // allow the observer under this vid to be created again
-  if (!observers[vid].done) {
-    delete observers[vid];
+  if (!observers.get(vid).done) {
+    observers.delete(vid);
   }
 }
 
diff --git a/src/utils.js b/src/utils.js
index 08f06324503..de805b965fd 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1381,3 +1381,30 @@ export function setScriptAttributes(script, attributes) {
     }
   }
 }
+
+/**
+ * Encode a string for inclusion in HTML.
+ * See https://pragmaticwebsecurity.com/articles/spasecurity/json-stringify-xss.html and
+ * https://codeql.github.com/codeql-query-help/javascript/js-bad-code-sanitization/
+ * @return {string}
+ */
+export const escapeUnsafeChars = (() => {
+  const escapes = {
+    '<': '\\u003C',
+    '>': '\\u003E',
+    '/': '\\u002F',
+    '\\': '\\\\',
+    '\b': '\\b',
+    '\f': '\\f',
+    '\n': '\\n',
+    '\r': '\\r',
+    '\t': '\\t',
+    '\0': '\\0',
+    '\u2028': '\\u2028',
+    '\u2029': '\\u2029'
+  };
+
+  return function(str) {
+    return str.replace(/[<>\b\f\n\r\t\0\u2028\u2029\\]/g, x => escapes[x])
+  }
+})();
diff --git a/test/pages/instream.html b/test/pages/instream.html
index 887b509813a..3b5bfb3d102 100644
--- a/test/pages/instream.html
+++ b/test/pages/instream.html
@@ -8,8 +8,8 @@
     <title>Prebid.js video adUnit example</title>
 
     <!-- videojs -->
-    <link rel="stylesheet" href="http://vjs.zencdn.net/5.9.2/video-js.css">
-    <script type="text/javascript" src="http://vjs.zencdn.net/5.9.2/video.js"></script>
+    <link rel="stylesheet" href="https://vjs.zencdn.net/5.9.2/video-js.css">
+    <script type="text/javascript" src="https://vjs.zencdn.net/5.9.2/video.js"></script>
 
     <!-- videojs-vast-vpaid -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/videojs-vast-vpaid/2.0.2/videojs.vast.vpaid.min.css" rel="stylesheet">

From 4f399351be2390b2072a9f6a774f3370d894a1d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Aug 2022 10:36:04 -0700
Subject: [PATCH 206/569] Bump trim-newlines from 1.0.0 to 3.0.1 (#8929)

Bumps [trim-newlines](https://github.com/sindresorhus/trim-newlines) from 1.0.0 to 3.0.1.
- [Release notes](https://github.com/sindresorhus/trim-newlines/releases)
- [Commits](https://github.com/sindresorhus/trim-newlines/commits)

---
updated-dependencies:
- dependency-name: trim-newlines
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 160f2fbfe5f..230eed26d8a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "7.10.0-pre",
+      "version": "7.13.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
@@ -11095,7 +11095,7 @@
     "node_modules/gulp-clean/node_modules/meow": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "integrity": "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
       "dev": true,
       "dependencies": {
         "camelcase-keys": "^2.0.0",
@@ -11315,7 +11315,7 @@
     "node_modules/gulp-clean/node_modules/trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -21930,6 +21930,20 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
+    "node_modules/typescript": {
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
+      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
     "node_modules/typescript-compare": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
@@ -32229,7 +32243,7 @@
         "meow": {
           "version": "3.7.0",
           "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-          "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+          "integrity": "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
           "dev": true,
           "requires": {
             "camelcase-keys": "^2.0.0",
@@ -32403,7 +32417,7 @@
         "trim-newlines": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-          "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+          "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
           "dev": true
         },
         "vinyl": {
@@ -40826,6 +40840,13 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
+    "typescript": {
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
+      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
+      "dev": true,
+      "peer": true
+    },
     "typescript-compare": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",

From 7bc2fd77569565ade5daf1c99cdcde94c4225ccd Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Wed, 31 Aug 2022 10:56:50 -0700
Subject: [PATCH 207/569] clear currency cache (#8930)

---
 modules/currency.js                |  1 +
 test/spec/modules/currency_spec.js | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/modules/currency.js b/modules/currency.js
index 392817b5822..5b0f9af7afc 100644
--- a/modules/currency.js
+++ b/modules/currency.js
@@ -146,6 +146,7 @@ function initCurrency(url) {
           try {
             currencyRates = JSON.parse(response);
             logInfo('currencyRates set to ' + JSON.stringify(currencyRates));
+            conversionCache = {};
             currencyRatesLoaded = true;
             processBidResponseQueue();
             ready.done();
diff --git a/test/spec/modules/currency_spec.js b/test/spec/modules/currency_spec.js
index 928c252943c..6eb4f929a42 100644
--- a/test/spec/modules/currency_spec.js
+++ b/test/spec/modules/currency_spec.js
@@ -169,6 +169,28 @@ describe('currency', function () {
       expect(getGlobal().convertCurrency(1.0, 'USD', 'EUR')).to.equal(4);
       expect(getGlobal().convertCurrency(1.0, 'USD', 'JPY')).to.equal(200);
     });
+    it('uses default rates until currency file is loaded', function () {
+      setConfig({
+        adServerCurrency: 'USD',
+        defaultRates: {
+          USD: {
+            JPY: 100
+          }
+        }
+      });
+
+      // Race condition where a bid is converted before the file has been loaded
+      expect(getGlobal().convertCurrency(1.0, 'USD', 'JPY')).to.equal(100);
+
+      fakeCurrencyFileServer.respondWith(JSON.stringify({
+        'dataAsOf': '2017-04-25',
+        'conversions': {
+          'USD': { JPY: 200 }
+        }
+      }));
+      fakeCurrencyFileServer.respond();
+      expect(getGlobal().convertCurrency(1.0, 'USD', 'JPY')).to.equal(200);
+    });
   });
   describe('bidder override', function () {
     it('allows setConfig to set bidder currency', function () {

From 4ddd9eb43ca30d15d67c821af5a5601055335a17 Mon Sep 17 00:00:00 2001
From: Samuel Adu <samuel.adu@gmail.com>
Date: Wed, 31 Aug 2022 21:28:16 +0100
Subject: [PATCH 208/569] Yahoossp bid adapter: Update outsream renderer CDN
 location (#8932)

Co-authored-by: slimkrazy <sam@slimkrazy.com>
---
 modules/yahoosspBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/yahoosspBidAdapter.js b/modules/yahoosspBidAdapter.js
index 38bb141070c..71b1ddca2c4 100644
--- a/modules/yahoosspBidAdapter.js
+++ b/modules/yahoosspBidAdapter.js
@@ -488,7 +488,7 @@ function generateServerRequest({payload, requestOptions, bidderRequest}) {
 
 function createRenderer(bidderRequest, bidResponse) {
   const renderer = Renderer.install({
-    url: 'https://cdn.vidible.tv/prod/hb-outstream-renderer/renderer.js',
+    url: 'https://s.yimg.com/kp/prebid-outstream-renderer/renderer.js',
     loaded: false,
     adUnitCode: bidderRequest.adUnitCode
   })

From 806c4d952bc1e3fbd50eb0c95215b98d5be2daff Mon Sep 17 00:00:00 2001
From: Michele Nasti <musikele@users.noreply.github.com>
Date: Wed, 31 Aug 2022 22:33:13 +0200
Subject: [PATCH 209/569] PBjs Core (Native): ortb tracker support (#8905)

* handle clicktrackers the ORTB way

* support for clicktrackers on assets

* parameters are now explicitly defined

Co-authored-by: Michele Nasti <michele@rtk.io>
---
 src/native.js            | 25 ++++++++++++++++++++++---
 test/spec/native_spec.js | 19 +++++++++++++++++--
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/native.js b/src/native.js
index 0e48470d300..2fdacfb4b08 100644
--- a/src/native.js
+++ b/src/native.js
@@ -272,7 +272,7 @@ export function fireNativeTrackers(message, bidResponse) {
   const nativeResponse = bidResponse.native.ortb || legacyPropertiesToOrtbNative(bidResponse.native);
 
   if (message.action === 'click') {
-    fireClickTrackers(nativeResponse);
+    fireClickTrackers(nativeResponse, message?.assetId);
   } else {
     fireImpressionTrackers(nativeResponse);
   }
@@ -305,8 +305,27 @@ export function fireImpressionTrackers(nativeResponse, {runMarkup = (mkup) => in
   }
 }
 
-export function fireClickTrackers(nativeResponse, {fetchURL = triggerPixel} = {}) {
-  (nativeResponse.link?.clicktrackers || []).forEach(url => fetchURL(url));
+export function fireClickTrackers(nativeResponse, assetId = null, {fetchURL = triggerPixel} = {}) {
+  // legacy click tracker
+  if (!assetId) {
+    (nativeResponse.link?.clicktrackers || []).forEach(url => fetchURL(url));
+  } else {
+    // ortb click tracker. This will try to call the clicktracker associated with the asset;
+    // will fallback to the link if none is found.
+    const assetIdLinkMap = (nativeResponse.assets || [])
+      .filter(a => a.link)
+      .reduce((map, asset) => {
+        map[asset.id] = asset.link;
+        return map
+      }, {});
+    const masterClickTrackers = nativeResponse.link?.clicktrackers || [];
+    let assetLink = assetIdLinkMap[assetId];
+    let clickTrackers = masterClickTrackers;
+    if (assetLink) {
+      clickTrackers = assetLink.clicktrackers || [];
+    }
+    clickTrackers.forEach(url => fetchURL(url));
+  }
 }
 
 /**
diff --git a/test/spec/native_spec.js b/test/spec/native_spec.js
index 08491edeb64..4809f3f8e48 100644
--- a/test/spec/native_spec.js
+++ b/test/spec/native_spec.js
@@ -1212,8 +1212,8 @@ describe('fireClickTrackers', () => {
     fetchURL = sinon.stub();
   });
 
-  function runTrackers(resp) {
-    fireClickTrackers(resp, {fetchURL});
+  function runTrackers(resp, assetId = null) {
+    fireClickTrackers(resp, assetId, {fetchURL});
   }
 
   it('should load each URL in link.clicktrackers', () => {
@@ -1225,6 +1225,21 @@ describe('fireClickTrackers', () => {
     });
     urls.forEach(url => sinon.assert.calledWith(fetchURL, url));
   })
+
+  it('should load each URL in asset.link.clicktrackers, when response is ORTB', () => {
+    const urls = ['asset_url1', 'asset_url2'];
+    runTrackers({
+      assets: [
+        {
+          id: 1,
+          link: {
+            clicktrackers: urls
+          }
+        }
+      ],
+    }, 1);
+    urls.forEach(url => sinon.assert.calledWith(fetchURL, url));
+  })
 })
 
 describe('toOrtbNativeResponse', () => {

From 24637bc5a9f0fc3d44ef7ed6626d927617b58e3a Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Wed, 31 Aug 2022 16:34:17 -0400
Subject: [PATCH 210/569] appnexus bid adapter - update logic of native
 viewability script (#8890)

---
 modules/appnexusBidAdapter.js                 | 106 +++---------------
 test/spec/modules/appnexusBidAdapter_spec.js  |   1 +
 .../modules/big-richmediaBidAdapter_spec.js   |   1 +
 3 files changed, 15 insertions(+), 93 deletions(-)

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index cf73b69991f..948e1c31b17 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -10,6 +10,7 @@ import {
   getMaxValueFromArray,
   getMinValueFromArray,
   getParameterByName,
+  getUniqueIdentifierStr,
   isArray,
   isArrayOfNums,
   isEmpty,
@@ -444,16 +445,6 @@ export const spec = {
     }
 
     return params;
-  },
-
-  /**
-   * Add element selector to javascript tracker to improve native viewability
-   * @param {Bid} bid
-   */
-  onBidWon: function (bid) {
-    if (FEATURES.NATIVE && bid.native) {
-      reloadViewabilityScriptWithCorrectParameters(bid);
-    }
   }
 };
 
@@ -467,58 +458,9 @@ function deleteValues(keyPairObj) {
   }
 }
 
-function reloadViewabilityScriptWithCorrectParameters(bid) {
-  let viewJsPayload = getAppnexusViewabilityScriptFromJsTrackers(bid.native.javascriptTrackers);
-
-  if (viewJsPayload) {
-    let prebidParams = 'pbjs_adid=' + bid.adId + ';pbjs_auc=' + bid.adUnitCode;
-
-    let jsTrackerSrc = getViewabilityScriptUrlFromPayload(viewJsPayload);
-
-    let newJsTrackerSrc = jsTrackerSrc.replace('dom_id=%native_dom_id%', prebidParams);
-
-    // find iframe containing script tag
-    let frameArray = document.getElementsByTagName('iframe');
-
-    // boolean var to modify only one script. That way if there are muliple scripts,
-    // they won't all point to the same creative.
-    let modifiedAScript = false;
-
-    // first, loop on all ifames
-    for (let i = 0; i < frameArray.length && !modifiedAScript; i++) {
-      let currentFrame = frameArray[i];
-      try {
-        // IE-compatible, see https://stackoverflow.com/a/3999191/2112089
-        let nestedDoc = currentFrame.contentDocument || currentFrame.contentWindow.document;
-
-        if (nestedDoc) {
-          // if the doc is present, we look for our jstracker
-          let scriptArray = nestedDoc.getElementsByTagName('script');
-          for (let j = 0; j < scriptArray.length && !modifiedAScript; j++) {
-            let currentScript = scriptArray[j];
-            if (currentScript.getAttribute('data-src') == jsTrackerSrc) {
-              currentScript.setAttribute('src', newJsTrackerSrc);
-              currentScript.setAttribute('data-src', '');
-              if (currentScript.removeAttribute) {
-                currentScript.removeAttribute('data-src');
-              }
-              modifiedAScript = true;
-            }
-          }
-        }
-      } catch (exception) {
-        // trying to access a cross-domain iframe raises a SecurityError
-        // this is expected and ignored
-        if (!(exception instanceof DOMException && exception.name === 'SecurityError')) {
-          // all other cases are raised again to be treated by the calling function
-          throw exception;
-        }
-      }
-    }
-  }
-}
-
 function strIsAppnexusViewabilityScript(str) {
+  if (!str || str === '') return false;
+
   let regexMatchUrlStart = str.match(VIEWABILITY_URL_START);
   let viewUrlStartInStr = regexMatchUrlStart != null && regexMatchUrlStart.length >= 1;
 
@@ -528,30 +470,6 @@ function strIsAppnexusViewabilityScript(str) {
   return str.startsWith(SCRIPT_TAG_START) && fileNameInStr && viewUrlStartInStr;
 }
 
-function getAppnexusViewabilityScriptFromJsTrackers(jsTrackerArray) {
-  let viewJsPayload;
-  if (isStr(jsTrackerArray) && strIsAppnexusViewabilityScript(jsTrackerArray)) {
-    viewJsPayload = jsTrackerArray;
-  } else if (isArray(jsTrackerArray)) {
-    for (let i = 0; i < jsTrackerArray.length; i++) {
-      let currentJsTracker = jsTrackerArray[i];
-      if (strIsAppnexusViewabilityScript(currentJsTracker)) {
-        viewJsPayload = currentJsTracker;
-      }
-    }
-  }
-  return viewJsPayload;
-}
-
-function getViewabilityScriptUrlFromPayload(viewJsPayload) {
-  // extracting the content of the src attribute
-  // -> substring between src=" and "
-  let indexOfFirstQuote = viewJsPayload.indexOf('src="') + 5; // offset of 5: the length of 'src=' + 1
-  let indexOfSecondQuote = viewJsPayload.indexOf('"', indexOfFirstQuote);
-  let jsTrackerSrc = viewJsPayload.substring(indexOfFirstQuote, indexOfSecondQuote);
-  return jsTrackerSrc;
-}
-
 function formatRequest(payload, bidderRequest) {
   let request = [];
   let options = {
@@ -633,7 +551,9 @@ function newRenderer(adUnitCode, rtbBid, rendererOptions = {}) {
  */
 function newBid(serverBid, rtbBid, bidderRequest) {
   const bidRequest = getBidRequest(serverBid.uuid, [bidderRequest]);
+  const adId = getUniqueIdentifierStr();
   const bid = {
+    adId: adId,
     requestId: serverBid.uuid,
     cpm: rtbBid.cpm,
     creativeId: rtbBid.creative_id,
@@ -721,20 +641,20 @@ function newBid(serverBid, rtbBid, bidderRequest) {
     }
   } else if (FEATURES.NATIVE && rtbBid.rtb[NATIVE]) {
     const nativeAd = rtbBid.rtb[NATIVE];
+    let viewScript;
 
-    // setting up the jsTracker:
-    // we put it as a data-src attribute so that the tracker isn't called
-    // until we have the adId (see onBidWon)
-    let jsTrackerDisarmed = rtbBid.viewability.config.replace('src=', 'data-src=');
+    if (strIsAppnexusViewabilityScript(rtbBid.viewability.config)) {
+      let prebidParams = 'pbjs_adid=' + adId + ';pbjs_auc=' + bidRequest.adUnitCode;
+      viewScript = rtbBid.viewability.config.replace('dom_id=%native_dom_id%', prebidParams);
+    }
 
     let jsTrackers = nativeAd.javascript_trackers;
-
     if (jsTrackers == undefined) {
-      jsTrackers = jsTrackerDisarmed;
+      jsTrackers = viewScript;
     } else if (isStr(jsTrackers)) {
-      jsTrackers = [jsTrackers, jsTrackerDisarmed];
+      jsTrackers = [jsTrackers, viewScript];
     } else {
-      jsTrackers.push(jsTrackerDisarmed);
+      jsTrackers.push(viewScript);
     }
 
     bid[NATIVE] = {
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 5ec481e140c..6f00d851a94 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -1195,6 +1195,7 @@ describe('AppNexusAdapter', function () {
     it('should get correct bid response', function () {
       let expectedResponse = [
         {
+          'adId': '3a1f23123e',
           'requestId': '3db3773286ee59',
           'cpm': 0.5,
           'creativeId': 29681110,
diff --git a/test/spec/modules/big-richmediaBidAdapter_spec.js b/test/spec/modules/big-richmediaBidAdapter_spec.js
index 1e97e1ac1d7..b2ee0725d49 100644
--- a/test/spec/modules/big-richmediaBidAdapter_spec.js
+++ b/test/spec/modules/big-richmediaBidAdapter_spec.js
@@ -190,6 +190,7 @@ describe('bigRichMediaAdapterTests', function () {
     it('should get correct bid response', function () {
       const expectedResponse = [
         {
+          'adId': '3a1f23123e',
           'requestId': '3db3773286ee59',
           'cpm': 0.5,
           'creativeId': 29681110,

From 2b1c60ec047e3a01333b940d0487ceef55caba0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Baudisch?= <rene.baudisch@axelspringer.de>
Date: Wed, 31 Aug 2022 22:35:06 +0200
Subject: [PATCH 211/569] allow video cacheKey for outstream (#8833)

---
 src/auction.js | 3 ++-
 src/video.js   | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/auction.js b/src/auction.js
index da805ae41dd..4d6462f2b6b 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -498,8 +498,9 @@ function tryAddVideoBid(auctionInstance, bidResponse, afterBidAdded, {index = au
       transactionId: bidResponse.transactionId
     }), 'video');
   const context = videoMediaType && deepAccess(videoMediaType, 'context');
+  const useCacheKey = videoMediaType && deepAccess(videoMediaType, 'useCacheKey');
 
-  if (config.getConfig('cache.url') && context !== OUTSTREAM) {
+  if (config.getConfig('cache.url') && (useCacheKey || context !== OUTSTREAM)) {
     if (!bidResponse.videoCacheKey || config.getConfig('cache.ignoreBidderCacheKey')) {
       addBid = false;
       callPrebidCache(auctionInstance, bidResponse, afterBidAdded, videoMediaType);
diff --git a/src/video.js b/src/video.js
index 977991b7134..7930e318874 100644
--- a/src/video.js
+++ b/src/video.js
@@ -35,15 +35,16 @@ export const hasNonVideoBidder = adUnit =>
 export function isValidVideoBid(bid, {index = auctionManager.index} = {}) {
   const videoMediaType = deepAccess(index.getMediaTypes(bid), 'video');
   const context = videoMediaType && deepAccess(videoMediaType, 'context');
+  const useCacheKey = videoMediaType && deepAccess(videoMediaType, 'useCacheKey');
   const adUnit = index.getAdUnit(bid);
 
   // if context not defined assume default 'instream' for video bids
   // instream bids require a vast url or vast xml content
-  return checkVideoBidSetup(bid, adUnit, videoMediaType, context);
+  return checkVideoBidSetup(bid, adUnit, videoMediaType, context, useCacheKey);
 }
 
-export const checkVideoBidSetup = hook('sync', function(bid, adUnit, videoMediaType, context) {
-  if (videoMediaType && context !== OUTSTREAM) {
+export const checkVideoBidSetup = hook('sync', function(bid, adUnit, videoMediaType, context, useCacheKey) {
+  if (videoMediaType && (useCacheKey || context !== OUTSTREAM)) {
     // xml-only video bids require a prebid cache url
     if (!config.getConfig('cache.url') && bid.vastXml && !bid.vastUrl) {
       logError(`
@@ -57,7 +58,7 @@ export const checkVideoBidSetup = hook('sync', function(bid, adUnit, videoMediaT
   }
 
   // outstream bids require a renderer on the bid or pub-defined on adunit
-  if (context === OUTSTREAM) {
+  if (context === OUTSTREAM && !useCacheKey) {
     return !!(bid.renderer || (adUnit && adUnit.renderer) || videoMediaType.renderer);
   }
 

From 25434671d6fc5dd8f8caaf44cdd591a4d49d0c5e Mon Sep 17 00:00:00 2001
From: Romain Lofaso <1193072+RomainLofaso@users.noreply.github.com>
Date: Wed, 31 Aug 2022 22:39:02 +0200
Subject: [PATCH 212/569] OneKey Id Submodule: initial release (#8685)

* Create Id Submodule for OneKey

* Fix the 'decode' of OneKey Id

* Refine the documentation of the OneKey Id Sub-Module

* Update locations of the OneKey repositories in the Id sub-module doc
---
 modules/.submodules.json                 |   1 +
 modules/oneKeyIdSystem.js                |  78 ++++++++++++++++
 modules/oneKeyIdSystem.md                | 109 +++++++++++++++++++++++
 modules/userId/eids.js                   |  26 ++++++
 test/spec/modules/oneKeyIdSystem_spec.js | 107 ++++++++++++++++++++++
 5 files changed, 321 insertions(+)
 create mode 100644 modules/oneKeyIdSystem.js
 create mode 100644 modules/oneKeyIdSystem.md
 create mode 100644 test/spec/modules/oneKeyIdSystem_spec.js

diff --git a/modules/.submodules.json b/modules/.submodules.json
index 72eadf15d31..727d8784b89 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -29,6 +29,7 @@
       "naveggIdSystem",
       "netIdSystem",
       "novatiqIdSystem",
+      "oneKeyIdSystem",
       "parrableIdSystem",
       "pubProvidedIdSystem",
       "publinkIdSystem",
diff --git a/modules/oneKeyIdSystem.js b/modules/oneKeyIdSystem.js
new file mode 100644
index 00000000000..8d8d594b533
--- /dev/null
+++ b/modules/oneKeyIdSystem.js
@@ -0,0 +1,78 @@
+/**
+ * This module adds Onekey data to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/oneKeyIdSystem
+ * @requires module:modules/userId
+ */
+
+import {submodule} from '../src/hook.js';
+import { logError, logMessage } from '../src/utils.js';
+
+// Pre-init OneKey if it has not load yet.
+window.OneKey = window.OneKey || {};
+window.OneKey.queue = window.OneKey.queue || [];
+
+const logPrefix = 'OneKey.Id-Module';
+
+/**
+ * Generate callback that deserializes the result of getIdsAndPreferences.
+ */
+const onIdsAndPreferencesResult = (callback) => {
+  return (result) => {
+    logMessage(logPrefix, `Has got Ids and Prefs with status: `, result);
+    callback(result.data);
+  };
+};
+
+/**
+ * Call OneKey once it is loaded for retrieving
+ * the ids and the preferences.
+ */
+const getIdsAndPreferences = (callback) => {
+  logMessage(logPrefix, 'Queue getIdsAndPreferences call');
+  // Call OneKey in a queue so that we are sure
+  // it will be called when fully load and configured
+  // within the page.
+  window.OneKey.queue.push(() => {
+    logMessage(logPrefix, 'Get Ids and Prefs');
+    window.OneKey.getIdsAndPreferences()
+      .then(onIdsAndPreferencesResult(callback))
+      .catch(() => {
+        logError(logPrefix, 'Cannot retrieve the ids and preferences from OneKey.');
+        callback(undefined);
+      });
+  });
+};
+
+/** @type {Submodule} */
+export const oneKeyIdSubmodule = {
+  /**
+    * used to link submodule with config
+    * @type {string}
+    */
+  name: 'oneKeyData',
+  /**
+    * decode the stored data value for passing to bid requests
+    * @function decode
+    * @param {(Object|string)} value
+    * @returns {(Object|undefined)}
+    */
+  decode(data) {
+    return { oneKeyData: data };
+  },
+  /**
+    * performs action to obtain id and return a value in the callback's response argument
+    * @function
+    * @param {SubmoduleConfig} [config]
+    * @param {ConsentData} [consentData]
+    * @param {(Object|undefined)} cacheIdObj
+    * @returns {IdResponse|undefined}
+    */
+  getId(config) {
+    return {
+      callback: getIdsAndPreferences
+    };
+  }
+};
+
+submodule('userId', oneKeyIdSubmodule);
diff --git a/modules/oneKeyIdSystem.md b/modules/oneKeyIdSystem.md
new file mode 100644
index 00000000000..36caf382065
--- /dev/null
+++ b/modules/oneKeyIdSystem.md
@@ -0,0 +1,109 @@
+# OneKey
+
+The OneKey real-time data module in Prebid has been built so that publishers
+can quickly and easily setup the OneKey Addressability Framework.
+This module is used along with the oneKeyRtdProvider to pass OneKey data to your partners.
+Both modules are required. This module will pass oneKeyData to your partners
+while the oneKeyRtdProvider will pass the transmission requests.
+
+Background information:
+- [OneKey-Network/addressability-framework](https://github.com/OneKey-Network/addressability-framework)
+- [OneKey-Network/OneKey-implementation](https://github.com/OneKey-Network/OneKey-implementation)
+
+It can be added to you Prebid.js package with:
+
+{: .alert.alert-info :}
+gulp build –modules=userId,oneKeyIdSystem
+
+⚠️ This module works in association with a RTD module. See [oneKeyRtdProvider](oneKeyRtdProvider.md).
+
+#### OneKey Registration
+
+OneKey is a community based Framework with a decentralized approach.
+Go to [onekey.community](https://onekey.community/) for more details.
+
+#### OneKey Configuration
+
+{: .table .table-bordered .table-striped }
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of this module | `"oneKeyData"` |
+
+
+#### OneKey Exemple
+
+```javascript
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'oneKeyData'
+        }]
+    }
+});
+```
+
+Bidders will receive the data in the following format:
+
+```json
+{
+    "identifiers": [{
+        "version": "0.1",
+        "type": "paf_browser_id",
+        "value": "da135b3a-7d04-44bf-a0af-c4709f10420b",
+        "source": {
+            "domain": "crto-poc-1.onekey.network",
+            "timestamp": 1648836556881,
+            "signature": "+NF27bBvPM54z103YPExXuS834+ggAQe6JV0jPeGo764vRYiiBl5OmEXlnB7UZgxNe3KBU7rN2jk0SkI4uL0bg=="
+        }
+    }],
+    "preferences": {
+        "version": "0.1",
+        "data": {
+            "use_browsing_for_personalization": true
+        },
+        "source": {
+            "domain": "cmp.pafdemopublisher.com",
+            "timestamp": 1648836566468,
+            "signature": "ipbYhU8IbSFm2tCqAVYI2d5w4DnGF7Xa2AaiZScx2nmBPLfMmIT/FkBYGitR8Mi791DHtcy5MXr4+bs1aeZFqw=="
+        }
+    }
+}
+```
+
+If the bidder elects to use pbjs.getUserIdsAsEids() then the format will be:
+
+```json
+"user": {
+    "ext": {
+        "eids": [{
+            "source": "paf",
+            "uids": [{
+                "id": "da135b3a-7d04-44bf-a0af-c4709f10420b",
+                "atype": 1,
+                "ext": {
+                    "version": "0.1",
+                    "type": "paf_browser_id",
+                    "source": {
+                        "domain": "crto-poc-1.onekey.network",
+                        "timestamp": 1648836556881,
+                        "signature": "+NF27bBvPM54z103YPExXuS834+ggAQe6JV0jPeGo764vRYiiBl5OmEXlnB7UZgxNe3KBU7rN2jk0SkI4uL0bg=="
+                    }
+                }
+            }],
+            "ext": {
+                "preferences": {
+                    "version": "0.1",
+                    "data": {
+                        "use_browsing_for_personalization": true
+                    },
+                    "source": {
+                        "domain": "cmp.pafdemopublisher.com",
+                        "timestamp": 1648836566468,
+                        "signature": "ipbYhU8IbSFm2tCqAVYI2d5w4DnGF7Xa2AaiZScx2nmBPLfMmIT/FkBYGitR8Mi791DHtcy5MXr4+bs1aeZFqw=="
+                    }
+                }
+            }
+        }]
+    }
+}
+```
\ No newline at end of file
diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index e0f100ee660..689916f6a3e 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -330,6 +330,32 @@ export const USER_IDS_CONFIG = {
   'cpexId': {
     source: 'czechadid.cz',
     atype: 1
+  },
+
+  // OneKey Data
+  'oneKeyData': {
+    getValue: function(data) {
+      if (data && Array.isArray(data.identifiers) && data.identifiers[0]) {
+        return data.identifiers[0].value;
+      }
+    },
+    source: 'paf',
+    atype: 1,
+    getEidExt: function(data) {
+      if (data && data.preferences) {
+        return {preferences: data.preferences};
+      }
+    },
+    getUidExt: function(data) {
+      if (data && Array.isArray(data.identifiers) && data.identifiers[0]) {
+        const id = data.identifiers[0];
+        return {
+          version: id.version,
+          type: id.type,
+          source: id.source
+        };
+      }
+    }
   }
 };
 
diff --git a/test/spec/modules/oneKeyIdSystem_spec.js b/test/spec/modules/oneKeyIdSystem_spec.js
new file mode 100644
index 00000000000..9172a61df79
--- /dev/null
+++ b/test/spec/modules/oneKeyIdSystem_spec.js
@@ -0,0 +1,107 @@
+import { oneKeyIdSubmodule } from 'modules/oneKeyIdSystem'
+
+const defaultConf = {
+  params: {
+    proxyHostName: 'proxy.com'
+  }
+};
+
+const defaultIdsAndPreferences = {
+  identifiers: [
+    {
+      version: '0.1',
+      type: 'paf_browser_id',
+      value: 'df0a5664-987d-4074-bbd9-e9b12ebae6ef',
+      source: {
+        domain: 'crto-poc-1.onekey.network',
+        timestamp: 1657100291,
+        signature: 'ikjV6WwpcroNB5XyLOr3MgYHLpS6UjICEOuv/jEr00uVrjZm0zluDSWh11OeGDZrMhxMBPeTabtQ4U2rNk3IzQ=='
+      }
+    }
+  ],
+  preferences: {
+    version: '0.1',
+    data: {
+      use_browsing_for_personalization: true
+    },
+    source: {
+      domain: 'cmp.pafdemopublisher.com',
+      timestamp: 1657100294,
+      signature: 'aAbMThxyeKpe/EgT5ARI1xecjCwwh0uRagsTuPXNY2fzh7foeW31qljDZf6h8UwOd9M2bAN7XNtM2LYBbJzskQ=='
+    }
+  }
+};
+
+const defaultIdsAndPreferencesResult = {
+  status: 'PARTICIPATING',
+  data: defaultIdsAndPreferences
+};
+
+describe('oneKeyData module', () => {
+  describe('getId function', () => {
+    beforeEach(() => {
+      setUpOneKey();
+    });
+
+    it('return a callback for handling asynchron results', () => {
+      const moduleIdResponse = oneKeyIdSubmodule.getId(defaultConf);
+
+      expect(moduleIdResponse.callback).to.be.an('function');
+    });
+
+    it(`return a callback that waits for OneKey to be loaded`, () => {
+      const moduleIdResponse = oneKeyIdSubmodule.getId(defaultConf);
+
+      moduleIdResponse.callback(function() {})
+
+      expect(window.OneKey.queue.length).to.equal(1);
+    });
+
+    it('return a callback that gets ids and prefs', () => {
+      const moduleIdResponse = oneKeyIdSubmodule.getId(defaultConf);
+
+      // Act
+      return new Promise((resolve) => {
+        moduleIdResponse.callback(resolve);
+        executeOneKeyQueue();
+      })
+
+      // Assert
+        .then((idsAndPrefs) => {
+          expect(idsAndPrefs).to.equal(defaultIdsAndPreferences);
+        });
+    });
+
+    it('return a callback with undefined if impossible to get ids and prefs', () => {
+      window.OneKey.getIdsAndPreferences = () => {
+        return Promise.reject(new Error(`Impossible to get ids and prefs`));
+      };
+      const moduleIdResponse = oneKeyIdSubmodule.getId(defaultConf);
+
+      // Act
+      return new Promise((resolve) => {
+        moduleIdResponse.callback(resolve);
+        executeOneKeyQueue();
+      })
+
+      // Assert
+        .then((idsAndPrefs) => {
+          expect(idsAndPrefs).to.be.undefined;
+        });
+    });
+  });
+});
+
+const setUpOneKey = () => {
+  window.OneKey.queue = [];
+  window.OneKey.getIdsAndPreferences = () => {
+    return Promise.resolve(defaultIdsAndPreferencesResult);
+  };
+}
+
+const executeOneKeyQueue = () => {
+  while (window.OneKey.queue.length > 0) {
+    window.OneKey.queue[0]();
+    window.OneKey.queue.shift();
+  }
+}

From 0827e2b72a9daa5855bf1d53f382772a6ac597a7 Mon Sep 17 00:00:00 2001
From: Romain Lofaso <1193072+RomainLofaso@users.noreply.github.com>
Date: Wed, 31 Aug 2022 22:40:21 +0200
Subject: [PATCH 213/569] OneKey RTD Module: initial release (#8686)

* Create RTD module for OneKey

* Refine the documentation of the OneKey RTD Module

* Update locations of the OneKey repositories in the RTD Provider doc
---
 modules/.submodules.json                    |   1 +
 modules/oneKeyRtdProvider.js                |  98 +++++++++++++
 modules/oneKeyRtdProvider.md                | 127 ++++++++++++++++
 test/spec/modules/oneKeyRtdProvider_spec.js | 152 ++++++++++++++++++++
 4 files changed, 378 insertions(+)
 create mode 100644 modules/oneKeyRtdProvider.js
 create mode 100644 modules/oneKeyRtdProvider.md
 create mode 100644 test/spec/modules/oneKeyRtdProvider_spec.js

diff --git a/modules/.submodules.json b/modules/.submodules.json
index 727d8784b89..d3665dd38f4 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -62,6 +62,7 @@
       "iasRtdProvider",
       "jwplayerRtdProvider",
       "medianetRtdProvider",
+      "oneKeyRtdProvider",
       "optimeraRtdProvider",
       "permutiveRtdProvider",
       "reconciliationRtdProvider",
diff --git a/modules/oneKeyRtdProvider.js b/modules/oneKeyRtdProvider.js
new file mode 100644
index 00000000000..27511017676
--- /dev/null
+++ b/modules/oneKeyRtdProvider.js
@@ -0,0 +1,98 @@
+
+import { submodule } from '../src/hook.js';
+import { mergeDeep, logError, logMessage, deepSetValue, generateUUID } from '../src/utils.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+
+const SUBMODULE_NAME = 'oneKey';
+const prefixLog = 'OneKey.RTD-module'
+
+// Pre-init OneKey if it has not load yet.
+window.OneKey = window.OneKey || {};
+window.OneKey.queue = window.OneKey.queue || [];
+
+/**
+ * Generate the OneKey transmission and include it in the Bid Request.
+ *
+ * Modify the AdUnit object for each auction.
+ * It’s called as part of the requestBids hook.
+ * https://docs.prebid.org/dev-docs/add-rtd-submodule.html#getbidrequestdata
+ *
+ * @param {Object} reqBidsConfigObj
+ * @param {function} callback
+ * @param {Object} rtdConfig
+ * @param {Object} userConsent
+ */
+const getTransmissionInBidRequest = (reqBidsConfigObj, done, rtdConfig) => {
+  const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
+  const transactionIds = adUnits.map(() => generateUUID());
+
+  logMessage(prefixLog, 'Queue seed generation.');
+  window.OneKey.queue.push(() => {
+    logMessage(prefixLog, 'Generate a seed.');
+    window.OneKey.generateSeed(transactionIds)
+      .then(onGetSeed(reqBidsConfigObj, rtdConfig, adUnits, transactionIds))
+      .catch((err) => { logError(SUBMODULE_NAME, err.message); })
+      .finally(done);
+  });
+}
+
+const onGetSeed = (reqBidsConfigObj, rtdConfig, adUnits, transactionIds) => {
+  return (seed) => {
+    if (!seed) {
+      logMessage(prefixLog, 'No seed generated.');
+      return;
+    }
+
+    logMessage(prefixLog, 'Has retrieved a seed:', seed);
+    addTransactionIdsToAdUnits(adUnits, transactionIds);
+    addTransmissionToOrtb2(reqBidsConfigObj, rtdConfig, seed);
+  };
+};
+
+const addTransactionIdsToAdUnits = (adUnits, transactionIds) => {
+  adUnits.forEach((unit, index) => {
+    deepSetValue(unit, `ortb2Imp.ext.data.paf.transaction_id`, transactionIds[index]);
+  });
+};
+
+const addTransmissionToOrtb2 = (reqBidsConfigObj, rtdConfig, seed) => {
+  const okOrtb2 = {
+    ortb2: {
+      user: {
+        ext: {
+          paf: {
+            transmission: {
+              seed
+            }
+          }
+        }
+      }
+    }
+  }
+
+  const shareSeedWithAllBidders = !rtdConfig.params || !rtdConfig.params.bidders;
+  if (shareSeedWithAllBidders) {
+    // Change global first party data with OneKey
+    logMessage(prefixLog, 'set ortb2:', okOrtb2);
+    mergeDeep(reqBidsConfigObj.ortb2Fragments.global, okOrtb2.ortb2);
+  } else {
+    // Change bidder-specific first party data with OneKey
+    logMessage(prefixLog, `set ortb2 for: ${rtdConfig.params.bidders.join(',')}`, okOrtb2);
+    rtdConfig.params.bidders.forEach(bidder => {
+      mergeDeep(reqBidsConfigObj.ortb2Fragments.bidder, { [bidder]: okOrtb2.ortb2 });
+    });
+  }
+};
+
+/** @type {RtdSubmodule} */
+export const oneKeyDataSubmodule = {
+  /**
+   * used to link submodule with realTimeData
+   * @type {string}
+   */
+  name: SUBMODULE_NAME,
+  init: () => true,
+  getBidRequestData: getTransmissionInBidRequest,
+};
+
+submodule('realTimeData', oneKeyDataSubmodule);
diff --git a/modules/oneKeyRtdProvider.md b/modules/oneKeyRtdProvider.md
new file mode 100644
index 00000000000..075e91cafda
--- /dev/null
+++ b/modules/oneKeyRtdProvider.md
@@ -0,0 +1,127 @@
+## OneKey Real-time Data Submodule
+
+The OneKey real-time data module in Prebid has been built so that publishers
+can quickly and easily setup the OneKey Addressability Framework.
+This module is used along with the oneKeyIdSystem to pass OneKey data to your partners.
+Both modules are required. This module will pass transmission requests to your partners
+while the oneKeyIdSystem will pass the oneKeyData.
+
+Background information:
+- [OneKey-Network/addressability-framework](https://github.com/OneKey-Network/addressability-framework)
+- [OneKey-Network/OneKey-implementation](https://github.com/OneKey-Network/OneKey-implementation)
+
+## Implementation for Publishers
+
+### Integration
+
+1) Compile the OneKey RTD Provider and the OneKey UserID sub-module into your Prebid build. 
+
+```
+gulp build --modules=rtdModule,oneKeyRtdProvider
+```
+
+2) Publishers must register OneKey RTD Provider as a Real Time Data provider by using `setConfig`
+to load a Prebid Config containing a `realTimeData.dataProviders` array:
+
+```javascript
+pbjs.setConfig({
+    ...,
+    realTimeData: {
+      auctionDelay: 100,
+      dataProviders: [
+            {
+              name: 'oneKey',
+              waitForIt: true
+            }
+        ]
+    }
+});
+``` 
+
+3) Configure the OneKey RTD Provider with the bidders that are part of the OneKey community. If there is no bidders specified, the RTD provider
+will share OneKey data with all adapters.
+
+⚠️ This module works in association with a RTD module. See [oneKeyIdSystem](oneKeyIdSystem.md).
+
+### Parameters
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| name | String | Real time data module name | Always 'oneKey' |
+| waitForIt | Boolean | Required to ensure that the auction is delayed until prefetch is complete | Optional. Defaults to false |
+| params | Object | | Optional |
+| params.bidders | Array | List of bidders to restrict the data to. | Optional |
+
+## Implementation for Bidders
+
+### Bidder Requests
+
+The data will provided to the bidders using the `ortb2` object.
+The following is an example of the format of the data:
+
+```json
+"user": {
+    "ext": {
+        "paf": {
+            "transmission": {
+                "seed": {
+                    "version": "0.1",
+                    "transaction_ids": ["06df6992-691c-4342-bbb0-66d2a005d5b1", "d2cd0aa7-8810-478c-bd15-fb5bfa8138b8"],
+                    "publisher": "cmp.pafdemopublisher.com",
+                    "source": {
+                        "domain": "cmp.pafdemopublisher.com",
+                        "timestamp": 1649712888,
+                        "signature": "turzZlXh9IqD5Rjwh4vWR78pKLrVsmwQrGr6fgw8TPgQVJSC8K3HvkypTV7lm3UaCi+Zzjl+9sd7Hrv87gdI8w=="
+                    }
+                }
+            }
+        }
+    }
+}
+```
+
+```json
+"ortb2Imp": {
+    "ext": {
+        "data": {
+            "paf": {
+                "transaction_id": "52d23fed-4f50-4c17-b07a-c458143e9d09"
+            }
+        }
+    }
+}
+```
+
+### Bidder Responses
+
+Bidders who are part of the OneKey Addressability Framework and receive OneKey
+transmissions are required to return transmission responses as outlined in
+[OneKey-Network/addressability-framework]https://github.com/OneKey-Network/addressability-framework/blob/main/mvp-spec/ad-auction.md). Transmission responses should be appended to bids
+along with the releveant content_id using the meta.paf field. The paf-lib will
+be responsible for collecting all of the transmission responses.
+
+Below is an example of setting a transmission response:
+
+```javascript
+bid.meta.paf = {
+    content_id: "90141190-26fe-497c-acee-4d2b649c2112",
+    transmission: {
+        version: "0.1",
+        contents: [
+            {
+                transaction_id: "f55a401d-e8bb-4de1-a3d2-fa95619393e8",
+                content_id: "90141190-26fe-497c-acee-4d2b649c2112"
+            }
+        ],
+        status: "success",
+        details: "",
+        receiver: "dsp1.com",
+        source: {
+            domain: "dsp1.com",
+            timestamp: 1639589531,
+            signature: "d01c6e83f14b4f057c2a2a86d320e2454fc0c60df4645518d993b5f40019d24c"
+        },
+        children: []
+    }
+}
+```
diff --git a/test/spec/modules/oneKeyRtdProvider_spec.js b/test/spec/modules/oneKeyRtdProvider_spec.js
new file mode 100644
index 00000000000..70023e35196
--- /dev/null
+++ b/test/spec/modules/oneKeyRtdProvider_spec.js
@@ -0,0 +1,152 @@
+import {oneKeyDataSubmodule} from 'modules/oneKeyRtdProvider.js';
+import {getAdUnits} from '../../fixtures/fixtures.js';
+
+const defaultSeed = {
+  version: '0.1',
+  transaction_ids: [
+    'd566b02a-a6e2-4c87-98dc-f5623cd9e828',
+    'f7ffe3cc-0d58-4ec4-b687-1d3d410a48fe'
+  ],
+  publisher: 'cmp.pafdemopublisher.com',
+  source: {
+    domain: 'cmp.pafdemopublisher.com',
+    timestamp: 1657116880,
+    signature: '6OmdrSGwagPpugGFuQ4VGjzqYadHxWIXPaLItk0vA1lmi/EQyRvNF5seXStfwKWRnC7HZlOIGSjA6g7HAuofWw=='
+
+  }
+};
+
+const defaultOrb2WithTransmission = {
+  user: {
+    ext: {
+      paf: {
+        transmission: {
+          seed: defaultSeed
+        }
+      }
+    }
+  }
+};
+
+const defaultRtdConfig = {
+  params: {
+    proxyHostName: 'host'
+  }
+};
+
+describe('oneKeyDataSubmodule', () => {
+  var bidsConfig;
+  beforeEach(() => {
+    // Fresh bidsConfig because it can be altered
+    // during the tests.
+    bidsConfig = getReqBidsConfig();
+    setUpOneKey();
+  });
+
+  it('successfully instantiates', () => {
+    expect(oneKeyDataSubmodule.init()).to.equal(true);
+  });
+
+  it('call OneKey API once it is loaded', () => {
+    const done = sinon.spy();
+
+    oneKeyDataSubmodule.getBidRequestData(bidsConfig, done, defaultRtdConfig);
+
+    expect(bidsConfig).to.eql(getReqBidsConfig());
+    expect(done.callCount).to.equal(0);
+    expect(window.OneKey.queue.length).to.equal(1);
+  });
+
+  it('don\'t change anything without a seed', () => {
+    window.OneKey.generateSeed = (_transactionIds) => {
+      return Promise.resolve(undefined);
+    };
+
+    // Act
+    return new Promise(resolve => {
+      oneKeyDataSubmodule.getBidRequestData(bidsConfig, resolve, defaultRtdConfig);
+      executeOneKeyQueue();
+    })
+
+    // Assert
+      .then(() => {
+        expect(bidsConfig).to.eql(getReqBidsConfig());
+      });
+  });
+
+  [ // Test cases
+    {
+      description: 'global orb2',
+      rtdConfig: defaultRtdConfig,
+      expectedFragment: {
+        global: {
+          ...defaultOrb2WithTransmission
+        },
+        bidder: {}
+      }
+    },
+
+    {
+      description: 'bidder-specific orb2',
+      rtdConfig: {
+        params: {
+          proxyHostName: 'host',
+          bidders: [ 'bidder42', 'bidder24' ]
+        }
+      },
+      expectedFragment: {
+        global: { },
+        bidder: {
+          bidder42: {
+            ...defaultOrb2WithTransmission
+          },
+          bidder24: {
+            ...defaultOrb2WithTransmission
+          }
+        }
+      }
+    }
+  ].forEach(testCase => {
+    it(`update adUnits with transaction-ids and transmission in ${testCase.description}`, () => {
+      // Act
+      return new Promise(resolve => {
+        oneKeyDataSubmodule.getBidRequestData(bidsConfig, resolve, testCase.rtdConfig);
+        executeOneKeyQueue();
+      })
+
+      // Assert
+        .then(() => {
+        // Verify transaction-ids without equality
+        // because they are generated UUID.
+          bidsConfig.adUnits.forEach((adUnit) => {
+            expect(adUnit.ortb2Imp.ext.data.paf.transaction_id).to.not.be.undefined;
+          });
+          expect(bidsConfig.ortb2Fragments).to.eql(testCase.expectedFragment);
+        });
+    });
+  });
+});
+
+const getReqBidsConfig = () => {
+  return {
+    adUnits: getAdUnits(),
+    ortb2Fragments: {
+      global: {},
+      bidder: {}
+    }
+  }
+}
+
+const setUpOneKey = () => {
+  window.OneKey.queue = [];
+  OneKey.generateSeed = (_transactionIds) => {
+    return Promise.resolve(defaultSeed);
+  };
+}
+
+const executeOneKeyQueue = () => {
+  while (window.OneKey.queue.length > 0) {
+    window.OneKey.queue[0]();
+    window.OneKey.queue.shift();
+  }
+}

From f097b8a995bd33de854b1e556a38e23f400e79c9 Mon Sep 17 00:00:00 2001
From: Alexander Pykhteyev <alex.pykhteyev@gmail.com>
Date: Thu, 1 Sep 2022 16:56:58 +0400
Subject: [PATCH 214/569] LimelightDigital: support schain (#8927)

* User sync improvements

* User sync improvements

* Code review fixes

* Pass supply chain to limelightDigitalBidAdapter.js

Co-authored-by: apykhteyev <alex@project-limelight.com>
Co-authored-by: EngineeringProjectLimeLight <45598299+EngineeringProjectLimeLight@users.noreply.github.com>
---
 modules/limelightDigitalBidAdapter.js         |  3 +-
 .../limelightDigitalBidAdapter_spec.js        | 66 +++++++++++++++++--
 2 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/modules/limelightDigitalBidAdapter.js b/modules/limelightDigitalBidAdapter.js
index a278a587038..c39fd36e597 100644
--- a/modules/limelightDigitalBidAdapter.js
+++ b/modules/limelightDigitalBidAdapter.js
@@ -157,7 +157,8 @@ function buildPlacement(bidRequest) {
       }),
       type: bidRequest.params.adUnitType.toUpperCase(),
       publisherId: bidRequest.params.publisherId,
-      userIdAsEids: bidRequest.userIdAsEids
+      userIdAsEids: bidRequest.userIdAsEids,
+      supplyChain: bidRequest.schain
     }
   }
 }
diff --git a/test/spec/modules/limelightDigitalBidAdapter_spec.js b/test/spec/modules/limelightDigitalBidAdapter_spec.js
index 115acda722f..4efb4f4e84d 100644
--- a/test/spec/modules/limelightDigitalBidAdapter_spec.js
+++ b/test/spec/modules/limelightDigitalBidAdapter_spec.js
@@ -1,5 +1,5 @@
-import {expect} from 'chai';
-import {spec} from '../../../modules/limelightDigitalBidAdapter.js';
+import { expect } from 'chai';
+import { spec } from '../../../modules/limelightDigitalBidAdapter.js';
 
 describe('limelightDigitalAdapter', function () {
   const bid1 = {
@@ -29,7 +29,18 @@ describe('limelightDigitalAdapter', function () {
           }
         ]
       }
-    ]
+    ],
+    schain: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'example.com',
+          sid: '1',
+          hp: 1
+        }
+      ]
+    }
   }
   const bid2 = {
     bidId: '58ee9870c3164a',
@@ -53,7 +64,23 @@ describe('limelightDigitalAdapter', function () {
           }
         ]
       }
-    ]
+    ],
+    schain: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'example.com',
+          sid: '1',
+          hp: 1
+        },
+        {
+          asi: 'example1.com',
+          sid: '2',
+          hp: 1
+        }
+      ]
+    }
   }
   const bid3 = {
     bidId: '019645c7d69460',
@@ -81,7 +108,18 @@ describe('limelightDigitalAdapter', function () {
           }
         ]
       }
-    ]
+    ],
+    schain: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'example.com',
+          sid: '1',
+          hp: 1
+        }
+      ]
+    }
   }
   const bid4 = {
     bidId: '019645c7d69460',
@@ -107,7 +145,18 @@ describe('limelightDigitalAdapter', function () {
           }
         ]
       }
-    ]
+    ],
+    schain: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'example.com',
+          sid: '1',
+          hp: 1
+        }
+      ]
+    }
   }
 
   describe('buildRequests', function () {
@@ -146,7 +195,8 @@ describe('limelightDigitalAdapter', function () {
             'sizes',
             'transactionId',
             'publisherId',
-            'userIdAsEids'
+            'userIdAsEids',
+            'supplyChain'
           );
           expect(adUnit.id).to.be.a('number');
           expect(adUnit.bidId).to.be.a('string');
@@ -154,6 +204,7 @@ describe('limelightDigitalAdapter', function () {
           expect(adUnit.transactionId).to.be.a('string');
           expect(adUnit.sizes).to.be.an('array');
           expect(adUnit.userIdAsEids).to.be.an('array');
+          expect(adUnit.supplyChain).to.be.an('object');
         })
       })
     })
@@ -587,4 +638,5 @@ function validateAdUnit(adUnit, bid) {
   }));
   expect(adUnit.publisherId).to.equal(bid.params.publisherId);
   expect(adUnit.userIdAsEids).to.deep.equal(bid.userIdAsEids);
+  expect(adUnit.supplyChain).to.deep.equal(bid.schain);
 }

From 36f2d1155ff28a03e877588b9ebe630e3080a30e Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 1 Sep 2022 13:29:52 +0000
Subject: [PATCH 215/569] Prebid 7.13.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 230eed26d8a..b3a32b11620 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.13.0-pre",
+  "version": "7.13.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 5f68825a89d..190a4f61419 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.13.0-pre",
+  "version": "7.13.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From d73944600b1e15a5a1f5c4ce5c2db8a84eb53644 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 1 Sep 2022 13:29:53 +0000
Subject: [PATCH 216/569] Increment version to 7.14.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b3a32b11620..c01a9882363 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.13.0",
+  "version": "7.14.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 190a4f61419..3624cd70527 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.13.0",
+  "version": "7.14.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From ab1282bab97c246eabc3511201adc94246aa72ee Mon Sep 17 00:00:00 2001
From: Kenan Gillet <1706856+kenan-gillet@users.noreply.github.com>
Date: Thu, 1 Sep 2022 11:59:12 -0700
Subject: [PATCH 217/569] Experimental Fledge Module & OpenXOrtb Adapter:
 initial release and bidder support (#8716)

* Fledge POC: adding run ad auction and rendering with openxOrtbBidAdapter


Co-authored-by: Laurentiu Badea <laurentiu.badea@openx.com>
Co-authored-by: Luigi Sayson <luigi.sayson@openx.com>
Co-authored-by: Kenan Gillet <kenan.gillet@openx.com>

* Remove defensive coding: gtpSlotInfo is always an object

* Change onBidderAuctionResponse callback to specialized onFledgeAuctionConfigs

* openxOrtbBidAdapter: avoid error logging when response body is null


```
prebid.js:5 Prebid openx ERROR: Bidder openx failed to interpret the server's response. Continuing without bids null TypeError: Cannot use 'in' operator to search for 'nbr' in at prebid.js:12:4571
```
Thanks @piotrj-rtbh

* Fledge Modularized

- make fledgeManager into a module
- add top-level auction handling
- add support for registering component auction to GPT ad slot
- remove hard coded demo auction config, ensure auctionSignals is not undefined (#61)

Co-authored-by: Laurentiu Badea <laurentiu.badea@openx.com>
Co-authored-by: Luigi Sayson <luigi.sayson@openx.com>
Co-authored-by: Kenan Gillet <kenan.gillet@openx.com>

* Split GPT handling into its own module

* Remove fledge run/rendered by prebid

* Fix lint issues and name inconsistency

* Update unit test after switching to GPT only

* fix/remove no more relevant tests

* fledgeForGpt: clarify documentation of configuration

Co-authored-by: Laurentiu Badea <laurentiu.badea@openx.com>
Co-authored-by: Luigi Sayson <luigi.sayson@openx.com>
---
 modules/fledgeForGpt.js                       |  52 ++++++
 modules/fledgeForGpt.md                       |  60 +++++++
 modules/openxOrtbBidAdapter.js                |  30 +++-
 src/adapterManager.js                         |   8 +
 src/adapters/bidderFactory.js                 |  38 ++++-
 src/utils.js                                  |  12 +-
 test/spec/modules/fledge_spec.js              |  37 +++++
 test/spec/modules/openxOrtbBidAdapter_spec.js | 150 +++++++++++++++---
 test/spec/unit/core/adapterManager_spec.js    |  58 +++++++
 test/spec/unit/core/bidderFactory_spec.js     |  64 ++++++++
 10 files changed, 483 insertions(+), 26 deletions(-)
 create mode 100644 modules/fledgeForGpt.js
 create mode 100644 modules/fledgeForGpt.md
 create mode 100644 test/spec/modules/fledge_spec.js

diff --git a/modules/fledgeForGpt.js b/modules/fledgeForGpt.js
new file mode 100644
index 00000000000..0f7092baf03
--- /dev/null
+++ b/modules/fledgeForGpt.js
@@ -0,0 +1,52 @@
+/**
+ * Fledge modules is responsible for registering fledged auction configs into the GPT slot;
+ * GPT is resposible to run the fledge auction.
+ */
+import { config } from '../src/config.js';
+import { getHook } from '../src/hook.js';
+import { getGptSlotForAdUnitCode, logInfo, logWarn } from '../src/utils.js';
+
+const MODULE = 'fledgeForGpt'
+
+export let isEnabled = false;
+
+config.getConfig('fledgeForGpt', config => init(config.fledgeForGpt));
+
+/**
+  * Module init.
+  */
+export function init(cfg) {
+  if (cfg && cfg.enabled === true) {
+    if (!isEnabled) {
+      getHook('addComponentAuction').before(addComponentAuctionHook);
+      isEnabled = true;
+    }
+    logInfo(MODULE, `isEnabled`, cfg);
+  } else {
+    if (isEnabled) {
+      getHook('addComponentAuction').getHooks({hook: addComponentAuctionHook}).remove();
+      isEnabled = false;
+    }
+    logInfo(MODULE, `isDisabled`, cfg);
+  }
+}
+
+export function addComponentAuctionHook(next, bidRequest, componentAuctionConfig) {
+  const seller = componentAuctionConfig.seller;
+  const adUnitCode = bidRequest.adUnitCode;
+  const gptSlot = getGptSlotForAdUnitCode(adUnitCode);
+  if (gptSlot && gptSlot.setConfig) {
+    delete componentAuctionConfig.bidId;
+    gptSlot.setConfig({
+      componentAuction: [{
+        configKey: seller,
+        auctionConfig: componentAuctionConfig
+      }]
+    });
+    logInfo(MODULE, `register component auction config for: ${adUnitCode} x ${seller}: ${gptSlot.getAdUnitPath()}`, componentAuctionConfig);
+  } else {
+    logWarn(MODULE, `unable to register component auction config for: ${adUnitCode} x ${seller}.`);
+  }
+
+  next(bidRequest, componentAuctionConfig);
+}
diff --git a/modules/fledgeForGpt.md b/modules/fledgeForGpt.md
new file mode 100644
index 00000000000..5672ac04618
--- /dev/null
+++ b/modules/fledgeForGpt.md
@@ -0,0 +1,60 @@
+## Overview
+
+This module enables the handling of fledge auction by GPT.
+Bid adapters can now return component auction configs in addition to bids.
+
+Those component auction configs will be registered to the GPT ad slot,
+and GPT will be responsible to run fledge auction and render the winning fledge ad.
+
+Find out more [here](https://github.com/WICG/turtledove/blob/main/FLEDGE.md).
+
+## Integration
+
+Build the fledge module into the Prebid.js package with:
+
+```
+gulp build --modules=fledgeForGpt,...
+```
+
+## Module Configuration Parameters
+
+|Name |Type |Description |Notes |
+| :------------ | :------------ | :------------ |:------------ |
+|enabled | Boolean |Enable/disable the module |Defaults to `false` |
+
+## Configuration
+
+Fledge support need to be enabled at 3 levels:
+- `fledgeForGpt` module
+- bidder
+- adunit
+### enabling the fledgeForGpt module
+```js
+pbjs.que.push(function() {
+  pbjs.setConfig({
+    fledgeForGpt: {
+      enabled: true
+    }
+  });
+});
+```
+
+### enablingthe  bidder
+```js
+pbjs.setBidderConfig({
+    bidders: ["openx"],
+    config: {
+        fledgeEnabled: true
+    }
+});
+```
+
+### enabling the adunit
+ortb2Imp.ext.ae on the adunit must be set 1
+```js
+ortb2Imp: {
+    ext: {
+        ae: 1
+    }
+}
+```
diff --git a/modules/openxOrtbBidAdapter.js b/modules/openxOrtbBidAdapter.js
index 62066ebe4f1..dc79ffb47b2 100644
--- a/modules/openxOrtbBidAdapter.js
+++ b/modules/openxOrtbBidAdapter.js
@@ -67,12 +67,17 @@ function createBannerRequest(bids, bidderRequest) {
       },
       ext: {divid: bid.adUnitCode}
     };
+
+    if (bidderRequest.fledgeEnabled) {
+      imp.ext.ae = bid?.ortb2Imp?.ext?.ae
+    }
+
     enrichImp(imp, bid, floor);
     return imp;
   });
   return {
     method: 'POST',
-    url: REQUEST_URL,
+    url: config.getConfig('openxOrtbUrl') || REQUEST_URL,
     data: data
   }
 }
@@ -190,6 +195,9 @@ function getBaseRequest(bid, bidderRequest) {
   if (bid.params.delDomain) {
     utils.deepSetValue(req, 'ext.delDomain', bid.params.delDomain);
   }
+  if (bid.params.response_template_name) {
+    utils.deepSetValue(req, 'ext.response_template_name', bid.params.response_template_name);
+  }
   if (bid.params.test) {
     req.test = 1;
   }
@@ -251,7 +259,7 @@ function getFloor(bid, mediaType) {
   return floor;
 }
 
-function interpretResponse(resp, req) {
+function interpretOrtbResponse(resp, req) {
   if (!resp.body) {
     resp.body = {nbr: 0};
   }
@@ -316,6 +324,24 @@ function interpretResponse(resp, req) {
   return bids;
 }
 
+function interpretResponse(resp, req) {
+  const bids = interpretOrtbResponse(resp, req);
+  let fledgeAuctionConfigs = utils.deepAccess(resp, 'body.ext.fledge_auction_configs');
+  if (fledgeAuctionConfigs) {
+    fledgeAuctionConfigs = Object.entries(fledgeAuctionConfigs).map(([bidId, cfg]) => {
+      return Object.assign({
+        bidId,
+        auctionSignals: {}
+      }, cfg);
+    });
+    return {
+      bids,
+      fledgeAuctionConfigs,
+    }
+  }
+  return bids;
+}
+
 /**
  * @param syncOptions
  * @param responses
diff --git a/src/adapterManager.js b/src/adapterManager.js
index e5fea72b108..ffad35e65a2 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -311,6 +311,14 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
       bidRequest['uspConsent'] = uspDataHandler.getConsentData();
     });
   }
+
+  bidRequests.forEach(bidRequest => {
+    config.runWithBidder(bidRequest.bidderCode, () => {
+      const fledgeEnabledFromConfig = config.getConfig('fledgeEnabled');
+      bidRequest['fledgeEnabled'] = navigator.runAdAuction && fledgeEnabledFromConfig
+    });
+  });
+
   return bidRequests;
 }, 'makeBidRequests');
 
diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
index 03103dbdcdd..2e28388d188 100644
--- a/src/adapters/bidderFactory.js
+++ b/src/adapters/bidderFactory.js
@@ -9,7 +9,7 @@ import CONSTANTS from '../constants.json';
 import * as events from '../events.js';
 import {includes} from '../polyfill.js';
 import { ajax } from '../ajax.js';
-import { logWarn, logError, parseQueryStringParameters, delayExecution, parseSizesInput, flatten, uniques, timestamp, deepAccess, isArray, isPlainObject } from '../utils.js';
+import { logWarn, logInfo, logError, parseQueryStringParameters, delayExecution, parseSizesInput, flatten, uniques, timestamp, deepAccess, isArray, isPlainObject } from '../utils.js';
 import { ADPOD } from '../mediaTypes.js';
 import { getHook, hook } from '../hook.js';
 import { getCoreStorageManager } from '../storageManager.js';
@@ -72,6 +72,13 @@ export const storage = getCoreStorageManager('bidderFactory');
  * @property {object} params Any bidder-specific params which the publisher used in their bid request.
  */
 
+/**
+ * @typedef {object} BidderAuctionResponse An object encapsulating an adapter response for current Auction
+ *
+ * @property {Array<Bid>} bids Contextual bids returned by this adapter, if any
+ * @property {object|null} fledgeAuctionConfigs Optional FLEDGE response, as a map of impid -> auction_config
+ */
+
 /**
  * @typedef {object} ServerRequest
  *
@@ -226,6 +233,17 @@ export function newBidder(spec) {
           onTimelyResponse(spec.code);
           responses.push(resp)
         },
+        /** Process eventual BidderAuctionResponse.fledgeAuctionConfig field in response.
+         * @param {Array<FledgeAuctionConfig>} fledgeAuctionConfigs
+         */
+        onFledgeAuctionConfigs: (fledgeAuctionConfigs) => {
+          fledgeAuctionConfigs.forEach((fledgeAuctionConfig) => {
+            const bidRequest = bidRequestMap[fledgeAuctionConfig.bidId];
+            if (bidRequest) {
+              addComponentAuction(bidRequest, fledgeAuctionConfig);
+            }
+          });
+        },
         // If the server responds with an error, there's not much we can do beside logging.
         onError: (errorMessage, error) => {
           onTimelyResponse(spec.code);
@@ -296,7 +314,7 @@ export function newBidder(spec) {
  * @param onBid {function({})} invoked once for each bid in the response - with the bid as returned by interpretResponse
  * @param onCompletion {function()} invoked once when all bid requests have been processed
  */
-export const processBidderRequests = hook('sync', function (spec, bids, bidderRequest, ajax, wrapCallback, {onRequest, onResponse, onError, onBid, onCompletion}) {
+export const processBidderRequests = hook('sync', function (spec, bids, bidderRequest, ajax, wrapCallback, {onRequest, onResponse, onFledgeAuctionConfigs, onError, onBid, onCompletion}) {
   let requests = spec.buildRequests(bids, bidderRequest);
   if (!requests || requests.length === 0) {
     onCompletion();
@@ -324,15 +342,23 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
       };
       onResponse(response);
 
-      let bids;
       try {
-        bids = spec.interpretResponse(response, request);
+        response = spec.interpretResponse(response, request);
       } catch (err) {
         logError(`Bidder ${spec.code} failed to interpret the server's response. Continuing without bids`, null, err);
         requestDone();
         return;
       }
 
+      let bids;
+      // Extract additional data from a structured {BidderAuctionResponse} response
+      if (response && isArray(response.fledgeAuctionConfigs)) {
+        onFledgeAuctionConfigs(response.fledgeAuctionConfigs);
+        bids = response.bids;
+      } else {
+        bids = response;
+      }
+
       if (bids) {
         if (isArray(bids)) {
           bids.forEach(onBid);
@@ -419,6 +445,10 @@ export const registerSyncInner = hook('async', function(spec, responses, gdprCon
   }
 }, 'registerSyncs')
 
+export const addComponentAuction = hook('sync', (_bidRequest, fledgeAuctionConfig) => {
+  logInfo(`bidderFactory.addComponentAuction`, fledgeAuctionConfig);
+}, 'addComponentAuction')
+
 export function preloadBidderMappingFile(fn, adUnits) {
   if (!config.getConfig('adpod.brandCategoryExclusion')) {
     return fn.call(this, adUnits);
diff --git a/src/utils.js b/src/utils.js
index de805b965fd..e8578320b9e 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -955,14 +955,22 @@ export function isSlotMatchingAdUnitCode(adUnitCode) {
 }
 
 /**
- * @summary Uses the adUnit's code in order to find a matching gptSlot on the page
+ * @summary Uses the adUnit's code in order to find a matching gpt slot object on the page
  */
-export function getGptSlotInfoForAdUnitCode(adUnitCode) {
+export function getGptSlotForAdUnitCode(adUnitCode) {
   let matchingSlot;
   if (isGptPubadsDefined()) {
     // find the first matching gpt slot on the page
     matchingSlot = find(window.googletag.pubads().getSlots(), isSlotMatchingAdUnitCode(adUnitCode));
   }
+  return matchingSlot;
+};
+
+/**
+ * @summary Uses the adUnit's code in order to find a matching gptSlot on the page
+ */
+export function getGptSlotInfoForAdUnitCode(adUnitCode) {
+  const matchingSlot = getGptSlotForAdUnitCode(adUnitCode);
   if (matchingSlot) {
     return {
       gptSlot: matchingSlot.getAdUnitPath(),
diff --git a/test/spec/modules/fledge_spec.js b/test/spec/modules/fledge_spec.js
new file mode 100644
index 00000000000..2094ab42438
--- /dev/null
+++ b/test/spec/modules/fledge_spec.js
@@ -0,0 +1,37 @@
+import {
+  expect
+} from 'chai';
+import * as fledge from 'modules/fledgeForGpt.js';
+
+const CODE = 'sampleBidder';
+const AD_UNIT_CODE = 'mock/placement';
+
+describe('fledgeForGpt module', function() {
+  let nextFnSpy;
+  fledge.init({enabled: true})
+
+  const bidRequest = {
+    adUnitCode: AD_UNIT_CODE,
+    bids: [{
+      bidId: '1',
+      bidder: CODE,
+      auctionId: 'first-bid-id',
+      adUnitCode: AD_UNIT_CODE,
+      transactionId: 'au',
+    }]
+  };
+  const fledgeAuctionConfig = {
+    bidId: '1',
+  }
+
+  describe('addComponentAuctionHook', function() {
+    beforeEach(function() {
+      nextFnSpy = sinon.spy();
+    });
+
+    it('should call next() when a proper bidrequest and fledgeAuctionConfig are provided', function() {
+      fledge.addComponentAuctionHook(nextFnSpy, bidRequest, fledgeAuctionConfig);
+      expect(nextFnSpy.called).to.be.true;
+    });
+  });
+});
diff --git a/test/spec/modules/openxOrtbBidAdapter_spec.js b/test/spec/modules/openxOrtbBidAdapter_spec.js
index 3fe9b627d04..6d1e59da677 100644
--- a/test/spec/modules/openxOrtbBidAdapter_spec.js
+++ b/test/spec/modules/openxOrtbBidAdapter_spec.js
@@ -206,7 +206,12 @@ describe('OpenxRtbAdapter', function () {
         bidId: 'test-bid-id-1',
         bidderRequestId: 'test-bid-request-1',
         auctionId: 'test-auction-1',
-        transactionId: 'test-transactionId-1'
+        transactionId: 'test-transactionId-1',
+        ortb2Imp: {
+          ext: {
+            ae: 2
+          }
+        }
       }, {
         bidder: 'openx',
         params: {
@@ -384,14 +389,16 @@ describe('OpenxRtbAdapter', function () {
         });
 
         it('ortb2.site should be merged in the request', function() {
-          const ortb2 = {
-            site: {
-              domain: 'page.example.com',
-              cat: ['IAB2'],
-              sectioncat: ['IAB2-2']
+          const request = spec.buildRequests(bidRequests, {
+            ...mockBidderRequest,
+            'ortb2': {
+              site: {
+                domain: 'page.example.com',
+                cat: ['IAB2'],
+                sectioncat: ['IAB2-2']
+              }
             }
-          };
-          const request = spec.buildRequests(bidRequests, {refererInfo: {}, ortb2: ortb2});
+          });
           let data = request[0].data;
           expect(data.site.domain).to.equal('page.example.com');
           expect(data.site.cat).to.deep.equal(['IAB2']);
@@ -399,12 +406,14 @@ describe('OpenxRtbAdapter', function () {
         });
 
         it('ortb2.user should be merged in the request', function() {
-          const ortb2 = {
-            user: {
-              yob: 1985
+          const request = spec.buildRequests(bidRequests, {
+            ...mockBidderRequest,
+            'ortb2': {
+              user: {
+                yob: 1985
+              }
             }
-          };
-          const request = spec.buildRequests(bidRequests, {refererInfo: {}, ortb2: ortb2});
+          });
           let data = request[0].data;
           expect(data.user.yob).to.equal(1985);
         });
@@ -598,10 +607,6 @@ describe('OpenxRtbAdapter', function () {
           }];
         });
 
-        afterEach(function () {
-          config.getConfig.restore();
-        });
-
         describe('us_privacy', function () {
           beforeEach(function () {
             bidderRequest = {
@@ -614,6 +619,10 @@ describe('OpenxRtbAdapter', function () {
             });
           });
 
+          afterEach(function () {
+            config.getConfig.restore();
+          });
+
           it('should send a signal to specify that US Privacy applies to this request', function () {
             const request = spec.buildRequests(bidRequests, bidderRequest);
             expect(request[0].data.regs.ext.us_privacy).to.equal('1YYN');
@@ -651,6 +660,10 @@ describe('OpenxRtbAdapter', function () {
             });
           });
 
+          afterEach(function () {
+            config.getConfig.restore();
+          });
+
           it('should send a signal to specify that GDPR applies to this request', function () {
             bidderRequest.bids = bidRequests;
             const request = spec.buildRequests(bidRequests, bidderRequest);
@@ -718,8 +731,10 @@ describe('OpenxRtbAdapter', function () {
 
           const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
           expect(request[0].data.regs.coppa).to.equal(1);
+        });
 
-          config.getConfig.restore();
+        after(function () {
+          config.getConfig.restore()
         });
       });
 
@@ -890,6 +905,27 @@ describe('OpenxRtbAdapter', function () {
           expect(request[0].data).to.not.have.any.keys('user');
         });
       });
+
+      context('FLEDGE', function() {
+        it('when FLEDGE is disabled, should not send imp.ext.ae', function () {
+          const request = spec.buildRequests(
+            bidRequestsWithMediaTypes,
+            {
+              ...mockBidderRequest,
+              fledgeEnabled: false
+            }
+          );
+          expect(request[0].data.imp[0].ext).to.not.have.property('ae');
+        });
+
+        it('when FLEDGE is enabled, should send whatever is set in ortb2imp.ext.ae in all bid requests', function () {
+          const request = spec.buildRequests(bidRequestsWithMediaTypes, {
+            ...mockBidderRequest,
+            fledgeEnabled: true
+          });
+          expect(request[0].data.imp[0].ext.ae).to.equal(2);
+        });
+      });
     });
 
     context('banner', function () {
@@ -1225,6 +1261,84 @@ describe('OpenxRtbAdapter', function () {
         expect(bid.vastUrl).to.equal(winUrl);
       });
     });
+
+    context('when the response contains FLEDGE interest groups config', function() {
+      let response;
+
+      beforeEach(function () {
+        sinon.stub(config, 'getConfig')
+          .withArgs('fledgeEnabled')
+          .returns(true);
+
+        bidRequestConfigs = [{
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain'
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]],
+            },
+          },
+          bidId: 'test-bid-id',
+          bidderRequestId: 'test-bidder-request-id',
+          auctionId: 'test-auction-id'
+        }];
+
+        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
+
+        bidResponse = {
+          seatbid: [{
+            bid: [{
+              impid: 'test-bid-id',
+              price: 2,
+              w: 300,
+              h: 250,
+              crid: 'test-creative-id',
+              dealid: 'test-deal-id',
+              adm: 'test-ad-markup'
+            }]
+          }],
+          cur: 'AUS',
+          ext: {
+            fledge_auction_configs: {
+              'test-bid-id': {
+                seller: 'codinginadtech.com',
+                interestGroupBuyers: ['somedomain.com'],
+                sellerTimeout: 0,
+                perBuyerSignals: {
+                  'somedomain.com': {
+                    base_bid_micros: 0.1,
+                    disallowed_advertiser_ids: [
+                      '1234',
+                      '2345'
+                    ],
+                    multiplier: 1.3,
+                    use_bid_multiplier: true,
+                    win_reporting_id: '1234567asdf'
+                  }
+                }
+              }
+            }
+          }
+        };
+
+        response = spec.interpretResponse({body: bidResponse}, bidRequest);
+      });
+
+      afterEach(function () {
+        config.getConfig.restore();
+      });
+
+      it('should return FLEDGE auction_configs alongside bids', function () {
+        expect(response).to.have.property('bids');
+        expect(response).to.have.property('fledgeAuctionConfigs');
+        expect(response.fledgeAuctionConfigs.length).to.equal(1);
+        expect(response.fledgeAuctionConfigs[0].bidId).to.equal('test-bid-id');
+      });
+    });
   });
 
   describe('user sync', function () {
diff --git a/test/spec/unit/core/adapterManager_spec.js b/test/spec/unit/core/adapterManager_spec.js
index a437e938327..6e37da4e85f 100644
--- a/test/spec/unit/core/adapterManager_spec.js
+++ b/test/spec/unit/core/adapterManager_spec.js
@@ -1815,6 +1815,64 @@ describe('adapterManager tests', function () {
       });
     });
 
+    describe('fledgeEnabled', function () {
+      const origRunAdAuction = navigator?.runAdAuction;
+      before(function () {
+        // navigator.runAdAuction doesn't exist, so we can't stub it normally with
+        // sinon.stub(navigator, 'runAdAuction') or something
+        navigator.runAdAuction = sinon.stub();
+      });
+
+      after(function() {
+        navigator.runAdAuction = origRunAdAuction;
+      })
+
+      afterEach(function () {
+        config.resetConfig();
+      });
+
+      it('should set fledgeEnabled correctly per bidder', function () {
+        config.setConfig({bidderSequence: 'fixed'})
+        config.setBidderConfig({
+          bidders: ['appnexus'],
+          config: {
+            fledgeEnabled: true,
+          }
+        });
+
+        const adUnits = [{
+          'code': '/19968336/header-bid-tag1',
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[728, 90]]
+            },
+          },
+          'bids': [
+            {
+              'bidder': 'appnexus',
+            },
+            {
+              'bidder': 'rubicon',
+            },
+          ]
+        }];
+
+        const bidRequests = adapterManager.makeBidRequests(
+          adUnits,
+          Date.now(),
+          utils.getUniqueIdentifierStr(),
+          function callback() {},
+          []
+        );
+
+        expect(bidRequests[0].bids[0].bidder).equals('appnexus');
+        expect(bidRequests[0].fledgeEnabled).to.be.true;
+
+        expect(bidRequests[1].bids[0].bidder).equals('rubicon');
+        expect(bidRequests[1].fledgeEnabled).to.be.undefined;
+      });
+    });
+
     describe('sizeMapping', function () {
       let sandbox;
       beforeEach(function () {
diff --git a/test/spec/unit/core/bidderFactory_spec.js b/test/spec/unit/core/bidderFactory_spec.js
index 93cb7bd4449..7164e468e71 100644
--- a/test/spec/unit/core/bidderFactory_spec.js
+++ b/test/spec/unit/core/bidderFactory_spec.js
@@ -1186,6 +1186,70 @@ describe('validate bid response: ', function () {
       expect(addBidResponseStub.calledOnce).to.equal(false);
       expect(logWarnSpy.callCount).to.equal(1);
     });
+  });
+
+  describe('when interpretResponse returns BidderAuctionResponse', function() {
+    const bidRequest = {
+      bids: [{
+        bidId: '1',
+        bidder: CODE,
+        auctionId: 'first-bid-id',
+        adUnitCode: 'mock/placement',
+        transactionId: 'au',
+      }]
+    };
+    const fledgeAuctionConfig = {
+      bidId: '1',
+    }
+    describe('when response has FLEDGE auction config', function() {
+      let logInfoSpy;
+
+      beforeEach(function () {
+        logInfoSpy = sinon.spy(utils, 'logInfo');
+      });
+
+      afterEach(function () {
+        logInfoSpy.restore();
+      });
+
+      it('should unwrap bids', function() {
+        const bidder = newBidder(spec);
+        spec.interpretResponse.returns({
+          bids: bids,
+          fledgeAuctionConfigs: []
+        });
+        bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+        expect(addBidResponseStub.calledOnce).to.equal(true);
+        expect(addBidResponseStub.firstCall.args[0]).to.equal('mock/placement');
+      });
+
+      it('should call fledgeManager with FLEDGE configs', function() {
+        const bidder = newBidder(spec);
+        spec.interpretResponse.returns({
+          bids: bids,
+          fledgeAuctionConfigs: [fledgeAuctionConfig]
+        });
+        bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+        expect(logInfoSpy.calledOnce).to.equal(true);
+        expect(logInfoSpy.firstCall.args[1]).to.equal(fledgeAuctionConfig);
+        expect(addBidResponseStub.calledOnce).to.equal(true);
+        expect(addBidResponseStub.firstCall.args[0]).to.equal('mock/placement');
+      })
+
+      it('should call fledgeManager with FLEDGE configs even if no bids returned', function() {
+        const bidder = newBidder(spec);
+        spec.interpretResponse.returns({
+          bids: [],
+          fledgeAuctionConfigs: [fledgeAuctionConfig]
+        });
+        bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+
+        expect(logInfoSpy.calledOnce).to.equal(true);
+        expect(logInfoSpy.firstCall.args[1]).to.equal(fledgeAuctionConfig);
+        expect(addBidResponseStub.calledOnce).to.equal(false);
+      })
+    })
   })
 });
 

From 65d61b71fe4231e464b6c1051c68f0995841c39d Mon Sep 17 00:00:00 2001
From: matthieularere-msq
 <63732822+matthieularere-msq@users.noreply.github.com>
Date: Fri, 2 Sep 2022 14:00:02 +0200
Subject: [PATCH 218/569] bidWatch Analytics Adapter : minor fixes (#8937)

* minor fixes

* Update bidwatchAnalyticsAdapter.js

* Update bidwatchAnalyticsAdapter.js
---
 modules/bidwatchAnalyticsAdapter.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/bidwatchAnalyticsAdapter.js b/modules/bidwatchAnalyticsAdapter.js
index 9983eb58289..867cc575fe0 100644
--- a/modules/bidwatchAnalyticsAdapter.js
+++ b/modules/bidwatchAnalyticsAdapter.js
@@ -53,7 +53,7 @@ function filterAttributes(arg, removead) {
 function cleanAuctionEnd(args) {
   let response = {};
   let filteredObj;
-  let objects = ['bidderRequests', 'bidsReceived', 'noBids'];
+  let objects = ['bidderRequests', 'bidsReceived', 'noBids', 'adUnits'];
   objects.forEach((attr) => {
     if (Array.isArray(args[attr])) {
       response[attr] = [];
@@ -150,8 +150,13 @@ function handleAuctionEnd() {
   ajax(endpoint + '.bidwatch.io/analytics/auctions', function (data) {
     let list = JSON.parse(data);
     if (Array.isArray(list) && typeof allEvents['bidResponse'] != 'undefined') {
+      let alreadyCalled = [];
       allEvents['bidResponse'].forEach((bidResponse) => {
-        if (list.includes(bidResponse['originalBidder'] + '_' + bidResponse['creativeId'])) { ajax(endpoint + '.bidwatch.io/analytics/creatives', null, JSON.stringify(bidResponse), {method: 'POST', withCredentials: true}); }
+        let tmpId = bidResponse['originalBidder'] + '_' + bidResponse['creativeId'];
+        if (list.includes(tmpId) && !alreadyCalled.includes(tmpId)) {
+          alreadyCalled.push(tmpId);
+          ajax(endpoint + '.bidwatch.io/analytics/creatives', null, JSON.stringify(bidResponse), {method: 'POST', withCredentials: true});
+        }
       });
     }
     allEvents = {};
@@ -191,7 +196,9 @@ bidwatchAnalytics.originEnableAnalytics = bidwatchAnalytics.enableAnalytics;
 bidwatchAnalytics.enableAnalytics = function (config) {
   bidwatchAnalytics.originEnableAnalytics(config); // call the base class function
   initOptions = config.options;
-  if (initOptions.domain) { endpoint = 'https://' + initOptions.domain; }
+  if (initOptions.domain) {
+    endpoint = 'https://' + initOptions.domain;
+  }
 };
 
 adapterManager.registerAnalyticsAdapter({

From 0f16f2056cea367735b28e45a478d15cb8bfb3c9 Mon Sep 17 00:00:00 2001
From: matthieularere-msq
 <63732822+matthieularere-msq@users.noreply.github.com>
Date: Mon, 5 Sep 2022 19:21:46 +0200
Subject: [PATCH 219/569] bidWatch Analytics Adapter : forward
 advertiserDomains (#8948)

* forward advertiserDomains

* Update bidwatchAnalyticsAdapter.js
---
 modules/bidwatchAnalyticsAdapter.js                | 7 ++++---
 test/spec/modules/bidwatchAnalyticsAdapter_spec.js | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/bidwatchAnalyticsAdapter.js b/modules/bidwatchAnalyticsAdapter.js
index 867cc575fe0..b94b7eccada 100644
--- a/modules/bidwatchAnalyticsAdapter.js
+++ b/modules/bidwatchAnalyticsAdapter.js
@@ -42,6 +42,9 @@ function filterAttributes(arg, removead) {
       response['gdprConsent'] = {};
       if (typeof arg['gdprConsent']['consentString'] != 'undefined') { response['gdprConsent']['consentString'] = arg['gdprConsent']['consentString']; }
     }
+    if (typeof arg['meta'] == 'object' && typeof arg['meta']['advertiserDomains'] != 'undefined') {
+      response['meta'] = {'advertiserDomains': arg['meta']['advertiserDomains']};
+    }
     requestsAttributes.forEach((attr) => {
       if (typeof arg[attr] != 'undefined') { response[attr] = arg[attr]; }
     });
@@ -196,9 +199,7 @@ bidwatchAnalytics.originEnableAnalytics = bidwatchAnalytics.enableAnalytics;
 bidwatchAnalytics.enableAnalytics = function (config) {
   bidwatchAnalytics.originEnableAnalytics(config); // call the base class function
   initOptions = config.options;
-  if (initOptions.domain) {
-    endpoint = 'https://' + initOptions.domain;
-  }
+  if (initOptions.domain) { endpoint = 'https://' + initOptions.domain; }
 };
 
 adapterManager.registerAnalyticsAdapter({
diff --git a/test/spec/modules/bidwatchAnalyticsAdapter_spec.js b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
index dddb29dbfd9..321d3607178 100644
--- a/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
+++ b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
@@ -291,6 +291,8 @@ describe('BidWatch Analytics', function () {
       expect(message.auctionEnd).to.have.lengthOf(1);
       expect(message.auctionEnd[0]).to.have.property('bidsReceived').and.to.have.lengthOf(1);
       expect(message.auctionEnd[0].bidsReceived[0]).not.to.have.property('ad');
+      expect(message.auctionEnd[0].bidsReceived[0]).to.have.property('meta');
+      expect(message.auctionEnd[0].bidsReceived[0].meta).to.have.property('advertiserDomains');
       expect(message.auctionEnd[0]).to.have.property('bidderRequests').and.to.have.lengthOf(1);
       expect(message.auctionEnd[0].bidderRequests[0]).to.have.property('gdprConsent');
       expect(message.auctionEnd[0].bidderRequests[0].gdprConsent).not.to.have.property('vendorData');

From dce138a498fc4ea1993b1711a7fc9947ad0ee244 Mon Sep 17 00:00:00 2001
From: nkloeber <100145701+nkloeber@users.noreply.github.com>
Date: Tue, 6 Sep 2022 18:31:58 +0200
Subject: [PATCH 220/569] Yieldlab Bid Adapter support floor module (#8893)

* Yieldlab Bid Adapter support floor module, in order to set dynamic floor prices

* comply with standard object-curly-spacing lint configuration
---
 modules/yieldlabBidAdapter.js                | 37 ++++++++++++++++++--
 test/spec/modules/yieldlabBidAdapter_spec.js | 37 ++++++++++++++++++++
 2 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/modules/yieldlabBidAdapter.js b/modules/yieldlabBidAdapter.js
index 96577ed8b02..e5e452b4ce0 100644
--- a/modules/yieldlabBidAdapter.js
+++ b/modules/yieldlabBidAdapter.js
@@ -1,4 +1,4 @@
-import { _each, deepAccess, isArray, isPlainObject, timestamp } from '../src/utils.js'
+import { _each, deepAccess, isArray, isFn, isPlainObject, timestamp } from '../src/utils.js'
 import { registerBidder } from '../src/adapters/bidderFactory.js'
 import { find } from '../src/polyfill.js'
 import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js'
@@ -75,6 +75,10 @@ export const spec = {
       if (iabContent) {
         query.iab_content = createIabContentString(iabContent)
       }
+      const floor = getBidFloor(bid, sizes)
+      if (floor) {
+        query.floor = floor;
+      }
     })
 
     if (bidderRequest) {
@@ -177,7 +181,7 @@ export const spec = {
           bidResponse.adUrl = url
           bidResponse.mediaType = NATIVE
           const nativeImageAssetObj = find(matchedBid.native.assets, e => e.id === 2)
-          const nativeImageAsset = nativeImageAssetObj ? nativeImageAssetObj.img : {url: '', w: 0, h: 0};
+          const nativeImageAsset = nativeImageAssetObj ? nativeImageAssetObj.img : { url: '', w: 0, h: 0 };
           const nativeTitleAsset = find(matchedBid.native.assets, e => e.id === 1)
           const nativeBodyAsset = find(matchedBid.native.assets, e => e.id === 3)
           bidResponse.native = {
@@ -405,6 +409,7 @@ function outstreamRender(bid) {
     window.document.dispatchEvent(new Event('ma-start-event'))
   });
 }
+
 /**
  * Extract sizes for a given bid from either `mediaTypes` or `sizes` directly.
  *
@@ -426,7 +431,7 @@ function extractSizes(bid) {
         sizes.push([bannerType.sizes])
       }
     }
-  // The bid top level field `sizes` is deprecated and should not be used anymore. Keeping it for compatibility.
+    // The bid top level field `sizes` is deprecated and should not be used anymore. Keeping it for compatibility.
   } else if (isArray(bid.sizes)) {
     if (isArray(bid.sizes[0])) {
       sizes.push(bid.sizes)
@@ -441,4 +446,30 @@ function extractSizes(bid) {
   return Array.from(deduplicatedSizeStrings)
 }
 
+/**
+ * Gets the floor price if the Price Floors Module is enabled for a given auction,
+ * which will add the getFloor() function to the bidRequest object.
+ *
+ * @param {Object} bid
+ * @param {string[]} sizes
+ * @returns The floor CPM of a matched rule based on the rule selection process (mediaType, size and currency),
+ *          using the getFloor() inputs. Multi sizes and unsupported media types will default to '*'
+ */
+function getBidFloor(bid, sizes) {
+  if (!isFn(bid.getFloor)) {
+    return undefined;
+  }
+  const mediaTypes = deepAccess(bid, 'mediaTypes');
+  const mediaType = mediaTypes !== undefined ? Object.keys(mediaTypes)[0].toLowerCase() : undefined;
+  const floor = bid.getFloor({
+    currency: CURRENCY_CODE,
+    mediaType: mediaType !== undefined && spec.supportedMediaTypes.includes(mediaType) ? mediaType : '*',
+    size: sizes.length !== 1 ? '*' : extractSizes(sizes)
+  });
+  if (floor.currency === CURRENCY_CODE) {
+    return floor.floor;
+  }
+  return undefined;
+}
+
 registerBidder(spec)
diff --git a/test/spec/modules/yieldlabBidAdapter_spec.js b/test/spec/modules/yieldlabBidAdapter_spec.js
index 4998f5381ac..4c39fe5fe29 100644
--- a/test/spec/modules/yieldlabBidAdapter_spec.js
+++ b/test/spec/modules/yieldlabBidAdapter_spec.js
@@ -531,4 +531,41 @@ describe('yieldlabBidAdapter', () => {
       expect(sync[0].type).to.have.string('iframe');
     });
   });
+
+  describe('getBidFloor', function () {
+    let bidRequest, getFloor;
+
+    it('should add valid bid floor', () => {
+      getFloor = () => {
+        return {
+          currency: 'EUR',
+          floor: 1.33
+        };
+      };
+      bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor})
+      const result = spec.buildRequests([bidRequest], REQPARAMS)
+      expect(result).to.have.nested.property('queryParams.floor', 1.33)
+    });
+
+    it('should not add empty bid floor', () => {
+      getFloor = () => {
+        return {};
+      };
+      bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor})
+      const result = spec.buildRequests([bidRequest], REQPARAMS)
+      expect(result).not.to.have.nested.property('queryParams.floor')
+    });
+
+    it('should not add bid floor when currency is not matching', () => {
+      getFloor = (currency, mediaType, size) => {
+        return {
+          currency: 'USD',
+          floor: 1.33
+        };
+      };
+      bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor})
+      const result = spec.buildRequests([bidRequest], REQPARAMS)
+      expect(result).not.to.have.nested.property('queryParams.floor')
+    });
+  });
 })

From b5ebe1964208f7826f9a585420407edb5e5577aa Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 6 Sep 2022 10:45:28 -0600
Subject: [PATCH 221/569] Revert "Prebid core: optimize getRefererInfo to run
 only once per page (#8864)" (#8954)

This reverts commit 5362745c08efcd374767f566a8c9bb1758093789.
---
 src/refererDetection.js                       | 13 +------------
 test/spec/modules/enrichmentFpdModule_spec.js |  3 +--
 test/spec/modules/fpdModule_spec.js           |  3 +--
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/refererDetection.js b/src/refererDetection.js
index 28da182c7ab..15c080f5c69 100644
--- a/src/refererDetection.js
+++ b/src/refererDetection.js
@@ -11,8 +11,6 @@
 import { config } from './config.js';
 import {logWarn} from './utils.js';
 
-let RI = new WeakMap();
-
 /**
  * Prepend a URL with the page's protocol (http/https), if necessary.
  */
@@ -254,19 +252,10 @@ export function detectReferer(win) {
     };
   }
 
-  return function() {
-    if (!RI.has(win)) {
-      RI.set(win, Object.freeze(refererInfo()));
-    }
-    return RI.get(win);
-  }
+  return refererInfo;
 }
 
 /**
  * @type {function(): refererInfo}
  */
 export const getRefererInfo = detectReferer(window);
-
-export function resetRefererInfo() {
-  RI = new WeakMap();
-}
diff --git a/test/spec/modules/enrichmentFpdModule_spec.js b/test/spec/modules/enrichmentFpdModule_spec.js
index 6aff2d3ceff..acdf873d7a6 100644
--- a/test/spec/modules/enrichmentFpdModule_spec.js
+++ b/test/spec/modules/enrichmentFpdModule_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import {getRefererInfo, resetRefererInfo} from 'src/refererDetection.js';
+import { getRefererInfo } from 'src/refererDetection.js';
 import { processFpd, coreStorage } from 'modules/enrichmentFpdModule.js';
 
 describe('the first party data enrichment module', function() {
@@ -20,7 +20,6 @@ describe('the first party data enrichment module', function() {
   });
 
   beforeEach(function() {
-    resetRefererInfo();
     querySelectorStub = sinon.stub(window.top.document, 'querySelector');
     querySelectorStub.withArgs("link[rel='canonical']").returns(canonical);
     querySelectorStub.withArgs("meta[name='keywords']").returns(keywords);
diff --git a/test/spec/modules/fpdModule_spec.js b/test/spec/modules/fpdModule_spec.js
index cf2ad4afe6f..498bed29243 100644
--- a/test/spec/modules/fpdModule_spec.js
+++ b/test/spec/modules/fpdModule_spec.js
@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import {config} from 'src/config.js';
-import {getRefererInfo, resetRefererInfo} from 'src/refererDetection.js';
+import {getRefererInfo} from 'src/refererDetection.js';
 import {processFpd, registerSubmodules, startAuctionHook, reset} from 'modules/fpdModule/index.js';
 import * as enrichmentModule from 'modules/enrichmentFpdModule.js';
 import * as validationModule from 'modules/validationFpdModule/index.js';
@@ -70,7 +70,6 @@ describe('the first party data module', function () {
     });
 
     beforeEach(function() {
-      resetRefererInfo();
       querySelectorStub = sinon.stub(window.top.document, 'querySelector');
       querySelectorStub.withArgs("link[rel='canonical']").returns(canonical);
       querySelectorStub.withArgs("meta[name='keywords']").returns(keywords);

From 07835d1b00e2c315fc6a7f9535caf5cb0c9c00f9 Mon Sep 17 00:00:00 2001
From: ahmadlob <109217988+ahmadlob@users.noreply.github.com>
Date: Tue, 6 Sep 2022 19:52:33 +0300
Subject: [PATCH 222/569] Taboola Bid Adapter: Support Dynamic Endpoint Url
 Param (#8949)

* update-ttl-passing

* Update taboolaBidAdapter_spec.js

* add fallback default value in case of null

* add semicolons

* .

* .

* .

* ..

* ...

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url
---
 modules/taboolaBidAdapter.js                |  4 +-
 modules/taboolaBidAdapter.md                | 18 ++---
 test/spec/modules/taboolaBidAdapter_spec.js | 77 +++++++++++++++++++++
 3 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/modules/taboolaBidAdapter.js b/modules/taboolaBidAdapter.js
index 8db98409a76..ac4fed11fb6 100644
--- a/modules/taboolaBidAdapter.js
+++ b/modules/taboolaBidAdapter.js
@@ -84,7 +84,7 @@ export const spec = {
   buildRequests: (validBidRequests, bidderRequest) => {
     const [bidRequest] = validBidRequests;
     const {refererInfo, gdprConsent = {}, uspConsent} = bidderRequest;
-    const {publisherId} = bidRequest.params;
+    const {publisherId, endpointUrl} = bidRequest.params;
     const site = getSiteProperties(bidRequest.params, refererInfo);
     const device = {ua: navigator.userAgent};
     const imps = getImps(validBidRequests);
@@ -128,7 +128,7 @@ export const spec = {
       regs
     };
 
-    const url = [END_POINT_URL, publisherId].join('/');
+    const url = [endpointUrl || END_POINT_URL, publisherId].join('/');
 
     return {
       url,
diff --git a/modules/taboolaBidAdapter.md b/modules/taboolaBidAdapter.md
index 33e72592796..d63616d23a9 100644
--- a/modules/taboolaBidAdapter.md
+++ b/modules/taboolaBidAdapter.md
@@ -30,7 +30,8 @@ The Taboola Bidding adapter requires setup before beginning. Please contact us o
       publisherId: 'tester-pub', // your-publisher-id
       bidfloor: 0.25, // Optional - default is null
       bcat: ['IAB1-1'], // Optional - default is []
-      badv: ['example.com']  // Optional - default is []
+      badv: ['example.com'],  // Optional - default is []
+      endpointUrl: ['https://example.com']  // Optional
     }
   }]
 }];
@@ -38,12 +39,13 @@ The Taboola Bidding adapter requires setup before beginning. Please contact us o
 
 # Parameters
 
-| Name           | Scope    | Description                                             | Example                    | Type         |
-|----------------|----------|---------------------------------------------------------|----------------------------|--------------|
-| `tagId`        | required | Tag ID / Placement Name <br>                            | `'Below The Article'`      | `String`     |
-| `publisherId`  | required | Numeric Publisher ID <br>(as provided by Taboola)       | `'1234567'`                | `String`     |
-| `bcat`         | optional | List of blocked advertiser categories (IAB)             | `['IAB1-1']`               | `Array`      |
-| `badv`         | optional | Blocked Advertiser Domains                              | `'example.com'`            | `String Url` |
-| `bidfloor`     | optional | CPM bid floor                                           | `0.25`                     | `Float`      |
+| Name          | Scope    | Description                                             | Example                    | Type         |
+|---------------|----------|---------------------------------------------------------|----------------------------|--------------|
+| `tagId`       | required | Tag ID / Placement Name <br>                            | `'Below The Article'`      | `String`     |
+| `publisherId` | required | Numeric Publisher ID <br>(as provided by Taboola)       | `'1234567'`                | `String`     |
+| `bcat`        | optional | List of blocked advertiser categories (IAB)             | `['IAB1-1']`               | `Array`      |
+| `badv`        | optional | Blocked Advertiser Domains                              | `'example.com'`            | `String Url` |
+| `bidfloor`    | optional | CPM bid floor                                           | `0.25`                     | `Float`      |
+| `endpointUrl` | optional | Endpoint Url (only if provided by Taboola)              | `https://example.com`      | `String`     |
 
 
diff --git a/test/spec/modules/taboolaBidAdapter_spec.js b/test/spec/modules/taboolaBidAdapter_spec.js
index 739335e8f1f..5899b03a26d 100644
--- a/test/spec/modules/taboolaBidAdapter_spec.js
+++ b/test/spec/modules/taboolaBidAdapter_spec.js
@@ -89,6 +89,45 @@ describe('Taboola Adapter', function () {
       }
       expect(spec.isBidRequestValid(bid)).to.equal(true)
     })
+
+    it('should succeed when url is null', function () {
+      const bid = {
+        bidder: 'taboola',
+        params: {
+          publisherId: 'publisherId',
+          tagId: 'below the article',
+          endpointUrl: null
+        },
+        ...displayBidRequestParams
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(true)
+    })
+
+    it('should succeed when url is empty string', function () {
+      const bid = {
+        bidder: 'taboola',
+        params: {
+          publisherId: 'publisherId',
+          tagId: 'below the article',
+          endpointUrl: ''
+        },
+        ...displayBidRequestParams
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(true)
+    })
+
+    it('should succeed when url is filled', function () {
+      const bid = {
+        bidder: 'taboola',
+        params: {
+          publisherId: 'publisherId',
+          tagId: 'below the article',
+          endpointUrl: 'https://example.com'
+        },
+        ...displayBidRequestParams
+      }
+      expect(spec.isBidRequestValid(bid)).to.equal(true)
+    })
   })
 
   describe('buildRequests', function () {
@@ -148,6 +187,44 @@ describe('Taboola Adapter', function () {
 
       expect(res.url).to.equal(`${END_POINT_URL}/${commonBidRequest.params.publisherId}`);
       expect(res.data).to.deep.equal(JSON.stringify(expectedData));
+    });
+
+    it('should fill the url when it is passed', function () {
+      const commonBidRequestWithUrl = {
+        bidder: 'taboola',
+        params: {
+          publisherId: 'publisherId',
+          tagId: 'placement name',
+          endpointUrl: 'https://example.com'
+        },
+        bidId: 'aa43860a-4644-442a-b5e0-93f268cs4d19',
+        auctionId: '65746dca-26f3-4186-be13-dfa63469b1b7',
+      }
+      let defaultBidRequestWithUrl = {
+        ...commonBidRequestWithUrl,
+        ...displayBidRequestParams,
+      }
+      const res = spec.buildRequests([defaultBidRequestWithUrl], commonBidderRequest);
+      expect(res.url).to.equal(`${commonBidRequestWithUrl.params.endpointUrl}/${commonBidRequest.params.publisherId}`);
+    })
+
+    it('should fill default url when url param is empty string', function () {
+      const commonBidRequestWithUrl = {
+        bidder: 'taboola',
+        params: {
+          publisherId: 'publisherId',
+          tagId: 'placement name',
+          endpointUrl: ''
+        },
+        bidId: 'aa43860a-4644-442a-b5e0-93f268cs4d19',
+        auctionId: '65746dca-26f3-4186-be13-dfa63469b1b7',
+      }
+      let defaultBidRequestWithUrl = {
+        ...commonBidRequestWithUrl,
+        ...displayBidRequestParams,
+      }
+      const res = spec.buildRequests([defaultBidRequestWithUrl], commonBidderRequest);
+      expect(res.url).to.equal(`${END_POINT_URL}/${commonBidRequestWithUrl.params.publisherId}`);
     })
 
     it('should pass optional parameters in request', function () {

From a87efe77aaf009597b55b9f80341bc9a7d815c1d Mon Sep 17 00:00:00 2001
From: Andrea <fasenderos@gmail.com>
Date: Tue, 6 Sep 2022 19:08:33 +0200
Subject: [PATCH 223/569] fix(debugging): fix DOMException: Failed to read the
 'sessionStorage' (#8935)

close issue #8934
---
 src/debugging.js | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/debugging.js b/src/debugging.js
index 817ec66e320..f5d13d1a134 100644
--- a/src/debugging.js
+++ b/src/debugging.js
@@ -70,14 +70,22 @@ export function debuggingControls({load = debuggingModuleLoader(), hook = getHoo
 const ctl = debuggingControls();
 export const reset = ctl.reset;
 
-export function loadSession({storage = window.sessionStorage, debugging = ctl} = {}) {
-  let config = null;
+export function loadSession() {
+  let storage = null;
   try {
-    config = storage.getItem(DEBUG_KEY);
+    storage = window.sessionStorage;
   } catch (e) {}
-  if (config != null) {
-    // just make sure the module runs; it will take care of parsing the config (and disabling itself if necessary)
-    debugging.enable();
+
+  if (storage !== null) {
+    let debugging = ctl;
+    let config = null;
+    try {
+      config = storage.getItem(DEBUG_KEY);
+    } catch (e) {}
+    if (config !== null) {
+      // just make sure the module runs; it will take care of parsing the config (and disabling itself if necessary)
+      debugging.enable();
+    }
   }
 }
 

From 789de5523ff28868a840cda8a4fd585b16c29a67 Mon Sep 17 00:00:00 2001
From: gabrielIvbs <112690249+gabrielIvbs@users.noreply.github.com>
Date: Tue, 6 Sep 2022 20:45:54 +0300
Subject: [PATCH 224/569] added prevent page view event param in order to
 differentiate from the first and following request on multi request; added
 disableUserSyncs in order to disable that functionality as default and added
 the option to activate it from the bidRequest (#8944)

---
 modules/invibesBidAdapter.js                | 33 ++++++++++++++-------
 test/spec/modules/invibesBidAdapter_spec.js | 33 +++++++++++++++++++--
 2 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/modules/invibesBidAdapter.js b/modules/invibesBidAdapter.js
index 2f80b89fb9c..c3e5cf6cca8 100644
--- a/modules/invibesBidAdapter.js
+++ b/modules/invibesBidAdapter.js
@@ -9,11 +9,12 @@ const CONSTANTS = {
   SYNC_ENDPOINT: 'https://k.r66net.com/GetUserSync',
   TIME_TO_LIVE: 300,
   DEFAULT_CURRENCY: 'EUR',
-  PREBID_VERSION: 8,
+  PREBID_VERSION: 9,
   METHOD: 'GET',
   INVIBES_VENDOR_ID: 436,
   USERID_PROVIDERS: ['pubcid', 'pubProvidedId', 'uid2', 'zeotapIdPlus', 'id5id'],
-  META_TAXONOMY: ['networkId', 'networkName', 'agencyId', 'agencyName', 'advertiserId', 'advertiserName', 'advertiserDomains', 'brandId', 'brandName', 'primaryCatId', 'secondaryCatIds', 'mediaType']
+  META_TAXONOMY: ['networkId', 'networkName', 'agencyId', 'agencyName', 'advertiserId', 'advertiserName', 'advertiserDomains', 'brandId', 'brandName', 'primaryCatId', 'secondaryCatIds', 'mediaType'],
+  DISABLE_USER_SYNC: true
 };
 
 const storage = getStorageManager({gvlid: CONSTANTS.INVIBES_VENDOR_ID, bidderCode: CONSTANTS.BIDDER_CODE});
@@ -40,15 +41,7 @@ export const spec = {
   interpretResponse: function (responseObj, requestParams) {
     return handleResponse(responseObj, requestParams != null ? requestParams.bidRequests : null);
   },
-  getUserSyncs: function (syncOptions) {
-    if (syncOptions.iframeEnabled) {
-      const syncUrl = buildSyncUrl();
-      return {
-        type: 'iframe',
-        url: syncUrl
-      };
-    }
-  }
+  getUserSyncs: getUserSync,
 };
 
 registerBidder(spec);
@@ -60,7 +53,9 @@ invibes.purposes = invibes.purposes || [false, false, false, false, false, false
 invibes.legitimateInterests = invibes.legitimateInterests || [false, false, false, false, false, false, false, false, false, false];
 invibes.placementBids = invibes.placementBids || [];
 invibes.pushedCids = invibes.pushedCids || {};
+let preventPageViewEvent = false;
 let _customUserSync;
+let _disableUserSyncs;
 
 function isBidRequestValid(bid) {
   if (typeof bid.params !== 'object') {
@@ -75,6 +70,18 @@ function isBidRequestValid(bid) {
   return true;
 }
 
+function getUserSync(syncOptions) {
+  if (syncOptions.iframeEnabled) {
+    if (!(_disableUserSyncs == null || _disableUserSyncs == undefined ? CONSTANTS.DISABLE_USER_SYNC : _disableUserSyncs)) {
+      const syncUrl = buildSyncUrl();
+      return {
+        type: 'iframe',
+        url: syncUrl
+      };
+    }
+  }
+}
+
 function buildRequest(bidRequests, bidderRequest) {
   bidderRequest = bidderRequest || {};
   const _placementIds = [];
@@ -89,6 +96,7 @@ function buildRequest(bidRequests, bidderRequest) {
     _domainId = _domainId || bidRequest.params.domainId;
     _customEndpoint = _customEndpoint || bidRequest.params.customEndpoint;
     _customUserSync = _customUserSync || bidRequest.params.customUserSync;
+    _disableUserSyncs = bidRequest?.params?.disableUserSyncs;
     _userId = _userId || bidRequest.userId;
   });
 
@@ -129,6 +137,7 @@ function buildRequest(bidRequests, bidderRequest) {
 
     tc: invibes.gdpr_consent,
     isLocalStorageEnabled: storage.hasLocalStorage(),
+    preventPageViewEvent: preventPageViewEvent,
   };
 
   let lid = readFromLocalStorage('ivbsdid');
@@ -158,6 +167,8 @@ function buildRequest(bidRequests, bidderRequest) {
 
   let endpoint = createEndpoint(_customEndpoint, _domainId, _placementIds);
 
+  preventPageViewEvent = true;
+
   return {
     method: CONSTANTS.METHOD,
     url: endpoint,
diff --git a/test/spec/modules/invibesBidAdapter_spec.js b/test/spec/modules/invibesBidAdapter_spec.js
index 971af98411f..2b98a9f8960 100644
--- a/test/spec/modules/invibesBidAdapter_spec.js
+++ b/test/spec/modules/invibesBidAdapter_spec.js
@@ -14,7 +14,9 @@ describe('invibesBidAdapter:', function () {
       bidder: BIDDER_CODE,
       bidderRequestId: 'r1',
       params: {
-        placementId: PLACEMENT_ID
+        placementId: PLACEMENT_ID,
+        disableUserSyncs: false
+
       },
       adUnitCode: 'test-div1',
       auctionId: 'a1',
@@ -29,7 +31,8 @@ describe('invibesBidAdapter:', function () {
       bidder: BIDDER_CODE,
       bidderRequestId: 'r2',
       params: {
-        placementId: 'abcde'
+        placementId: 'abcde',
+        disableUserSyncs: false
       },
       adUnitCode: 'test-div2',
       auctionId: 'a2',
@@ -170,6 +173,16 @@ describe('invibesBidAdapter:', function () {
   });
 
   describe('buildRequests', function () {
+    it('sends preventPageViewEvent as false on first call', function () {
+      let request = spec.buildRequests(bidRequests);
+      expect(request.data.preventPageViewEvent).to.be.false;
+    });
+
+    it('sends preventPageViewEvent as true on 2nd call', function () {
+      let request = spec.buildRequests(bidRequests);
+      expect(request.data.preventPageViewEvent).to.be.true;
+    });
+
     it('sends bid request to ENDPOINT via GET', function () {
       const request = spec.buildRequests(bidRequests);
       expect(request.url).to.equal(ENDPOINT);
@@ -1200,7 +1213,15 @@ describe('invibesBidAdapter:', function () {
   });
 
   describe('getUserSyncs', function () {
+    it('returns undefined if disableUserSyncs not passed as bid request param ', function () {
+      spec.buildRequests(bidRequestsWithUserId);
+      let response = spec.getUserSyncs({iframeEnabled: true});
+      expect(response).to.equal(undefined);
+    });
+
     it('returns an iframe if enabled', function () {
+      spec.buildRequests(bidRequests);
+
       let response = spec.getUserSyncs({iframeEnabled: true});
       expect(response.type).to.equal('iframe');
       expect(response.url).to.include(SYNC_ENDPOINT);
@@ -1208,6 +1229,8 @@ describe('invibesBidAdapter:', function () {
 
     it('returns an iframe with params if enabled', function () {
       top.window.invibes.optIn = 1;
+      spec.buildRequests(bidRequests);
+
       let response = spec.getUserSyncs({iframeEnabled: true});
       expect(response.type).to.equal('iframe');
       expect(response.url).to.include(SYNC_ENDPOINT);
@@ -1216,6 +1239,8 @@ describe('invibesBidAdapter:', function () {
 
     it('returns an iframe with params including if enabled', function () {
       top.window.invibes.optIn = 1;
+      spec.buildRequests(bidRequests);
+
       global.document.cookie = 'ivbsdid={"id":"dvdjkams6nkq","cr":' + Date.now() + ',"hc":0}';
       SetBidderAccess();
 
@@ -1227,7 +1252,9 @@ describe('invibesBidAdapter:', function () {
     });
 
     it('returns an iframe with params including if enabled read from LocalStorage', function () {
+      spec.buildRequests(bidRequests);
       top.window.invibes.optIn = 1;
+
       localStorage.ivbsdid = 'dvdjkams6nkq';
       SetBidderAccess();
 
@@ -1239,6 +1266,8 @@ describe('invibesBidAdapter:', function () {
     });
 
     it('returns undefined if iframe not enabled ', function () {
+      spec.buildRequests(bidRequests);
+
       let response = spec.getUserSyncs({iframeEnabled: false});
       expect(response).to.equal(undefined);
     });

From dc9e5c7e6277b26d49f6398d299be88d634e45bd Mon Sep 17 00:00:00 2001
From: Andrew Slagle <42588549+spotxslagle@users.noreply.github.com>
Date: Tue, 6 Sep 2022 11:50:04 -0600
Subject: [PATCH 225/569] SpotX Bid Adapter: Support UID2 (#8933)

* SpotX Adapter: Implement UID2 support

* SpotX Adapter: Add UID2 Testing

* Implement and Test Prebid userIdAsEids

* Lint fix
---
 modules/spotxBidAdapter.js                | 36 ++++++---------------
 test/spec/modules/spotxBidAdapter_spec.js | 38 ++++++++++++++++++-----
 2 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/modules/spotxBidAdapter.js b/modules/spotxBidAdapter.js
index 8a18d4973d3..31009370d0d 100644
--- a/modules/spotxBidAdapter.js
+++ b/modules/spotxBidAdapter.js
@@ -257,18 +257,17 @@ export const spec = {
         deepSetValue(requestPayload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
       }
 
-      // ID5 fied
-      if (deepAccess(bid, 'userId.id5id.uid')) {
-        userExt.eids = userExt.eids || [];
-        userExt.eids.push(
-          {
-            source: 'id5-sync.com',
-            uids: [{
-              id: bid.userId.id5id.uid,
-              ext: bid.userId.id5id.ext || {}
-            }]
+      if (bid.userIdAsEids) {
+        userExt.eids = bid.userIdAsEids;
+
+        userExt.eids.forEach(eid => {
+          if (eid.source === 'uidapi.com') {
+            eid.uids.forEach(uid => {
+              uid.ext = uid.ext || {};
+              uid.ext.rtiPartner = 'UID2'
+            });
           }
-        );
+        });
       }
 
       // Add common id if available
@@ -285,21 +284,6 @@ export const spec = {
         };
       }
 
-      if (bid && bid.userId && bid.userId.tdid) {
-        userExt.eids = userExt.eids || [];
-        userExt.eids.push(
-          {
-            source: 'adserver.org',
-            uids: [{
-              id: bid.userId.tdid,
-              ext: {
-                rtiPartner: 'TDID'
-              }
-            }]
-          }
-        );
-      }
-
       // Only add the user object if it's not empty
       if (!isEmpty(userExt)) {
         requestPayload.user = { ext: userExt };
diff --git a/test/spec/modules/spotxBidAdapter_spec.js b/test/spec/modules/spotxBidAdapter_spec.js
index 74eaf669bce..90bd931d8ce 100644
--- a/test/spec/modules/spotxBidAdapter_spec.js
+++ b/test/spec/modules/spotxBidAdapter_spec.js
@@ -158,10 +158,22 @@ describe('the spotx adapter', function () {
         position: 1
       };
 
-      bid.userId = {
-        id5id: { uid: 'id5id_1' },
-        tdid: 'tdid_1'
-      };
+      bid.userIdAsEids = [{
+        source: 'adserver.org',
+        uids: [{id: 'tdid_1', atype: 1, ext: {rtiPartner: 'TDID'}}]
+      },
+      {
+        source: 'id5-sync.com',
+        uids: [{id: 'id5id_1', ext: {}}]
+      },
+      {
+        source: 'uidapi.com',
+        uids: [{
+          id: 'uid_1',
+          atype: 3
+        }]
+      }
+      ];
 
       bid.crumbs = {
         pubcid: 'pubcid_1'
@@ -205,6 +217,15 @@ describe('the spotx adapter', function () {
       expect(request.data.user.ext).to.deep.equal({
         consented_providers_settings: GOOGLE_CONSENT,
         eids: [{
+          source: 'adserver.org',
+          uids: [{
+            id: 'tdid_1',
+            atype: 1,
+            ext: {
+              rtiPartner: 'TDID'
+            }
+          }]
+        }, {
           source: 'id5-sync.com',
           uids: [{
             id: 'id5id_1',
@@ -212,16 +233,17 @@ describe('the spotx adapter', function () {
           }]
         },
         {
-          source: 'adserver.org',
+          source: 'uidapi.com',
           uids: [{
-            id: 'tdid_1',
+            id: 'uid_1',
+            atype: 3,
             ext: {
-              rtiPartner: 'TDID'
+              rtiPartner: 'UID2'
             }
           }]
         }],
         fpc: 'pubcid_1'
-      })
+      });
 
       expect(request.data.source).to.deep.equal({
         ext: {

From 75818b998a683c565d31f00d47f3b96f8ad689f2 Mon Sep 17 00:00:00 2001
From: Nayan Savla <nsavla@yieldmo.com>
Date: Tue, 6 Sep 2022 11:02:25 -0700
Subject: [PATCH 226/569] Yieldmo Adapter: Pass Auction Id and Transaction Id
 in Bid Request (#8901)

* Add stage bidder service

* add stage url

* fix url

* fix string method

* clean up rebase

* Adding transaction id and auction id.

* Removing state url code

* Clean up

* Adding new line

* Reading transaction id from impression.

getting transaction id from imp.ext.tid

Co-authored-by: elber@yieldmo.com <elber@yieldmo.com>
Co-authored-by: Elber Carneiro <81249884+ym-elber@users.noreply.github.com>
---
 modules/yieldmoBidAdapter.js                | 17 +++++++-
 test/spec/modules/yieldmoBidAdapter_spec.js | 46 +++++++++++++++++++--
 2 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/modules/yieldmoBidAdapter.js b/modules/yieldmoBidAdapter.js
index 3149dcb7f5c..892936ceea5 100644
--- a/modules/yieldmoBidAdapter.js
+++ b/modules/yieldmoBidAdapter.js
@@ -242,6 +242,17 @@ function addPlacement(request) {
   if (gpid) {
     placementInfo.gpid = gpid;
   }
+
+  // get the transaction id for the banner bid.
+  const transactionId = deepAccess(request, 'ortb2Imp.ext.tid');
+
+  if (transactionId) {
+    placementInfo.tid = transactionId;
+  }
+
+  if (request.auctionId) {
+    placementInfo.auctionId = request.auctionId;
+  }
   return JSON.stringify(placementInfo);
 }
 
@@ -382,6 +393,9 @@ function openRtbRequest(bidRequests, bidderRequest) {
     openRtbRequest.schain = schain;
   }
 
+  if (bidRequests[0].auctionId) {
+    openRtbRequest.auctionId = bidRequests[0].auctionId;
+  }
   populateOpenRtbGdpr(openRtbRequest, bidderRequest);
 
   return openRtbRequest;
@@ -399,7 +413,8 @@ function openRtbImpression(bidRequest) {
     tagid: bidRequest.adUnitCode,
     bidfloor: getBidFloor(bidRequest, VIDEO),
     ext: {
-      placement_id: bidRequest.params.placementId
+      placement_id: bidRequest.params.placementId,
+      tid: deepAccess(bidRequest, 'ortb2Imp.ext.tid')
     },
     video: {
       w: size[0],
diff --git a/test/spec/modules/yieldmoBidAdapter_spec.js b/test/spec/modules/yieldmoBidAdapter_spec.js
index f36c804a18b..32f0ead11f1 100644
--- a/test/spec/modules/yieldmoBidAdapter_spec.js
+++ b/test/spec/modules/yieldmoBidAdapter_spec.js
@@ -2,6 +2,9 @@ import { expect } from 'chai';
 import { spec } from 'modules/yieldmoBidAdapter.js';
 import * as utils from 'src/utils.js';
 
+/* eslint no-console: ["error", { allow: ["log", "warn", "error"] }] */
+// above is used for debugging purposes only
+
 describe('YieldmoAdapter', function () {
   const BANNER_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebid';
   const VIDEO_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebidvideo';
@@ -38,6 +41,7 @@ describe('YieldmoAdapter', function () {
     bidder: 'yieldmo',
     adUnitCode: 'adunit-code-video',
     bidId: '321video123',
+    auctionId: '1d1a03073455',
     mediaTypes: {
       video: {
         playerSize: [640, 480],
@@ -172,15 +176,15 @@ describe('YieldmoAdapter', function () {
       it('should place bid information into the p parameter of data', function () {
         let bidArray = [mockBannerBid()];
         expect(buildAndGetPlacementInfo(bidArray)).to.equal(
-          '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1}]'
+          '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1,"auctionId":"1d1a030790a475"}]'
         );
 
         // multiple placements
         bidArray.push(mockBannerBid(
           {adUnitCode: 'adunit-2', bidId: '123a', bidderRequestId: '321', auctionId: '222'}, {bidFloor: 0.2}));
         expect(buildAndGetPlacementInfo(bidArray)).to.equal(
-          '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1},' +
-        '{"placement_id":"adunit-2","callback_id":"123a","sizes":[[300,250],[300,600]],"bidFloor":0.2}]'
+          '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1,"auctionId":"1d1a030790a475"},' +
+        '{"placement_id":"adunit-2","callback_id":"123a","sizes":[[300,250],[300,600]],"bidFloor":0.2,"auctionId":"222"}]'
         );
       });
 
@@ -218,6 +222,24 @@ describe('YieldmoAdapter', function () {
         expect(buildAndGetData([pubcidBid]).pubcid).to.deep.equal(pubcid);
       });
 
+      it('should add transaction id as parameter of request', function () {
+        const transactionId = '54a58774-7a41-494e-9aaf-fa7b79164f0c';
+        const pubcidBid = mockBannerBid({ ortb2Imp: {
+          ext: {
+            tid: '54a58774-7a41-494e-9aaf-fa7b79164f0c',
+          }
+        }});
+        const bidRequest = buildAndGetData([pubcidBid]);
+        expect(bidRequest.p).to.contain(transactionId);
+      });
+
+      it('should add auction id as parameter of request', function () {
+        const auctionId = '1d1a030790a475';
+        const pubcidBid = mockBannerBid({});
+        const bidRequest = buildAndGetData([pubcidBid]);
+        expect(bidRequest.p).to.contain(auctionId);
+      });
+
       it('should add unified id as parameter of request', function () {
         const unifiedIdBid = mockBannerBid({crumbs: undefined});
         expect(buildAndGetData([unifiedIdBid]).tdid).to.deep.equal(mockBannerBid().userId.tdid);
@@ -471,6 +493,24 @@ describe('YieldmoAdapter', function () {
         expect(requests[0].data.ats_envelope).to.equal(envelope);
       });
 
+      it('should add transaction id to video bid request', function() {
+        const transactionId = '54a58774-7a41-494e-8cbc-fa7b79164f0c';
+        const requestData = {
+          ortb2Imp: {
+            ext: {
+              tid: '54a58774-7a41-494e-8cbc-fa7b79164f0c',
+            }
+          }
+        };
+        expect(buildAndGetData([mockVideoBid({...requestData})]).imp[0].ext.tid).to.equal(transactionId);
+      });
+
+      it('should add auction id to video bid request', function() {
+        const auctionId = '1d1a03073455';
+
+        expect(buildAndGetData([mockVideoBid({})]).auctionId).to.deep.equal(auctionId);
+      });
+
       it('should add schain if it is in the bidRequest', () => {
         const schain = {
           ver: '1.0',

From 6e154c8cb7f6c996c41acd7aea229f609164eab0 Mon Sep 17 00:00:00 2001
From: Gena <wertixvost@gmail.com>
Date: Wed, 7 Sep 2022 15:47:21 +0200
Subject: [PATCH 227/569] OCM Add gvlid (#8961)

---
 modules/adtelligentBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/adtelligentBidAdapter.js b/modules/adtelligentBidAdapter.js
index 3dad2e98bcf..a7c83d9c190 100644
--- a/modules/adtelligentBidAdapter.js
+++ b/modules/adtelligentBidAdapter.js
@@ -43,7 +43,7 @@ export const spec = {
     { code: 'selectmedia', gvlid: 775 },
     { code: 'navelix', gvlid: 380 },
     'pgam',
-    'ocm',
+    { code: 'ocm', gvlid: 1148 },
     { code: 'vidcrunchllc', gvlid: 1145 },
   ],
   supportedMediaTypes: [VIDEO, BANNER],

From 1f54343d86e6dea9b224cb418c90d8bb8cb6b0c8 Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Wed, 7 Sep 2022 07:07:04 -0700
Subject: [PATCH 228/569] wlang support (#8962)

---
 modules/outbrainBidAdapter.js                |  9 ++++++---
 test/spec/modules/outbrainBidAdapter_spec.js | 21 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/modules/outbrainBidAdapter.js b/modules/outbrainBidAdapter.js
index d1e47f6437b..3db1da0d689 100644
--- a/modules/outbrainBidAdapter.js
+++ b/modules/outbrainBidAdapter.js
@@ -56,13 +56,15 @@ export const spec = {
   buildRequests: (validBidRequests, bidderRequest) => {
     // convert Native ORTB definition to old-style prebid native definition
     validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    const ortb2 = bidderRequest.ortb2 || {};
     const page = bidderRequest.refererInfo.page;
     const ua = navigator.userAgent;
     const test = setOnAny(validBidRequests, 'params.test');
     const publisher = setOnAny(validBidRequests, 'params.publisher');
-    const bcat = setOnAny(validBidRequests, 'params.bcat');
-    const badv = setOnAny(validBidRequests, 'params.badv');
-    const eids = setOnAny(validBidRequests, 'userIdAsEids')
+    const bcat = ortb2.bcat || setOnAny(validBidRequests, 'params.bcat');
+    const badv = ortb2.badv || setOnAny(validBidRequests, 'params.badv');
+    const eids = setOnAny(validBidRequests, 'userIdAsEids');
+    const wlang = ortb2.wlang;
     const cur = CURRENCY;
     const endpointUrl = config.getConfig('outbrain.bidderUrl');
     const timeout = bidderRequest.timeout;
@@ -109,6 +111,7 @@ export const spec = {
       imp: imps,
       bcat: bcat,
       badv: badv,
+      wlang: wlang,
       ext: {
         prebid: {
           channel: {
diff --git a/test/spec/modules/outbrainBidAdapter_spec.js b/test/spec/modules/outbrainBidAdapter_spec.js
index b55ad04eac3..5d7bebc1de1 100644
--- a/test/spec/modules/outbrainBidAdapter_spec.js
+++ b/test/spec/modules/outbrainBidAdapter_spec.js
@@ -318,6 +318,27 @@ describe('Outbrain Adapter', function () {
         expect(resData.badv).to.deep.equal(['bad-advertiser'])
       });
 
+      it('first party data', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ortb2: {
+            bcat: ['IAB1', 'IAB2-1'],
+            badv: ['domain1.com', 'domain2.com'],
+            wlang: ['en'],
+          },
+          ...commonBidderRequest,
+        }
+
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.bcat).to.deep.equal(bidderRequest.ortb2.bcat)
+        expect(resData.badv).to.deep.equal(bidderRequest.ortb2.badv)
+        expect(resData.wlang).to.deep.equal(bidderRequest.ortb2.wlang)
+      });
+
       it('should pass bidder timeout', function () {
         const bidRequest = {
           ...commonBidRequest,

From 9cfdc3508f656ccebc3037bbf5ab2fbe8d62973d Mon Sep 17 00:00:00 2001
From: Jeremy Sadwith <jeremy@kargo.com>
Date: Wed, 7 Sep 2022 11:12:14 -0400
Subject: [PATCH 229/569] Kargo: Add support for Social Canvas (#8898)

---
 modules/kargoBidAdapter.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/kargoBidAdapter.js b/modules/kargoBidAdapter.js
index deeb1cb8630..f4563081aa7 100644
--- a/modules/kargoBidAdapter.js
+++ b/modules/kargoBidAdapter.js
@@ -61,6 +61,13 @@ export const spec = {
       },
       prebidRawBidRequests: validBidRequests
     }, spec._getAllMetadata(bidderRequest, tdid));
+
+    // Pull Social Canvas segments and embed URL
+    if (validBidRequests.length > 0 && validBidRequests[0].params.socialCanvas) {
+      transformedParams.socialCanvasSegments = validBidRequests[0].params.socialCanvas.segments;
+      transformedParams.socialEmbedURL = validBidRequests[0].params.socialCanvas.embedURL;
+    }
+
     const encodedParams = encodeURIComponent(JSON.stringify(transformedParams));
     return Object.assign({}, bidderRequest, {
       method: 'GET',

From 779a022580b676f36a9673e8f4063a0bbb0d28d3 Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Wed, 7 Sep 2022 11:38:12 -0700
Subject: [PATCH 230/569] dependency fix (#8963)

---
 package-lock.json | 321 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 233 insertions(+), 88 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c01a9882363..a4ec906b8e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "7.13.0-pre",
+      "version": "7.14.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
@@ -3771,7 +3771,7 @@
     "node_modules/ansi-html": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "integrity": "sha512-JoAxEa1DfP9m2xfB/y2r/aKcwXNlltr4+0QSBC4TrLfcxyvepX2Pv0t/xpgGV5bGsDzCYV8SzjWgyCW0T9yYbA==",
       "dev": true,
       "engines": [
         "node >= 0.8.0"
@@ -7988,12 +7988,12 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "node_modules/ejs": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
-      "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
       "dev": true,
       "dependencies": {
-        "jake": "^10.6.1"
+        "jake": "^10.8.5"
       },
       "bin": {
         "ejs": "bin/cli.js"
@@ -9596,12 +9596,33 @@
       "optional": true
     },
     "node_modules/filelist": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
-      "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
       "dev": true,
       "dependencies": {
-        "minimatch": "^3.0.4"
+        "minimatch": "^5.0.1"
+      }
+    },
+    "node_modules/filelist/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/filelist/node_modules/minimatch": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/fill-range": {
@@ -10416,7 +10437,7 @@
     "node_modules/glob-stream": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
+      "integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==",
       "dev": true,
       "dependencies": {
         "extend": "^3.0.0",
@@ -10437,7 +10458,7 @@
     "node_modules/glob-stream/node_modules/glob-parent": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
       "dev": true,
       "dependencies": {
         "is-glob": "^3.1.0",
@@ -10604,7 +10625,7 @@
     "node_modules/glob-watcher/node_modules/glob-parent": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
       "dev": true,
       "dependencies": {
         "is-glob": "^3.1.0",
@@ -10786,9 +10807,9 @@
       }
     },
     "node_modules/got": {
-      "version": "11.8.3",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.3.tgz",
-      "integrity": "sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg==",
+      "version": "11.8.5",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
+      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
       "dev": true,
       "dependencies": {
         "@sindresorhus/is": "^4.0.0",
@@ -10852,7 +10873,7 @@
     "node_modules/gulp-clean": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.3.2.tgz",
-      "integrity": "sha1-o0fUc6zqQBgvk1WHpFGUFnGSgQI=",
+      "integrity": "sha512-1pSOrC+PLKkEQz1HFl5L+TG0LV3/Tz/Y25lRk1IjTsE/agXWcqeeicBFJ1vDgokF+musc0vSBdm3xLXUU8cP1Q==",
       "dev": true,
       "dependencies": {
         "gulp-util": "^2.2.14",
@@ -10957,7 +10978,7 @@
     "node_modules/gulp-clean/node_modules/gulp-util": {
       "version": "2.2.20",
       "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
-      "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=",
+      "integrity": "sha512-9rtv4sj9EtCWYGD15HQQvWtRBtU9g1t0+w29tphetHxjxEAuBKQJkhGqvlLkHEtUjEgoqIpsVwPKU1yMZAa+wA==",
       "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5",
       "dev": true,
       "dependencies": {
@@ -11061,7 +11082,7 @@
     "node_modules/gulp-clean/node_modules/lodash.template": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
-      "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
+      "integrity": "sha512-5yLOQwlS69xbaez3g9dA1i0GMAj8pLDHp8lhA4V7M1vRam1lqD76f0jg5EV+65frbqrXo1WH9ZfKalfYBzJ5yQ==",
       "dev": true,
       "dependencies": {
         "lodash._escapestringchar": "~2.4.1",
@@ -11114,9 +11135,9 @@
       }
     },
     "node_modules/gulp-clean/node_modules/meow/node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "node_modules/gulp-clean/node_modules/minimist": {
@@ -11823,7 +11844,7 @@
     "node_modules/gulp-eslint/node_modules/ajv": {
       "version": "5.5.2",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
       "dev": true,
       "dependencies": {
         "co": "^4.6.0",
@@ -11851,9 +11872,9 @@
       }
     },
     "node_modules/gulp-eslint/node_modules/ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -12601,7 +12622,7 @@
     "node_modules/gulp-util": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
+      "integrity": "sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==",
       "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5",
       "dev": true,
       "dependencies": {
@@ -12700,7 +12721,7 @@
     "node_modules/gulp-util/node_modules/lodash.template": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+      "integrity": "sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==",
       "dev": true,
       "dependencies": {
         "lodash._basecopy": "^3.0.0",
@@ -14388,13 +14409,13 @@
       }
     },
     "node_modules/jake": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz",
-      "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==",
+      "version": "10.8.5",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
       "dev": true,
       "dependencies": {
-        "async": "0.9.x",
-        "chalk": "^2.4.2",
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
         "filelist": "^1.0.1",
         "minimatch": "^3.0.4"
       },
@@ -14402,15 +14423,76 @@
         "jake": "bin/cli.js"
       },
       "engines": {
-        "node": "*"
+        "node": ">=10"
+      }
+    },
+    "node_modules/jake/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/jake/node_modules/async": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+      "dev": true
+    },
+    "node_modules/jake/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/jake/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jake/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/jake/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-diff": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
@@ -15129,9 +15211,9 @@
       }
     },
     "node_modules/karma-mocha-reporter/node_modules/ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -17074,13 +17156,13 @@
     "node_modules/mocha/node_modules/minimist": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
       "dev": true
     },
     "node_modules/mocha/node_modules/mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
       "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
       "dev": true,
       "dependencies": {
@@ -18199,9 +18281,9 @@
       }
     },
     "node_modules/parse-path": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-4.0.3.tgz",
-      "integrity": "sha512-9Cepbp2asKnWTJ9x2kpw6Fe8y9JDbqwahGCTvklzd/cEq5C5JC59x2Xb0Kx+x0QZ8bvNquGO8/BWP0cwBHzSAA==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-4.0.4.tgz",
+      "integrity": "sha512-Z2lWUis7jlmXC1jeOG9giRO2+FsuyNipeQ43HAjqAZjwSe3SEf+q/84FGPHoso3kyntbxa4c4i77t3m6fGf8cw==",
       "dev": true,
       "dependencies": {
         "is-ssh": "^1.3.0",
@@ -26429,7 +26511,7 @@
     "ansi-html": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "integrity": "sha512-JoAxEa1DfP9m2xfB/y2r/aKcwXNlltr4+0QSBC4TrLfcxyvepX2Pv0t/xpgGV5bGsDzCYV8SzjWgyCW0T9yYbA==",
       "dev": true
     },
     "ansi-regex": {
@@ -29764,12 +29846,12 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "ejs": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
-      "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz",
+      "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==",
       "dev": true,
       "requires": {
-        "jake": "^10.6.1"
+        "jake": "^10.8.5"
       }
     },
     "electron-to-chromium": {
@@ -31042,12 +31124,32 @@
       "optional": true
     },
     "filelist": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
-      "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
       "dev": true,
       "requires": {
-        "minimatch": "^3.0.4"
+        "minimatch": "^5.0.1"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        }
       }
     },
     "fill-range": {
@@ -31691,7 +31793,7 @@
     "glob-stream": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
+      "integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==",
       "dev": true,
       "requires": {
         "extend": "^3.0.0",
@@ -31709,7 +31811,7 @@
         "glob-parent": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
           "dev": true,
           "requires": {
             "is-glob": "^3.1.0",
@@ -31848,7 +31950,7 @@
         "glob-parent": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
           "dev": true,
           "requires": {
             "is-glob": "^3.1.0",
@@ -31996,9 +32098,9 @@
       }
     },
     "got": {
-      "version": "11.8.3",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.3.tgz",
-      "integrity": "sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg==",
+      "version": "11.8.5",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
+      "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
       "dev": true,
       "requires": {
         "@sindresorhus/is": "^4.0.0",
@@ -32047,7 +32149,7 @@
     "gulp-clean": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.3.2.tgz",
-      "integrity": "sha1-o0fUc6zqQBgvk1WHpFGUFnGSgQI=",
+      "integrity": "sha512-1pSOrC+PLKkEQz1HFl5L+TG0LV3/Tz/Y25lRk1IjTsE/agXWcqeeicBFJ1vDgokF+musc0vSBdm3xLXUU8cP1Q==",
       "dev": true,
       "requires": {
         "gulp-util": "^2.2.14",
@@ -32125,7 +32227,7 @@
         "gulp-util": {
           "version": "2.2.20",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
-          "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=",
+          "integrity": "sha512-9rtv4sj9EtCWYGD15HQQvWtRBtU9g1t0+w29tphetHxjxEAuBKQJkhGqvlLkHEtUjEgoqIpsVwPKU1yMZAa+wA==",
           "dev": true,
           "requires": {
             "chalk": "^0.5.0",
@@ -32212,7 +32314,7 @@
         "lodash.template": {
           "version": "2.4.1",
           "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
-          "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
+          "integrity": "sha512-5yLOQwlS69xbaez3g9dA1i0GMAj8pLDHp8lhA4V7M1vRam1lqD76f0jg5EV+65frbqrXo1WH9ZfKalfYBzJ5yQ==",
           "dev": true,
           "requires": {
             "lodash._escapestringchar": "~2.4.1",
@@ -32259,9 +32361,9 @@
           },
           "dependencies": {
             "minimist": {
-              "version": "1.2.5",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-              "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+              "version": "1.2.6",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+              "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
               "dev": true
             }
           }
@@ -32839,7 +32941,7 @@
         "ajv": {
           "version": "5.5.2",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
           "dev": true,
           "requires": {
             "co": "^4.6.0",
@@ -32862,9 +32964,9 @@
           "dev": true
         },
         "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
           "dev": true
         },
         "chardet": {
@@ -33495,7 +33597,7 @@
     "gulp-util": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
+      "integrity": "sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==",
       "dev": true,
       "requires": {
         "array-differ": "^1.0.0",
@@ -33578,7 +33680,7 @@
         "lodash.template": {
           "version": "3.6.2",
           "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-          "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+          "integrity": "sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==",
           "dev": true,
           "requires": {
             "lodash._basecopy": "^3.0.0",
@@ -34812,22 +34914,65 @@
       }
     },
     "jake": {
-      "version": "10.8.2",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz",
-      "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==",
+      "version": "10.8.5",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
+      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
       "dev": true,
       "requires": {
-        "async": "0.9.x",
-        "chalk": "^2.4.2",
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
         "filelist": "^1.0.1",
         "minimatch": "^3.0.4"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "async": {
-          "version": "0.9.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+          "version": "3.2.4",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+          "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         }
       }
     },
@@ -35439,9 +35584,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
           "dev": true
         },
         "strip-ansi": {
@@ -36965,13 +37110,13 @@
         "minimist": {
           "version": "0.0.8",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
           "dev": true
         },
         "mkdirp": {
           "version": "0.5.1",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
           "dev": true,
           "requires": {
             "minimist": "0.0.8"
@@ -37857,9 +38002,9 @@
       "dev": true
     },
     "parse-path": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-4.0.3.tgz",
-      "integrity": "sha512-9Cepbp2asKnWTJ9x2kpw6Fe8y9JDbqwahGCTvklzd/cEq5C5JC59x2Xb0Kx+x0QZ8bvNquGO8/BWP0cwBHzSAA==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-4.0.4.tgz",
+      "integrity": "sha512-Z2lWUis7jlmXC1jeOG9giRO2+FsuyNipeQ43HAjqAZjwSe3SEf+q/84FGPHoso3kyntbxa4c4i77t3m6fGf8cw==",
       "dev": true,
       "requires": {
         "is-ssh": "^1.3.0",

From edd2006270c778eecc87c3644531a1920bf5e846 Mon Sep 17 00:00:00 2001
From: Dmytro Shyrokov <shirokoffdima@gmail.com>
Date: Wed, 7 Sep 2022 21:43:47 +0300
Subject: [PATCH 231/569] add xe.works bid adapter (#8909)

---
 modules/xeBidAdapter.js                | 206 +++++++++++
 modules/xeBidAdapter.md                |  54 +++
 test/spec/modules/xeBidAdapter_spec.js | 450 +++++++++++++++++++++++++
 3 files changed, 710 insertions(+)
 create mode 100644 modules/xeBidAdapter.js
 create mode 100644 modules/xeBidAdapter.md
 create mode 100644 test/spec/modules/xeBidAdapter_spec.js

diff --git a/modules/xeBidAdapter.js b/modules/xeBidAdapter.js
new file mode 100644
index 00000000000..e7a251008bf
--- /dev/null
+++ b/modules/xeBidAdapter.js
@@ -0,0 +1,206 @@
+import { config } from '../src/config.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getAdUnitSizes, parseSizesInput, isFn, deepAccess, getBidIdParameter, logError, isArray } from '../src/utils.js';
+
+const CUR = 'USD';
+const BIDDER_CODE = 'xe';
+const ENDPOINT = 'https://pbjs.xe.works/bid';
+
+/**
+ * Determines whether or not the given bid request is valid.
+ *
+ * @param {BidRequest} bid The bid params to validate.
+ * @return boolean True  if this is a valid bid, and false otherwise.
+ */
+function isBidRequestValid(req) {
+  if (req && typeof req.params !== 'object') {
+    logError('Params is not defined or is incorrect in the bidder settings');
+    return false;
+  }
+
+  if (!getBidIdParameter('env', req.params) || !getBidIdParameter('placement', req.params)) {
+    logError('Env or placement is not present in bidder params');
+    return false;
+  }
+
+  if (deepAccess(req, 'mediaTypes.video') && !isArray(deepAccess(req, 'mediaTypes.video.playerSize'))) {
+    logError('mediaTypes.video.playerSize is required for video');
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * Make a server request from the list of BidRequests.
+ *
+ * @param {validBidRequest?pbjs_debug=trues[]} - an array of bids
+ * @return ServerRequest Info describing the request to the server.
+ */
+function buildRequests(validBidRequests, bidderRequest) {
+  const { refererInfo = {}, gdprConsent = {}, uspConsent } = bidderRequest;
+  const requests = validBidRequests.map(req => {
+    const request = {};
+    request.bidId = req.bidId;
+    request.banner = deepAccess(req, 'mediaTypes.banner');
+    request.auctionId = req.auctionId;
+    request.transactionId = req.transactionId;
+    request.sizes = parseSizesInput(getAdUnitSizes(req));
+    request.schain = req.schain;
+    request.location = {
+      page: refererInfo.page,
+      location: refererInfo.location,
+      domain: refererInfo.domain,
+      whost: window.location.host,
+      ref: refererInfo.ref,
+      isAmp: refererInfo.isAmp
+    };
+    request.device = {
+      ua: navigator.userAgent,
+      lang: navigator.language
+    };
+    request.env = {
+      env: req.params.env,
+      placement: req.params.placement
+    };
+    request.ortb2 = req.ortb2;
+    request.ortb2Imp = req.ortb2Imp;
+    request.tz = new Date().getTimezoneOffset();
+    request.ext = req.params.ext;
+    request.bc = req.bidRequestsCount;
+    request.floor = getBidFloor(req);
+
+    if (req.userIdAsEids && req.userIdAsEids.length !== 0) {
+      request.userEids = req.userIdAsEids;
+    } else {
+      request.userEids = [];
+    }
+    if (gdprConsent.gdprApplies) {
+      request.gdprApplies = Number(gdprConsent.gdprApplies);
+      request.consentString = gdprConsent.consentString;
+    } else {
+      request.gdprApplies = 0;
+      request.consentString = '';
+    }
+    if (uspConsent) {
+      request.usPrivacy = uspConsent;
+    } else {
+      request.usPrivacy = '';
+    }
+    if (config.getConfig('coppa')) {
+      request.coppa = 1;
+    } else {
+      request.coppa = 0;
+    }
+
+    const video = deepAccess(req, 'mediaTypes.video');
+    if (video) {
+      request.sizes = parseSizesInput(deepAccess(req, 'mediaTypes.video.playerSize'));
+      request.video = video;
+    }
+
+    return request;
+  });
+
+  return {
+    method: 'POST',
+    url: ENDPOINT,
+    data: JSON.stringify(requests),
+    withCredentials: true,
+    bidderRequest,
+    options: {
+      contentType: 'application/json'
+    }
+  };
+}
+
+/**
+ * Unpack the response from the server into a list of bids.
+ *
+ * @param {ServerResponse} serverResponse A successful response from the server.
+ * @return {Bid[]} An array of bids which were nested inside the server.
+ */
+function interpretResponse(serverResponse, { bidderRequest }) {
+  const response = [];
+  if (!isArray(deepAccess(serverResponse, 'body.data'))) {
+    return response;
+  }
+
+  serverResponse.body.data.forEach(serverBid => {
+    const bid = {
+      requestId: bidderRequest.bidId,
+      dealId: bidderRequest.dealId || null,
+      ...serverBid
+    };
+    response.push(bid);
+  });
+
+  return response;
+}
+
+/**
+* Register the user sync pixels which should be dropped after the auction.
+*
+* @param {SyncOptions} syncOptions Which user syncs are allowed?
+* @param {ServerResponse[]} serverResponses List of server's responses.
+* @return {UserSync[]} The user syncs which should be dropped.
+*/
+function getUserSyncs(syncOptions, serverResponses, gdprConsent = {}, uspConsent = '') {
+  const syncs = [];
+  const pixels = deepAccess(serverResponses, '0.body.data.0.ext.pixels');
+
+  if ((syncOptions.iframeEnabled || syncOptions.pixelEnabled) && isArray(pixels) && pixels.length !== 0) {
+    const gdprFlag = `&gdpr=${gdprConsent.gdprApplies ? 1 : 0}`;
+    const gdprString = `&gdpr_consent=${encodeURIComponent((gdprConsent.consentString || ''))}`;
+    const usPrivacy = `us_privacy=${encodeURIComponent(uspConsent)}`;
+
+    pixels.forEach(pixel => {
+      const [ type, url ] = pixel;
+      const sync = { type, url: `${url}&${usPrivacy}${gdprFlag}${gdprString}` };
+      if (type === 'iframe' && syncOptions.iframeEnabled) {
+        syncs.push(sync)
+      } else if (type === 'image' && syncOptions.pixelEnabled) {
+        syncs.push(sync)
+      }
+    });
+  }
+
+  return syncs;
+}
+
+/**
+* Get valid floor value from getFloor fuction.
+*
+* @param {Object} bid Current bid request.
+* @return {null|Number} Returns floor value when bid.getFloor is function and returns valid floor object with USD currency, otherwise returns null.
+*/
+export function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return null;
+  }
+
+  let floor = bid.getFloor({
+    currency: CUR,
+    mediaType: '*',
+    size: '*'
+  });
+
+  if (typeof floor === 'object' && !isNaN(floor.floor) && floor.currency === CUR) {
+    return floor.floor;
+  }
+
+  return null;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: [ 'xeworks', 'lunamediax' ],
+  supportedMediaTypes: [ BANNER, VIDEO ],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs
+}
+
+registerBidder(spec);
diff --git a/modules/xeBidAdapter.md b/modules/xeBidAdapter.md
new file mode 100644
index 00000000000..aad00cb45e8
--- /dev/null
+++ b/modules/xeBidAdapter.md
@@ -0,0 +1,54 @@
+# Overview
+
+```
+Module Name: xe Bidder Adapter
+Module Type: xe Bidder Adapter
+Maintainer: dima@xe.works
+```
+
+# Description
+
+Module that connects to xe.works demand sources
+
+# Test Parameters
+```
+var adUnits = [
+    {
+        code: 'test-banner',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]],
+            }
+        },
+        bids: [
+            {
+                bidder: 'xe',
+                params: {
+                    env: 'xe',
+                    placement: 'test-banner',
+                    ext: {}
+                }
+            }
+        ]
+    },
+    {
+        code: 'test-video',
+        sizes: [ [ 640, 480 ] ],
+        mediaTypes: {
+            video: {
+                playerSize: [640, 480],
+                context: 'instream',
+                skipppable: true
+            }
+        },
+        bids: [{
+            bidder: 'xe',
+            params: {
+                env: 'xe',
+                placement: 'test-video',
+                ext: {}
+            }
+        }]
+    }
+];
+```
\ No newline at end of file
diff --git a/test/spec/modules/xeBidAdapter_spec.js b/test/spec/modules/xeBidAdapter_spec.js
new file mode 100644
index 00000000000..dcd82683221
--- /dev/null
+++ b/test/spec/modules/xeBidAdapter_spec.js
@@ -0,0 +1,450 @@
+import { expect } from 'chai';
+import { config } from 'src/config.js';
+import { spec, getBidFloor } from 'modules/xeBidAdapter.js';
+import { deepClone } from 'src/utils';
+import { createEidsArray } from 'modules/userId/eids.js';
+
+const ENDPOINT = 'https://pbjs.xe.works/bid';
+
+const defaultRequest = {
+  adUnitCode: 'test',
+  bidId: '1',
+  requestId: 'qwerty',
+  auctionId: 'auctionId',
+  transactionId: 'tr1',
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250],
+        [300, 200]
+      ]
+    }
+  },
+  bidder: 'xe',
+  params: {
+    env: 'xe',
+    placement: 'test-banner',
+    ext: {}
+  },
+  bidRequestsCount: 1
+};
+
+const defaultRequestVideo = deepClone(defaultRequest);
+defaultRequestVideo.mediaTypes = {
+  video: {
+    playerSize: [640, 480],
+    context: 'instream',
+    skipppable: true
+  }
+};
+
+describe('isBidRequestValid', function () {
+  it('should return false when request params is missing', function () {
+    const invalidRequest = deepClone(defaultRequest);
+    delete invalidRequest.params;
+    expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+  });
+
+  it('should return false when required env param is missing', function () {
+    const invalidRequest = deepClone(defaultRequest);
+    delete invalidRequest.params.env;
+    expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+  });
+
+  it('should return false when required placement param is missing', function () {
+    const invalidRequest = deepClone(defaultRequest);
+    delete invalidRequest.params.placement;
+    expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+  });
+
+  it('should return false when video.playerSize is missing', function () {
+    const invalidRequest = deepClone(defaultRequestVideo);
+    delete invalidRequest.mediaTypes.video.playerSize;
+    expect(spec.isBidRequestValid(invalidRequest)).to.equal(false);
+  });
+
+  it('should return true when required params found', function () {
+    expect(spec.isBidRequestValid(defaultRequest)).to.equal(true);
+  });
+});
+
+describe('buildRequests', function () {
+  beforeEach(function () {
+    config.resetConfig();
+  });
+
+  it('should send request with correct structure', function () {
+    const request = spec.buildRequests([defaultRequest], {});
+    expect(request.method).to.equal('POST');
+    expect(request.url).to.equal(ENDPOINT);
+    expect(request.options).to.have.property('contentType').and.to.equal('application/json');
+    expect(request).to.have.property('data');
+  });
+
+  it('should build basic request structure', function () {
+    const request = JSON.parse(spec.buildRequests([defaultRequest], {}).data)[0];
+    expect(request).to.have.property('bidId').and.to.equal(defaultRequest.bidId);
+    expect(request).to.have.property('auctionId').and.to.equal(defaultRequest.auctionId);
+    expect(request).to.have.property('transactionId').and.to.equal(defaultRequest.transactionId);
+    expect(request).to.have.property('tz').and.to.equal(new Date().getTimezoneOffset());
+    expect(request).to.have.property('bc').and.to.equal(1);
+    expect(request).to.have.property('floor').and.to.equal(null);
+    expect(request).to.have.property('banner').and.to.deep.equal({ sizes: [[300, 250], [300, 200]] });
+    expect(request).to.have.property('gdprApplies').and.to.equal(0);
+    expect(request).to.have.property('consentString').and.to.equal('');
+    expect(request).to.have.property('userEids').and.to.deep.equal([]);
+    expect(request).to.have.property('usPrivacy').and.to.equal('');
+    expect(request).to.have.property('coppa').and.to.equal(0);
+    expect(request).to.have.property('sizes').and.to.deep.equal(['300x250', '300x200']);
+    expect(request).to.have.property('ext').and.to.deep.equal({});
+    expect(request).to.have.property('env').and.to.deep.equal({
+      env: 'xe',
+      placement: 'test-banner'
+    });
+    expect(request).to.have.property('device').and.to.deep.equal({
+      ua: navigator.userAgent,
+      lang: navigator.language
+    });
+  });
+
+  it('should build request with schain', function () {
+    const schainRequest = deepClone(defaultRequest);
+    schainRequest.schain = {
+      validation: 'strict',
+      config: {
+        ver: '1.0'
+      }
+    };
+    const request = JSON.parse(spec.buildRequests([schainRequest], {}).data)[0];
+    expect(request).to.have.property('schain').and.to.deep.equal({
+      validation: 'strict',
+      config: {
+        ver: '1.0'
+      }
+    });
+  });
+
+  it('should build request with location', function () {
+    const bidderRequest = {
+      refererInfo: {
+        page: 'page',
+        location: 'location',
+        domain: 'domain',
+        ref: 'ref',
+        isAmp: false
+      }
+    };
+    const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+    expect(request).to.have.property('location');
+    const location = request.location;
+    expect(location).to.have.property('page').and.to.equal('page');
+    expect(location).to.have.property('location').and.to.equal('location');
+    expect(location).to.have.property('domain').and.to.equal('domain');
+    expect(location).to.have.property('ref').and.to.equal('ref');
+    expect(location).to.have.property('isAmp').and.to.equal(false);
+  });
+
+  it('should build request with ortb2 info', function () {
+    const ortb2Request = deepClone(defaultRequest);
+    ortb2Request.ortb2 = {
+      site: {
+        name: 'name'
+      }
+    };
+    const request = JSON.parse(spec.buildRequests([ortb2Request], {}).data)[0];
+    expect(request).to.have.property('ortb2').and.to.deep.equal({
+      site: {
+        name: 'name'
+      }
+    });
+  });
+
+  it('should build request with ortb2Imp info', function () {
+    const ortb2ImpRequest = deepClone(defaultRequest);
+    ortb2ImpRequest.ortb2Imp = {
+      ext: {
+        data: {
+          pbadslot: 'home1',
+          adUnitSpecificAttribute: '1'
+        }
+      }
+    };
+    const request = JSON.parse(spec.buildRequests([ortb2ImpRequest], {}).data)[0];
+    expect(request).to.have.property('ortb2Imp').and.to.deep.equal({
+      ext: {
+        data: {
+          pbadslot: 'home1',
+          adUnitSpecificAttribute: '1'
+        }
+      }
+    });
+  });
+
+  it('should build request with valid bidfloor', function () {
+    const bfRequest = deepClone(defaultRequest);
+    bfRequest.getFloor = () => ({ floor: 5, currency: 'USD' });
+    const request = JSON.parse(spec.buildRequests([bfRequest], {}).data)[0];
+    expect(request).to.have.property('floor').and.to.equal(5);
+  });
+
+  it('should build request with gdpr consent data if applies', function () {
+    const bidderRequest = {
+      gdprConsent: {
+        gdprApplies: true,
+        consentString: 'qwerty'
+      }
+    };
+    const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+    expect(request).to.have.property('gdprApplies').and.equals(1);
+    expect(request).to.have.property('consentString').and.equals('qwerty');
+  });
+
+  it('should build request with usp consent data if applies', function () {
+    const bidderRequest = {
+      uspConsent: '1YA-'
+    };
+    const request = JSON.parse(spec.buildRequests([defaultRequest], bidderRequest).data)[0];
+    expect(request).to.have.property('usPrivacy').and.equals('1YA-');
+  });
+
+  it('should build request with coppa 1', function () {
+    config.setConfig({
+      coppa: true
+    });
+    const request = JSON.parse(spec.buildRequests([defaultRequest], {}).data)[0];
+    expect(request).to.have.property('coppa').and.equals(1);
+  });
+
+  it('should build request with extended ids', function () {
+    const idRequest = deepClone(defaultRequest);
+    idRequest.userIdAsEids = createEidsArray({
+      tdid: 'TTD_ID_FROM_USER_ID_MODULE',
+      pubcid: 'pubCommonId_FROM_USER_ID_MODULE'
+    });
+    const request = JSON.parse(spec.buildRequests([idRequest], {}).data)[0];
+    expect(request).to.have.property('userEids').and.deep.equal([
+      { source: 'adserver.org', uids: [ { id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } } ] },
+      { source: 'pubcid.org', uids: [ { id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 } ] }
+    ]);
+  });
+
+  it('should build request with video', function () {
+    const request = JSON.parse(spec.buildRequests([defaultRequestVideo], {}).data)[0];
+    expect(request).to.have.property('video').and.to.deep.equal({
+      playerSize: [640, 480],
+      context: 'instream',
+      skipppable: true
+    });
+    expect(request).to.have.property('sizes').and.to.deep.equal(['640x480']);
+  });
+});
+
+describe('interpretResponse', function () {
+  it('should return empty bids', function () {
+    const serverResponse = {
+      body: {
+        data: null
+      }
+    };
+
+    const invalidResponse = spec.interpretResponse(serverResponse, {});
+    expect(invalidResponse).to.be.an('array').that.is.empty;
+  });
+
+  it('should interpret valid response', function () {
+    const serverResponse = {
+      body: {
+        data: [{
+          requestId: 'qwerty',
+          cpm: 1,
+          currency: 'USD',
+          width: 300,
+          height: 250,
+          ttl: 600,
+          meta: {
+            advertiserDomains: ['xe.works']
+          },
+          ext: {
+            pixels: [
+              [ 'iframe', 'surl1' ],
+              [ 'image', 'surl2' ],
+            ]
+          }
+        }]
+      }
+    };
+
+    const validResponse = spec.interpretResponse(serverResponse, { bidderRequest: defaultRequest });
+    const bid = validResponse[0];
+    expect(validResponse).to.be.an('array').that.is.not.empty;
+    expect(bid.requestId).to.equal('qwerty');
+    expect(bid.cpm).to.equal(1);
+    expect(bid.currency).to.equal('USD');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.ttl).to.equal(600);
+    expect(bid.meta).to.deep.equal({ advertiserDomains: ['xe.works'] });
+  });
+
+  it('should interpret valid banner response', function () {
+    const serverResponse = {
+      body: {
+        data: [{
+          requestId: 'qwerty',
+          cpm: 1,
+          currency: 'USD',
+          width: 300,
+          height: 250,
+          ttl: 600,
+          mediaType: 'banner',
+          creativeId: 'xe-demo-banner',
+          ad: 'ad',
+          meta: {}
+        }]
+      }
+    };
+
+    const validResponseBanner = spec.interpretResponse(serverResponse, { bidderRequest: defaultRequest });
+    const bid = validResponseBanner[0];
+    expect(validResponseBanner).to.be.an('array').that.is.not.empty;
+    expect(bid.mediaType).to.equal('banner');
+    expect(bid.creativeId).to.equal('xe-demo-banner');
+    expect(bid.ad).to.equal('ad');
+  });
+
+  it('should interpret valid video response', function () {
+    const serverResponse = {
+      body: {
+        data: [{
+          requestId: 'qwerty',
+          cpm: 1,
+          currency: 'USD',
+          width: 600,
+          height: 480,
+          ttl: 600,
+          mediaType: 'video',
+          creativeId: 'xe-demo-video',
+          ad: 'vast-xml',
+          meta: {}
+        }]
+      }
+    };
+
+    const validResponseBanner = spec.interpretResponse(serverResponse, { bidderRequest: defaultRequestVideo });
+    const bid = validResponseBanner[0];
+    expect(validResponseBanner).to.be.an('array').that.is.not.empty;
+    expect(bid.mediaType).to.equal('video');
+    expect(bid.creativeId).to.equal('xe-demo-video');
+    expect(bid.ad).to.equal('vast-xml');
+  });
+});
+
+describe('getUserSyncs', function () {
+  it('shoukd handle no params', function () {
+    const opts = spec.getUserSyncs({}, []);
+    expect(opts).to.be.an('array').that.is.empty;
+  });
+
+  it('should return empty if sync is not allowed', function () {
+    const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: false});
+    expect(opts).to.be.an('array').that.is.empty;
+  });
+
+  it('should allow iframe sync', function () {
+    const opts = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, [{
+      body: {
+        data: [{
+          requestId: 'qwerty',
+          ext: {
+            pixels: [
+              [ 'iframe', 'surl1?a=b' ],
+              [ 'image', 'surl2?a=b' ],
+            ]
+          }
+        }]
+      }
+    }]);
+    expect(opts.length).to.equal(1);
+    expect(opts[0].type).to.equal('iframe');
+    expect(opts[0].url).to.equal('surl1?a=b&us_privacy=&gdpr=0&gdpr_consent=');
+  });
+
+  it('should allow pixel sync', function () {
+    const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [{
+      body: {
+        data: [{
+          requestId: 'qwerty',
+          ext: {
+            pixels: [
+              [ 'iframe', 'surl1?a=b' ],
+              [ 'image', 'surl2?a=b' ],
+            ]
+          }
+        }]
+      }
+    }]);
+    expect(opts.length).to.equal(1);
+    expect(opts[0].type).to.equal('image');
+    expect(opts[0].url).to.equal('surl2?a=b&us_privacy=&gdpr=0&gdpr_consent=');
+  });
+
+  it('should allow pixel sync and parse consent params', function () {
+    const opts = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, [{
+      body: {
+        data: [{
+          requestId: 'qwerty',
+          ext: {
+            pixels: [
+              [ 'iframe', 'surl1?a=b' ],
+              [ 'image', 'surl2?a=b' ],
+            ]
+          }
+        }]
+      }
+    }], {
+      gdprApplies: 1,
+      consentString: '1YA-'
+    });
+    expect(opts.length).to.equal(1);
+    expect(opts[0].type).to.equal('image');
+    expect(opts[0].url).to.equal('surl2?a=b&us_privacy=&gdpr=1&gdpr_consent=1YA-');
+  });
+});
+
+describe('getBidFloor', function () {
+  it('should return null when getFloor is not a function', () => {
+    const bid = { getFloor: 2 };
+    const result = getBidFloor(bid);
+    expect(result).to.be.null;
+  });
+
+  it('should return null when getFloor doesnt return an object', () => {
+    const bid = { getFloor: () => 2 };
+    const result = getBidFloor(bid);
+    expect(result).to.be.null;
+  });
+
+  it('should return null when floor is not a number', () => {
+    const bid = {
+      getFloor: () => ({ floor: 'string', currency: 'USD' })
+    };
+    const result = getBidFloor(bid);
+    expect(result).to.be.null;
+  });
+
+  it('should return null when currency is not USD', () => {
+    const bid = {
+      getFloor: () => ({ floor: 5, currency: 'EUR' })
+    };
+    const result = getBidFloor(bid);
+    expect(result).to.be.null;
+  });
+
+  it('should return floor value when everything is correct', () => {
+    const bid = {
+      getFloor: () => ({ floor: 5, currency: 'USD' })
+    };
+    const result = getBidFloor(bid);
+    expect(result).to.equal(5);
+  });
+});

From 496c817352537056cdb6a2f6cbc35577a70bb8cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Sep 2022 15:10:06 -0400
Subject: [PATCH 232/569] Bump parse-path and documentation (#8964)

Bumps [parse-path](https://github.com/IonicaBizau/parse-path) and [documentation](https://github.com/documentationjs/documentation). These dependencies needed to be updated together.

Updates `parse-path` from 4.0.4 to 5.0.0
- [Release notes](https://github.com/IonicaBizau/parse-path/releases)
- [Commits](https://github.com/IonicaBizau/parse-path/compare/4.0.4...5.0.0)

Updates `documentation` from 13.2.5 to 14.0.0
- [Release notes](https://github.com/documentationjs/documentation/releases)
- [Changelog](https://github.com/documentationjs/documentation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/documentationjs/documentation/compare/v13.2.5...v14.0.0)

---
updated-dependencies:
- dependency-name: parse-path
  dependency-type: indirect
- dependency-name: documentation
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 7382 ++++++++++++++++-----------------------------
 package.json      |    2 +-
 2 files changed, 2677 insertions(+), 4707 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a4ec906b8e2..edd991cdf45 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
         "chai": "^4.2.0",
         "coveralls": "^3.1.0",
         "deep-equal": "^2.0.3",
-        "documentation": "^13.2.5",
+        "documentation": "^14.0.0",
         "es5-shim": "^4.5.14",
         "eslint": "^7.27.0",
         "eslint-config-standard": "^10.2.1",
@@ -122,43 +122,43 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
+        "@babel/highlight": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz",
-      "integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.0.tgz",
+      "integrity": "sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.17.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz",
-      "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.0.tgz",
+      "integrity": "sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ==",
       "dependencies": {
         "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.3",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helpers": "^7.17.2",
-        "@babel/parser": "^7.17.3",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
-        "@babel/types": "^7.17.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.19.0",
+        "@babel/helper-compilation-targets": "^7.19.0",
+        "@babel/helper-module-transforms": "^7.19.0",
+        "@babel/helpers": "^7.19.0",
+        "@babel/parser": "^7.19.0",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
+        "json5": "^2.2.1",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -188,13 +188,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.3.tgz",
-      "integrity": "sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
+      "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
       "dependencies": {
-        "@babel/types": "^7.17.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+        "@babel/types": "^7.19.0",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "jsesc": "^2.5.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -224,13 +224,13 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
-      "integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz",
+      "integrity": "sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA==",
       "dependencies": {
-        "@babel/compat-data": "^7.16.4",
-        "@babel/helper-validator-option": "^7.16.7",
-        "browserslist": "^4.17.5",
+        "@babel/compat-data": "^7.19.0",
+        "@babel/helper-validator-option": "^7.18.6",
+        "browserslist": "^4.20.2",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -294,12 +294,9 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -316,35 +313,23 @@
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
-      "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
-      "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/template": "^7.18.10",
+        "@babel/types": "^7.19.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -373,18 +358,18 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.17.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz",
-      "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
+      "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-simple-access": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
-        "@babel/types": "^7.17.0"
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-simple-access": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -438,11 +423,11 @@
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
-      "integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
+      "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -460,16 +445,24 @@
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
+      "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/helper-validator-identifier": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
@@ -479,9 +472,9 @@
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -501,24 +494,24 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.17.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.2.tgz",
-      "integrity": "sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
+      "integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
       "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.0",
-        "@babel/types": "^7.17.0"
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.16.10",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
-      "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.18.6",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       },
@@ -527,9 +520,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz",
-      "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz",
+      "integrity": "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1575,31 +1568,31 @@
       "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
     },
     "node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.18.10",
+        "@babel/types": "^7.18.10"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz",
-      "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.3",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.3",
-        "@babel/types": "^7.17.0",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.0.tgz",
+      "integrity": "sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA==",
+      "dependencies": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.19.0",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/parser": "^7.19.0",
+        "@babel/types": "^7.19.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1608,10 +1601,11 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz",
-      "integrity": "sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+      "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
       "dependencies": {
+        "@babel/helper-string-parser": "^7.18.10",
         "@babel/helper-validator-identifier": "^7.18.6",
         "to-fast-properties": "^2.0.0"
       },
@@ -1828,15 +1822,6 @@
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
-    "node_modules/@hutson/parse-repository-url": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz",
-      "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -2013,7 +1998,6 @@
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
       "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dev": true,
       "dependencies": {
         "@jridgewell/set-array": "^1.0.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -2035,7 +2019,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
       "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "dev": true,
       "engines": {
         "node": ">=6.0.0"
       }
@@ -2174,6 +2157,15 @@
       "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
       "dev": true
     },
+    "node_modules/@types/debug": {
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
+      "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==",
+      "dev": true,
+      "dependencies": {
+        "@types/ms": "*"
+      }
+    },
     "node_modules/@types/diff": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.2.tgz",
@@ -2224,6 +2216,12 @@
       "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==",
       "dev": true
     },
+    "node_modules/@types/extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha512-R1g/VyKFFI2HLC1QGAeTtCBWCo6n75l41OnsVYNbmKG+kempOESaodf6BeJyUM3Q0rKa/NQcTHbB2+66lNnxLw==",
+      "dev": true
+    },
     "node_modules/@types/fibers": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@types/fibers/-/fibers-3.1.1.tgz",
@@ -2239,6 +2237,21 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/github-slugger": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@types/github-slugger/-/github-slugger-1.3.0.tgz",
+      "integrity": "sha512-J/rMZa7RqiH/rT29TEVZO4nBoDP9XJOjnbbIofg7GQKs4JIduEO3WLpte+6WeUz/TcrXKlY+bM7FYrp8yFB+3g==",
+      "dev": true
+    },
+    "node_modules/@types/hast": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz",
+      "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
     "node_modules/@types/http-cache-semantics": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
@@ -2342,10 +2355,10 @@
         "@types/unist": "*"
       }
     },
-    "node_modules/@types/minimist": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+    "node_modules/@types/mdurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
+      "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
       "dev": true
     },
     "node_modules/@types/mocha": {
@@ -2354,6 +2367,12 @@
       "integrity": "sha512-QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg==",
       "dev": true
     },
+    "node_modules/@types/ms": {
+      "version": "0.7.31",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
+      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
+      "dev": true
+    },
     "node_modules/@types/node": {
       "version": "17.0.21",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz",
@@ -2495,14 +2514,14 @@
       "dev": true
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.2.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.31.tgz",
-      "integrity": "sha512-aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ==",
+      "version": "3.2.38",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.38.tgz",
+      "integrity": "sha512-/FsvnSu7Z+lkd/8KXMa4yYNUiqQrI22135gfsQYVGuh5tqEgOB0XqrUdb/KnCLa5+TmQLPwvyUnKMyCpu+SX3Q==",
       "dev": true,
       "optional": true,
       "dependencies": {
         "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.31",
+        "@vue/shared": "3.2.38",
         "estree-walker": "^2.0.2",
         "source-map": "^0.6.1"
       }
@@ -2518,29 +2537,29 @@
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.2.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz",
-      "integrity": "sha512-60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg==",
+      "version": "3.2.38",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.38.tgz",
+      "integrity": "sha512-zqX4FgUbw56kzHlgYuEEJR8mefFiiyR3u96498+zWPsLeh1WKvgIReoNE+U7gG8bCUdvsrJ0JRmev0Ky6n2O0g==",
       "dev": true,
       "optional": true,
       "dependencies": {
-        "@vue/compiler-core": "3.2.31",
-        "@vue/shared": "3.2.31"
+        "@vue/compiler-core": "3.2.38",
+        "@vue/shared": "3.2.38"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.2.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz",
-      "integrity": "sha512-748adc9msSPGzXgibHiO6T7RWgfnDcVQD+VVwYgSsyyY8Ans64tALHZANrKtOzvkwznV/F4H7OAod/jIlp/dkQ==",
+      "version": "3.2.38",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.38.tgz",
+      "integrity": "sha512-KZjrW32KloMYtTcHAFuw3CqsyWc5X6seb8KbkANSWt3Cz9p2qA8c1GJpSkksFP9ABb6an0FLCFl46ZFXx3kKpg==",
       "dev": true,
       "optional": true,
       "dependencies": {
         "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.31",
-        "@vue/compiler-dom": "3.2.31",
-        "@vue/compiler-ssr": "3.2.31",
-        "@vue/reactivity-transform": "3.2.31",
-        "@vue/shared": "3.2.31",
+        "@vue/compiler-core": "3.2.38",
+        "@vue/compiler-dom": "3.2.38",
+        "@vue/compiler-ssr": "3.2.38",
+        "@vue/reactivity-transform": "3.2.38",
+        "@vue/shared": "3.2.38",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.25.7",
         "postcss": "^8.1.10",
@@ -2558,34 +2577,34 @@
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.2.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.31.tgz",
-      "integrity": "sha512-mjN0rqig+A8TVDnsGPYJM5dpbjlXeHUm2oZHZwGyMYiGT/F4fhJf/cXy8QpjnLQK4Y9Et4GWzHn9PS8AHUnSkw==",
+      "version": "3.2.38",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.38.tgz",
+      "integrity": "sha512-bm9jOeyv1H3UskNm4S6IfueKjUNFmi2kRweFIGnqaGkkRePjwEcfCVqyS3roe7HvF4ugsEkhf4+kIvDhip6XzQ==",
       "dev": true,
       "optional": true,
       "dependencies": {
-        "@vue/compiler-dom": "3.2.31",
-        "@vue/shared": "3.2.31"
+        "@vue/compiler-dom": "3.2.38",
+        "@vue/shared": "3.2.38"
       }
     },
     "node_modules/@vue/reactivity-transform": {
-      "version": "3.2.31",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.31.tgz",
-      "integrity": "sha512-uS4l4z/W7wXdI+Va5pgVxBJ345wyGFKvpPYtdSgvfJfX/x2Ymm6ophQlXXB6acqGHtXuBqNyyO3zVp9b1r0MOA==",
+      "version": "3.2.38",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.38.tgz",
+      "integrity": "sha512-3SD3Jmi1yXrDwiNJqQ6fs1x61WsDLqVk4NyKVz78mkaIRh6d3IqtRnptgRfXn+Fzf+m6B1KxBYWq1APj6h4qeA==",
       "dev": true,
       "optional": true,
       "dependencies": {
         "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.31",
-        "@vue/shared": "3.2.31",
+        "@vue/compiler-core": "3.2.38",
+        "@vue/shared": "3.2.38",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.25.7"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.2.31",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.31.tgz",
-      "integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==",
+      "version": "3.2.38",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.38.tgz",
+      "integrity": "sha512-dTyhTIRmGXBjxJE+skC8tTWCGLCVc4wQgRRLt8+O9p5ewBAjoBwtCAkLPrtToSr1xltoe3st21Pv953aOZ7alg==",
       "dev": true,
       "optional": true
     },
@@ -3671,32 +3690,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/acorn-node": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
-      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/add-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
-      "integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=",
-      "dev": true
-    },
     "node_modules/agent-base": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
@@ -3768,18 +3761,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha512-JoAxEa1DfP9m2xfB/y2r/aKcwXNlltr4+0QSBC4TrLfcxyvepX2Pv0t/xpgGV5bGsDzCYV8SzjWgyCW0T9yYbA==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
-    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -4006,12 +3987,6 @@
       "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=",
       "dev": true
     },
-    "node_modules/array-ify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
-      "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=",
-      "dev": true
-    },
     "node_modules/array-includes": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
@@ -4132,15 +4107,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -4737,18 +4703,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/babelify": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz",
-      "integrity": "sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
     "node_modules/babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
@@ -4779,9 +4733,9 @@
       }
     },
     "node_modules/bail": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-      "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
+      "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -5074,21 +5028,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/browser-resolve": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
-      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "1.1.7"
-      }
-    },
-    "node_modules/browser-resolve/node_modules/resolve": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-      "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-      "dev": true
-    },
     "node_modules/browser-stdout": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
@@ -5096,25 +5035,30 @@
       "dev": true
     },
     "node_modules/browserslist": {
-      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.0.tgz",
-      "integrity": "sha512-bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ==",
+      "version": "4.21.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
+      "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001313",
-        "electron-to-chromium": "^1.4.76",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.2",
-        "picocolors": "^1.0.0"
+        "caniuse-lite": "^1.0.30001370",
+        "electron-to-chromium": "^1.4.202",
+        "node-releases": "^2.0.6",
+        "update-browserslist-db": "^1.0.5"
       },
       "bin": {
         "browserslist": "cli.js"
       },
       "engines": {
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
       }
     },
     "node_modules/browserstack": {
@@ -5276,12 +5220,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/buffer-shims": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-      "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
-      "dev": true
-    },
     "node_modules/buffers": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
@@ -5589,12 +5527,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cached-path-relative": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz",
-      "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==",
-      "dev": true
-    },
     "node_modules/call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -5646,36 +5578,10 @@
         "node": ">=6"
       }
     },
-    "node_modules/camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/camelcase-keys/node_modules/quick-lru": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001320",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001320.tgz",
-      "integrity": "sha512-MWPzG54AGdo3nWx7zHZTefseM5Y1ccM7hlQKHRqJkPozUaw3hNbBTMmLn16GG2FUzjR13Cr3NPfhIieX5PzXDA==",
+      "version": "1.0.30001390",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz",
+      "integrity": "sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g==",
       "funding": [
         {
           "type": "opencollective",
@@ -5694,9 +5600,9 @@
       "dev": true
     },
     "node_modules/ccount": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz",
-      "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+      "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -5766,9 +5672,9 @@
       }
     },
     "node_modules/character-entities": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
+      "integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -5776,9 +5682,9 @@
       }
     },
     "node_modules/character-entities-html4": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz",
-      "integrity": "sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+      "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -5786,19 +5692,9 @@
       }
     },
     "node_modules/character-entities-legacy": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/character-reference-invalid": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+      "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -6172,9 +6068,9 @@
       }
     },
     "node_modules/comma-separated-tokens": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz",
-      "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz",
+      "integrity": "sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -6193,16 +6089,6 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
-    "node_modules/compare-func": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz",
-      "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==",
-      "dev": true,
-      "dependencies": {
-        "array-ify": "^1.0.0",
-        "dot-prop": "^5.1.0"
-      }
-    },
     "node_modules/component-emitter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -6360,395 +6246,6 @@
       "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
       "dev": true
     },
-    "node_modules/conventional-changelog": {
-      "version": "3.1.24",
-      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.24.tgz",
-      "integrity": "sha512-ed6k8PO00UVvhExYohroVPXcOJ/K1N0/drJHx/faTH37OIZthlecuLIRX/T6uOp682CAoVoFpu+sSEaeuH6Asg==",
-      "dev": true,
-      "dependencies": {
-        "conventional-changelog-angular": "^5.0.12",
-        "conventional-changelog-atom": "^2.0.8",
-        "conventional-changelog-codemirror": "^2.0.8",
-        "conventional-changelog-conventionalcommits": "^4.5.0",
-        "conventional-changelog-core": "^4.2.1",
-        "conventional-changelog-ember": "^2.0.9",
-        "conventional-changelog-eslint": "^3.0.9",
-        "conventional-changelog-express": "^2.0.6",
-        "conventional-changelog-jquery": "^3.0.11",
-        "conventional-changelog-jshint": "^2.0.9",
-        "conventional-changelog-preset-loader": "^2.3.4"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-angular": {
-      "version": "5.0.13",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz",
-      "integrity": "sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==",
-      "dev": true,
-      "dependencies": {
-        "compare-func": "^2.0.0",
-        "q": "^1.5.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-atom": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz",
-      "integrity": "sha512-xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw==",
-      "dev": true,
-      "dependencies": {
-        "q": "^1.5.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-codemirror": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz",
-      "integrity": "sha512-z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw==",
-      "dev": true,
-      "dependencies": {
-        "q": "^1.5.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-config-spec": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.1.0.tgz",
-      "integrity": "sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ==",
-      "dev": true
-    },
-    "node_modules/conventional-changelog-conventionalcommits": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.1.tgz",
-      "integrity": "sha512-lzWJpPZhbM1R0PIzkwzGBCnAkH5RKJzJfFQZcl/D+2lsJxAwGnDKBqn/F4C1RD31GJNn8NuKWQzAZDAVXPp2Mw==",
-      "dev": true,
-      "dependencies": {
-        "compare-func": "^2.0.0",
-        "lodash": "^4.17.15",
-        "q": "^1.5.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-core": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz",
-      "integrity": "sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg==",
-      "dev": true,
-      "dependencies": {
-        "add-stream": "^1.0.0",
-        "conventional-changelog-writer": "^5.0.0",
-        "conventional-commits-parser": "^3.2.0",
-        "dateformat": "^3.0.0",
-        "get-pkg-repo": "^4.0.0",
-        "git-raw-commits": "^2.0.8",
-        "git-remote-origin-url": "^2.0.0",
-        "git-semver-tags": "^4.1.1",
-        "lodash": "^4.17.15",
-        "normalize-package-data": "^3.0.0",
-        "q": "^1.5.1",
-        "read-pkg": "^3.0.0",
-        "read-pkg-up": "^3.0.0",
-        "through2": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-core/node_modules/dateformat": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-      "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/conventional-changelog-core/node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-core/node_modules/normalize-package-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "is-core-module": "^2.5.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-core/node_modules/read-pkg-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-      "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^2.0.0",
-        "read-pkg": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/conventional-changelog-core/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-ember": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz",
-      "integrity": "sha512-ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A==",
-      "dev": true,
-      "dependencies": {
-        "q": "^1.5.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-eslint": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz",
-      "integrity": "sha512-6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA==",
-      "dev": true,
-      "dependencies": {
-        "q": "^1.5.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-express": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz",
-      "integrity": "sha512-SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ==",
-      "dev": true,
-      "dependencies": {
-        "q": "^1.5.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-jquery": {
-      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz",
-      "integrity": "sha512-x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw==",
-      "dev": true,
-      "dependencies": {
-        "q": "^1.5.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-jshint": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz",
-      "integrity": "sha512-wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA==",
-      "dev": true,
-      "dependencies": {
-        "compare-func": "^2.0.0",
-        "q": "^1.5.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-preset-loader": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz",
-      "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-writer": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz",
-      "integrity": "sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==",
-      "dev": true,
-      "dependencies": {
-        "conventional-commits-filter": "^2.0.7",
-        "dateformat": "^3.0.0",
-        "handlebars": "^4.7.7",
-        "json-stringify-safe": "^5.0.1",
-        "lodash": "^4.17.15",
-        "meow": "^8.0.0",
-        "semver": "^6.0.0",
-        "split": "^1.0.0",
-        "through2": "^4.0.0"
-      },
-      "bin": {
-        "conventional-changelog-writer": "cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-changelog-writer/node_modules/dateformat": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-      "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/conventional-changelog-writer/node_modules/split": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-      "dev": true,
-      "dependencies": {
-        "through": "2"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/conventional-commits-filter": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz",
-      "integrity": "sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==",
-      "dev": true,
-      "dependencies": {
-        "lodash.ismatch": "^4.4.0",
-        "modify-values": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-commits-parser": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz",
-      "integrity": "sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==",
-      "dev": true,
-      "dependencies": {
-        "is-text-path": "^1.0.1",
-        "JSONStream": "^1.0.4",
-        "lodash": "^4.17.15",
-        "meow": "^8.0.0",
-        "split2": "^3.0.0",
-        "through2": "^4.0.0"
-      },
-      "bin": {
-        "conventional-commits-parser": "cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-commits-parser/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/conventional-commits-parser/node_modules/split2": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^3.0.0"
-      }
-    },
-    "node_modules/conventional-recommended-bump": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz",
-      "integrity": "sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==",
-      "dev": true,
-      "dependencies": {
-        "concat-stream": "^2.0.0",
-        "conventional-changelog-preset-loader": "^2.3.4",
-        "conventional-commits-filter": "^2.0.7",
-        "conventional-commits-parser": "^3.2.0",
-        "git-raw-commits": "^2.0.8",
-        "git-semver-tags": "^4.1.1",
-        "meow": "^8.0.0",
-        "q": "^1.5.1"
-      },
-      "bin": {
-        "conventional-recommended-bump": "cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/conventional-recommended-bump/node_modules/concat-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
-      "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
-      "dev": true,
-      "engines": [
-        "node >= 6.0"
-      ],
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.0.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/conventional-recommended-bump/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/convert-source-map": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
@@ -7006,15 +6503,6 @@
         "type": "^1.0.1"
       }
     },
-    "node_modules/dargs": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz",
-      "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -7048,7 +6536,7 @@
     "node_modules/de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
+      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
       "dev": true,
       "optional": true
     },
@@ -7097,26 +6585,17 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/decamelize-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+    "node_modules/decode-named-character-reference": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz",
+      "integrity": "sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==",
       "dev": true,
       "dependencies": {
-        "decamelize": "^1.1.0",
-        "map-obj": "^1.0.0"
+        "character-entities": "^2.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decamelize-keys/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
     "node_modules/decode-uri-component": {
@@ -7280,12 +6759,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
-      "dev": true
-    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -7303,6 +6776,15 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/destroy": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
@@ -7317,15 +6799,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/detect-indent": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
-      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@@ -7347,23 +6820,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/detective": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz",
-      "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==",
-      "dev": true,
-      "dependencies": {
-        "acorn-node": "^1.6.1",
-        "defined": "^1.0.0",
-        "minimist": "^1.1.1"
-      },
-      "bin": {
-        "detective": "bin/detective.js"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/devtools": {
       "version": "7.16.16",
       "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
@@ -7476,308 +6932,176 @@
       }
     },
     "node_modules/documentation": {
-      "version": "13.2.5",
-      "resolved": "https://registry.npmjs.org/documentation/-/documentation-13.2.5.tgz",
-      "integrity": "sha512-d1TrfrHXYZR63xrOzkYwwe297vkSwBoEhyyMBOi20T+7Ohe1aX1dW4nqXncQmdmE5MxluSaxxa3BW1dCvbF5AQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "7.12.3",
-        "@babel/generator": "7.12.1",
-        "@babel/parser": "7.12.3",
-        "@babel/traverse": "^7.12.1",
-        "@babel/types": "^7.12.1",
-        "ansi-html": "^0.0.7",
-        "babelify": "^10.0.0",
-        "chalk": "^2.3.0",
-        "chokidar": "^3.4.0",
-        "concat-stream": "^1.6.0",
-        "diff": "^4.0.1",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/documentation/-/documentation-14.0.0.tgz",
+      "integrity": "sha512-4AwFzdiseEdtqR0KKLrruIQ5fvh7n5epg47P0ZyOidA5Fes5am+6xjqkDECHPwcv4pxJ6zITaHwzCoGblP0+JQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.18.10",
+        "@babel/generator": "^7.18.10",
+        "@babel/parser": "^7.18.11",
+        "@babel/traverse": "^7.18.11",
+        "@babel/types": "^7.18.10",
+        "chalk": "^5.0.1",
+        "chokidar": "^3.5.3",
+        "diff": "^5.1.0",
         "doctrine-temporary-fork": "2.1.0",
-        "get-port": "^5.0.0",
-        "git-url-parse": "^11.1.2",
-        "github-slugger": "1.2.0",
-        "glob": "^7.1.2",
-        "globals-docs": "^2.4.0",
-        "highlight.js": "^10.7.2",
-        "ini": "^1.3.5",
-        "js-yaml": "^3.10.0",
-        "lodash": "^4.17.10",
-        "mdast-util-find-and-replace": "^1.1.1",
+        "git-url-parse": "^12.0.0",
+        "github-slugger": "1.4.0",
+        "glob": "^8.0.3",
+        "globals-docs": "^2.4.1",
+        "highlight.js": "^11.6.0",
+        "ini": "^3.0.0",
+        "js-yaml": "^4.1.0",
+        "konan": "^2.1.1",
+        "lodash": "^4.17.21",
+        "mdast-util-find-and-replace": "^2.2.1",
         "mdast-util-inject": "^1.1.0",
-        "micromatch": "^3.1.5",
-        "mime": "^2.2.0",
-        "module-deps-sortable": "^5.0.3",
+        "micromark-util-character": "^1.1.0",
         "parse-filepath": "^1.0.2",
-        "pify": "^5.0.0",
-        "read-pkg-up": "^4.0.0",
-        "remark": "^13.0.0",
-        "remark-gfm": "^1.0.0",
-        "remark-html": "^13.0.1",
-        "remark-reference-links": "^5.0.0",
-        "remark-toc": "^7.2.0",
-        "resolve": "^1.8.1",
-        "stream-array": "^1.1.2",
-        "strip-json-comments": "^2.0.1",
-        "tiny-lr": "^1.1.0",
-        "unist-builder": "^2.0.3",
-        "unist-util-visit": "^2.0.3",
-        "vfile": "^4.0.0",
-        "vfile-reporter": "^6.0.0",
-        "vfile-sort": "^2.1.0",
-        "vinyl": "^2.1.0",
-        "vinyl-fs": "^3.0.2",
-        "yargs": "^15.3.1"
+        "pify": "^6.0.0",
+        "read-pkg-up": "^9.1.0",
+        "remark": "^14.0.2",
+        "remark-gfm": "^3.0.1",
+        "remark-html": "^15.0.1",
+        "remark-reference-links": "^6.0.1",
+        "remark-toc": "^8.0.1",
+        "resolve": "^1.22.1",
+        "strip-json-comments": "^5.0.0",
+        "unist-builder": "^3.0.0",
+        "unist-util-visit": "^4.1.0",
+        "vfile": "^5.3.4",
+        "vfile-reporter": "^7.0.4",
+        "vfile-sort": "^3.0.0",
+        "yargs": "^17.5.1"
       },
       "bin": {
         "documentation": "bin/documentation.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14"
       },
       "optionalDependencies": {
-        "@vue/compiler-sfc": "^3.0.11",
-        "vue-template-compiler": "^2.6.12"
+        "@vue/compiler-sfc": "^3.2.37",
+        "vue-template-compiler": "^2.7.8"
       }
     },
-    "node_modules/documentation/node_modules/@babel/core": {
-      "version": "7.12.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz",
-      "integrity": "sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.12.1",
-        "@babel/helper-module-transforms": "^7.12.1",
-        "@babel/helpers": "^7.12.1",
-        "@babel/parser": "^7.12.3",
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.12.1",
-        "@babel/types": "^7.12.1",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.1",
-        "json5": "^2.1.2",
-        "lodash": "^4.17.19",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
-        "source-map": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
+    "node_modules/documentation/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
     },
-    "node_modules/documentation/node_modules/@babel/generator": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz",
-      "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==",
+    "node_modules/documentation/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.12.1",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/documentation/node_modules/@babel/parser": {
-      "version": "7.12.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz",
-      "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/documentation/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/documentation/node_modules/chalk": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
+      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/documentation/node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "node_modules/documentation/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/documentation/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/documentation/node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
+      "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
       "dev": true,
       "engines": {
         "node": ">=0.3.1"
       }
     },
-    "node_modules/documentation/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+    "node_modules/documentation/node_modules/glob": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+      "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/documentation/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
+        "node": ">=12"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/documentation/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+    "node_modules/documentation/node_modules/ini": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz",
+      "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==",
       "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
-    "node_modules/documentation/node_modules/p-locate": {
+    "node_modules/documentation/node_modules/js-yaml": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/documentation/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/documentation/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/documentation/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
       "bin": {
-        "semver": "bin/semver"
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/documentation/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+    "node_modules/documentation/node_modules/minimatch": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
-    "node_modules/documentation/node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
-    "node_modules/documentation/node_modules/yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+    "node_modules/documentation/node_modules/strip-json-comments": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
+      "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
       "dev": true,
-      "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/documentation/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+    "node_modules/documentation/node_modules/yargs": {
+      "version": "17.5.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
+      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
       "dev": true,
       "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       }
     },
     "node_modules/dom-serialize": {
@@ -7792,92 +7116,6 @@
         "void-elements": "^2.0.0"
       }
     },
-    "node_modules/dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "dependencies": {
-        "is-obj": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/dotgitignore": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/dotgitignore/-/dotgitignore-2.1.0.tgz",
-      "integrity": "sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/dotgitignore/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/dotgitignore/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/dotgitignore/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/dotgitignore/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/dotgitignore/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/dset": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/dset/-/dset-2.0.1.tgz",
@@ -7950,6 +7188,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
     "node_modules/easy-table": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.2.0.tgz",
@@ -8003,14 +7247,14 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.78",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.78.tgz",
-      "integrity": "sha512-o61+D/Lx7j/E0LIin/efOqeHpXhwi1TaQco9vUcRmr91m25SfZY6L5hWJDv/r+6kNjboFKgBw1LbfM0lbhuK6Q=="
+      "version": "1.4.243",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.243.tgz",
+      "integrity": "sha512-BgLD2gBX43OSXwlT01oYRRD5NIB4n3okTRxkzEAC6G0SZG4TTlyrWMjbOo0fajCwqwpRtMHXQNMjtRN6qpNtfw=="
     },
     "node_modules/emoji-regex": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz",
-      "integrity": "sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4=",
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
       "dev": true
     },
     "node_modules/emojis-list": {
@@ -9637,15 +8881,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/filter-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-      "integrity": "sha1-mzERErxsYSehbgFsbF1/GeCAXFs=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
@@ -9911,18 +9146,6 @@
       "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
       "dev": true
     },
-    "node_modules/fs-access": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
-      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
-      "dev": true,
-      "dependencies": {
-        "null-check": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -10151,73 +9374,6 @@
         "node": ">=8.0.0"
       }
     },
-    "node_modules/get-pkg-repo": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz",
-      "integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==",
-      "dev": true,
-      "dependencies": {
-        "@hutson/parse-repository-url": "^3.0.0",
-        "hosted-git-info": "^4.0.0",
-        "through2": "^2.0.0",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "get-pkg-repo": "src/cli.js"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-pkg-repo/node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/get-pkg-repo/node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "node_modules/get-pkg-repo/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/get-pkg-repo/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/get-port": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
@@ -10285,122 +9441,30 @@
         "assert-plus": "^1.0.0"
       }
     },
-    "node_modules/git-raw-commits": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz",
-      "integrity": "sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==",
-      "dev": true,
-      "dependencies": {
-        "dargs": "^7.0.0",
-        "lodash": "^4.17.15",
-        "meow": "^8.0.0",
-        "split2": "^3.0.0",
-        "through2": "^4.0.0"
-      },
-      "bin": {
-        "git-raw-commits": "cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/git-raw-commits/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/git-raw-commits/node_modules/split2": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^3.0.0"
-      }
-    },
-    "node_modules/git-remote-origin-url": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
-      "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
-      "dev": true,
-      "dependencies": {
-        "gitconfiglocal": "^1.0.0",
-        "pify": "^2.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/git-remote-origin-url/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/git-semver-tags": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-4.1.1.tgz",
-      "integrity": "sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==",
-      "dev": true,
-      "dependencies": {
-        "meow": "^8.0.0",
-        "semver": "^6.0.0"
-      },
-      "bin": {
-        "git-semver-tags": "cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/git-up": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/git-up/-/git-up-4.0.5.tgz",
-      "integrity": "sha512-YUvVDg/vX3d0syBsk/CKUTib0srcQME0JyHkL5BaYdwLsiCslPWmDSi8PUMo9pXYjrryMcmsCoCgsTpSCJEQaA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/git-up/-/git-up-6.0.0.tgz",
+      "integrity": "sha512-6RUFSNd1c/D0xtGnyWN2sxza2bZtZ/EmI9448n6rCZruFwV/ezeEn2fJP7XnUQGwf0RAtd/mmUCbtH6JPYA2SA==",
       "dev": true,
       "dependencies": {
-        "is-ssh": "^1.3.0",
-        "parse-url": "^6.0.0"
+        "is-ssh": "^1.4.0",
+        "parse-url": "^7.0.2"
       }
     },
     "node_modules/git-url-parse": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.6.0.tgz",
-      "integrity": "sha512-WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g==",
-      "dev": true,
-      "dependencies": {
-        "git-up": "^4.0.0"
-      }
-    },
-    "node_modules/gitconfiglocal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
-      "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-12.0.0.tgz",
+      "integrity": "sha512-I6LMWsxV87vysX1WfsoglXsXg6GjQRKq7+Dgiseo+h0skmp5Hp2rzmcEIRQot9CPA+uzU7x1x7jZdqvTFGnB+Q==",
       "dev": true,
       "dependencies": {
-        "ini": "^1.3.2"
+        "git-up": "^6.0.0"
       }
     },
     "node_modules/github-slugger": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.2.0.tgz",
-      "integrity": "sha512-wIaa75k1vZhyPm9yWrD08A5Xnx/V+RmzGrpjQuLemGKSb77Qukiaei58Bogrl/LZSADDfPzKJX8jhLs4CRTl7Q==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": ">=6.0.0 <=6.1.1"
-      }
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz",
+      "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==",
+      "dev": true
     },
     "node_modules/glob": {
       "version": "7.2.0",
@@ -12895,15 +11959,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/hard-rejection": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -13038,22 +12093,26 @@
       }
     },
     "node_modules/hast-util-is-element": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz",
-      "integrity": "sha512-oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-2.1.2.tgz",
+      "integrity": "sha512-thjnlGAnwP8ef/GSO1Q8BfVk2gundnc2peGQqEg2kUt/IqesiGg/5mSwN2fE7nLzy61pg88NG6xV+UrGOrx9EA==",
       "dev": true,
+      "dependencies": {
+        "@types/hast": "^2.0.0",
+        "@types/unist": "^2.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
     "node_modules/hast-util-sanitize": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-3.0.2.tgz",
-      "integrity": "sha512-+2I0x2ZCAyiZOO/sb4yNLFmdwPBnyJ4PBkVTUMKMqBwYNA+lXSgOmoRXlJFazoyid9QPogRRKgKhVEodv181sA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-4.0.0.tgz",
+      "integrity": "sha512-pw56+69jq+QSr/coADNvWTmBPDy+XsmwaF5KnUys4/wM1jt/fZdl7GPxhXXXYdXnz3Gj3qMkbUCH2uKjvX0MgQ==",
       "dev": true,
       "dependencies": {
-        "xtend": "^4.0.0"
+        "@types/hast": "^2.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -13061,21 +12120,21 @@
       }
     },
     "node_modules/hast-util-to-html": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-7.1.3.tgz",
-      "integrity": "sha512-yk2+1p3EJTEE9ZEUkgHsUSVhIpCsL/bvT8E5GzmWc+N1Po5gBw+0F8bo7dpxXR0nu0bQVxVZGX2lBGF21CmeDw==",
-      "dev": true,
-      "dependencies": {
-        "ccount": "^1.0.0",
-        "comma-separated-tokens": "^1.0.0",
-        "hast-util-is-element": "^1.0.0",
-        "hast-util-whitespace": "^1.0.0",
-        "html-void-elements": "^1.0.0",
-        "property-information": "^5.0.0",
-        "space-separated-tokens": "^1.0.0",
-        "stringify-entities": "^3.0.1",
-        "unist-util-is": "^4.0.0",
-        "xtend": "^4.0.0"
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-8.0.3.tgz",
+      "integrity": "sha512-/D/E5ymdPYhHpPkuTHOUkSatxr4w1ZKrZsG0Zv/3C2SRVT0JFJG53VS45AMrBtYk0wp5A7ksEhiC8QaOZM95+A==",
+      "dev": true,
+      "dependencies": {
+        "@types/hast": "^2.0.0",
+        "ccount": "^2.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "hast-util-is-element": "^2.0.0",
+        "hast-util-whitespace": "^2.0.0",
+        "html-void-elements": "^2.0.0",
+        "property-information": "^6.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "stringify-entities": "^4.0.2",
+        "unist-util-is": "^5.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -13083,9 +12142,9 @@
       }
     },
     "node_modules/hast-util-whitespace": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz",
-      "integrity": "sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz",
+      "integrity": "sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -13102,12 +12161,12 @@
       }
     },
     "node_modules/highlight.js": {
-      "version": "10.7.3",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
-      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
+      "version": "11.6.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.6.0.tgz",
+      "integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==",
       "dev": true,
       "engines": {
-        "node": "*"
+        "node": ">=12.0.0"
       }
     },
     "node_modules/home-or-tmp": {
@@ -13148,9 +12207,9 @@
       "dev": true
     },
     "node_modules/html-void-elements": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz",
-      "integrity": "sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-2.0.1.tgz",
+      "integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -13313,15 +12372,6 @@
         "node": ">=0.8.19"
       }
     },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -13512,30 +12562,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-alphabetical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/is-alphanumerical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-      "dev": true,
-      "dependencies": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/is-arguments": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
@@ -13634,9 +12660,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
-      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
+      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -13680,16 +12706,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-decimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/is-descriptor": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
@@ -13809,16 +12825,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-hexadecimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/is-interactive": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
@@ -13919,22 +12925,16 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-plain-object": {
@@ -14011,12 +13011,12 @@
       }
     },
     "node_modules/is-ssh": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.3.tgz",
-      "integrity": "sha512-NKzJmQzJfEEma3w5cJNcUMxoXfDjz0Zj0eyCalHn2E6VOwlzjZo0yuO2fcBSf8zhFuVCL/82/r5gRcoi6aEPVQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz",
+      "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==",
       "dev": true,
       "dependencies": {
-        "protocols": "^1.1.0"
+        "protocols": "^2.0.1"
       }
     },
     "node_modules/is-stream": {
@@ -14058,18 +13058,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-text-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
-      "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
-      "dev": true,
-      "dependencies": {
-        "text-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-typed-array": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz",
@@ -14853,12 +13841,9 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -14878,31 +13863,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-      "dev": true,
-      "engines": [
-        "node >= 0.2.0"
-      ]
-    },
-    "node_modules/JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "dependencies": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      },
-      "bin": {
-        "JSONStream": "bin.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
@@ -15375,6 +14335,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/kleur": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+      "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/konan": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/konan/-/konan-2.1.1.tgz",
@@ -15553,30 +14522,6 @@
       "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
       "dev": true
     },
-    "node_modules/load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/loader-runner": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
@@ -15781,12 +14726,6 @@
       "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
       "dev": true
     },
-    "node_modules/lodash.ismatch": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz",
-      "integrity": "sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=",
-      "dev": true
-    },
     "node_modules/lodash.isobject": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
@@ -15952,9 +14891,9 @@
       "dev": true
     },
     "node_modules/longest-streak": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
-      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.0.1.tgz",
+      "integrity": "sha512-cHlYSUpL2s7Fb3394mYxwTYj8niTaNHUCLr0qdiCXQfSjfuA7CKofpX2uSwEfFDQ0EB7JcnMnm+GjbqqoinYYg==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -16080,18 +15019,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/map-obj": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/map-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
@@ -16111,13 +15038,10 @@
       }
     },
     "node_modules/markdown-table": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
-      "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.2.tgz",
+      "integrity": "sha512-y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA==",
       "dev": true,
-      "dependencies": {
-        "repeat-string": "^1.0.0"
-      },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -16172,12 +15096,14 @@
       }
     },
     "node_modules/mdast-util-definitions": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz",
-      "integrity": "sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz",
+      "integrity": "sha512-rQ+Gv7mHttxHOBx2dkF4HWTg+EE+UR78ptQWDylzPKaQuVGdG4HIoY3SrS/pCp80nZ04greFvXbVFHT+uf0JVQ==",
       "dev": true,
       "dependencies": {
-        "unist-util-visit": "^2.0.0"
+        "@types/mdast": "^3.0.0",
+        "@types/unist": "^2.0.0",
+        "unist-util-visit": "^4.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -16185,14 +15111,14 @@
       }
     },
     "node_modules/mdast-util-find-and-replace": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz",
-      "integrity": "sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.1.tgz",
+      "integrity": "sha512-SobxkQXFAdd4b5WmEakmkVoh18icjQRxGy5OWTCzgsLRm1Fu/KCtwD1HIQSsmq5ZRjVH0Ehwg6/Fn3xIUk+nKw==",
       "dev": true,
       "dependencies": {
-        "escape-string-regexp": "^4.0.0",
-        "unist-util-is": "^4.0.0",
-        "unist-util-visit-parents": "^3.0.0"
+        "escape-string-regexp": "^5.0.0",
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit-parents": "^5.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -16200,28 +15126,35 @@
       }
     },
     "node_modules/mdast-util-find-and-replace/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/mdast-util-from-markdown": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
-      "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz",
+      "integrity": "sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q==",
       "dev": true,
       "dependencies": {
         "@types/mdast": "^3.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "micromark": "~2.11.0",
-        "parse-entities": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
+        "@types/unist": "^2.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "mdast-util-to-string": "^3.1.0",
+        "micromark": "^3.0.0",
+        "micromark-util-decode-numeric-character-reference": "^1.0.0",
+        "micromark-util-decode-string": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "unist-util-stringify-position": "^3.0.0",
+        "uvu": "^0.5.0"
       },
       "funding": {
         "type": "opencollective",
@@ -16229,9 +15162,9 @@
       }
     },
     "node_modules/mdast-util-from-markdown/node_modules/mdast-util-to-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-      "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
+      "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -16239,16 +15172,18 @@
       }
     },
     "node_modules/mdast-util-gfm": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz",
-      "integrity": "sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.1.tgz",
+      "integrity": "sha512-42yHBbfWIFisaAfV1eixlabbsa6q7vHeSPY+cg+BBjX51M8xhgMacqH9g6TftB/9+YkcI0ooV4ncfrJslzm/RQ==",
       "dev": true,
       "dependencies": {
-        "mdast-util-gfm-autolink-literal": "^0.1.0",
-        "mdast-util-gfm-strikethrough": "^0.2.0",
-        "mdast-util-gfm-table": "^0.1.0",
-        "mdast-util-gfm-task-list-item": "^0.1.0",
-        "mdast-util-to-markdown": "^0.6.1"
+        "mdast-util-from-markdown": "^1.0.0",
+        "mdast-util-gfm-autolink-literal": "^1.0.0",
+        "mdast-util-gfm-footnote": "^1.0.0",
+        "mdast-util-gfm-strikethrough": "^1.0.0",
+        "mdast-util-gfm-table": "^1.0.0",
+        "mdast-util-gfm-task-list-item": "^1.0.0",
+        "mdast-util-to-markdown": "^1.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -16256,14 +15191,30 @@
       }
     },
     "node_modules/mdast-util-gfm-autolink-literal": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz",
-      "integrity": "sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.2.tgz",
+      "integrity": "sha512-FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg==",
+      "dev": true,
+      "dependencies": {
+        "@types/mdast": "^3.0.0",
+        "ccount": "^2.0.0",
+        "mdast-util-find-and-replace": "^2.0.0",
+        "micromark-util-character": "^1.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-footnote": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.1.tgz",
+      "integrity": "sha512-p+PrYlkw9DeCRkTVw1duWqPRHX6Ywh2BNKJQcZbCwAuP/59B0Lk9kakuAd7KbQprVO4GzdW8eS5++A9PUSqIyw==",
       "dev": true,
       "dependencies": {
-        "ccount": "^1.0.0",
-        "mdast-util-find-and-replace": "^1.1.0",
-        "micromark": "^2.11.3"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.3.0",
+        "micromark-util-normalize-identifier": "^1.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -16271,12 +15222,13 @@
       }
     },
     "node_modules/mdast-util-gfm-strikethrough": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz",
-      "integrity": "sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.1.tgz",
+      "integrity": "sha512-zKJbEPe+JP6EUv0mZ0tQUyLQOC+FADt0bARldONot/nefuISkaZFlmVK4tU6JgfyZGrky02m/I6PmehgAgZgqg==",
       "dev": true,
       "dependencies": {
-        "mdast-util-to-markdown": "^0.6.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.3.0"
       },
       "funding": {
         "type": "opencollective",
@@ -16284,13 +15236,14 @@
       }
     },
     "node_modules/mdast-util-gfm-table": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz",
-      "integrity": "sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.4.tgz",
+      "integrity": "sha512-aEuoPwZyP4iIMkf2cLWXxx3EQ6Bmh2yKy9MVCg4i6Sd3cX80dcLEfXO/V4ul3pGH9czBK4kp+FAl+ZHmSUt9/w==",
       "dev": true,
       "dependencies": {
-        "markdown-table": "^2.0.0",
-        "mdast-util-to-markdown": "~0.6.0"
+        "markdown-table": "^3.0.0",
+        "mdast-util-from-markdown": "^1.0.0",
+        "mdast-util-to-markdown": "^1.3.0"
       },
       "funding": {
         "type": "opencollective",
@@ -16298,12 +15251,13 @@
       }
     },
     "node_modules/mdast-util-gfm-task-list-item": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz",
-      "integrity": "sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.1.tgz",
+      "integrity": "sha512-KZ4KLmPdABXOsfnM6JHUIjxEvcx2ulk656Z/4Balw071/5qgnhz+H1uGtf2zIGnrnvDC8xR4Fj9uKbjAFGNIeA==",
       "dev": true,
       "dependencies": {
-        "mdast-util-to-markdown": "~0.6.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.3.0"
       },
       "funding": {
         "type": "opencollective",
@@ -16320,19 +15274,22 @@
       }
     },
     "node_modules/mdast-util-to-hast": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-10.2.0.tgz",
-      "integrity": "sha512-JoPBfJ3gBnHZ18icCwHR50orC9kNH81tiR1gs01D8Q5YpV6adHNO9nKNuFBCJQ941/32PT1a63UF/DitmS3amQ==",
+      "version": "12.2.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.2.1.tgz",
+      "integrity": "sha512-dyindR2P7qOqXO1hQirZeGtVbiX7xlNQbw7gGaAwN4A1dh4+X8xU/JyYmRoyB8Fu1uPXzp7mlL5QwW7k+knvgA==",
       "dev": true,
       "dependencies": {
+        "@types/hast": "^2.0.0",
         "@types/mdast": "^3.0.0",
-        "@types/unist": "^2.0.0",
-        "mdast-util-definitions": "^4.0.0",
+        "@types/mdurl": "^1.0.0",
+        "mdast-util-definitions": "^5.0.0",
         "mdurl": "^1.0.0",
-        "unist-builder": "^2.0.0",
-        "unist-util-generated": "^1.0.0",
-        "unist-util-position": "^3.0.0",
-        "unist-util-visit": "^2.0.0"
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "trim-lines": "^3.0.0",
+        "unist-builder": "^3.0.0",
+        "unist-util-generated": "^2.0.0",
+        "unist-util-position": "^4.0.0",
+        "unist-util-visit": "^4.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -16340,17 +15297,18 @@
       }
     },
     "node_modules/mdast-util-to-markdown": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz",
-      "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.3.0.tgz",
+      "integrity": "sha512-6tUSs4r+KK4JGTTiQ7FfHmVOaDrLQJPmpjD6wPMlHGUVXoG9Vjc3jIeP+uyBWRf8clwB2blM+W7+KrlMYQnftA==",
       "dev": true,
       "dependencies": {
+        "@types/mdast": "^3.0.0",
         "@types/unist": "^2.0.0",
-        "longest-streak": "^2.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.0.0",
-        "zwitch": "^1.0.0"
+        "longest-streak": "^3.0.0",
+        "mdast-util-to-string": "^3.0.0",
+        "micromark-util-decode-string": "^1.0.0",
+        "unist-util-visit": "^4.0.0",
+        "zwitch": "^2.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -16358,9 +15316,9 @@
       }
     },
     "node_modules/mdast-util-to-markdown/node_modules/mdast-util-to-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-      "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
+      "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -16378,44 +15336,68 @@
       }
     },
     "node_modules/mdast-util-toc": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-5.1.0.tgz",
-      "integrity": "sha512-csimbRIVkiqc+PpFeKDGQ/Ck2N4f9FYH3zzBMMJzcxoKL8m+cM0n94xXm0I9eaxHnKdY9n145SGTdyJC7i273g==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-6.1.0.tgz",
+      "integrity": "sha512-0PuqZELXZl4ms1sF7Lqigrqik4Ll3UhbI+jdTrfw7pZ9QPawgl7LD4GQ8MkU7bT/EwiVqChNTbifa2jLLKo76A==",
       "dev": true,
       "dependencies": {
-        "@types/mdast": "^3.0.3",
-        "@types/unist": "^2.0.3",
-        "extend": "^3.0.2",
-        "github-slugger": "^1.2.1",
-        "mdast-util-to-string": "^2.0.0",
-        "unist-util-is": "^4.0.0",
-        "unist-util-visit": "^2.0.0"
+        "@types/extend": "^3.0.0",
+        "@types/github-slugger": "^1.0.0",
+        "@types/mdast": "^3.0.0",
+        "extend": "^3.0.0",
+        "github-slugger": "^1.0.0",
+        "mdast-util-to-string": "^3.1.0",
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit": "^3.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/mdast-util-toc/node_modules/github-slugger": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz",
-      "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==",
-      "dev": true
-    },
     "node_modules/mdast-util-toc/node_modules/mdast-util-to-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-      "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
+      "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
       "dev": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/mdast-util-toc/node_modules/unist-util-visit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-3.1.0.tgz",
+      "integrity": "sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit-parents": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-toc/node_modules/unist-util-visit-parents": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz",
+      "integrity": "sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw==",
+      "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0",
+        "unist-util-is": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/mdurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
       "dev": true
     },
     "node_modules/media-typer": {
@@ -16455,282 +15437,427 @@
         "node": ">=4.3.0 <5.0.0 || >=5.10"
       }
     },
-    "node_modules/meow": {
-      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz",
-      "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
-      },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/meow/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+    "node_modules/micromark": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.0.10.tgz",
+      "integrity": "sha512-ryTDy6UUunOXy2HPjelppgJ2sNfcPz1pLlMdA6Rz9jPzhLikWXv/irpWV/I2jd68Uhmny7hHxAlAhk4+vWggpg==",
       "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
       "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "@types/debug": "^4.0.0",
+        "debug": "^4.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-core-commonmark": "^1.0.1",
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-combine-extensions": "^1.0.0",
+        "micromark-util-decode-numeric-character-reference": "^1.0.0",
+        "micromark-util-encode": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-resolve-all": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-subtokenize": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.1",
+        "uvu": "^0.5.0"
+      }
+    },
+    "node_modules/micromark-core-commonmark": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz",
+      "integrity": "sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-factory-destination": "^1.0.0",
+        "micromark-factory-label": "^1.0.0",
+        "micromark-factory-space": "^1.0.0",
+        "micromark-factory-title": "^1.0.0",
+        "micromark-factory-whitespace": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-classify-character": "^1.0.0",
+        "micromark-util-html-tag-name": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-resolve-all": "^1.0.0",
+        "micromark-util-subtokenize": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.1",
+        "uvu": "^0.5.0"
       }
     },
-    "node_modules/meow/node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+    "node_modules/micromark-extension-gfm": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-2.0.1.tgz",
+      "integrity": "sha512-p2sGjajLa0iYiGQdT0oelahRYtMWvLjy8J9LOCxzIQsllMCGLbsLW+Nc+N4vi02jcRJvedVJ68cjelKIO6bpDA==",
       "dev": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
+        "micromark-extension-gfm-autolink-literal": "^1.0.0",
+        "micromark-extension-gfm-footnote": "^1.0.0",
+        "micromark-extension-gfm-strikethrough": "^1.0.0",
+        "micromark-extension-gfm-table": "^1.0.0",
+        "micromark-extension-gfm-tagfilter": "^1.0.0",
+        "micromark-extension-gfm-task-list-item": "^1.0.0",
+        "micromark-util-combine-extensions": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
       },
-      "engines": {
-        "node": ">=10"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/meow/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+    "node_modules/micromark-extension-gfm-autolink-literal": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-1.0.3.tgz",
+      "integrity": "sha512-i3dmvU0htawfWED8aHMMAzAVp/F0Z+0bPh3YrbTPPL1v4YAlCZpy5rBO5p0LPYiZo0zFVkoYh7vDU7yQSiCMjg==",
       "dev": true,
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/meow/node_modules/normalize-package-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+    "node_modules/micromark-extension-gfm-footnote": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.0.4.tgz",
+      "integrity": "sha512-E/fmPmDqLiMUP8mLJ8NbJWJ4bTw6tS+FEQS8CcuDtZpILuOb2kjLqPEeAePF1djXROHXChM/wPJw0iS4kHCcIg==",
       "dev": true,
       "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "is-core-module": "^2.5.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
+        "micromark-core-commonmark": "^1.0.0",
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       },
-      "engines": {
-        "node": ">=10"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/meow/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+    "node_modules/micromark-extension-gfm-strikethrough": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.4.tgz",
+      "integrity": "sha512-/vjHU/lalmjZCT5xt7CcHVJGq8sYRm80z24qAKXzaHzem/xsDYb2yLL+NNVbYvmpLx3O7SYPuGL5pzusL9CLIQ==",
       "dev": true,
       "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-classify-character": "^1.0.0",
+        "micromark-util-resolve-all": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/meow/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+    "node_modules/micromark-extension-gfm-table": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-1.0.5.tgz",
+      "integrity": "sha512-xAZ8J1X9W9K3JTJTUL7G6wSKhp2ZYHrFk5qJgY/4B33scJzE2kpfRL6oiw/veJTbt7jiM/1rngLlOKPWr1G+vg==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/meow/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+    "node_modules/micromark-extension-gfm-tagfilter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-1.0.1.tgz",
+      "integrity": "sha512-Ty6psLAcAjboRa/UKUbbUcwjVAv5plxmpUTy2XC/3nJFL37eHej8jrHrRzkqcpipJliuBH30DTs7+3wqNcQUVA==",
       "dev": true,
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "micromark-util-types": "^1.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/meow/node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+    "node_modules/micromark-extension-gfm-task-list-item": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-1.0.3.tgz",
+      "integrity": "sha512-PpysK2S1Q/5VXi72IIapbi/jliaiOFzv7THH4amwXeYXLq3l1uo8/2Be0Ac1rEwK20MQEsGH2ltAZLNY2KI/0Q==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/meow/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+    "node_modules/micromark-factory-destination": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz",
+      "integrity": "sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
       }
     },
-    "node_modules/meow/node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+    "node_modules/micromark-factory-label": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-1.0.2.tgz",
+      "integrity": "sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg==",
       "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
       "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       }
     },
-    "node_modules/meow/node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+    "node_modules/micromark-factory-space": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz",
+      "integrity": "sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew==",
       "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
       "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
       }
     },
-    "node_modules/meow/node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+    "node_modules/micromark-factory-title": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-1.0.2.tgz",
+      "integrity": "sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       }
     },
-    "node_modules/meow/node_modules/read-pkg/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/meow/node_modules/read-pkg/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+    "node_modules/micromark-factory-whitespace": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz",
+      "integrity": "sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A==",
       "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
       "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
       }
     },
-    "node_modules/meow/node_modules/read-pkg/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+    "node_modules/micromark-util-character": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.1.0.tgz",
+      "integrity": "sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==",
       "dev": true,
-      "bin": {
-        "semver": "bin/semver"
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
       }
     },
-    "node_modules/meow/node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+    "node_modules/micromark-util-chunked": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz",
+      "integrity": "sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-symbol": "^1.0.0"
       }
     },
-    "node_modules/meow/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+    "node_modules/micromark-util-classify-character": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz",
+      "integrity": "sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA==",
       "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
       }
     },
-    "node_modules/meow/node_modules/type-fest": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+    "node_modules/micromark-util-combine-extensions": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz",
+      "integrity": "sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
       }
     },
-    "node_modules/meow/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+    "node_modules/micromark-util-decode-numeric-character-reference": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz",
+      "integrity": "sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "engines": {
-        "node": ">= 0.6"
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-symbol": "^1.0.0"
       }
     },
-    "node_modules/micromark": {
-      "version": "2.11.4",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
-      "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
+    "node_modules/micromark-util-decode-string": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-1.0.2.tgz",
+      "integrity": "sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q==",
       "dev": true,
       "funding": [
         {
@@ -16743,89 +15870,156 @@
         }
       ],
       "dependencies": {
-        "debug": "^4.0.0",
-        "parse-entities": "^2.0.0"
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-decode-numeric-character-reference": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0"
       }
     },
-    "node_modules/micromark-extension-gfm": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz",
-      "integrity": "sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==",
+    "node_modules/micromark-util-encode": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.0.1.tgz",
+      "integrity": "sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA==",
       "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/micromark-util-html-tag-name": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.1.0.tgz",
+      "integrity": "sha512-BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/micromark-util-normalize-identifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz",
+      "integrity": "sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
       "dependencies": {
-        "micromark": "~2.11.0",
-        "micromark-extension-gfm-autolink-literal": "~0.5.0",
-        "micromark-extension-gfm-strikethrough": "~0.6.5",
-        "micromark-extension-gfm-table": "~0.4.0",
-        "micromark-extension-gfm-tagfilter": "~0.3.0",
-        "micromark-extension-gfm-task-list-item": "~0.3.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "micromark-util-symbol": "^1.0.0"
       }
     },
-    "node_modules/micromark-extension-gfm-autolink-literal": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz",
-      "integrity": "sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==",
+    "node_modules/micromark-util-resolve-all": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz",
+      "integrity": "sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw==",
       "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
       "dependencies": {
-        "micromark": "~2.11.3"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "micromark-util-types": "^1.0.0"
       }
     },
-    "node_modules/micromark-extension-gfm-strikethrough": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz",
-      "integrity": "sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==",
+    "node_modules/micromark-util-sanitize-uri": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.0.0.tgz",
+      "integrity": "sha512-cCxvBKlmac4rxCGx6ejlIviRaMKZc0fWm5HdCHEeDWRSkn44l6NdYVRyU+0nT1XC72EQJMZV8IPHF+jTr56lAg==",
       "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
       "dependencies": {
-        "micromark": "~2.11.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-encode": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0"
       }
     },
-    "node_modules/micromark-extension-gfm-table": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz",
-      "integrity": "sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==",
+    "node_modules/micromark-util-subtokenize": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.2.tgz",
+      "integrity": "sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA==",
       "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
       "dependencies": {
-        "micromark": "~2.11.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       }
     },
-    "node_modules/micromark-extension-gfm-tagfilter": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz",
-      "integrity": "sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==",
+    "node_modules/micromark-util-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz",
+      "integrity": "sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==",
       "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
     },
-    "node_modules/micromark-extension-gfm-task-list-item": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz",
-      "integrity": "sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==",
+    "node_modules/micromark-util-types": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.0.2.tgz",
+      "integrity": "sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==",
       "dev": true,
-      "dependencies": {
-        "micromark": "~2.11.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-      }
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
     },
     "node_modules/micromatch": {
       "version": "3.1.10",
@@ -16991,15 +16185,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -17015,30 +16200,8 @@
     "node_modules/minimist": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
-    },
-    "node_modules/minimist-options": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-      "dev": true,
-      "dependencies": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0",
-        "kind-of": "^6.0.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/minimist-options/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
     },
     "node_modules/mixin-deep": {
       "version": "1.3.2",
@@ -17190,101 +16353,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/modify-values": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
-      "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/module-deps-sortable": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/module-deps-sortable/-/module-deps-sortable-5.0.3.tgz",
-      "integrity": "sha512-eiyIZj/A0dj1o4ywXWqicazUL3l0HP3TydUR6xF0X3xh3LGBMLqW8a9aFe6MuNH4mxNMk53QKBHM6LOPR8kSgw==",
-      "dev": true,
-      "dependencies": {
-        "browser-resolve": "^1.7.0",
-        "cached-path-relative": "^1.0.0",
-        "concat-stream": "~1.5.0",
-        "defined": "^1.0.0",
-        "detective": "^5.2.0",
-        "duplexer2": "^0.1.2",
-        "inherits": "^2.0.1",
-        "JSONStream": "^1.0.3",
-        "konan": "^2.1.1",
-        "readable-stream": "^2.0.2",
-        "resolve": "^1.1.3",
-        "standard-version": "^9.0.0",
-        "stream-combiner2": "^1.1.1",
-        "subarg": "^1.0.0",
-        "through2": "^2.0.0",
-        "xtend": "^4.0.0"
-      },
-      "bin": {
-        "module-deps": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/module-deps-sortable/node_modules/concat-stream": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
-      "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
-      "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "~2.0.0",
-        "typedarray": "~0.0.5"
-      }
-    },
-    "node_modules/module-deps-sortable/node_modules/concat-stream/node_modules/readable-stream": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-      "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~1.0.6",
-        "string_decoder": "~0.10.x",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/module-deps-sortable/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "node_modules/module-deps-sortable/node_modules/process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-      "dev": true
-    },
-    "node_modules/module-deps-sortable/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/module-deps-sortable/node_modules/through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
     "node_modules/morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
@@ -17325,6 +16393,15 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
+    "node_modules/mri": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
+      "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/mrmime": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.0.tgz",
@@ -17404,9 +16481,9 @@
       "optional": true
     },
     "node_modules/nanoid": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
-      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
       "dev": true,
       "optional": true,
       "bin": {
@@ -17556,9 +16633,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz",
-      "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
+      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
     },
     "node_modules/nopt": {
       "version": "3.0.6",
@@ -17647,15 +16724,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/null-check": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
-      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -18208,24 +17276,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/parse-entities": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-      "dev": true,
-      "dependencies": {
-        "character-entities": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "character-reference-invalid": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-hexadecimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -18241,16 +17291,21 @@
       }
     },
     "node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
       "dependencies": {
+        "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/parse-ms": {
@@ -18281,27 +17336,24 @@
       }
     },
     "node_modules/parse-path": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-4.0.4.tgz",
-      "integrity": "sha512-Z2lWUis7jlmXC1jeOG9giRO2+FsuyNipeQ43HAjqAZjwSe3SEf+q/84FGPHoso3kyntbxa4c4i77t3m6fGf8cw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-5.0.0.tgz",
+      "integrity": "sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A==",
       "dev": true,
       "dependencies": {
-        "is-ssh": "^1.3.0",
-        "protocols": "^1.4.0",
-        "qs": "^6.9.4",
-        "query-string": "^6.13.8"
+        "protocols": "^2.0.0"
       }
     },
     "node_modules/parse-url": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-6.0.5.tgz",
-      "integrity": "sha512-e35AeLTSIlkw/5GFq70IN7po8fmDUjpDPY1rIK+VubRfsUvBonjQ+PBZG+vWMACnQSmNlvl524IucoDmcioMxA==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-7.0.2.tgz",
+      "integrity": "sha512-PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg==",
       "dev": true,
       "dependencies": {
-        "is-ssh": "^1.3.0",
+        "is-ssh": "^1.4.0",
         "normalize-url": "^6.1.0",
-        "parse-path": "^4.0.0",
-        "protocols": "^1.4.0"
+        "parse-path": "^5.0.0",
+        "protocols": "^2.0.1"
       }
     },
     "node_modules/parseurl": {
@@ -18391,27 +17443,6 @@
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
       "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
     },
-    "node_modules/path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-type/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/pathval": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
@@ -18460,12 +17491,12 @@
       }
     },
     "node_modules/pify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-6.1.0.tgz",
+      "integrity": "sha512-KocF8ve28eFjjuBKKGvzOBGzG8ew2OqOOSxTTZhirkzH7h3BI1vyzqlR0qbfcDBve1Yzo3FVlWUAtCRrbVN8Fw==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -18620,22 +17651,28 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.8",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz",
-      "integrity": "sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==",
+      "version": "8.4.16",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
+      "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
       "optional": true,
       "dependencies": {
-        "nanoid": "^3.3.1",
+        "nanoid": "^3.3.4",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
       }
     },
     "node_modules/prelude-ls": {
@@ -18734,22 +17771,19 @@
       }
     },
     "node_modules/property-information": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz",
-      "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.1.1.tgz",
+      "integrity": "sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==",
       "dev": true,
-      "dependencies": {
-        "xtend": "^4.0.0"
-      },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
       }
     },
     "node_modules/protocols": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.8.tgz",
-      "integrity": "sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz",
+      "integrity": "sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==",
       "dev": true
     },
     "node_modules/proxy-addr": {
@@ -18966,24 +18000,6 @@
       "integrity": "sha512-bK0/0cCI+R8ZmOF1QjT7HupDUYCxbf/9TJgAmSXQxZpftXmTAeil9DRoCnTDkWbvOyZzhcMBwKpptWcdkGFIMg==",
       "dev": true
     },
-    "node_modules/query-string": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz",
-      "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
-      "dev": true,
-      "dependencies": {
-        "decode-uri-component": "^0.2.0",
-        "filter-obj": "^1.1.0",
-        "split-on-first": "^1.0.0",
-        "strict-uri-encode": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -19050,91 +18066,186 @@
       "dev": true
     },
     "node_modules/read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
+      "integrity": "sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==",
       "dev": true,
       "dependencies": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
+        "@types/normalize-package-data": "^2.4.1",
+        "normalize-package-data": "^3.0.2",
+        "parse-json": "^5.2.0",
+        "type-fest": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/read-pkg-up": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
-      "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-9.1.0.tgz",
+      "integrity": "sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg==",
       "dev": true,
       "dependencies": {
-        "find-up": "^3.0.0",
-        "read-pkg": "^3.0.0"
+        "find-up": "^6.3.0",
+        "read-pkg": "^7.1.0",
+        "type-fest": "^2.5.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^3.0.0"
+        "locate-path": "^7.1.0",
+        "path-exists": "^5.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/read-pkg-up/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.1.1.tgz",
+      "integrity": "sha512-vJXaRMJgRVD3+cUZs3Mncj2mxpt5mP0EmNOsxRSZRMlbqjvxzDEOIUWXGmavo0ZC9+tNZCBLQ66reA11nbpHZg==",
       "dev": true,
       "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "^6.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/read-pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
       "dev": true,
       "dependencies": {
-        "p-try": "^2.0.0"
+        "yocto-queue": "^1.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/read-pkg-up/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^2.0.0"
+        "p-limit": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/read-pkg-up/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+    "node_modules/read-pkg-up/node_modules/path-exists": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/yocto-queue": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg/node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/read-pkg/node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/read-pkg/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/read-pkg/node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/readable-stream": {
@@ -19215,19 +18326,6 @@
         "node": "*"
       }
     },
-    "node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -19340,14 +18438,15 @@
       }
     },
     "node_modules/remark": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz",
-      "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==",
+      "version": "14.0.2",
+      "resolved": "https://registry.npmjs.org/remark/-/remark-14.0.2.tgz",
+      "integrity": "sha512-A3ARm2V4BgiRXaUo5K0dRvJ1lbogrbXnhkJRmD0yw092/Yl0kOCZt1k9ZeElEwkZsWGsMumz6qL5MfNJH9nOBA==",
       "dev": true,
       "dependencies": {
-        "remark-parse": "^9.0.0",
-        "remark-stringify": "^9.0.0",
-        "unified": "^9.1.0"
+        "@types/mdast": "^3.0.0",
+        "remark-parse": "^10.0.0",
+        "remark-stringify": "^10.0.0",
+        "unified": "^10.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -19355,13 +18454,15 @@
       }
     },
     "node_modules/remark-gfm": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-1.0.0.tgz",
-      "integrity": "sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-3.0.1.tgz",
+      "integrity": "sha512-lEFDoi2PICJyNrACFOfDD3JlLkuSbOa5Wd8EPt06HUdptv8Gn0bxYTdbU/XXQ3swAPkEaGxxPN9cbnMHvVu1Ig==",
       "dev": true,
       "dependencies": {
-        "mdast-util-gfm": "^0.1.0",
-        "micromark-extension-gfm": "^0.3.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-gfm": "^2.0.0",
+        "micromark-extension-gfm": "^2.0.0",
+        "unified": "^10.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -19369,14 +18470,16 @@
       }
     },
     "node_modules/remark-html": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/remark-html/-/remark-html-13.0.2.tgz",
-      "integrity": "sha512-LhSRQ+3RKdBqB/RGesFWkNNfkGqprDUCwjq54SylfFeNyZby5kqOG8Dn/vYsRoM8htab6EWxFXCY6XIZvMoRiQ==",
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/remark-html/-/remark-html-15.0.1.tgz",
+      "integrity": "sha512-7ta5UPRqj8nP0GhGMYUAghZ/DRno7dgq7alcW90A7+9pgJsXzGJlFgwF8HOP1b1tMgT3WwbeANN+CaTimMfyNQ==",
       "dev": true,
       "dependencies": {
-        "hast-util-sanitize": "^3.0.0",
-        "hast-util-to-html": "^7.0.0",
-        "mdast-util-to-hast": "^10.0.0"
+        "@types/mdast": "^3.0.0",
+        "hast-util-sanitize": "^4.0.0",
+        "hast-util-to-html": "^8.0.0",
+        "mdast-util-to-hast": "^12.0.0",
+        "unified": "^10.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -19384,12 +18487,14 @@
       }
     },
     "node_modules/remark-parse": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
-      "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.1.tgz",
+      "integrity": "sha512-1fUyHr2jLsVOkhbvPRBJ5zTKZZyD6yZzYaWCS6BPBdQ8vEMBCH+9zNCDA6tET/zHCi/jLqjCWtlJZUPk+DbnFw==",
       "dev": true,
       "dependencies": {
-        "mdast-util-from-markdown": "^0.8.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-from-markdown": "^1.0.0",
+        "unified": "^10.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -19397,12 +18502,14 @@
       }
     },
     "node_modules/remark-reference-links": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/remark-reference-links/-/remark-reference-links-5.0.0.tgz",
-      "integrity": "sha512-oSIo6lfDyG/1yYl2jPZNXmD9dgyPxp07mSd7snJagVMsDU6NRlD8i54MwHWUgMoOHTs8lIKPkwaUok/tbr5syQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/remark-reference-links/-/remark-reference-links-6.0.1.tgz",
+      "integrity": "sha512-34wY2C6HXSuKVTRtyJJwefkUD8zBOZOSHFZ4aSTnU2F656gr9WeuQ2dL6IJDK3NPd2F6xKF2t4XXcQY9MygAXg==",
       "dev": true,
       "dependencies": {
-        "unist-util-visit": "^2.0.0"
+        "@types/mdast": "^3.0.0",
+        "unified": "^10.0.0",
+        "unist-util-visit": "^4.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -19410,12 +18517,14 @@
       }
     },
     "node_modules/remark-stringify": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz",
-      "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-10.0.2.tgz",
+      "integrity": "sha512-6wV3pvbPvHkbNnWB0wdDvVFHOe1hBRAx1Q/5g/EpH4RppAII6J8Gnwe7VbHuXaoKIF6LAg6ExTel/+kNqSQ7lw==",
       "dev": true,
       "dependencies": {
-        "mdast-util-to-markdown": "^0.6.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.0.0",
+        "unified": "^10.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -19423,13 +18532,14 @@
       }
     },
     "node_modules/remark-toc": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/remark-toc/-/remark-toc-7.2.0.tgz",
-      "integrity": "sha512-ppHepvpbg7j5kPFmU5rzDC4k2GTcPDvWcxXyr/7BZzO1cBSPk0stKtEJdsgAyw2WHKPGxadcHIZRjb2/sHxjkg==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/remark-toc/-/remark-toc-8.0.1.tgz",
+      "integrity": "sha512-7he2VOm/cy13zilnOTZcyAoyoolV26ULlon6XyCFU+vG54Z/LWJnwphj/xKIDLOt66QmJUgTyUvLVHi2aAElyg==",
       "dev": true,
       "dependencies": {
-        "@types/unist": "^2.0.3",
-        "mdast-util-toc": "^5.0.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-toc": "^6.0.0",
+        "unified": "^10.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -19608,12 +18718,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
     "node_modules/require-uncached": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
@@ -19643,11 +18747,11 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
       "dependencies": {
-        "is-core-module": "^2.8.1",
+        "is-core-module": "^2.9.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -19817,6 +18921,18 @@
       "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
       "dev": true
     },
+    "node_modules/sade": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz",
+      "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==",
+      "dev": true,
+      "dependencies": {
+        "mri": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -20551,6 +19667,7 @@
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -20610,9 +19727,9 @@
       "optional": true
     },
     "node_modules/space-separated-tokens": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz",
-      "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz",
+      "integrity": "sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -20672,15 +19789,6 @@
         "node": "*"
       }
     },
-    "node_modules/split-on-first": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
-      "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -20763,157 +19871,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/standard-version": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/standard-version/-/standard-version-9.3.2.tgz",
-      "integrity": "sha512-u1rfKP4o4ew7Yjbfycv80aNMN2feTiqseAhUhrrx2XtdQGmu7gucpziXe68Z4YfHVqlxVEzo4aUA0Iu3VQOTgQ==",
-      "deprecated": "standard-version is deprecated. If you're a GitHub user, I recommend https://github.com/googleapis/release-please as an alternative.",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "conventional-changelog": "3.1.24",
-        "conventional-changelog-config-spec": "2.1.0",
-        "conventional-changelog-conventionalcommits": "4.6.1",
-        "conventional-recommended-bump": "6.1.0",
-        "detect-indent": "^6.0.0",
-        "detect-newline": "^3.1.0",
-        "dotgitignore": "^2.1.0",
-        "figures": "^3.1.0",
-        "find-up": "^5.0.0",
-        "fs-access": "^1.0.1",
-        "git-semver-tags": "^4.0.0",
-        "semver": "^7.1.1",
-        "stringify-package": "^1.0.1",
-        "yargs": "^16.0.0"
-      },
-      "bin": {
-        "standard-version": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/standard-version/node_modules/detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/standard-version/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/standard-version/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/standard-version/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/standard-version/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/standard-version/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/standard-version/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/standard-version/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/standard-version/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -21015,51 +19972,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/stream-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/stream-array/-/stream-array-1.1.2.tgz",
-      "integrity": "sha1-nl9zRfITfDDuO0mLkRToC1K7frU=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~2.1.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/stream-array/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "node_modules/stream-array/node_modules/process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-      "dev": true
-    },
-    "node_modules/stream-array/node_modules/readable-stream": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-      "integrity": "sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA=",
-      "dev": true,
-      "dependencies": {
-        "buffer-shims": "^1.0.0",
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~1.0.6",
-        "string_decoder": "~0.10.x",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/stream-array/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
     "node_modules/stream-buffers": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
@@ -21078,16 +19990,6 @@
         "duplexer": "~0.1.1"
       }
     },
-    "node_modules/stream-combiner2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
-      "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
-      "dev": true,
-      "dependencies": {
-        "duplexer2": "~0.1.0",
-        "readable-stream": "^2.0.2"
-      }
-    },
     "node_modules/stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
@@ -21114,15 +20016,6 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/strict-uri-encode": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
-      "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -21185,26 +20078,19 @@
       }
     },
     "node_modules/stringify-entities": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz",
-      "integrity": "sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.3.tgz",
+      "integrity": "sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==",
       "dev": true,
       "dependencies": {
-        "character-entities-html4": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "xtend": "^4.0.0"
+        "character-entities-html4": "^2.0.0",
+        "character-entities-legacy": "^3.0.0"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/stringify-package": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz",
-      "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==",
-      "dev": true
-    },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -21244,18 +20130,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
@@ -21265,15 +20139,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/subarg": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
-      "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.1.0"
-      }
-    },
     "node_modules/suffix": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
@@ -21590,15 +20455,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/text-extensions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
-      "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -21879,13 +20735,14 @@
         "node": "*"
       }
     },
-    "node_modules/trim-newlines": {
+    "node_modules/trim-lines": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+      "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
     "node_modules/trim-right": {
@@ -21898,9 +20755,9 @@
       }
     },
     "node_modules/trough": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz",
+      "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -22186,32 +21043,24 @@
       }
     },
     "node_modules/unified": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz",
-      "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
+      "integrity": "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==",
       "dev": true,
       "dependencies": {
-        "bail": "^1.0.0",
+        "@types/unist": "^2.0.0",
+        "bail": "^2.0.0",
         "extend": "^3.0.0",
         "is-buffer": "^2.0.0",
-        "is-plain-obj": "^2.0.0",
-        "trough": "^1.0.0",
-        "vfile": "^4.0.0"
+        "is-plain-obj": "^4.0.0",
+        "trough": "^2.0.0",
+        "vfile": "^5.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/unified/node_modules/is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -22247,19 +21096,22 @@
       }
     },
     "node_modules/unist-builder": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
-      "integrity": "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-3.0.0.tgz",
+      "integrity": "sha512-GFxmfEAa0vi9i5sd0R2kcrI9ks0r82NasRq5QHh2ysGngrc6GiqD5CDf1FjPenY4vApmFASBIIlk/jj5J5YbmQ==",
       "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
     "node_modules/unist-util-generated": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz",
-      "integrity": "sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-2.0.0.tgz",
+      "integrity": "sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -22267,9 +21119,9 @@
       }
     },
     "node_modules/unist-util-is": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-      "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.1.1.tgz",
+      "integrity": "sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -22277,22 +21129,25 @@
       }
     },
     "node_modules/unist-util-position": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz",
-      "integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.3.tgz",
+      "integrity": "sha512-p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ==",
       "dev": true,
+      "dependencies": {
+        "@types/unist": "^2.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
     "node_modules/unist-util-stringify-position": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
-      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz",
+      "integrity": "sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==",
       "dev": true,
       "dependencies": {
-        "@types/unist": "^2.0.2"
+        "@types/unist": "^2.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -22300,14 +21155,14 @@
       }
     },
     "node_modules/unist-util-visit": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-      "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.1.tgz",
+      "integrity": "sha512-n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0",
-        "unist-util-visit-parents": "^3.0.0"
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit-parents": "^5.1.1"
       },
       "funding": {
         "type": "opencollective",
@@ -22315,13 +21170,13 @@
       }
     },
     "node_modules/unist-util-visit-parents": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-      "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.1.tgz",
+      "integrity": "sha512-gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0"
+        "unist-util-is": "^5.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -22426,6 +21281,31 @@
         "yarn": "*"
       }
     },
+    "node_modules/update-browserslist-db": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz",
+      "integrity": "sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "browserslist-lint": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -22515,6 +21395,24 @@
         "uuid": "bin/uuid"
       }
     },
+    "node_modules/uvu": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/uvu/-/uvu-0.5.6.tgz",
+      "integrity": "sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==",
+      "dev": true,
+      "dependencies": {
+        "dequal": "^2.0.0",
+        "diff": "^5.0.0",
+        "kleur": "^4.0.3",
+        "sade": "^1.7.3"
+      },
+      "bin": {
+        "uvu": "bin.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/v8-compile-cache": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
@@ -22581,15 +21479,15 @@
       "dev": true
     },
     "node_modules/vfile": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
-      "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.4.tgz",
+      "integrity": "sha512-KI+7cnst03KbEyN1+JE504zF5bJBZa+J+CrevLeyIMq0aPU681I2rQ5p4PlnQ6exFtWiUrg26QUdFMnAKR6PIw==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0",
         "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0",
-        "vfile-message": "^2.0.0"
+        "unist-util-stringify-position": "^3.0.0",
+        "vfile-message": "^3.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -22597,13 +21495,13 @@
       }
     },
     "node_modules/vfile-message": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
-      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.2.tgz",
+      "integrity": "sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
+        "unist-util-stringify-position": "^3.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -22611,59 +21509,100 @@
       }
     },
     "node_modules/vfile-reporter": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-6.0.2.tgz",
-      "integrity": "sha512-GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.4.tgz",
+      "integrity": "sha512-4cWalUnLrEnbeUQ+hARG5YZtaHieVK3Jp4iG5HslttkVl+MHunSGNAIrODOTLbtjWsNZJRMCkL66AhvZAYuJ9A==",
       "dev": true,
       "dependencies": {
-        "repeat-string": "^1.5.0",
-        "string-width": "^4.0.0",
-        "supports-color": "^6.0.0",
-        "unist-util-stringify-position": "^2.0.0",
-        "vfile-sort": "^2.1.2",
-        "vfile-statistics": "^1.1.0"
+        "@types/supports-color": "^8.0.0",
+        "string-width": "^5.0.0",
+        "supports-color": "^9.0.0",
+        "unist-util-stringify-position": "^3.0.0",
+        "vfile-sort": "^3.0.0",
+        "vfile-statistics": "^2.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/vfile-reporter/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+    "node_modules/vfile-reporter/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/vfile-reporter/node_modules/supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+    "node_modules/vfile-reporter/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/vfile-reporter/node_modules/strip-ansi": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/vfile-reporter/node_modules/supports-color": {
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.3.tgz",
+      "integrity": "sha512-aszYUX/DVK/ed5rFLb/dDinVJrQjG/vmU433wtqVSD800rYsJNWxh2R3USV90aLSU+UsyQkbNeffVLzc6B6foA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
     "node_modules/vfile-sort": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-2.2.2.tgz",
-      "integrity": "sha512-tAyUqD2R1l/7Rn7ixdGkhXLD3zsg+XLAeUDUhXearjfIcpL1Hcsj5hHpCoy/gvfK/Ws61+e972fm0F7up7hfYA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.0.tgz",
+      "integrity": "sha512-fJNctnuMi3l4ikTVcKpxTbzHeCgvDhnI44amA3NVDvA6rTC6oKCFpCVyT5n2fFMr3ebfr+WVQZedOCd73rzSxg==",
       "dev": true,
+      "dependencies": {
+        "vfile-message": "^3.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
       }
     },
     "node_modules/vfile-statistics": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.4.tgz",
-      "integrity": "sha512-lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.0.tgz",
+      "integrity": "sha512-foOWtcnJhKN9M2+20AOTlWi2dxNfAoeNIoxD5GXcO182UJyId4QrXa41fWrgcfV3FWTjdEDy3I4cpLVcQscIMA==",
       "dev": true,
+      "dependencies": {
+        "vfile-message": "^3.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
@@ -22782,14 +21721,24 @@
       }
     },
     "node_modules/vue-template-compiler": {
-      "version": "2.6.14",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz",
-      "integrity": "sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==",
+      "version": "2.7.10",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz",
+      "integrity": "sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ==",
       "dev": true,
       "optional": true,
       "dependencies": {
         "de-indent": "^1.0.2",
-        "he": "^1.1.0"
+        "he": "^1.2.0"
+      }
+    },
+    "node_modules/vue-template-compiler/node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "he": "bin/he"
       }
     },
     "node_modules/walk": {
@@ -23312,12 +22261,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
     "node_modules/which-typed-array": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz",
@@ -23709,9 +22652,9 @@
       }
     },
     "node_modules/zwitch": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
-      "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.2.tgz",
+      "integrity": "sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA==",
       "dev": true,
       "funding": {
         "type": "github",
@@ -23735,37 +22678,37 @@
       }
     },
     "@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
       "requires": {
-        "@babel/highlight": "^7.16.7"
+        "@babel/highlight": "^7.18.6"
       }
     },
     "@babel/compat-data": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz",
-      "integrity": "sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng=="
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.0.tgz",
+      "integrity": "sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw=="
     },
     "@babel/core": {
-      "version": "7.17.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz",
-      "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.0.tgz",
+      "integrity": "sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ==",
       "requires": {
         "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.3",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helpers": "^7.17.2",
-        "@babel/parser": "^7.17.3",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
-        "@babel/types": "^7.17.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.19.0",
+        "@babel/helper-compilation-targets": "^7.19.0",
+        "@babel/helper-module-transforms": "^7.19.0",
+        "@babel/helpers": "^7.19.0",
+        "@babel/parser": "^7.19.0",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
+        "json5": "^2.2.1",
         "semver": "^6.3.0"
       }
     },
@@ -23781,13 +22724,13 @@
       }
     },
     "@babel/generator": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.3.tgz",
-      "integrity": "sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
+      "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
       "requires": {
-        "@babel/types": "^7.17.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+        "@babel/types": "^7.19.0",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "jsesc": "^2.5.1"
       }
     },
     "@babel/helper-annotate-as-pure": {
@@ -23808,13 +22751,13 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz",
-      "integrity": "sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz",
+      "integrity": "sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA==",
       "requires": {
-        "@babel/compat-data": "^7.16.4",
-        "@babel/helper-validator-option": "^7.16.7",
-        "browserslist": "^4.17.5",
+        "@babel/compat-data": "^7.19.0",
+        "@babel/helper-validator-option": "^7.18.6",
+        "browserslist": "^4.20.2",
         "semver": "^6.3.0"
       }
     },
@@ -23857,12 +22800,9 @@
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
-      "requires": {
-        "@babel/types": "^7.16.7"
-      }
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="
     },
     "@babel/helper-explode-assignable-expression": {
       "version": "7.16.7",
@@ -23873,29 +22813,20 @@
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
-      "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      }
-    },
-    "@babel/helper-get-function-arity": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
-      "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
       "requires": {
-        "@babel/types": "^7.16.7"
+        "@babel/template": "^7.18.10",
+        "@babel/types": "^7.19.0"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
       "requires": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       }
     },
     "@babel/helper-member-expression-to-functions": {
@@ -23915,18 +22846,18 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.17.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz",
-      "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
+      "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
       "requires": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-simple-access": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
-        "@babel/types": "^7.17.0"
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-simple-access": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -23965,11 +22896,11 @@
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz",
-      "integrity": "sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
+      "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
       "requires": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
@@ -23981,22 +22912,27 @@
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
       "requires": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       }
     },
+    "@babel/helper-string-parser": {
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
+      "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="
+    },
     "@babel/helper-validator-identifier": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
       "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
     },
     "@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
     },
     "@babel/helper-wrap-function": {
       "version": "7.16.8",
@@ -24010,29 +22946,29 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.17.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.2.tgz",
-      "integrity": "sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
+      "integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
       "requires": {
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.0",
-        "@babel/types": "^7.17.0"
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
       }
     },
     "@babel/highlight": {
-      "version": "7.16.10",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
-      "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.18.6",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz",
-      "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA=="
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz",
+      "integrity": "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.16.7",
@@ -24711,37 +23647,38 @@
       }
     },
     "@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
       "requires": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.18.10",
+        "@babel/types": "^7.18.10"
       }
     },
     "@babel/traverse": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz",
-      "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
-      "requires": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.3",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.3",
-        "@babel/types": "^7.17.0",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.0.tgz",
+      "integrity": "sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA==",
+      "requires": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.19.0",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/parser": "^7.19.0",
+        "@babel/types": "^7.19.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz",
-      "integrity": "sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+      "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
       "requires": {
+        "@babel/helper-string-parser": "^7.18.10",
         "@babel/helper-validator-identifier": "^7.18.6",
         "to-fast-properties": "^2.0.0"
       }
@@ -24905,12 +23842,6 @@
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
-    "@hutson/parse-repository-url": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz",
-      "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==",
-      "dev": true
-    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -25043,7 +23974,6 @@
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
       "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dev": true,
       "requires": {
         "@jridgewell/set-array": "^1.0.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -25058,8 +23988,7 @@
     "@jridgewell/set-array": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "dev": true
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
     },
     "@jridgewell/source-map": {
       "version": "0.3.2",
@@ -25183,6 +24112,15 @@
       "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
       "dev": true
     },
+    "@types/debug": {
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
+      "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==",
+      "dev": true,
+      "requires": {
+        "@types/ms": "*"
+      }
+    },
     "@types/diff": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.2.tgz",
@@ -25233,6 +24171,12 @@
       "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==",
       "dev": true
     },
+    "@types/extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha512-R1g/VyKFFI2HLC1QGAeTtCBWCo6n75l41OnsVYNbmKG+kempOESaodf6BeJyUM3Q0rKa/NQcTHbB2+66lNnxLw==",
+      "dev": true
+    },
     "@types/fibers": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@types/fibers/-/fibers-3.1.1.tgz",
@@ -25248,6 +24192,21 @@
         "@types/node": "*"
       }
     },
+    "@types/github-slugger": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@types/github-slugger/-/github-slugger-1.3.0.tgz",
+      "integrity": "sha512-J/rMZa7RqiH/rT29TEVZO4nBoDP9XJOjnbbIofg7GQKs4JIduEO3WLpte+6WeUz/TcrXKlY+bM7FYrp8yFB+3g==",
+      "dev": true
+    },
+    "@types/hast": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz",
+      "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "*"
+      }
+    },
     "@types/http-cache-semantics": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
@@ -25351,10 +24310,10 @@
         "@types/unist": "*"
       }
     },
-    "@types/minimist": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+    "@types/mdurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
+      "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
       "dev": true
     },
     "@types/mocha": {
@@ -25363,6 +24322,12 @@
       "integrity": "sha512-QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg==",
       "dev": true
     },
+    "@types/ms": {
+      "version": "0.7.31",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
+      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
+      "dev": true
+    },
     "@types/node": {
       "version": "17.0.21",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz",
@@ -25504,14 +24469,14 @@
       "dev": true
     },
     "@vue/compiler-core": {
-      "version": "3.2.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.31.tgz",
-      "integrity": "sha512-aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ==",
+      "version": "3.2.38",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.38.tgz",
+      "integrity": "sha512-/FsvnSu7Z+lkd/8KXMa4yYNUiqQrI22135gfsQYVGuh5tqEgOB0XqrUdb/KnCLa5+TmQLPwvyUnKMyCpu+SX3Q==",
       "dev": true,
       "optional": true,
       "requires": {
         "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.31",
+        "@vue/shared": "3.2.38",
         "estree-walker": "^2.0.2",
         "source-map": "^0.6.1"
       },
@@ -25526,29 +24491,29 @@
       }
     },
     "@vue/compiler-dom": {
-      "version": "3.2.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz",
-      "integrity": "sha512-60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg==",
+      "version": "3.2.38",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.38.tgz",
+      "integrity": "sha512-zqX4FgUbw56kzHlgYuEEJR8mefFiiyR3u96498+zWPsLeh1WKvgIReoNE+U7gG8bCUdvsrJ0JRmev0Ky6n2O0g==",
       "dev": true,
       "optional": true,
       "requires": {
-        "@vue/compiler-core": "3.2.31",
-        "@vue/shared": "3.2.31"
+        "@vue/compiler-core": "3.2.38",
+        "@vue/shared": "3.2.38"
       }
     },
     "@vue/compiler-sfc": {
-      "version": "3.2.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz",
-      "integrity": "sha512-748adc9msSPGzXgibHiO6T7RWgfnDcVQD+VVwYgSsyyY8Ans64tALHZANrKtOzvkwznV/F4H7OAod/jIlp/dkQ==",
+      "version": "3.2.38",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.38.tgz",
+      "integrity": "sha512-KZjrW32KloMYtTcHAFuw3CqsyWc5X6seb8KbkANSWt3Cz9p2qA8c1GJpSkksFP9ABb6an0FLCFl46ZFXx3kKpg==",
       "dev": true,
       "optional": true,
       "requires": {
         "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.31",
-        "@vue/compiler-dom": "3.2.31",
-        "@vue/compiler-ssr": "3.2.31",
-        "@vue/reactivity-transform": "3.2.31",
-        "@vue/shared": "3.2.31",
+        "@vue/compiler-core": "3.2.38",
+        "@vue/compiler-dom": "3.2.38",
+        "@vue/compiler-ssr": "3.2.38",
+        "@vue/reactivity-transform": "3.2.38",
+        "@vue/shared": "3.2.38",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.25.7",
         "postcss": "^8.1.10",
@@ -25565,34 +24530,34 @@
       }
     },
     "@vue/compiler-ssr": {
-      "version": "3.2.31",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.31.tgz",
-      "integrity": "sha512-mjN0rqig+A8TVDnsGPYJM5dpbjlXeHUm2oZHZwGyMYiGT/F4fhJf/cXy8QpjnLQK4Y9Et4GWzHn9PS8AHUnSkw==",
+      "version": "3.2.38",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.38.tgz",
+      "integrity": "sha512-bm9jOeyv1H3UskNm4S6IfueKjUNFmi2kRweFIGnqaGkkRePjwEcfCVqyS3roe7HvF4ugsEkhf4+kIvDhip6XzQ==",
       "dev": true,
       "optional": true,
       "requires": {
-        "@vue/compiler-dom": "3.2.31",
-        "@vue/shared": "3.2.31"
+        "@vue/compiler-dom": "3.2.38",
+        "@vue/shared": "3.2.38"
       }
     },
     "@vue/reactivity-transform": {
-      "version": "3.2.31",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.31.tgz",
-      "integrity": "sha512-uS4l4z/W7wXdI+Va5pgVxBJ345wyGFKvpPYtdSgvfJfX/x2Ymm6ophQlXXB6acqGHtXuBqNyyO3zVp9b1r0MOA==",
+      "version": "3.2.38",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.38.tgz",
+      "integrity": "sha512-3SD3Jmi1yXrDwiNJqQ6fs1x61WsDLqVk4NyKVz78mkaIRh6d3IqtRnptgRfXn+Fzf+m6B1KxBYWq1APj6h4qeA==",
       "dev": true,
       "optional": true,
       "requires": {
         "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.31",
-        "@vue/shared": "3.2.31",
+        "@vue/compiler-core": "3.2.38",
+        "@vue/shared": "3.2.38",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.25.7"
       }
     },
     "@vue/shared": {
-      "version": "3.2.31",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.31.tgz",
-      "integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==",
+      "version": "3.2.38",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.38.tgz",
+      "integrity": "sha512-dTyhTIRmGXBjxJE+skC8tTWCGLCVc4wQgRRLt8+O9p5ewBAjoBwtCAkLPrtToSr1xltoe3st21Pv953aOZ7alg==",
       "dev": true,
       "optional": true
     },
@@ -26436,29 +25401,6 @@
       "dev": true,
       "requires": {}
     },
-    "acorn-node": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
-      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
-      "dev": true,
-      "requires": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true
-    },
-    "add-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
-      "integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=",
-      "dev": true
-    },
     "agent-base": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
@@ -26508,12 +25450,6 @@
         "ansi-wrap": "0.1.0"
       }
     },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha512-JoAxEa1DfP9m2xfB/y2r/aKcwXNlltr4+0QSBC4TrLfcxyvepX2Pv0t/xpgGV5bGsDzCYV8SzjWgyCW0T9yYbA==",
-      "dev": true
-    },
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -26691,12 +25627,6 @@
       "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=",
       "dev": true
     },
-    "array-ify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
-      "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=",
-      "dev": true
-    },
     "array-includes": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
@@ -26785,12 +25715,6 @@
         "es-abstract": "^1.19.0"
       }
     },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
-    },
     "asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -27301,13 +26225,6 @@
         }
       }
     },
-    "babelify": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz",
-      "integrity": "sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg==",
-      "dev": true,
-      "requires": {}
-    },
     "babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
@@ -27332,9 +26249,9 @@
       }
     },
     "bail": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-      "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
+      "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
       "dev": true
     },
     "balanced-match": {
@@ -27572,23 +26489,6 @@
         "fill-range": "^7.0.1"
       }
     },
-    "browser-resolve": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
-      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
-      "dev": true,
-      "requires": {
-        "resolve": "1.1.7"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
-        }
-      }
-    },
     "browser-stdout": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
@@ -27596,15 +26496,14 @@
       "dev": true
     },
     "browserslist": {
-      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.0.tgz",
-      "integrity": "sha512-bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ==",
+      "version": "4.21.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
+      "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
       "requires": {
-        "caniuse-lite": "^1.0.30001313",
-        "electron-to-chromium": "^1.4.76",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.2",
-        "picocolors": "^1.0.0"
+        "caniuse-lite": "^1.0.30001370",
+        "electron-to-chromium": "^1.4.202",
+        "node-releases": "^2.0.6",
+        "update-browserslist-db": "^1.0.5"
       }
     },
     "browserstack": {
@@ -27732,12 +26631,6 @@
       "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
       "dev": true
     },
-    "buffer-shims": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-      "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
-      "dev": true
-    },
     "buffers": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
@@ -27971,12 +26864,6 @@
         }
       }
     },
-    "cached-path-relative": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz",
-      "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==",
-      "dev": true
-    },
     "call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -28015,29 +26902,10 @@
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
-    "camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
-      },
-      "dependencies": {
-        "quick-lru": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-          "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-          "dev": true
-        }
-      }
-    },
     "caniuse-lite": {
-      "version": "1.0.30001320",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001320.tgz",
-      "integrity": "sha512-MWPzG54AGdo3nWx7zHZTefseM5Y1ccM7hlQKHRqJkPozUaw3hNbBTMmLn16GG2FUzjR13Cr3NPfhIieX5PzXDA=="
+      "version": "1.0.30001390",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz",
+      "integrity": "sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g=="
     },
     "caseless": {
       "version": "0.12.0",
@@ -28046,9 +26914,9 @@
       "dev": true
     },
     "ccount": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz",
-      "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+      "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
       "dev": true
     },
     "chai": {
@@ -28101,27 +26969,21 @@
       }
     },
     "character-entities": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
+      "integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==",
       "dev": true
     },
     "character-entities-html4": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz",
-      "integrity": "sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+      "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
       "dev": true
     },
     "character-entities-legacy": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
-      "dev": true
-    },
-    "character-reference-invalid": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+      "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
       "dev": true
     },
     "chardet": {
@@ -28408,9 +27270,9 @@
       }
     },
     "comma-separated-tokens": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz",
-      "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz",
+      "integrity": "sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==",
       "dev": true
     },
     "commander": {
@@ -28425,16 +27287,6 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
-    "compare-func": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz",
-      "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==",
-      "dev": true,
-      "requires": {
-        "array-ify": "^1.0.0",
-        "dot-prop": "^5.1.0"
-      }
-    },
     "component-emitter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -28562,313 +27414,6 @@
       "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
       "dev": true
     },
-    "conventional-changelog": {
-      "version": "3.1.24",
-      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.24.tgz",
-      "integrity": "sha512-ed6k8PO00UVvhExYohroVPXcOJ/K1N0/drJHx/faTH37OIZthlecuLIRX/T6uOp682CAoVoFpu+sSEaeuH6Asg==",
-      "dev": true,
-      "requires": {
-        "conventional-changelog-angular": "^5.0.12",
-        "conventional-changelog-atom": "^2.0.8",
-        "conventional-changelog-codemirror": "^2.0.8",
-        "conventional-changelog-conventionalcommits": "^4.5.0",
-        "conventional-changelog-core": "^4.2.1",
-        "conventional-changelog-ember": "^2.0.9",
-        "conventional-changelog-eslint": "^3.0.9",
-        "conventional-changelog-express": "^2.0.6",
-        "conventional-changelog-jquery": "^3.0.11",
-        "conventional-changelog-jshint": "^2.0.9",
-        "conventional-changelog-preset-loader": "^2.3.4"
-      }
-    },
-    "conventional-changelog-angular": {
-      "version": "5.0.13",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz",
-      "integrity": "sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==",
-      "dev": true,
-      "requires": {
-        "compare-func": "^2.0.0",
-        "q": "^1.5.1"
-      }
-    },
-    "conventional-changelog-atom": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz",
-      "integrity": "sha512-xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw==",
-      "dev": true,
-      "requires": {
-        "q": "^1.5.1"
-      }
-    },
-    "conventional-changelog-codemirror": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz",
-      "integrity": "sha512-z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw==",
-      "dev": true,
-      "requires": {
-        "q": "^1.5.1"
-      }
-    },
-    "conventional-changelog-config-spec": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.1.0.tgz",
-      "integrity": "sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ==",
-      "dev": true
-    },
-    "conventional-changelog-conventionalcommits": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.1.tgz",
-      "integrity": "sha512-lzWJpPZhbM1R0PIzkwzGBCnAkH5RKJzJfFQZcl/D+2lsJxAwGnDKBqn/F4C1RD31GJNn8NuKWQzAZDAVXPp2Mw==",
-      "dev": true,
-      "requires": {
-        "compare-func": "^2.0.0",
-        "lodash": "^4.17.15",
-        "q": "^1.5.1"
-      }
-    },
-    "conventional-changelog-core": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz",
-      "integrity": "sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg==",
-      "dev": true,
-      "requires": {
-        "add-stream": "^1.0.0",
-        "conventional-changelog-writer": "^5.0.0",
-        "conventional-commits-parser": "^3.2.0",
-        "dateformat": "^3.0.0",
-        "get-pkg-repo": "^4.0.0",
-        "git-raw-commits": "^2.0.8",
-        "git-remote-origin-url": "^2.0.0",
-        "git-semver-tags": "^4.1.1",
-        "lodash": "^4.17.15",
-        "normalize-package-data": "^3.0.0",
-        "q": "^1.5.1",
-        "read-pkg": "^3.0.0",
-        "read-pkg-up": "^3.0.0",
-        "through2": "^4.0.0"
-      },
-      "dependencies": {
-        "dateformat": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-          "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
-          "dev": true
-        },
-        "hosted-git-info": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "normalize-package-data": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-          "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^4.0.1",
-            "is-core-module": "^2.5.0",
-            "semver": "^7.3.4",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
-        "read-pkg-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^3.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "conventional-changelog-ember": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz",
-      "integrity": "sha512-ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A==",
-      "dev": true,
-      "requires": {
-        "q": "^1.5.1"
-      }
-    },
-    "conventional-changelog-eslint": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz",
-      "integrity": "sha512-6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA==",
-      "dev": true,
-      "requires": {
-        "q": "^1.5.1"
-      }
-    },
-    "conventional-changelog-express": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz",
-      "integrity": "sha512-SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ==",
-      "dev": true,
-      "requires": {
-        "q": "^1.5.1"
-      }
-    },
-    "conventional-changelog-jquery": {
-      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz",
-      "integrity": "sha512-x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw==",
-      "dev": true,
-      "requires": {
-        "q": "^1.5.1"
-      }
-    },
-    "conventional-changelog-jshint": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz",
-      "integrity": "sha512-wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA==",
-      "dev": true,
-      "requires": {
-        "compare-func": "^2.0.0",
-        "q": "^1.5.1"
-      }
-    },
-    "conventional-changelog-preset-loader": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz",
-      "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==",
-      "dev": true
-    },
-    "conventional-changelog-writer": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz",
-      "integrity": "sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==",
-      "dev": true,
-      "requires": {
-        "conventional-commits-filter": "^2.0.7",
-        "dateformat": "^3.0.0",
-        "handlebars": "^4.7.7",
-        "json-stringify-safe": "^5.0.1",
-        "lodash": "^4.17.15",
-        "meow": "^8.0.0",
-        "semver": "^6.0.0",
-        "split": "^1.0.0",
-        "through2": "^4.0.0"
-      },
-      "dependencies": {
-        "dateformat": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-          "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
-          "dev": true
-        },
-        "split": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-          "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-          "dev": true,
-          "requires": {
-            "through": "2"
-          }
-        }
-      }
-    },
-    "conventional-commits-filter": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz",
-      "integrity": "sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==",
-      "dev": true,
-      "requires": {
-        "lodash.ismatch": "^4.4.0",
-        "modify-values": "^1.0.0"
-      }
-    },
-    "conventional-commits-parser": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz",
-      "integrity": "sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==",
-      "dev": true,
-      "requires": {
-        "is-text-path": "^1.0.1",
-        "JSONStream": "^1.0.4",
-        "lodash": "^4.17.15",
-        "meow": "^8.0.0",
-        "split2": "^3.0.0",
-        "through2": "^4.0.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "split2": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-          "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "^3.0.0"
-          }
-        }
-      }
-    },
-    "conventional-recommended-bump": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz",
-      "integrity": "sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==",
-      "dev": true,
-      "requires": {
-        "concat-stream": "^2.0.0",
-        "conventional-changelog-preset-loader": "^2.3.4",
-        "conventional-commits-filter": "^2.0.7",
-        "conventional-commits-parser": "^3.2.0",
-        "git-raw-commits": "^2.0.8",
-        "git-semver-tags": "^4.1.1",
-        "meow": "^8.0.0",
-        "q": "^1.5.1"
-      },
-      "dependencies": {
-        "concat-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
-          "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "inherits": "^2.0.3",
-            "readable-stream": "^3.0.2",
-            "typedarray": "^0.0.6"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "convert-source-map": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
@@ -29077,12 +27622,6 @@
         "type": "^1.0.1"
       }
     },
-    "dargs": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz",
-      "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==",
-      "dev": true
-    },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -29107,7 +27646,7 @@
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
+      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
       "dev": true,
       "optional": true
     },
@@ -29147,22 +27686,13 @@
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "dev": true
     },
-    "decamelize-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+    "decode-named-character-reference": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz",
+      "integrity": "sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==",
       "dev": true,
       "requires": {
-        "decamelize": "^1.1.0",
-        "map-obj": "^1.0.0"
-      },
-      "dependencies": {
-        "map-obj": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-          "dev": true
-        }
+        "character-entities": "^2.0.0"
       }
     },
     "decode-uri-component": {
@@ -29288,12 +27818,6 @@
         "isobject": "^3.0.1"
       }
     },
-    "defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
-      "dev": true
-    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -29305,6 +27829,12 @@
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
       "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
     },
+    "dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true
+    },
     "destroy": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
@@ -29316,12 +27846,6 @@
       "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
       "dev": true
     },
-    "detect-indent": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
-      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
-      "dev": true
-    },
     "detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@@ -29334,17 +27858,6 @@
       "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
       "dev": true
     },
-    "detective": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz",
-      "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==",
-      "dev": true,
-      "requires": {
-        "acorn-node": "^1.6.1",
-        "defined": "^1.0.0",
-        "minimist": "^1.1.1"
-      }
-    },
     "devtools": {
       "version": "7.16.16",
       "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
@@ -29428,242 +27941,135 @@
       }
     },
     "documentation": {
-      "version": "13.2.5",
-      "resolved": "https://registry.npmjs.org/documentation/-/documentation-13.2.5.tgz",
-      "integrity": "sha512-d1TrfrHXYZR63xrOzkYwwe297vkSwBoEhyyMBOi20T+7Ohe1aX1dW4nqXncQmdmE5MxluSaxxa3BW1dCvbF5AQ==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "7.12.3",
-        "@babel/generator": "7.12.1",
-        "@babel/parser": "7.12.3",
-        "@babel/traverse": "^7.12.1",
-        "@babel/types": "^7.12.1",
-        "@vue/compiler-sfc": "^3.0.11",
-        "ansi-html": "^0.0.7",
-        "babelify": "^10.0.0",
-        "chalk": "^2.3.0",
-        "chokidar": "^3.4.0",
-        "concat-stream": "^1.6.0",
-        "diff": "^4.0.1",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/documentation/-/documentation-14.0.0.tgz",
+      "integrity": "sha512-4AwFzdiseEdtqR0KKLrruIQ5fvh7n5epg47P0ZyOidA5Fes5am+6xjqkDECHPwcv4pxJ6zITaHwzCoGblP0+JQ==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.18.10",
+        "@babel/generator": "^7.18.10",
+        "@babel/parser": "^7.18.11",
+        "@babel/traverse": "^7.18.11",
+        "@babel/types": "^7.18.10",
+        "@vue/compiler-sfc": "^3.2.37",
+        "chalk": "^5.0.1",
+        "chokidar": "^3.5.3",
+        "diff": "^5.1.0",
         "doctrine-temporary-fork": "2.1.0",
-        "get-port": "^5.0.0",
-        "git-url-parse": "^11.1.2",
-        "github-slugger": "1.2.0",
-        "glob": "^7.1.2",
-        "globals-docs": "^2.4.0",
-        "highlight.js": "^10.7.2",
-        "ini": "^1.3.5",
-        "js-yaml": "^3.10.0",
-        "lodash": "^4.17.10",
-        "mdast-util-find-and-replace": "^1.1.1",
+        "git-url-parse": "^12.0.0",
+        "github-slugger": "1.4.0",
+        "glob": "^8.0.3",
+        "globals-docs": "^2.4.1",
+        "highlight.js": "^11.6.0",
+        "ini": "^3.0.0",
+        "js-yaml": "^4.1.0",
+        "konan": "^2.1.1",
+        "lodash": "^4.17.21",
+        "mdast-util-find-and-replace": "^2.2.1",
         "mdast-util-inject": "^1.1.0",
-        "micromatch": "^3.1.5",
-        "mime": "^2.2.0",
-        "module-deps-sortable": "^5.0.3",
+        "micromark-util-character": "^1.1.0",
         "parse-filepath": "^1.0.2",
-        "pify": "^5.0.0",
-        "read-pkg-up": "^4.0.0",
-        "remark": "^13.0.0",
-        "remark-gfm": "^1.0.0",
-        "remark-html": "^13.0.1",
-        "remark-reference-links": "^5.0.0",
-        "remark-toc": "^7.2.0",
-        "resolve": "^1.8.1",
-        "stream-array": "^1.1.2",
-        "strip-json-comments": "^2.0.1",
-        "tiny-lr": "^1.1.0",
-        "unist-builder": "^2.0.3",
-        "unist-util-visit": "^2.0.3",
-        "vfile": "^4.0.0",
-        "vfile-reporter": "^6.0.0",
-        "vfile-sort": "^2.1.0",
-        "vinyl": "^2.1.0",
-        "vinyl-fs": "^3.0.2",
-        "vue-template-compiler": "^2.6.12",
-        "yargs": "^15.3.1"
-      },
-      "dependencies": {
-        "@babel/core": {
-          "version": "7.12.3",
-          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz",
-          "integrity": "sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.12.1",
-            "@babel/helper-module-transforms": "^7.12.1",
-            "@babel/helpers": "^7.12.1",
-            "@babel/parser": "^7.12.3",
-            "@babel/template": "^7.10.4",
-            "@babel/traverse": "^7.12.1",
-            "@babel/types": "^7.12.1",
-            "convert-source-map": "^1.7.0",
-            "debug": "^4.1.0",
-            "gensync": "^1.0.0-beta.1",
-            "json5": "^2.1.2",
-            "lodash": "^4.17.19",
-            "resolve": "^1.3.2",
-            "semver": "^5.4.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.1",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz",
-          "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.1",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.3",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz",
-          "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==",
+        "pify": "^6.0.0",
+        "read-pkg-up": "^9.1.0",
+        "remark": "^14.0.2",
+        "remark-gfm": "^3.0.1",
+        "remark-html": "^15.0.1",
+        "remark-reference-links": "^6.0.1",
+        "remark-toc": "^8.0.1",
+        "resolve": "^1.22.1",
+        "strip-json-comments": "^5.0.0",
+        "unist-builder": "^3.0.0",
+        "unist-util-visit": "^4.1.0",
+        "vfile": "^5.3.4",
+        "vfile-reporter": "^7.0.4",
+        "vfile-sort": "^3.0.0",
+        "vue-template-compiler": "^2.7.8",
+        "yargs": "^17.5.1"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "cliui": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^6.2.0"
-          }
-        },
-        "color-convert": {
+        "brace-expansion": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "balanced-match": "^1.0.0"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+        "chalk": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
+          "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
           "dev": true
         },
         "diff": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
+          "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
           "dev": true
         },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+        "glob": {
+          "version": "8.0.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+          "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
           "dev": true,
           "requires": {
-            "p-locate": "^4.1.0"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^5.0.1",
+            "once": "^1.3.0"
           }
         },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
+        "ini": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz",
+          "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==",
+          "dev": true
         },
-        "p-locate": {
+        "js-yaml": {
           "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.2.0"
+            "argparse": "^2.0.1"
           }
         },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
-        "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
+            "brace-expansion": "^2.0.1"
           }
         },
-        "y18n": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+        "strip-json-comments": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
+          "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
           "dev": true
         },
         "yargs": {
-          "version": "15.4.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+          "version": "17.5.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
+          "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
           "dev": true,
           "requires": {
-            "cliui": "^6.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^4.1.0",
-            "get-caller-file": "^2.0.1",
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
             "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^4.2.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^18.1.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "18.1.3",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.0.0"
           }
         }
       }
@@ -29680,70 +28086,6 @@
         "void-elements": "^2.0.0"
       }
     },
-    "dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
-    "dotgitignore": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/dotgitignore/-/dotgitignore-2.1.0.tgz",
-      "integrity": "sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==",
-      "dev": true,
-      "requires": {
-        "find-up": "^3.0.0",
-        "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        }
-      }
-    },
     "dset": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/dset/-/dset-2.0.1.tgz",
@@ -29810,6 +28152,12 @@
         }
       }
     },
+    "eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
     "easy-table": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.2.0.tgz",
@@ -29855,14 +28203,14 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.78",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.78.tgz",
-      "integrity": "sha512-o61+D/Lx7j/E0LIin/efOqeHpXhwi1TaQco9vUcRmr91m25SfZY6L5hWJDv/r+6kNjboFKgBw1LbfM0lbhuK6Q=="
+      "version": "1.4.243",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.243.tgz",
+      "integrity": "sha512-BgLD2gBX43OSXwlT01oYRRD5NIB4n3okTRxkzEAC6G0SZG4TTlyrWMjbOo0fajCwqwpRtMHXQNMjtRN6qpNtfw=="
     },
     "emoji-regex": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz",
-      "integrity": "sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4=",
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
       "dev": true
     },
     "emojis-list": {
@@ -31161,12 +29509,6 @@
         "to-regex-range": "^5.0.1"
       }
     },
-    "filter-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-      "integrity": "sha1-mzERErxsYSehbgFsbF1/GeCAXFs=",
-      "dev": true
-    },
     "finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
@@ -31371,15 +29713,6 @@
       "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
       "dev": true
     },
-    "fs-access": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
-      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
-      "dev": true,
-      "requires": {
-        "null-check": "^1.0.0"
-      }
-    },
     "fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -31567,60 +29900,6 @@
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true
     },
-    "get-pkg-repo": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz",
-      "integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==",
-      "dev": true,
-      "requires": {
-        "@hutson/parse-repository-url": "^3.0.0",
-        "hosted-git-info": "^4.0.0",
-        "through2": "^2.0.0",
-        "yargs": "^16.2.0"
-      },
-      "dependencies": {
-        "hosted-git-info": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "through2": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~2.3.6",
-            "xtend": "~4.0.1"
-          }
-        },
-        "yargs": {
-          "version": "16.2.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^7.0.2",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.0",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^20.2.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "20.2.9",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-          "dev": true
-        }
-      }
-    },
     "get-port": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
@@ -31667,105 +29946,30 @@
         "assert-plus": "^1.0.0"
       }
     },
-    "git-raw-commits": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz",
-      "integrity": "sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==",
-      "dev": true,
-      "requires": {
-        "dargs": "^7.0.0",
-        "lodash": "^4.17.15",
-        "meow": "^8.0.0",
-        "split2": "^3.0.0",
-        "through2": "^4.0.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "split2": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-          "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "^3.0.0"
-          }
-        }
-      }
-    },
-    "git-remote-origin-url": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
-      "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
-      "dev": true,
-      "requires": {
-        "gitconfiglocal": "^1.0.0",
-        "pify": "^2.3.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
-      }
-    },
-    "git-semver-tags": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-4.1.1.tgz",
-      "integrity": "sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==",
-      "dev": true,
-      "requires": {
-        "meow": "^8.0.0",
-        "semver": "^6.0.0"
-      }
-    },
     "git-up": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/git-up/-/git-up-4.0.5.tgz",
-      "integrity": "sha512-YUvVDg/vX3d0syBsk/CKUTib0srcQME0JyHkL5BaYdwLsiCslPWmDSi8PUMo9pXYjrryMcmsCoCgsTpSCJEQaA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/git-up/-/git-up-6.0.0.tgz",
+      "integrity": "sha512-6RUFSNd1c/D0xtGnyWN2sxza2bZtZ/EmI9448n6rCZruFwV/ezeEn2fJP7XnUQGwf0RAtd/mmUCbtH6JPYA2SA==",
       "dev": true,
       "requires": {
-        "is-ssh": "^1.3.0",
-        "parse-url": "^6.0.0"
+        "is-ssh": "^1.4.0",
+        "parse-url": "^7.0.2"
       }
     },
     "git-url-parse": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.6.0.tgz",
-      "integrity": "sha512-WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g==",
-      "dev": true,
-      "requires": {
-        "git-up": "^4.0.0"
-      }
-    },
-    "gitconfiglocal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
-      "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-12.0.0.tgz",
+      "integrity": "sha512-I6LMWsxV87vysX1WfsoglXsXg6GjQRKq7+Dgiseo+h0skmp5Hp2rzmcEIRQot9CPA+uzU7x1x7jZdqvTFGnB+Q==",
       "dev": true,
       "requires": {
-        "ini": "^1.3.2"
+        "git-up": "^6.0.0"
       }
     },
     "github-slugger": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.2.0.tgz",
-      "integrity": "sha512-wIaa75k1vZhyPm9yWrD08A5Xnx/V+RmzGrpjQuLemGKSb77Qukiaei58Bogrl/LZSADDfPzKJX8jhLs4CRTl7Q==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": ">=6.0.0 <=6.1.1"
-      }
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz",
+      "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==",
+      "dev": true
     },
     "glob": {
       "version": "7.2.0",
@@ -33817,12 +32021,6 @@
         }
       }
     },
-    "hard-rejection": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-      "dev": true
-    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -33922,42 +32120,46 @@
       }
     },
     "hast-util-is-element": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz",
-      "integrity": "sha512-oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ==",
-      "dev": true
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-2.1.2.tgz",
+      "integrity": "sha512-thjnlGAnwP8ef/GSO1Q8BfVk2gundnc2peGQqEg2kUt/IqesiGg/5mSwN2fE7nLzy61pg88NG6xV+UrGOrx9EA==",
+      "dev": true,
+      "requires": {
+        "@types/hast": "^2.0.0",
+        "@types/unist": "^2.0.0"
+      }
     },
     "hast-util-sanitize": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-3.0.2.tgz",
-      "integrity": "sha512-+2I0x2ZCAyiZOO/sb4yNLFmdwPBnyJ4PBkVTUMKMqBwYNA+lXSgOmoRXlJFazoyid9QPogRRKgKhVEodv181sA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-sanitize/-/hast-util-sanitize-4.0.0.tgz",
+      "integrity": "sha512-pw56+69jq+QSr/coADNvWTmBPDy+XsmwaF5KnUys4/wM1jt/fZdl7GPxhXXXYdXnz3Gj3qMkbUCH2uKjvX0MgQ==",
       "dev": true,
       "requires": {
-        "xtend": "^4.0.0"
+        "@types/hast": "^2.0.0"
       }
     },
     "hast-util-to-html": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-7.1.3.tgz",
-      "integrity": "sha512-yk2+1p3EJTEE9ZEUkgHsUSVhIpCsL/bvT8E5GzmWc+N1Po5gBw+0F8bo7dpxXR0nu0bQVxVZGX2lBGF21CmeDw==",
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-8.0.3.tgz",
+      "integrity": "sha512-/D/E5ymdPYhHpPkuTHOUkSatxr4w1ZKrZsG0Zv/3C2SRVT0JFJG53VS45AMrBtYk0wp5A7ksEhiC8QaOZM95+A==",
       "dev": true,
       "requires": {
-        "ccount": "^1.0.0",
-        "comma-separated-tokens": "^1.0.0",
-        "hast-util-is-element": "^1.0.0",
-        "hast-util-whitespace": "^1.0.0",
-        "html-void-elements": "^1.0.0",
-        "property-information": "^5.0.0",
-        "space-separated-tokens": "^1.0.0",
-        "stringify-entities": "^3.0.1",
-        "unist-util-is": "^4.0.0",
-        "xtend": "^4.0.0"
+        "@types/hast": "^2.0.0",
+        "ccount": "^2.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "hast-util-is-element": "^2.0.0",
+        "hast-util-whitespace": "^2.0.0",
+        "html-void-elements": "^2.0.0",
+        "property-information": "^6.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "stringify-entities": "^4.0.2",
+        "unist-util-is": "^5.0.0"
       }
     },
     "hast-util-whitespace": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz",
-      "integrity": "sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz",
+      "integrity": "sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg==",
       "dev": true
     },
     "he": {
@@ -33967,9 +32169,9 @@
       "dev": true
     },
     "highlight.js": {
-      "version": "10.7.3",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
-      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
+      "version": "11.6.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.6.0.tgz",
+      "integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==",
       "dev": true
     },
     "home-or-tmp": {
@@ -34004,9 +32206,9 @@
       "dev": true
     },
     "html-void-elements": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-1.0.5.tgz",
-      "integrity": "sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-2.0.1.tgz",
+      "integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==",
       "dev": true
     },
     "http-cache-semantics": {
@@ -34119,12 +32321,6 @@
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -34277,22 +32473,6 @@
         }
       }
     },
-    "is-alphabetical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-      "dev": true
-    },
-    "is-alphanumerical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-      "dev": true,
-      "requires": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
-      }
-    },
     "is-arguments": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
@@ -34350,9 +32530,9 @@
       "dev": true
     },
     "is-core-module": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
-      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
+      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
       "requires": {
         "has": "^1.0.3"
       }
@@ -34383,12 +32563,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-decimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-      "dev": true
-    },
     "is-descriptor": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
@@ -34470,12 +32644,6 @@
         "is-extglob": "^2.1.1"
       }
     },
-    "is-hexadecimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
-      "dev": true
-    },
     "is-interactive": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
@@ -34545,16 +32713,10 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true
-    },
     "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
       "dev": true
     },
     "is-plain-object": {
@@ -34613,12 +32775,12 @@
       "dev": true
     },
     "is-ssh": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.3.tgz",
-      "integrity": "sha512-NKzJmQzJfEEma3w5cJNcUMxoXfDjz0Zj0eyCalHn2E6VOwlzjZo0yuO2fcBSf8zhFuVCL/82/r5gRcoi6aEPVQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz",
+      "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==",
       "dev": true,
       "requires": {
-        "protocols": "^1.1.0"
+        "protocols": "^2.0.1"
       }
     },
     "is-stream": {
@@ -34645,15 +32807,6 @@
         "has-symbols": "^1.0.2"
       }
     },
-    "is-text-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
-      "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
-      "dev": true,
-      "requires": {
-        "text-extensions": "^1.0.0"
-      }
-    },
     "is-typed-array": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz",
@@ -35256,12 +33409,9 @@
       "dev": true
     },
     "json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "requires": {
-        "minimist": "^1.2.5"
-      }
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
     },
     "jsonfile": {
       "version": "6.1.0",
@@ -35273,22 +33423,6 @@
         "universalify": "^2.0.0"
       }
     },
-    "jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-      "dev": true
-    },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      }
-    },
     "jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
@@ -35672,6 +33806,12 @@
       "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true
     },
+    "kleur": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+      "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
+      "dev": true
+    },
     "konan": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/konan/-/konan-2.1.1.tgz",
@@ -35821,26 +33961,6 @@
       "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
       "dev": true
     },
-    "load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        }
-      }
-    },
     "loader-runner": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
@@ -36039,12 +34159,6 @@
       "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
       "dev": true
     },
-    "lodash.ismatch": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz",
-      "integrity": "sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=",
-      "dev": true
-    },
     "lodash.isobject": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
@@ -36196,9 +34310,9 @@
       "dev": true
     },
     "longest-streak": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
-      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.0.1.tgz",
+      "integrity": "sha512-cHlYSUpL2s7Fb3394mYxwTYj8niTaNHUCLr0qdiCXQfSjfuA7CKofpX2uSwEfFDQ0EB7JcnMnm+GjbqqoinYYg==",
       "dev": true
     },
     "loose-envify": {
@@ -36295,12 +34409,6 @@
       "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
       "dev": true
     },
-    "map-obj": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-      "dev": true
-    },
     "map-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
@@ -36317,13 +34425,10 @@
       }
     },
     "markdown-table": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
-      "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
-      "dev": true,
-      "requires": {
-        "repeat-string": "^1.0.0"
-      }
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.2.tgz",
+      "integrity": "sha512-y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA==",
+      "dev": true
     },
     "marky": {
       "version": "1.2.4",
@@ -36367,104 +34472,130 @@
       }
     },
     "mdast-util-definitions": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz",
-      "integrity": "sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz",
+      "integrity": "sha512-rQ+Gv7mHttxHOBx2dkF4HWTg+EE+UR78ptQWDylzPKaQuVGdG4HIoY3SrS/pCp80nZ04greFvXbVFHT+uf0JVQ==",
       "dev": true,
       "requires": {
-        "unist-util-visit": "^2.0.0"
+        "@types/mdast": "^3.0.0",
+        "@types/unist": "^2.0.0",
+        "unist-util-visit": "^4.0.0"
       }
     },
     "mdast-util-find-and-replace": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz",
-      "integrity": "sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.1.tgz",
+      "integrity": "sha512-SobxkQXFAdd4b5WmEakmkVoh18icjQRxGy5OWTCzgsLRm1Fu/KCtwD1HIQSsmq5ZRjVH0Ehwg6/Fn3xIUk+nKw==",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^4.0.0",
-        "unist-util-is": "^4.0.0",
-        "unist-util-visit-parents": "^3.0.0"
+        "escape-string-regexp": "^5.0.0",
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit-parents": "^5.0.0"
       },
       "dependencies": {
         "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+          "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
           "dev": true
         }
       }
     },
     "mdast-util-from-markdown": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
-      "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz",
+      "integrity": "sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q==",
       "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "micromark": "~2.11.0",
-        "parse-entities": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
+        "@types/unist": "^2.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "mdast-util-to-string": "^3.1.0",
+        "micromark": "^3.0.0",
+        "micromark-util-decode-numeric-character-reference": "^1.0.0",
+        "micromark-util-decode-string": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "unist-util-stringify-position": "^3.0.0",
+        "uvu": "^0.5.0"
       },
       "dependencies": {
         "mdast-util-to-string": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-          "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
+          "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
           "dev": true
         }
       }
     },
     "mdast-util-gfm": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz",
-      "integrity": "sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.1.tgz",
+      "integrity": "sha512-42yHBbfWIFisaAfV1eixlabbsa6q7vHeSPY+cg+BBjX51M8xhgMacqH9g6TftB/9+YkcI0ooV4ncfrJslzm/RQ==",
       "dev": true,
       "requires": {
-        "mdast-util-gfm-autolink-literal": "^0.1.0",
-        "mdast-util-gfm-strikethrough": "^0.2.0",
-        "mdast-util-gfm-table": "^0.1.0",
-        "mdast-util-gfm-task-list-item": "^0.1.0",
-        "mdast-util-to-markdown": "^0.6.1"
+        "mdast-util-from-markdown": "^1.0.0",
+        "mdast-util-gfm-autolink-literal": "^1.0.0",
+        "mdast-util-gfm-footnote": "^1.0.0",
+        "mdast-util-gfm-strikethrough": "^1.0.0",
+        "mdast-util-gfm-table": "^1.0.0",
+        "mdast-util-gfm-task-list-item": "^1.0.0",
+        "mdast-util-to-markdown": "^1.0.0"
       }
     },
     "mdast-util-gfm-autolink-literal": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz",
-      "integrity": "sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.2.tgz",
+      "integrity": "sha512-FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg==",
+      "dev": true,
+      "requires": {
+        "@types/mdast": "^3.0.0",
+        "ccount": "^2.0.0",
+        "mdast-util-find-and-replace": "^2.0.0",
+        "micromark-util-character": "^1.0.0"
+      }
+    },
+    "mdast-util-gfm-footnote": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.1.tgz",
+      "integrity": "sha512-p+PrYlkw9DeCRkTVw1duWqPRHX6Ywh2BNKJQcZbCwAuP/59B0Lk9kakuAd7KbQprVO4GzdW8eS5++A9PUSqIyw==",
       "dev": true,
       "requires": {
-        "ccount": "^1.0.0",
-        "mdast-util-find-and-replace": "^1.1.0",
-        "micromark": "^2.11.3"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.3.0",
+        "micromark-util-normalize-identifier": "^1.0.0"
       }
     },
     "mdast-util-gfm-strikethrough": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz",
-      "integrity": "sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.1.tgz",
+      "integrity": "sha512-zKJbEPe+JP6EUv0mZ0tQUyLQOC+FADt0bARldONot/nefuISkaZFlmVK4tU6JgfyZGrky02m/I6PmehgAgZgqg==",
       "dev": true,
       "requires": {
-        "mdast-util-to-markdown": "^0.6.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.3.0"
       }
     },
     "mdast-util-gfm-table": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz",
-      "integrity": "sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.4.tgz",
+      "integrity": "sha512-aEuoPwZyP4iIMkf2cLWXxx3EQ6Bmh2yKy9MVCg4i6Sd3cX80dcLEfXO/V4ul3pGH9czBK4kp+FAl+ZHmSUt9/w==",
       "dev": true,
       "requires": {
-        "markdown-table": "^2.0.0",
-        "mdast-util-to-markdown": "~0.6.0"
+        "markdown-table": "^3.0.0",
+        "mdast-util-from-markdown": "^1.0.0",
+        "mdast-util-to-markdown": "^1.3.0"
       }
     },
     "mdast-util-gfm-task-list-item": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz",
-      "integrity": "sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.1.tgz",
+      "integrity": "sha512-KZ4KLmPdABXOsfnM6JHUIjxEvcx2ulk656Z/4Balw071/5qgnhz+H1uGtf2zIGnrnvDC8xR4Fj9uKbjAFGNIeA==",
       "dev": true,
       "requires": {
-        "mdast-util-to-markdown": "~0.6.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.3.0"
       }
     },
     "mdast-util-inject": {
@@ -36477,39 +34608,43 @@
       }
     },
     "mdast-util-to-hast": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-10.2.0.tgz",
-      "integrity": "sha512-JoPBfJ3gBnHZ18icCwHR50orC9kNH81tiR1gs01D8Q5YpV6adHNO9nKNuFBCJQ941/32PT1a63UF/DitmS3amQ==",
+      "version": "12.2.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.2.1.tgz",
+      "integrity": "sha512-dyindR2P7qOqXO1hQirZeGtVbiX7xlNQbw7gGaAwN4A1dh4+X8xU/JyYmRoyB8Fu1uPXzp7mlL5QwW7k+knvgA==",
       "dev": true,
       "requires": {
+        "@types/hast": "^2.0.0",
         "@types/mdast": "^3.0.0",
-        "@types/unist": "^2.0.0",
-        "mdast-util-definitions": "^4.0.0",
+        "@types/mdurl": "^1.0.0",
+        "mdast-util-definitions": "^5.0.0",
         "mdurl": "^1.0.0",
-        "unist-builder": "^2.0.0",
-        "unist-util-generated": "^1.0.0",
-        "unist-util-position": "^3.0.0",
-        "unist-util-visit": "^2.0.0"
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "trim-lines": "^3.0.0",
+        "unist-builder": "^3.0.0",
+        "unist-util-generated": "^2.0.0",
+        "unist-util-position": "^4.0.0",
+        "unist-util-visit": "^4.0.0"
       }
     },
     "mdast-util-to-markdown": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz",
-      "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.3.0.tgz",
+      "integrity": "sha512-6tUSs4r+KK4JGTTiQ7FfHmVOaDrLQJPmpjD6wPMlHGUVXoG9Vjc3jIeP+uyBWRf8clwB2blM+W7+KrlMYQnftA==",
       "dev": true,
       "requires": {
+        "@types/mdast": "^3.0.0",
         "@types/unist": "^2.0.0",
-        "longest-streak": "^2.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.0.0",
-        "zwitch": "^1.0.0"
+        "longest-streak": "^3.0.0",
+        "mdast-util-to-string": "^3.0.0",
+        "micromark-util-decode-string": "^1.0.0",
+        "unist-util-visit": "^4.0.0",
+        "zwitch": "^2.0.0"
       },
       "dependencies": {
         "mdast-util-to-string": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-          "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
+          "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
           "dev": true
         }
       }
@@ -36521,38 +34656,54 @@
       "dev": true
     },
     "mdast-util-toc": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-5.1.0.tgz",
-      "integrity": "sha512-csimbRIVkiqc+PpFeKDGQ/Ck2N4f9FYH3zzBMMJzcxoKL8m+cM0n94xXm0I9eaxHnKdY9n145SGTdyJC7i273g==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-6.1.0.tgz",
+      "integrity": "sha512-0PuqZELXZl4ms1sF7Lqigrqik4Ll3UhbI+jdTrfw7pZ9QPawgl7LD4GQ8MkU7bT/EwiVqChNTbifa2jLLKo76A==",
       "dev": true,
       "requires": {
-        "@types/mdast": "^3.0.3",
-        "@types/unist": "^2.0.3",
-        "extend": "^3.0.2",
-        "github-slugger": "^1.2.1",
-        "mdast-util-to-string": "^2.0.0",
-        "unist-util-is": "^4.0.0",
-        "unist-util-visit": "^2.0.0"
+        "@types/extend": "^3.0.0",
+        "@types/github-slugger": "^1.0.0",
+        "@types/mdast": "^3.0.0",
+        "extend": "^3.0.0",
+        "github-slugger": "^1.0.0",
+        "mdast-util-to-string": "^3.1.0",
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit": "^3.0.0"
       },
       "dependencies": {
-        "github-slugger": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz",
-          "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==",
-          "dev": true
-        },
         "mdast-util-to-string": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-          "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz",
+          "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==",
           "dev": true
+        },
+        "unist-util-visit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-3.1.0.tgz",
+          "integrity": "sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA==",
+          "dev": true,
+          "requires": {
+            "@types/unist": "^2.0.0",
+            "unist-util-is": "^5.0.0",
+            "unist-util-visit-parents": "^4.0.0"
+          }
+        },
+        "unist-util-visit-parents": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz",
+          "integrity": "sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw==",
+          "dev": true,
+          "requires": {
+            "@types/unist": "^2.0.0",
+            "unist-util-is": "^5.0.0"
+          }
         }
       }
     },
     "mdurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
       "dev": true
     },
     "media-typer": {
@@ -36586,193 +34737,6 @@
         "readable-stream": "^2.0.1"
       }
     },
-    "meow": {
-      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz",
-      "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==",
-      "dev": true,
-      "requires": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "hosted-git-info": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "normalize-package-data": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-          "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^4.0.1",
-            "is-core-module": "^2.5.0",
-            "semver": "^7.3.4",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "parse-json": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-          "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "error-ex": "^1.3.1",
-            "json-parse-even-better-errors": "^2.3.0",
-            "lines-and-columns": "^1.1.6"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-          "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-          "dev": true,
-          "requires": {
-            "@types/normalize-package-data": "^2.4.0",
-            "normalize-package-data": "^2.5.0",
-            "parse-json": "^5.0.0",
-            "type-fest": "^0.6.0"
-          },
-          "dependencies": {
-            "hosted-git-info": {
-              "version": "2.8.9",
-              "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-              "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-              "dev": true
-            },
-            "normalize-package-data": {
-              "version": "2.5.0",
-              "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-              "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-              "dev": true,
-              "requires": {
-                "hosted-git-info": "^2.1.4",
-                "resolve": "^1.10.0",
-                "semver": "2 || 3 || 4 || 5",
-                "validate-npm-package-license": "^3.0.1"
-              }
-            },
-            "semver": {
-              "version": "5.7.1",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-              "dev": true
-            },
-            "type-fest": {
-              "version": "0.6.0",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-              "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-              "dev": true
-            }
-          }
-        },
-        "read-pkg-up": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-          "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.1.0",
-            "read-pkg": "^5.2.0",
-            "type-fest": "^0.8.1"
-          },
-          "dependencies": {
-            "type-fest": {
-              "version": "0.8.1",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-              "dev": true
-            }
-          }
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.18.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-          "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-          "dev": true
-        },
-        "yargs-parser": {
-          "version": "20.2.9",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-          "dev": true
-        }
-      }
-    },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -36790,71 +34754,332 @@
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "micromark": {
-      "version": "2.11.4",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
-      "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.0.10.tgz",
+      "integrity": "sha512-ryTDy6UUunOXy2HPjelppgJ2sNfcPz1pLlMdA6Rz9jPzhLikWXv/irpWV/I2jd68Uhmny7hHxAlAhk4+vWggpg==",
       "dev": true,
       "requires": {
+        "@types/debug": "^4.0.0",
         "debug": "^4.0.0",
-        "parse-entities": "^2.0.0"
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-core-commonmark": "^1.0.1",
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-combine-extensions": "^1.0.0",
+        "micromark-util-decode-numeric-character-reference": "^1.0.0",
+        "micromark-util-encode": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-resolve-all": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-subtokenize": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.1",
+        "uvu": "^0.5.0"
+      }
+    },
+    "micromark-core-commonmark": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz",
+      "integrity": "sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA==",
+      "dev": true,
+      "requires": {
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-factory-destination": "^1.0.0",
+        "micromark-factory-label": "^1.0.0",
+        "micromark-factory-space": "^1.0.0",
+        "micromark-factory-title": "^1.0.0",
+        "micromark-factory-whitespace": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-classify-character": "^1.0.0",
+        "micromark-util-html-tag-name": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-resolve-all": "^1.0.0",
+        "micromark-util-subtokenize": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.1",
+        "uvu": "^0.5.0"
       }
     },
     "micromark-extension-gfm": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz",
-      "integrity": "sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-2.0.1.tgz",
+      "integrity": "sha512-p2sGjajLa0iYiGQdT0oelahRYtMWvLjy8J9LOCxzIQsllMCGLbsLW+Nc+N4vi02jcRJvedVJ68cjelKIO6bpDA==",
       "dev": true,
       "requires": {
-        "micromark": "~2.11.0",
-        "micromark-extension-gfm-autolink-literal": "~0.5.0",
-        "micromark-extension-gfm-strikethrough": "~0.6.5",
-        "micromark-extension-gfm-table": "~0.4.0",
-        "micromark-extension-gfm-tagfilter": "~0.3.0",
-        "micromark-extension-gfm-task-list-item": "~0.3.0"
+        "micromark-extension-gfm-autolink-literal": "^1.0.0",
+        "micromark-extension-gfm-footnote": "^1.0.0",
+        "micromark-extension-gfm-strikethrough": "^1.0.0",
+        "micromark-extension-gfm-table": "^1.0.0",
+        "micromark-extension-gfm-tagfilter": "^1.0.0",
+        "micromark-extension-gfm-task-list-item": "^1.0.0",
+        "micromark-util-combine-extensions": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
       }
     },
     "micromark-extension-gfm-autolink-literal": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz",
-      "integrity": "sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-1.0.3.tgz",
+      "integrity": "sha512-i3dmvU0htawfWED8aHMMAzAVp/F0Z+0bPh3YrbTPPL1v4YAlCZpy5rBO5p0LPYiZo0zFVkoYh7vDU7yQSiCMjg==",
       "dev": true,
       "requires": {
-        "micromark": "~2.11.3"
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      }
+    },
+    "micromark-extension-gfm-footnote": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.0.4.tgz",
+      "integrity": "sha512-E/fmPmDqLiMUP8mLJ8NbJWJ4bTw6tS+FEQS8CcuDtZpILuOb2kjLqPEeAePF1djXROHXChM/wPJw0iS4kHCcIg==",
+      "dev": true,
+      "requires": {
+        "micromark-core-commonmark": "^1.0.0",
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-normalize-identifier": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       }
     },
     "micromark-extension-gfm-strikethrough": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz",
-      "integrity": "sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.4.tgz",
+      "integrity": "sha512-/vjHU/lalmjZCT5xt7CcHVJGq8sYRm80z24qAKXzaHzem/xsDYb2yLL+NNVbYvmpLx3O7SYPuGL5pzusL9CLIQ==",
       "dev": true,
       "requires": {
-        "micromark": "~2.11.0"
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-classify-character": "^1.0.0",
+        "micromark-util-resolve-all": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       }
     },
     "micromark-extension-gfm-table": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz",
-      "integrity": "sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-1.0.5.tgz",
+      "integrity": "sha512-xAZ8J1X9W9K3JTJTUL7G6wSKhp2ZYHrFk5qJgY/4B33scJzE2kpfRL6oiw/veJTbt7jiM/1rngLlOKPWr1G+vg==",
       "dev": true,
       "requires": {
-        "micromark": "~2.11.0"
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
       }
     },
     "micromark-extension-gfm-tagfilter": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz",
-      "integrity": "sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==",
-      "dev": true
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-1.0.1.tgz",
+      "integrity": "sha512-Ty6psLAcAjboRa/UKUbbUcwjVAv5plxmpUTy2XC/3nJFL37eHej8jrHrRzkqcpipJliuBH30DTs7+3wqNcQUVA==",
+      "dev": true,
+      "requires": {
+        "micromark-util-types": "^1.0.0"
+      }
     },
     "micromark-extension-gfm-task-list-item": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz",
-      "integrity": "sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-1.0.3.tgz",
+      "integrity": "sha512-PpysK2S1Q/5VXi72IIapbi/jliaiOFzv7THH4amwXeYXLq3l1uo8/2Be0Ac1rEwK20MQEsGH2ltAZLNY2KI/0Q==",
+      "dev": true,
+      "requires": {
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      }
+    },
+    "micromark-factory-destination": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz",
+      "integrity": "sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw==",
+      "dev": true,
+      "requires": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "micromark-factory-label": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-1.0.2.tgz",
+      "integrity": "sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg==",
+      "dev": true,
+      "requires": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      }
+    },
+    "micromark-factory-space": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz",
+      "integrity": "sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew==",
+      "dev": true,
+      "requires": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "micromark-factory-title": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-1.0.2.tgz",
+      "integrity": "sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A==",
+      "dev": true,
+      "requires": {
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      }
+    },
+    "micromark-factory-whitespace": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz",
+      "integrity": "sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A==",
+      "dev": true,
+      "requires": {
+        "micromark-factory-space": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "micromark-util-character": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.1.0.tgz",
+      "integrity": "sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==",
+      "dev": true,
+      "requires": {
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "micromark-util-chunked": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz",
+      "integrity": "sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g==",
+      "dev": true,
+      "requires": {
+        "micromark-util-symbol": "^1.0.0"
+      }
+    },
+    "micromark-util-classify-character": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz",
+      "integrity": "sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA==",
+      "dev": true,
+      "requires": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "micromark-util-combine-extensions": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz",
+      "integrity": "sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA==",
       "dev": true,
       "requires": {
-        "micromark": "~2.11.0"
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-types": "^1.0.0"
       }
     },
+    "micromark-util-decode-numeric-character-reference": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz",
+      "integrity": "sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w==",
+      "dev": true,
+      "requires": {
+        "micromark-util-symbol": "^1.0.0"
+      }
+    },
+    "micromark-util-decode-string": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-1.0.2.tgz",
+      "integrity": "sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q==",
+      "dev": true,
+      "requires": {
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-decode-numeric-character-reference": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0"
+      }
+    },
+    "micromark-util-encode": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.0.1.tgz",
+      "integrity": "sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA==",
+      "dev": true
+    },
+    "micromark-util-html-tag-name": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.1.0.tgz",
+      "integrity": "sha512-BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA==",
+      "dev": true
+    },
+    "micromark-util-normalize-identifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz",
+      "integrity": "sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg==",
+      "dev": true,
+      "requires": {
+        "micromark-util-symbol": "^1.0.0"
+      }
+    },
+    "micromark-util-resolve-all": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz",
+      "integrity": "sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw==",
+      "dev": true,
+      "requires": {
+        "micromark-util-types": "^1.0.0"
+      }
+    },
+    "micromark-util-sanitize-uri": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.0.0.tgz",
+      "integrity": "sha512-cCxvBKlmac4rxCGx6ejlIviRaMKZc0fWm5HdCHEeDWRSkn44l6NdYVRyU+0nT1XC72EQJMZV8IPHF+jTr56lAg==",
+      "dev": true,
+      "requires": {
+        "micromark-util-character": "^1.0.0",
+        "micromark-util-encode": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0"
+      }
+    },
+    "micromark-util-subtokenize": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.2.tgz",
+      "integrity": "sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA==",
+      "dev": true,
+      "requires": {
+        "micromark-util-chunked": "^1.0.0",
+        "micromark-util-symbol": "^1.0.0",
+        "micromark-util-types": "^1.0.0",
+        "uvu": "^0.5.0"
+      }
+    },
+    "micromark-util-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz",
+      "integrity": "sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==",
+      "dev": true
+    },
+    "micromark-util-types": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.0.2.tgz",
+      "integrity": "sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==",
+      "dev": true
+    },
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -36983,12 +35208,6 @@
       "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
       "dev": true
     },
-    "min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true
-    },
     "minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -37001,26 +35220,8 @@
     "minimist": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
-    },
-    "minimist-options": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-      "dev": true,
-      "requires": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0",
-        "kind-of": "^6.0.3"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        }
-      }
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
     },
     "mixin-deep": {
       "version": "1.3.2",
@@ -37139,93 +35340,6 @@
         }
       }
     },
-    "modify-values": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
-      "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
-      "dev": true
-    },
-    "module-deps-sortable": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/module-deps-sortable/-/module-deps-sortable-5.0.3.tgz",
-      "integrity": "sha512-eiyIZj/A0dj1o4ywXWqicazUL3l0HP3TydUR6xF0X3xh3LGBMLqW8a9aFe6MuNH4mxNMk53QKBHM6LOPR8kSgw==",
-      "dev": true,
-      "requires": {
-        "browser-resolve": "^1.7.0",
-        "cached-path-relative": "^1.0.0",
-        "concat-stream": "~1.5.0",
-        "defined": "^1.0.0",
-        "detective": "^5.2.0",
-        "duplexer2": "^0.1.2",
-        "inherits": "^2.0.1",
-        "JSONStream": "^1.0.3",
-        "konan": "^2.1.1",
-        "readable-stream": "^2.0.2",
-        "resolve": "^1.1.3",
-        "standard-version": "^9.0.0",
-        "stream-combiner2": "^1.1.1",
-        "subarg": "^1.0.0",
-        "through2": "^2.0.0",
-        "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "concat-stream": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
-          "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
-          "dev": true,
-          "requires": {
-            "inherits": "~2.0.1",
-            "readable-stream": "~2.0.0",
-            "typedarray": "~0.0.5"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "2.0.6",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-              "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-              "dev": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~1.0.6",
-                "string_decoder": "~0.10.x",
-                "util-deprecate": "~1.0.1"
-              }
-            }
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "through2": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~2.3.6",
-            "xtend": "~4.0.1"
-          }
-        }
-      }
-    },
     "morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
@@ -37262,6 +35376,12 @@
         }
       }
     },
+    "mri": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
+      "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
+      "dev": true
+    },
     "mrmime": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.0.tgz",
@@ -37337,9 +35457,9 @@
       "optional": true
     },
     "nanoid": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
-      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
       "dev": true,
       "optional": true
     },
@@ -37464,9 +35584,9 @@
       }
     },
     "node-releases": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz",
-      "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
+      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
     },
     "nopt": {
       "version": "3.0.6",
@@ -37535,12 +35655,6 @@
         }
       }
     },
-    "null-check": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
-      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
-      "dev": true
-    },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -37948,20 +36062,6 @@
         "callsites": "^3.0.0"
       }
     },
-    "parse-entities": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-      "dev": true,
-      "requires": {
-        "character-entities": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "character-reference-invalid": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-hexadecimal": "^1.0.0"
-      }
-    },
     "parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -37974,13 +36074,15 @@
       }
     },
     "parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
       "requires": {
+        "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
       }
     },
     "parse-ms": {
@@ -38002,27 +36104,24 @@
       "dev": true
     },
     "parse-path": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-4.0.4.tgz",
-      "integrity": "sha512-Z2lWUis7jlmXC1jeOG9giRO2+FsuyNipeQ43HAjqAZjwSe3SEf+q/84FGPHoso3kyntbxa4c4i77t3m6fGf8cw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-5.0.0.tgz",
+      "integrity": "sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A==",
       "dev": true,
       "requires": {
-        "is-ssh": "^1.3.0",
-        "protocols": "^1.4.0",
-        "qs": "^6.9.4",
-        "query-string": "^6.13.8"
+        "protocols": "^2.0.0"
       }
     },
     "parse-url": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-6.0.5.tgz",
-      "integrity": "sha512-e35AeLTSIlkw/5GFq70IN7po8fmDUjpDPY1rIK+VubRfsUvBonjQ+PBZG+vWMACnQSmNlvl524IucoDmcioMxA==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-7.0.2.tgz",
+      "integrity": "sha512-PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg==",
       "dev": true,
       "requires": {
-        "is-ssh": "^1.3.0",
+        "is-ssh": "^1.4.0",
         "normalize-url": "^6.1.0",
-        "parse-path": "^4.0.0",
-        "protocols": "^1.4.0"
+        "parse-path": "^5.0.0",
+        "protocols": "^2.0.1"
       }
     },
     "parseurl": {
@@ -38091,23 +36190,6 @@
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
       "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
     },
-    "path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "requires": {
-        "pify": "^3.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        }
-      }
-    },
     "pathval": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
@@ -38147,9 +36229,9 @@
       "dev": true
     },
     "pify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz",
-      "integrity": "sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-6.1.0.tgz",
+      "integrity": "sha512-KocF8ve28eFjjuBKKGvzOBGzG8ew2OqOOSxTTZhirkzH7h3BI1vyzqlR0qbfcDBve1Yzo3FVlWUAtCRrbVN8Fw==",
       "dev": true
     },
     "pinkie": {
@@ -38263,13 +36345,13 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.4.8",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz",
-      "integrity": "sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==",
+      "version": "8.4.16",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
+      "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
       "dev": true,
       "optional": true,
       "requires": {
-        "nanoid": "^3.3.1",
+        "nanoid": "^3.3.4",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       }
@@ -38339,18 +36421,15 @@
       "dev": true
     },
     "property-information": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz",
-      "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==",
-      "dev": true,
-      "requires": {
-        "xtend": "^4.0.0"
-      }
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.1.1.tgz",
+      "integrity": "sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==",
+      "dev": true
     },
     "protocols": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.8.tgz",
-      "integrity": "sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz",
+      "integrity": "sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==",
       "dev": true
     },
     "proxy-addr": {
@@ -38523,18 +36602,6 @@
       "integrity": "sha512-bK0/0cCI+R8ZmOF1QjT7HupDUYCxbf/9TJgAmSXQxZpftXmTAeil9DRoCnTDkWbvOyZzhcMBwKpptWcdkGFIMg==",
       "dev": true
     },
-    "query-string": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz",
-      "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
-      "dev": true,
-      "requires": {
-        "decode-uri-component": "^0.2.0",
-        "filter-obj": "^1.1.0",
-        "split-on-first": "^1.0.0",
-        "strict-uri-encode": "^2.0.0"
-      }
-    },
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -38585,67 +36652,119 @@
       "dev": true
     },
     "read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
+      "integrity": "sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==",
       "dev": true,
       "requires": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
+        "@types/normalize-package-data": "^2.4.1",
+        "normalize-package-data": "^3.0.2",
+        "parse-json": "^5.2.0",
+        "type-fest": "^2.0.0"
+      },
+      "dependencies": {
+        "hosted-git-info": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "normalize-package-data": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+          "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^4.0.1",
+            "is-core-module": "^2.5.0",
+            "semver": "^7.3.4",
+            "validate-npm-package-license": "^3.0.1"
+          }
+        },
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "type-fest": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+          "dev": true
+        }
       }
     },
     "read-pkg-up": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
-      "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-9.1.0.tgz",
+      "integrity": "sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg==",
       "dev": true,
       "requires": {
-        "find-up": "^3.0.0",
-        "read-pkg": "^3.0.0"
+        "find-up": "^6.3.0",
+        "read-pkg": "^7.1.0",
+        "type-fest": "^2.5.0"
       },
       "dependencies": {
         "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+          "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "^7.1.0",
+            "path-exists": "^5.0.0"
           }
         },
         "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.1.1.tgz",
+          "integrity": "sha512-vJXaRMJgRVD3+cUZs3Mncj2mxpt5mP0EmNOsxRSZRMlbqjvxzDEOIUWXGmavo0ZC9+tNZCBLQ66reA11nbpHZg==",
           "dev": true,
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "p-locate": "^6.0.0"
           }
         },
         "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+          "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "yocto-queue": "^1.0.0"
           }
         },
         "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+          "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "^4.0.0"
           }
         },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+        "path-exists": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+          "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+          "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+          "dev": true
+        },
+        "yocto-queue": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+          "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
           "dev": true
         }
       }
@@ -38720,16 +36839,6 @@
         }
       }
     },
-    "redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
-      "requires": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      }
-    },
     "regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -38817,72 +36926,84 @@
       }
     },
     "remark": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz",
-      "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==",
+      "version": "14.0.2",
+      "resolved": "https://registry.npmjs.org/remark/-/remark-14.0.2.tgz",
+      "integrity": "sha512-A3ARm2V4BgiRXaUo5K0dRvJ1lbogrbXnhkJRmD0yw092/Yl0kOCZt1k9ZeElEwkZsWGsMumz6qL5MfNJH9nOBA==",
       "dev": true,
       "requires": {
-        "remark-parse": "^9.0.0",
-        "remark-stringify": "^9.0.0",
-        "unified": "^9.1.0"
+        "@types/mdast": "^3.0.0",
+        "remark-parse": "^10.0.0",
+        "remark-stringify": "^10.0.0",
+        "unified": "^10.0.0"
       }
     },
     "remark-gfm": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-1.0.0.tgz",
-      "integrity": "sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-3.0.1.tgz",
+      "integrity": "sha512-lEFDoi2PICJyNrACFOfDD3JlLkuSbOa5Wd8EPt06HUdptv8Gn0bxYTdbU/XXQ3swAPkEaGxxPN9cbnMHvVu1Ig==",
       "dev": true,
       "requires": {
-        "mdast-util-gfm": "^0.1.0",
-        "micromark-extension-gfm": "^0.3.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-gfm": "^2.0.0",
+        "micromark-extension-gfm": "^2.0.0",
+        "unified": "^10.0.0"
       }
     },
     "remark-html": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/remark-html/-/remark-html-13.0.2.tgz",
-      "integrity": "sha512-LhSRQ+3RKdBqB/RGesFWkNNfkGqprDUCwjq54SylfFeNyZby5kqOG8Dn/vYsRoM8htab6EWxFXCY6XIZvMoRiQ==",
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/remark-html/-/remark-html-15.0.1.tgz",
+      "integrity": "sha512-7ta5UPRqj8nP0GhGMYUAghZ/DRno7dgq7alcW90A7+9pgJsXzGJlFgwF8HOP1b1tMgT3WwbeANN+CaTimMfyNQ==",
       "dev": true,
       "requires": {
-        "hast-util-sanitize": "^3.0.0",
-        "hast-util-to-html": "^7.0.0",
-        "mdast-util-to-hast": "^10.0.0"
+        "@types/mdast": "^3.0.0",
+        "hast-util-sanitize": "^4.0.0",
+        "hast-util-to-html": "^8.0.0",
+        "mdast-util-to-hast": "^12.0.0",
+        "unified": "^10.0.0"
       }
     },
     "remark-parse": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
-      "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-10.0.1.tgz",
+      "integrity": "sha512-1fUyHr2jLsVOkhbvPRBJ5zTKZZyD6yZzYaWCS6BPBdQ8vEMBCH+9zNCDA6tET/zHCi/jLqjCWtlJZUPk+DbnFw==",
       "dev": true,
       "requires": {
-        "mdast-util-from-markdown": "^0.8.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-from-markdown": "^1.0.0",
+        "unified": "^10.0.0"
       }
     },
     "remark-reference-links": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/remark-reference-links/-/remark-reference-links-5.0.0.tgz",
-      "integrity": "sha512-oSIo6lfDyG/1yYl2jPZNXmD9dgyPxp07mSd7snJagVMsDU6NRlD8i54MwHWUgMoOHTs8lIKPkwaUok/tbr5syQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/remark-reference-links/-/remark-reference-links-6.0.1.tgz",
+      "integrity": "sha512-34wY2C6HXSuKVTRtyJJwefkUD8zBOZOSHFZ4aSTnU2F656gr9WeuQ2dL6IJDK3NPd2F6xKF2t4XXcQY9MygAXg==",
       "dev": true,
       "requires": {
-        "unist-util-visit": "^2.0.0"
+        "@types/mdast": "^3.0.0",
+        "unified": "^10.0.0",
+        "unist-util-visit": "^4.0.0"
       }
     },
     "remark-stringify": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz",
-      "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-10.0.2.tgz",
+      "integrity": "sha512-6wV3pvbPvHkbNnWB0wdDvVFHOe1hBRAx1Q/5g/EpH4RppAII6J8Gnwe7VbHuXaoKIF6LAg6ExTel/+kNqSQ7lw==",
       "dev": true,
       "requires": {
-        "mdast-util-to-markdown": "^0.6.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-to-markdown": "^1.0.0",
+        "unified": "^10.0.0"
       }
     },
     "remark-toc": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/remark-toc/-/remark-toc-7.2.0.tgz",
-      "integrity": "sha512-ppHepvpbg7j5kPFmU5rzDC4k2GTcPDvWcxXyr/7BZzO1cBSPk0stKtEJdsgAyw2WHKPGxadcHIZRjb2/sHxjkg==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/remark-toc/-/remark-toc-8.0.1.tgz",
+      "integrity": "sha512-7he2VOm/cy13zilnOTZcyAoyoolV26ULlon6XyCFU+vG54Z/LWJnwphj/xKIDLOt66QmJUgTyUvLVHi2aAElyg==",
       "dev": true,
       "requires": {
-        "@types/unist": "^2.0.3",
-        "mdast-util-toc": "^5.0.0"
+        "@types/mdast": "^3.0.0",
+        "mdast-util-toc": "^6.0.0",
+        "unified": "^10.0.0"
       }
     },
     "remove-bom-buffer": {
@@ -39029,12 +37150,6 @@
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true
     },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
     "require-uncached": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
@@ -39060,11 +37175,11 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
       "requires": {
-        "is-core-module": "^2.8.1",
+        "is-core-module": "^2.9.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
@@ -39207,6 +37322,15 @@
         }
       }
     },
+    "sade": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz",
+      "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==",
+      "dev": true,
+      "requires": {
+        "mri": "^1.1.0"
+      }
+    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -39818,7 +37942,8 @@
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
     },
     "source-map-js": {
       "version": "1.0.2",
@@ -39869,9 +37994,9 @@
       "optional": true
     },
     "space-separated-tokens": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz",
-      "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz",
+      "integrity": "sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw==",
       "dev": true
     },
     "sparkles": {
@@ -39921,12 +38046,6 @@
         "through": "2"
       }
     },
-    "split-on-first": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
-      "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",
-      "dev": true
-    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -39988,110 +38107,6 @@
         }
       }
     },
-    "standard-version": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/standard-version/-/standard-version-9.3.2.tgz",
-      "integrity": "sha512-u1rfKP4o4ew7Yjbfycv80aNMN2feTiqseAhUhrrx2XtdQGmu7gucpziXe68Z4YfHVqlxVEzo4aUA0Iu3VQOTgQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.2",
-        "conventional-changelog": "3.1.24",
-        "conventional-changelog-config-spec": "2.1.0",
-        "conventional-changelog-conventionalcommits": "4.6.1",
-        "conventional-recommended-bump": "6.1.0",
-        "detect-indent": "^6.0.0",
-        "detect-newline": "^3.1.0",
-        "dotgitignore": "^2.1.0",
-        "figures": "^3.1.0",
-        "find-up": "^5.0.0",
-        "fs-access": "^1.0.1",
-        "git-semver-tags": "^4.0.0",
-        "semver": "^7.1.1",
-        "stringify-package": "^1.0.1",
-        "yargs": "^16.0.0"
-      },
-      "dependencies": {
-        "detect-newline": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-          "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^6.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^5.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-          "dev": true,
-          "requires": {
-            "yocto-queue": "^0.1.0"
-          }
-        },
-        "p-locate": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^3.0.2"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "yargs": {
-          "version": "16.2.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^7.0.2",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.0",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^20.2.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "20.2.9",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-          "dev": true
-        }
-      }
-    },
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -40175,50 +38190,6 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
     },
-    "stream-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/stream-array/-/stream-array-1.1.2.tgz",
-      "integrity": "sha1-nl9zRfITfDDuO0mLkRToC1K7frU=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~2.1.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.1.5",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-          "integrity": "sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA=",
-          "dev": true,
-          "requires": {
-            "buffer-shims": "^1.0.0",
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "string_decoder": "~0.10.x",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
     "stream-buffers": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
@@ -40234,16 +38205,6 @@
         "duplexer": "~0.1.1"
       }
     },
-    "stream-combiner2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
-      "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
-      "dev": true,
-      "requires": {
-        "duplexer2": "~0.1.0",
-        "readable-stream": "^2.0.2"
-      }
-    },
     "stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
@@ -40267,12 +38228,6 @@
         "fs-extra": "^10.0.1"
       }
     },
-    "strict-uri-encode": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
-      "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=",
-      "dev": true
-    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -40328,22 +38283,15 @@
       }
     },
     "stringify-entities": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz",
-      "integrity": "sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.3.tgz",
+      "integrity": "sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==",
       "dev": true,
       "requires": {
-        "character-entities-html4": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "xtend": "^4.0.0"
+        "character-entities-html4": "^2.0.0",
+        "character-entities-legacy": "^3.0.0"
       }
     },
-    "stringify-package": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz",
-      "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==",
-      "dev": true
-    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -40371,30 +38319,12 @@
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
-    "strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "requires": {
-        "min-indent": "^1.0.0"
-      }
-    },
     "strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
       "dev": true
     },
-    "subarg": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
-      "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.1.0"
-      }
-    },
     "suffix": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
@@ -40634,12 +38564,6 @@
         "minimatch": "^3.0.4"
       }
     },
-    "text-extensions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
-      "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
-      "dev": true
-    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -40881,10 +38805,10 @@
       "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
       "dev": true
     },
-    "trim-newlines": {
+    "trim-lines": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+      "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
       "dev": true
     },
     "trim-right": {
@@ -40894,9 +38818,9 @@
       "dev": true
     },
     "trough": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz",
+      "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
       "dev": true
     },
     "tsconfig-paths": {
@@ -41111,25 +39035,18 @@
       "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="
     },
     "unified": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz",
-      "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",
+      "integrity": "sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==",
       "dev": true,
       "requires": {
-        "bail": "^1.0.0",
+        "@types/unist": "^2.0.0",
+        "bail": "^2.0.0",
         "extend": "^3.0.0",
         "is-buffer": "^2.0.0",
-        "is-plain-obj": "^2.0.0",
-        "trough": "^1.0.0",
-        "vfile": "^4.0.0"
-      },
-      "dependencies": {
-        "is-plain-obj": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-          "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-          "dev": true
-        }
+        "is-plain-obj": "^4.0.0",
+        "trough": "^2.0.0",
+        "vfile": "^5.0.0"
       }
     },
     "union-value": {
@@ -41163,57 +39080,63 @@
       }
     },
     "unist-builder": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
-      "integrity": "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==",
-      "dev": true
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-3.0.0.tgz",
+      "integrity": "sha512-GFxmfEAa0vi9i5sd0R2kcrI9ks0r82NasRq5QHh2ysGngrc6GiqD5CDf1FjPenY4vApmFASBIIlk/jj5J5YbmQ==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^2.0.0"
+      }
     },
     "unist-util-generated": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz",
-      "integrity": "sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-2.0.0.tgz",
+      "integrity": "sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw==",
       "dev": true
     },
     "unist-util-is": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-      "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.1.1.tgz",
+      "integrity": "sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ==",
       "dev": true
     },
     "unist-util-position": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz",
-      "integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==",
-      "dev": true
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.3.tgz",
+      "integrity": "sha512-p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "^2.0.0"
+      }
     },
     "unist-util-stringify-position": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
-      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz",
+      "integrity": "sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==",
       "dev": true,
       "requires": {
-        "@types/unist": "^2.0.2"
+        "@types/unist": "^2.0.0"
       }
     },
     "unist-util-visit": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-      "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.1.tgz",
+      "integrity": "sha512-n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg==",
       "dev": true,
       "requires": {
         "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0",
-        "unist-util-visit-parents": "^3.0.0"
+        "unist-util-is": "^5.0.0",
+        "unist-util-visit-parents": "^5.1.1"
       }
     },
     "unist-util-visit-parents": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-      "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.1.tgz",
+      "integrity": "sha512-gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw==",
       "dev": true,
       "requires": {
         "@types/unist": "^2.0.0",
-        "unist-util-is": "^4.0.0"
+        "unist-util-is": "^5.0.0"
       }
     },
     "universalify": {
@@ -41296,6 +39219,15 @@
       "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
       "dev": true
     },
+    "update-browserslist-db": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz",
+      "integrity": "sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg==",
+      "requires": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      }
+    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -41376,6 +39308,18 @@
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "dev": true
     },
+    "uvu": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/uvu/-/uvu-0.5.6.tgz",
+      "integrity": "sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==",
+      "dev": true,
+      "requires": {
+        "dequal": "^2.0.0",
+        "diff": "^5.0.0",
+        "kleur": "^4.0.3",
+        "sade": "^1.7.3"
+      }
+    },
     "v8-compile-cache": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
@@ -41432,69 +39376,92 @@
       }
     },
     "vfile": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
-      "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.4.tgz",
+      "integrity": "sha512-KI+7cnst03KbEyN1+JE504zF5bJBZa+J+CrevLeyIMq0aPU681I2rQ5p4PlnQ6exFtWiUrg26QUdFMnAKR6PIw==",
       "dev": true,
       "requires": {
         "@types/unist": "^2.0.0",
         "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0",
-        "vfile-message": "^2.0.0"
+        "unist-util-stringify-position": "^3.0.0",
+        "vfile-message": "^3.0.0"
       }
     },
     "vfile-message": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
-      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.2.tgz",
+      "integrity": "sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA==",
       "dev": true,
       "requires": {
         "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
+        "unist-util-stringify-position": "^3.0.0"
       }
     },
     "vfile-reporter": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-6.0.2.tgz",
-      "integrity": "sha512-GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.4.tgz",
+      "integrity": "sha512-4cWalUnLrEnbeUQ+hARG5YZtaHieVK3Jp4iG5HslttkVl+MHunSGNAIrODOTLbtjWsNZJRMCkL66AhvZAYuJ9A==",
       "dev": true,
       "requires": {
-        "repeat-string": "^1.5.0",
-        "string-width": "^4.0.0",
-        "supports-color": "^6.0.0",
-        "unist-util-stringify-position": "^2.0.0",
-        "vfile-sort": "^2.1.2",
-        "vfile-statistics": "^1.1.0"
+        "@types/supports-color": "^8.0.0",
+        "string-width": "^5.0.0",
+        "supports-color": "^9.0.0",
+        "unist-util-stringify-position": "^3.0.0",
+        "vfile-sort": "^3.0.0",
+        "vfile-statistics": "^2.0.0"
       },
       "dependencies": {
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+        "ansi-regex": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
           "dev": true
         },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+        "string-width": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "eastasianwidth": "^0.2.0",
+            "emoji-regex": "^9.2.2",
+            "strip-ansi": "^7.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^6.0.1"
           }
+        },
+        "supports-color": {
+          "version": "9.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.3.tgz",
+          "integrity": "sha512-aszYUX/DVK/ed5rFLb/dDinVJrQjG/vmU433wtqVSD800rYsJNWxh2R3USV90aLSU+UsyQkbNeffVLzc6B6foA==",
+          "dev": true
         }
       }
     },
     "vfile-sort": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-2.2.2.tgz",
-      "integrity": "sha512-tAyUqD2R1l/7Rn7ixdGkhXLD3zsg+XLAeUDUhXearjfIcpL1Hcsj5hHpCoy/gvfK/Ws61+e972fm0F7up7hfYA==",
-      "dev": true
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-3.0.0.tgz",
+      "integrity": "sha512-fJNctnuMi3l4ikTVcKpxTbzHeCgvDhnI44amA3NVDvA6rTC6oKCFpCVyT5n2fFMr3ebfr+WVQZedOCd73rzSxg==",
+      "dev": true,
+      "requires": {
+        "vfile-message": "^3.0.0"
+      }
     },
     "vfile-statistics": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.4.tgz",
-      "integrity": "sha512-lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-2.0.0.tgz",
+      "integrity": "sha512-foOWtcnJhKN9M2+20AOTlWi2dxNfAoeNIoxD5GXcO182UJyId4QrXa41fWrgcfV3FWTjdEDy3I4cpLVcQscIMA==",
+      "dev": true,
+      "requires": {
+        "vfile-message": "^3.0.0"
+      }
     },
     "vinyl": {
       "version": "2.2.1",
@@ -41597,14 +39564,23 @@
       "dev": true
     },
     "vue-template-compiler": {
-      "version": "2.6.14",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz",
-      "integrity": "sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==",
+      "version": "2.7.10",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz",
+      "integrity": "sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ==",
       "dev": true,
       "optional": true,
       "requires": {
         "de-indent": "^1.0.2",
-        "he": "^1.1.0"
+        "he": "^1.2.0"
+      },
+      "dependencies": {
+        "he": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+          "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
     "walk": {
@@ -41998,12 +39974,6 @@
         "is-weakset": "^2.0.1"
       }
     },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
     "which-typed-array": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz",
@@ -42297,9 +40267,9 @@
       }
     },
     "zwitch": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
-      "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.2.tgz",
+      "integrity": "sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA==",
       "dev": true
     }
   }
diff --git a/package.json b/package.json
index 3624cd70527..9c3458a4ee2 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "chai": "^4.2.0",
     "coveralls": "^3.1.0",
     "deep-equal": "^2.0.3",
-    "documentation": "^13.2.5",
+    "documentation": "^14.0.0",
     "es5-shim": "^4.5.14",
     "eslint": "^7.27.0",
     "eslint-config-standard": "^10.2.1",

From 57b4534bcd0f493c0b5460c772f94e433e94e705 Mon Sep 17 00:00:00 2001
From: TM <tomasz.mielcarz@gmail.com>
Date: Thu, 8 Sep 2022 11:56:21 +0200
Subject: [PATCH 233/569] Adrino Bid Adapter: pass userId object to bidder
 (#8966)

* New config parameter for a custom adserver domain

* test fix

* new test

* pass userId object to bidder

Co-authored-by: Tomasz Mielcarz <tomasz.mielcarz@adrino.pl>
---
 modules/adrinoBidAdapter.js                |  2 +-
 test/spec/modules/adrinoBidAdapter_spec.js | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/adrinoBidAdapter.js b/modules/adrinoBidAdapter.js
index 91f16fdb2b3..2a5588eeb8c 100644
--- a/modules/adrinoBidAdapter.js
+++ b/modules/adrinoBidAdapter.js
@@ -40,7 +40,7 @@ export const spec = {
         bidId: validBidRequests[i].bidId,
         nativeParams: validBidRequests[i].nativeParams,
         placementHash: validBidRequests[i].params.hash,
-        // TODO: is 'page' the right value here?
+        userId: validBidRequests[i].userId,
         referer: bidderRequest.refererInfo.page,
         userAgent: navigator.userAgent,
       }
diff --git a/test/spec/modules/adrinoBidAdapter_spec.js b/test/spec/modules/adrinoBidAdapter_spec.js
index a321eb60677..78cea8da9ac 100644
--- a/test/spec/modules/adrinoBidAdapter_spec.js
+++ b/test/spec/modules/adrinoBidAdapter_spec.js
@@ -71,6 +71,7 @@ describe('adrinoBidAdapter', function () {
           }
         }
       },
+      userId: { criteoId: '2xqi3F94aHdwWnM3', pubcid: '3ec0b202-7697' },
       adUnitCode: 'adunit-code',
       bidId: '12345678901234',
       bidderRequestId: '98765432109876',
@@ -92,6 +93,9 @@ describe('adrinoBidAdapter', function () {
       expect(result[0].data.userAgent).to.equal(navigator.userAgent);
       expect(result[0].data).to.have.property('nativeParams');
       expect(result[0].data).not.to.have.property('gdprConsent');
+      expect(result[0].data).to.have.property('userId');
+      expect(result[0].data.userId.criteoId).to.equal('2xqi3F94aHdwWnM3');
+      expect(result[0].data.userId.pubcid).to.equal('3ec0b202-7697');
     });
 
     it('should build the request correctly with gdpr', function () {
@@ -108,6 +112,9 @@ describe('adrinoBidAdapter', function () {
       expect(result[0].data.userAgent).to.equal(navigator.userAgent);
       expect(result[0].data).to.have.property('nativeParams');
       expect(result[0].data).to.have.property('gdprConsent');
+      expect(result[0].data).to.have.property('userId');
+      expect(result[0].data.userId.criteoId).to.equal('2xqi3F94aHdwWnM3');
+      expect(result[0].data.userId.pubcid).to.equal('3ec0b202-7697');
     });
 
     it('should build the request correctly without gdpr', function () {
@@ -124,6 +131,9 @@ describe('adrinoBidAdapter', function () {
       expect(result[0].data.userAgent).to.equal(navigator.userAgent);
       expect(result[0].data).to.have.property('nativeParams');
       expect(result[0].data).not.to.have.property('gdprConsent');
+      expect(result[0].data).to.have.property('userId');
+      expect(result[0].data.userId.criteoId).to.equal('2xqi3F94aHdwWnM3');
+      expect(result[0].data.userId.pubcid).to.equal('3ec0b202-7697');
     });
   });
 

From a1b705fed97f87dc856c27c5e84de4d67714a758 Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Thu, 8 Sep 2022 08:54:41 -0700
Subject: [PATCH 234/569] onetag fix (#8968)

---
 modules/onetagBidAdapter.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/onetagBidAdapter.js b/modules/onetagBidAdapter.js
index 0364acd5d21..40ef6d596be 100644
--- a/modules/onetagBidAdapter.js
+++ b/modules/onetagBidAdapter.js
@@ -6,7 +6,6 @@ import { Renderer } from '../src/Renderer.js';
 import {find} from '../src/polyfill.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { createEidsArray } from './userId/eids.js';
 import { deepClone, logError, deepAccess } from '../src/utils.js';
 
 const ENDPOINT = 'https://onetag-sys.com/prebid-request';
@@ -65,8 +64,8 @@ function buildRequests(validBidRequests, bidderRequest) {
   if (bidderRequest && bidderRequest.uspConsent) {
     payload.usPrivacy = bidderRequest.uspConsent;
   }
-  if (validBidRequests && validBidRequests.length !== 0 && validBidRequests[0].userId) {
-    payload.userId = createEidsArray(validBidRequests[0].userId);
+  if (validBidRequests && validBidRequests.length !== 0 && validBidRequests[0].userIdAsEids) {
+    payload.userId = validBidRequests[0].userIdAsEids;
   }
   if (validBidRequests && validBidRequests.length !== 0 && validBidRequests[0].schain && isSchainValid(validBidRequests[0].schain)) {
     payload.schain = validBidRequests[0].schain;

From 9b4baf1b0d6d4ab2a4a8624fcb7a8ac198d728b2 Mon Sep 17 00:00:00 2001
From: cuihua111 <734376178@qq.com>
Date: Thu, 8 Sep 2022 23:57:43 +0800
Subject: [PATCH 235/569] DiscoveryDSP Bid Adapter: initial adapter release
 (#8876)

* discovery Bid Adapter:new adapter

* discovery Bid Adapter:new adapter

* fix lint

* change bidder name & fix circleCI lint

* fix lint

* fix lint

* add bidWon report

* delete package-lock.json

* update discoveryBidAdapter

* add meta.advertiserDomains

* Optimisation bidResponse

* fix Spelling errors :(

* add ttl into bidResponse :(

* kick off circleci tests manually

* for kick off circleci

* update markdown

* Update discoveryBidAdapter.md

* kick off tests

* fix linting

Co-authored-by: v_cuidong <v_cuidong@baidu.com>
Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
Co-authored-by: Patrick McCann <pmccann@cafemedia.com>
---
 modules/discoveryBidAdapter.js                | 467 ++++++++++++++++++
 modules/discoveryBidAdapter.md                |  60 +++
 test/spec/modules/discoveryBidAdapter_spec.js |  92 ++++
 3 files changed, 619 insertions(+)
 create mode 100644 modules/discoveryBidAdapter.js
 create mode 100644 modules/discoveryBidAdapter.md
 create mode 100644 test/spec/modules/discoveryBidAdapter_spec.js

diff --git a/modules/discoveryBidAdapter.js b/modules/discoveryBidAdapter.js
new file mode 100644
index 00000000000..4f22a41cf9f
--- /dev/null
+++ b/modules/discoveryBidAdapter.js
@@ -0,0 +1,467 @@
+import * as utils from '../src/utils.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'discovery';
+const ENDPOINT_URL = 'https://rtb-jp.mediago.io/api/bid?tn=';
+const TIME_TO_LIVE = 500;
+const storage = getStorageManager();
+let globals = {};
+let itemMaps = {};
+const MEDIATYPE = [BANNER, NATIVE];
+
+/* ----- _ss_pp_id:start ------ */
+const COOKIE_KEY_MGUID = '_ss_pp_id';
+
+const NATIVERET = {
+  id: 'id',
+  bidfloor: 0,
+  // TODO Dynamic parameters
+  native: {
+    ver: '1.2',
+    plcmtcnt: 1,
+    assets: [
+      {
+        id: 1,
+        required: 1,
+        img: {
+          type: 3,
+          w: 300,
+          wmin: 300,
+          h: 174,
+          hmin: 174,
+        },
+      },
+      {
+        id: 2,
+        required: 1,
+        title: {
+          len: 75,
+        },
+      }
+    ],
+    plcmttype: 1,
+    privacy: 1,
+    eventtrackers: [
+      {
+        event: 1,
+        methods: [1, 2],
+      },
+    ],
+  },
+  ext: {},
+};
+
+/**
+ * 获取用户id
+ * @return {string}
+ */
+const getUserID = () => {
+  const i = storage.getCookie(COOKIE_KEY_MGUID);
+
+  if (i === null) {
+    const uuid = utils.generateUUID();
+    storage.setCookie(COOKIE_KEY_MGUID, uuid);
+    return uuid;
+  }
+  return i;
+};
+
+/* ----- _ss_pp_id:end ------ */
+
+/**
+ * get object key -> value
+ * @param  {Object}    obj  对象
+ * @param  {...string} keys 键名
+ * @return {any}
+ */
+function getKv(obj, ...keys) {
+  let o = obj;
+
+  for (let key of keys) {
+    // console.log(key, o);
+    if (o && o[key]) {
+      o = o[key];
+    } else {
+      return '';
+    }
+  }
+  return o;
+}
+
+/**
+ * get device
+ * @return {boolean}
+ */
+function getDevice() {
+  let check = false;
+  (function (a) {
+    let reg1 = new RegExp(
+      [
+        '(android|bbd+|meego)',
+        '.+mobile|avantgo|bada/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)',
+        '|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone',
+        '|p(ixi|re)/|plucker|pocket|psp|series(4|6)0|symbian|treo|up.(browser|link)|vodafone|wap',
+        '|windows ce|xda|xiino|android|ipad|playbook|silk',
+      ].join(''),
+      'i'
+    );
+    let reg2 = new RegExp(
+      [
+        '1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)',
+        '|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )',
+        '|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55/|capi|ccwa|cdm-|cell',
+        '|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)',
+        '|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene',
+        '|gf-5|g-mo|go(.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c',
+        '|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|/)|ibro|idea|ig01|ikom',
+        '|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |/)|klon|kpt |kwc-|kyo(c|k)',
+        '|le(no|xi)|lg( g|/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50/|ma(te|ui|xo)|mc(01|21|ca)',
+        '|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]',
+        '|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)',
+        '|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio',
+        '|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55/|sa(ge|ma|mm|ms',
+        '|ny|va)|sc(01|h-|oo|p-)|sdk/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al',
+        '|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)',
+        '|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(.b|g1|si)|utst|',
+        'v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)',
+        '|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-',
+        '|your|zeto|zte-',
+      ].join(''),
+      'i'
+    );
+    if (reg1.test(a) || reg2.test(a.substr(0, 4))) {
+      check = true;
+    }
+  })(navigator.userAgent || navigator.vendor || window.opera);
+  return check;
+}
+
+/**
+ * get BidFloor
+ * @param {*} bid
+ * @param {*} mediaType
+ * @param {*} sizes
+ * @returns
+ */
+function getBidFloor(bid) {
+  if (!utils.isFn(bid.getFloor)) {
+    return utils.deepAccess(bid, 'params.bidfloor', 0);
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*',
+    });
+    return bidFloor.floor;
+  } catch (_) {
+    return 0;
+  }
+}
+
+/**
+ * get sizes for rtb
+ * @param  {Array|Object} requestSizes
+ * @return {Object}
+ */
+function transformSizes(requestSizes) {
+  let sizes = [];
+  let sizeObj = {};
+
+  if (
+    utils.isArray(requestSizes) &&
+    requestSizes.length === 2 &&
+    !utils.isArray(requestSizes[0])
+  ) {
+    sizeObj.width = parseInt(requestSizes[0], 10);
+    sizeObj.height = parseInt(requestSizes[1], 10);
+    sizes.push(sizeObj);
+  } else if (typeof requestSizes === 'object') {
+    for (let i = 0; i < requestSizes.length; i++) {
+      let size = requestSizes[i];
+      sizeObj = {};
+      sizeObj.width = parseInt(size[0], 10);
+      sizeObj.height = parseInt(size[1], 10);
+      sizes.push(sizeObj);
+    }
+  }
+
+  return sizes;
+}
+
+// Support sizes
+const popInAdSize = [
+  { w: 300, h: 250 },
+  { w: 300, h: 600 },
+  { w: 728, h: 90 },
+  { w: 970, h: 250 },
+  { w: 320, h: 50 },
+  { w: 160, h: 600 },
+  { w: 320, h: 180 },
+  { w: 320, h: 100 },
+  { w: 336, h: 280 },
+];
+
+/**
+ * get aditem setting
+ * @param {Array}  validBidRequests an an array of bids
+ * @param {Object} bidderRequest  The master bidRequest object
+ * @return {Object}
+ */
+function getItems(validBidRequests, bidderRequest) {
+  let items = [];
+  items = validBidRequests.map((req, i) => {
+    let ret = {};
+    // eslint-disable-next-line no-debugger
+    let mediaTypes = getKv(req, 'mediaTypes');
+
+    const bidFloor = getBidFloor(req);
+    let id = '' + (i + 1);
+
+    if (mediaTypes.native) {
+      ret = {...NATIVERET, ...{id, bidFloor}}
+    }
+    // banner
+    if (mediaTypes.banner) {
+      let sizes = transformSizes(getKv(req, 'sizes'));
+      let matchSize;
+
+      for (let size of sizes) {
+        matchSize = popInAdSize.find(
+          (item) => size.width === item.w && size.height === item.h
+        );
+        if (matchSize) {
+          break;
+        }
+      }
+      if (!matchSize) {
+        return {};
+      }
+      ret = {
+        id: id,
+        bidfloor: bidFloor,
+        banner: {
+          h: matchSize.h,
+          w: matchSize.w,
+          pos: 1,
+        },
+        ext: {},
+      };
+    }
+    itemMaps[id] = {
+      req,
+      ret,
+    };
+    return ret;
+  });
+  return items;
+}
+
+/**
+ * get rtb qequest params
+ *
+ * @param {Array}  validBidRequests an an array of bids
+ * @param {Object} bidderRequest  The master bidRequest object
+ * @return {Object}
+ */
+function getParam(validBidRequests, bidderRequest) {
+  const pubcid = utils.deepAccess(validBidRequests[0], 'crumbs.pubcid');
+  let isMobile = getDevice() ? 1 : 0;
+  let auctionId = getKv(bidderRequest, 'auctionId');
+  let items = getItems(validBidRequests, bidderRequest);
+
+  const location = utils.deepAccess(bidderRequest, 'refererInfo.referer');
+
+  const timeout = bidderRequest.timeout || 2000;
+
+  if (items && items.length) {
+    let c = {
+      id: 'pp_hbjs_' + auctionId,
+      at: 1,
+      cur: ['USD'],
+      device: {
+        connectiontype: 0,
+        js: 1,
+        os: navigator.platform || '',
+        ua: navigator.userAgent,
+        language: /en/.test(navigator.language) ? 'en' : navigator.language,
+      },
+      user: {
+        buyeruid: getUserID(),
+        id: pubcid,
+      },
+      tmax: timeout,
+      site: {
+        name: globals['media'],
+        domain: globals['media'],
+        page: location,
+        ref: location,
+        mobile: isMobile,
+        cat: [], // todo
+        publisher: {
+          // todo
+          id: globals['media'],
+          name: globals['media'],
+        },
+      },
+      imp: items,
+    };
+    return c;
+  } else {
+    return null;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: MEDIATYPE,
+  // aliases: ['ex'], // short code
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function (bid) {
+    if (bid.params.token) {
+      globals['token'] = bid.params.token;
+    }
+    if (bid.params.media) {
+      globals['media'] = bid.params.media;
+    }
+    return !!(bid.params.token && bid.params.media);
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {Array}  validBidRequests an an array of bids
+   * @param {Object} bidderRequest  The master bidRequest object
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let payload = getParam(validBidRequests, bidderRequest);
+
+    const payloadString = JSON.stringify(payload);
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL + globals['token'],
+      data: payloadString,
+    };
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bids = getKv(serverResponse, 'body', 'seatbid', 0, 'bid');
+    const cur = getKv(serverResponse, 'body', 'cur');
+    const bidResponses = [];
+    for (let bid of bids) {
+      let impid = getKv(bid, 'impid');
+      if (itemMaps[impid]) {
+        let bidId = getKv(itemMaps[impid], 'req', 'bidId');
+        const mediaType = getKv(bid, 'w') ? 'banner' : 'native';
+        let bidResponse = {
+          requestId: bidId,
+          cpm: getKv(bid, 'price'),
+          creativeId: getKv(bid, 'cid'),
+          mediaType,
+          currency: cur,
+          netRevenue: true,
+          nurl: getKv(bid, 'nurl'),
+          ttl: TIME_TO_LIVE,
+          meta: {
+            advertiserDomains: getKv(bid, 'adomain') || []
+          }
+        };
+        if (mediaType === 'native') {
+          const adm = getKv(bid, 'adm');
+          const admObj = JSON.parse(adm);
+          var native = {};
+          admObj.assets.forEach((asset) => {
+            if (asset.title) {
+              native.title = asset.title.text;
+            } else if (asset.data) {
+              native.data = asset.data.value;
+            } else if (asset.img) {
+              switch (asset.img.type) {
+                case 1:
+                  native.icon = {
+                    url: asset.img.url,
+                    width: asset.img.w,
+                    height: asset.img.h,
+                  };
+                  break;
+                default:
+                  native.image = {
+                    url: asset.img.url,
+                    width: asset.img.w,
+                    height: asset.img.h,
+                  };
+                  break;
+              }
+            }
+          });
+          if (admObj.link) {
+            if (admObj.link.url) {
+              native.clickUrl = admObj.link.url;
+            }
+          }
+          if (Array.isArray(admObj.eventtrackers)) {
+            native.impressionTrackers = [];
+            admObj.eventtrackers.forEach((tracker) => {
+              if (tracker.event !== 1) {
+                return;
+              }
+              switch (tracker.method) {
+                case 1:
+                  native.impressionTrackers.push(tracker.url);
+                  break;
+                // case 2:
+                //   native.javascriptTrackers = `<script src=\"${tracker.url}\"></script>`;
+                //   break;
+              }
+            });
+          }
+          if (admObj.purl) {
+            native.purl = admObj.purl;
+          }
+          bidResponse['native'] = native;
+        } else {
+          bidResponse['width'] = getKv(bid, 'w');
+          bidResponse['height'] = getKv(bid, 'h');
+          bidResponse['ad'] = getKv(bid, 'adm');
+        }
+        bidResponses.push(bidResponse);
+      }
+    }
+
+    return bidResponses;
+  },
+
+  /**
+   * Register bidder specific code, which will execute if bidder timed out after an auction
+   * @param {data} Containing timeout specific data
+   */
+  onTimeout: function (data) {
+    utils.logError('DiscoveryDSP adapter timed out for the auction.');
+    // TODO send request timeout to serve, the interface is not ready
+  },
+
+  /**
+   * Register bidder specific code, which  will execute if a bid from this bidder won the auction
+   * @param {Bid} The bid that won the auction
+   */
+  onBidWon: function (bid) {
+    if (bid['nurl']) {
+      utils.triggerPixel(bid['nurl'])
+    }
+  }
+};
+registerBidder(spec);
diff --git a/modules/discoveryBidAdapter.md b/modules/discoveryBidAdapter.md
new file mode 100644
index 00000000000..6e7197863a5
--- /dev/null
+++ b/modules/discoveryBidAdapter.md
@@ -0,0 +1,60 @@
+# Overview
+
+```
+Module Name: DiscoveryDSP Bid Adapter
+Module Type: Bidder Adapter
+```
+
+# Description
+
+Module that connects to popIn's demand sources
+
+The DiscoveryDSP Bidding adapter requires setup before beginning. Please contact us at <media-support@popin.cc>
+
+# Test Parameters
+```
+    var adUnits = [
+      // native
+      {
+        code: "test-div-1",
+        mediaTypes: {
+          native: {
+            title: {
+              required: true
+            },
+            image: {
+              required: true
+            }
+          }
+        },
+        bids: [
+          {
+            bidder: "discovery",
+            params: {
+              token: "a1b067897e4ae093d1f94261e0ddc6c9",
+              media: 'test_media' // your media host
+            },
+          },
+        ],
+      },
+      // banner
+      {
+        code: "test-div-2",
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        // Replace this object to test a new adapter!
+        bids: [
+          {
+            bidder: "discovery",
+            params: {
+              token: "d0f4902b616cc5c38cbe0a08676d0ed9",
+              media: 'test_media' // your media host
+            },
+          },
+        ],
+      },
+    ];
+```
diff --git a/test/spec/modules/discoveryBidAdapter_spec.js b/test/spec/modules/discoveryBidAdapter_spec.js
new file mode 100644
index 00000000000..a30afd96ad1
--- /dev/null
+++ b/test/spec/modules/discoveryBidAdapter_spec.js
@@ -0,0 +1,92 @@
+import { expect } from 'chai';
+import { spec } from 'modules/discoveryBidAdapter.js';
+
+describe('DiscoveryDSP:BidAdapterTests', function () {
+  let bidRequestData = {
+    bidderCode: 'DiscoveryDSP',
+    auctionId: 'ff66e39e-4075-4d18-9854-56fde9b879ac',
+    bidderRequestId: '4fec04e87ad785',
+    bids: [
+      {
+        bidder: 'DiscoveryDSP',
+        params: {
+          token: 'd0f4902b616cc5c38cbe0a08676d0ed9',
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        adUnitCode: 'regular_iframe',
+        transactionId: 'd163f9e2-7ecd-4c2c-a3bd-28ceb52a60ee',
+        sizes: [[300, 250]],
+        bidId: '276092a19e05eb',
+        bidderRequestId: '1fadae168708b',
+        auctionId: 'ff66e39e-4075-4d18-9854-56fde9b879ac',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0,
+      },
+    ],
+  };
+  let request = [];
+
+  it('DiscoveryDSP:validate_pub_params', function () {
+    expect(
+      spec.isBidRequestValid({
+        bidder: 'DiscoveryDSP',
+        params: {
+          token: ['d0f4902b616cc5c38cbe0a08676d0ed9'],
+          media: ['test_media']
+        },
+      })
+    ).to.equal(true);
+  });
+
+  it('DiscoveryDSP:validate_generated_params', function () {
+    request = spec.buildRequests(bidRequestData.bids, bidRequestData);
+    let req_data = JSON.parse(request.data);
+    expect(req_data.imp).to.have.lengthOf(1);
+  });
+
+  it('DiscoveryDSP:validate_response_params', function () {
+    let tempAdm = '<link rel=\"stylesheet\" href=\"https://cdn.mediago.io/js/style/style_banner_336x280_standard.css\"><div id=\"mgcontainer-e1746bcc817beaba9d63bd4254aad533\" class=\"mediago-placement_46ee9c c336x280_standard_46ee9c mediago-placement c336x280_standard\" style=\"width:336px;height:280px;overflow:hidden\"><a class=\"mediago-placement-track_46ee9c mediago-placement-track\" title=\"秘密のしかけのネックレスをプレゼントした男性。2年後に彼女は中身に気付いて悲鳴を上げた\" href=\"https://trace.mediago.cc/api/bidder/track?tn=d0f4902b616cc5c38cbe0a08676d0ed9&price=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&evt=102&rid=3f6700b5e61e1476bed629b6ea6c7a4d&campaignid=1366258&impid=50-3663.infoseek.co.jp.336x280-1&offerid=28316825&test=0&time=1660811542&cp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&clickid=50_3f6700b5e61e1476bed629b6ea6c7a4d_50-3663.infoseek.co.jp.336x280-1&acid=1120&trackingid=e1746bcc817beaba9d63bd4254aad533&uid=7544198412013119947&jt=2&url=O7fi1nLA9qLQjcPq7rIDvxMyybMbcc2iUh-TuaqiVSD1Dj4cKrR82gRYdWy1Ao22yhq2FoY79tmyI3X_bsO3CusXggmpW8bZvwTlHPxfOxekArClcRSpWmkVorlnMSYf7yM6QBVTuTLCCP-cK8eXMZnQVR7PdOImYZGJis6q9Xx9MToxvPkWRVa13OaCtKVeqzGdglYH3G2mqo1qLP1RCCZJHE1Fq8fgCYmLJ0Xli-nLvFZjt3g0HIui_IvyZi6YtXS97p9ohgfgDJnqcGH6l053AP0cO7ZQDHtS2_9P9UqgaA47gmltDVEDkSThX7js&bm=50&la=ja&cn=jp&cid=4215873&info=x_ME1qzmB7TY6hTSn_XUw5s6N-EkBgxcE4qJ0fd9amgsJzO3-Gtm2Nja777SyGlpkF6k_tSzbcLYYecYQlHncOAAIyuNaT2rvqrhxrQPfC7opZUGQ8WMx4Rwkx8R2k0nDiBI8xnegLWYTvY-Fc99Rw&sid=38__149__12__24__144__163__47__1__99&sp=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&scp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&acu=JPY&scu=USD&sgcp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&gprice=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&gcp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&ah=&pb=m&de=infoseek.co.jp&cat=&iv=0\" target=\"_blank\"><div class=\"mediago-placement-top_46ee9c mediago-placement-top\" style=\"background-image:url(https://d2cli4kgl5uxre.cloudfront.net/ML/d8e9b4aa20fae1739d2aad8c926d3f15__scv1__306x304.png)\"></div></a><div class=\"mediago-placement-bottom_46ee9c mediago-placement-bottom\"><div class=\"mediago-middle_46ee9c mediago-middle\"><a class=\"mediago-placement-track_46ee9c mediago-placement-track\" title=\"秘密のしかけのネックレスをプレゼントした男性。2年後に彼女は中身に気付いて悲鳴を上げた\" href=\"https://trace.mediago.cc/api/bidder/track?tn=d0f4902b616cc5c38cbe0a08676d0ed9&price=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&evt=102&rid=3f6700b5e61e1476bed629b6ea6c7a4d&campaignid=1366258&impid=50-3663.infoseek.co.jp.336x280-1&offerid=28316825&test=0&time=1660811542&cp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&clickid=50_3f6700b5e61e1476bed629b6ea6c7a4d_50-3663.infoseek.co.jp.336x280-1&acid=1120&trackingid=e1746bcc817beaba9d63bd4254aad533&uid=7544198412013119947&jt=2&url=O7fi1nLA9qLQjcPq7rIDvxMyybMbcc2iUh-TuaqiVSD1Dj4cKrR82gRYdWy1Ao22yhq2FoY79tmyI3X_bsO3CusXggmpW8bZvwTlHPxfOxekArClcRSpWmkVorlnMSYf7yM6QBVTuTLCCP-cK8eXMZnQVR7PdOImYZGJis6q9Xx9MToxvPkWRVa13OaCtKVeqzGdglYH3G2mqo1qLP1RCCZJHE1Fq8fgCYmLJ0Xli-nLvFZjt3g0HIui_IvyZi6YtXS97p9ohgfgDJnqcGH6l053AP0cO7ZQDHtS2_9P9UqgaA47gmltDVEDkSThX7js&bm=50&la=ja&cn=jp&cid=4215873&info=x_ME1qzmB7TY6hTSn_XUw5s6N-EkBgxcE4qJ0fd9amgsJzO3-Gtm2Nja777SyGlpkF6k_tSzbcLYYecYQlHncOAAIyuNaT2rvqrhxrQPfC7opZUGQ8WMx4Rwkx8R2k0nDiBI8xnegLWYTvY-Fc99Rw&sid=38__149__12__24__144__163__47__1__99&sp=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&scp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&acu=JPY&scu=USD&sgcp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&gprice=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&gcp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&ah=&pb=m&de=infoseek.co.jp&cat=&iv=0\" target=\"_blank\"><div class=\"mediago-title_46ee9c mediago-title\">秘密のしかけのネックレスをプレゼントした男性。2年後に彼女は中身に気付いて悲鳴を上げた</div></a><div style=\"margin-top:10px;\"><a class=\"mediago-ad-icon_46ee9c mediago-ad-icon\" title=\"ad\" href=\"//www.mediago.io/privacy\" target=\"_blank\">AD</a> <a class=\"mediago-placement-track_46ee9c mediago-placement-track\" title=\"秘密のしかけのネックレスをプレゼントした男性。2年後に彼女は中身に気付いて悲鳴を上げた\" href=\"https://trace.mediago.cc/api/bidder/track?tn=d0f4902b616cc5c38cbe0a08676d0ed9&price=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&evt=102&rid=3f6700b5e61e1476bed629b6ea6c7a4d&campaignid=1366258&impid=50-3663.infoseek.co.jp.336x280-1&offerid=28316825&test=0&time=1660811542&cp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&clickid=50_3f6700b5e61e1476bed629b6ea6c7a4d_50-3663.infoseek.co.jp.336x280-1&acid=1120&trackingid=e1746bcc817beaba9d63bd4254aad533&uid=7544198412013119947&jt=2&url=O7fi1nLA9qLQjcPq7rIDvxMyybMbcc2iUh-TuaqiVSD1Dj4cKrR82gRYdWy1Ao22yhq2FoY79tmyI3X_bsO3CusXggmpW8bZvwTlHPxfOxekArClcRSpWmkVorlnMSYf7yM6QBVTuTLCCP-cK8eXMZnQVR7PdOImYZGJis6q9Xx9MToxvPkWRVa13OaCtKVeqzGdglYH3G2mqo1qLP1RCCZJHE1Fq8fgCYmLJ0Xli-nLvFZjt3g0HIui_IvyZi6YtXS97p9ohgfgDJnqcGH6l053AP0cO7ZQDHtS2_9P9UqgaA47gmltDVEDkSThX7js&bm=50&la=ja&cn=jp&cid=4215873&info=x_ME1qzmB7TY6hTSn_XUw5s6N-EkBgxcE4qJ0fd9amgsJzO3-Gtm2Nja777SyGlpkF6k_tSzbcLYYecYQlHncOAAIyuNaT2rvqrhxrQPfC7opZUGQ8WMx4Rwkx8R2k0nDiBI8xnegLWYTvY-Fc99Rw&sid=38__149__12__24__144__163__47__1__99&sp=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&scp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&acu=JPY&scu=USD&sgcp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&gprice=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&gcp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&ah=&pb=m&de=infoseek.co.jp&cat=&iv=0\" target=\"_blank\"><div class=\"mediago-brand-name_46ee9c mediago-brand-name\">Factable</div></a></div></div></div></div>'
+    tempAdm += '%3Cscr';
+    tempAdm += 'ipt%3E';
+    tempAdm += '!function(){\"use strict\";function f(t){return(f=\"function\"==typeof Symbol&&\"symbol\"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&\"function\"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?\"symbol\":typeof t})(t)}function l(t){var e=0<arguments.length&&void 0!==t?t:{};try{e.random_t=(new Date).getTime(),g(function(t){var e=1<arguments.length&&void 0!==arguments[1]?arguments[1]:\"\";if(\"object\"!==f(t))return e;var n=function(t){for(var e,n=[],o=0,i=Object.keys(t);o<i.length;o++)e=i[o],n.push(\"\".concat(e,\"=\").concat(t[e]));return n}(t).join(\"&\"),o=e.indexOf(\"#\"),i=e,t=\"\";return-1!==o&&(i=e.slice(0,o),t=e.slice(o)),n&&(i&&-1!==i.indexOf(\"?\")?i+=\"&\"+n:i+=\"?\"+n),i+t}(e,\"https://trace.mediago.io/api/log/track\"))}catch(e){}}function g(t,e,n){(t=t?t.split(\";;;\"):[]).map(function(t){try{0<=t.indexOf(\"/api/bidder/track\")&&n&&(t+=\"&inIframe=\".concat(!(!self.frameElement||\"IFRAME\"!=self.frameElement.tagName)||window.frames.length!=parent.frames.length||self!=top),t+=\"&pos_x=\".concat(n.left,\"&pos_y=\").concat(n.top,\"&page_w=\").concat(n.page_width,\"&page_h=\").concat(n.page_height))}catch(t){l({tn:p,winloss:1,fe:2,pos_err_c:1002,pos_err_m:t.toString()})}var e=new Image;e.src=t,e.style.display=\"none\",e.style.visibility=\"hidden\",e.width=0,e.height=0,document.body.appendChild(e)})}var d=[\"https://trace.mediago.cc/api/bidder/track?tn=d0f4902b616cc5c38cbe0a08676d0ed9&price=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&evt=101&rid=3f6700b5e61e1476bed629b6ea6c7a4d&campaignid=1366258&impid=50-3663.infoseek.co.jp.336x280-1&offerid=28316825&test=0&time=1660811542&cp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&acid=1120&trackingid=e1746bcc817beaba9d63bd4254aad533&uid=7544198412013119947&bm=50&la=ja&cn=jp&cid=4215873&info=x_ME1qzmB7TY6hTSn_XUw5s6N-EkBgxcE4qJ0fd9amgsJzO3-Gtm2Nja777SyGlpkF6k_tSzbcLYYecYQlHncOAAIyuNaT2rvqrhxrQPfC7opZUGQ8WMx4Rwkx8R2k0nDiBI8xnegLWYTvY-Fc99Rw&sid=38__149__12__24__144__163__47__1__99&sp=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&scp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&acu=JPY&scu=USD&sgcp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&gprice=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&gcp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&ah=&de=infoseek.co.jp&iv=0\",\"${ITRACKER2}\",\"${ITRACKER3}\",\"${ITRACKER4}\",\"${ITRACKER5}\",\"${ITRACKER6}\"],u=[\"https://trace.mediago.cc/api/bidder/track?tn=d0f4902b616cc5c38cbe0a08676d0ed9&price=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&evt=104&rid=3f6700b5e61e1476bed629b6ea6c7a4d&campaignid=1366258&impid=50-3663.infoseek.co.jp.336x280-1&offerid=28316825&test=0&time=1660811542&cp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&acid=1120&trackingid=e1746bcc817beaba9d63bd4254aad533&uid=7544198412013119947&sid=38__149__12__24__144__163__47__1__99&format=&crid=d8e9b4aa20fae1739d2aad8c926d3f15&bm=50&la=ja&cn=jp&cid=4215873&info=x_ME1qzmB7TY6hTSn_XUw5s6N-EkBgxcE4qJ0fd9amgsJzO3-Gtm2Nja777SyGlpkF6k_tSzbcLYYecYQlHncOAAIyuNaT2rvqrhxrQPfC7opZUGQ8WMx4Rwkx8R2k0nDiBI8xnegLWYTvY-Fc99Rw&sp=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&scp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&acu=JPY&scu=USD&sgcp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&gprice=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&gcp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&ah=&de=infoseek.co.jp&iv=0\",\"${VTRACKER2}\",\"${VTRACKER3}\",\"${VTRACKER4}\",\"${VTRACKER5}\",\"${VTRACKER6}\"],p=\"f9f2b1ef23fe2759c2cad0953029a94b\",n=document.getElementById(\"mgcontainer-e1746bcc817beaba9d63bd4254aad533\");n&&function(){var a=n.getElementsByClassName(\"mediago-placement-track\");if(a&&a.length){var t,e=function(t){var e,n,o,i,c,r;\"object\"===f(r=a[t])&&(e=function(t){try{var e=t.getBoundingClientRect(),n=e&&e.top||-1,o=e&&e.left||-1,i=document.body.scrollWidth||-1,c=document.body.scrollHeight||-1;return{top:n.toFixed(0),left:o.toFixed(0),page_width:i,page_height:c}}catch(t){return l({tn:p,winloss:1,fe:2,pos_err_c:1001,pos_err_m:t.toString()}),{top:\"-1\",left:\"-1\",page_width:\"-1\",page_height:\"-1\"}}}(r),(n=d[t])&&g(n,0,e),o=u[t],c=!(i=function(){o&&g(o)}),function n(){setTimeout(function(){var t,e;!c&&(t=r,e=window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight,(t.getBoundingClientRect()&&t.getBoundingClientRect().top)<=e-.75*(t.offsetHeight||t.clientHeight))?(c=!0,i()):n()},500)}())};for(t in a)e(t)}}()}();'
+    let serverResponse = {
+      body: {
+        id: 'pp_hbjs_2405029787417735524',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '3f6700b5e61e1476bed629b6ea6c7a4d',
+                impid: '1',
+                price: 0.2,
+                adm: tempAdm,
+                cid: '1366258',
+                adid: '373310507',
+                nurl: 'https://trace.mediago.cc/api/log/winnotice?tn=d0f4902b616cc5c38cbe0a08676d0ed9&winloss=1&id=3f6700b5e61e1476bed629b6ea6c7a4d&seat_id=${AUCTION_SEAT_ID}&currency=${AUCTION_CURRENCY}&bid_id=${AUCTION_BID_ID}&ad_id=${AUCTION_AD_ID}&loss=&imp_id=1&price=${AUCTION_PRICE}&test=0&time=1660811542&dp=wvO7WSz-cc9cIMKfTKLEV4Wxq2bmfn3b7m1-eCXRY1g&dsp_id=22&url=GDlAk_HBNSXBOzdKhhvt8xajglRd4lKSZa1p6n_jRygw27m5Zfp-B5yN7ofsn9N-9LkOtOK9HmnrRW-rhROSzRkQdNNrbPQDXeiO2eRi_gVHuZ0AXrxvU4hnGLTR8qeXxFVQkDpzI1_GRaZgcHjPXyhf_Thj5s6oTdKWCPj5Bui8R-ED5NNPv0KH8jhaA_LFXaaa89e8yoi04RX7ouASR_JB6LKofkZEpl2333zEMxl_FatV9NKzCWyZeYMR7m9VVRtkvNv-TUpN61y5cUGMVBfBHPe47sN773IM2Lys3iWP-p-dY1sE0bMrgEFiXHL_E5Y2kydBncLHV9cjzLsjnDtHUd5ourda_bzVApcQYtJn58m_3-_hz_04vjAqLuL1A4dVlorZq65NCWzR6vTN-xemSRp1D4ZQAR2nRU3YVNyubFAeSFyBgUBEx2t8u76oKLz_luOXvFm1I81mRqI-HhDEg827PW51xmrJT9TpLU3i16ULlbcKfoKk3C4RrFLNsC8fLGWcqky0T7Ese0o2BMcGBVXBxlnbkvabzFN6h4Y0-vYDvVRWWm_G3YzfApqhCnTgcaGCDsyLIptJuX36N4GltCTBcpQvhprn5VA_kZop5G8uhHGOE2oJ8g4HyVF5N752EZMFSe5H6Wz2pvH2gmm0KpYOdcGR1PopuJ-M9NaneEl6_cKiCtizBUxdSnxa-WADwkTJ-WwnTP2acy4M0r9puv1rk6myLl32TFmcCgd-6BtT7m9QRZiVOhlvxfWIHbyNgdb-BZ0GHwiKOVd5jMDj4hsDWqNq4hEtBlKDDpYXbdgpB-mK3z24wS_VgsgB1vnMw0yLekWK5_yDqqb_n8VEV6N7LLHyb-Ry5X-0EyRQw-IlXLjjfC7MqZwfMCTTElx2lt9Xd1DYbWM43q2EVEI0j6Vn8pITBBIfg-ygthG26htPBxgIDh8qXQaTkbldLyX_don-BYhs7U3TPv9u2FYE6ACLjvo9iUnMj_8MSD4&sp=wvO7WSz-cc9cIMKfTKLEV4Wxq2bmfn3b7m1-eCXRY1g',
+                w: 300,
+                h: 250,
+              },
+            ],
+          },
+        ],
+        cur: 'USD',
+      },
+    };
+
+    let bids = spec.interpretResponse(serverResponse);
+
+    expect(bids).to.have.lengthOf(1);
+
+    let bid = bids[0];
+    expect(bid.creativeId).to.equal('1366258');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.currency).to.equal('USD');
+  });
+});

From 17cde91633005628f2261c49578fc8a5b6064ed2 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 8 Sep 2022 16:10:43 +0000
Subject: [PATCH 236/569] Prebid 7.14.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index edd991cdf45..6178c20db58 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.14.0-pre",
+  "version": "7.14.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 9c3458a4ee2..bc0e49c5ff6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.14.0-pre",
+  "version": "7.14.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From c9a481955b3527cf6f80b36b4fbba023be2a3ac9 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 8 Sep 2022 16:10:44 +0000
Subject: [PATCH 237/569] Increment version to 7.15.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6178c20db58..0755bfe5c02 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.14.0",
+  "version": "7.15.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index bc0e49c5ff6..56593e7b2eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.14.0",
+  "version": "7.15.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From e0ef967669ff5d4d67ff695b5326c5540ffb146b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Sep 2022 14:56:19 -0400
Subject: [PATCH 238/569] Prebid Core: Upgrade deepSetValue import (#8443)

* Bump dset from 2.0.1 to 3.1.2

Bumps [dset](https://github.com/lukeed/dset) from 2.0.1 to 3.1.2.
- [Release notes](https://github.com/lukeed/dset/releases)
- [Commits](https://github.com/lukeed/dset/compare/v2.0.1...v3.1.2)

---
updated-dependencies:
- dependency-name: dset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update utils.js

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Patrick McCann <patmmccann@gmail.com>
---
 package-lock.json | 17 ++++++++---------
 package.json      |  2 +-
 src/utils.js      |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0755bfe5c02..977e9119b4f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "7.14.0-pre",
+      "version": "7.15.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
@@ -18,7 +18,7 @@
         "criteo-direct-rsa-validate": "^1.1.0",
         "crypto-js": "^3.3.0",
         "dlv": "1.1.3",
-        "dset": "2.0.1",
+        "dset": "3.1.2",
         "express": "^4.15.4",
         "fun-hooks": "^0.9.9",
         "just-clone": "^1.0.2",
@@ -7117,10 +7117,9 @@
       }
     },
     "node_modules/dset": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/dset/-/dset-2.0.1.tgz",
-      "integrity": "sha512-nI29OZMRYq36hOcifB6HTjajNAAiBKSXsyWZrq+VniusseuP2OpNlTiYgsaNRSGvpyq5Wjbc2gQLyBdTyWqhnQ==",
-      "deprecated": "Please use dset@2.1.0 or later for an important security patch",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
+      "integrity": "sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q==",
       "engines": {
         "node": ">=4"
       }
@@ -28087,9 +28086,9 @@
       }
     },
     "dset": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/dset/-/dset-2.0.1.tgz",
-      "integrity": "sha512-nI29OZMRYq36hOcifB6HTjajNAAiBKSXsyWZrq+VniusseuP2OpNlTiYgsaNRSGvpyq5Wjbc2gQLyBdTyWqhnQ=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
+      "integrity": "sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q=="
     },
     "duplexer": {
       "version": "0.1.2",
diff --git a/package.json b/package.json
index 56593e7b2eb..b92dbf92faf 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "criteo-direct-rsa-validate": "^1.1.0",
     "crypto-js": "^3.3.0",
     "dlv": "1.1.3",
-    "dset": "2.0.1",
+    "dset": "3.1.2",
     "express": "^4.15.4",
     "fun-hooks": "^0.9.9",
     "just-clone": "^1.0.2",
diff --git a/src/utils.js b/src/utils.js
index e8578320b9e..9e49e1687ae 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -4,7 +4,7 @@ import {find, includes} from './polyfill.js';
 import CONSTANTS from './constants.json';
 import {GreedyPromise} from './utils/promise.js';
 export { default as deepAccess } from 'dlv/index.js';
-export { default as deepSetValue } from 'dset';
+export { dset as deepSetValue } from 'dset';
 
 var tArr = 'Array';
 var tStr = 'String';

From 921d441aa593248e1d85987bf92f96bfeb63e022 Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Fri, 9 Sep 2022 04:51:03 -0400
Subject: [PATCH 239/569] appnexus bid adapter - add support to read ortb2
 keywords (#8939)

---
 modules/appnexusBidAdapter.js                | 85 +++++++++++++++++---
 test/spec/modules/appnexusBidAdapter_spec.js | 67 +++++++++++++--
 2 files changed, 134 insertions(+), 18 deletions(-)

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index 948e1c31b17..1d69e69f555 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -22,6 +22,7 @@ import {
   logInfo,
   logMessage,
   logWarn,
+  mergeDeep,
   transformBidderParamKeywords,
   getWindowFromDocument
 } from '../src/utils.js';
@@ -230,15 +231,32 @@ export const spec = {
       payload.app = appIdObj;
     }
 
-    let auctionKeywords = config.getConfig('appnexusAuctionKeywords');
-    if (isPlainObject(auctionKeywords)) {
-      let aucKeywords = transformBidderParamKeywords(auctionKeywords);
+    function grabOrtb2Keywords(ortb2Obj) {
+      const fields = ['site.keywords', 'site.content.keywords', 'user.keywords', 'app.keywords', 'app.content.keywords'];
+      let result = [];
 
-      if (aucKeywords.length > 0) {
-        aucKeywords.forEach(deleteValues);
-      }
+      fields.forEach(path => {
+        let keyStr = deepAccess(ortb2Obj, path);
+        if (isStr(keyStr)) result.push(keyStr);
+      });
+      return result;
+    }
 
-      payload.keywords = aucKeywords;
+    // grab the ortb2 keyword data (if it exists) and convert from the comma list string format to object format
+    let ortb2 = deepClone(bidderRequest && bidderRequest.ortb2);
+    let ortb2KeywordsObjList = grabOrtb2Keywords(ortb2).map(keyStr => convertStringToKeywordsObj(keyStr));
+
+    let anAuctionKeywords = deepClone(config.getConfig('appnexusAuctionKeywords')) || {};
+    // need to convert the string values into array of strings, to properly merge values with other existing keys later
+    Object.keys(anAuctionKeywords).forEach(k => { if (isStr(anAuctionKeywords[k]) || isNumber(anAuctionKeywords[k])) anAuctionKeywords[k] = [anAuctionKeywords[k]] });
+    // combine all sources of keywords (converted from string comma list to object format) into one object (that combines the values for shared keys)
+    let mergedAuctionKeywrds = mergeDeep({}, anAuctionKeywords, ...ortb2KeywordsObjList);
+
+    // convert to final format used by adserver
+    let auctionKeywords = transformBidderParamKeywords(mergedAuctionKeywrds);
+    if (auctionKeywords.length > 0) {
+      auctionKeywords.forEach(deleteValues);
+      payload.keywords = auctionKeywords;
     }
 
     if (config.getConfig('adpod.brandCategoryExclusion')) {
@@ -763,13 +781,25 @@ function bidToTag(bid) {
   if (bid.params.externalImpId) {
     tag.external_imp_id = bid.params.externalImpId;
   }
-  if (!isEmpty(bid.params.keywords)) {
-    let keywords = transformBidderParamKeywords(bid.params.keywords);
 
-    if (keywords.length > 0) {
-      keywords.forEach(deleteValues);
+  let ortb2ImpKwStr = deepAccess(bid, 'ortb2Imp.ext.data.keywords');
+  if ((isStr(ortb2ImpKwStr) && ortb2ImpKwStr !== '') || !isEmpty(bid.params.keywords)) {
+    // convert ortb2 from comma list string format to bid param object format
+    let ortb2ImpKwObj = convertStringToKeywordsObj(ortb2ImpKwStr);
+
+    let bidParamsKwObj = (isPlainObject(bid.params.keywords)) ? deepClone(bid.params.keywords) : {};
+    // need to convert the string values into an array of strings, to properly merge values with other existing keys later
+    Object.keys(bidParamsKwObj).forEach(k => { if (isStr(bidParamsKwObj[k]) || isNumber(bidParamsKwObj[k])) bidParamsKwObj[k] = [bidParamsKwObj[k]] });
+
+    // combine both sources of keywords into one merged object (that combines the values for shared keys)
+    let keywordsObj = mergeDeep({}, bidParamsKwObj, ortb2ImpKwObj);
+
+    // convert to final format used by adserver
+    let keywordsUt = transformBidderParamKeywords(keywordsObj);
+    if (keywordsUt.length > 0) {
+      keywordsUt.forEach(deleteValues);
+      tag.keywords = keywordsUt;
     }
-    tag.keywords = keywords;
   }
 
   let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
@@ -1167,4 +1197,35 @@ function convertKeywordsToString(keywords) {
   return result;
 }
 
+// converts a comma separated list of keywords into the standard keyword object format used in appnexus bid params
+// 'genre=rock,genre=pop,pets=dog,music' goes to { 'genre': ['rock', 'pop'], 'pets': ['dog'], 'music': [''] }
+function convertStringToKeywordsObj(keyStr) {
+  let result = {};
+
+  // will split based on commas and will eat white space before/after the comma
+  let keywordList = keyStr.split(/\s*(?:,)\s*/);
+  keywordList.forEach(kw => {
+    // if = exists, then split
+    if (kw.indexOf('=') !== -1) {
+      let kwPair = kw.split('=');
+      let key = kwPair[0];
+      let val = kwPair[1];
+
+      // then check for existing key in result > if so add value to the array > if not, add new key and create value array
+      if (result.hasOwnProperty(key)) {
+        result[key].push(val);
+      } else {
+        result[key] = [val];
+      }
+    } else {
+      // make a key with '' value; if key already exists > don't add
+      if (!result.hasOwnProperty(kw)) {
+        result[kw] = [''];
+      }
+    }
+  });
+
+  return result;
+}
+
 registerBidder(spec);
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 6f00d851a94..211c0d64e67 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -610,7 +610,7 @@ describe('AppNexusAdapter', function () {
       config.getConfig.restore();
     });
 
-    it('adds auction level keywords to request when set', function () {
+    it('adds auction level keywords and ortb2 keywords to request when set', function () {
       let bidRequest = Object.assign({}, bidRequests[0]);
       sinon
         .stub(config, 'getConfig')
@@ -618,10 +618,31 @@ describe('AppNexusAdapter', function () {
         .returns({
           gender: 'm',
           music: ['rock', 'pop'],
-          test: ''
+          test: '',
+          tools: 'power'
         });
 
-      const request = spec.buildRequests([bidRequest]);
+      const bidderRequest = {
+        ortb2: {
+          site: {
+            keywords: 'power tools, drills, tools=industrial',
+            content: {
+              keywords: 'video, source=streaming'
+            }
+          },
+          user: {
+            keywords: 'tools=home,renting'
+          },
+          app: {
+            keywords: 'app=iphone 11',
+            content: {
+              keywords: 'appcontent=home repair, dyi'
+            }
+          }
+        }
+      };
+
+      const request = spec.buildRequests([bidRequest], bidderRequest);
       const payload = JSON.parse(request.data);
 
       expect(payload.keywords).to.deep.equal([{
@@ -632,6 +653,28 @@ describe('AppNexusAdapter', function () {
         'value': ['rock', 'pop']
       }, {
         'key': 'test'
+      }, {
+        'key': 'tools',
+        'value': ['power', 'industrial', 'home']
+      }, {
+        'key': 'power tools'
+      }, {
+        'key': 'drills'
+      }, {
+        'key': 'video'
+      }, {
+        'key': 'source',
+        'value': ['streaming']
+      }, {
+        'key': 'renting'
+      }, {
+        'key': 'app',
+        'value': ['iphone 11']
+      }, {
+        'key': 'appcontent',
+        'value': ['home repair']
+      }, {
+        'key': 'dyi'
       }]);
 
       config.getConfig.restore();
@@ -714,7 +757,7 @@ describe('AppNexusAdapter', function () {
       });
     }
 
-    it('should convert keyword params to proper form and attaches to request', function () {
+    it('should convert keyword params and adUnit ortb2 keywords to proper form and attaches to request', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],
         {
@@ -730,6 +773,13 @@ describe('AppNexusAdapter', function () {
               emptyArr: [''],
               badValue: { 'foo': 'bar' } // should be dropped
             }
+          },
+          ortb2Imp: {
+            ext: {
+              data: {
+                keywords: 'ortb2=yes,ortb2test, multiValMixed=4, singleValNum=456'
+              }
+            }
           }
         }
       );
@@ -748,14 +798,19 @@ describe('AppNexusAdapter', function () {
         'value': ['5']
       }, {
         'key': 'multiValMixed',
-        'value': ['value1', '2', 'value3']
+        'value': ['value1', '2', 'value3', '4']
       }, {
         'key': 'singleValNum',
-        'value': ['123']
+        'value': ['123', '456']
       }, {
         'key': 'emptyStr'
       }, {
         'key': 'emptyArr'
+      }, {
+        'key': 'ortb2',
+        'value': ['yes']
+      }, {
+        'key': 'ortb2test'
       }]);
     });
 

From 918ffb98422b5bd8075f69e664729710a9f98e33 Mon Sep 17 00:00:00 2001
From: github-tom-kuhnen <101572885+github-tom-kuhnen@users.noreply.github.com>
Date: Fri, 9 Sep 2022 13:48:57 +0200
Subject: [PATCH 240/569] Adding new user ids to Teads adapter (#8951)

---
 modules/teadsBidAdapter.js                | 42 ++++++++++---
 test/spec/modules/teadsBidAdapter_spec.js | 76 +++++++++++++++++++----
 2 files changed, 97 insertions(+), 21 deletions(-)

diff --git a/modules/teadsBidAdapter.js b/modules/teadsBidAdapter.js
index c40f76e743e..9ce00d2d3eb 100644
--- a/modules/teadsBidAdapter.js
+++ b/modules/teadsBidAdapter.js
@@ -54,7 +54,7 @@ export const spec = {
       data: bids,
       deviceWidth: screen.width,
       hb_version: '$prebid.version$',
-      ...getUnifiedId2Parameter(deepAccess(validBidRequests, '0.userId.uid2')),
+      ...getSharedViewerIdParameters(validBidRequests),
       ...getFirstPartyTeadsIdParameter()
     };
 
@@ -124,6 +124,37 @@ export const spec = {
   }
 };
 
+/**
+ *
+ * @param validBidRequests an array of bids
+ * @returns {{sharedViewerIdKey : 'sharedViewerIdValue'}} object with all sharedviewerids
+ */
+function getSharedViewerIdParameters(validBidRequests) {
+  const sharedViewerIdMapping = {
+    unifiedId2: 'uid2.id', // uid2IdSystem
+    liveRampId: 'idl_env', // identityLinkIdSystem
+    lotamePanoramaId: 'lotamePanoramaId', // lotamePanoramaIdSystem
+    id5Id: 'id5id.uid', // id5IdSystem
+    criteoId: 'criteoId', // criteoIdSystem
+    yahooConnectId: 'connectId', // connectIdSystem
+    quantcastId: 'quantcastId', // quantcastIdSystem
+    epsilonPublisherLinkId: 'publinkId', // publinkIdSystem
+    publisherFirstPartyViewerId: 'pubcid', // sharedIdSystem
+    merkleId: 'merkleId.id', // merkleIdSystem
+    kinessoId: 'kpuid' // kinessoIdSystem
+  }
+
+  let sharedViewerIdObject = {};
+  for (const sharedViewerId in sharedViewerIdMapping) {
+    const key = sharedViewerIdMapping[sharedViewerId];
+    const value = deepAccess(validBidRequests, `0.userId.${key}`);
+    if (value) {
+      sharedViewerIdObject[sharedViewerId] = value;
+    }
+  }
+  return sharedViewerIdObject;
+}
+
 function getReferrerInfo(bidderRequest) {
   let ref = '';
   if (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page) {
@@ -228,15 +259,6 @@ function _validateId(id) {
   return (parseInt(id) > 0);
 }
 
-/**
- * Get unified ID v2 parameter to be sent in bid request.
- * @param `{id: string} | undefined` optionalUid2 uid2 user ID object available if "uid2IdSystem" module is enabled.
- * @returns `{} | {unifiedId2: string}`
- */
-function getUnifiedId2Parameter(optionalUid2) {
-  return optionalUid2 ? { unifiedId2: optionalUid2.id } : {};
-}
-
 /**
  * Get the first-party cookie Teads ID parameter to be sent in bid request.
  * @returns `{} | {firstPartyCookieTeadsId: string}`
diff --git a/test/spec/modules/teadsBidAdapter_spec.js b/test/spec/modules/teadsBidAdapter_spec.js
index c0845d93bde..254f23d011e 100644
--- a/test/spec/modules/teadsBidAdapter_spec.js
+++ b/test/spec/modules/teadsBidAdapter_spec.js
@@ -470,35 +470,89 @@ describe('teadsBidAdapter', () => {
         'deviceWidth': 1680
       };
 
-      describe('Unified ID v2', function () {
-        it('should not add unifiedId2 param to payload if uid2 system is not enabled', function () {
+      const userIdModules = {
+        unifiedId2: {uid2: {id: 'unifiedId2-id'}},
+        liveRampId: {idl_env: 'liveRampId-id'},
+        lotamePanoramaId: {lotamePanoramaId: 'lotamePanoramaId-id'},
+        id5Id: {id5id: {uid: 'id5Id-id'}},
+        criteoId: {criteoId: 'criteoId-id'},
+        yahooConnectId: {connectId: 'yahooConnectId-id'},
+        quantcastId: {quantcastId: 'quantcastId-id'},
+        epsilonPublisherLinkId: {publinkId: 'epsilonPublisherLinkId-id'},
+        publisherFirstPartyViewerId: {pubcid: 'publisherFirstPartyViewerId-id'},
+        merkleId: {merkleId: {id: 'merkleId-id'}},
+        kinessoId: {kpuid: 'kinessoId-id'}
+      };
+
+      describe('User Id Modules', function () {
+        it(`should not add param to payload if user id system is not enabled`, function () {
           const bidRequest = {
             ...baseBidRequest,
-            userId: {} // no "uid2" property -> assumption that the Unified ID v2 system is disabled
+            userId: {} // no property -> assumption that the system is disabled
           };
 
           const request = spec.buildRequests([bidRequest], bidderResquestDefault);
           const payload = JSON.parse(request.data);
 
-          expect(payload).not.to.have.property('unifiedId2');
+          for (const userId in userIdModules) {
+            expect(payload, userId).not.to.have.property(userId);
+          }
+        });
+
+        it(`should not add param to payload if user id field is absent`, function () {
+          const request = spec.buildRequests([baseBidRequest], bidderResquestDefault);
+          const payload = JSON.parse(request.data);
+
+          for (const userId in userIdModules) {
+            expect(payload, userId).not.to.have.property(userId);
+          }
         });
 
-        it('should add unifiedId2 param to payload if uid2 system is enabled', function () {
+        it(`should not add param to payload if user id is enabled but there is no value`, function () {
           const bidRequest = {
             ...baseBidRequest,
             userId: {
-              uid2: {
-                id: 'my-unified-id-2'
-              }
+              idl_env: '',
+              pubcid: 'publisherFirstPartyViewerId-id'
             }
           };
 
           const request = spec.buildRequests([bidRequest], bidderResquestDefault);
           const payload = JSON.parse(request.data);
 
-          expect(payload.unifiedId2).to.equal('my-unified-id-2');
-        })
-      });
+          expect(payload).not.to.have.property('liveRampId');
+          expect(payload['publisherFirstPartyViewerId']).to.equal('publisherFirstPartyViewerId-id');
+        });
+
+        it(`should add userId param to payload for each enabled user id system`, function () {
+          let userIdObject = {};
+          for (const userId in userIdModules) {
+            userIdObject = {
+              ...userIdObject,
+              ...userIdModules[userId]
+            }
+          }
+          const bidRequest = {
+            ...baseBidRequest,
+            userId: userIdObject
+          };
+
+          const request = spec.buildRequests([bidRequest], bidderResquestDefault);
+          const payload = JSON.parse(request.data);
+
+          expect(payload['unifiedId2']).to.equal('unifiedId2-id');
+          expect(payload['liveRampId']).to.equal('liveRampId-id');
+          expect(payload['lotamePanoramaId']).to.equal('lotamePanoramaId-id');
+          expect(payload['id5Id']).to.equal('id5Id-id');
+          expect(payload['criteoId']).to.equal('criteoId-id');
+          expect(payload['yahooConnectId']).to.equal('yahooConnectId-id');
+          expect(payload['quantcastId']).to.equal('quantcastId-id');
+          expect(payload['epsilonPublisherLinkId']).to.equal('epsilonPublisherLinkId-id');
+          expect(payload['publisherFirstPartyViewerId']).to.equal('publisherFirstPartyViewerId-id');
+          expect(payload['merkleId']).to.equal('merkleId-id');
+          expect(payload['kinessoId']).to.equal('kinessoId-id');
+        });
+      })
 
       describe('First-party cookie Teads ID', function () {
         it('should not add firstPartyCookieTeadsId param to payload if cookies are not enabled', function () {

From b04c132692c397453ff043433ab1acccffd1e0bd Mon Sep 17 00:00:00 2001
From: Michele Nasti <musikele@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:19:32 +0200
Subject: [PATCH 241/569] upgrade gulp-eslint to 6.0.0 (#8976)

Co-authored-by: Michele Nasti <michele@rtk.io>
---
 package-lock.json | 1362 ++++++++++++++++++---------------------------
 package.json      |    2 +-
 2 files changed, 536 insertions(+), 828 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 977e9119b4f..892cfe7c486 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -58,7 +58,7 @@
         "gulp-clean": "^0.3.2",
         "gulp-concat": "^2.6.0",
         "gulp-connect": "^5.7.0",
-        "gulp-eslint": "^4.0.0",
+        "gulp-eslint": "^6.0.0",
         "gulp-if": "^3.0.0",
         "gulp-js-escape": "^1.0.1",
         "gulp-replace": "^1.0.0",
@@ -5539,27 +5539,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/caller-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/caller-path/node_modules/callsites": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -5788,13 +5767,6 @@
         "node": ">=6.0"
       }
     },
-    "node_modules/circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "deprecated": "CircularJSON is in maintenance only, flatted is its successor.",
-      "dev": true
-    },
     "node_modules/class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -5978,16 +5950,6 @@
         "readable-stream": "^2.3.5"
       }
     },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true,
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
-      }
-    },
     "node_modules/code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -10861,207 +10823,144 @@
       }
     },
     "node_modules/gulp-eslint": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-4.0.2.tgz",
-      "integrity": "sha512-fcFUQzFsN6dJ6KZlG+qPOEkqfcevRUXgztkYCvhNvJeSvOicC8ucutN4qR/ID8LmNZx9YPIkBzazTNnVvbh8wg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz",
+      "integrity": "sha512-dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig==",
       "dev": true,
       "dependencies": {
-        "eslint": "^4.0.0",
+        "eslint": "^6.0.0",
         "fancy-log": "^1.3.2",
-        "plugin-error": "^1.0.0"
+        "plugin-error": "^1.0.1"
       }
     },
-    "node_modules/gulp-eslint/node_modules/acorn": {
-      "version": "5.7.4",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/gulp-eslint/node_modules/acorn-jsx": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^3.0.4"
-      }
-    },
-    "node_modules/gulp-eslint/node_modules/acorn-jsx/node_modules/acorn": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-      "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/gulp-eslint/node_modules/ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
-      "dev": true,
-      "dependencies": {
-        "co": "^4.6.0",
-        "fast-deep-equal": "^1.0.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.3.0"
-      }
-    },
-    "node_modules/gulp-eslint/node_modules/ajv-keywords": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^5.0.0"
-      }
-    },
-    "node_modules/gulp-eslint/node_modules/ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+    "node_modules/gulp-eslint/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
-    "node_modules/gulp-eslint/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+    "node_modules/gulp-eslint/node_modules/astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
       "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/gulp-eslint/node_modules/chardet": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
-      "dev": true
-    },
-    "node_modules/gulp-eslint/node_modules/cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+    "node_modules/gulp-eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "restore-cursor": "^2.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/gulp-eslint/node_modules/cli-width": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
+    "node_modules/gulp-eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/gulp-eslint/node_modules/cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
       "dev": true,
       "dependencies": {
-        "lru-cache": "^4.0.1",
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
         "shebang-command": "^1.2.0",
         "which": "^1.2.9"
       }
     },
-    "node_modules/gulp-eslint/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+    "node_modules/gulp-eslint/node_modules/cross-spawn/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
+      "bin": {
+        "semver": "bin/semver"
       }
     },
-    "node_modules/gulp-eslint/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/gulp-eslint/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
     },
     "node_modules/gulp-eslint/node_modules/eslint": {
-      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
-      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
+      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
       "dev": true,
       "dependencies": {
-        "ajv": "^5.3.0",
-        "babel-code-frame": "^6.22.0",
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.10.0",
         "chalk": "^2.1.0",
-        "concat-stream": "^1.6.0",
-        "cross-spawn": "^5.1.0",
-        "debug": "^3.1.0",
-        "doctrine": "^2.1.0",
-        "eslint-scope": "^3.7.1",
-        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^3.5.4",
-        "esquery": "^1.0.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^1.4.3",
+        "eslint-visitor-keys": "^1.1.0",
+        "espree": "^6.1.2",
+        "esquery": "^1.0.1",
         "esutils": "^2.0.2",
-        "file-entry-cache": "^2.0.0",
+        "file-entry-cache": "^5.0.1",
         "functional-red-black-tree": "^1.0.1",
-        "glob": "^7.1.2",
-        "globals": "^11.0.1",
-        "ignore": "^3.3.3",
+        "glob-parent": "^5.0.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^3.0.6",
-        "is-resolvable": "^1.0.0",
-        "js-yaml": "^3.9.1",
+        "inquirer": "^7.0.0",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.3.0",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.2",
+        "lodash": "^4.17.14",
+        "minimatch": "^3.0.4",
         "mkdirp": "^0.5.1",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.8.2",
-        "path-is-inside": "^1.0.2",
-        "pluralize": "^7.0.0",
+        "optionator": "^0.8.3",
         "progress": "^2.0.0",
-        "regexpp": "^1.0.1",
-        "require-uncached": "^1.0.3",
-        "semver": "^5.3.0",
-        "strip-ansi": "^4.0.0",
-        "strip-json-comments": "~2.0.1",
-        "table": "4.0.2",
-        "text-table": "~0.2.0"
+        "regexpp": "^2.0.1",
+        "semver": "^6.1.2",
+        "strip-ansi": "^5.2.0",
+        "strip-json-comments": "^3.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
       },
       "bin": {
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/gulp-eslint/node_modules/eslint-scope": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
-      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
+    "node_modules/gulp-eslint/node_modules/eslint-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
       "dev": true,
       "dependencies": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
+        "eslint-visitor-keys": "^1.1.0"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=6"
       }
     },
     "node_modules/gulp-eslint/node_modules/eslint-visitor-keys": {
@@ -11073,126 +10972,163 @@
         "node": ">=4"
       }
     },
-    "node_modules/gulp-eslint/node_modules/espree": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
-      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+    "node_modules/gulp-eslint/node_modules/eslint/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
-        "acorn": "^5.5.0",
-        "acorn-jsx": "^3.0.0"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/gulp-eslint/node_modules/external-editor": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+    "node_modules/gulp-eslint/node_modules/eslint/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
       "dependencies": {
-        "chardet": "^0.4.0",
-        "iconv-lite": "^0.4.17",
-        "tmp": "^0.0.33"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=0.12"
+        "node": ">=6"
       }
     },
-    "node_modules/gulp-eslint/node_modules/fast-deep-equal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-      "dev": true
-    },
-    "node_modules/gulp-eslint/node_modules/figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+    "node_modules/gulp-eslint/node_modules/espree": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
       "dev": true,
       "dependencies": {
-        "escape-string-regexp": "^1.0.5"
+        "acorn": "^7.1.1",
+        "acorn-jsx": "^5.2.0",
+        "eslint-visitor-keys": "^1.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6.0.0"
       }
     },
     "node_modules/gulp-eslint/node_modules/file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
       "dev": true,
       "dependencies": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
+        "flat-cache": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
     "node_modules/gulp-eslint/node_modules/flat-cache": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
       "dev": true,
       "dependencies": {
-        "circular-json": "^0.3.1",
-        "graceful-fs": "^4.1.2",
-        "rimraf": "~2.6.2",
-        "write": "^0.2.1"
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/gulp-eslint/node_modules/ignore": {
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+    "node_modules/gulp-eslint/node_modules/flatted": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
       "dev": true
     },
+    "node_modules/gulp-eslint/node_modules/globals": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/inquirer": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
       "dev": true,
       "dependencies": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.0",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^2.0.4",
-        "figures": "^2.0.0",
-        "lodash": "^4.3.0",
-        "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rx-lite": "^4.0.8",
-        "rx-lite-aggregates": "^4.0.8",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^4.0.0",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.19",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
         "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/inquirer/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/inquirer/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/gulp-eslint/node_modules/is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
       "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/gulp-eslint/node_modules/json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-      "dev": true
-    },
     "node_modules/gulp-eslint/node_modules/levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "dev": true,
       "dependencies": {
         "prelude-ls": "~1.1.2",
@@ -11202,55 +11138,18 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/gulp-eslint/node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "node_modules/gulp-eslint/node_modules/mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/gulp-eslint/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.5"
+        "minimist": "^1.2.6"
       },
       "bin": {
         "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/gulp-eslint/node_modules/mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-      "dev": true
-    },
-    "node_modules/gulp-eslint/node_modules/onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/gulp-eslint/node_modules/optionator": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -11268,35 +11167,31 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/gulp-eslint/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
       "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/gulp-eslint/node_modules/regexpp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
-      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/gulp-eslint/node_modules/restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
       "dev": true,
-      "dependencies": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">=6.5.0"
       }
     },
     "node_modules/gulp-eslint/node_modules/rimraf": {
@@ -11311,19 +11206,22 @@
         "rimraf": "bin.js"
       }
     },
-    "node_modules/gulp-eslint/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+    "node_modules/gulp-eslint/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
-      "bin": {
-        "semver": "bin/semver"
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
       }
     },
     "node_modules/gulp-eslint/node_modules/shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dev": true,
       "dependencies": {
         "shebang-regex": "^1.0.0"
@@ -11335,79 +11233,95 @@
     "node_modules/gulp-eslint/node_modules/shebang-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/gulp-eslint/node_modules/slice-ansi": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
       "dev": true,
       "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
         "is-fullwidth-code-point": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
-    "node_modules/gulp-eslint/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+    "node_modules/gulp-eslint/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/gulp-eslint/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+    "node_modules/gulp-eslint/node_modules/table": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^3.0.0"
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/gulp-eslint/node_modules/table": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+    "node_modules/gulp-eslint/node_modules/table/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
       "dev": true,
       "dependencies": {
-        "ajv": "^5.2.3",
-        "ajv-keywords": "^2.1.0",
-        "chalk": "^2.1.0",
-        "lodash": "^4.17.4",
-        "slice-ansi": "1.0.0",
-        "string-width": "^2.1.1"
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/gulp-eslint/node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+    "node_modules/gulp-eslint/node_modules/table/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dev": true,
       "dependencies": {
-        "os-tmpdir": "~1.0.2"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=0.6.0"
+        "node": ">=6"
       }
     },
     "node_modules/gulp-eslint/node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
       "dev": true,
       "dependencies": {
         "prelude-ls": "~1.1.2"
@@ -11416,6 +11330,15 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/gulp-eslint/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -11428,12 +11351,6 @@
         "which": "bin/which"
       }
     },
-    "node_modules/gulp-eslint/node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
-    },
     "node_modules/gulp-if": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-3.0.0.tgz",
@@ -12979,12 +12896,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
     "node_modules/is-running": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-running/-/is-running-2.1.0.tgz",
@@ -17396,12 +17307,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
     "node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -17631,15 +17536,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/pluralize": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -18717,28 +18613,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/require-uncached": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-      "dev": true,
-      "dependencies": {
-        "caller-path": "^0.1.0",
-        "resolve-from": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-uncached/node_modules/resolve-from": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -18890,21 +18764,6 @@
         "node": ">=0.12.0"
       }
     },
-    "node_modules/rx-lite": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
-    },
-    "node_modules/rx-lite-aggregates": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
-      "dev": true,
-      "dependencies": {
-        "rx-lite": "*"
-      }
-    },
     "node_modules/rxjs": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
@@ -20129,15 +19988,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/suffix": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
@@ -22358,24 +22208,24 @@
       "dev": true
     },
     "node_modules/write": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
       "dev": true,
       "dependencies": {
         "mkdirp": "^0.5.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
     "node_modules/write/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.5"
+        "minimist": "^1.2.6"
       },
       "bin": {
         "mkdirp": "bin/cmd.js"
@@ -26872,23 +26722,6 @@
         "get-intrinsic": "^1.0.2"
       }
     },
-    "caller-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-      "dev": true,
-      "requires": {
-        "callsites": "^0.2.0"
-      },
-      "dependencies": {
-        "callsites": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-          "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-          "dev": true
-        }
-      }
-    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -27045,12 +26878,6 @@
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "dev": true
     },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
-    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -27201,12 +27028,6 @@
         "readable-stream": "^2.3.5"
       }
     },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
-    },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -31108,174 +30929,145 @@
       }
     },
     "gulp-eslint": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-4.0.2.tgz",
-      "integrity": "sha512-fcFUQzFsN6dJ6KZlG+qPOEkqfcevRUXgztkYCvhNvJeSvOicC8ucutN4qR/ID8LmNZx9YPIkBzazTNnVvbh8wg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz",
+      "integrity": "sha512-dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig==",
       "dev": true,
       "requires": {
-        "eslint": "^4.0.0",
+        "eslint": "^6.0.0",
         "fancy-log": "^1.3.2",
-        "plugin-error": "^1.0.0"
+        "plugin-error": "^1.0.1"
       },
       "dependencies": {
-        "acorn": {
-          "version": "5.7.4",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
-          "dev": true
-        },
-        "acorn-jsx": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-          "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-          "dev": true,
-          "requires": {
-            "acorn": "^3.0.4"
-          },
-          "dependencies": {
-            "acorn": {
-              "version": "3.3.0",
-              "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-              "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-              "dev": true
-            }
-          }
-        },
-        "ajv": {
-          "version": "5.5.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-          "integrity": "sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw==",
-          "dev": true,
-          "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
-          }
-        },
-        "ajv-keywords": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-          "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
-          "dev": true,
-          "requires": {}
-        },
-        "ansi-escapes": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-          "dev": true
-        },
         "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
-        "chardet": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-          "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+        "astral-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+          "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
           "dev": true
         },
-        "cli-cursor": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "restore-cursor": "^2.0.0"
+            "color-name": "~1.1.4"
           }
         },
-        "cli-width": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-          "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "lru-cache": "^4.0.1",
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
             "shebang-command": "^1.2.0",
             "which": "^1.2.9"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "5.7.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "dev": true
+            }
           }
         },
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "dev": true
         },
         "eslint": {
-          "version": "4.19.1",
-          "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
-          "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
+          "version": "6.8.0",
+          "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
+          "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
           "dev": true,
           "requires": {
-            "ajv": "^5.3.0",
-            "babel-code-frame": "^6.22.0",
+            "@babel/code-frame": "^7.0.0",
+            "ajv": "^6.10.0",
             "chalk": "^2.1.0",
-            "concat-stream": "^1.6.0",
-            "cross-spawn": "^5.1.0",
-            "debug": "^3.1.0",
-            "doctrine": "^2.1.0",
-            "eslint-scope": "^3.7.1",
-            "eslint-visitor-keys": "^1.0.0",
-            "espree": "^3.5.4",
-            "esquery": "^1.0.0",
+            "cross-spawn": "^6.0.5",
+            "debug": "^4.0.1",
+            "doctrine": "^3.0.0",
+            "eslint-scope": "^5.0.0",
+            "eslint-utils": "^1.4.3",
+            "eslint-visitor-keys": "^1.1.0",
+            "espree": "^6.1.2",
+            "esquery": "^1.0.1",
             "esutils": "^2.0.2",
-            "file-entry-cache": "^2.0.0",
+            "file-entry-cache": "^5.0.1",
             "functional-red-black-tree": "^1.0.1",
-            "glob": "^7.1.2",
-            "globals": "^11.0.1",
-            "ignore": "^3.3.3",
+            "glob-parent": "^5.0.0",
+            "globals": "^12.1.0",
+            "ignore": "^4.0.6",
+            "import-fresh": "^3.0.0",
             "imurmurhash": "^0.1.4",
-            "inquirer": "^3.0.6",
-            "is-resolvable": "^1.0.0",
-            "js-yaml": "^3.9.1",
+            "inquirer": "^7.0.0",
+            "is-glob": "^4.0.0",
+            "js-yaml": "^3.13.1",
             "json-stable-stringify-without-jsonify": "^1.0.1",
             "levn": "^0.3.0",
-            "lodash": "^4.17.4",
-            "minimatch": "^3.0.2",
+            "lodash": "^4.17.14",
+            "minimatch": "^3.0.4",
             "mkdirp": "^0.5.1",
             "natural-compare": "^1.4.0",
-            "optionator": "^0.8.2",
-            "path-is-inside": "^1.0.2",
-            "pluralize": "^7.0.0",
+            "optionator": "^0.8.3",
             "progress": "^2.0.0",
-            "regexpp": "^1.0.1",
-            "require-uncached": "^1.0.3",
-            "semver": "^5.3.0",
-            "strip-ansi": "^4.0.0",
-            "strip-json-comments": "~2.0.1",
-            "table": "4.0.2",
-            "text-table": "~0.2.0"
+            "regexpp": "^2.0.1",
+            "semver": "^6.1.2",
+            "strip-ansi": "^5.2.0",
+            "strip-json-comments": "^3.0.1",
+            "table": "^5.2.3",
+            "text-table": "^0.2.0",
+            "v8-compile-cache": "^2.0.3"
+          },
+          "dependencies": {
+            "ajv": {
+              "version": "6.12.6",
+              "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+              "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+              "dev": true,
+              "requires": {
+                "fast-deep-equal": "^3.1.1",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.4.1",
+                "uri-js": "^4.2.2"
+              }
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
           }
         },
-        "eslint-scope": {
-          "version": "3.7.3",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
-          "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
+        "eslint-utils": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+          "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
           "dev": true,
           "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
+            "eslint-visitor-keys": "^1.1.0"
           }
         },
         "eslint-visitor-keys": {
@@ -31285,151 +31077,116 @@
           "dev": true
         },
         "espree": {
-          "version": "3.5.4",
-          "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
-          "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+          "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
           "dev": true,
           "requires": {
-            "acorn": "^5.5.0",
-            "acorn-jsx": "^3.0.0"
+            "acorn": "^7.1.1",
+            "acorn-jsx": "^5.2.0",
+            "eslint-visitor-keys": "^1.1.0"
           }
         },
-        "external-editor": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-          "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+        "file-entry-cache": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+          "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
           "dev": true,
           "requires": {
-            "chardet": "^0.4.0",
-            "iconv-lite": "^0.4.17",
-            "tmp": "^0.0.33"
+            "flat-cache": "^2.0.1"
           }
         },
-        "fast-deep-equal": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-          "dev": true
-        },
-        "figures": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+        "flat-cache": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+          "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
           "dev": true,
           "requires": {
-            "escape-string-regexp": "^1.0.5"
+            "flatted": "^2.0.0",
+            "rimraf": "2.6.3",
+            "write": "1.0.3"
           }
         },
-        "file-entry-cache": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-          "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-          "dev": true,
-          "requires": {
-            "flat-cache": "^1.2.1",
-            "object-assign": "^4.0.1"
-          }
+        "flatted": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+          "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+          "dev": true
         },
-        "flat-cache": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-          "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+        "globals": {
+          "version": "12.4.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+          "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
           "dev": true,
           "requires": {
-            "circular-json": "^0.3.1",
-            "graceful-fs": "^4.1.2",
-            "rimraf": "~2.6.2",
-            "write": "^0.2.1"
+            "type-fest": "^0.8.1"
           }
         },
-        "ignore": {
-          "version": "3.3.10",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-          "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-          "dev": true
-        },
         "inquirer": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-          "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
-          "dev": true,
-          "requires": {
-            "ansi-escapes": "^3.0.0",
-            "chalk": "^2.0.0",
-            "cli-cursor": "^2.1.0",
-            "cli-width": "^2.0.0",
-            "external-editor": "^2.0.4",
-            "figures": "^2.0.0",
-            "lodash": "^4.3.0",
-            "mute-stream": "0.0.7",
-            "run-async": "^2.2.0",
-            "rx-lite": "^4.0.8",
-            "rx-lite-aggregates": "^4.0.8",
-            "string-width": "^2.1.0",
-            "strip-ansi": "^4.0.0",
+          "version": "7.3.3",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+          "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^4.1.0",
+            "cli-cursor": "^3.1.0",
+            "cli-width": "^3.0.0",
+            "external-editor": "^3.0.3",
+            "figures": "^3.0.0",
+            "lodash": "^4.17.19",
+            "mute-stream": "0.0.8",
+            "run-async": "^2.4.0",
+            "rxjs": "^6.6.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0",
             "through": "^2.3.6"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "4.3.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+              "dev": true,
+              "requires": {
+                "color-convert": "^2.0.1"
+              }
+            },
+            "chalk": {
+              "version": "4.1.2",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+              }
+            }
           }
         },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
           "dev": true
         },
         "levn": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-          "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+          "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
           "dev": true,
           "requires": {
             "prelude-ls": "~1.1.2",
             "type-check": "~0.3.2"
           }
         },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "mimic-fn": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-          "dev": true
-        },
         "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "mute-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-          "dev": true
-        },
-        "onetime": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
           "dev": true,
           "requires": {
-            "mimic-fn": "^1.0.0"
+            "minimist": "^1.2.6"
           }
         },
         "optionator": {
@@ -31446,28 +31203,24 @@
             "word-wrap": "~1.2.3"
           }
         },
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+          "dev": true
+        },
         "prelude-ls": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-          "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+          "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
           "dev": true
         },
         "regexpp": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
-          "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+          "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
           "dev": true
         },
-        "restore-cursor": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-          "dev": true,
-          "requires": {
-            "onetime": "^2.0.0",
-            "signal-exit": "^3.0.2"
-          }
-        },
         "rimraf": {
           "version": "2.6.3",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@@ -31477,16 +31230,19 @@
             "glob": "^7.1.3"
           }
         },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
         },
         "shebang-command": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+          "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
           "dev": true,
           "requires": {
             "shebang-regex": "^1.0.0"
@@ -31495,69 +31251,84 @@
         "shebang-regex": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+          "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
           "dev": true
         },
         "slice-ansi": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-          "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+          "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
           "dev": true,
           "requires": {
+            "ansi-styles": "^3.2.0",
+            "astral-regex": "^1.0.0",
             "is-fullwidth-code-point": "^2.0.0"
           }
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
         },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "has-flag": "^4.0.0"
           }
         },
         "table": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-          "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+          "version": "5.4.6",
+          "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+          "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
           "dev": true,
           "requires": {
-            "ajv": "^5.2.3",
-            "ajv-keywords": "^2.1.0",
-            "chalk": "^2.1.0",
-            "lodash": "^4.17.4",
-            "slice-ansi": "1.0.0",
-            "string-width": "^2.1.1"
-          }
-        },
-        "tmp": {
-          "version": "0.0.33",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-          "dev": true,
-          "requires": {
-            "os-tmpdir": "~1.0.2"
+            "ajv": "^6.10.2",
+            "lodash": "^4.17.14",
+            "slice-ansi": "^2.1.0",
+            "string-width": "^3.0.0"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+              "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+              "dev": true,
+              "requires": {
+                "emoji-regex": "^7.0.1",
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
           }
         },
         "type-check": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+          "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
           "dev": true,
           "requires": {
             "prelude-ls": "~1.1.2"
           }
         },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
+        },
         "which": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -31566,12 +31337,6 @@
           "requires": {
             "isexe": "^2.0.0"
           }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-          "dev": true
         }
       }
     },
@@ -32749,12 +32514,6 @@
         "is-unc-path": "^1.0.0"
       }
     },
-    "is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
     "is-running": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-running/-/is-running-2.1.0.tgz",
@@ -36152,12 +35911,6 @@
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
     "path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -36331,12 +36084,6 @@
         }
       }
     },
-    "pluralize": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
-      "dev": true
-    },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -37149,24 +36896,6 @@
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true
     },
-    "require-uncached": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-      "dev": true,
-      "requires": {
-        "caller-path": "^0.1.0",
-        "resolve-from": "^1.0.0"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-          "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-          "dev": true
-        }
-      }
-    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -37289,21 +37018,6 @@
       "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
       "dev": true
     },
-    "rx-lite": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
-    },
-    "rx-lite-aggregates": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
-      "dev": true,
-      "requires": {
-        "rx-lite": "*"
-      }
-    },
     "rxjs": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
@@ -38318,12 +38032,6 @@
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
-    },
     "suffix": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
@@ -40049,21 +39757,21 @@
       "dev": true
     },
     "write": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
       "dev": true,
       "requires": {
         "mkdirp": "^0.5.1"
       },
       "dependencies": {
         "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.5"
+            "minimist": "^1.2.6"
           }
         }
       }
diff --git a/package.json b/package.json
index b92dbf92faf..df8afe9e723 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "gulp-clean": "^0.3.2",
     "gulp-concat": "^2.6.0",
     "gulp-connect": "^5.7.0",
-    "gulp-eslint": "^4.0.0",
+    "gulp-eslint": "^6.0.0",
     "gulp-if": "^3.0.0",
     "gulp-js-escape": "^1.0.1",
     "gulp-replace": "^1.0.0",

From a47403a6a0fe94637e6def0cd4ad1e7cd93dcb58 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Fri, 9 Sep 2022 10:15:07 -0600
Subject: [PATCH 242/569] Adriver ID system: fix spurious test failure (#8978)

Fix Adriver ID system test failures (https://app.circleci.com/pipelines/github/prebid/Prebid.js/13137/workflows/5e686ed9-e57e-47b3-9c4e-8beea10be321/jobs/24200).
This was already done in #8489, but #8768 undid it.
---
 test/spec/modules/adriverIdSystem_spec.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/spec/modules/adriverIdSystem_spec.js b/test/spec/modules/adriverIdSystem_spec.js
index bc7d3f191d2..abc831b67f0 100644
--- a/test/spec/modules/adriverIdSystem_spec.js
+++ b/test/spec/modules/adriverIdSystem_spec.js
@@ -66,12 +66,16 @@ describe('AdriverIdSystem', function () {
         let request = server.requests[0];
         request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ adrcid: response.adrcid }));
 
-        let now = new Date();
-        now.setTime(now.getTime() + 86400 * 1825 * 1000);
+        let expectedExpiration = new Date();
+        expectedExpiration.setTime(expectedExpiration.getTime() + 86400 * 1825 * 1000);
         const minimalDate = new Date(0).toString();
 
+        function dateStringFor(date, maxDeltaMs = 2000) {
+          return sinon.match((val) => Math.abs(date.getTime() - new Date(val).getTime()) <= maxDeltaMs)
+        }
+
         if (response.adrcid) {
-          expect(setCookieStub.calledWith('adrcid', response.adrcid, now.toUTCString())).to.be.true;
+          expect(setCookieStub.calledWith('adrcid', response.adrcid, dateStringFor(expectedExpiration))).to.be.true;
           expect(setLocalStorageStub.calledWith('adrcid', response.adrcid)).to.be.true;
         } else {
           expect(setCookieStub.calledWith('adrcid', '', minimalDate)).to.be.false;

From d55f9bdf094a5f8f1802b7ffbc3279410de8bd73 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Fri, 9 Sep 2022 10:28:17 -0600
Subject: [PATCH 243/569] Prebid core: fix bug with native adUnits generating
 invalid PBS requests (#8977)

---
 src/constants.json       |  2 ++
 src/native.js            |  7 +++++--
 test/spec/native_spec.js | 11 +++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/constants.json b/src/constants.json
index 6557b705e37..ad57fb45c4f 100644
--- a/src/constants.json
+++ b/src/constants.json
@@ -152,6 +152,8 @@
     "MAIN": 3
   },
   "NATIVE_KEYS_THAT_ARE_NOT_ASSETS": [
+    "privacyLink",
+    "clickUrl",
     "sendTargetingKeys",
     "adTemplate",
     "rendererUrl",
diff --git a/src/native.js b/src/native.js
index 2fdacfb4b08..de77b10f7e6 100644
--- a/src/native.js
+++ b/src/native.js
@@ -80,7 +80,7 @@ const SUPPORTED_TYPES = {
   image: IMAGE
 };
 
-const { NATIVE_ASSET_TYPES, NATIVE_IMAGE_TYPES, PREBID_NATIVE_DATA_KEYS_TO_ORTB, NATIVE_KEYS_THAT_ARE_NOT_ASSETS } = CONSTANTS;
+const { NATIVE_ASSET_TYPES, NATIVE_IMAGE_TYPES, PREBID_NATIVE_DATA_KEYS_TO_ORTB, NATIVE_KEYS_THAT_ARE_NOT_ASSETS, NATIVE_KEYS } = CONSTANTS;
 
 // inverse native maps useful for converting to legacy
 const PREBID_NATIVE_DATA_KEYS_TO_ORTB_INVERSE = inverse(PREBID_NATIVE_DATA_KEYS_TO_ORTB);
@@ -488,6 +488,10 @@ export function toOrtbNativeRequest(legacyNativeAssets) {
   for (let key in legacyNativeAssets) {
     // skip conversion for non-asset keys
     if (NATIVE_KEYS_THAT_ARE_NOT_ASSETS.includes(key)) continue;
+    if (!NATIVE_KEYS.hasOwnProperty(key)) {
+      logError(`Unrecognized native asset code: ${key}. Asset will be ignored.`);
+      continue;
+    }
 
     const asset = legacyNativeAssets[key];
     let required = 0;
@@ -560,7 +564,6 @@ export function toOrtbNativeRequest(legacyNativeAssets) {
       // in `ext` case, required field is not needed
       delete ortbAsset.required;
     }
-
     ortb.assets.push(ortbAsset);
   }
   return ortb;
diff --git a/test/spec/native_spec.js b/test/spec/native_spec.js
index 4809f3f8e48..72eee1be85d 100644
--- a/test/spec/native_spec.js
+++ b/test/spec/native_spec.js
@@ -877,6 +877,17 @@ describe('validate native', function () {
     });
   });
 
+  ['bogusKey', 'clickUrl', 'privacyLink'].forEach(nativeKey => {
+    it(`should not generate an empty asset for key ${nativeKey}`, () => {
+      const ortbReq = toOrtbNativeRequest({
+        [nativeKey]: {
+          required: true
+        }
+      });
+      expect(ortbReq.assets.length).to.equal(0);
+    });
+  })
+
   it('should convert from ortb to old-style native request', () => {
     const openRTBRequest = {
       'ver': '1.2',

From d63b81f42c9eff0d16482805d75232a6ad10b6f9 Mon Sep 17 00:00:00 2001
From: Michele Nasti <musikele@users.noreply.github.com>
Date: Fri, 9 Sep 2022 18:29:38 +0200
Subject: [PATCH 244/569] write a warning for viewability (#8945)

Co-authored-by: Michele Nasti <michele@rtk.io>
---
 modules/viewability.js                | 172 +---------------
 modules/viewability.md                |  87 --------
 test/spec/modules/viewability_spec.js | 280 --------------------------
 3 files changed, 2 insertions(+), 537 deletions(-)
 delete mode 100644 modules/viewability.md
 delete mode 100644 test/spec/modules/viewability_spec.js

diff --git a/modules/viewability.js b/modules/viewability.js
index 3e77994c4de..8da2d00f9ef 100644
--- a/modules/viewability.js
+++ b/modules/viewability.js
@@ -1,177 +1,9 @@
-import {insertHtmlIntoIframe, isFn, isStr, logInfo, logWarn, triggerPixel} from '../src/utils.js';
-import {getGlobal} from '../src/prebidGlobal.js';
-import {find} from '../src/polyfill.js';
+import {logWarn} from '../src/utils.js';
 
 export const MODULE_NAME = 'viewability';
 
 export function init() {
-  (getGlobal()).viewability = {
-    startMeasurement: startMeasurement,
-    stopMeasurement: stopMeasurement,
-  };
-
-  listenMessagesFromCreative();
-}
-
-const observers = new Map();
-
-function isValid(vid, element, tracker, criteria) {
-  if (!element) {
-    logWarn(`${MODULE_NAME}: no html element provided`);
-    return false;
-  }
-
-  let validTracker = tracker &&
-    ((tracker.method === 'img' && isStr(tracker.value)) ||
-    (tracker.method === 'js' && isStr(tracker.value)) ||
-    (tracker.method === 'callback' && isFn(tracker.value)));
-
-  if (!validTracker) {
-    logWarn(`${MODULE_NAME}: invalid tracker`, tracker);
-    return false;
-  }
-
-  if (!criteria || !criteria.inViewThreshold || !criteria.timeInView) {
-    logWarn(`${MODULE_NAME}: missing criteria`, criteria);
-    return false;
-  }
-
-  if (!vid || observers.has(vid)) {
-    logWarn(`${MODULE_NAME}: must provide an unregistered vid`, vid);
-    return false;
-  }
-
-  return true;
-}
-
-function stopObserving(observer, vid, element) {
-  observer.unobserve(element);
-  observers.get(vid).done = true;
-}
-
-function fireViewabilityTracker(element, tracker) {
-  switch (tracker.method) {
-    case 'img':
-      triggerPixel(tracker.value, () => {
-        logInfo(`${MODULE_NAME}: viewability pixel fired`, tracker.value);
-      });
-      break;
-    case 'js':
-      insertHtmlIntoIframe(`<script src="${tracker.value}"></script>`);
-      break;
-    case 'callback':
-      tracker.value(element);
-      break;
-  }
-}
-
-function viewabilityCriteriaMet(observer, vid, element, tracker) {
-  stopObserving(observer, vid, element);
-  fireViewabilityTracker(element, tracker);
-}
-
-/**
- * Start measuring viewability of an element
- * @typedef {{ method: string='img','js','callback', value: string|function }} ViewabilityTracker { method: 'img', value: 'http://my.tracker/123' }
- * @typedef {{ inViewThreshold: number, timeInView: number }} ViewabilityCriteria { inViewThreshold: 0.5, timeInView: 1000 }
- * @param {string} vid unique viewability identifier
- * @param {HTMLElement} element
- * @param {ViewabilityTracker} tracker
- * @param {ViewabilityCriteria} criteria
- */
-export function startMeasurement(vid, element, tracker, criteria) {
-  if (!isValid(vid, element, tracker, criteria)) {
-    return;
-  }
-
-  const options = {
-    root: null,
-    rootMargin: '0px',
-    threshold: criteria.inViewThreshold,
-  };
-
-  let observer;
-  let viewable = false;
-  let stateChange = (entries) => {
-    viewable = entries[0].isIntersecting;
-
-    if (viewable) {
-      observers.get(vid).timeoutId = window.setTimeout(() => {
-        viewabilityCriteriaMet(observer, vid, element, tracker);
-      }, criteria.timeInView);
-    } else if (observers.get(vid).timeoutId) {
-      window.clearTimeout(observers.get(vid).timeoutId);
-    }
-  };
-
-  observer = new IntersectionObserver(stateChange, options);
-  observers.set(vid, {
-    observer: observer,
-    element: element,
-    timeoutId: null,
-    done: false,
-  });
-
-  observer.observe(element);
-
-  logInfo(`${MODULE_NAME}: startMeasurement called with:`, arguments);
-}
-
-/**
- * Stop measuring viewability of an element
- * @param {string} vid unique viewability identifier
- */
-export function stopMeasurement(vid) {
-  if (!vid || !observers.has(vid)) {
-    logWarn(`${MODULE_NAME}: must provide a registered vid`, vid);
-    return;
-  }
-
-  observers.get(vid).observer.unobserve(observers.get(vid).element);
-  if (observers.get(vid).timeoutId) {
-    window.clearTimeout(observers.get(vid).timeoutId);
-  }
-
-  // allow the observer under this vid to be created again
-  if (!observers.get(vid).done) {
-    observers.delete(vid);
-  }
-}
-
-function listenMessagesFromCreative() {
-  window.addEventListener('message', receiveMessage, false);
-}
-
-/**
- * Recieve messages from creatives
- * @param {MessageEvent} evt
- */
-export function receiveMessage(evt) {
-  var key = evt.message ? 'message' : 'data';
-  var data = {};
-  try {
-    data = JSON.parse(evt[key]);
-  } catch (e) {
-    return;
-  }
-
-  if (!data || data.message !== 'Prebid Viewability') {
-    return;
-  }
-
-  switch (data.action) {
-    case 'startMeasurement':
-      let element = data.elementId && document.getElementById(data.elementId);
-      if (!element) {
-        element = find(document.getElementsByTagName('IFRAME'), iframe => (iframe.contentWindow || iframe.contentDocument.defaultView) == evt.source);
-      }
-
-      startMeasurement(data.vid, element, data.tracker, data.criteria);
-      break;
-    case 'stopMeasurement':
-      stopMeasurement(data.vid);
-      break;
-  }
+  logWarn('Viewability module should not be used. See https://github.com/prebid/Prebid.js/issues/8928');
 }
 
 init();
diff --git a/modules/viewability.md b/modules/viewability.md
deleted file mode 100644
index df93b5c40db..00000000000
--- a/modules/viewability.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Overview
-
-Module Name: Viewability
-
-Purpose: Track when a given HTML element becomes viewable
-
-Maintainer: atrajkovic@magnite.com
-
-# Configuration
-
-Module does not need any configuration, as long as you include it in your PBJS bundle.
-Viewability module has only two functions `startMeasurement` and `stopMeasurement` which can be used to enable more complex viewability measurements. Since it allows tracking from within creative (possibly inside a safe frame) this module registers a message listener, for messages with a format that is described bellow.
-
-## `startMeasurement`
-
-| startMeasurement Arg Object | Scope | Type | Description | Example |
-| --------------------- | -------- | ------------ | -------------------------------------------------------------------------------- | --------- |
-| vid | Required | String | Unique viewability identifier, used to reference particular observer | `"ae0f9"` |
-| element | Required | HTMLElement |  Reference to an HTML element that needs to be tracked | `document.getElementById('test_div')` |
-| tracker | Required | ViewabilityTracker | How viewaility event is communicated back to the parties of interest | `{ method: 'img', value: 'http://my.tracker/123' }` |
-| criteria | Required | ViewabilityCriteria| Defines custom viewability criteria using the threshold and duration provided  | `{ inViewThreshold: 0.5, timeInView: 1000 }` |
-
-| ViewabilityTracker | Scope | Type | Description | Example |
-| --------------------- | -------- | ------------ | -------------------------------------------------------------------------------- | --------- |
-| method | Required | String | Type of method for Tracker | `'img' OR 'js' OR 'callback'` |
-| value | Required | String | URL string for 'img' and 'js' Trackers, or a function for 'callback' Tracker | `'http://my.tracker/123'` |
-
-| ViewabilityCriteria | Scope | Type | Description | Example |
-| --------------------- | -------- | ------------ | -------------------------------------------------------------------------------- | --------- |
-| inViewThreshold | Required | Number | Represents a percentage threshold for the Element to be registered as in view | `0.5` |
-| timeInView | Required | Number | Number of milliseconds that a given element needs to be in view continuously, above the threshold | `1000` |
-
-## Please Note:
-- `vid` allows for multiple trackers, with different criteria to be registered for a given HTML element, independently. It's not autogenerated by `startMeasurement()`, it needs to be provided by the caller so that it doesn't have to be posted back to the source iframe (in case viewability is started from within the creative).
-- In case of 'callback' method, HTML element is being passed back to the callback function.
-- When a tracker needs to be started, without direct access to pbjs, postMessage mechanism can be used to invoke `startMeasurement`, with a following payload: `vid`, `tracker` and `criteria` as described above, but also with `message: 'Prebid Viewability'` and `action: 'startMeasurement'`. Optionally payload can provide `elementId`, if available at that time (for ad servers where name of the iframe is known, or adservers that render outside an iframe). If `elementId` is not provided, viewability module will try to find the iframe that corresponds to the message source. 
-
-
-## `stopMeasurement`
-
-| stopMeasurement Arg Object | Scope | Type | Description | Example |
-| --------------------- | -------- | ------------ | -------------------------------------------------------------------------------- | --------- |
-| vid | Required | String | Unique viewability identifier, referencing an already started viewability tracker. | `"ae0f9"` |
-
-## Please Note:
-- When a tracker needs to be stopped, without direct access to pbjs, postMessage mechanism can be used here as well. To invoke `stopMeasurement`, you provide the payload with `vid`, `message: 'Prebid Viewability'` and `action: 'stopMeasurement`. Check the example bellow.
-
-# Examples
-
-## Example of starting a viewability measurement, when you have direct access to pbjs
-```
-pbjs.viewability.startMeasurement(
-    'ae0f9', 
-    document.getElementById('test_div'),
-    { method: 'img', value: 'http://my.tracker/123' },
-    { inViewThreshold: 0.5, timeInView: 1000 }
-);
-```
-
-## Example of starting a viewability measurement from within a rendered creative
-```
-let viewabilityRecord = {
-    vid: 'ae0f9',
-    tracker: { method: 'img', value: 'http://my.tracker/123'},
-    criteria: { inViewThreshold: 0.5, timeInView: 1000 },
-    message: 'Prebid Viewability',
-    action: 'startMeasurement'
-}
-
-window.parent.postMessage(JSON.stringify(viewabilityRecord), '*');
-```
-
-## Example of stopping the viewability measurement, when you have direct access to pbjs
-```
-pbjs.viewability.stopMeasurement('ae0f9');
-```
-
-## Example of stopping the viewability measurement from within a rendered creative
-```
-let viewabilityRecord = {
-    vid: 'ae0f9',
-    message: 'Prebid Viewability',
-    action: 'stopMeasurement'
-}
-
-window.parent.postMessage(JSON.stringify(viewabilityRecord), '*');
-```
diff --git a/test/spec/modules/viewability_spec.js b/test/spec/modules/viewability_spec.js
deleted file mode 100644
index ab2753daf53..00000000000
--- a/test/spec/modules/viewability_spec.js
+++ /dev/null
@@ -1,280 +0,0 @@
-import { expect } from 'chai';
-import * as sinon from 'sinon';
-import * as utils from 'src/utils.js';
-import * as viewability from 'modules/viewability.js';
-
-describe('viewability test', () => {
-  describe('start measurement', () => {
-    let sandbox;
-    let intersectionObserverStub;
-    let setTimeoutStub;
-    let observeCalled;
-    let unobserveCalled;
-    let ti = 1;
-    beforeEach(() => {
-      observeCalled = false;
-      unobserveCalled = false;
-      sandbox = sinon.sandbox.create();
-
-      let fakeIntersectionObserver = (stateChange, options) => {
-        return {
-          observe: (element) => {
-            observeCalled = true;
-            stateChange([{ isIntersecting: true }]);
-          },
-          unobserve: (element) => {
-            unobserveCalled = true;
-          },
-        };
-      };
-
-      intersectionObserverStub = sandbox.stub(window, 'IntersectionObserver').callsFake(fakeIntersectionObserver);
-      setTimeoutStub = sandbox.stub(window, 'setTimeout').callsFake((callback, timeout) => {
-        callback();
-        return ti++;
-      });
-    });
-
-    afterEach(() => {
-      sandbox.restore();
-    });
-
-    it('should trigger appropriate callbacks', () => {
-      viewability.startMeasurement('0', {}, { method: 'img', value: 'http://my.tracker/123' }, { inViewThreshold: 0.5, timeInView: 1000 });
-
-      sinon.assert.called(intersectionObserverStub);
-      sinon.assert.called(setTimeoutStub);
-      expect(observeCalled).to.equal(true);
-      expect(unobserveCalled).to.equal(true);
-    });
-
-    it('should trigger img tracker', () => {
-      let triggerPixelSpy = sandbox.spy(utils, ['triggerPixel']);
-      viewability.startMeasurement('1', {}, { method: 'img', value: 'http://my.tracker/123' }, { inViewThreshold: 0.5, timeInView: 1000 });
-      expect(triggerPixelSpy.callCount).to.equal(1);
-    });
-
-    it('should trigger js tracker', () => {
-      let insertHtmlIntoIframeSpy = sandbox.spy(utils, ['insertHtmlIntoIframe']);
-      viewability.startMeasurement('2', {}, { method: 'js', value: 'http://my.tracker/123.js' }, { inViewThreshold: 0.5, timeInView: 1000 });
-      expect(insertHtmlIntoIframeSpy.callCount).to.equal(1);
-    });
-
-    it('should trigger callback tracker', () => {
-      let callbackFired = false;
-      viewability.startMeasurement('3', {}, { method: 'callback', value: () => { callbackFired = true; } }, { inViewThreshold: 0.5, timeInView: 1000 });
-      expect(callbackFired).to.equal(true);
-    });
-
-    it('should check for vid uniqueness', () => {
-      let logWarnSpy = sandbox.spy(utils, 'logWarn');
-      viewability.startMeasurement('4', {}, { method: 'js', value: 'http://my.tracker/123.js' }, { inViewThreshold: 0.5, timeInView: 1000 });
-      expect(logWarnSpy.callCount).to.equal(0);
-
-      viewability.startMeasurement('4', {}, { method: 'js', value: 'http://my.tracker/123.js' }, { inViewThreshold: 0.5, timeInView: 1000 });
-      expect(logWarnSpy.callCount).to.equal(1);
-      expect(logWarnSpy.calledWith(`${viewability.MODULE_NAME}: must provide an unregistered vid`, '4')).to.equal(true);
-    });
-
-    it('should check for valid criteria', () => {
-      let logWarnSpy = sandbox.spy(utils, 'logWarn');
-      viewability.startMeasurement('5', {}, { method: 'js', value: 'http://my.tracker/123.js' }, { timeInView: 1000 });
-      expect(logWarnSpy.callCount).to.equal(1);
-      expect(logWarnSpy.calledWith(`${viewability.MODULE_NAME}: missing criteria`, { timeInView: 1000 })).to.equal(true);
-    });
-
-    it('should check for valid tracker', () => {
-      let logWarnSpy = sandbox.spy(utils, 'logWarn');
-      viewability.startMeasurement('6', {}, { method: 'callback', value: 'string' }, { inViewThreshold: 0.5, timeInView: 1000 });
-      expect(logWarnSpy.callCount).to.equal(1);
-      expect(logWarnSpy.calledWith(`${viewability.MODULE_NAME}: invalid tracker`, { method: 'callback', value: 'string' })).to.equal(true);
-    });
-
-    it('should check if element provided', () => {
-      let logWarnSpy = sandbox.spy(utils, 'logWarn');
-      viewability.startMeasurement('7', undefined, { method: 'js', value: 'http://my.tracker/123.js' }, { timeInView: 1000 });
-      expect(logWarnSpy.callCount).to.equal(1);
-      expect(logWarnSpy.calledWith(`${viewability.MODULE_NAME}: no html element provided`)).to.equal(true);
-    });
-  });
-
-  describe('stop measurement', () => {
-    let sandbox;
-    let intersectionObserverStub;
-    let setTimeoutStub;
-    let clearTimeoutStub;
-    let observeCalled;
-    let unobserveCalled;
-    let stateChangeBackup;
-    let ti = 1;
-    beforeEach(() => {
-      observeCalled = false;
-      unobserveCalled = false;
-      sandbox = sinon.sandbox.create();
-
-      let fakeIntersectionObserver = (stateChange, options) => {
-        return {
-          observe: (element) => {
-            stateChangeBackup = stateChange;
-            observeCalled = true;
-            stateChange([{ isIntersecting: true }]);
-          },
-          unobserve: (element) => {
-            unobserveCalled = true;
-          },
-        };
-      };
-
-      intersectionObserverStub = sandbox.stub(window, 'IntersectionObserver').callsFake(fakeIntersectionObserver);
-      setTimeoutStub = sandbox.stub(window, 'setTimeout').callsFake((callback, timeout) => {
-        // skipping the callback
-        return ti++;
-      });
-      clearTimeoutStub = sandbox.stub(window, 'clearTimeout').callsFake((timeoutId) => { });
-    });
-
-    afterEach(() => {
-      sandbox.restore();
-    });
-
-    it('should clear the timeout', () => {
-      viewability.startMeasurement('10', {}, { method: 'img', value: 'http://my.tracker/123' }, { inViewThreshold: 0.5, timeInView: 1000 });
-      stateChangeBackup([{ isIntersecting: false }]);
-      sinon.assert.called(intersectionObserverStub);
-      sinon.assert.called(setTimeoutStub);
-      sinon.assert.called(clearTimeoutStub);
-      expect(observeCalled).to.equal(true);
-    });
-
-    it('should unobserve', () => {
-      viewability.startMeasurement('11', {}, { method: 'img', value: 'http://my.tracker/123' }, { inViewThreshold: 0.5, timeInView: 1000 });
-      sinon.assert.called(intersectionObserverStub);
-      sinon.assert.called(setTimeoutStub);
-      expect(observeCalled).to.equal(true);
-      expect(unobserveCalled).to.equal(false);
-
-      viewability.stopMeasurement('11');
-      expect(unobserveCalled).to.equal(true);
-      sinon.assert.called(clearTimeoutStub);
-    });
-
-    it('should check for vid existence', () => {
-      let logWarnSpy = sandbox.spy(utils, 'logWarn');
-      viewability.stopMeasurement('100');
-      expect(logWarnSpy.callCount).to.equal(1);
-      expect(logWarnSpy.calledWith(`${viewability.MODULE_NAME}: must provide a registered vid`, '100')).to.equal(true);
-    });
-  });
-
-  describe('handle creative messages', () => {
-    let sandbox;
-    let intersectionObserverStub;
-    let setTimeoutStub;
-    let observeCalled;
-    let unobserveCalled;
-    let ti = 1;
-    let getElementsByTagStub;
-    let getElementByIdStub;
-
-    let fakeContentWindow = {};
-    beforeEach(() => {
-      observeCalled = false;
-      unobserveCalled = false;
-      sandbox = sinon.sandbox.create();
-
-      let fakeIntersectionObserver = (stateChange, options) => {
-        return {
-          observe: (element) => {
-            observeCalled = true;
-            stateChange([{ isIntersecting: true }]);
-          },
-          unobserve: (element) => {
-            unobserveCalled = true;
-          },
-        };
-      };
-
-      intersectionObserverStub = sandbox.stub(window, 'IntersectionObserver').callsFake(fakeIntersectionObserver);
-      setTimeoutStub = sandbox.stub(window, 'setTimeout').callsFake((callback, timeout) => {
-        callback();
-        return ti++;
-      });
-
-      getElementsByTagStub = sandbox.stub(document, 'getElementsByTagName').callsFake((tagName) => {
-        return [{
-          contentWindow: fakeContentWindow,
-        }];
-      });
-      getElementByIdStub = sandbox.stub(document, 'getElementById').callsFake((id) => {
-        return {};
-      });
-    });
-
-    afterEach(() => {
-      sandbox.restore();
-    });
-
-    it('should find element by contentWindow', () => {
-      let viewabilityRecord = {
-        vid: 1000,
-        tracker: {
-          value: 'http://my.tracker/123',
-          method: 'img',
-        },
-        criteria: { inViewThreshold: 0.5, timeInView: 1000 },
-        message: 'Prebid Viewability',
-        action: 'startMeasurement',
-      };
-      let data = JSON.stringify(viewabilityRecord);
-
-      viewability.receiveMessage({
-        data: data,
-        source: fakeContentWindow,
-      });
-
-      sinon.assert.called(getElementsByTagStub);
-      sinon.assert.called(intersectionObserverStub);
-      sinon.assert.called(setTimeoutStub);
-      expect(observeCalled).to.equal(true);
-      expect(unobserveCalled).to.equal(true);
-    });
-
-    it('should find element by id', () => {
-      let viewabilityRecord = {
-        vid: 1001,
-        tracker: {
-          value: 'http://my.tracker/123',
-          method: 'img',
-        },
-        criteria: { inViewThreshold: 0.5, timeInView: 1000 },
-        message: 'Prebid Viewability',
-        action: 'startMeasurement',
-        elementId: '1',
-      };
-      let data = JSON.stringify(viewabilityRecord);
-      viewability.receiveMessage({
-        data: data,
-      });
-
-      sinon.assert.called(getElementByIdStub);
-      sinon.assert.called(intersectionObserverStub);
-      sinon.assert.called(setTimeoutStub);
-      expect(observeCalled).to.equal(true);
-      expect(unobserveCalled).to.equal(true);
-    });
-
-    it('should stop measurement', () => {
-      let viewabilityRecord = {
-        vid: 1001,
-        message: 'Prebid Viewability',
-        action: 'stopMeasurement',
-      };
-      let data = JSON.stringify(viewabilityRecord);
-      viewability.receiveMessage({
-        data: data,
-      });
-
-      expect(unobserveCalled).to.equal(true);
-    });
-  });
-});

From d96c738c4dc7dfdcaf0bc4ad798f8e12bd10ed1e Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Fri, 9 Sep 2022 16:39:33 +0000
Subject: [PATCH 245/569] Prebid 7.15.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 892cfe7c486..45b5147a7bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.15.0-pre",
+  "version": "7.15.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index df8afe9e723..d59c5f2d223 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.15.0-pre",
+  "version": "7.15.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 12c35495ef2d1fc842338f3b041eb252e7cc2b52 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Fri, 9 Sep 2022 16:39:33 +0000
Subject: [PATCH 246/569] Increment version to 7.16.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 45b5147a7bf..1665b80db6e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.15.0",
+  "version": "7.16.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index d59c5f2d223..f91ad0bab9e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.15.0",
+  "version": "7.16.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 8f42557d0e495be430bb34f612f47c226af4c3e2 Mon Sep 17 00:00:00 2001
From: CPMStar <josh@cpmstar.com>
Date: Sat, 10 Sep 2022 05:11:46 -0700
Subject: [PATCH 247/569] CPMStar Bid Adapter: Updated buildRequests method to
 use new referer (#8982)

* added cpmstarBidAdapter with meta.advertiserDomains support

* fix linting

* Updated modules/cpmstarBidAdapter: Changed request method to post and included the mediaType.video and adUnitCode data to the request body.

* added cpmstarBidAdapter with meta.advertiserDomains support

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
Co-authored-by: = <=>
---
 modules/cpmstarBidAdapter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/cpmstarBidAdapter.js b/modules/cpmstarBidAdapter.js
index 64fe85fdbbc..9e237ef2558 100755
--- a/modules/cpmstarBidAdapter.js
+++ b/modules/cpmstarBidAdapter.js
@@ -47,7 +47,8 @@ export const spec = {
 
     for (var i = 0; i < validBidRequests.length; i++) {
       var bidRequest = validBidRequests[i];
-      var referer = encodeURIComponent(bidderRequest.refererInfo.referer);
+      var referer = bidderRequest.refererInfo.page ? bidderRequest.refererInfo.page : bidderRequest.refererInfo.domain;
+      referer = encodeURIComponent(referer);
       var e = utils.getBidIdParameter('endpoint', bidRequest.params);
       var ENDPOINT = e == 'dev' ? ENDPOINT_DEV : e == 'staging' ? ENDPOINT_STAGING : ENDPOINT_PRODUCTION;
       var mediaType = spec.getMediaType(bidRequest);

From ceb96ab16ac3c90a5e1f67cb8beecb12a471e974 Mon Sep 17 00:00:00 2001
From: Andrew Slagle <42588549+spotxslagle@users.noreply.github.com>
Date: Sat, 10 Sep 2022 06:12:58 -0600
Subject: [PATCH 248/569] Pass isRendererRequired check (#8979)

---
 modules/spotxBidAdapter.js                | 1 +
 test/spec/modules/spotxBidAdapter_spec.js | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/modules/spotxBidAdapter.js b/modules/spotxBidAdapter.js
index 31009370d0d..5059341baaa 100644
--- a/modules/spotxBidAdapter.js
+++ b/modules/spotxBidAdapter.js
@@ -365,6 +365,7 @@ export const spec = {
             const renderer = Renderer.install({
               id: 0,
               renderNow: true,
+              url: '/',
               config: {
                 adText: 'SpotX Outstream Video Ad via Prebid.js',
                 player_width: playersize[0][0],
diff --git a/test/spec/modules/spotxBidAdapter_spec.js b/test/spec/modules/spotxBidAdapter_spec.js
index 90bd931d8ce..ec99d0f7142 100644
--- a/test/spec/modules/spotxBidAdapter_spec.js
+++ b/test/spec/modules/spotxBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {expect} from 'chai';
 import {config} from 'src/config.js';
 import {loadExternalScript} from '../../../src/adloader';
+import {isRendererRequired} from '../../../src/Renderer';
 import {spec, GOOGLE_CONSENT} from 'modules/spotxBidAdapter.js';
 
 describe('the spotx adapter', function () {
@@ -568,6 +569,11 @@ describe('the spotx adapter', function () {
       renderer.render();
       expect(hasRun).to.equal(true);
     });
+
+    it('should include the url property on the renderer for Prebid Core checks', function () {
+      var renderer = spec.interpretResponse(serverResponse, bidderRequestObj)[0].renderer;
+      expect(isRendererRequired(renderer)).to.be.true;
+    });
   });
 
   describe('outstreamRender', function() {

From cac090277da07226b14feda599d272bcd302f81b Mon Sep 17 00:00:00 2001
From: Wiem Zine El Abidine <wiemzin@gmail.com>
Date: Mon, 12 Sep 2022 10:16:11 +0200
Subject: [PATCH 249/569] LiveIntent Analytics Adapter: initial release (#8960)

* CM-552 Liveintent Analytics Adapter (#4)

* start work

* send analytics event

* Add first test and get winning bids from auctionManager

* Add event test data and fix bugs

* Remove duplicate userIds

* add bidWonTimeout in configOptions

* add sampling and adjust test

* Add server test

* Compare expected request body in the test

* refactoring

* update description

* remove comment

* comments

* make sure we map defined data

* refactoring

* some refactoring

* comments

Co-authored-by: wiem <welabidine@liveintent.com>

* fix typo

* Use getRefererInfo to get url and ?? operator for default values

Co-authored-by: Leonel Cuevas Valeriano <leonel.cvs@gmail.com>
Co-authored-by: leonelcuevas <lcuevas@liveintent.com>
---
 modules/liveIntentAnalyticsAdapter.js         | 148 +++++++++
 modules/liveIntentAnalyticsAdapter.md         |  22 ++
 .../liveIntentAnalyticsAdapter_spec.js        | 297 ++++++++++++++++++
 3 files changed, 467 insertions(+)
 create mode 100644 modules/liveIntentAnalyticsAdapter.js
 create mode 100644 modules/liveIntentAnalyticsAdapter.md
 create mode 100644 test/spec/modules/liveIntentAnalyticsAdapter_spec.js

diff --git a/modules/liveIntentAnalyticsAdapter.js b/modules/liveIntentAnalyticsAdapter.js
new file mode 100644
index 00000000000..ffe4f8f58b0
--- /dev/null
+++ b/modules/liveIntentAnalyticsAdapter.js
@@ -0,0 +1,148 @@
+import {ajax} from '../src/ajax.js';
+import { generateUUID, logInfo, logWarn } from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import CONSTANTS from '../src/constants.json';
+import adapterManager from '../src/adapterManager.js';
+import { auctionManager } from '../src/auctionManager.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+
+const ANALYTICS_TYPE = 'endpoint';
+const URL = 'https://wba.liadm.com/analytic-events';
+const GVL_ID = 148;
+const ADAPTER_CODE = 'liveintent';
+const DEFAULT_SAMPLING = 0.1;
+const DEFAULT_BID_WON_TIMEOUT = 2000;
+const { EVENTS: { AUCTION_END } } = CONSTANTS;
+let initOptions = {};
+let isSampled;
+let bidWonTimeout;
+
+function handleAuctionEnd(args) {
+  setTimeout(() => {
+    const auction = auctionManager.index.getAuction(args.auctionId);
+    const winningBids = (auction) ? auction.getWinningBids() : [];
+    const data = createAnalyticsEvent(args, winningBids);
+    sendAnalyticsEvent(data);
+  }, bidWonTimeout);
+}
+
+function getAnalyticsEventBids(bidsReceived) {
+  return bidsReceived.map(bid => {
+    return {
+      adUnitCode: bid.adUnitCode,
+      timeToRespond: bid.timeToRespond,
+      cpm: bid.cpm,
+      currency: bid.currency,
+      ttl: bid.ttl,
+      bidder: bid.bidder
+    };
+  });
+}
+
+function getBannerSizes(banner) {
+  if (banner && banner.sizes) {
+    return banner.sizes.map(size => {
+      const [width, height] = size;
+      return {w: width, h: height};
+    });
+  } else return [];
+}
+
+function getUniqueBy(arr, key) {
+  return [...new Map(arr.map(item => [item[key], item])).values()]
+}
+
+function createAnalyticsEvent(args, winningBids) {
+  let payload = {
+    instanceId: generateUUID(),
+    url: getRefererInfo().page,
+    bidsReceived: getAnalyticsEventBids(args.bidsReceived),
+    auctionStart: args.timestamp,
+    auctionEnd: args.auctionEnd,
+    adUnits: [],
+    userIds: [],
+    bidders: []
+  }
+  let allUserIds = [];
+
+  if (args.adUnits) {
+    args.adUnits.forEach(unit => {
+      if (unit.mediaTypes && unit.mediaTypes.banner) {
+        payload['adUnits'].push({
+          code: unit.code,
+          mediaType: 'banner',
+          sizes: getBannerSizes(unit.mediaTypes.banner),
+          ortb2Imp: unit.ortb2Imp
+        });
+      }
+      if (unit.bids) {
+        let userIds = unit.bids.flatMap(getAnalyticsEventUserIds);
+        allUserIds.push(...userIds);
+        let bidders = unit.bids.map(({bidder, params}) => {
+          return { bidder, params }
+        });
+
+        payload['bidders'].push(...bidders);
+      }
+    })
+    let uniqueUserIds = getUniqueBy(allUserIds, 'source');
+    payload['userIds'] = uniqueUserIds;
+  }
+  payload['winningBids'] = getAnalyticsEventBids(winningBids);
+  payload['auctionId'] = args.auctionId;
+  return payload;
+}
+
+function getAnalyticsEventUserIds(bid) {
+  if (bid && bid.userIdAsEids) {
+    return bid.userIdAsEids.map(({source, uids, ext}) => {
+      let analyticsEventUserId = {source, uids, ext};
+      return ignoreUndefined(analyticsEventUserId)
+    });
+  } else { return []; }
+}
+
+function sendAnalyticsEvent(data) {
+  ajax(URL, {
+    success: function () {
+      logInfo('LiveIntent Prebid Analytics: send data success');
+    },
+    error: function (e) {
+      logWarn('LiveIntent Prebid Analytics: send data error' + e);
+    }
+  }, JSON.stringify(data), {
+    contentType: 'application/json',
+    method: 'POST'
+  })
+}
+
+function ignoreUndefined(data) {
+  const filteredData = Object.entries(data).filter(([key, value]) => value)
+  return Object.fromEntries(filteredData)
+}
+
+let liAnalytics = Object.assign(adapter({URL, ANALYTICS_TYPE}), {
+  track({ eventType, args }) {
+    if (eventType == AUCTION_END && args && isSampled) { handleAuctionEnd(args); }
+  }
+});
+
+// save the base class function
+liAnalytics.originEnableAnalytics = liAnalytics.enableAnalytics;
+
+// override enableAnalytics so we can get access to the config passed in from the page
+liAnalytics.enableAnalytics = function (config) {
+  initOptions = config.options;
+  const sampling = (initOptions && initOptions.sampling) ?? DEFAULT_SAMPLING;
+  isSampled = Math.random() < parseFloat(sampling);
+  bidWonTimeout = (initOptions && initOptions.bidWonTimeout) ?? DEFAULT_BID_WON_TIMEOUT;
+  liAnalytics.originEnableAnalytics(config); // call the base class function
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: liAnalytics,
+  code: ADAPTER_CODE,
+  gvlid: GVL_ID
+});
+
+export default liAnalytics;
diff --git a/modules/liveIntentAnalyticsAdapter.md b/modules/liveIntentAnalyticsAdapter.md
new file mode 100644
index 00000000000..15f51006134
--- /dev/null
+++ b/modules/liveIntentAnalyticsAdapter.md
@@ -0,0 +1,22 @@
+# Overview
+Module Name: LiveIntent Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: product@liveintent.com
+
+# Description
+
+Analytics adapter for [LiveIntent](https://www.liveintent.com/). Contact product@liveintent.com for information.
+
+# Test Parameters
+
+```
+{
+  provider: 'liveintent',
+  options: {
+     bidWonTimeout: 2000,
+     sampling: 0.5 // the tracked event percentage, a number between 0 to 1
+  }
+}
+```
diff --git a/test/spec/modules/liveIntentAnalyticsAdapter_spec.js b/test/spec/modules/liveIntentAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..b3a452e5ece
--- /dev/null
+++ b/test/spec/modules/liveIntentAnalyticsAdapter_spec.js
@@ -0,0 +1,297 @@
+import liAnalytics from 'modules/liveIntentAnalyticsAdapter';
+import { expect } from 'chai';
+import { server } from 'test/mocks/xhr.js';
+import { auctionManager } from 'src/auctionManager.js';
+
+let utils = require('src/utils');
+let refererDetection = require('src/refererDetection');
+let instanceId = '77abbc81-c1f1-41cd-8f25-f7149244c800';
+let url = 'https://www.test.com'
+let sandbox;
+let clock;
+let now = new Date();
+
+let events = require('src/events');
+let constants = require('src/constants.json');
+let auctionId = '99abbc81-c1f1-41cd-8f25-f7149244c897'
+
+const config = {
+  provider: 'liveintent',
+  options: {
+    bidWonTimeout: 2000,
+    sampling: 1
+  }
+}
+
+let args = {
+  auctionId: auctionId,
+  timestamp: 1660915379703,
+  auctionEnd: 1660915381635,
+  adUnits: [
+    {
+      code: 'ID_Bot100AdJ1',
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [
+              300,
+              250
+            ],
+            [
+              320,
+              50
+            ]
+          ]
+        }
+      },
+      ortb2Imp: {
+        gpid: '/777/test/home/ID_Bot100AdJ1',
+        ext: {
+          data: {
+            aupName: '/777/test/home/ID_Bot100AdJ1',
+            adserver: {
+              name: 'gam',
+              adslot: '/777/test/home/ID_Bot100AdJ1'
+            },
+            pbadslot: '/777/test/home/ID_Bot100AdJ1'
+          },
+          gpid: '/777/test/home/ID_Bot100AdJ1'
+        }
+      },
+      bids: [
+        {
+          bidder: 'testBidder',
+          params: {
+            siteId: 321218,
+            zoneId: 1732558,
+            position: 'bug',
+            accountId: 10777
+          },
+          userIdAsEids: [
+            {
+              source: 'source1.com',
+              uids: [
+                {
+                  id: 'ID5*yO-L9xRugTx4mkIJ9z99eYva6CZQhz8B70QOkLLSEEQWowsxvVQqMaZOt4qpBTYAFqR3y6ZtZ8qLJJBAsRqnRRalTfy8iZszQavAAkZcAjkWpxp6DnOSkF3R5LafC10OFqhwcxH699dDc_fI6RVEGBasN6zrJwgqCGelgfQLtQwWrikWRyi0l3ICFj9JUiVGFrCF8SAFaqJD9A0_I07a8xa0-jADtEj1T8w30oX--sMWvTK_I5_3zA5f3z0OMoxbFsCMFdhfGRDuw5GrpI475g',
+                  atype: 1,
+                  ext: {
+                    linkType: 2
+                  }
+                }
+              ]
+            },
+            {
+              source: 'source2.com',
+              uids: [
+                {
+                  id: 'ID5*yO-L9xRugTx4mkIJ9z99eYva6CZQhz8B70QOkLLSEEQWowsxvVQqMaZOt4qpBTYAFqR3y6ZtZ8qLJJBAsRqnRRalTfy8iZszQavAAkZcAjkWpxp6DnOSkF3R5LafC10OFqhwcxH699dDc_fI6RVEGBasN6zrJwgqCGelgfQLtQwWrikWRyi0l3ICFj9JUiVGFrCF8SAFaqJD9A0_I07a8xa0-jADtEj1T8w30oX--sMWvTK_I5_3zA5f3z0OMoxbFsCMFdhfGRDuw5GrpI475g',
+                  atype: 1,
+                  ext: {
+                    linkType: 2
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          bidder: 'testBidder2',
+          params: {
+            adSlot: '2926251',
+            publisherId: '159423'
+          },
+          userIdAsEids: [
+            {
+              source: 'source1.com',
+              uids: [
+                {
+                  id: 'ID5*yO-L9xRugTx4mkIJ9z99eYva6CZQhz8B70QOkLLSEEQWowsxvVQqMaZOt4qpBTYAFqR3y6ZtZ8qLJJBAsRqnRRalTfy8iZszQavAAkZcAjkWpxp6DnOSkF3R5LafC10OFqhwcxH699dDc_fI6RVEGBasN6zrJwgqCGelgfQLtQwWrikWRyi0l3ICFj9JUiVGFrCF8SAFaqJD9A0_I07a8xa0-jADtEj1T8w30oX--sMWvTK_I5_3zA5f3z0OMoxbFsCMFdhfGRDuw5GrpI475g',
+                  atype: 1,
+                  ext: {
+                    linkType: 2
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  bidderRequests: [
+    {
+      bidderCode: 'tripl_ss1',
+      auctionId: '8e5a5eda-a7dc-49a3-bc7f-654fc',
+      bidderRequestId: '953fe1ee8a1645',
+      uniquePbsTid: '0da1f980-8351-415d-860d-ebbdb4274179',
+      auctionStart: 1660915379703
+    },
+    {
+      bidderCode: 'tripl_ss2',
+      auctionId: '8e5a5eda-a7dc-49a3-bc7f-6ca682ae893c',
+      bidderRequestId: '953fe1ee8a164e',
+      uniquePbsTid: '0da1f980-8351-415d-860d-ebbdb4274180',
+      auctionStart: 1660915379703
+    }
+  ],
+  bidsReceived: [
+    {
+      adUnitCode: 'ID_Bot100AdJ1',
+      timeToRespond: 824,
+      cpm: 0.447,
+      currency: 'USD',
+      ttl: 300,
+      bidder: 'testBidder'
+    }
+  ],
+  winningBids: []
+}
+
+let winningBids = [
+  {
+    adUnitCode: 'ID_Bot100AdJ1',
+    timeToRespond: 824,
+    cpm: 0.447,
+    currency: 'USD',
+    ttl: 300,
+    bidder: 'testBidder'
+  }
+];
+
+let expectedEvent = {
+  instanceId: instanceId,
+  url: url,
+  bidsReceived: [
+    {
+      adUnitCode: 'ID_Bot100AdJ1',
+      timeToRespond: 824,
+      cpm: 0.447,
+      currency: 'USD',
+      ttl: 300,
+      bidder: 'testBidder'
+    }
+  ],
+  auctionStart: 1660915379703,
+  auctionEnd: 1660915381635,
+  adUnits: [
+    {
+      code: 'ID_Bot100AdJ1',
+      mediaType: 'banner',
+      sizes: [
+        {
+          w: 300,
+          h: 250
+        },
+        {
+          w: 320,
+          h: 50
+        }
+      ],
+      ortb2Imp: {
+        gpid: '/777/test/home/ID_Bot100AdJ1',
+        ext: {
+          data: {
+            aupName: '/777/test/home/ID_Bot100AdJ1',
+            adserver: {
+              name: 'gam',
+              adslot: '/777/test/home/ID_Bot100AdJ1'
+            },
+            pbadslot: '/777/test/home/ID_Bot100AdJ1'
+          },
+          gpid: '/777/test/home/ID_Bot100AdJ1'
+        }
+      }
+    }
+  ],
+  winningBids: [
+    {
+      adUnitCode: 'ID_Bot100AdJ1',
+      timeToRespond: 824,
+      cpm: 0.447,
+      currency: 'USD',
+      ttl: 300,
+      bidder: 'testBidder'
+    }
+  ],
+  auctionId: auctionId,
+  userIds: [
+    {
+      source: 'source1.com',
+      uids: [
+        {
+          id: 'ID5*yO-L9xRugTx4mkIJ9z99eYva6CZQhz8B70QOkLLSEEQWowsxvVQqMaZOt4qpBTYAFqR3y6ZtZ8qLJJBAsRqnRRalTfy8iZszQavAAkZcAjkWpxp6DnOSkF3R5LafC10OFqhwcxH699dDc_fI6RVEGBasN6zrJwgqCGelgfQLtQwWrikWRyi0l3ICFj9JUiVGFrCF8SAFaqJD9A0_I07a8xa0-jADtEj1T8w30oX--sMWvTK_I5_3zA5f3z0OMoxbFsCMFdhfGRDuw5GrpI475g',
+          atype: 1,
+          ext: {
+            linkType: 2
+          }
+        }
+      ]
+    },
+    {
+      source: 'source2.com',
+      uids: [
+        {
+          id: 'ID5*yO-L9xRugTx4mkIJ9z99eYva6CZQhz8B70QOkLLSEEQWowsxvVQqMaZOt4qpBTYAFqR3y6ZtZ8qLJJBAsRqnRRalTfy8iZszQavAAkZcAjkWpxp6DnOSkF3R5LafC10OFqhwcxH699dDc_fI6RVEGBasN6zrJwgqCGelgfQLtQwWrikWRyi0l3ICFj9JUiVGFrCF8SAFaqJD9A0_I07a8xa0-jADtEj1T8w30oX--sMWvTK_I5_3zA5f3z0OMoxbFsCMFdhfGRDuw5GrpI475g',
+          atype: 1,
+          ext: {
+            linkType: 2
+          }
+        }
+      ]
+    }
+  ],
+  bidders: [
+    {
+      bidder: 'testBidder',
+      params: {
+        siteId: 321218,
+        zoneId: 1732558,
+        position: 'bug',
+        accountId: 10777
+      }
+    },
+    {
+      bidder: 'testBidder2',
+      params: {
+        adSlot: '2926251',
+        publisherId: '159423'
+      }
+    }
+  ]
+};
+
+describe('LiveIntent Analytics Adapter ', () => {
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(events, 'getEvents').returns([]);
+    clock = sandbox.useFakeTimers(now.getTime());
+  });
+  afterEach(function () {
+    liAnalytics.disableAnalytics();
+    sandbox.restore();
+    clock.restore();
+  });
+
+  it('request is computed and sent correctly', () => {
+    liAnalytics.enableAnalytics(config);
+    sandbox.stub(utils, 'generateUUID').returns(instanceId);
+    sandbox.stub(refererDetection, 'getRefererInfo').returns({page: url});
+    sandbox.stub(auctionManager.index, 'getAuction').withArgs(auctionId).returns({ getWinningBids: () => winningBids });
+    events.emit(constants.EVENTS.AUCTION_END, args);
+    clock.tick(2000);
+    expect(server.requests.length).to.equal(1);
+
+    let requestBody = JSON.parse(server.requests[0].requestBody);
+    expect(requestBody).to.deep.equal(expectedEvent);
+  });
+
+  it('track is called', () => {
+    liAnalytics.enableAnalytics(config);
+    sandbox.stub(liAnalytics, 'track');
+    events.emit(constants.EVENTS.AUCTION_END, args);
+    events.emit(constants.EVENTS.AUCTION_END, args);
+    events.emit(constants.EVENTS.AUCTION_END, args);
+    clock.tick(6000);
+    sinon.assert.callCount(liAnalytics.track, 3)
+  })
+});

From 56941e187ae054b6927ae8aebf6ee3f07d04d14a Mon Sep 17 00:00:00 2001
From: Philip Watson <philip.watson@adscale.co.nz>
Date: Tue, 13 Sep 2022 02:37:48 +1200
Subject: [PATCH 250/569] StroeerCore Bid Adapter: add video support (#8958)

* StroeerCore Bid Adapter: add video support

* update docs and add video example
---
 modules/stroeerCoreBidAdapter.js              | 221 ++++++-----
 modules/stroeerCoreBidAdapter.md              |  66 +++-
 .../modules/stroeerCoreBidAdapter_spec.js     | 348 ++++++++++++++++--
 3 files changed, 496 insertions(+), 139 deletions(-)

diff --git a/modules/stroeerCoreBidAdapter.js b/modules/stroeerCoreBidAdapter.js
index 8e617eb24f8..722cffab16d 100644
--- a/modules/stroeerCoreBidAdapter.js
+++ b/modules/stroeerCoreBidAdapter.js
@@ -1,6 +1,6 @@
-import { getWindowSelf, getWindowTop, buildUrl, logError, isStr, isEmpty, deepAccess } from '../src/utils.js';
+import {buildUrl, deepAccess, getWindowSelf, getWindowTop, isEmpty, isStr, logWarn} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER} from '../src/mediaTypes.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
 const GVL_ID = 136;
 const BIDDER_CODE = 'stroeerCore';
@@ -10,98 +10,33 @@ const DEFAULT_PORT = '';
 const FIVE_MINUTES_IN_SECONDS = 300;
 const USER_SYNC_IFRAME_URL = 'https://js.adscale.de/pbsync.html';
 
-const isSecureWindow = () => getWindowSelf().location.protocol === 'https:';
-const isMainPageAccessible = () => getMostAccessibleTopWindow() === getWindowTop();
-
-function getMostAccessibleTopWindow() {
-  let res = getWindowSelf();
-
-  try {
-    while (getWindowTop().top !== res && res.parent.location.href.length) {
-      res = res.parent;
-    }
-  } catch (ignore) {
-  }
-
-  return res;
-}
-
-function elementInView(elementId) {
-  const resolveElement = (elId) => {
-    const win = getWindowSelf();
-
-    return win.document.getElementById(elId);
-  };
-
-  const visibleInWindow = (el, win) => {
-    const rect = el.getBoundingClientRect();
-    const inView = (rect.top + rect.height >= 0) && (rect.top <= win.innerHeight);
-
-    if (win !== win.parent) {
-      return inView && visibleInWindow(win.frameElement, win.parent);
-    }
-
-    return inView;
-  };
-
-  try {
-    return visibleInWindow(resolveElement(elementId), getWindowSelf());
-  } catch (e) {
-    // old browser, element not found, cross-origin etc.
-  }
-  return undefined;
-}
-
-function _buildUrl({host: hostname = DEFAULT_HOST, port = DEFAULT_PORT, securePort, path: pathname = DEFAULT_PATH}) {
-  if (securePort) {
-    port = securePort;
-  }
-
-  return buildUrl({protocol: 'https', hostname, port, pathname});
-}
-
-function getGdprParams(gdprConsent) {
-  if (gdprConsent) {
-    const consentString = encodeURIComponent(gdprConsent.consentString || '')
-    const isGdpr = gdprConsent.gdprApplies ? 1 : 0;
-
-    return `?gdpr=${isGdpr}&gdpr_consent=${consentString}`
-  } else {
-    return '';
-  }
-}
-
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVL_ID,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
 
   isBidRequestValid: (function () {
     const validators = [];
 
-    const createValidator = (checkFn, errorMsgFn) => {
+    const createValidator = (checkFn, msg) => {
       return (bidRequest) => {
         if (checkFn(bidRequest)) {
           return true;
         } else {
-          logError(`invalid bid: ${errorMsgFn(bidRequest)}`, 'ERROR');
+          logWarn(`${BIDDER_CODE}: Bid setup for ${bidRequest.adUnitCode} is invalid: ${msg}`);
           return false;
         }
       }
     };
 
-    function isBanner(bidReq) {
-      return (!bidReq.mediaTypes && !bidReq.mediaType) ||
-        (bidReq.mediaTypes && bidReq.mediaTypes.banner) ||
-        bidReq.mediaType === BANNER;
-    }
+    const hasValidMediaType = bidReq => hasBanner(bidReq) || hasVideo(bidReq);
 
-    validators.push(createValidator((bidReq) => isBanner(bidReq),
-      bidReq => `bid request ${bidReq.bidId} is not a banner`));
+    validators.push(createValidator((bidReq) => hasValidMediaType(bidReq),
+      'the media type is invalid'));
     validators.push(createValidator((bidReq) => typeof bidReq.params === 'object',
-      bidReq => `bid request ${bidReq.bidId} does not have custom params`));
+      'the custom params does not exist'));
     validators.push(createValidator((bidReq) => isStr(bidReq.params.sid),
-      bidReq => `bid request ${bidReq.bidId} does not have a sid string field`));
+      'the sid field must be a string'));
 
     return function (bidRequest) {
       return validators.every(f => f(bidRequest));
@@ -113,9 +48,8 @@ export const spec = {
 
     const refererInfo = bidderRequest.refererInfo;
 
-    const payload = {
+    const basePayload = {
       id: bidderRequest.auctionId,
-      bids: [],
       ref: refererInfo.ref,
       ssl: isSecureWindow(),
       mpa: isMainPageAccessible(),
@@ -127,7 +61,7 @@ export const spec = {
     const userIds = anyBid.userId;
 
     if (!isEmpty(userIds)) {
-      payload.user = {
+      basePayload.user = {
         euids: userIds
       };
     }
@@ -135,24 +69,24 @@ export const spec = {
     const gdprConsent = bidderRequest.gdprConsent;
 
     if (gdprConsent && gdprConsent.consentString != null && gdprConsent.gdprApplies != null) {
-      payload.gdpr = {
+      basePayload.gdpr = {
         consent: bidderRequest.gdprConsent.consentString, applies: bidderRequest.gdprConsent.gdprApplies
       };
     }
 
-    function bidSizes(bid) {
-      return deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes /* for prebid < 3 */ || [];
-    }
+    const bannerBids = validBidRequests
+      .filter(hasBanner)
+      .map(mapToPayloadBannerBid);
 
-    validBidRequests.forEach(bid => {
-      payload.bids.push({
-        bid: bid.bidId, sid: bid.params.sid, siz: bidSizes(bid), viz: elementInView(bid.adUnitCode)
-      });
-    });
+    const videoBids = validBidRequests
+      .filter(hasVideo)
+      .map(mapToPayloadVideoBid);
 
     return {
-      method: 'POST', url: _buildUrl(anyBid.params), data: payload
-    }
+      method: 'POST',
+      url: buildEndpointUrl(anyBid.params),
+      data: {...basePayload, bids: [...bannerBids, ...videoBids]}
+    };
   },
 
   interpretResponse: function (serverResponse) {
@@ -160,12 +94,13 @@ export const spec = {
 
     if (serverResponse.body && typeof serverResponse.body === 'object') {
       serverResponse.body.bids.forEach(bidResponse => {
-        bids.push({
+        const mediaType = bidResponse.vastXml != null ? VIDEO : BANNER;
+
+        const bid = {
           requestId: bidResponse.bidId,
           cpm: bidResponse.cpm || 0,
           width: bidResponse.width || 0,
           height: bidResponse.height || 0,
-          ad: bidResponse.ad,
           ttl: FIVE_MINUTES_IN_SECONDS,
           currency: 'EUR',
           netRevenue: true,
@@ -173,7 +108,16 @@ export const spec = {
           meta: {
             advertiserDomains: bidResponse.adomain
           },
-        });
+          mediaType,
+        };
+
+        if (mediaType === VIDEO) {
+          bid.vastXml = bidResponse.vastXml;
+        } else {
+          bid.ad = bidResponse.ad;
+        }
+
+        bids.push(bid);
       });
     }
 
@@ -192,4 +136,97 @@ export const spec = {
   }
 };
 
+const isSecureWindow = () => getWindowSelf().location.protocol === 'https:';
+
+const isMainPageAccessible = () => {
+  try {
+    return !!getWindowTop().location.href;
+  } catch (ignore) {
+    return false;
+  }
+}
+
+const elementInView = (elementId) => {
+  const resolveElement = (elId) => {
+    const win = getWindowSelf();
+
+    return win.document.getElementById(elId);
+  };
+
+  const visibleInWindow = (el, win) => {
+    const rect = el.getBoundingClientRect();
+    const inView = (rect.top + rect.height >= 0) && (rect.top <= win.innerHeight);
+
+    if (win !== win.parent) {
+      return inView && visibleInWindow(win.frameElement, win.parent);
+    }
+
+    return inView;
+  };
+
+  try {
+    return visibleInWindow(resolveElement(elementId), getWindowSelf());
+  } catch (e) {
+    // old browser, element not found, cross-origin etc.
+  }
+  return undefined;
+}
+
+const buildEndpointUrl = ({host: hostname = DEFAULT_HOST, port = DEFAULT_PORT, securePort, path: pathname = DEFAULT_PATH}) => {
+  if (securePort) {
+    port = securePort;
+  }
+
+  return buildUrl({protocol: 'https', hostname, port, pathname});
+}
+
+const getGdprParams = gdprConsent => {
+  if (gdprConsent) {
+    const consentString = encodeURIComponent(gdprConsent.consentString || '')
+    const isGdpr = gdprConsent.gdprApplies ? 1 : 0;
+
+    return `?gdpr=${isGdpr}&gdpr_consent=${consentString}`
+  } else {
+    return '';
+  }
+}
+
+const hasBanner = bidReq => {
+  return (!bidReq.mediaTypes && !bidReq.mediaType) ||
+    (bidReq.mediaTypes && bidReq.mediaTypes.banner) ||
+    bidReq.mediaType === BANNER;
+}
+
+const hasVideo = bidReq => {
+  const mediaTypes = bidReq.mediaTypes;
+  return mediaTypes &&
+    mediaTypes.video &&
+    ['instream', 'outstream'].indexOf(mediaTypes.video.context) > -1;
+};
+
+const mapToPayloadBaseBid = (bidRequest) => ({
+  bid: bidRequest.bidId,
+  sid: bidRequest.params.sid,
+  viz: elementInView(bidRequest.adUnitCode),
+});
+
+const mapToPayloadBannerBid = (bidRequest) => ({
+  ban: {
+    siz: deepAccess(bidRequest, 'mediaTypes.banner.sizes') || [],
+  },
+  ...mapToPayloadBaseBid(bidRequest)
+});
+
+const mapToPayloadVideoBid = (bidRequest) => {
+  const video = deepAccess(bidRequest, 'mediaTypes.video') || {};
+  return {
+    vid: {
+      ctx: video.context,
+      siz: video.playerSize,
+      mim: video.mimes,
+    },
+    ...mapToPayloadBaseBid(bidRequest)
+  };
+};
+
 registerBidder(spec);
diff --git a/modules/stroeerCoreBidAdapter.md b/modules/stroeerCoreBidAdapter.md
index fe6e92057c6..f9e26e1ad3e 100644
--- a/modules/stroeerCoreBidAdapter.md
+++ b/modules/stroeerCoreBidAdapter.md
@@ -6,26 +6,64 @@ Module Type: Bidder Adapter
 Maintainer: help@cz.stroeer-labs.com
 ```
 
+### Bid Params
 
-## Ad unit configuration for publishers
+| Name          | Scope    | Description        | Example                                 | Type     |
+|---------------|----------|--------------------|-----------------------------------------|----------|
+| `sid`         | required | Slot ID            | `'06b782cc-091b-4f53-9cd2-0291679aa1ac'`| `string` |
+
+### Ad Unit Configuration
+
+#### Banner
+
+* The server will ignore sizes that are not supported by the slot or by the platform (such as 987x123).
+
+##### Example
 
 ```javascript
-const adUnits = [{ 
-    code: 'div-gpt-ad-1460505748561-0',
+var adUnits = [
+  { 
+    code: 'your-banner-adunit-code',
     mediaTypes: {
-        banner: {
-            sizes: [[300, 250]],
-        }
+      banner: {
+        sizes: [[300, 250]],
+      }
     },
     bids: [{
-        bidder: 'stroeerCore',
-        params: {
-          sid: "06b782cc-091b-4f53-9cd2-0291679aa1ac"
-        }    
+      bidder: 'stroeerCore',
+      params: {
+        sid: '06b782cc-091b-4f53-9cd2-0291679aa1ac'
+      }    
     }]
-}];
+  }
+];
 ```
-### Config Notes
 
-* Slot id (`sid`) is required. The adapter will ignore bid requests from prebid if `sid` is not provided. This must be in the decoded form. For example, "1234" as opposed to "MTM0ODA=". 
-* The server ignores dimensions that are not supported by the slot or by the platform (such as 987x123).
+#### Video
+
+* Both instream and outstream contexts are supported.
+* We do not provide an outstream renderer. You will need to set up your own. See [Show Outstream Video Ads](https://docs.prebid.org/dev-docs/show-outstream-video-ads.html) for more information.
+* On `mediaTypes.video`, the fields `context` and `mediaTypes` are required.
+
+##### Example
+
+```javascript
+var adUnits = [
+  {
+    code: 'your-video-adunit-code',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        mimes: ['video/mp4', 'video/quicktime', 'video/x-ms-wmv']
+      }
+    },
+    bids: [{
+      bidder: 'stroeerCore',
+      params: {
+        sid: '35d4225e-f8e3-4f45-b1ea-77913afd00d1'
+      }
+    }]
+  }
+];
+```
diff --git a/test/spec/modules/stroeerCoreBidAdapter_spec.js b/test/spec/modules/stroeerCoreBidAdapter_spec.js
index 5b43b78280b..6489d8ece7e 100644
--- a/test/spec/modules/stroeerCoreBidAdapter_spec.js
+++ b/test/spec/modules/stroeerCoreBidAdapter_spec.js
@@ -21,9 +21,8 @@ describe('stroeerCore bid adapter', function () {
     sandbox.restore();
   });
 
-  function assertStandardFieldsOnBid(bidObject, bidId, ad, width, height, cpm) {
+  function assertStandardFieldsBid(bidObject, bidId, width, height, cpm) {
     assert.propertyVal(bidObject, 'requestId', bidId);
-    assert.propertyVal(bidObject, 'ad', ad);
     assert.propertyVal(bidObject, 'width', width);
     assert.propertyVal(bidObject, 'height', height);
     assert.propertyVal(bidObject, 'cpm', cpm);
@@ -32,6 +31,26 @@ describe('stroeerCore bid adapter', function () {
     assert.propertyVal(bidObject, 'creativeId', '');
   }
 
+  function assertStandardFieldsOnBannerBid(bidObject, bidId, ad, width, height, cpm) {
+    assertStandardFieldsBid(bidObject, bidId, width, height, cpm);
+    assertBannerAdMarkup(bidObject, ad);
+  }
+
+  function assertStandardFieldsOnVideoBid(bidObject, bidId, vastXml, width, height, cpm) {
+    assertStandardFieldsBid(bidObject, bidId, width, height, cpm);
+    assertVideoVastXml(bidObject, vastXml);
+  }
+
+  function assertBannerAdMarkup(bidObject, ad) {
+    assert.propertyVal(bidObject, 'ad', ad);
+    assert.notProperty(bidObject, 'vastXml');
+  }
+
+  function assertVideoVastXml(bidObject, vastXml) {
+    assert.propertyVal(bidObject, 'vastXml', vastXml);
+    assert.notProperty(bidObject, 'ad');
+  }
+
   const AUCTION_ID = utils.getUniqueIdentifierStr();
 
   // Vendor user ids and associated data
@@ -91,16 +110,6 @@ describe('stroeerCore bid adapter', function () {
     }],
   });
 
-  const buildBidderRequestPreVersion3 = () => {
-    const request = buildBidderRequest();
-    request.bids.forEach((bid) => {
-      bid.sizes = bid.mediaTypes.banner.sizes;
-      delete bid.mediaTypes;
-      bid.mediaType = 'banner';
-    });
-    return request;
-  };
-
   const buildBidderResponse = () => ({
     'bids': [{
       'bidId': 'bid1', 'cpm': 4.0, 'width': 300, 'height': 600, 'ad': '<div>tag1</div>', 'tracking': {'brandId': 123}
@@ -109,10 +118,16 @@ describe('stroeerCore bid adapter', function () {
     }]
   });
 
+  const buildBidderResponseWithVideo = () => ({
+    'bids': [{
+      'bidId': 'bid1', 'cpm': 4.0, 'width': 800, 'height': 250, 'vastXml': '<vast>video</vast>'
+    }]
+  });
+
   const createWindow = (href, params = {}) => {
     let {parent, top, frameElement, placementElements = []} = params;
 
-    const protocol = (href.indexOf('https') === 0) ? 'https:' : 'http:';
+    const protocol = href.startsWith('https') ? 'https:' : 'http:';
     const win = {
       frameElement,
       parent,
@@ -187,8 +202,12 @@ describe('stroeerCore bid adapter', function () {
     return {topWin, midWin, win};
   }
 
-  it('should only support BANNER mediaType', function () {
-    assert.deepEqual(spec.supportedMediaTypes, [BANNER]);
+  it('should support BANNER and VIDEO mediaType', function () {
+    assert.deepEqual(spec.supportedMediaTypes, [BANNER, VIDEO]);
+  });
+
+  it('should have GDPR vendor list id (gvlid) set on the spec', function () {
+    assert.equal(spec.gvlid, 136);
   });
 
   describe('bid validation entry point', () => {
@@ -211,16 +230,86 @@ describe('stroeerCore bid adapter', function () {
       assert.isFalse(spec.isBidRequestValid(bidRequest));
     });
 
-    it('should exclude non-banner bids', () => {
+    it('should allow instream video bids', () => {
+      delete bidRequest.mediaTypes.banner;
+      bidRequest.mediaTypes.video = {
+        playerSize: [640, 480],
+        context: 'instream'
+      };
+
+      assert.isTrue(spec.isBidRequestValid(bidRequest));
+    });
+
+    it('should allow outstream video bids', () => {
       delete bidRequest.mediaTypes.banner;
       bidRequest.mediaTypes.video = {
-        playerSize: [640, 480]
+        playerSize: [640, 480],
+        context: 'outstream'
+      };
+
+      assert.isTrue(spec.isBidRequestValid(bidRequest));
+    });
+
+    it('should allow multi-format bid that has banner and instream video', () => {
+      assert.isTrue('banner' in bidRequest.mediaTypes);
+
+      // Allowed because instream video component of the bid will be ignored in buildRequest()
+      bidRequest.mediaTypes.video = {
+        playerSize: [640, 480],
+        context: 'instream'
+      };
+
+      assert.isTrue(spec.isBidRequestValid(bidRequest))
+    });
+
+    it('should exclude multi-format bid that has no format of interest', () => {
+      bidRequest.mediaTypes = {
+        video: {
+          playerSize: [640, 480],
+          context: 'adpod'
+        },
+        native: {
+          image: {
+            required: true,
+            sizes: [150, 50]
+          },
+          title: {
+            required: true,
+            len: 80
+          },
+          sponsoredBy: {
+            required: true
+          },
+          clickUrl: {
+            required: true
+          },
+          privacyLink: {
+            required: false
+          },
+          body: {
+            required: true
+          },
+          icon: {
+            required: true,
+            sizes: [50, 50]
+          }
+        }
       };
 
       assert.isFalse(spec.isBidRequestValid(bidRequest));
     });
 
-    it('should exclude non-banner, pre-version 3 bids', () => {
+    it('should exclude video bids without context', () => {
+      delete bidRequest.mediaTypes.banner;
+      bidRequest.mediaTypes.video = {
+        playerSize: [640, 480],
+        context: undefined
+      };
+
+      assert.isFalse(spec.isBidRequestValid(bidRequest));
+    });
+
+    it('should exclude video, pre-version 3 bids', () => {
       delete bidRequest.mediaTypes;
       bidRequest.mediaType = VIDEO;
       assert.isFalse(spec.isBidRequestValid(bidRequest));
@@ -253,9 +342,13 @@ describe('stroeerCore bid adapter', function () {
 
       describe('should use custom url if provided', () => {
         const samples = [{
-          protocol: 'http:', params: {sid: 'ODA=', host: 'other.com', port: '234', path: '/xyz'}, expected: 'https://other.com:234/xyz'
+          protocol: 'http:',
+          params: {sid: 'ODA=', host: 'other.com', port: '234', path: '/xyz'},
+          expected: 'https://other.com:234/xyz'
         }, {
-          protocol: 'https:', params: {sid: 'ODA=', host: 'other.com', port: '234', path: '/xyz'}, expected: 'https://other.com:234/xyz'
+          protocol: 'https:',
+          params: {sid: 'ODA=', host: 'other.com', port: '234', path: '/xyz'},
+          expected: 'https://other.com:234/xyz'
         }, {
           protocol: 'https:',
           params: {sid: 'ODA=', host: 'other.com', port: '234', securePort: '871', path: '/xyz'},
@@ -315,9 +408,19 @@ describe('stroeerCore bid adapter', function () {
           'ssl': false,
           'url': 'https://www.example.com/monkey/index.html',
           'bids': [{
-            'sid': 'NDA=', 'bid': 'bid1', 'siz': [[300, 600], [160, 60]], 'viz': true
+            'sid': 'NDA=',
+            'bid': 'bid1',
+            'viz': true,
+            'ban': {
+              'siz': [[300, 600], [160, 60]]
+            }
           }, {
-            'sid': 'ODA=', 'bid': 'bid2', 'siz': [[728, 90]], 'viz': true
+            'sid': 'ODA=',
+            'bid': 'bid2',
+            'viz': true,
+            'ban': {
+              'siz': [[728, 90]]
+            }
           }],
           'user': {
             'euids': userIds
@@ -330,13 +433,182 @@ describe('stroeerCore bid adapter', function () {
         assert.deepEqual(actualJsonPayload, expectedJsonPayload);
       });
 
-      it('should handle banner sizes for pre version 3', () => {
-        // Version 3 changes the way how banner sizes are accessed.
-        // We can support backwards compatibility with version 2.x
-        const bidReq = buildBidderRequestPreVersion3();
-        const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
-        assert.deepEqual(serverRequestInfo.data.bids[0].siz, [[300, 600], [160, 60]]);
-        assert.deepEqual(serverRequestInfo.data.bids[1].siz, [[728, 90]]);
+      describe('video bids', () => {
+        it('should be able to build instream video bid', () => {
+          bidderRequest.bids = [{
+            bidId: 'bid1',
+            bidder: 'stroeerCore',
+            adUnitCode: 'div-1',
+            mediaTypes: {
+              video: {
+                context: 'instream',
+                playerSize: [640, 480],
+                mimes: ['video/mp4', 'video/quicktime']
+              }
+            },
+            params: {
+              sid: 'NDA='
+            },
+            userId: userIds
+          }];
+
+          const expectedBids = [{
+            'sid': 'NDA=',
+            'bid': 'bid1',
+            'viz': true,
+            'vid': {
+              'ctx': 'instream',
+              'siz': [640, 480],
+              'mim': ['video/mp4', 'video/quicktime']
+            }
+          }];
+
+          const serverRequestInfo = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+          const bids = JSON.parse(JSON.stringify(serverRequestInfo.data.bids));
+          assert.deepEqual(bids, expectedBids);
+        });
+      });
+
+      describe('multi-formats', () => {
+        it(`should create a request for video and banner`, () => {
+          const videoBid = {
+            bidId: 'bid3',
+            bidder: 'stroeerCore',
+            adUnitCode: 'div-1',
+            mediaTypes: {
+              video: {
+                context: 'instream',
+                playerSize: [640, 480],
+                mimes: ['video/mp4', 'video/quicktime'],
+              }
+            },
+            params: {
+              sid: 'ODA=',
+            },
+            userId: userIds
+          }
+
+          const bannerBid1 = {
+            bidId: 'bid8',
+            bidder: 'stroeerCore',
+            adUnitCode: 'div-2',
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 600], [160, 60]],
+              }
+            },
+            params: {
+              sid: 'NDA=',
+            },
+            userId: userIds
+          }
+
+          const bannerBid2 = {
+            bidId: 'bid12',
+            bidder: 'stroeerCore',
+            adUnitCode: 'div-3',
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 200], [300, 500]],
+              }
+            },
+            params: {
+              sid: 'ABC=',
+            },
+            userId: userIds
+          }
+
+          bidderRequest.bids = [bannerBid1, videoBid, bannerBid2];
+
+          const expectedBannerBids = [
+            {
+              'sid': 'NDA=',
+              'bid': 'bid8',
+              'viz': true,
+              'ban': {
+                'siz': [[300, 600], [160, 60]]
+              }
+            },
+            {
+              'sid': 'ABC=',
+              'bid': 'bid12',
+              'ban': {
+                'siz': [[100, 200], [300, 500]]
+              },
+              'viz': undefined
+            }
+          ];
+
+          const expectedVideoBids = [
+            {
+              'sid': 'ODA=',
+              'bid': 'bid3',
+              'viz': true,
+              'vid': {
+                'ctx': 'instream',
+                'siz': [640, 480],
+                'mim': ['video/mp4', 'video/quicktime']
+              }
+            }
+          ];
+
+          const serverRequestInfo = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+          assert.deepEqual(serverRequestInfo.data.bids, [...expectedBannerBids, ...expectedVideoBids]);
+        });
+
+        it('should split multi-format bid', function() {
+          const multiFormatBid = {
+            bidId: 'bid3',
+            bidder: 'stroeerCore',
+            adUnitCode: 'div-1',
+            mediaTypes: {
+              video: {
+                context: 'instream',
+                playerSize: [640, 480],
+                mimes: ['video/mp4', 'video/quicktime'],
+              },
+              banner: {
+                sizes: [[100, 200], [300, 500]],
+              }
+            },
+            params: {
+              sid: 'ODA=',
+            },
+            userId: userIds
+          }
+
+          bidderRequest.bids = [multiFormatBid];
+
+          const serverRequestInfo = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+          const expectedBannerBids = [
+            {
+              'sid': 'ODA=',
+              'bid': 'bid3',
+              'viz': true,
+              'ban': {
+                'siz': [[100, 200], [300, 500]]
+              }
+            }
+          ];
+
+          const expectedVideoBids = [
+            {
+              'sid': 'ODA=',
+              'bid': 'bid3',
+              'viz': true,
+              'vid': {
+                'ctx': 'instream',
+                'siz': [640, 480],
+                'mim': ['video/mp4', 'video/quicktime']
+              }
+            }
+          ];
+
+          assert.deepEqual(serverRequestInfo.data.bids, [...expectedBannerBids, ...expectedVideoBids]);
+        });
       });
 
       describe('optional fields', () => {
@@ -364,7 +636,10 @@ describe('stroeerCore bid adapter', function () {
           }
         });
 
-        const gdprSamples = [{consentString: 'RG9ua2V5IEtvbmc=', gdprApplies: true}, {consentString: 'UGluZyBQb25n', gdprApplies: false}];
+        const gdprSamples = [{consentString: 'RG9ua2V5IEtvbmc=', gdprApplies: true}, {
+          consentString: 'UGluZyBQb25n',
+          gdprApplies: false
+        }];
         gdprSamples.forEach((sample) => {
           it(`should add GDPR info ${JSON.stringify(sample)} when provided`, () => {
             const bidReq = buildBidderRequest();
@@ -424,7 +699,6 @@ describe('stroeerCore bid adapter', function () {
           bidReq.bids.forEach(bid => bid.schain = schain);
 
           const serverRequestInfo = spec.buildRequests(bidReq.bids, bidReq);
-
           assert.deepEqual(serverRequestInfo.data.schain, schain);
         });
       });
@@ -449,8 +723,8 @@ describe('stroeerCore bid adapter', function () {
       const bidderResponse = buildBidderResponse();
 
       const result = spec.interpretResponse({body: bidderResponse});
-      assertStandardFieldsOnBid(result[0], 'bid1', '<div>tag1</div>', 300, 600, 4);
-      assertStandardFieldsOnBid(result[1], 'bid2', '<div>tag2</div>', 728, 90, 7.3);
+      assertStandardFieldsOnBannerBid(result[0], 'bid1', '<div>tag1</div>', 300, 600, 4);
+      assertStandardFieldsOnBannerBid(result[1], 'bid2', '<div>tag2</div>', 728, 90, 7.3);
     });
 
     it('should return empty array, when response contains no bids', () => {
@@ -458,6 +732,13 @@ describe('stroeerCore bid adapter', function () {
       assert.deepStrictEqual(result, []);
     });
 
+    it('should interpret a video response', () => {
+      const bidderResponse = buildBidderResponseWithVideo();
+      const bidResponses = spec.interpretResponse({body: bidderResponse});
+      let videoBidResponse = bidResponses[0];
+      assertStandardFieldsOnVideoBid(videoBidResponse, 'bid1', '<vast>video</vast>', 800, 250, 4);
+    })
+
     it('should add data to meta object', () => {
       const response = buildBidderResponse();
       response.bids[0] = Object.assign(response.bids[0], {adomain: ['website.org', 'domain.com']});
@@ -470,6 +751,7 @@ describe('stroeerCore bid adapter', function () {
 
   describe('get user syncs entry point', () => {
     let win;
+
     beforeEach(() => {
       win = setupSingleWindow(sandbox);
 

From f0053c3e6bdc2a8c64270eb0e13b7cda06296ddc Mon Sep 17 00:00:00 2001
From: Mikhail Ivanchenko <mihail.ivanchenko@nextmillennium.io>
Date: Mon, 12 Sep 2022 20:12:59 +0300
Subject: [PATCH 251/569] NextMillennium Bid Adapter: Added video support
 (#8740)

* Video support

* Re-run circleCI

* fix linting error

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/nextMillenniumBidAdapter.js           | 132 ++++++++++++++++--
 .../modules/nextMillenniumBidAdapter_spec.js  |  82 +++++++++++
 2 files changed, 203 insertions(+), 11 deletions(-)

diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index 87d2e53568f..a4c89866741 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -1,7 +1,21 @@
-import { isStr, _each, parseUrl, getWindowTop, getBidIdParameter } from '../src/utils.js';
-import { getRefererInfo } from '../src/refererDetection.js';
+import {
+  _each,
+  createTrackPixelHtml,
+  deepAccess,
+  isStr,
+  getWindowTop,
+  getBidIdParameter,
+  logMessage,
+  parseUrl,
+  triggerPixel,
+} from '../src/utils.js';
+
+import CONSTANTS from '../src/constants.json'
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import * as events from '../src/events.js'
+
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
+import { getRefererInfo } from '../src/refererDetection.js';
 
 const BIDDER_CODE = 'nextMillennium';
 const ENDPOINT = 'https://pbs.nextmillmedia.com/openrtb2/auction';
@@ -9,9 +23,15 @@ const TEST_ENDPOINT = 'https://test.pbs.nextmillmedia.com/openrtb2/auction';
 const SYNC_ENDPOINT = 'https://statics.nextmillmedia.com/load-cookie.html?v=4';
 const TIME_TO_LIVE = 360;
 
+const EXPIRENCE_WURL = 20 * 60000
+const wurlMap = {}
+
+events.on(CONSTANTS.EVENTS.BID_WON, bidWonHandler)
+cleanWurl()
+
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
 
   isBidRequestValid: function(bid) {
     return !!(
@@ -26,6 +46,8 @@ export const spec = {
     _each(validBidRequests, function(bid) {
       window.nmmRefreshCounts[bid.adUnitCode] = window.nmmRefreshCounts[bid.adUnitCode] || 0;
       const id = getPlacementId(bid)
+      const auctionId = bid.auctionId
+      const bidId = bid.bidId
       let sizes = bid.sizes
       if (sizes && !Array.isArray(sizes[0])) sizes = [sizes]
 
@@ -97,7 +119,9 @@ export const spec = {
           contentType: 'application/json',
           withCredentials: true
         },
-        bidId: bid.bidId
+
+        bidId,
+        auctionId,
       });
     });
 
@@ -110,8 +134,15 @@ export const spec = {
 
     _each(response.seatbid, (resp) => {
       _each(resp.bid, (bid) => {
-        bidResponses.push({
-          requestId: bidRequest.bidId,
+        const requestId = bidRequest.bidId
+        const auctionId = bidRequest.auctionId
+        const wurl = deepAccess(bid, 'ext.prebid.events.win')
+        addWurl({auctionId, requestId, wurl})
+
+        const {ad, adUrl, vastUrl, vastXml} = getAd(bid)
+
+        const bidResponse = {
+          requestId,
           cpm: bid.price,
           width: bid.w,
           height: bid.h,
@@ -121,10 +152,20 @@ export const spec = {
           ttl: TIME_TO_LIVE,
           meta: {
             advertiserDomains: bid.adomain || []
-          },
+          }
+        }
+
+        if (vastUrl || vastXml) {
+          bidResponse.mediaType = VIDEO
 
-          ad: bid.adm
-        });
+          if (vastUrl) bidResponse.vastUrl = vastUrl
+          if (vastXml) bidResponse.vastXml = vastXml
+        } else {
+          bidResponse.ad = ad
+          bidResponse.adUrl = adUrl
+        }
+
+        bidResponses.push(bidResponse);
       });
     });
 
@@ -200,6 +241,32 @@ function getTopWindow(curWindow, nesting = 0) {
   }
 }
 
+function getAd(bid) {
+  let ad, adUrl, vastXml, vastUrl
+
+  switch (deepAccess(bid, 'ext.prebid.type')) {
+    case VIDEO:
+      if (bid.adm.substr(0, 4) === 'http') {
+        vastUrl = bid.adm
+      } else {
+        vastXml = bid.adm
+      }
+
+      break;
+    default:
+      if (bid.adm && bid.nurl) {
+        ad = bid.adm
+        ad += createTrackPixelHtml(decodeURIComponent(bid.nurl))
+      } else if (bid.adm) {
+        ad = bid.adm
+      } else if (bid.nurl) {
+        adUrl = bid.nurl
+      }
+  }
+
+  return {ad, adUrl, vastXml, vastUrl}
+}
+
 function getSiteObj() {
   const refInfo = (getRefererInfo && getRefererInfo()) || {}
 
@@ -217,4 +284,47 @@ function getDeviceObj() {
   }
 }
 
-registerBidder(spec);
+function getKeyWurl({auctionId, requestId}) {
+  return `${auctionId}-${requestId}`
+}
+
+function addWurl({wurl, requestId, auctionId}) {
+  if (!wurl) return
+
+  const expirence = Date.now() + EXPIRENCE_WURL
+  const key = getKeyWurl({auctionId, requestId})
+  wurlMap[key] = {wurl, expirence}
+}
+
+function removeWurl({auctionId, requestId}) {
+  const key = getKeyWurl({auctionId, requestId})
+  delete wurlMap[key]
+}
+
+function getWurl({auctionId, requestId}) {
+  const key = getKeyWurl({auctionId, requestId})
+  return wurlMap[key] && wurlMap[key].wurl
+}
+
+function bidWonHandler(bid) {
+  const {auctionId, requestId} = bid
+  const wurl = getWurl({auctionId, requestId})
+  if (wurl) {
+    logMessage(`(nextmillennium) Invoking image pixel for wurl on BID_WIN: "${wurl}"`)
+    triggerPixel(wurl)
+    removeWurl({auctionId, requestId})
+  }
+}
+
+function cleanWurl() {
+  const dateNow = Date.now()
+  Object.keys(wurlMap).forEach(key => {
+    if (dateNow >= wurlMap[key].expirence) {
+      delete wurlMap[key]
+    }
+  })
+
+  setTimeout(cleanWurl, 60000)
+}
+
+registerBidder(spec)
diff --git a/test/spec/modules/nextMillenniumBidAdapter_spec.js b/test/spec/modules/nextMillenniumBidAdapter_spec.js
index 303025888dc..6ba979bc205 100644
--- a/test/spec/modules/nextMillenniumBidAdapter_spec.js
+++ b/test/spec/modules/nextMillenniumBidAdapter_spec.js
@@ -173,4 +173,86 @@ describe('nextMillenniumBidAdapterTests', function() {
     expect(bid.height).to.equal(250);
     expect(bid.currency).to.equal('USD');
   });
+
+  it('validate_videowrapper_response_params', function() {
+    const serverResponse = {
+      body: {
+        id: 'f7b3d2da-e762-410c-b069-424f92c4c4b2',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '7457329903666272789',
+                price: 0.5,
+                adm: 'https://some_vast_host.com/vast.xml',
+                adid: '96846035',
+                adomain: ['test.addomain.com'],
+                w: 300,
+                h: 250,
+                ext: {
+                  prebid: {
+                    type: 'video'
+                  }
+                }
+              }
+            ]
+          }
+        ],
+        cur: 'USD'
+      }
+    };
+
+    let bids = spec.interpretResponse(serverResponse, bidRequestData[0]);
+    expect(bids).to.have.lengthOf(1);
+
+    let bid = bids[0];
+
+    expect(bid.creativeId).to.equal('96846035');
+    expect(bid.vastUrl).to.equal('https://some_vast_host.com/vast.xml');
+    expect(bid.cpm).to.equal(0.5);
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.currency).to.equal('USD');
+  });
+
+  it('validate_videoxml_response_params', function() {
+    const serverResponse = {
+      body: {
+        id: 'f7b3d2da-e762-410c-b069-424f92c4c4b2',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '7457329903666272789',
+                price: 0.5,
+                adm: '<vast><ad></ad></vast>',
+                adid: '96846035',
+                adomain: ['test.addomain.com'],
+                w: 300,
+                h: 250,
+                ext: {
+                  prebid: {
+                    type: 'video'
+                  }
+                }
+              }
+            ]
+          }
+        ],
+        cur: 'USD'
+      }
+    };
+
+    let bids = spec.interpretResponse(serverResponse, bidRequestData[0]);
+    expect(bids).to.have.lengthOf(1);
+
+    let bid = bids[0];
+
+    expect(bid.creativeId).to.equal('96846035');
+    expect(bid.vastXml).to.equal('<vast><ad></ad></vast>');
+    expect(bid.cpm).to.equal(0.5);
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.currency).to.equal('USD');
+  });
 });

From ca6fe726d5f505846dad23473282129ac0c12905 Mon Sep 17 00:00:00 2001
From: Nick Jacob <nickbjacob@gmail.com>
Date: Tue, 13 Sep 2022 23:20:37 -0400
Subject: [PATCH 252/569] Update AMX adapter to use correct refererInfo fields,
 remove legacy code + add support for ortb2Imp (#8989)

---
 modules/amxBidAdapter.js                | 176 +++++-----
 test/spec/modules/amxBidAdapter_spec.js | 442 ++++++++++++++----------
 2 files changed, 348 insertions(+), 270 deletions(-)

diff --git a/modules/amxBidAdapter.js b/modules/amxBidAdapter.js
index dae7784b3bc..c5ce3745526 100644
--- a/modules/amxBidAdapter.js
+++ b/modules/amxBidAdapter.js
@@ -1,37 +1,46 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import { parseUrl, deepAccess, _each, formatQS, getUniqueIdentifierStr, triggerPixel, isFn, logError } from '../src/utils.js';
+import {
+  parseUrl,
+  deepAccess,
+  _each,
+  formatQS,
+  getUniqueIdentifierStr,
+  triggerPixel,
+  isFn,
+  logError,
+} from '../src/utils.js';
 import { config } from '../src/config.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const BIDDER_CODE = 'amx';
-const storage = getStorageManager({gvlid: 737, bidderCode: BIDDER_CODE});
+const storage = getStorageManager({ gvlid: 737, bidderCode: BIDDER_CODE });
 const SIMPLE_TLD_TEST = /\.com?\.\w{2,4}$/;
 const DEFAULT_ENDPOINT = 'https://prebid.a-mo.net/a/c';
-const VERSION = 'pba1.3.1';
+const VERSION = 'pba1.3.2';
 const VAST_RXP = /^\s*<\??(?:vast|xml)/i;
 const TRACKING_ENDPOINT = 'https://1x1.a-mo.net/hbx/';
 const AMUID_KEY = '__amuidpb';
 
 function getLocation(request) {
-  // TODO: does it make sense to fall back to window.location?
-  return parseUrl(request.refererInfo?.topmostLocation || window.location.href)
-};
+  return parseUrl(request.refererInfo?.topmostLocation || window.location.href);
+}
 
 const largestSize = (sizes, mediaTypes) => {
   const allSizes = sizes
     .concat(deepAccess(mediaTypes, `${BANNER}.sizes`, []) || [])
-    .concat(deepAccess(mediaTypes, `${VIDEO}.sizes`, []) || [])
+    .concat(deepAccess(mediaTypes, `${VIDEO}.sizes`, []) || []);
 
-  return allSizes.sort((a, b) => (b[0] * b[1]) - (a[0] * a[1]))[0];
-}
+  return allSizes.sort((a, b) => b[0] * b[1] - a[0] * a[1])[0];
+};
 
 function flatMap(input, mapFn) {
   if (input == null) {
-    return []
+    return [];
   }
-  return input.map(mapFn)
-    .reduce((acc, item) => item != null && acc.concat(item), [])
+  return input
+    .map(mapFn)
+    .reduce((acc, item) => item != null && acc.concat(item), []);
 }
 
 const isVideoADM = (html) => html != null && VAST_RXP.test(html);
@@ -44,14 +53,13 @@ function getMediaType(bid) {
   return BANNER;
 }
 
-const nullOrType = (value, type) =>
-  value == null || (typeof value) === type // eslint-disable-line valid-typeof
+const nullOrType = (value, type) => value == null || typeof value === type; // eslint-disable-line valid-typeof
 
 function getID(loc) {
   const host = loc.hostname.split('.');
-  const short = host.slice(
-    host.length - (SIMPLE_TLD_TEST.test(loc.hostname) ? 3 : 2)
-  ).join('.');
+  const short = host
+    .slice(host.length - (SIMPLE_TLD_TEST.test(loc.hostname) ? 3 : 2))
+    .join('.');
   return btoa(short).replace(/=+$/, '');
 }
 
@@ -59,21 +67,21 @@ const enc = encodeURIComponent;
 
 function getUIDSafe() {
   try {
-    return storage.getDataFromLocalStorage(AMUID_KEY)
+    return storage.getDataFromLocalStorage(AMUID_KEY);
   } catch (e) {
-    return null
+    return null;
   }
 }
 
 function setUIDSafe(uid) {
   try {
-    storage.setDataInLocalStorage(AMUID_KEY, uid)
+    storage.setDataInLocalStorage(AMUID_KEY, uid);
   } catch (e) {
     // do nothing
   }
 }
 
-function nestedQs (qsData) {
+function nestedQs(qsData) {
   const out = [];
   Object.keys(qsData || {}).forEach((key) => {
     out.push(enc(key) + '=' + enc(String(qsData[key])));
@@ -85,23 +93,28 @@ function nestedQs (qsData) {
 function createBidMap(bids) {
   const out = {};
   _each(bids, (bid) => {
-    out[bid.bidId] = convertRequest(bid)
-  })
+    out[bid.bidId] = convertRequest(bid);
+  });
   return out;
 }
 
 const trackEvent = (eventName, data) =>
-  triggerPixel(`${TRACKING_ENDPOINT}g_${eventName}?${formatQS({
-    ...data,
-    ts: Date.now(),
-    eid: getUniqueIdentifierStr(),
-  })}`);
+  triggerPixel(
+    `${TRACKING_ENDPOINT}g_${eventName}?${formatQS({
+      ...data,
+      ts: Date.now(),
+      eid: getUniqueIdentifierStr(),
+    })}`
+  );
 
 const DEFAULT_MIN_FLOOR = 0;
 
 function ensureFloor(floorValue) {
-  return typeof floorValue === 'number' && isFinite(floorValue) && floorValue > 0.0
-    ? floorValue : DEFAULT_MIN_FLOOR;
+  return typeof floorValue === 'number' &&
+    isFinite(floorValue) &&
+    floorValue > 0.0
+    ? floorValue
+    : DEFAULT_MIN_FLOOR;
 }
 
 function getFloor(bid) {
@@ -114,7 +127,7 @@ function getFloor(bid) {
       currency: 'USD',
       mediaType: '*',
       size: '*',
-      bidRequest: bid
+      bidRequest: bid,
     });
     return floor.floor;
   } catch (e) {
@@ -123,14 +136,20 @@ function getFloor(bid) {
   }
 }
 
+function refInfo(bidderRequest, subKey, defaultValue) {
+  return deepAccess(bidderRequest, 'refererInfo.' + subKey, defaultValue);
+}
+
 function convertRequest(bid) {
   const size = largestSize(bid.sizes, bid.mediaTypes) || [0, 0];
-  const isVideoBid = bid.mediaType === VIDEO || VIDEO in bid.mediaTypes
+  const isVideoBid = bid.mediaType === VIDEO || VIDEO in bid.mediaTypes;
   const av = isVideoBid || size[1] > 100;
-  const tid = deepAccess(bid, 'params.tagId')
+  const tid = deepAccess(bid, 'params.tagId');
 
-  const au = bid.params != null && typeof bid.params.adUnitId === 'string'
-    ? bid.params.adUnitId : bid.adUnitCode;
+  const au =
+    bid.params != null && typeof bid.params.adUnitId === 'string'
+      ? bid.params.adUnitId
+      : bid.adUnitCode;
 
   const multiSizes = [
     bid.sizes,
@@ -150,7 +169,8 @@ function convertRequest(bid) {
     ah: size[1],
     tf: 0,
     sc: bid.schain || {},
-    f: ensureFloor(getFloor(bid))
+    f: ensureFloor(getFloor(bid)),
+    rtb: bid.ortb2Imp,
   };
 
   if (typeof tid === 'string' && tid.length > 0) {
@@ -159,15 +179,6 @@ function convertRequest(bid) {
   return params;
 }
 
-function decorateADM(bid) {
-  const impressions = deepAccess(bid, 'ext.himp', [])
-    .concat(bid.nurl != null ? [bid.nurl] : [])
-    .filter((imp) => imp != null && imp.length > 0)
-    .map((src) => `<img src="${src}" width="0" height="0"/>`)
-    .join('');
-  return bid.adm + impressions;
-}
-
 function resolveSize(bid, request, bidId) {
   if (bid.w != null && bid.w > 1 && bid.h != null && bid.h > 1) {
     return [bid.w, bid.h];
@@ -183,11 +194,11 @@ function resolveSize(bid, request, bidId) {
 
 function values(source) {
   if (Object.values != null) {
-    return Object.values(source)
+    return Object.values(source);
   }
 
   return Object.keys(source).map((key) => {
-    return source[key]
+    return source[key];
   });
 }
 
@@ -199,19 +210,24 @@ export const spec = {
   supportedMediaTypes: [BANNER, VIDEO],
 
   isBidRequestValid(bid) {
-    return nullOrType(deepAccess(bid, 'params.endpoint', null), 'string') &&
+    return (
+      nullOrType(deepAccess(bid, 'params.endpoint', null), 'string') &&
       nullOrType(deepAccess(bid, 'params.tagId', null), 'string')
+    );
   },
 
   buildRequests(bidRequests, bidderRequest) {
     const loc = getLocation(bidderRequest);
     const tagId = deepAccess(bidRequests[0], 'params.tagId', null);
     const testMode = deepAccess(bidRequests[0], 'params.testMode', 0);
-    const fbid = bidRequests[0] != null ? bidRequests[0] : {
-      bidderRequestsCount: 0,
-      bidderWinsCount: 0,
-      bidRequestsCount: 0
-    }
+    const fbid =
+      bidRequests[0] != null
+        ? bidRequests[0]
+        : {
+          bidderRequestsCount: 0,
+          bidderWinsCount: 0,
+          bidRequestsCount: 0,
+        };
 
     const payload = {
       a: bidderRequest.auctionId,
@@ -223,7 +239,7 @@ export const spec = {
       tm: isTrue(testMode),
       V: '$prebid.version$',
       vg: '$$PREBID_GLOBAL$$',
-      i: (testMode && tagId != null) ? tagId : getID(loc),
+      i: testMode && tagId != null ? tagId : getID(loc),
       l: {},
       f: 0.01,
       cv: VERSION,
@@ -232,10 +248,9 @@ export const spec = {
       w: screen.width,
       gs: deepAccess(bidderRequest, 'gdprConsent.gdprApplies', ''),
       gc: deepAccess(bidderRequest, 'gdprConsent.consentString', ''),
-      u: deepAccess(bidderRequest, 'refererInfo.canonicalUrl', loc.href),
-      // TODO: are these referer values correct?
-      do: loc.hostname,
-      re: deepAccess(bidderRequest, 'refererInfo.ref'),
+      u: refInfo(bidderRequest, 'page', loc.href),
+      do: refInfo(bidderRequest, 'site', loc.hostname),
+      re: refInfo(bidderRequest, 'ref'),
       am: getUIDSafe(),
       usp: bidderRequest.uspConsent || '1---',
       smt: 1,
@@ -244,20 +259,23 @@ export const spec = {
       cpp: config.getConfig('coppa') ? 1 : 0,
       fpd2: bidderRequest.ortb2,
       tmax: config.getConfig('bidderTimeout'),
-      eids: values(bidRequests.reduce((all, bid) => {
-        // we only want unique ones in here
-        if (bid == null || bid.userIdAsEids == null) {
-          return all
-        }
-
-        _each(bid.userIdAsEids, (value) => {
-          if (value == null) {
-            return;
+      amp: refInfo(bidderRequest, 'isAmp', null),
+      eids: values(
+        bidRequests.reduce((all, bid) => {
+          // we only want unique ones in here
+          if (bid == null || bid.userIdAsEids == null) {
+            return all;
           }
-          all[value.source] = value
-        });
-        return all;
-      }, {})),
+
+          _each(bid.userIdAsEids, (value) => {
+            if (value == null) {
+              return;
+            }
+            all[value.source] = value;
+          });
+          return all;
+        }, {})
+      ),
     };
 
     return {
@@ -270,13 +288,14 @@ export const spec = {
 
   getUserSyncs(syncOptions, serverResponses) {
     if (serverResponses == null || serverResponses.length === 0) {
-      return []
+      return [];
     }
-    const output = []
+    const output = [];
     _each(serverResponses, function ({ body: response }) {
       if (response != null && response.p != null && response.p.hreq) {
         _each(response.p.hreq, function (syncPixel) {
-          const pixelType = syncPixel.indexOf('__st=iframe') !== -1 ? 'iframe' : 'image';
+          const pixelType =
+            syncPixel.indexOf('__st=iframe') !== -1 ? 'iframe' : 'image';
           if (syncOptions.iframeEnabled || pixelType === 'image') {
             output.push({
               url: syncPixel,
@@ -303,7 +322,7 @@ export const spec = {
       return flatMap(response.r[bidID], (siteBid) =>
         siteBid.b.map((bid) => {
           const mediaType = getMediaType(bid);
-          const ad = mediaType === BANNER ? decorateADM(bid) : bid.adm;
+          const ad = bid.adm;
 
           if (ad == null) {
             return null;
@@ -312,7 +331,7 @@ export const spec = {
           const size = resolveSize(bid, request.data, bidID);
           const defaultExpiration = mediaType === BANNER ? 240 : 300;
 
-          return ({
+          return {
             requestId: bidID,
             cpm: bid.price,
             width: size[0],
@@ -327,8 +346,9 @@ export const spec = {
             },
             mediaType,
             ttl: typeof bid.exp === 'number' ? bid.exp : defaultExpiration,
-          });
-        })).filter((possibleBid) => possibleBid != null);
+          };
+        })
+      ).filter((possibleBid) => possibleBid != null);
     });
   },
 
diff --git a/test/spec/modules/amxBidAdapter_spec.js b/test/spec/modules/amxBidAdapter_spec.js
index e6a87d6035e..fe85e874c3b 100644
--- a/test/spec/modules/amxBidAdapter_spec.js
+++ b/test/spec/modules/amxBidAdapter_spec.js
@@ -1,50 +1,52 @@
-import * as utils from 'src/utils.js';
-import { createEidsArray } from 'modules/userId/eids.js';
 import { expect } from 'chai';
 import { spec } from 'modules/amxBidAdapter.js';
+import { createEidsArray } from 'modules/userId/eids.js';
 import { BANNER, VIDEO } from 'src/mediaTypes.js';
-import { config } from 'src/config.js';
+import * as utils from 'src/utils.js';
 
 const sampleRequestId = '82c91e127a9b93e';
-const sampleDisplayAd = (additionalImpressions) => `<script src='https://assets.a-mo.net/tmode.v1.js'></script>${additionalImpressions}`;
+const sampleDisplayAd = `<script src='https://assets.a-mo.net/tmode.v1.js'></script>`;
 const sampleDisplayCRID = '78827819';
 // minimal example vast
-const sampleVideoAd = (addlImpression) => `
+const sampleVideoAd = (addlImpression) =>
+  `
 <?xml version="1.0" encoding="UTF-8" ?><VAST version="2.0"><Ad id="128a6.44d74.46b3"><InLine><Error><![CDATA[http://example.net/hbx/verr?e=]]></Error><Impression><![CDATA[http://example.net/hbx/vimp?lid=test&aid=testapp]]></Impression><Creatives><Creative sequence="1"><Linear><Duration>00:00:15</Duration><TrackingEvents><Tracking event="firstQuartile"><![CDATA[https://example.com?event=first_quartile]]></Tracking></TrackingEvents><VideoClicks><ClickThrough><![CDATA[http://example.com]]></ClickThrough></VideoClicks><MediaFiles><MediaFile delivery="progressive" width="16" height="9" type="video/mp4" bitrate="800"><![CDATA[https://example.com/media.mp4]]></MediaFile></MediaFiles></Linear></Creative></Creatives>${addlImpression}</InLine></Ad></VAST>
-`.replace(/\n+/g, '')
-
-const embeddedTrackingPixel = `https://1x1.a-mo.net/hbx/g_impression?A=sample&B=20903`;
-const sampleNurl = 'https://example.exchange/nurl';
+`.replace(/\n+/g, '');
 
 const sampleFPD = {
   site: {
     keywords: 'sample keywords',
     ext: {
       data: {
-        pageType: 'article'
-      }
-    }
+        pageType: 'article',
+      },
+    },
   },
   user: {
     gender: 'O',
     yob: 1982,
-  }
+  },
 };
 
 const sampleBidderRequest = {
   gdprConsent: {
     gdprApplies: true,
     consentString: utils.getUniqueIdentifierStr(),
-    vendorData: {}
+    vendorData: {},
   },
   auctionId: utils.getUniqueIdentifierStr(),
   uspConsent: '1YYY',
   refererInfo: {
     location: 'https://www.prebid.org',
+    site: 'prebid.org',
     topmostLocation: 'https://www.prebid.org',
-    canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+    page: 'https://www.prebid.org/the/link/to/the/page',
   },
-  ortb2: sampleFPD
+  ortb2: sampleFPD,
+};
+
+const sampleImpExt = {
+  testKey: 'testValue',
 };
 
 const sampleBidRequestBase = {
@@ -52,20 +54,29 @@ const sampleBidRequestBase = {
   params: {
     endpoint: 'https://httpbin.org/post',
   },
+  ortb2Imp: {
+    ext: sampleImpExt,
+  },
   sizes: [[320, 50]],
   getFloor(params) {
-    if (params.size == null || params.currency == null || params.mediaType == null) {
-      throw new Error(`getFloor called with incomplete params: ${JSON.stringify(params)}`)
+    if (
+      params.size == null ||
+      params.currency == null ||
+      params.mediaType == null
+    ) {
+      throw new Error(
+        `getFloor called with incomplete params: ${JSON.stringify(params)}`
+      );
     }
     return {
       floor: 0.5,
-      currency: 'USD'
-    }
+      currency: 'USD',
+    };
   },
   mediaTypes: {
     [BANNER]: {
-      sizes: [[300, 250]]
-    }
+      sizes: [[300, 250]],
+    },
   },
   adUnitCode: 'div-gpt-ad-example',
   transactionId: utils.getUniqueIdentifierStr(),
@@ -75,13 +86,15 @@ const sampleBidRequestBase = {
 
 const schainConfig = {
   ver: '1.0',
-  nodes: [{
-    asi: 'greatnetwork.exchange',
-    sid: '000001',
-    hp: 1,
-    rid: 'bid_request_1',
-    domain: 'publisher.com'
-  }]
+  nodes: [
+    {
+      asi: 'greatnetwork.exchange',
+      sid: '000001',
+      hp: 1,
+      rid: 'bid_request_1',
+      domain: 'publisher.com',
+    },
+  ],
 };
 
 const sampleBidRequestVideo = {
@@ -94,89 +107,93 @@ const sampleBidRequestVideo = {
       sizes: [[360, 250]],
       context: 'adpod',
       adPodDurationSec: 90,
-      contentMode: 'live'
-    }
-  }
+      contentMode: 'live',
+    },
+  },
 };
 
 const sampleServerResponse = {
-  'p': {
-    'hreq': ['https://1x1.a-mo.net/hbx/g_sync?partner=test', 'https://1x1.a-mo.net/hbx/g_syncf?__st=iframe']
+  p: {
+    hreq: [
+      'https://1x1.a-mo.net/hbx/g_sync?partner=test',
+      'https://1x1.a-mo.net/hbx/g_syncf?__st=iframe',
+    ],
   },
-  'r': {
+  r: {
     [sampleRequestId]: [
       {
-        'b': [
+        b: [
           {
-            'adid': '78827819',
-            'adm': sampleDisplayAd(''),
-            'adomain': [
-              'example.com'
-            ],
-            'crid': sampleDisplayCRID,
-            'ext': {
-              'himp': [
-                embeddedTrackingPixel
-              ],
-            },
-            'nurl': sampleNurl,
-            'h': 600,
-            'id': '2014691335735134254',
-            'impid': '1',
-            'exp': 90,
-            'price': 0.25,
-            'w': 300
+            adid: '78827819',
+            adm: sampleDisplayAd,
+            adomain: ['example.com'],
+            crid: sampleDisplayCRID,
+            h: 600,
+            id: '2014691335735134254',
+            impid: '1',
+            exp: 90,
+            price: 0.25,
+            w: 300,
           },
           {
-            'adid': '222976952',
-            'adm': sampleVideoAd(''),
-            'adomain': [
-              'example.com'
-            ],
-            'crid': sampleDisplayCRID,
-            'ext': {
-              'himp': [
-                embeddedTrackingPixel
-              ],
-            },
-            'nurl': sampleNurl,
-            'h': 1,
-            'id': '7735706981389902829',
-            'impid': '1',
-            'exp': 90,
-            'price': 0.25,
-            'w': 1
+            adid: '222976952',
+            adm: sampleVideoAd(''),
+            adomain: ['example.com'],
+            crid: sampleDisplayCRID,
+            ext: {},
+            h: 1,
+            id: '7735706981389902829',
+            impid: '1',
+            exp: 90,
+            price: 0.25,
+            w: 1,
           },
         ],
-      }
-    ]
+      },
+    ],
   },
-}
+};
 
 describe('AmxBidAdapter', () => {
   describe('isBidRequestValid', () => {
     it('endpoint must be an optional string', () => {
-      expect(spec.isBidRequestValid({params: { endpoint: 1 }})).to.equal(false)
-      expect(spec.isBidRequestValid({params: { endpoint: 'test' }})).to.equal(true)
+      expect(spec.isBidRequestValid({ params: { endpoint: 1 } })).to.equal(
+        false
+      );
+      expect(spec.isBidRequestValid({ params: { endpoint: 'test' } })).to.equal(
+        true
+      );
     });
 
     it('tagId is an optional string', () => {
-      expect(spec.isBidRequestValid({params: { tagId: 1 }})).to.equal(false)
-      expect(spec.isBidRequestValid({params: { tagId: 'test' }})).to.equal(true)
+      expect(spec.isBidRequestValid({ params: { tagId: 1 } })).to.equal(false);
+      expect(spec.isBidRequestValid({ params: { tagId: 'test' } })).to.equal(
+        true
+      );
     });
 
     it('testMode is an optional truthy value', () => {
-      expect(spec.isBidRequestValid({params: { testMode: 1 }})).to.equal(true)
-      expect(spec.isBidRequestValid({params: { testMode: 'true' }})).to.equal(true)
+      expect(spec.isBidRequestValid({ params: { testMode: 1 } })).to.equal(
+        true
+      );
+      expect(spec.isBidRequestValid({ params: { testMode: 'true' } })).to.equal(
+        true
+      );
       // ignore invalid values (falsy)
-      expect(spec.isBidRequestValid({params: { testMode: 'non-truthy-invalid-value' }})).to.equal(true)
-      expect(spec.isBidRequestValid({params: { testMode: false }})).to.equal(true)
+      expect(
+        spec.isBidRequestValid({
+          params: { testMode: 'non-truthy-invalid-value' },
+        })
+      ).to.equal(true);
+      expect(spec.isBidRequestValid({ params: { testMode: false } })).to.equal(
+        true
+      );
     });
 
     it('none of the params are required', () => {
-      expect(spec.isBidRequestValid({})).to.equal(true)
+      expect(spec.isBidRequestValid({})).to.equal(true);
     });
-  })
+  });
   describe('getUserSync', () => {
     it('will only sync from valid server responses', () => {
       const syncs = spec.getUserSyncs({ iframeEnabled: true });
@@ -184,43 +201,62 @@ describe('AmxBidAdapter', () => {
     });
 
     it('will return valid syncs from a server response', () => {
-      const syncs = spec.getUserSyncs({ iframeEnabled: true }, [{body: sampleServerResponse}]);
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, [
+        { body: sampleServerResponse },
+      ]);
       expect(syncs.length).to.equal(2);
       expect(syncs[0].type).to.equal('image');
       expect(syncs[1].type).to.equal('iframe');
     });
 
     it('will filter out iframe syncs based on options', () => {
-      const syncs = spec.getUserSyncs({ iframeEnabled: false }, [{body: sampleServerResponse}, {body: sampleServerResponse}]);
+      const syncs = spec.getUserSyncs({ iframeEnabled: false }, [
+        { body: sampleServerResponse },
+        { body: sampleServerResponse },
+      ]);
       expect(syncs.length).to.equal(2);
-      expect(syncs).to.satisfy((allSyncs) => allSyncs.every((sync) => sync.type === 'image'))
+      expect(syncs).to.satisfy((allSyncs) =>
+        allSyncs.every((sync) => sync.type === 'image')
+      );
     });
   });
 
   describe('buildRequests', () => {
     it('will default to prebid.a-mo.net endpoint', () => {
       const { url } = spec.buildRequests([], sampleBidderRequest);
-      expect(url).to.equal('https://prebid.a-mo.net/a/c')
+      expect(url).to.equal('https://prebid.a-mo.net/a/c');
     });
 
     it('will read the prebid version & global', () => {
-      const { data: { V: prebidVersion, vg: prebidGlobal } } = spec.buildRequests([{
-        ...sampleBidRequestBase,
-        params: {
-          testMode: true
-        }
-      }], sampleBidderRequest);
-      expect(prebidVersion).to.equal('$prebid.version$')
-      expect(prebidGlobal).to.equal('$$PREBID_GLOBAL$$')
+      const {
+        data: { V: prebidVersion, vg: prebidGlobal },
+      } = spec.buildRequests(
+        [
+          {
+            ...sampleBidRequestBase,
+            params: {
+              testMode: true,
+            },
+          },
+        ],
+        sampleBidderRequest
+      );
+      expect(prebidVersion).to.equal('$prebid.version$');
+      expect(prebidGlobal).to.equal('$$PREBID_GLOBAL$$');
     });
 
     it('reads test mode from the first bid request', () => {
-      const { data } = spec.buildRequests([{
-        ...sampleBidRequestBase,
-        params: {
-          testMode: true
-        }
-      }], sampleBidderRequest);
+      const { data } = spec.buildRequests(
+        [
+          {
+            ...sampleBidRequestBase,
+            params: {
+              testMode: true,
+            },
+          },
+        ],
+        sampleBidderRequest
+      );
       expect(data.tm).to.equal(true);
     });
 
@@ -231,9 +267,9 @@ describe('AmxBidAdapter', () => {
           location: null,
           topmostLocation: null,
           ref: 'http://search-traffic-source.com',
-        }
+        },
       });
-      expect(data.do).to.equal('localhost')
+      expect(data.do).to.equal('localhost');
       expect(data.re).to.equal('http://search-traffic-source.com');
     });
 
@@ -244,48 +280,59 @@ describe('AmxBidAdapter', () => {
           location: null,
           topmostLocation: 'http://top-site.com',
           ref: 'http://search-traffic-source.com',
-        }
+        },
       });
       expect(data.do).to.equal('top-site.com');
       expect(data.re).to.equal('http://search-traffic-source.com');
     });
 
     it('handles referer data and GDPR, USP Consent, COPPA', () => {
-      const { data } = spec.buildRequests([sampleBidRequestBase], sampleBidderRequest);
+      const { data } = spec.buildRequests(
+        [sampleBidRequestBase],
+        sampleBidderRequest
+      );
       delete data.m; // don't deal with "m" in this test
-      expect(data.gs).to.equal(sampleBidderRequest.gdprConsent.gdprApplies)
-      expect(data.gc).to.equal(sampleBidderRequest.gdprConsent.consentString)
-      expect(data.usp).to.equal(sampleBidderRequest.uspConsent)
-      expect(data.cpp).to.equal(0)
+      expect(data.gs).to.equal(sampleBidderRequest.gdprConsent.gdprApplies);
+      expect(data.gc).to.equal(sampleBidderRequest.gdprConsent.consentString);
+      expect(data.usp).to.equal(sampleBidderRequest.uspConsent);
+      expect(data.cpp).to.equal(0);
     });
 
     it('will forward bid request count & wins count data', () => {
-      const bidderRequestsCount = Math.floor(Math.random() * 100)
-      const bidderWinsCount = Math.floor(Math.random() * 100)
-      const { data } = spec.buildRequests([{
-        ...sampleBidRequestBase,
-        bidderRequestsCount,
-        bidderWinsCount
-      }], sampleBidderRequest);
+      const bidderRequestsCount = Math.floor(Math.random() * 100);
+      const bidderWinsCount = Math.floor(Math.random() * 100);
+      const { data } = spec.buildRequests(
+        [
+          {
+            ...sampleBidRequestBase,
+            bidderRequestsCount,
+            bidderWinsCount,
+          },
+        ],
+        sampleBidderRequest
+      );
 
-      expect(data.brc).to.equal(bidderRequestsCount)
-      expect(data.bwc).to.equal(bidderWinsCount)
-      expect(data.trc).to.equal(0)
+      expect(data.brc).to.equal(bidderRequestsCount);
+      expect(data.bwc).to.equal(bidderWinsCount);
+      expect(data.trc).to.equal(0);
     });
     it('will forward first-party data', () => {
-      const { data } = spec.buildRequests([sampleBidRequestBase], sampleBidderRequest);
-      expect(data.fpd2).to.deep.equal(sampleFPD)
+      const { data } = spec.buildRequests(
+        [sampleBidRequestBase],
+        sampleBidderRequest
+      );
+      expect(data.fpd2).to.deep.equal(sampleFPD);
     });
 
     it('will collect & forward RTI user IDs', () => {
-      const randomRTI = `greatRTI${Math.floor(Math.random() * 100)}`
+      const randomRTI = `greatRTI${Math.floor(Math.random() * 100)}`;
       const userId = {
         britepoolid: 'sample-britepool',
         criteoId: 'sample-criteo',
-        digitrustid: {data: {id: 'sample-digitrust'}},
-        id5id: {uid: 'sample-id5'},
+        digitrustid: { data: { id: 'sample-digitrust' } },
+        id5id: { uid: 'sample-id5' },
         idl_env: 'sample-liveramp',
-        lipb: {lipbid: 'sample-liveintent'},
+        lipb: { lipbid: 'sample-liveintent' },
         netId: 'sample-netid',
         parrableId: { eid: 'sample-parrable' },
         pubcid: 'sample-pubcid',
@@ -296,71 +343,74 @@ describe('AmxBidAdapter', () => {
       const eids = createEidsArray(userId);
       const bid = {
         ...sampleBidRequestBase,
-        userIdAsEids: eids
+        userIdAsEids: eids,
       };
 
       const { data } = spec.buildRequests([bid, bid], sampleBidderRequest);
-      expect(data.eids).to.deep.equal(eids)
+      expect(data.eids).to.deep.equal(eids);
     });
 
     it('can build a banner request', () => {
-      const { method, url, data } = spec.buildRequests([sampleBidRequestBase, {
-        ...sampleBidRequestBase,
-        bidId: sampleRequestId + '_2',
-        params: {
-          ...sampleBidRequestBase.params,
-          tagId: 'example'
-        }
-      }], sampleBidderRequest)
+      const { method, url, data } = spec.buildRequests(
+        [
+          sampleBidRequestBase,
+          {
+            ...sampleBidRequestBase,
+            bidId: sampleRequestId + '_2',
+            params: {
+              ...sampleBidRequestBase.params,
+              tagId: 'example',
+            },
+          },
+        ],
+        sampleBidderRequest
+      );
 
-      expect(url).to.equal(sampleBidRequestBase.params.endpoint)
+      expect(url).to.equal(sampleBidRequestBase.params.endpoint);
       expect(method).to.equal('POST');
       expect(Object.keys(data.m).length).to.equal(2);
       expect(data.m[sampleRequestId]).to.deep.equal({
         av: true,
         au: 'div-gpt-ad-example',
         vd: {},
-        ms: [
-          [[320, 50]],
-          [[300, 250]],
-          []
-        ],
+        ms: [[[320, 50]], [[300, 250]], []],
         aw: 300,
         sc: {},
         ah: 250,
         tf: 0,
         f: 0.5,
-        vr: false
+        vr: false,
+        rtb: {
+          ext: sampleImpExt,
+        },
       });
       expect(data.m[sampleRequestId + '_2']).to.deep.equal({
         av: true,
         aw: 300,
         au: 'div-gpt-ad-example',
         sc: {},
-        ms: [
-          [[320, 50]],
-          [[300, 250]],
-          []
-        ],
+        ms: [[[320, 50]], [[300, 250]], []],
         i: 'example',
         ah: 250,
         vd: {},
         tf: 0,
         f: 0.5,
         vr: false,
+        rtb: {
+          ext: sampleImpExt,
+        },
       });
     });
 
     it('can build a video request', () => {
-      const { data } = spec.buildRequests([sampleBidRequestVideo], sampleBidderRequest);
+      const { data } = spec.buildRequests(
+        [sampleBidRequestVideo],
+        sampleBidderRequest
+      );
       expect(Object.keys(data.m).length).to.equal(1);
       expect(data.m[sampleRequestId + '_video']).to.deep.equal({
         au: 'div-gpt-ad-example',
-        ms: [
-          [[300, 150]],
-          [],
-          [[360, 250]]
-        ],
+        ms: [[[300, 150]], [], [[360, 250]]],
         av: true,
         aw: 360,
         ah: 250,
@@ -369,11 +419,14 @@ describe('AmxBidAdapter', () => {
           sizes: [[360, 250]],
           context: 'adpod',
           adPodDurationSec: 90,
-          contentMode: 'live'
+          contentMode: 'live',
         },
         tf: 0,
         f: 0.5,
-        vr: true
+        rtb: {
+          ext: sampleImpExt,
+        },
+        vr: true,
       });
     });
   });
@@ -397,18 +450,21 @@ describe('AmxBidAdapter', () => {
             aw: 300,
             ah: 250,
           },
-        }
-      }
+        },
+      },
     };
 
     it('will handle a nobid response', () => {
-      const parsed = spec.interpretResponse({ body: '' }, baseRequest)
-      expect(parsed).to.eql([])
+      const parsed = spec.interpretResponse({ body: '' }, baseRequest);
+      expect(parsed).to.eql([]);
     });
 
     it('can parse a display ad', () => {
-      const parsed = spec.interpretResponse({ body: sampleServerResponse }, baseRequest)
-      expect(parsed.length).to.equal(2)
+      const parsed = spec.interpretResponse(
+        { body: sampleServerResponse },
+        baseRequest
+      );
+      expect(parsed.length).to.equal(2);
 
       // we should have display, video, display
       expect(parsed[0]).to.deep.equal({
@@ -421,16 +477,16 @@ describe('AmxBidAdapter', () => {
         width: 300,
         height: 600, // from the bid itself
         ttl: 90,
-        ad: sampleDisplayAd(
-          `<img src="${embeddedTrackingPixel}" width="0" height="0"/>` +
-          `<img src="${sampleNurl}" width="0" height="0"/>`
-        ),
+        ad: sampleDisplayAd,
       });
     });
 
     it('can parse a video ad', () => {
-      const parsed = spec.interpretResponse({ body: sampleServerResponse }, baseRequest)
-      expect(parsed.length).to.equal(2)
+      const parsed = spec.interpretResponse(
+        { body: sampleServerResponse },
+        baseRequest
+      );
+      expect(parsed.length).to.equal(2);
       expect(parsed[1]).to.deep.equal({
         ...baseBidResponse,
         meta: {
@@ -453,9 +509,9 @@ describe('AmxBidAdapter', () => {
       _Image = window.Image;
       window.Image = class FakeImage {
         set src(value) {
-          firedPixels.push(value)
+          firedPixels.push(value);
         }
-      }
+      };
     });
 
     beforeEach(() => {
@@ -479,24 +535,26 @@ describe('AmxBidAdapter', () => {
         adserverTargeting: {
           hb_pb: '1.23',
           hb_adid: 'ad-id',
-          hb_bidder: 'example'
-        }
+          hb_bidder: 'example',
+        },
       });
-      expect(firedPixels.length).to.equal(1)
-      expect(firedPixels[0]).to.match(/\/hbx\/g_pbst/)
+      expect(firedPixels.length).to.equal(1);
+      expect(firedPixels[0]).to.match(/\/hbx\/g_pbst/);
       try {
         const parsed = new URL(firedPixels[0]);
         const nestedData = parsed.searchParams.get('c2');
-        expect(nestedData).to.equal(utils.formatQS({
-          hb_pb: '1.23',
-          hb_adid: 'ad-id',
-          hb_bidder: 'example'
-        }));
+        expect(nestedData).to.equal(
+          utils.formatQS({
+            hb_pb: '1.23',
+            hb_adid: 'ad-id',
+            hb_bidder: 'example',
+          })
+        );
       } catch (e) {
         // unsupported browser; try testing for string
         const pixel = firedPixels[0];
-        expect(pixel).to.have.string(encodeURIComponent('hb_pb=1.23'))
-        expect(pixel).to.have.string(encodeURIComponent('hb_adid=ad-id'))
+        expect(pixel).to.have.string(encodeURIComponent('hb_pb=1.23'));
+        expect(pixel).to.have.string(encodeURIComponent('hb_adid=ad-id'));
       }
     });
 
@@ -506,10 +564,10 @@ describe('AmxBidAdapter', () => {
         bidId: 'test-bid-id',
         adUnitCode: 'div-gpt-ad',
         timeout: 300,
-        auctionId: utils.getUniqueIdentifierStr()
+        auctionId: utils.getUniqueIdentifierStr(),
       });
-      expect(firedPixels.length).to.equal(1)
-      expect(firedPixels[0]).to.match(/\/hbx\/g_pbto/)
+      expect(firedPixels.length).to.equal(1);
+      expect(firedPixels[0]).to.match(/\/hbx\/g_pbto/);
     });
 
     it('will log an event for prebid win', () => {
@@ -522,19 +580,19 @@ describe('AmxBidAdapter', () => {
         cpm: 1.34,
         adUnitCode: 'div-gpt-ad',
         timeout: 300,
-        auctionId: utils.getUniqueIdentifierStr()
+        auctionId: utils.getUniqueIdentifierStr(),
       });
-      expect(firedPixels.length).to.equal(1)
-      expect(firedPixels[0]).to.match(/\/hbx\/g_pbwin/)
+      expect(firedPixels.length).to.equal(1);
+      expect(firedPixels[0]).to.match(/\/hbx\/g_pbwin/);
 
       const pixel = firedPixels[0];
       try {
         const url = new URL(pixel);
-        expect(url.searchParams.get('C')).to.equal('1')
-        expect(url.searchParams.get('np')).to.equal('1.34')
+        expect(url.searchParams.get('C')).to.equal('1');
+        expect(url.searchParams.get('np')).to.equal('1.34');
       } catch (e) {
-        expect(pixel).to.have.string('C=1')
-        expect(pixel).to.have.string('np=1.34')
+        expect(pixel).to.have.string('C=1');
+        expect(pixel).to.have.string('np=1.34');
       }
     });
   });

From dd17d37578c47651e6c4e409b4f20c599c038074 Mon Sep 17 00:00:00 2001
From: Mathieu Pheulpin <mpheulpin@sharethrough.com>
Date: Tue, 13 Sep 2022 20:21:42 -0700
Subject: [PATCH 253/569] Sharethrough Bid Adapter: Add support for Transaction
 ID (#8988)

* [PGE-178206904] Send Transaction ID to STX

`source.tid` is transaction id at the request level
`bidReq.ortb2Imp` may carry a transaction id at the impression level (`imp.ext.tid`)

Followed recommendations provided by contributors here: https://github.com/prebid/Prebid.js/issues/8573

PGE-178206904

* Bump adapter version

* Fix Transaction ID + Be more conscious about what we put in `imp.ext`
---
 modules/sharethroughBidAdapter.js             | 14 ++++++-----
 .../modules/sharethroughBidAdapter_spec.js    | 25 +++++++++++++++++--
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/modules/sharethroughBidAdapter.js b/modules/sharethroughBidAdapter.js
index cfbd94096bd..4ae8b98efa4 100644
--- a/modules/sharethroughBidAdapter.js
+++ b/modules/sharethroughBidAdapter.js
@@ -4,7 +4,7 @@ import { config } from '../src/config.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { createEidsArray } from './userId/eids.js';
 
-const VERSION = '4.2.0';
+const VERSION = '4.3.0';
 const BIDDER_CODE = 'sharethrough';
 const SUPPLY_ID = 'WYu2BXv1';
 
@@ -52,6 +52,7 @@ export const sharethroughAdapterSpec = {
         ext: {},
       },
       source: {
+        tid: bidRequests[0].transactionId,
         ext: {
           version: '$prebid.version$',
           str: VERSION,
@@ -80,12 +81,13 @@ export const sharethroughAdapterSpec = {
     }
 
     const imps = bidRequests.map(bidReq => {
-      const impression = {};
+      const impression = { ext: {} };
 
-      const gpid = deepAccess(bidReq, 'ortb2Imp.ext.data.pbadslot');
-      if (gpid) {
-        impression.ext = { gpid: gpid };
-      }
+      // mergeDeep(impression, bidReq.ortb2Imp); // leaving this out for now as we may want to leave stuff out on purpose
+      const tid = deepAccess(bidReq, 'ortb2Imp.ext.tid');
+      if (tid) impression.ext.tid = tid;
+      const gpid = deepAccess(bidReq, 'ortb2Imp.ext.gpid', deepAccess(bidReq, 'ortb2Imp.ext.data.pbadslot'));
+      if (gpid) impression.ext.gpid = gpid;
 
       const videoRequest = deepAccess(bidReq, 'mediaTypes.video');
 
diff --git a/test/spec/modules/sharethroughBidAdapter_spec.js b/test/spec/modules/sharethroughBidAdapter_spec.js
index bb5e8e69b6e..bc9affd4d0d 100644
--- a/test/spec/modules/sharethroughBidAdapter_spec.js
+++ b/test/spec/modules/sharethroughBidAdapter_spec.js
@@ -72,6 +72,7 @@ describe('sharethrough adapter spec', function () {
         {
           bidder: 'sharethrough',
           bidId: 'bidId1',
+          transactionId: 'transactionId1',
           sizes: [[300, 250], [300, 600]],
           params: {
             pkey: 'aaaa1111',
@@ -85,8 +86,10 @@ describe('sharethrough adapter spec', function () {
           },
           ortb2Imp: {
             ext: {
+              tid: 'transaction-id-1',
+              gpid: 'universal-id',
               data: {
-                pbadslot: 'universal-id',
+                pbadslot: 'pbadslot-id',
               },
             },
           },
@@ -136,6 +139,7 @@ describe('sharethrough adapter spec', function () {
           bidder: 'sharethrough',
           bidId: 'bidId2',
           sizes: [[600, 300]],
+          transactionId: 'transactionId2',
           params: {
             pkey: 'bbbb2222',
           },
@@ -229,6 +233,7 @@ describe('sharethrough adapter spec', function () {
             expect(openRtbReq.device.ua).to.equal(navigator.userAgent);
             expect(openRtbReq.regs.coppa).to.equal(1);
 
+            expect(openRtbReq.source.tid).to.equal(bidRequests[0].transactionId);
             expect(openRtbReq.source.ext.version).not.to.be.undefined;
             expect(openRtbReq.source.ext.str).not.to.be.undefined;
             expect(openRtbReq.source.ext.schain).to.deep.equal(bidRequests[0].schain);
@@ -310,12 +315,28 @@ describe('sharethrough adapter spec', function () {
         });
       });
 
+      describe('transaction id at the impression level', () => {
+        it('should include transaction id when provided', () => {
+          const requests = spec.buildRequests(bidRequests, bidderRequest);
+
+          expect(requests[0].data.imp[0].ext.tid).to.equal('transaction-id-1');
+          expect(requests[1].data.imp[0].ext).to.be.empty;
+        });
+      });
+
       describe('universal id', () => {
         it('should include gpid when universal id is provided', () => {
           const requests = spec.buildRequests(bidRequests, bidderRequest);
 
           expect(requests[0].data.imp[0].ext.gpid).to.equal('universal-id');
-          expect(requests[1].data.imp[0].ext).to.be.undefined;
+          expect(requests[1].data.imp[0].ext).to.be.empty;
+        });
+
+        it('should include gpid when pbadslot is provided without universal id', () => {
+          delete bidRequests[0].ortb2Imp.ext.gpid;
+          const requests = spec.buildRequests(bidRequests, bidderRequest);
+
+          expect(requests[0].data.imp[0].ext.gpid).to.equal('pbadslot-id');
         });
       });
 

From e25ed7ea4e09eaffbc0da10c3e410bf27ad8d2a7 Mon Sep 17 00:00:00 2001
From: jackhsiehucf <77815341+jackhsiehucf@users.noreply.github.com>
Date: Wed, 14 Sep 2022 11:29:40 +0800
Subject: [PATCH 254/569] ucfunnel Bid Adapter: add GPID support and fix page
 and domain parameter. (#8986)

* Add a new ucfunnel Adapter and test page

* Add a new ucfunnel Adapter and test page

* 1. Use prebid lib in the repo to keep updated
2. Replace var with let
3. Put JSON.parse(JSON.stringify()) into try catch block

* utils.getTopWindowLocation is a function

* Change to modules from adapters

* Migrate to module design

* [Dev Fix] Remove width and height which can be got from ad unit id

* Update ucfunnelBidAdapter to fit into new spec

* Correct the endpoint. Fix the error of query string

* Add test case for ucfunnelBidAdapter

* Fix lint error

* Update version number

* Combine all checks on bid request

* Add GDPR support for ucfunnel adapter

* Add in-stream video and native support for ucfunnel adapter

* Remove demo page. Add more test cases.

* Change request method from POST to GET

* Remove unnecessary comment

* Support vastXml and vastUrl for video request

* update TTL to 30 mins

* Avoid using arrow function which is not discuraged in mocha

* ucfunnel tdid support

* ucfunnel fix error message in debug mode

* ucfunnel adapter add bidfloor parameter

* ucfunnel adapter support CCPA

* ucfunnel adapter native support clicktrackers

* ucfunnel adapter change cookie sync setting

* ucfunnel adapter update request parameter

* Update ucfunnelBidAdapter

* ucfunnel adapter add currency in ad response

* ucfunnel adapter support uid2

* ucfunnel Bid Adapter: add support for FLoC and Verizon Media ConnectID

* ucfunnel Bid Adapter: add support Price Floors Module

* ucfunnel Bid Adapter: add GPID support and fix page and domain parameter.

Co-authored-by: root <root@ubuntu.members.linode.com>
Co-authored-by: Ryan Chou <ryanchou0210@gmail.com>
Co-authored-by: ucfunnel <support@ucfunnel.com>
Co-authored-by: jack.hsieh <moonnight8520@gmail.com>
---
 modules/ucfunnelBidAdapter.js                | 19 ++++++-----
 test/spec/modules/ucfunnelBidAdapter_spec.js | 34 ++++++++++++++------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/modules/ucfunnelBidAdapter.js b/modules/ucfunnelBidAdapter.js
index b441d93bcf5..2225deaa900 100644
--- a/modules/ucfunnelBidAdapter.js
+++ b/modules/ucfunnelBidAdapter.js
@@ -1,4 +1,4 @@
-import { generateUUID, _each } from '../src/utils.js';
+import { generateUUID, _each, deepAccess } from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
@@ -251,6 +251,7 @@ function getRequestData(bid, bidderRequest) {
   const userIdTdid = (bid.userId && bid.userId.tdid) ? bid.userId.tdid : '';
   const supplyChain = getSupplyChain(bid.schain);
   const bidFloor = getFloor(bid, size, bid.mediaTypes);
+  const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid');
   // general bid data
   let bidData = {
     ver: VER,
@@ -267,17 +268,15 @@ function getRequestData(bid, bidderRequest) {
     bidData.fp = bidFloor;
   }
 
-  addUserId(bidData, bid.userId);
-  // TODO: is 'page' the right value here? does the fallback make sense?
-  bidData.u = bidderRequest?.refererInfo?.page || bidderRequest?.refererInfo?.topmostLocation;
-  try {
-    bidData.host = window.top.location.hostname;
-    bidData.xr = 0;
-  } catch (e) {
-    bidData.host = window.location.hostname;
-    bidData.xr = 1;
+  if (gpid) {
+    bidData.gpid = gpid;
   }
 
+  addUserId(bidData, bid.userId);
+
+  bidData.u = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
+  bidData.host = bidderRequest.refererInfo.domain;
+
   if (window.location.ancestorOrigins && window.location.ancestorOrigins.length > 0) {
     bidData.ao = window.location.ancestorOrigins[window.location.ancestorOrigins.length - 1];
   }
diff --git a/test/spec/modules/ucfunnelBidAdapter_spec.js b/test/spec/modules/ucfunnelBidAdapter_spec.js
index 76e448b7694..992708bd2ea 100644
--- a/test/spec/modules/ucfunnelBidAdapter_spec.js
+++ b/test/spec/modules/ucfunnelBidAdapter_spec.js
@@ -5,7 +5,11 @@ const URL = 'https://hb.aralego.com/header';
 const BIDDER_CODE = 'ucfunnel';
 
 const bidderRequest = {
-  uspConsent: '1YNN'
+  uspConsent: '1YNN',
+  refererInfo: {
+    domain: 'example.com',
+    page: 'http://example.com/index.html'
+  }
 };
 
 const userId = {
@@ -28,6 +32,11 @@ const validBannerBidReq = {
   sizes: [[300, 250]],
   bidId: '263be71e91dd9d',
   auctionId: '9ad1fa8d-2297-4660-a018-b39945054746',
+  ortb2Imp: {
+    ext: {
+      gpid: '/1111/homepage#div-leftnav'
+    }
+  },
   userId: userId,
   'schain': {
     'ver': '1.0',
@@ -151,6 +160,11 @@ describe('ucfunnel Adapter', function () {
       expect(request[0].bidRequest).to.equal(validBannerBidReq);
     });
 
+    it('should set gpid if configured', function () {
+      const data = request[0].data;
+      expect(data.gpid).to.equal('/1111/homepage#div-leftnav');
+    });
+
     it('should attach request data', function () {
       const data = request[0].data;
       const [ width, height ] = validBannerBidReq.sizes[0];
@@ -166,7 +180,7 @@ describe('ucfunnel Adapter', function () {
       const width = 640;
       const height = 480;
       validBannerBidReq.sizes = [[ width, height ]];
-      const requests = spec.buildRequests([ validBannerBidReq ]);
+      const requests = spec.buildRequests([ validBannerBidReq ], bidderRequest);
       const data = requests[0].data;
       expect(data.w).to.equal(width);
       expect(data.h).to.equal(height);
@@ -180,7 +194,7 @@ describe('ucfunnel Adapter', function () {
           floor: 2.02
         }
       };
-      const requests = spec.buildRequests([ bid ]);
+      const requests = spec.buildRequests([ bid ], bidderRequest);
       const data = requests[0].data;
       expect(data.fp).to.equal(2.02);
     });
@@ -188,7 +202,7 @@ describe('ucfunnel Adapter', function () {
     it('should set bidfloor if configured', function() {
       let bid = Object.assign({}, validBannerBidReq);
       bid.params.bidfloor = 2.01;
-      const requests = spec.buildRequests([ bid ]);
+      const requests = spec.buildRequests([ bid ], bidderRequest);
       const data = requests[0].data;
       expect(data.fp).to.equal(2.01);
     });
@@ -202,7 +216,7 @@ describe('ucfunnel Adapter', function () {
         }
       };
       bid.params.bidfloor = 2.01;
-      const requests = spec.buildRequests([ bid ]);
+      const requests = spec.buildRequests([ bid ], bidderRequest);
       const data = requests[0].data;
       expect(data.fp).to.equal(2.01);
     });
@@ -210,7 +224,7 @@ describe('ucfunnel Adapter', function () {
 
   describe('interpretResponse', function () {
     describe('should support banner', function () {
-      const request = spec.buildRequests([ validBannerBidReq ]);
+      const request = spec.buildRequests([ validBannerBidReq ], bidderRequest);
       const result = spec.interpretResponse({body: validBannerBidRes}, request[0]);
       it('should build bid array for banner', function () {
         expect(result.length).to.equal(1);
@@ -229,7 +243,7 @@ describe('ucfunnel Adapter', function () {
     });
 
     describe('handle banner no ad', function () {
-      const request = spec.buildRequests([ validBannerBidReq ]);
+      const request = spec.buildRequests([ validBannerBidReq ], bidderRequest);
       const result = spec.interpretResponse({body: invalidBannerBidRes}, request[0]);
       it('should build bid array for banner', function () {
         expect(result.length).to.equal(1);
@@ -247,7 +261,7 @@ describe('ucfunnel Adapter', function () {
     });
 
     describe('handle banner cpm under bidfloor', function () {
-      const request = spec.buildRequests([ validBannerBidReq ]);
+      const request = spec.buildRequests([ validBannerBidReq ], bidderRequest);
       const result = spec.interpretResponse({body: invalidBannerBidRes}, request[0]);
       it('should build bid array for banner', function () {
         expect(result.length).to.equal(1);
@@ -265,7 +279,7 @@ describe('ucfunnel Adapter', function () {
     });
 
     describe('should support video', function () {
-      const request = spec.buildRequests([ validVideoBidReq ]);
+      const request = spec.buildRequests([ validVideoBidReq ], bidderRequest);
       const result = spec.interpretResponse({body: validVideoBidRes}, request[0]);
       it('should build bid array', function () {
         expect(result.length).to.equal(1);
@@ -285,7 +299,7 @@ describe('ucfunnel Adapter', function () {
     });
 
     describe('should support native', function () {
-      const request = spec.buildRequests([ validNativeBidReq ]);
+      const request = spec.buildRequests([ validNativeBidReq ], bidderRequest);
       const result = spec.interpretResponse({body: validNativeBidRes}, request[0]);
       it('should build bid array', function () {
         expect(result.length).to.equal(1);

From f0282eed1e653cfa21a6b69531d30effd6829b2d Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 13 Sep 2022 21:32:42 -0600
Subject: [PATCH 255/569] Core & multiple modules: collect granular timing
 metrics for auctions, requests, responses (#8914)

* Request side metrics

* Response side metrics

* UserID metrics

* Minor fixes

* Add config option to disable metrics
---
 modules/categoryTranslation.js           |  17 +-
 modules/consentManagement.js             |   6 +-
 modules/consentManagementUsp.js          |   5 +-
 modules/currency.js                      |   7 +-
 modules/dataControllerModule/index.js    |   7 +-
 modules/dchain.js                        |   5 +-
 modules/fpdModule/index.js               |   5 +-
 modules/mass.js                          |   8 +-
 modules/multibid/index.js                |   6 +-
 modules/prebidServerBidAdapter/index.js  |  22 +-
 modules/priceFloors.js                   |   9 +-
 modules/pubCommonId.js                   |   5 +-
 modules/rtdModule/index.js               |   5 +-
 modules/userId/index.js                  | 121 ++++---
 src/adapterManager.js                    |  34 +-
 src/adapters/bidderFactory.js            |  34 +-
 src/auction.js                           |  21 +-
 src/auctionManager.js                    |   5 +
 src/prebid.js                            |  75 +++--
 src/secureCreatives.js                   |   2 +-
 src/utils/perfMetrics.js                 | 386 ++++++++++++++++++++++
 test/spec/unit/utils/perfMetrics_spec.js | 394 +++++++++++++++++++++++
 22 files changed, 1045 insertions(+), 134 deletions(-)
 create mode 100644 src/utils/perfMetrics.js
 create mode 100644 test/spec/unit/utils/perfMetrics_spec.js

diff --git a/modules/categoryTranslation.js b/modules/categoryTranslation.js
index 9a9289fcd73..57267095ff0 100644
--- a/modules/categoryTranslation.js
+++ b/modules/categoryTranslation.js
@@ -11,12 +11,13 @@
  * If publisher has not defined translation file than prebid will use default prebid translation file provided here //cdn.jsdelivr.net/gh/prebid/category-mapping-file@1/freewheel-mapping.json
  */
 
-import { config } from '../src/config.js';
-import { setupBeforeHookFnOnce, hook } from '../src/hook.js';
-import { ajax } from '../src/ajax.js';
-import { timestamp, logError } from '../src/utils.js';
-import { addBidResponse } from '../src/auction.js';
-import { getCoreStorageManager } from '../src/storageManager.js';
+import {config} from '../src/config.js';
+import {hook, setupBeforeHookFnOnce} from '../src/hook.js';
+import {ajax} from '../src/ajax.js';
+import {logError, timestamp} from '../src/utils.js';
+import {addBidResponse} from '../src/auction.js';
+import {getCoreStorageManager} from '../src/storageManager.js';
+import {timedBidResponseHook} from '../src/utils/perfMetrics.js';
 
 export const storage = getCoreStorageManager('categoryTranslation');
 const DEFAULT_TRANSLATION_FILE_URL = 'https://cdn.jsdelivr.net/gh/prebid/category-mapping-file@1/freewheel-mapping.json';
@@ -33,7 +34,7 @@ export const registerAdserver = hook('async', function(adServer) {
 }, 'registerAdserver');
 registerAdserver();
 
-export function getAdserverCategoryHook(fn, adUnitCode, bid) {
+export const getAdserverCategoryHook = timedBidResponseHook('categoryTranslation', function getAdserverCategoryHook(fn, adUnitCode, bid) {
   if (!bid) {
     return fn.call(this, adUnitCode); // if no bid, call original and let it display warnings
   }
@@ -63,7 +64,7 @@ export function getAdserverCategoryHook(fn, adUnitCode, bid) {
     }
   }
   fn.call(this, adUnitCode, bid);
-}
+});
 
 export function initTranslation(url, localStorageKey) {
   setupBeforeHookFnOnce(addBidResponse, getAdserverCategoryHook, 50);
diff --git a/modules/consentManagement.js b/modules/consentManagement.js
index 44a0d7d65c6..3d6562958c3 100644
--- a/modules/consentManagement.js
+++ b/modules/consentManagement.js
@@ -8,6 +8,7 @@ import {isNumber, isPlainObject, isStr, logError, logInfo, logWarn} from '../src
 import {config} from '../src/config.js';
 import {gdprDataHandler} from '../src/adapterManager.js';
 import {includes} from '../src/polyfill.js';
+import {timedAuctionHook} from '../src/utils/perfMetrics.js';
 
 const DEFAULT_CMP = 'iab';
 const DEFAULT_CONSENT_TIMEOUT = 10000;
@@ -227,7 +228,7 @@ function loadIfMissing(cb) {
  * @param {object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
  * @param {function} fn required; The next function in the chain, used by hook.js
  */
-export function requestBidsHook(fn, reqBidsConfigObj) {
+export const requestBidsHook = timedAuctionHook('gdpr', function requestBidsHook(fn, reqBidsConfigObj) {
   loadIfMissing(function (shouldCancelAuction, errMsg, ...extraArgs) {
     if (errMsg) {
       let log = logWarn;
@@ -239,6 +240,7 @@ export function requestBidsHook(fn, reqBidsConfigObj) {
     }
 
     if (shouldCancelAuction) {
+      fn.stopTiming();
       if (typeof reqBidsConfigObj.bidsBackHandler === 'function') {
         reqBidsConfigObj.bidsBackHandler();
       } else {
@@ -248,7 +250,7 @@ export function requestBidsHook(fn, reqBidsConfigObj) {
       fn.call(this, reqBidsConfigObj);
     }
   });
-}
+});
 
 /**
  * This function checks the consent data provided by CMP to ensure it's in an expected state.
diff --git a/modules/consentManagementUsp.js b/modules/consentManagementUsp.js
index 3dcb236ac84..b6a627a1baa 100644
--- a/modules/consentManagementUsp.js
+++ b/modules/consentManagementUsp.js
@@ -8,6 +8,7 @@ import { isFn, logInfo, logWarn, isStr, isNumber, isPlainObject, logError } from
 import { config } from '../src/config.js';
 import { uspDataHandler } from '../src/adapterManager.js';
 import {getGlobal} from '../src/prebidGlobal.js';
+import {timedAuctionHook} from '../src/utils/perfMetrics.js';
 
 const DEFAULT_CONSENT_API = 'iab';
 const DEFAULT_CONSENT_TIMEOUT = 50;
@@ -211,14 +212,14 @@ function loadConsentData(cb) {
  * @param {object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
  * @param {function} fn required; The next function in the chain, used by hook.js
  */
-export function requestBidsHook(fn, reqBidsConfigObj) {
+export const requestBidsHook = timedAuctionHook('usp', function requestBidsHook(fn, reqBidsConfigObj) {
   loadConsentData((errMsg, ...extraArgs) => {
     if (errMsg != null) {
       logWarn(errMsg, ...extraArgs);
     }
     fn.call(this, reqBidsConfigObj);
   });
-}
+});
 
 /**
  * This function checks the consent data provided by USPAPI to ensure it's in an expected state.
diff --git a/modules/currency.js b/modules/currency.js
index 5b0f9af7afc..f0ad6681afa 100644
--- a/modules/currency.js
+++ b/modules/currency.js
@@ -6,6 +6,7 @@ import { ajax } from '../src/ajax.js';
 import { config } from '../src/config.js';
 import { getHook } from '../src/hook.js';
 import {defer} from '../src/utils/promise.js';
+import {timedBidResponseHook} from '../src/utils/perfMetrics.js';
 
 const DEFAULT_CURRENCY_RATE_URL = 'https://cdn.jsdelivr.net/gh/prebid/currency-file@1/latest.json?date=$$TODAY$$';
 const CURRENCY_RATE_PRECISION = 4;
@@ -180,7 +181,7 @@ function resetCurrency() {
   bidderCurrencyDefault = {};
 }
 
-export function addBidResponseHook(fn, adUnitCode, bid) {
+export const addBidResponseHook = timedBidResponseHook('currency', function addBidResponseHook(fn, adUnitCode, bid) {
   if (!bid) {
     return fn.call(this, adUnitCode); // if no bid, call original and let it display warnings
   }
@@ -215,9 +216,9 @@ export function addBidResponseHook(fn, adUnitCode, bid) {
   if (!currencySupportEnabled || currencyRatesLoaded) {
     processBidResponseQueue();
   } else {
-    fn.bail(ready.promise());
+    fn.untimed.bail(ready.promise());
   }
-}
+});
 
 function processBidResponseQueue() {
   while (bidResponseQueue.length > 0) {
diff --git a/modules/dataControllerModule/index.js b/modules/dataControllerModule/index.js
index c9d15457c3d..b1866e3783f 100644
--- a/modules/dataControllerModule/index.js
+++ b/modules/dataControllerModule/index.js
@@ -6,6 +6,7 @@ import {config} from '../../src/config.js';
 import {getHook, module} from '../../src/hook.js';
 import {deepAccess, deepSetValue, prefixLog} from '../../src/utils.js';
 import {startAuction} from '../../src/prebid.js';
+import {timedAuctionHook} from '../../src/utils/perfMetrics.js';
 
 const LOG_PRE_FIX = 'Data_Controller : ';
 const ALL = '*';
@@ -18,7 +19,7 @@ const _logger = prefixLog(LOG_PRE_FIX);
 /**
  * BidderRequests hook to intiate module and reset data object
  */
-export function filterBidData(fn, req) {
+export const filterBidData = timedAuctionHook('dataController', function filterBidData(fn, req) {
   if (_dataControllerConfig.filterEIDwhenSDA) {
     filterEIDs(req.adUnits, req.ortb2Fragments);
   }
@@ -28,7 +29,7 @@ export function filterBidData(fn, req) {
   }
   fn.call(this, req);
   return req;
-}
+});
 
 function containsConfiguredEIDS(eidSourcesMap, bidderCode) {
   if (_dataControllerConfig.filterSDAwhenEID.includes(ALL)) {
@@ -111,7 +112,7 @@ function constructSegment(userData) {
 function getEIDsSource(adUnits) {
   let bidderEIDSMap = new Map();
   adUnits.forEach(adUnit => {
-    adUnit.bids.forEach(bid => {
+    (adUnit.bids || []).forEach(bid => {
       let userEIDs = deepAccess(bid, 'userIdAsEids') || [];
 
       if (userEIDs) {
diff --git a/modules/dchain.js b/modules/dchain.js
index fbe78fc5c86..79e20520e93 100644
--- a/modules/dchain.js
+++ b/modules/dchain.js
@@ -2,6 +2,7 @@ import {includes} from '../src/polyfill.js';
 import {config} from '../src/config.js';
 import {getHook} from '../src/hook.js';
 import {_each, deepAccess, deepClone, hasOwn, isArray, isPlainObject, isStr, logError, logWarn} from '../src/utils.js';
+import {timedBidResponseHook} from '../src/utils/perfMetrics.js';
 
 const shouldBeAString = ' should be a string';
 const shouldBeAnObject = ' should be an object';
@@ -108,7 +109,7 @@ function isValidDchain(bid) {
   }
 }
 
-export function addBidResponseHook(fn, adUnitCode, bid) {
+export const addBidResponseHook = timedBidResponseHook('dchain', function addBidResponseHook(fn, adUnitCode, bid) {
   const basicDchain = {
     ver: '1.0',
     complete: 0,
@@ -140,7 +141,7 @@ export function addBidResponseHook(fn, adUnitCode, bid) {
   }
 
   fn(adUnitCode, bid);
-}
+});
 
 export function init() {
   getHook('addBidResponse').before(addBidResponseHook, 35);
diff --git a/modules/fpdModule/index.js b/modules/fpdModule/index.js
index 553cab47b66..0b0c0906f84 100644
--- a/modules/fpdModule/index.js
+++ b/modules/fpdModule/index.js
@@ -6,6 +6,7 @@ import { config } from '../../src/config.js';
 import { module, getHook } from '../../src/hook.js';
 import {logError} from '../../src/utils.js';
 import {GreedyPromise} from '../../src/utils/promise.js';
+import {timedAuctionHook} from '../../src/utils/perfMetrics.js';
 
 let submodules = [];
 
@@ -35,12 +36,12 @@ export function processFpd({global = {}, bidder = {}} = {}) {
   return result;
 }
 
-export function startAuctionHook(fn, req) {
+export const startAuctionHook = timedAuctionHook('fpd', function startAuctionHook(fn, req) {
   processFpd(req.ortb2Fragments).then((ortb2Fragments) => {
     Object.assign(req.ortb2Fragments, ortb2Fragments);
     fn.call(this, req);
   })
-}
+});
 
 function setupHook() {
   getHook('startAuction').before(startAuctionHook, 10);
diff --git a/modules/mass.js b/modules/mass.js
index f38f833f4d3..6a01f06bd90 100644
--- a/modules/mass.js
+++ b/modules/mass.js
@@ -5,6 +5,7 @@
 import {config} from '../src/config.js';
 import {getHook} from '../src/hook.js';
 import {auctionManager} from '../src/auctionManager.js';
+import {timedBidResponseHook} from '../src/utils/perfMetrics.js';
 
 const defaultCfg = {
   dealIdPattern: /^MASS/i
@@ -17,7 +18,6 @@ export let isEnabled = false;
 const matchedBids = {};
 let renderers;
 
-init();
 config.getConfig('mass', config => init(config.mass));
 
 /**
@@ -78,7 +78,7 @@ export function updateRenderers() {
 /**
  * Before hook for 'addBidResponse'.
  */
-export function addBidResponseHook(next, adUnitCode, bid, {index = auctionManager.index} = {}) {
+export const addBidResponseHook = timedBidResponseHook('mass', function addBidResponseHook(next, adUnitCode, bid, {index = auctionManager.index} = {}) {
   let renderer;
   for (let i = 0; i < renderers.length; i++) {
     if (renderers[i].match(bid)) {
@@ -105,7 +105,7 @@ export function addBidResponseHook(next, adUnitCode, bid, {index = auctionManage
   }
 
   next(adUnitCode, bid);
-}
+});
 
 /**
  * Add listener for the "message" event sent by the winning bid
@@ -180,3 +180,5 @@ export function useDefaultRender(renderUrl, namespace) {
     }
   };
 }
+
+init();
diff --git a/modules/multibid/index.js b/modules/multibid/index.js
index 8081e40ccb2..fb28be83fa8 100644
--- a/modules/multibid/index.js
+++ b/modules/multibid/index.js
@@ -12,6 +12,7 @@ import * as events from '../../src/events.js';
 import CONSTANTS from '../../src/constants.json';
 import {addBidderRequests} from '../../src/auction.js';
 import {getHighestCpmBidsFromBidPool, sortByDealAndPriceBucketOrCpm} from '../../src/targeting.js';
+import {timedBidResponseHook} from '../../src/utils/perfMetrics.js';
 
 const MODULE_NAME = 'multibid';
 let hasMultibid = false;
@@ -98,7 +99,7 @@ export function adjustBidderRequestsHook(fn, bidderRequests) {
    * @param {String} ad unit code for bid
    * @param {Object} bid object
 */
-export function addBidResponseHook(fn, adUnitCode, bid) {
+export const addBidResponseHook = timedBidResponseHook('multibid', function addBidResponseHook(fn, adUnitCode, bid) {
   let floor = deepAccess(bid, 'floorData.floorValue');
 
   if (!config.getConfig('multibid')) resetMultiConfig();
@@ -141,7 +142,7 @@ export function addBidResponseHook(fn, adUnitCode, bid) {
   } else {
     fn.call(this, adUnitCode, bid);
   }
-}
+});
 
 /**
 * A descending sort function that will sort the list of objects based on the following:
@@ -227,6 +228,7 @@ export const resetMultibidUnits = () => multibidUnits = {};
 * Set up hooks on init
 */
 function init() {
+  // TODO: does this reset logic make sense - what about simultaneous auctions?
   events.on(CONSTANTS.EVENTS.AUCTION_INIT, resetMultibidUnits);
   setupBeforeHookFnOnce(addBidderRequests, adjustBidderRequestsHook);
   getHook('addBidResponse').before(addBidResponseHook, 3);
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index d99013c61f3..7b2d05479e5 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -39,6 +39,7 @@ import {ajax} from '../../src/ajax.js';
 import {hook} from '../../src/hook.js';
 import {getGlobal} from '../../src/prebidGlobal.js';
 import {hasPurpose1Consent} from '../../src/utils/gpdr.js';
+import {useMetrics} from '../../src/utils/perfMetrics.js';
 
 const getConfig = config.getConfig;
 
@@ -1097,6 +1098,12 @@ export function PrebidServer() {
 
   /* Prebid executes this function when the page asks to send out bid requests */
   baseAdapter.callBids = function(s2sBidRequest, bidRequests, addBidResponse, done, ajax) {
+    const adapterMetrics = s2sBidRequest.metrics = useMetrics(deepAccess(bidRequests, '0.metrics'))
+      .newMetrics()
+      .renameWith((n) => [`adapter.s2s.${n}`, `adapters.s2s.${s2sBidRequest.s2sConfig.defaultVendor}.${n}`])
+    done = adapterMetrics.startTiming('total').stopBefore(done);
+    bidRequests.forEach(req => useMetrics(req.metrics).join(adapterMetrics, {continuePropagation: false}));
+
     let { gdprConsent, uspConsent } = getConsentData(bidRequests);
 
     if (Array.isArray(_s2sConfigs)) {
@@ -1118,7 +1125,9 @@ export function PrebidServer() {
         },
         onError: done,
         onBid: function ({adUnit, bid}) {
-          if (isValid(adUnit, bid)) {
+          const metrics = bid.metrics = s2sBidRequest.metrics.fork().renameWith();
+          metrics.checkpoint('addBidResponse');
+          if (metrics.measureTime('addBidResponse.validate', () => isValid(adUnit, bid))) {
             addBidResponse(adUnit, bid);
           }
         }
@@ -1157,19 +1166,21 @@ export const processPBSRequest = hook('sync', function (s2sBidRequest, bidReques
     .filter(uniques);
 
   const ortb2 = new ORTB2(s2sBidRequest, bidRequests, adUnits, requestedBidders);
-  const request = ortb2.buildRequest();
+  const request = s2sBidRequest.metrics.measureTime('buildRequests', () => ortb2.buildRequest());
   const requestJson = request && JSON.stringify(request);
   logInfo('BidRequest: ' + requestJson);
   const endpointUrl = getMatchingConsentUrl(s2sBidRequest.s2sConfig.endpoint, gdprConsent);
   if (request && requestJson && endpointUrl) {
+    const networkDone = s2sBidRequest.metrics.startTiming('net');
     ajax(
       endpointUrl,
       {
         success: function (response) {
+          networkDone();
           let result;
           try {
             result = JSON.parse(response);
-            const bids = ortb2.interpretResponse(result);
+            const bids = s2sBidRequest.metrics.measureTime('interpretResponse', () => ortb2.interpretResponse(result));
             bids.forEach(onBid);
           } catch (error) {
             logError(error);
@@ -1181,7 +1192,10 @@ export const processPBSRequest = hook('sync', function (s2sBidRequest, bidReques
             onResponse(true, requestedBidders);
           }
         },
-        error: onError
+        error: function () {
+          networkDone();
+          onError.apply(this, arguments);
+        }
       },
       requestJson,
       {contentType: 'text/plain', withCredentials: true}
diff --git a/modules/priceFloors.js b/modules/priceFloors.js
index c972e024780..e4203fd73d3 100644
--- a/modules/priceFloors.js
+++ b/modules/priceFloors.js
@@ -25,6 +25,7 @@ import {find} from '../src/polyfill.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {bidderSettings} from '../src/bidderSettings.js';
 import {auctionManager} from '../src/auctionManager.js';
+import {timedAuctionHook, timedBidResponseHook} from '../src/utils/perfMetrics.js';
 
 /**
  * @summary This Module is intended to provide users with the ability to dynamically set and enforce price floors on a per auction basis.
@@ -501,7 +502,7 @@ export function parseFloorData(floorsData, location) {
  * @param {Object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
  * @param {function} fn required; The next function in the chain, used by hook.js
  */
-export function requestBidsHook(fn, reqBidsConfigObj) {
+export const requestBidsHook = timedAuctionHook('priceFloors', function requestBidsHook(fn, reqBidsConfigObj) {
   // preserves all module related variables for the current auction instance (used primiarily for concurrent auctions)
   const hookConfig = {
     reqBidsConfigObj,
@@ -522,7 +523,7 @@ export function requestBidsHook(fn, reqBidsConfigObj) {
   } else {
     continueAuction(hookConfig);
   }
-}
+});
 
 /**
  * @summary If an auction was queued to be delayed (waiting for a fetch) then this function will resume
@@ -693,7 +694,7 @@ function shouldFloorBid(floorData, floorInfo, bid) {
  * @summary The main driving force of floors. On bidResponse we hook in and intercept bidResponses.
  * And if the rule we find determines a bid should be floored we will do so.
  */
-export function addBidResponseHook(fn, adUnitCode, bid) {
+export const addBidResponseHook = timedBidResponseHook('priceFloors', function addBidResponseHook(fn, adUnitCode, bid) {
   let floorData = _floorDataForAuction[bid.auctionId];
   // if no floor data then bail
   if (!floorData || !bid || floorData.skipped) {
@@ -755,6 +756,6 @@ export function addBidResponseHook(fn, adUnitCode, bid) {
     return fn.call(this, adUnitCode, flooredBid);
   }
   return fn.call(this, adUnitCode, bid);
-}
+});
 
 config.getConfig('floors', config => handleSetFloorsConfig(config.floors));
diff --git a/modules/pubCommonId.js b/modules/pubCommonId.js
index e3fd21e7260..5cadd522af2 100644
--- a/modules/pubCommonId.js
+++ b/modules/pubCommonId.js
@@ -8,6 +8,7 @@ import { config } from '../src/config.js';
 import * as events from '../src/events.js';
 import CONSTANTS from '../src/constants.json';
 import { getStorageManager } from '../src/storageManager.js';
+import {timedAuctionHook} from '../src/utils/perfMetrics.js';
 
 const storage = getStorageManager({moduleName: 'pubCommonId'});
 
@@ -165,7 +166,7 @@ export function getPubcidConfig() { return pubcidConfig; }
  * @param {function} next The next function in the chain
  */
 
-export function requestBidHook(next, config) {
+export const requestBidHook = timedAuctionHook('pubCommonId', function requestBidHook(next, config) {
   let adUnits = config.adUnits || $$PREBID_GLOBAL$$.adUnits;
   let pubcid = null;
 
@@ -221,7 +222,7 @@ export function requestBidHook(next, config) {
   }
 
   return next.call(this, config);
-}
+});
 
 // Helper to set a cookie
 export function setCookie(name, value, expires, sameSite) {
diff --git a/modules/rtdModule/index.js b/modules/rtdModule/index.js
index eafbe7b472c..e32d2169c5c 100644
--- a/modules/rtdModule/index.js
+++ b/modules/rtdModule/index.js
@@ -158,6 +158,7 @@ import * as events from '../../src/events.js';
 import CONSTANTS from '../../src/constants.json';
 import {gdprDataHandler, uspDataHandler} from '../../src/adapterManager.js';
 import {find} from '../../src/polyfill.js';
+import {timedAuctionHook} from '../../src/utils/perfMetrics.js';
 
 /** @type {string} */
 const MODULE_NAME = 'realTimeData';
@@ -266,7 +267,7 @@ function initSubModules() {
  * @param {Object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
  * @param {function} fn required; The next function in the chain, used by hook.js
  */
-export function setBidRequestsData(fn, reqBidsConfigObj) {
+export const setBidRequestsData = timedAuctionHook('rtd', function setBidRequestsData(fn, reqBidsConfigObj) {
   _userConsent = getConsentData();
 
   const relevantSubModules = [];
@@ -317,7 +318,7 @@ export function setBidRequestsData(fn, reqBidsConfigObj) {
     clearTimeout(waitTimeout);
     fn.call(this, reqBidsConfigObj);
   }
-}
+});
 
 /**
  * loop through configured data providers If the data provider has registered getTargetingData,
diff --git a/modules/userId/index.js b/modules/userId/index.js
index 14ebe6a57e8..ca4a67019ec 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -154,6 +154,7 @@ import {
 import {getPPID as coreGetPPID} from '../../src/adserver.js';
 import {defer, GreedyPromise} from '../../src/utils/promise.js';
 import {hasPurpose1Consent} from '../../src/utils/gpdr.js';
+import {newMetrics, timedAuctionHook, useMetrics} from '../../src/utils/perfMetrics.js';
 
 const MODULE_NAME = 'User ID';
 const COOKIE = 'cookie';
@@ -196,6 +197,20 @@ let ppidSource;
 
 let configListener;
 
+const uidMetrics = (() => {
+  let metrics;
+  return () => {
+    if (metrics == null) {
+      metrics = newMetrics();
+    }
+    return metrics;
+  }
+})();
+
+function submoduleMetrics(moduleName) {
+  return uidMetrics().fork().renameWith(n => [`userId.mod.${n}`, `userId.mods.${moduleName}.${n}`])
+}
+
 /** @param {Submodule[]} submodules */
 export function setSubmoduleRegistry(submodules) {
   submoduleRegistry = submodules;
@@ -395,14 +410,13 @@ export function findRootDomain(fullDomain = window.location.hostname) {
  * @param {function} cb - callback for after processing is done.
  */
 function processSubmoduleCallbacks(submodules, cb) {
-  let done = () => {};
-  if (cb) {
-    done = delayExecution(() => {
-      clearTimeout(timeoutID);
-      cb();
-    }, submodules.length);
-  }
+  cb = uidMetrics().fork().startTiming('userId.callbacks.total').stopBefore(cb);
+  const done = delayExecution(() => {
+    clearTimeout(timeoutID);
+    cb();
+  }, submodules.length);
   submodules.forEach(function (submodule) {
+    const moduleDone = submoduleMetrics(submodule.submodule.name).startTiming('callback').stopBefore(done);
     function callbackCompleted(idObj) {
       // if valid, id data should be saved to cookie/html storage
       if (idObj) {
@@ -414,13 +428,13 @@ function processSubmoduleCallbacks(submodules, cb) {
       } else {
         logInfo(`${MODULE_NAME}: ${submodule.submodule.name} - request id responded with an empty value`);
       }
-      done();
+      moduleDone();
     }
     try {
       submodule.callback(callbackCompleted);
     } catch (e) {
       logError(`Error in userID module '${submodule.submodule.name}':`, e);
-      done();
+      moduleDone();
     }
     // clear callback, this prop is used to test if all submodule callbacks are complete below
     submodule.callback = undefined;
@@ -508,13 +522,16 @@ function idSystemInitializer({delay = GreedyPromise.timeout} = {}) {
   const startCallbacks = defer();
   let cancel;
   let initialized = false;
+  let initMetrics;
 
   function cancelAndTry(promise) {
+    initMetrics = uidMetrics().fork();
     if (cancel != null) {
       cancel.reject(INIT_CANCELED);
     }
     cancel = defer();
-    return GreedyPromise.race([promise, cancel.promise]);
+    return GreedyPromise.race([promise, cancel.promise])
+      .finally(initMetrics.startTiming('userId.total'))
   }
 
   // grab a reference to global vars so that the promise chains remain isolated;
@@ -532,13 +549,17 @@ function idSystemInitializer({delay = GreedyPromise.timeout} = {}) {
     }
   }
 
+  function timeGdpr() {
+    return gdprDataHandler.promise.finally(initMetrics.startTiming('userId.init.gdpr'));
+  }
+
   let done = cancelAndTry(
     GreedyPromise.all([hooksReady, startInit.promise])
-      .then(() => gdprDataHandler.promise)
+      .then(timeGdpr)
       .then(checkRefs((consentData) => {
         initSubmodules(initModules, allModules, consentData);
       }))
-      .then(() => startCallbacks.promise)
+      .then(() => startCallbacks.promise.finally(initMetrics.startTiming('userId.callbacks.pending')))
       .then(checkRefs(() => {
         const modWithCb = initModules.filter(item => isFn(item.callback));
         if (modWithCb.length) {
@@ -570,7 +591,7 @@ function idSystemInitializer({delay = GreedyPromise.timeout} = {}) {
       done = cancelAndTry(
         done
           .catch(() => null)
-          .then(() => gdprDataHandler.promise) // fetch again in case a refresh was forced before this was resolved
+          .then(timeGdpr) // fetch again in case a refresh was forced before this was resolved
           .then(checkRefs((consentData) => {
             const cbModules = initSubmodules(
               initModules,
@@ -614,7 +635,7 @@ function getPPID() {
  * @param {Object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
  * @param {function} fn required; The next function in the chain, used by hook.js
  */
-export function requestBidsHook(fn, reqBidsConfigObj, {delay = GreedyPromise.timeout, getIds = getUserIdsAsync} = {}) {
+export const requestBidsHook = timedAuctionHook('userId', function requestBidsHook(fn, reqBidsConfigObj, {delay = GreedyPromise.timeout, getIds = getUserIdsAsync} = {}) {
   GreedyPromise.race([
     getIds().catch(() => null),
     delay(auctionDelay)
@@ -633,11 +654,11 @@ export function requestBidsHook(fn, reqBidsConfigObj, {delay = GreedyPromise.tim
         });
       }
     }
-
+    uidMetrics().join(useMetrics(reqBidsConfigObj.metrics), {propagate: false, includeGroups: true});
     // calling fn allows prebid to continue processing
     fn.call(this, reqBidsConfigObj);
   });
-}
+});
 
 /**
  * This function will be exposed in global-name-space so that userIds stored by Prebid UserId module can be used by external codes as well.
@@ -835,43 +856,47 @@ function populateSubmoduleId(submodule, consentData, storedConsentData, forceRef
 }
 
 function initSubmodules(dest, submodules, consentData, forceRefresh = false) {
-  if (!submodules.length) return []; // to simplify log messages from here on
+  return uidMetrics().fork().measureTime('userId.init.modules', function () {
+    if (!submodules.length) return []; // to simplify log messages from here on
 
-  // filter out submodules whose storage type is not enabled
-  // this needs to be done here (after consent data has loaded) so that enforcement may disable storage globally
-  const storageTypes = getActiveStorageTypes();
-  submodules = submodules.filter((submod) => !submod.config.storage || storageTypes.has(submod.config.storage.type));
-
-  if (!submodules.length) {
-    logWarn(`${MODULE_NAME} - no ID module is configured for one of the available storage types:`, Array.from(storageTypes));
-    return [];
-  }
+    // filter out submodules whose storage type is not enabled
+    // this needs to be done here (after consent data has loaded) so that enforcement may disable storage globally
+    const storageTypes = getActiveStorageTypes();
+    submodules = submodules.filter((submod) => !submod.config.storage || storageTypes.has(submod.config.storage.type));
 
-  // another consent check, this time each module is checked for consent with its own gvlid
-  let { userIdModules, hasValidated } = validateGdprEnforcement(submodules, consentData);
-  if (!hasValidated && !hasPurpose1Consent(consentData)) {
-    logWarn(`${MODULE_NAME} - gdpr permission not valid for local storage or cookies, exit module`);
-    return [];
-  }
+    if (!submodules.length) {
+      logWarn(`${MODULE_NAME} - no ID module is configured for one of the available storage types:`, Array.from(storageTypes));
+      return [];
+    }
 
-  // we always want the latest consentData stored, even if we don't execute any submodules
-  const storedConsentData = getStoredConsentData();
-  setStoredConsentData(consentData);
+    // another consent check, this time each module is checked for consent with its own gvlid
+    let { userIdModules, hasValidated } = validateGdprEnforcement(submodules, consentData);
+    if (!hasValidated && !hasPurpose1Consent(consentData)) {
+      logWarn(`${MODULE_NAME} - gdpr permission not valid for local storage or cookies, exit module`);
+      return [];
+    }
 
-  const initialized = userIdModules.reduce((carry, submodule) => {
-    try {
-      populateSubmoduleId(submodule, consentData, storedConsentData, forceRefresh);
-      carry.push(submodule);
-    } catch (e) {
-      logError(`Error in userID module '${submodule.submodule.name}':`, e);
+    // we always want the latest consentData stored, even if we don't execute any submodules
+    const storedConsentData = getStoredConsentData();
+    setStoredConsentData(consentData);
+
+    const initialized = userIdModules.reduce((carry, submodule) => {
+      return submoduleMetrics(submodule.submodule.name).measureTime('init', () => {
+        try {
+          populateSubmoduleId(submodule, consentData, storedConsentData, forceRefresh);
+          carry.push(submodule);
+        } catch (e) {
+          logError(`Error in userID module '${submodule.submodule.name}':`, e);
+        }
+        return carry;
+      })
+    }, []);
+    if (initialized.length) {
+      setPrebidServerEidPermissions(initialized);
     }
-    return carry;
-  }, []);
-  if (initialized.length) {
-    setPrebidServerEidPermissions(initialized);
-  }
-  initialized.forEach(updateInitializedSubmodules.bind(null, dest));
-  return initialized;
+    initialized.forEach(updateInitializedSubmodules.bind(null, dest));
+    return initialized;
+  })
 }
 
 function updateInitializedSubmodules(dest, submodule) {
diff --git a/src/adapterManager.js b/src/adapterManager.js
index ffad35e65a2..472693a6888 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -17,22 +17,24 @@ import {
   logError,
   logInfo,
   logMessage,
-  logWarn, mergeDeep,
+  logWarn,
+  mergeDeep,
   shuffle,
   timestamp,
 } from './utils.js';
 import {processAdUnitsForLabels} from './sizeMapping.js';
-import { decorateAdUnitsWithNativeParams, nativeAdapters } from './native.js';
-import { newBidder } from './adapters/bidderFactory.js';
-import { ajaxBuilder } from './ajax.js';
-import { config, RANDOM } from './config.js';
-import { hook } from './hook.js';
-import {includes, find} from './polyfill.js';
-import { adunitCounter } from './adUnits.js';
-import { getRefererInfo } from './refererDetection.js';
+import {decorateAdUnitsWithNativeParams, nativeAdapters} from './native.js';
+import {newBidder} from './adapters/bidderFactory.js';
+import {ajaxBuilder} from './ajax.js';
+import {config, RANDOM} from './config.js';
+import {hook} from './hook.js';
+import {find, includes} from './polyfill.js';
+import {adunitCounter} from './adUnits.js';
+import {getRefererInfo} from './refererDetection.js';
 import {GdprConsentHandler, UspConsentHandler} from './consentHandler.js';
 import * as events from './events.js';
 import CONSTANTS from './constants.json';
+import {useMetrics} from './utils/perfMetrics.js';
 
 export const PARTITIONS = {
   CLIENT: 'client',
@@ -60,7 +62,7 @@ var _analyticsRegistry = {};
  * @property {Array<string>} activeLabels the labels specified as being active by requestBids
  */
 
-function getBids({bidderCode, auctionId, bidderRequestId, adUnits, src}) {
+function getBids({bidderCode, auctionId, bidderRequestId, adUnits, src, metrics}) {
   return adUnits.reduce((result, adUnit) => {
     result.push(adUnit.bids.filter(bid => bid.bidder === bidderCode)
       .reduce((bids, bid) => {
@@ -92,6 +94,7 @@ function getBids({bidderCode, auctionId, bidderRequestId, adUnits, src}) {
           bidderRequestId,
           auctionId,
           src,
+          metrics,
           bidRequestsCount: adunitCounter.getRequestsCounter(adUnit.code),
           bidderRequestsCount: adunitCounter.getBidderRequestsCounter(adUnit.code, bid.bidder),
           bidderWinsCount: adunitCounter.getBidderWinsCounter(adUnit.code, bid.bidder),
@@ -206,7 +209,8 @@ export function _partitionBidders (adUnits, s2sConfigs, {getS2SBidders = getS2SB
 
 export const partitionBidders = hook('sync', _partitionBidders, 'partitionBidders');
 
-adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, auctionId, cbTimeout, labels, ortb2Fragments = {}) {
+adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, auctionId, cbTimeout, labels, ortb2Fragments = {}, auctionMetrics) {
+  auctionMetrics = useMetrics(auctionMetrics);
   /**
    * emit and pass adunits for external modification
    * @see {@link https://github.com/prebid/Prebid.js/issues/4149|Issue}
@@ -244,16 +248,18 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
       let uniquePbsTid = generateUUID();
       serverBidders.forEach(bidderCode => {
         const bidderRequestId = getUniqueIdentifierStr();
+        const metrics = auctionMetrics.fork();
         const bidderRequest = addOrtb2({
           bidderCode,
           auctionId,
           bidderRequestId,
           uniquePbsTid,
-          bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': deepClone(adUnitsS2SCopy), src: CONSTANTS.S2S.SRC}),
+          bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': deepClone(adUnitsS2SCopy), src: CONSTANTS.S2S.SRC, metrics}),
           auctionStart: auctionStart,
           timeout: s2sConfig.timeout,
           src: CONSTANTS.S2S.SRC,
           refererInfo,
+          metrics,
         });
         if (bidderRequest.bids.length !== 0) {
           bidRequests.push(bidderRequest);
@@ -281,14 +287,16 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
   let adUnitsClientCopy = getAdUnitCopyForClientAdapters(adUnits);
   clientBidders.forEach(bidderCode => {
     const bidderRequestId = getUniqueIdentifierStr();
+    const metrics = auctionMetrics.fork();
     const bidderRequest = addOrtb2({
       bidderCode,
       auctionId,
       bidderRequestId,
-      bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': deepClone(adUnitsClientCopy), labels, src: 'client'}),
+      bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': deepClone(adUnitsClientCopy), labels, src: 'client', metrics}),
       auctionStart: auctionStart,
       timeout: cbTimeout,
       refererInfo,
+      metrics,
     });
     const adapter = _bidderRegistry[bidderCode];
     if (!adapter) {
diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
index 2e28388d188..c60f4b8a015 100644
--- a/src/adapters/bidderFactory.js
+++ b/src/adapters/bidderFactory.js
@@ -15,6 +15,7 @@ import { getHook, hook } from '../hook.js';
 import { getCoreStorageManager } from '../storageManager.js';
 import {auctionManager} from '../auctionManager.js';
 import { bidderSettings } from '../bidderSettings.js';
+import {useMetrics} from '../utils/perfMetrics.js';
 
 export const storage = getCoreStorageManager('bidderFactory');
 
@@ -196,8 +197,10 @@ export function newBidder(spec) {
 
       const adUnitCodesHandled = {};
       function addBidWithCode(adUnitCode, bid) {
+        const metrics = useMetrics(bid.metrics);
+        metrics.checkpoint('addBidResponse');
         adUnitCodesHandled[adUnitCode] = true;
-        if (isValid(adUnitCode, bid)) {
+        if (metrics.measureTime('addBidResponse.validate', () => isValid(adUnitCode, bid))) {
           addBidResponse(adUnitCode, bid);
         }
       }
@@ -213,7 +216,9 @@ export function newBidder(spec) {
         });
       }
 
-      const validBidRequests = bidderRequest.bids.filter(filterAndWarn);
+      const validBidRequests = adapterMetrics(bidderRequest)
+        .measureTime('validate', () => bidderRequest.bids.filter(filterAndWarn));
+
       if (validBidRequests.length === 0) {
         afterAllResponses();
         return;
@@ -315,7 +320,11 @@ export function newBidder(spec) {
  * @param onCompletion {function()} invoked once when all bid requests have been processed
  */
 export const processBidderRequests = hook('sync', function (spec, bids, bidderRequest, ajax, wrapCallback, {onRequest, onResponse, onFledgeAuctionConfigs, onError, onBid, onCompletion}) {
-  let requests = spec.buildRequests(bids, bidderRequest);
+  const metrics = adapterMetrics(bidderRequest);
+  onCompletion = metrics.startTiming('total').stopBefore(onCompletion);
+
+  let requests = metrics.measureTime('buildRequests', () => spec.buildRequests(bids, bidderRequest));
+
   if (!requests || requests.length === 0) {
     onCompletion();
     return;
@@ -327,10 +336,16 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
   const requestDone = delayExecution(onCompletion, requests.length);
 
   requests.forEach((request) => {
+    const requestMetrics = metrics.fork();
+    function addBid(bid) {
+      if (bid != null) bid.metrics = requestMetrics.fork().renameWith();
+      onBid(bid);
+    }
     // If the server responds successfully, use the adapter code to unpack the Bids from it.
     // If the adapter code fails, no bids should be added. After all the bids have been added,
     // make sure to call the `requestDone` function so that we're one step closer to calling onCompletion().
     const onSuccess = wrapCallback(function(response, responseObj) {
+      networkDone();
       try {
         response = JSON.parse(response);
       } catch (e) { /* response might not be JSON... that's ok. */ }
@@ -343,7 +358,7 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
       onResponse(response);
 
       try {
-        response = spec.interpretResponse(response, request);
+        response = requestMetrics.measureTime('interpretResponse', () => spec.interpretResponse(response, request));
       } catch (err) {
         logError(`Bidder ${spec.code} failed to interpret the server's response. Continuing without bids`, null, err);
         requestDone();
@@ -361,9 +376,9 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
 
       if (bids) {
         if (isArray(bids)) {
-          bids.forEach(onBid);
+          bids.forEach(addBid);
         } else {
-          onBid(bids);
+          addBid(bids);
         }
       }
       requestDone();
@@ -376,11 +391,14 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
     });
 
     const onFailure = wrapCallback(function (errorMessage, error) {
+      networkDone();
       onError(errorMessage, error);
       requestDone();
     });
 
     onRequest(request);
+
+    const networkDone = requestMetrics.startTiming('net');
     switch (request.method) {
       case 'GET':
         ajax(
@@ -588,3 +606,7 @@ export function isValid(adUnitCode, bid, {index = auctionManager.index} = {}) {
 
   return true;
 }
+
+function adapterMetrics(bidderRequest) {
+  return useMetrics(bidderRequest.metrics).renameWith(n => [`adapter.client.${n}`, `adapters.client.${bidderRequest.bidderCode}.${n}`])
+}
diff --git a/src/auction.js b/src/auction.js
index 4d6462f2b6b..81280e0833c 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -77,6 +77,7 @@ import * as events from './events.js'
 import adapterManager from './adapterManager.js';
 import CONSTANTS from './constants.json';
 import {GreedyPromise} from './utils/promise.js';
+import {useMetrics} from './utils/perfMetrics.js';
 
 const { syncUsers } = userSync;
 
@@ -116,7 +117,8 @@ export function resetAuctionState() {
   *    (from getConfig('ortb2') + requestBids({ortb2})) and bidder (a map from bidderCode to ortb2)
   * @returns {Auction} auction instance
   */
-export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, auctionId, ortb2Fragments}) {
+export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, auctionId, ortb2Fragments, metrics}) {
+  metrics = useMetrics(metrics);
   let _adUnits = adUnits;
   let _labels = labels;
   let _adUnitCodes = adUnitCodes;
@@ -150,7 +152,8 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
       noBids: _noBids,
       bidsReceived: _bidsReceived,
       winningBids: _winningBids,
-      timeout: _timeout
+      timeout: _timeout,
+      metrics: metrics
     };
   }
 
@@ -179,6 +182,9 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
 
       _auctionStatus = AUCTION_COMPLETED;
       _auctionEnd = Date.now();
+      metrics.checkpoint('auctionEnd');
+      metrics.timeBetween('requestBids', 'auctionEnd', 'requestBids.total');
+      metrics.timeBetween('callBids', 'auctionEnd', 'requestBids.callBids');
 
       events.emit(CONSTANTS.EVENTS.AUCTION_END, getProperties());
       bidsBackCallback(_adUnits, function () {
@@ -225,9 +231,12 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
     _auctionStatus = AUCTION_STARTED;
     _auctionStart = Date.now();
 
-    let bidRequests = adapterManager.makeBidRequests(_adUnits, _auctionStart, _auctionId, _timeout, _labels, ortb2Fragments);
+    let bidRequests = metrics.measureTime('requestBids.makeRequests',
+      () => adapterManager.makeBidRequests(_adUnits, _auctionStart, _auctionId, _timeout, _labels, ortb2Fragments, metrics));
     logInfo(`Bids Requested for Auction with id: ${_auctionId}`, bidRequests);
 
+    metrics.checkpoint('callBids')
+
     if (bidRequests.length < 1) {
       logWarn('No valid bid requests returned for auction');
       auctionDone();
@@ -358,7 +367,8 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
     getBidRequests: () => _bidderRequests,
     getBidsReceived: () => _bidsReceived,
     getNoBids: () => _noBids,
-    getFPD: () => ortb2Fragments
+    getFPD: () => ortb2Fragments,
+    getMetrics: () => metrics,
   };
 }
 
@@ -482,6 +492,9 @@ export function doCallbacksIfTimedout(auctionInstance, bidResponse) {
 export function addBidToAuction(auctionInstance, bidResponse) {
   setupBidTargeting(bidResponse);
 
+  const metrics = useMetrics(bidResponse.metrics);
+  metrics.timeSince('addBidResponse', 'addBidResponse.total');
+
   events.emit(CONSTANTS.EVENTS.BID_RESPONSE, bidResponse);
   auctionInstance.addBidReceived(bidResponse);
 
diff --git a/src/auctionManager.js b/src/auctionManager.js
index 6d60f28946c..90d5fb543e2 100644
--- a/src/auctionManager.js
+++ b/src/auctionManager.js
@@ -24,6 +24,7 @@ import { newAuction, getStandardBidderSettings, AUCTION_COMPLETED } from './auct
 import {find} from './polyfill.js';
 import {AuctionIndex} from './auctionIndex.js';
 import CONSTANTS from './constants.json';
+import {useMetrics} from './utils/perfMetrics.js';
 
 /**
  * Creates new instance of auctionManager. There will only be one instance of auctionManager but
@@ -36,6 +37,10 @@ export function newAuctionManager() {
   const auctionManager = {};
 
   auctionManager.addWinningBid = function(bid) {
+    const metrics = useMetrics(bid.metrics);
+    metrics.checkpoint('bidWon');
+    metrics.timeBetween('auctionEnd', 'bidWon', 'render.pending');
+    metrics.timeBetween('requestBids', 'bidWon', 'render.e2e');
     const auction = find(_auctions, auction => auction.getAuctionId() === bid.auctionId);
     if (auction) {
       bid.status = CONSTANTS.BID_STATUS.RENDERED;
diff --git a/src/prebid.js b/src/prebid.js
index c9e26225076..53e32ee287b 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -1,28 +1,54 @@
 /** @module pbjs */
 
-import { getGlobal } from './prebidGlobal.js';
+import {getGlobal} from './prebidGlobal.js';
 import {
-  adUnitsFilter, flatten, getHighestCpm, isArrayOfNums, isGptPubadsDefined, uniques, logInfo,
-  contains, logError, isArray, deepClone, deepAccess, isNumber, logWarn, logMessage, isFn,
-  transformAdServerTargetingObj, bind, replaceAuctionPrice, replaceClickThrough, insertElement,
-  inIframe, callBurl, createInvisibleIframe, generateUUID, unsupportedBidderMessage, isEmpty, mergeDeep, deepSetValue
+  adUnitsFilter,
+  bind,
+  callBurl,
+  contains,
+  createInvisibleIframe,
+  deepAccess,
+  deepClone,
+  deepSetValue,
+  flatten,
+  generateUUID,
+  getHighestCpm,
+  inIframe,
+  insertElement,
+  isArray,
+  isArrayOfNums,
+  isEmpty,
+  isFn,
+  isGptPubadsDefined,
+  isNumber,
+  logError,
+  logInfo,
+  logMessage,
+  logWarn,
+  mergeDeep,
+  replaceAuctionPrice,
+  replaceClickThrough,
+  transformAdServerTargetingObj,
+  uniques,
+  unsupportedBidderMessage
 } from './utils.js';
-import { listenMessagesFromCreative } from './secureCreatives.js';
-import { userSync } from './userSync.js';
-import { config } from './config.js';
-import { auctionManager } from './auctionManager.js';
-import { filters, targeting } from './targeting.js';
+import {listenMessagesFromCreative} from './secureCreatives.js';
+import {userSync} from './userSync.js';
+import {config} from './config.js';
+import {auctionManager} from './auctionManager.js';
+import {filters, targeting} from './targeting.js';
 import {hook, wrapHook} from './hook.js';
-import { loadSession } from './debugging.js';
+import {loadSession} from './debugging.js';
 import {includes} from './polyfill.js';
-import { adunitCounter } from './adUnits.js';
-import { executeRenderer, isRendererRequired } from './Renderer.js';
-import { createBid } from './bidfactory.js';
-import { storageCallbacks } from './storageManager.js';
-import { emitAdRenderSucceeded, emitAdRenderFail } from './adRendering.js';
-import {gdprDataHandler, getS2SBidderSet, uspDataHandler, default as adapterManager} from './adapterManager.js';
+import {adunitCounter} from './adUnits.js';
+import {executeRenderer, isRendererRequired} from './Renderer.js';
+import {createBid} from './bidfactory.js';
+import {storageCallbacks} from './storageManager.js';
+import {emitAdRenderFail, emitAdRenderSucceeded} from './adRendering.js';
+import {default as adapterManager, gdprDataHandler, getS2SBidderSet, uspDataHandler} from './adapterManager.js';
 import CONSTANTS from './constants.json';
-import * as events from './events.js'
+import * as events from './events.js';
+import {newMetrics, useMetrics} from './utils/perfMetrics.js';
 
 const $$PREBID_GLOBAL$$ = getGlobal();
 const { triggerUserSyncs } = userSync;
@@ -584,7 +610,7 @@ $$PREBID_GLOBAL$$.removeAdUnit = function (adUnitCode) {
  * @alias module:pbjs.requestBids
  */
 $$PREBID_GLOBAL$$.requestBids = (function() {
-  const delegate = hook('async', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels, auctionId, ortb2 } = {}) {
+  const delegate = hook('async', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels, auctionId, ortb2, metrics } = {}) {
     events.emit(REQUEST_BIDS);
     const cbTimeout = timeout || config.getConfig('bidderTimeout');
     logInfo('Invoking $$PREBID_GLOBAL$$.requestBids', arguments);
@@ -592,7 +618,7 @@ $$PREBID_GLOBAL$$.requestBids = (function() {
       global: mergeDeep({}, config.getAnyConfig('ortb2') || {}, ortb2 || {}),
       bidder: Object.fromEntries(Object.entries(config.getBidderConfig()).map(([bidder, cfg]) => [bidder, cfg.ortb2]).filter(([_, ortb2]) => ortb2 != null))
     }
-    return startAuction({bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ortb2Fragments});
+    return startAuction({bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ortb2Fragments, metrics});
   }, 'requestBids');
 
   return wrapHook(delegate, function requestBids(req = {}) {
@@ -600,15 +626,17 @@ $$PREBID_GLOBAL$$.requestBids = (function() {
     // any hook has a chance to run.
     // otherwise, if the caller goes on to use addAdUnits/removeAdUnits, any asynchronous logic
     // in any hook might see their effects.
+    req.metrics = newMetrics();
+    req.metrics.checkpoint('requestBids');
     let adUnits = req.adUnits || $$PREBID_GLOBAL$$.adUnits;
     req.adUnits = (isArray(adUnits) ? adUnits.slice() : [adUnits]);
     return delegate.call(this, req);
   });
 })();
 
-export const startAuction = hook('async', function ({ bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ortb2Fragments } = {}) {
+export const startAuction = hook('async', function ({ bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ortb2Fragments, metrics } = {}) {
   const s2sBidders = getS2SBidderSet(config.getConfig('s2sConfig') || []);
-  adUnits = checkAdUnitSetup(adUnits);
+  adUnits = useMetrics(metrics).measureTime('requestBids.validate', () => checkAdUnitSetup(adUnits));
 
   if (adUnitCodes && adUnitCodes.length) {
     // if specific adUnitCodes supplied filter adUnits for those codes
@@ -678,7 +706,8 @@ export const startAuction = hook('async', function ({ bidsBackHandler, timeout:
     cbTimeout,
     labels,
     auctionId,
-    ortb2Fragments
+    ortb2Fragments,
+    metrics,
   });
 
   let adUnitsLen = adUnits.length;
diff --git a/src/secureCreatives.js b/src/secureCreatives.js
index d0c06f6ab1a..82d331988fc 100644
--- a/src/secureCreatives.js
+++ b/src/secureCreatives.js
@@ -4,7 +4,7 @@
  */
 
 import * as events from './events.js';
-import { fireNativeTrackers, getAssetMessage, getAllAssetsMessage } from './native.js';
+import {fireNativeTrackers, getAllAssetsMessage, getAssetMessage} from './native.js';
 import constants from './constants.json';
 import {deepAccess, isApnGetTagDefined, isGptPubadsDefined, logError, logWarn, replaceAuctionPrice} from './utils.js';
 import {auctionManager} from './auctionManager.js';
diff --git a/src/utils/perfMetrics.js b/src/utils/perfMetrics.js
new file mode 100644
index 00000000000..b1fdb38effe
--- /dev/null
+++ b/src/utils/perfMetrics.js
@@ -0,0 +1,386 @@
+import {config} from '../config.js';
+export const CONFIG_TOGGLE = 'performanceMetrics';
+const getTime = window.performance && window.performance.now ? () => window.performance.now() : () => Date.now();
+const NODES = new WeakMap();
+
+export function metricsFactory({now = getTime, mkNode = makeNode, mkTimer = makeTimer, mkRenamer = (rename) => rename, nodes = NODES} = {}) {
+  return function newMetrics() {
+    function makeMetrics(self, rename = (n) => ({forEach(fn) { fn(n); }})) {
+      rename = mkRenamer(rename);
+
+      function accessor(slot) {
+        return function (name) {
+          return self.dfWalk({
+            visit(edge, node) {
+              const obj = node[slot];
+              if (obj.hasOwnProperty(name)) {
+                return obj[name];
+              }
+            }
+          });
+        };
+      }
+
+      const getTimestamp = accessor('timestamps');
+
+      /**
+       * Register a metric.
+       *
+       * @param name metric name
+       * @param value metric valiue
+       */
+      function setMetric(name, value) {
+        const names = rename(name);
+        self.dfWalk({
+          follow(inEdge, outEdge) {
+            return outEdge.propagate && (!inEdge || !inEdge.stopPropagation)
+          },
+          visit(edge, node) {
+            names.forEach(name => {
+              if (edge == null) {
+                node.metrics[name] = value;
+              } else {
+                if (!node.groups.hasOwnProperty(name)) {
+                  node.groups[name] = [];
+                }
+                node.groups[name].push(value);
+              }
+            })
+          }
+        });
+      }
+
+      /**
+       * Mark the current time as a checkpoint with the given name, to be referenced later
+       * by `timeSince` or `timeBetween`.
+       *
+       * @param name checkpoint name
+       */
+      function checkpoint(name) {
+        self.timestamps[name] = now();
+      }
+
+      /**
+       * Get the tame passed since `checkpoint`, and optionally save it as a metric.
+       *
+       * @param checkpoint checkpoint name
+       * @param metric? metric name
+       * @return {number} time between now and `checkpoint`
+       */
+      function timeSince(checkpoint, metric) {
+        const ts = getTimestamp(checkpoint);
+        const elapsed = ts != null ? now() - ts : null;
+        if (metric != null) {
+          setMetric(metric, elapsed);
+        }
+        return elapsed;
+      }
+
+      /**
+       * Get the time passed between `startCheckpoint` and `endCheckpoint`, optionally saving it as a metric.
+       *
+       * @param startCheckpoint begin checkpoint
+       * @param endCheckpoint end checkpoint
+       * @param metric? metric name
+       * @return {number} time passed between `startCheckpoint` and `endCheckpoint`
+       */
+      function timeBetween(startCheckpoint, endCheckpoint, metric) {
+        const start = getTimestamp(startCheckpoint);
+        const end = getTimestamp(endCheckpoint);
+        const elapsed = start != null && end != null ? end - start : null;
+        if (metric != null) {
+          setMetric(metric, elapsed);
+        }
+        return elapsed;
+      }
+
+      /**
+       * A function that, when called, stops a time measure and saves it as a metric.
+       *
+       * @typedef {function(): void} MetricsTimer
+       * @template {function} F
+       * @property {function(F): F} stopBefore returns a wrapper around the given function that begins by
+       *   stopping this time measure.
+       * @property {function(F): F} stopAfter returns a wrapper around the given function that ends by
+       *   stopping this time measure.
+       */
+
+      /**
+       * Start measuring a time metric with the given name.
+       *
+       * @param name metric name
+       * @return {MetricsTimer}
+       */
+      function startTiming(name) {
+        return mkTimer(now, (val) => setMetric(name, val))
+      }
+
+      /**
+       * Run fn and measure the time spent in it.
+       *
+       * @template T
+       * @param name the name to use for the measured time metric
+       * @param {function(): T} fn
+       * @return {T} the return value of `fn`
+       */
+      function measureTime(name, fn) {
+        return startTiming(name).stopAfter(fn)();
+      }
+
+      /**
+       * @typedef {function: T} HookFn
+       * @property {function(T): void} bail
+       *
+       * @template T
+       * @typedef {T: HookFn} TimedHookFn
+       * @property {function(): void} stopTiming
+       * @property {T} untimed
+       */
+
+      /**
+       * Convenience method for measuring time spent in a `.before` or `.after` hook.
+       *
+       * @template T
+       * @param name metric name
+       * @param {HookFn} next the hook's `next` (first) argument
+       * @param {function(TimedHookFn): T} fn a function that will be run immediately; it takes `next`,
+       *    where both `next` and `next.bail` automatically
+       *    call `stopTiming` before continuing with the original hook.
+       * @return {T} fn's return value
+       */
+      function measureHookTime(name, next, fn) {
+        const stopTiming = startTiming(name);
+        return fn((function (orig) {
+          const next = stopTiming.stopBefore(orig);
+          next.bail = orig.bail && stopTiming.stopBefore(orig.bail);
+          next.stopTiming = stopTiming;
+          next.untimed = orig;
+          return next;
+        })(next));
+      }
+
+      /**
+       * Get all registered metrics.
+       * @return {{}}
+       */
+      function getMetrics() {
+        let result = {}
+        self.dfWalk({
+          visit(edge, node) {
+            result = Object.assign({}, !edge || edge.includeGroups ? node.groups : null, node.metrics, result);
+          }
+        });
+        return result;
+      }
+
+      /**
+       * Create and return a new metrics object that starts as a view on all metrics registered here,
+       * and - by default - also propagates all new metrics here.
+       *
+       * Propagated metrics are grouped together, and intended for repeated operations. For example, with the following:
+       *
+       * ```
+       * const metrics = newMetrics();
+       * const requests = metrics.measureTime('buildRequests', buildRequests)
+       * requests.forEach((req) => {
+       *   const requestMetrics = metrics.fork();
+       *   requestMetrics.measureTime('processRequest', () => processRequest(req);
+       * })
+       * ```
+       *
+       * if `buildRequests` takes 10ms and returns 3 objects, which respectively take 100, 200, and 300ms in `processRequest`, then
+       * the final `metrics.getMetrics()` would be:
+       *
+       * ```
+       * {
+       *    buildRequests: 10,
+       *    processRequest: [100, 200, 300]
+       * }
+       * ```
+       *
+       * while the inner `requestMetrics.getMetrics()` would be:
+       *
+       * ```
+       * {
+       *   buildRequests: 10,
+       *   processRequest: 100 // or 200 for the 2nd loop, etc
+       * }
+       * ```
+       *
+       *
+       * @param propagate if false, the forked metrics will not be propagated here
+       * @param stopPropagation if true, propagation from the new metrics is stopped here - instead of
+       *   continuing up the chain (if for example these metrics were themselves created through `.fork()`)
+       * @param includeGroups if true, the forked metrics will also replicate metrics that were propagated
+       *   here from elsewhere. For example:
+       *   ```
+       *   const metrics = newMetrics();
+       *   const op1 = metrics.fork();
+       *   const withoutGroups = metrics.fork();
+       *   const withGroups = metrics.fork({includeGroups: true});
+       *   op1.setMetric('foo', 'bar');
+       *   withoutGroups.getMetrics() // {}
+       *   withGroups.getMetrics() // {foo: ['bar']}
+       *   ```
+       */
+      function fork({propagate = true, stopPropagation = false, includeGroups = false} = {}) {
+        return makeMetrics(mkNode([[self, {propagate, stopPropagation, includeGroups}]]), rename);
+      }
+
+      /**
+       * Join `otherMetrics` with these; all metrics from `otherMetrics` will (by default) be propagated here,
+       * and all metrics from here will be included in `otherMetrics`.
+       *
+       * `propagate`, `stopPropagation` and `includeGroups` have the same semantics as in `.fork()`.
+       */
+      function join(otherMetrics, {propagate = true, stopPropagation = false, includeGroups = false} = {}) {
+        const other = nodes.get(otherMetrics);
+        if (other != null) {
+          other.addParent(self, {propagate, stopPropagation, includeGroups});
+        }
+      }
+
+      /**
+       * return a version of these metrics where all new metrics are renamed according to `renameFn`.
+       *
+       * @param {function(String): Array[String]} renameFn
+       */
+      function renameWith(renameFn) {
+        return makeMetrics(self, renameFn);
+      }
+
+      /**
+       * Create a new metrics object that uses the same propagation and renaming rules as this one.
+       */
+      function newMetrics() {
+        return makeMetrics(self.newSibling(), rename);
+      }
+
+      const metrics = {
+        startTiming,
+        measureTime,
+        measureHookTime,
+        checkpoint,
+        timeSince,
+        timeBetween,
+        setMetric,
+        getMetrics,
+        fork,
+        join,
+        newMetrics,
+        renameWith,
+        toJSON() {
+          return getMetrics();
+        }
+      };
+      nodes.set(metrics, self);
+      return metrics;
+    }
+
+    return makeMetrics(mkNode([]));
+  }
+}
+
+function wrapFn(fn, before, after) {
+  return function () {
+    before && before();
+    try {
+      return fn.apply(this, arguments);
+    } finally {
+      after && after();
+    }
+  };
+}
+
+function makeTimer(now, cb) {
+  const start = now();
+  let done = false;
+  function stopTiming() {
+    if (!done) {
+      // eslint-disable-next-line standard/no-callback-literal
+      cb(now() - start);
+      done = true;
+    }
+  }
+  stopTiming.stopBefore = (fn) => wrapFn(fn, stopTiming);
+  stopTiming.stopAfter = (fn) => wrapFn(fn, null, stopTiming);
+  return stopTiming;
+}
+
+function makeNode(parents) {
+  return {
+    metrics: {},
+    timestamps: {},
+    groups: {},
+    addParent(node, edge) {
+      parents.push([node, edge]);
+    },
+    newSibling() {
+      return makeNode(parents.slice());
+    },
+    dfWalk({visit, follow = () => true, visited = new Set(), inEdge} = {}) {
+      let res;
+      if (!visited.has(this)) {
+        visited.add(this);
+        res = visit(inEdge, this);
+        if (res != null) return res;
+        for (const [parent, outEdge] of parents) {
+          if (follow(inEdge, outEdge)) {
+            res = parent.dfWalk({visit, follow, visited, inEdge: outEdge});
+            if (res != null) return res;
+          }
+        }
+      }
+    }
+  };
+}
+
+const nullMetrics = (() => {
+  const nop = function () {};
+  const empty = () => ({});
+  const none = {forEach: nop};
+  const nullTimer = () => null;
+  nullTimer.stopBefore = (fn) => fn;
+  nullTimer.stopAfter = (fn) => fn;
+  const nullNode = Object.defineProperties(
+    {dfWalk: nop, newSibling: () => nullNode, addParent: nop},
+    Object.fromEntries(['metrics', 'timestamps', 'groups'].map(prop => [prop, {get: empty}])));
+  return metricsFactory({
+    now: () => 0,
+    mkNode: () => nullNode,
+    mkRenamer: () => () => none,
+    mkTimer: () => nullTimer,
+    nodes: {get: nop, set: nop}
+  })();
+})();
+
+let enabled = true;
+config.getConfig(CONFIG_TOGGLE, (cfg) => { enabled = !!cfg[CONFIG_TOGGLE] });
+
+/**
+ * convenience fallback function for metrics that may be undefined, especially during tests.
+ */
+export function useMetrics(metrics) {
+  return (enabled && metrics) || nullMetrics;
+}
+
+export const newMetrics = (() => {
+  const makeMetrics = metricsFactory();
+  return function () {
+    return enabled ? makeMetrics() : nullMetrics;
+  }
+})();
+
+export function hookTimer(prefix, getMetrics) {
+  return function(name, hookFn) {
+    return function (next, ...args) {
+      const that = this;
+      return useMetrics(getMetrics.apply(that, args)).measureHookTime(prefix + name, next, function (next) {
+        return hookFn.call(that, next, ...args);
+      });
+    }
+  }
+}
+
+export const timedAuctionHook = hookTimer('requestBids.', (req) => req.metrics);
+export const timedBidResponseHook = hookTimer('addBidResponse.', (_, bid) => bid.metrics)
diff --git a/test/spec/unit/utils/perfMetrics_spec.js b/test/spec/unit/utils/perfMetrics_spec.js
new file mode 100644
index 00000000000..4ce3336e030
--- /dev/null
+++ b/test/spec/unit/utils/perfMetrics_spec.js
@@ -0,0 +1,394 @@
+import {CONFIG_TOGGLE, metricsFactory, newMetrics, useMetrics} from '../../../../src/utils/perfMetrics.js';
+import {defer} from '../../../../src/utils/promise.js';
+import {hook} from '../../../../src/hook.js';
+import {config} from 'src/config.js';
+
+describe('metricsFactory', () => {
+  let metrics, now, enabled, newMetrics;
+
+  beforeEach(() => {
+    now = 0;
+    newMetrics = metricsFactory({now: () => now});
+    metrics = newMetrics();
+  });
+
+  it('can measure time with startTiming', () => {
+    now = 10;
+    const measure = metrics.startTiming('test');
+    now = 25.2;
+    measure();
+    expect(metrics.getMetrics()).to.eql({
+      test: 15.2
+    });
+  });
+
+  describe('measureTime', () => {
+    it('can measure time', () => {
+      metrics.measureTime('test', () => now += 3);
+      expect(metrics.getMetrics()).to.eql({
+        test: 3
+      })
+    });
+
+    it('still measures if fn throws', () => {
+      expect(() => {
+        metrics.measureTime('test', () => {
+          now += 4;
+          throw new Error();
+        });
+      }).to.throw();
+      expect(metrics.getMetrics()).to.eql({
+        test: 4
+      });
+    })
+  });
+
+  describe('measureHookTime', () => {
+    let testHook;
+    before(() => {
+      testHook = hook('sync', () => null, 0, 'testName');
+      hook.ready();
+    });
+    beforeEach(() => {
+      testHook.getHooks().remove();
+    });
+
+    ['before', 'after'].forEach(hookType => {
+      describe(`on ${hookType} hooks`, () => {
+        Object.entries({
+          next: (n) => n,
+          bail: (n) => n.bail
+        }).forEach(([t, fn]) => {
+          it(`can time when hooks call ${t}`, () => {
+            const q = defer();
+            testHook[hookType]((next) => {
+              metrics.measureHookTime('test', next, (next) => {
+                setTimeout(() => {
+                  now += 10;
+                  fn(next)();
+                  q.resolve();
+                })
+              })
+            });
+            testHook();
+            return q.promise.then(() => {
+              expect(metrics.getMetrics()).to.eql({
+                test: 10
+              });
+            })
+          });
+        });
+      })
+    })
+  });
+
+  describe('checkpoints', () => {
+    it('can measure time from checkpoint with timeSince', () => {
+      now = 10;
+      metrics.checkpoint('A');
+      now = 15;
+      expect(metrics.timeSince('A')).to.eql(5);
+    });
+
+    it('timeSince is null if checkpoint does not exist', () => {
+      expect(metrics.timeSince('missing')).to.equal(null);
+    });
+
+    it('timeSince saves a metric if given a name', () => {
+      now = 10;
+      metrics.checkpoint('A');
+      now = 15;
+      metrics.timeSince('A', 'test');
+      expect(metrics.getMetrics()).to.eql({test: 5});
+    });
+
+    it('can measure time between checkpoints with timeBetween', () => {
+      now = 10;
+      metrics.checkpoint('A');
+      now = 15;
+      metrics.checkpoint('B');
+      now = 20;
+      expect(metrics.timeBetween('A', 'B')).to.eql(5);
+    });
+
+    Object.entries({
+      'first checkpoint': [false, true],
+      'second checkpoint': [true, false],
+      'both checkpoints': [false, false]
+    }).forEach(([t, [checkFirst, checkSecond]]) => {
+      it(`timeBetween measures to null if missing ${t}`, () => {
+        if (checkFirst) {
+          metrics.checkpoint('A');
+        }
+        if (checkSecond) {
+          metrics.checkpoint('B');
+        }
+        expect(metrics.timeBetween('A', 'B')).to.equal(null)
+      })
+    });
+
+    it('saves a metric with timeBetween if given a name', () => {
+      now = 10;
+      metrics.checkpoint('A');
+      now = 15;
+      metrics.checkpoint('B');
+      metrics.timeBetween('A', 'B', 'test');
+      expect(metrics.getMetrics()).to.eql({test: 5});
+    });
+  });
+
+  describe('setMetrics', () => {
+    it('sets metric', () => {
+      metrics.setMetric('test', 1);
+      expect(metrics.getMetrics()).to.eql({test: 1});
+    });
+  });
+
+  describe('fork', () => {
+    it('keeps metrics from ancestors', () => {
+      const m2 = metrics.fork();
+      const m3 = m2.fork();
+      metrics.setMetric('1', 'one');
+      m2.setMetric('2', 'two');
+      m3.setMetric('3', 'three');
+      sinon.assert.match(metrics.getMetrics(), {
+        1: 'one'
+      })
+      sinon.assert.match(m2.getMetrics(), {
+        1: 'one',
+        2: 'two'
+      });
+      sinon.assert.match(m3.getMetrics(), {
+        1: 'one',
+        2: 'two',
+        3: 'three'
+      });
+    });
+
+    it('keeps checkpoints from ancestors', () => {
+      const m2 = metrics.fork();
+      const m3 = m2.fork();
+      now = 10;
+      metrics.checkpoint('1');
+      now = 20;
+      m2.checkpoint('2');
+      now = 30;
+      m3.checkpoint('3');
+      now = 40;
+      expect(m2.timeSince('1')).to.eql(30);
+      expect(m3.timeSince('2')).to.eql(20);
+    });
+
+    it('groups metrics into ancestors', () => {
+      const c1 = metrics.fork().fork();
+      const c2 = metrics.fork().fork();
+      c1.setMetric('test', 10);
+      c2.setMetric('test', 20);
+      expect(metrics.getMetrics().test).to.eql([10, 20]);
+    });
+
+    it('does not group metrics into ancestors if the name clashes', () => {
+      metrics.setMetric('test', {});
+      metrics.fork().setMetric('test', 1);
+      expect(metrics.getMetrics().test).to.eql({});
+    });
+
+    it('does not propagate further if stopPropagation = true', () => {
+      const c1 = metrics.fork();
+      const c2 = c1.fork({stopPropagation: true});
+      c2.setMetric('test', 1);
+      expect(c1.getMetrics().test).to.eql([1]);
+      expect(metrics.getMetrics().test).to.not.exist;
+    });
+
+    it('does not propagate at all if propagate = false', () => {
+      metrics.fork({propagate: false}).setMetric('test', 1);
+      expect(metrics.getMetrics()).to.eql({});
+    });
+
+    it('replicates grouped metrics if includeGroups = true', () => {
+      const child = metrics.fork({includeGroups: true});
+      metrics.fork().setMetric('test', 1);
+      expect(child.getMetrics()).to.eql({
+        test: [1]
+      });
+    })
+  });
+
+  describe('join', () => {
+    let other;
+    beforeEach(() => {
+      other = newMetrics();
+    });
+
+    it('joins metrics', () => {
+      metrics.setMetric('test', 1);
+      metrics.join(other);
+      expect(other.getMetrics()).to.eql({
+        test: 1
+      });
+    });
+
+    it('joins checkpoints', () => {
+      now = 10;
+      metrics.checkpoint('test');
+      metrics.join(other);
+      now = 20;
+      expect(other.timeSince('test')).to.eql(10);
+    })
+
+    it('groups metrics after joining', () => {
+      metrics.join(other);
+      other.setMetric('test', 1);
+      expect(metrics.getMetrics().test).to.eql([1]);
+    });
+
+    it('gives precedence to first join\'s metrics', () => {
+      metrics.join(other);
+      const metrics2 = newMetrics();
+      metrics2.join(other);
+      metrics.setMetric('test', 1);
+      metrics2.setMetric('test', 2);
+      expect(other.getMetrics()).to.eql({
+        test: 1
+      });
+    });
+
+    it('gives precedence to first joins\'s checkpoints', () => {
+      metrics.join(other);
+      const metrics2 = newMetrics();
+      metrics2.join(other);
+      now = 10;
+      metrics.checkpoint('testcp');
+      now = 20;
+      metrics2.checkpoint('testcp');
+      now = 30;
+      expect(other.timeSince('testcp')).to.eql(20);
+    });
+
+    it('does not propagate further if stopPropagation = true', () => {
+      const m2 = metrics.fork();
+      m2.join(other, {stopPropagation: true});
+      other.setMetric('test', 1);
+      expect(m2.getMetrics().test).to.eql([1]);
+      expect(metrics.getMetrics()).to.eql({});
+    });
+
+    it('does not propagate at all if propagate = false', () => {
+      metrics.join(other, {propagate: false});
+      other.setMetric('test', 1);
+      expect(metrics.getMetrics()).to.eql({});
+    });
+
+    it('replicates grouped metrics if includeGroups = true', () => {
+      const m2 = metrics.fork();
+      metrics.join(other, {includeGroups: true});
+      m2.setMetric('test', 1);
+      expect(other.getMetrics()).to.eql({
+        test: [1]
+      });
+    })
+
+    Object.entries({
+      'join with a common ancestor': () => [metrics.fork(), metrics.fork()],
+      'join with self': () => [metrics, metrics],
+    }).forEach(([t, makePair]) => {
+      it(`can ${t}`, () => {
+        const [m1, m2] = makePair();
+        m1.join(m2);
+        m1.setMetric('test', 1);
+        const expected = {'test': 1};
+        expect(m1.getMetrics()).to.eql(expected);
+        expect(m2.getMetrics()).to.eql(expected);
+      })
+    });
+
+    it('can join into a cycle', () => {
+      const c = metrics.fork();
+      c.join(metrics);
+      c.setMetric('child', 1);
+      metrics.setMetric('parent', 1);
+      expect(c.getMetrics()).to.eql({
+        child: 1,
+        parent: [1]
+      })
+      expect(metrics.getMetrics()).to.eql({
+        parent: 1,
+        child: [1]
+      })
+    });
+  });
+  describe('newMetrics', () => {
+    it('returns related, but independent, metrics', () => {
+      const m0 = metrics.newMetrics();
+      const m1 = newMetrics();
+      m1.join(m0);
+      m0.setMetric('m0', 1);
+      m1.setMetric('m1', 1);
+      expect(metrics.getMetrics()).to.eql({});
+      expect(m0.getMetrics()).to.eql({
+        m0: 1,
+        m1: 1
+      })
+    })
+  })
+})
+
+describe('nullMetrics', () => {
+  let nullMetrics;
+  beforeEach(() => {
+    nullMetrics = useMetrics(null);
+  });
+
+  Object.entries({
+    'stopBefore': (fn) => nullMetrics.startTiming('n').stopBefore(fn),
+    'stopAfter': (fn) => nullMetrics.startTiming('n').stopAfter(fn),
+    'measureTime': (fn) => (...args) => nullMetrics.measureTime('n', () => fn(...args)),
+    'measureHookTime': (fn) => (...args) => nullMetrics.measureHookTime('n', {}, () => fn(...args))
+  }).forEach(([t, wrapFn]) => {
+    describe(t, () => {
+      it('invokes the wrapped fn', () => {
+        const fn = sinon.stub();
+        wrapFn(fn)('one', 'two');
+        sinon.assert.calledWith(fn, 'one', 'two');
+      });
+      it('does not register timing metrics', () => {
+        wrapFn(sinon.stub())();
+        expect(nullMetrics.getMetrics()).to.eql({});
+      })
+    })
+  });
+
+  it('does not save checkpoints', () => {
+    nullMetrics.checkpoint('A');
+    expect(nullMetrics.timeSince('A')).to.equal(null);
+  });
+
+  it('does not save metrics', () => {
+    nullMetrics.setMetric('test', 1);
+    expect(nullMetrics.getMetrics()).to.eql({});
+  });
+})
+
+describe('configuration toggle', () => {
+  afterEach(() => {
+    config.resetConfig();
+  });
+
+  Object.entries({
+    'useMetrics': () => useMetrics(metricsFactory()()),
+    'newMetrics': newMetrics
+  }).forEach(([t, mkMetrics]) => {
+    it(`${t} returns no-op metrics when disabled`, () => {
+      config.setConfig({[CONFIG_TOGGLE]: false});
+      const metrics = mkMetrics();
+      metrics.setMetric('test', 'value');
+      expect(metrics.getMetrics()).to.eql({});
+    });
+    it(`returns actual metrics by default`, () => {
+      const metrics = mkMetrics();
+      metrics.setMetric('test', 'value');
+      expect(metrics.getMetrics()).to.eql({test: 'value'});
+    });
+  });
+});

From 73c3caac7b54d834f47c05f5596d98a04aabad64 Mon Sep 17 00:00:00 2001
From: DianomiJH <84312830+DianomiJH@users.noreply.github.com>
Date: Wed, 14 Sep 2022 07:18:08 +0100
Subject: [PATCH 256/569] Dianomi Bid Adapter: add usersyncs (#8904)

* start of dianomi adapter

* improving adapter

* Rename and add the missing "i"

* our bidder supports native (or it will)

* Updated dianomiAdapter

* dianomi adapter update endpoint and smartadId paramter

* removed nested request in buildRequests/native object to align better with ortb native 1.2

* dianomi adapter upddate, remove native {request} nesting

* update md, tried to make it similar to adform's

* updated urls to live endpoints

* a couple little tweaks to md

* added userSync and allow changing of endpoint

* updated Maintainer email

* added tests, need to look at coppa tests still as not sure if we should be testing that

* couple of test changes

* small change to tests

* switched to v7

* updated maintainer email and added pixel usersync

* updated tests and fixed url

* changed format of native requests to match closer to PBS requests

* Revert "changed format of native requests to match closer to PBS requests"

This reverts commit 99ab6579b50a3a6f983c54bc1e8ff27811752c29.

Co-authored-by: Michael Stevens <michael.stevens@dianomi.com>
Co-authored-by: Chris Almeida-Symons <chris@Chriss-MacBook-Pro.local>
Co-authored-by: Martin Hill <martin.hill@gmail.com>
---
 modules/dianomiBidAdapter.js                |  31 +-
 modules/dianomiBidAdapter.md                |   2 +-
 test/spec/modules/dianomiBidAdapter_spec.js | 332 +++++++++++++++++++-
 3 files changed, 344 insertions(+), 21 deletions(-)

diff --git a/modules/dianomiBidAdapter.js b/modules/dianomiBidAdapter.js
index c64584f3ae8..83b0ea0ae70 100644
--- a/modules/dianomiBidAdapter.js
+++ b/modules/dianomiBidAdapter.js
@@ -301,27 +301,30 @@ export const spec = {
       .filter(Boolean);
   },
   getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent) => {
-    if (syncOptions.iframeEnabled) {
-      // data is only assigned if params are available to pass to syncEndpoint
-      const params = {};
-
-      if (gdprConsent) {
-        if (typeof gdprConsent.gdprApplies === 'boolean') {
-          params['gdpr'] = Number(gdprConsent.gdprApplies);
-        }
-        if (typeof gdprConsent.consentString === 'string') {
-          params['gdpr_consent'] = gdprConsent.consentString;
-        }
+    const params = {};
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        params['gdpr'] = Number(gdprConsent.gdprApplies);
       }
-
-      if (uspConsent) {
-        params['us_privacy'] = encodeURIComponent(uspConsent);
+      if (typeof gdprConsent.consentString === 'string') {
+        params['gdpr_consent'] = gdprConsent.consentString;
       }
+    }
 
+    if (uspConsent) {
+      params['us_privacy'] = encodeURIComponent(uspConsent);
+    }
+    if (syncOptions.iframeEnabled) {
+      // data is only assigned if params are available to pass to syncEndpoint
       return {
         type: 'iframe',
         url: `https://${endpoint}/prebid/usersync/index.html?${formatQS(params)}`,
       };
+    } else if (syncOptions.pixelEnabled) {
+      return {
+        type: 'image',
+        url: `https://${endpoint.includes('dev') ? 'dev-' : ''}data.dianomi.com/frontend/usync?${formatQS(params)}`,
+      };
     }
   },
 };
diff --git a/modules/dianomiBidAdapter.md b/modules/dianomiBidAdapter.md
index e0b749e0765..d530475ce65 100644
--- a/modules/dianomiBidAdapter.md
+++ b/modules/dianomiBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name: Dianomi Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: eng@dianomi.com
+Maintainer: prebid-maintainer@dianomi.com
 ```
 
 # Description
diff --git a/test/spec/modules/dianomiBidAdapter_spec.js b/test/spec/modules/dianomiBidAdapter_spec.js
index f1c3015adb8..50673b79572 100644
--- a/test/spec/modules/dianomiBidAdapter_spec.js
+++ b/test/spec/modules/dianomiBidAdapter_spec.js
@@ -198,7 +198,7 @@ describe('Dianomi adapter', () => {
         {
           bidId: 'bidId',
           params: { smartadId: 1234 },
-          ortb2
+          ortb2,
         },
       ];
       let request = JSON.parse(
@@ -225,12 +225,12 @@ describe('Dianomi adapter', () => {
             name: "publisher's name",
           },
         },
-      }
+      };
       let validBidRequests = [
         {
           bidId: 'bidId',
           params: { smartadId: 1234 },
-          ortb2
+          ortb2,
         },
       ];
       let refererInfo = { page: 'page' };
@@ -342,7 +342,7 @@ describe('Dianomi adapter', () => {
           },
           {
             bidId: 'bidId2',
-            params: { smartadId: 1234 }
+            params: { smartadId: 1234 },
           },
         ];
         let request = JSON.parse(
@@ -1022,7 +1022,7 @@ describe('Dianomi adapter', () => {
               {
                 data: null,
                 id: 2,
-                img: { type: null, url: 'test.url.com/Files/58345/308185.jpg?bv=1', w: 30, h: 10 },
+                img: { type: null, url: 'test.url.com/Files/58345/308185.jpgbv=1', w: 30, h: 10 },
                 required: 0,
                 title: null,
                 video: null,
@@ -1032,7 +1032,7 @@ describe('Dianomi adapter', () => {
                 id: 3,
                 img: {
                   type: null,
-                  url: 'test.url.com/Files/58345/308200.jpg?bv=1',
+                  url: 'test.url.com/Files/58345/308200.jpgbv=1',
                   w: 100,
                   h: 100,
                 },
@@ -1220,4 +1220,324 @@ describe('Dianomi adapter', () => {
       });
     });
   });
+
+  describe('UserSyncs', () => {
+    let usersyncIframeUrl = 'https://www-prebid.dianomi.com/prebid/usersync/index.html?';
+    let usersyncRedirectUrl = 'https://data.dianomi.com/frontend/usync?';
+    it('should register the usersync iframe', function () {
+      let syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+      });
+
+      expect(syncs).to.deep.equal({ type: 'iframe', url: usersyncIframeUrl });
+    });
+
+    it('should register the usersync redirect', function () {
+      let syncs = spec.getUserSyncs({
+        pixelEnabled: true,
+      });
+
+      expect(syncs).to.deep.equal({ type: 'image', url: usersyncRedirectUrl });
+    });
+
+    it('should pass gdpr params if consent is true', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            gdprApplies: true,
+            consentString: 'foo',
+          }
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}gdpr=1&gdpr_consent=foo`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            gdprApplies: true,
+            consentString: 'foo',
+          }
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}gdpr=1&gdpr_consent=foo`,
+      });
+    });
+
+    it('should pass gdpr params if consent is false', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            gdprApplies: false,
+            consentString: 'foo',
+          }
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}gdpr=0&gdpr_consent=foo`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            gdprApplies: false,
+            consentString: 'foo',
+          }
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}gdpr=0&gdpr_consent=foo`,
+      });
+    });
+
+    it('should pass gdpr param gdpr_consent only when gdprApplies is undefined', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            consentString: 'foo',
+          }
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}gdpr_consent=foo`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            consentString: 'foo',
+          }
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}gdpr_consent=foo`,
+      });
+    });
+
+    it('should pass no params if gdpr consentString is not defined', function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {})).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}`,
+      });
+
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {})).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}`,
+      });
+    });
+
+    it('should pass no params if gdpr consentString is a number', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            consentString: 0,
+          }
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            consentString: 0,
+          }
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}`,
+      });
+    });
+
+    it('should pass no params if gdpr consentString is null', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            consentString: null,
+          }
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            consentString: null,
+          }
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}`,
+      });
+    });
+
+    it('should pass no params if gdpr consentString is a object', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            consentString: {},
+          }
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            consentString: {},
+          }
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}`,
+      });
+    });
+
+    it('should pass no params if gdpr is not defined', function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined)).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}`,
+      });
+
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined)).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}`,
+      });
+    });
+
+    it('should pass us_privacy if uspConsent is defined', function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined, '1NYN')).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}us_privacy=1NYN`,
+      });
+
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined, '1NYN')).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}us_privacy=1NYN`,
+      });
+    });
+
+    it('should pass us_privacy after gdpr if both are present', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            consentString: 'foo',
+          },
+          '1NYN'
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}gdpr_consent=foo&us_privacy=1NYN`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            consentString: 'foo',
+          },
+          '1NYN'
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}gdpr_consent=foo&us_privacy=1NYN`,
+      });
+    });
+
+    it('should pass gdprApplies', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            gdprApplies: true,
+          },
+          '1NYN'
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}gdpr=1&us_privacy=1NYN`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            gdprApplies: true,
+          },
+          '1NYN'
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}gdpr=1&us_privacy=1NYN`,
+      });
+    });
+
+    it('should pass all correctly', function () {
+      expect(
+        spec.getUserSyncs(
+          { iframeEnabled: true },
+          {},
+          {
+            gdprApplies: true,
+            consentString: 'foo',
+          },
+          '1NYN'
+        )
+      ).to.deep.equal({
+        type: 'iframe',
+        url: `${usersyncIframeUrl}gdpr=1&gdpr_consent=foo&us_privacy=1NYN`,
+      });
+
+      expect(
+        spec.getUserSyncs(
+          { pixelEnabled: true },
+          {},
+          {
+            gdprApplies: true,
+            consentString: 'foo',
+          },
+          '1NYN'
+        )
+      ).to.deep.equal({
+        type: 'image',
+        url: `${usersyncRedirectUrl}gdpr=1&gdpr_consent=foo&us_privacy=1NYN`,
+      });
+    });
+  });
 });

From 63f9b0d94292a02100842a50299cbfbb052a08b6 Mon Sep 17 00:00:00 2001
From: couchcrew-thomas <mail@feedad.com>
Date: Wed, 14 Sep 2022 09:05:41 +0200
Subject: [PATCH 257/569] FeedAd Bid Adapter: added user sync (#8967)

* added file scaffold

* added isBidRequestValid implementation

* added local prototype of ad integration

* added implementation for placement ID validation

* fixed video context filter

* applied lint to feedad bid adapter

* added unit test for bid request validation

* added buildRequest unit test

* added unit tests for timeout and bid won callbacks

* updated bid request to FeedAd API

* added parsing of feedad api bid response

* added transmisison of tracking events to FeedAd Api

* code cleanup

* updated feedad unit tests for buildRequest method

* added unit tests for event tracking implementation

* added unit test for interpretResponse method

* added adapter documentation

* added dedicated feedad example page

* updated feedad adapter to use live system

* updated FeedAd adapter placement ID regex

* removed groups from FeedAd adapter placement ID regex

* removed dedicated feedad example page

* updated imports in FeedAd adapter file to use relative paths

* updated FeedAd adapter unit test to use sinon.useFakeXMLHttpRequest()

* added GDPR fields to the FeedAd bid request

* removed video from supported media types of the FeedAd adapter

* increased version code of FeedAd adapter to 1.0.2

* removed unnecessary check of bidder request

* fixed unit test testing for old FeedAd version

* removed video media type example from documentation file

* added gvlid to FeedAd adapter

* added decoration parameter to adapter documentation

* added pass through of additional bid parameters

* added user syncs to FeedAd bid adapter

* increased FeedAd bid adapter version

* lint pass over FeedAd bid adapter
---
 modules/feedadBidAdapter.js                |  48 +++++--
 test/spec/modules/feedadBidAdapter_spec.js | 158 +++++++++++++++++++--
 2 files changed, 187 insertions(+), 19 deletions(-)

diff --git a/modules/feedadBidAdapter.js b/modules/feedadBidAdapter.js
index d695292bb4a..0ab6def38ae 100644
--- a/modules/feedadBidAdapter.js
+++ b/modules/feedadBidAdapter.js
@@ -1,4 +1,4 @@
-import { deepAccess, logWarn } from '../src/utils.js';
+import {deepAccess, isArray, logWarn} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 import {ajax} from '../src/ajax.js';
@@ -7,7 +7,7 @@ import {ajax} from '../src/ajax.js';
  * Version of the FeedAd bid adapter
  * @type {string}
  */
-const VERSION = '1.0.2';
+const VERSION = '1.0.3';
 
 /**
  * @typedef {object} FeedAdApiBidRequest
@@ -31,7 +31,7 @@ const VERSION = '1.0.2';
  * @typedef {object} FeedAdApiBidResponse
  * @inner
  *
- * @property {string} ad - Ad HTML payload
+ * @property {string} [ad] - Ad HTML payload
  * @property {number} cpm - number / float
  * @property {string} creativeId - ID of creative for tracking
  * @property {string} currency - 3-letter ISO 4217 currency-code
@@ -40,6 +40,7 @@ const VERSION = '1.0.2';
  * @property {string} requestId - bids[].bidId
  * @property {number} ttl - Time to live for this ad
  * @property {number} width - Width of creative returned in [].ad
+ * @property {object} [ext] - an extension object
  */
 
 /**
@@ -231,10 +232,16 @@ function buildRequests(validBidRequests, bidderRequest) {
  * @returns {Bid[]} the FeedAd bids
  */
 function interpretResponse(serverResponse, request) {
-  /**
-   * @type FeedAdApiBidResponse[]
-   */
-  return typeof serverResponse.body === 'string' ? JSON.parse(serverResponse.body) : serverResponse.body;
+  const response = typeof serverResponse.body === 'string' ? JSON.parse(serverResponse.body) : serverResponse.body;
+  if (!isArray(response)) {
+    return [];
+  }
+  return response.filter(bid => Object.prototype.hasOwnProperty.call(bid, 'ad'))
+    .map(bid => {
+      const copy = Object.assign({}, bid);
+      delete copy.ext;
+      return copy;
+    });
 }
 
 /**
@@ -284,6 +291,30 @@ function trackingHandlerFactory(klass) {
   }
 }
 
+/**
+ * Reads the user syncs off the server responses and converts them into Prebid.JS format
+ * @param {SyncOptions} syncOptions
+ * @param {FeedAdApiBidResponse[]} serverResponses
+ * @param gdprConsent
+ * @param uspConsent
+ */
+function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
+  return serverResponses.map(response => response.ext)
+    .flatMap(extension => {
+      // extract user syncs from extension
+      const pixels = syncOptions.pixelEnabled && extension.pixels ? extension.pixels : [];
+      const iframes = syncOptions.iframeEnabled && extension.iframes ? extension.iframes : [];
+      return pixels.concat(...iframes);
+    })
+    .reduce((syncs, sync) => {
+      // remove duplicates
+      if (!syncs.find(it => it.type === sync.type && it.url === sync.url)) {
+        syncs.push(sync);
+      }
+      return syncs;
+    }, []);
+}
+
 /**
  * @type {BidderSpec}
  */
@@ -295,7 +326,8 @@ export const spec = {
   buildRequests,
   interpretResponse,
   onTimeout: trackingHandlerFactory('prebid_bidTimeout'),
-  onBidWon: trackingHandlerFactory('prebid_bidWon')
+  onBidWon: trackingHandlerFactory('prebid_bidWon'),
+  getUserSyncs
 };
 
 registerBidder(spec);
diff --git a/test/spec/modules/feedadBidAdapter_spec.js b/test/spec/modules/feedadBidAdapter_spec.js
index fc26d9bc0cf..6db0b88a9bf 100644
--- a/test/spec/modules/feedadBidAdapter_spec.js
+++ b/test/spec/modules/feedadBidAdapter_spec.js
@@ -303,24 +303,160 @@ describe('FeedAdAdapter', function () {
   });
 
   describe('interpretResponse', function () {
-    const body = [{
-      foo: 'bar',
-      sub: {
-        obj: 5
-      }
-    }, {
-      bar: 'foo'
-    }];
-
     it('should convert string bodies to JSON', function () {
+      const body = [{
+        ad: 'bar',
+      }];
       let result = spec.interpretResponse({body: JSON.stringify(body)});
       expect(result).to.deep.equal(body);
     });
 
-    it('should pass through body objects', function () {
+    it('should pass through object bodies', function () {
+      const body = [{
+        ad: 'bar',
+      }];
       let result = spec.interpretResponse({body});
       expect(result).to.deep.equal(body);
     });
+
+    it('should pass through only bodies with ad fields', function () {
+      const bid1 = {
+        ad: 'bar',
+        other: 'field',
+        some: 'thing'
+      };
+      const bid2 = {
+        foo: 'bar'
+      };
+      const bid3 = {
+        ad: 'ad html',
+      };
+      const body = [bid1, bid2, bid3];
+      let result = spec.interpretResponse({body: JSON.stringify(body)});
+      expect(result).to.deep.equal([bid1, bid3]);
+    });
+
+    it('should remove extension fields from bid responses', function () {
+      const bid = {
+        ext: {},
+        ad: 'ad html',
+        cpm: 100
+      };
+      const result = spec.interpretResponse({body: JSON.stringify([bid])});
+      expect(result[0]).not.to.haveOwnProperty('ext');
+    });
+
+    it('should return an empty array if the response is not an array', function () {
+      const bid = {};
+      const result = spec.interpretResponse({body: JSON.stringify(bid)});
+      expect(result).to.deep.equal([]);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    const pixelSync1 = {type: 'image', url: 'the pixel url 1'};
+    const pixelSync2 = {type: 'image', url: 'the pixel url 2'};
+    const iFrameSync1 = {type: 'iframe', url: 'the iFrame url 1'};
+    const iFrameSync2 = {type: 'iframe', url: 'the iFrame url 2'};
+
+    it('should pass through the syncs out of the extension fields of the server response', function () {
+      const serverResponse = [{
+        ext: {
+          pixels: [pixelSync1, pixelSync2],
+          iframes: [iFrameSync1, iFrameSync2],
+        }
+      }];
+      const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse)
+      expect(result).to.deep.equal([
+        pixelSync1,
+        pixelSync2,
+        iFrameSync1,
+        iFrameSync2,
+      ]);
+    });
+
+    it('should concat the syncs of all responses', function () {
+      const serverResponse = [{
+        ext: {
+          pixels: [pixelSync1],
+          iframes: [iFrameSync2],
+        },
+        ad: 'ad html',
+        cpm: 100
+      }, {
+        ext: {
+          iframes: [iFrameSync1],
+        }
+      }, {
+        ext: {
+          pixels: [pixelSync2],
+        }
+      }];
+      const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse);
+      expect(result).to.deep.equal([
+        pixelSync1,
+        iFrameSync2,
+        iFrameSync1,
+        pixelSync2,
+      ]);
+    });
+
+    it('should filter out duplicates', function () {
+      const serverResponse = [{
+        ext: {
+          pixels: [pixelSync1, pixelSync1],
+          iframes: [iFrameSync2, iFrameSync2],
+        }
+      }, {
+        ext: {
+          iframes: [iFrameSync2, iFrameSync2],
+        }
+      }];
+      const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse);
+      expect(result).to.deep.equal([
+        pixelSync1,
+        iFrameSync2,
+      ]);
+    });
+
+    it('should not include iFrame syncs if the option is disabled', function () {
+      const serverResponse = [{
+        ext: {
+          pixels: [pixelSync1, pixelSync2],
+          iframes: [iFrameSync1, iFrameSync2],
+        }
+      }];
+      const result = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, serverResponse);
+      expect(result).to.deep.equal([
+        pixelSync1,
+        pixelSync2,
+      ]);
+    });
+
+    it('should not include pixel syncs if the option is disabled', function () {
+      const serverResponse = [{
+        ext: {
+          pixels: [pixelSync1, pixelSync2],
+          iframes: [iFrameSync1, iFrameSync2],
+        }
+      }];
+      const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, serverResponse);
+      expect(result).to.deep.equal([
+        iFrameSync1,
+        iFrameSync2,
+      ]);
+    });
+
+    it('should not include any syncs if the sync options are disabled or missing', function () {
+      const serverResponse = [{
+        ext: {
+          pixels: [pixelSync1, pixelSync2],
+          iframes: [iFrameSync1, iFrameSync2],
+        }
+      }];
+      const result = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: false}, serverResponse);
+      expect(result).to.deep.equal([]);
+    });
   });
 
   describe('event tracking calls', function () {
@@ -456,7 +592,7 @@ describe('FeedAdAdapter', function () {
             prebid_bid_id: bidId,
             prebid_transaction_id: transactionId,
             referer,
-            sdk_version: '1.0.2'
+            sdk_version: '1.0.3'
           };
           subject(data);
           expect(server.requests.length).to.equal(1);

From 91ac96574e34eb1a78dc23caddd6ee6b248d8eb4 Mon Sep 17 00:00:00 2001
From: Rocco Barbini <46724608+rbarbini-ias@users.noreply.github.com>
Date: Wed, 14 Sep 2022 15:35:36 +0200
Subject: [PATCH 258/569] IAS RTD Module: Custom URL support (#8994)

* custom pageUrl setting added

* custom pageUrl unit test added

* basic validation of the pageUrl
---
 modules/iasRtdProvider.js                | 20 +++++++++++++++++---
 test/spec/modules/iasRtdProvider_spec.js |  4 +++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/modules/iasRtdProvider.js b/modules/iasRtdProvider.js
index 58899d7a8c0..605fff8898e 100644
--- a/modules/iasRtdProvider.js
+++ b/modules/iasRtdProvider.js
@@ -119,7 +119,7 @@ function formatTargetingData(adUnit) {
   return renameKeyValues(result);
 }
 
-function constructQueryString(anId, adUnits) {
+function constructQueryString(anId, adUnits, pageUrl) {
   let queries = [];
   queries.push(['anId', anId]);
 
@@ -130,7 +130,7 @@ function constructQueryString(anId, adUnits) {
 
   queries.push(['wr', stringifyWindowSize()]);
   queries.push(['sr', stringifyScreenSize()]);
-  queries.push(['url', encodeURIComponent(window.location.href)]);
+  queries.push(['url', encodeURIComponent(pageUrl)]);
 
   return encodeURI(queries.map(qs => qs.join('=')).join('&'));
 }
@@ -160,6 +160,16 @@ function getTargetingData(adUnits, config, userConsent) {
   return targeting;
 }
 
+function isValidHttpUrl(string) {
+  let url;
+  try {
+    url = new URL(string);
+  } catch (_) {
+    return false;
+  }
+  return url.protocol === 'http:' || url.protocol === 'https:';
+}
+
 export function getApiCallback() {
   return {
     success: function (response, req) {
@@ -180,7 +190,11 @@ export function getApiCallback() {
 function getBidRequestData(reqBidsConfigObj, callback, config, userConsent) {
   const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
   const { pubId } = config.params;
-  const queryString = constructQueryString(pubId, adUnits);
+  let { pageUrl } = config.params;
+  if (!isValidHttpUrl(pageUrl)) {
+    pageUrl = document.location.href;
+  }
+  const queryString = constructQueryString(pubId, adUnits, pageUrl);
   ajax(
     `${IAS_HOST}?${queryString}`,
     getApiCallback(),
diff --git a/test/spec/modules/iasRtdProvider_spec.js b/test/spec/modules/iasRtdProvider_spec.js
index 0d52c594fb5..feb4c1093a8 100644
--- a/test/spec/modules/iasRtdProvider_spec.js
+++ b/test/spec/modules/iasRtdProvider_spec.js
@@ -73,6 +73,7 @@ describe('iasRtdProvider is a RTD provider that', function () {
       request = server.requests[0];
       request.respond(200, responseHeader, JSON.stringify(data));
       expect(request.url).to.be.include(`https://pixel.adsafeprotected.com/services/pub?anId=1234`);
+      expect(request.url).to.be.include('url=https%253A%252F%252Fintegralads.com%252Ftest')
       expect(adUnits).to.length(2);
       expect(adUnits[0]).to.be.eq(adUnitsOriginal[0]);
       const targetingKeys = Object.keys(iasTargeting);
@@ -136,7 +137,8 @@ const config = {
     pubId: 1234,
     keyMappings: {
       'id': 'ias_id'
-    }
+    },
+    pageUrl: 'https://integralads.com/test'
   }
 };
 

From 1e24b362b9346b22669ec1f770a5d7bb74dd48e1 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Wed, 14 Sep 2022 08:47:46 -0600
Subject: [PATCH 259/569] USP consent management module: fix bug with zero-conf
 not being enabled on first auction (#8995)

---
 modules/consentManagementUsp.js               | 26 ++++++++++---------
 .../spec/modules/consentManagementUsp_spec.js |  8 ++++--
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/modules/consentManagementUsp.js b/modules/consentManagementUsp.js
index b6a627a1baa..76bc7982be7 100644
--- a/modules/consentManagementUsp.js
+++ b/modules/consentManagementUsp.js
@@ -4,11 +4,11 @@
  * information and make it available for any USP (CCPA) supported adapters to
  * read/pass this information to their system.
  */
-import { isFn, logInfo, logWarn, isStr, isNumber, isPlainObject, logError } from '../src/utils.js';
-import { config } from '../src/config.js';
-import { uspDataHandler } from '../src/adapterManager.js';
-import {getGlobal} from '../src/prebidGlobal.js';
+import {isFn, isNumber, isPlainObject, isStr, logError, logInfo, logWarn} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {uspDataHandler} from '../src/adapterManager.js';
 import {timedAuctionHook} from '../src/utils/perfMetrics.js';
+import {getHook} from '../src/hook.js';
 
 const DEFAULT_CONSENT_API = 'iab';
 const DEFAULT_CONSENT_TIMEOUT = 50;
@@ -19,7 +19,7 @@ export let consentTimeout = DEFAULT_CONSENT_TIMEOUT;
 export let staticConsentData;
 
 let consentData;
-let addedConsentHook = false;
+let enabled = false;
 
 // consent APIs
 const uspCallMap = {
@@ -213,6 +213,9 @@ function loadConsentData(cb) {
  * @param {function} fn required; The next function in the chain, used by hook.js
  */
 export const requestBidsHook = timedAuctionHook('usp', function requestBidsHook(fn, reqBidsConfigObj) {
+  if (!enabled) {
+    enableConsentManagement();
+  }
   loadConsentData((errMsg, ...extraArgs) => {
     if (errMsg != null) {
       logWarn(errMsg, ...extraArgs);
@@ -258,8 +261,7 @@ export function resetConsentData() {
   consentAPI = undefined;
   consentTimeout = undefined;
   uspDataHandler.reset();
-  getGlobal().requestBids.getHooks({hook: requestBidsHook}).remove();
-  addedConsentHook = false;
+  enabled = false;
 }
 
 /**
@@ -296,13 +298,13 @@ export function setConsentConfig(config) {
 }
 
 function enableConsentManagement(configFromUser = false) {
-  if (!addedConsentHook) {
+  if (!enabled) {
     logInfo(`USPAPI consentManagement module has been activated${configFromUser ? '' : ` using default values (api: '${consentAPI}', timeout: ${consentTimeout}ms)`}`);
-    getGlobal().requestBids.before(requestBidsHook, 50);
+    enabled = true;
+    uspDataHandler.enable();
   }
-  addedConsentHook = true;
-  uspDataHandler.enable();
   loadConsentData(); // immediately look up consent data to make it available without requiring an auction
 }
 config.getConfig('consentManagement', config => setConsentConfig(config.consentManagement));
-setTimeout(() => !addedConsentHook && enableConsentManagement());
+
+getHook('requestBids').before(requestBidsHook, 50);
diff --git a/test/spec/modules/consentManagementUsp_spec.js b/test/spec/modules/consentManagementUsp_spec.js
index 94a0ba92813..39aeee4470b 100644
--- a/test/spec/modules/consentManagementUsp_spec.js
+++ b/test/spec/modules/consentManagementUsp_spec.js
@@ -23,8 +23,12 @@ function createIFrameMarker() {
 }
 
 describe('consentManagement', function () {
-  it('should be enabled by default', () => {
-    expect(uspDataHandler.enabled).to.be.true;
+  it('should enable itself on requestBids using default values', (done) => {
+    requestBidsHook(() => {
+      expect(uspDataHandler.enabled).to.be.true;
+      expect(consentAPI).to.eql('iab');
+      done();
+    }, {});
   });
   it('should respect configuration set after activation', () => {
     setConsentConfig({

From 16c9ba5a6ed962f55e0941bcd6a26ef4ba5965b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ven=C3=A2ncio?=
 <45434454+jvnnc@users.noreply.github.com>
Date: Wed, 14 Sep 2022 15:16:12 -0300
Subject: [PATCH 260/569] Navegg ID System: Added call to NaveggID API (#8946)

* Navegg ID System: Added call to NaveggID API

* Navegg ID System: Switched to ajax

Co-authored-by: Jose <jose.silva@navegg.com>
---
 modules/naveggIdSystem.js | 75 +++++++++++++++++++++++++++------------
 1 file changed, 53 insertions(+), 22 deletions(-)

diff --git a/modules/naveggIdSystem.js b/modules/naveggIdSystem.js
index a292b42f144..25f0afe4733 100644
--- a/modules/naveggIdSystem.js
+++ b/modules/naveggIdSystem.js
@@ -6,16 +6,52 @@
  */
 import { isStr, isPlainObject, logError } from '../src/utils.js';
 import { submodule } from '../src/hook.js';
+import { ajax } from '../src/ajax.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const MODULE_NAME = 'naveggId';
 const OLD_NAVEGG_ID = 'nid';
-const NAVEGG_ID = 'nvggid'
+const NAVEGG_ID = 'nvggid';
+const BASE_URL = 'https://id.navegg.com/uid/';
+const DEFAULT_EXPIRE = 8 * 24 * 3600 * 1000;
+const INVALID_EXPIRE = 3600 * 1000;
 
 export const storage = getStorageManager();
 
+function getNaveggIdFromApi() {
+  const callbacks = {
+    success: response => {
+      if (response) {
+        try {
+          const responseObj = JSON.parse(response);
+          writeCookie(NAVEGG_ID, responseObj[NAVEGG_ID]);
+        } catch (error) {
+          logError(error);
+        }
+      }
+    },
+    error: error => {
+      logError('Navegg ID fetch encountered an error', error);
+    }
+  };
+  ajax(BASE_URL, callbacks, undefined, { method: 'GET', withCredentials: false });
+}
+
+function writeCookie(key, value) {
+  try {
+    if (storage.cookiesAreEnabled) {
+      let expTime = new Date();
+      const expires = value ? DEFAULT_EXPIRE : INVALID_EXPIRE;
+      expTime.setTime(expTime.getTime() + expires);
+      storage.setCookie(key, value, expTime.toUTCString(), 'none');
+    }
+  } catch (e) {
+    logError(e);
+  }
+}
+
 function readnaveggIdFromLocalStorage() {
-  return storage.getDataFromLocalStorage(NAVEGG_ID);
+  return storage.localStorageIsEnabled ? storage.getDataFromLocalStorage(NAVEGG_ID) : null;
 }
 
 function readnaveggIDFromCookie() {
@@ -37,35 +73,30 @@ function readnavIDFromCookie() {
 /** @type {Submodule} */
 export const naveggIdSubmodule = {
   /**
-   * used to link submodule with config
-   * @type {string}
-   */
+  * used to link submodule with config
+  * @type {string}
+  */
   name: MODULE_NAME,
   /**
-   * decode the stored id value for passing to bid requests
-   * @function
-   * @param { Object | string | undefined } value
-   * @return { Object | string | undefined }
-   */
+  * decode the stored id value for passing to bid requests
+  * @function
+  * @param { Object | string | undefined } value
+  * @return { Object | string | undefined }
+  */
   decode(value) {
     const naveggIdVal = value ? isStr(value) ? value : isPlainObject(value) ? value.id : undefined : undefined;
     return naveggIdVal ? {
-      'naveggId': naveggIdVal
+      'naveggId': naveggIdVal.split('|')[0]
     } : undefined;
   },
   /**
-   * performs action to obtain id and return a value in the callback's response argument
-   * @function
-   * @param {SubmoduleConfig} config
-   * @return {{id: string | undefined } | undefined}
-   */
+  * performs action to obtain id and return a value in the callback's response argument
+  * @function
+  * @param {SubmoduleConfig} config
+  * @return {{id: string | undefined } | undefined}
+  */
   getId() {
-    let naveggIdStringFromLocalStorage = null;
-    if (storage.localStorageIsEnabled) {
-      naveggIdStringFromLocalStorage = readnaveggIdFromLocalStorage();
-    }
-
-    const naveggIdString = naveggIdStringFromLocalStorage || readnaveggIDFromCookie() || readoldnaveggIDFromCookie() || readnvgIDFromCookie() || readnavIDFromCookie();
+    const naveggIdString = readnaveggIdFromLocalStorage() || readnaveggIDFromCookie() || getNaveggIdFromApi() || readoldnaveggIDFromCookie() || readnvgIDFromCookie() || readnavIDFromCookie();
 
     if (typeof naveggIdString == 'string' && naveggIdString) {
       try {

From d319abd2688bfa9e2f54f20595d996eb33ca6101 Mon Sep 17 00:00:00 2001
From: Malkov Mikhail <mhlmlkv@gmail.com>
Date: Wed, 14 Sep 2022 22:02:28 +0300
Subject: [PATCH 261/569] NextMillennium Bid Adapter: sends not one size, but
 multiple for a request (#8975)

* single size to multi size

* Fixed tests for new changes

* code style changes

* code style changes
---
 modules/nextMillenniumBidAdapter.js           | 197 +++++++++---------
 .../modules/nextMillenniumBidAdapter_spec.js  |  22 +-
 2 files changed, 121 insertions(+), 98 deletions(-)

diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index a4c89866741..44e70b7b981 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -10,9 +10,9 @@ import {
   triggerPixel,
 } from '../src/utils.js';
 
-import CONSTANTS from '../src/constants.json'
+import CONSTANTS from '../src/constants.json';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
-import * as events from '../src/events.js'
+import * as events from '../src/events.js';
 
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { getRefererInfo } from '../src/refererDetection.js';
@@ -23,11 +23,11 @@ const TEST_ENDPOINT = 'https://test.pbs.nextmillmedia.com/openrtb2/auction';
 const SYNC_ENDPOINT = 'https://statics.nextmillmedia.com/load-cookie.html?v=4';
 const TIME_TO_LIVE = 360;
 
-const EXPIRENCE_WURL = 20 * 60000
-const wurlMap = {}
+const EXPIRENCE_WURL = 20 * 60000;
+const wurlMap = {};
 
-events.on(CONSTANTS.EVENTS.BID_WON, bidWonHandler)
-cleanWurl()
+events.on(CONSTANTS.EVENTS.BID_WON, bidWonHandler);
+cleanWurl();
 
 export const spec = {
   code: BIDDER_CODE,
@@ -45,14 +45,14 @@ export const spec = {
 
     _each(validBidRequests, function(bid) {
       window.nmmRefreshCounts[bid.adUnitCode] = window.nmmRefreshCounts[bid.adUnitCode] || 0;
-      const id = getPlacementId(bid)
-      const auctionId = bid.auctionId
-      const bidId = bid.bidId
-      let sizes = bid.sizes
-      if (sizes && !Array.isArray(sizes[0])) sizes = [sizes]
+      const id = getPlacementId(bid);
+      const auctionId = bid.auctionId;
+      const bidId = bid.bidId;
+      let sizes = bid.sizes;
+      if (sizes && !Array.isArray(sizes[0])) sizes = [sizes];
 
-      const site = getSiteObj()
-      const device = getDeviceObj()
+      const site = getSiteObj();
+      const device = getDeviceObj();
 
       const postBody = {
         'id': bid.auctionId,
@@ -69,12 +69,14 @@ export const spec = {
             'scrollTop': window.pageYOffset || document.documentElement.scrollTop
           }
         },
+
         device,
         site,
         'imp': [{
           'banner': {
             'format': (sizes || []).map(s => { return {w: s[0], h: s[1]} })
           },
+
           'ext': {
             'prebid': {
               'storedrequest': {
@@ -83,30 +85,30 @@ export const spec = {
             }
           }
         }]
-      }
+      };
 
       const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
-      const uspConsent = bidderRequest && bidderRequest.uspConsent
+      const uspConsent = bidderRequest && bidderRequest.uspConsent;
 
       if (gdprConsent || uspConsent) {
-        postBody.regs = { ext: {} }
+        postBody.regs = { ext: {} };
 
         if (uspConsent) {
           postBody.regs.ext.us_privacy = uspConsent;
-        }
+        };
 
         if (gdprConsent) {
           if (typeof gdprConsent.gdprApplies !== 'undefined') {
             postBody.regs.ext.gdpr = gdprConsent.gdprApplies ? 1 : 0;
-          }
+          };
 
           if (typeof gdprConsent.consentString !== 'undefined') {
             postBody.user = {
               ext: { consent: gdprConsent.consentString }
-            }
-          }
-        }
-      }
+            };
+          };
+        };
+      };
 
       const urlParameters = parseUrl(getWindowTop().location.href).search;
       const isTest = urlParameters['pbs'] && urlParameters['pbs'] === 'test';
@@ -134,12 +136,12 @@ export const spec = {
 
     _each(response.seatbid, (resp) => {
       _each(resp.bid, (bid) => {
-        const requestId = bidRequest.bidId
-        const auctionId = bidRequest.auctionId
-        const wurl = deepAccess(bid, 'ext.prebid.events.win')
-        addWurl({auctionId, requestId, wurl})
+        const requestId = bidRequest.bidId;
+        const auctionId = bidRequest.auctionId;
+        const wurl = deepAccess(bid, 'ext.prebid.events.win');
+        addWurl({auctionId, requestId, wurl});
 
-        const {ad, adUrl, vastUrl, vastXml} = getAd(bid)
+        const {ad, adUrl, vastUrl, vastXml} = getAd(bid);
 
         const bidResponse = {
           requestId,
@@ -153,17 +155,17 @@ export const spec = {
           meta: {
             advertiserDomains: bid.adomain || []
           }
-        }
+        };
 
         if (vastUrl || vastXml) {
-          bidResponse.mediaType = VIDEO
+          bidResponse.mediaType = VIDEO;
 
-          if (vastUrl) bidResponse.vastUrl = vastUrl
-          if (vastXml) bidResponse.vastXml = vastXml
+          if (vastUrl) bidResponse.vastUrl = vastUrl;
+          if (vastXml) bidResponse.vastXml = vastXml;
         } else {
-          bidResponse.ad = ad
-          bidResponse.adUrl = adUrl
-        }
+          bidResponse.ad = ad;
+          bidResponse.adUrl = adUrl;
+        };
 
         bidResponses.push(bidResponse);
       });
@@ -174,22 +176,22 @@ export const spec = {
 
   getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
     if (!syncOptions.iframeEnabled) {
-      return
-    }
+      return;
+    };
 
-    let syncurl = gdprConsent && gdprConsent.gdprApplies ? `${SYNC_ENDPOINT}&gdpr=1&gdpr_consent=${gdprConsent.consentString}` : SYNC_ENDPOINT
+    let syncurl = gdprConsent && gdprConsent.gdprApplies ? `${SYNC_ENDPOINT}&gdpr=1&gdpr_consent=${gdprConsent.consentString}` : SYNC_ENDPOINT;
 
-    let bidders = []
+    let bidders = [];
     if (responses) {
       _each(responses, (response) => {
-        if (!(response && response.body && response.body.ext && response.body.ext.responsetimemillis)) return
-        _each(Object.keys(response.body.ext.responsetimemillis), b => bidders.push(b))
-      })
-    }
+        if (!(response && response.body && response.body.ext && response.body.ext.responsetimemillis)) return;
+        _each(Object.keys(response.body.ext.responsetimemillis), b => bidders.push(b));
+      });
+    };
 
     if (bidders.length) {
-      syncurl += `&bidders=${bidders.join(',')}`
-    }
+      syncurl += `&bidders=${bidders.join(',')}`;
+    };
 
     return [{
       type: 'iframe',
@@ -197,6 +199,7 @@ export const spec = {
     }];
   },
 };
+
 function getAdEl(bid) {
   // best way I could think of to get El, is by matching adUnitCode to google slots...
   const slot = window.googletag && window.googletag.pubads && window.googletag.pubads().getSlots().find(slot => slot.getAdUnitPath() === bid.adUnitCode);
@@ -204,127 +207,127 @@ function getAdEl(bid) {
   if (!slotElementId) return null;
   return document.querySelector('#' + slotElementId);
 }
+
 function getBoundingClient(bid) {
-  // console.log(bid)
-  const el = getAdEl(bid)
-  if (!el) return {}
+  const el = getAdEl(bid);
+  if (!el) return {};
   return el.getBoundingClientRect();
 }
 
 function getPlacementId(bid) {
-  const groupId = getBidIdParameter('group_id', bid.params)
-  const placementId = getBidIdParameter('placement_id', bid.params)
-  if (!groupId) return placementId
+  const groupId = getBidIdParameter('group_id', bid.params);
+  const placementId = getBidIdParameter('placement_id', bid.params);
+  if (!groupId) return placementId;
 
-  let windowTop = getTopWindow(window)
-  let size = []
+  let windowTop = getTopWindow(window);
+  let sizes = [];
   if (bid.mediaTypes) {
-    if (bid.mediaTypes.banner) size = bid.mediaTypes.banner.sizes && bid.mediaTypes.banner.sizes[0]
-    if (bid.mediaTypes.video) size = bid.mediaTypes.video.playerSize
-  }
+    if (bid.mediaTypes.banner) sizes = bid.mediaTypes.banner.sizes;
+    if (bid.mediaTypes.video) sizes = [bid.mediaTypes.video.playerSize];
+  };
 
-  const host = (windowTop && windowTop.location && windowTop.location.host) || ''
-  return `g${groupId};${size.join('x')};${host}`
+  const host = (windowTop && windowTop.location && windowTop.location.host) || '';
+  return `g${groupId};${sizes.map(size => size.join('x')).join('|')};${host}`;
 }
 
 function getTopWindow(curWindow, nesting = 0) {
   if (nesting > 10) {
-    return curWindow
-  }
+    return curWindow;
+  };
 
   try {
     if (curWindow.parent.document) {
-      return getTopWindow(curWindow.parent.window, ++nesting)
-    }
+      return getTopWindow(curWindow.parent.window, ++nesting);
+    };
   } catch (err) {
-    return curWindow
-  }
+    return curWindow;
+  };
 }
 
 function getAd(bid) {
-  let ad, adUrl, vastXml, vastUrl
+  let ad, adUrl, vastXml, vastUrl;
 
   switch (deepAccess(bid, 'ext.prebid.type')) {
     case VIDEO:
       if (bid.adm.substr(0, 4) === 'http') {
-        vastUrl = bid.adm
+        vastUrl = bid.adm;
       } else {
-        vastXml = bid.adm
-      }
+        vastXml = bid.adm;
+      };
 
       break;
     default:
       if (bid.adm && bid.nurl) {
-        ad = bid.adm
-        ad += createTrackPixelHtml(decodeURIComponent(bid.nurl))
+        ad = bid.adm;
+        ad += createTrackPixelHtml(decodeURIComponent(bid.nurl));
       } else if (bid.adm) {
-        ad = bid.adm
+        ad = bid.adm;
       } else if (bid.nurl) {
-        adUrl = bid.nurl
-      }
+        adUrl = bid.nurl;
+      };
   }
 
-  return {ad, adUrl, vastXml, vastUrl}
+  return {ad, adUrl, vastXml, vastUrl};
 }
 
 function getSiteObj() {
-  const refInfo = (getRefererInfo && getRefererInfo()) || {}
+  const refInfo = (getRefererInfo && getRefererInfo()) || {};
 
   return {
     page: refInfo.page,
     ref: refInfo.ref,
     domain: refInfo.domain
-  }
+  };
 }
 
 function getDeviceObj() {
   return {
     w: window.innerWidth || window.document.documentElement.clientWidth || window.document.body.clientWidth || 0,
     h: window.innerHeight || window.document.documentElement.clientHeight || window.document.body.clientHeight || 0,
-  }
+  };
 }
 
 function getKeyWurl({auctionId, requestId}) {
-  return `${auctionId}-${requestId}`
+  return `${auctionId}-${requestId}`;
 }
 
 function addWurl({wurl, requestId, auctionId}) {
-  if (!wurl) return
+  if (!wurl) return;
 
-  const expirence = Date.now() + EXPIRENCE_WURL
-  const key = getKeyWurl({auctionId, requestId})
-  wurlMap[key] = {wurl, expirence}
+  const expirence = Date.now() + EXPIRENCE_WURL;
+  const key = getKeyWurl({auctionId, requestId});
+  wurlMap[key] = {wurl, expirence};
 }
 
 function removeWurl({auctionId, requestId}) {
-  const key = getKeyWurl({auctionId, requestId})
-  delete wurlMap[key]
+  const key = getKeyWurl({auctionId, requestId});
+  delete wurlMap[key];
 }
 
 function getWurl({auctionId, requestId}) {
-  const key = getKeyWurl({auctionId, requestId})
-  return wurlMap[key] && wurlMap[key].wurl
+  const key = getKeyWurl({auctionId, requestId});
+  return wurlMap[key] && wurlMap[key].wurl;
 }
 
 function bidWonHandler(bid) {
-  const {auctionId, requestId} = bid
-  const wurl = getWurl({auctionId, requestId})
+  const {auctionId, requestId} = bid;
+  const wurl = getWurl({auctionId, requestId});
   if (wurl) {
-    logMessage(`(nextmillennium) Invoking image pixel for wurl on BID_WIN: "${wurl}"`)
-    triggerPixel(wurl)
-    removeWurl({auctionId, requestId})
-  }
+    logMessage(`(nextmillennium) Invoking image pixel for wurl on BID_WIN: "${wurl}"`);
+    triggerPixel(wurl);
+    removeWurl({auctionId, requestId});
+  };
 }
 
 function cleanWurl() {
-  const dateNow = Date.now()
+  const dateNow = Date.now();
   Object.keys(wurlMap).forEach(key => {
     if (dateNow >= wurlMap[key].expirence) {
-      delete wurlMap[key]
-    }
-  })
+      delete wurlMap[key];
+    };
+  });
 
-  setTimeout(cleanWurl, 60000)
+  setTimeout(cleanWurl, 60000);
 }
 
-registerBidder(spec)
+registerBidder(spec);
diff --git a/test/spec/modules/nextMillenniumBidAdapter_spec.js b/test/spec/modules/nextMillenniumBidAdapter_spec.js
index 6ba979bc205..36920245070 100644
--- a/test/spec/modules/nextMillenniumBidAdapter_spec.js
+++ b/test/spec/modules/nextMillenniumBidAdapter_spec.js
@@ -49,6 +49,26 @@ describe('nextMillenniumBidAdapterTests', function() {
       }
     },
 
+    {
+      adUnitCode: 'test-banner-gi',
+      bidId: 'bid1234',
+      auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+      bidder: 'nextMillennium',
+      params: { group_id: '1234' },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 300]]
+        }
+      },
+
+      sizes: [[300, 250], [300, 300]],
+      uspConsent: '1---',
+      gdprConsent: {
+        consentString: 'kjfdniwjnifwenrif3',
+        gdprApplies: true
+      }
+    },
+
     {
       adUnitCode: 'test-video-gi',
       bidId: 'bid1234',
@@ -94,7 +114,7 @@ describe('nextMillenniumBidAdapterTests', function() {
       const request = spec.buildRequests([test]);
       const requestData = JSON.parse(request[0].data);
       const storeRequestId = requestData.ext.prebid.storedrequest.id;
-      const templateRE = /^g\d+;\d+x\d+;/;
+      const templateRE = /^g[1-9]\d*;(?:[1-9]\d*x[1-9]\d*\|)*[1-9]\d*x[1-9]\d*;/;
       expect(templateRE.test(storeRequestId)).to.be.true;
     };
   });

From 8ebd8a4b6332c6accd978c0ce31ac7e04503c373 Mon Sep 17 00:00:00 2001
From: shahinrahbariasl <56240400+shahinrahbariasl@users.noreply.github.com>
Date: Wed, 14 Sep 2022 18:47:00 -0400
Subject: [PATCH 262/569] feat: stop sending constructed GPID [PB-1276] (#8998)

feat: stop sending constructed GPID [PB-1276]

Co-authored-by: shahin.rahbariasl <shahin.rahbariasl@indexexchange.com>
---
 modules/ixBidAdapter.js                |  7 +--
 test/spec/modules/ixBidAdapter_spec.js | 64 --------------------------
 2 files changed, 2 insertions(+), 69 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 48cead83c0d..2f946635be4 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -755,14 +755,10 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
       currentImpressionSize = encodeURIComponent(JSON.stringify({ impressionObjects })).length;
     }
 
-    let gpid = impressions[transactionIds[adUnitIndex]].gpid;
+    const gpid = impressions[transactionIds[adUnitIndex]].gpid;
     const dfpAdUnitCode = impressions[transactionIds[adUnitIndex]].dfp_ad_unit_code;
     const tid = impressions[transactionIds[adUnitIndex]].tid;
-    const divId = impressions[transactionIds[adUnitIndex]].divId;
 
-    if (!gpid && dfpAdUnitCode && divId) {
-      gpid = `${dfpAdUnitCode}#${divId}`;
-    }
     if (impressionObjects.length && BANNER in impressionObjects[0]) {
       const { id, banner: { topframe } } = impressionObjects[0];
       const _bannerImpression = {
@@ -845,6 +841,7 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     const pbaAdSlot = impressions[transactionIds[adUnitIndex]].pbadslot;
     const tagId = impressions[transactionIds[adUnitIndex]].tagId;
     const adUnitCode = impressions[transactionIds[adUnitIndex]].adUnitCode;
+    const divId = impressions[transactionIds[adUnitIndex]].divId;
     if (pbaAdSlot || tagId || adUnitCode || divId) {
       const clonedRObject = deepClone(r);
       const requestSize = `${baseUrl}${parseQueryStringParameters({ ...payload, r: JSON.stringify(clonedRObject) })}`.length;
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index 60ea2df0510..34c9e865909 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -1665,70 +1665,6 @@ describe('IndexexchangeAdapter', function () {
       expect(gpid).to.equal(GPID);
     });
 
-    it('should still build gpid in request if ortb2Imp.ext.gpid does not exist', function () {
-      const AD_UNIT_CODE = '/1111/home';
-      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
-      sinon.stub(utils, 'getGptSlotInfoForAdUnitCode')
-        .returns({ gptSlot: AD_UNIT_CODE, divId: 'adunit-code-3-div-id' });
-      validBids[0].ortb2Imp = {
-        ext: {
-          data: {
-            adserver: {
-              name: 'gam',
-              adslot: AD_UNIT_CODE
-            }
-          }
-        }
-      }
-      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
-      const { ext: { gpid } } = JSON.parse(requests[0].data.r).imp[0];
-      utils.getGptSlotInfoForAdUnitCode.restore();
-      expect(gpid).to.equal(`${AD_UNIT_CODE}#adunit-code-3-div-id`);
-    });
-
-    it('should not build gpid if divid doesnt exist when ortb2Imp.ext.gpid does not exist', function () {
-      const AD_UNIT_CODE = '/1111/home';
-      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
-      sinon.stub(utils, 'getGptSlotInfoForAdUnitCode')
-        .returns({ gptSlot: AD_UNIT_CODE });
-      validBids[0].ortb2Imp = {
-        ext: {
-          data: {
-            adserver: {
-              name: 'gam',
-              adslot: AD_UNIT_CODE
-            }
-          }
-        }
-      }
-      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
-      const imp = JSON.parse(requests[0].data.r).imp[0];
-      utils.getGptSlotInfoForAdUnitCode.restore();
-      expect(imp.ext.gpid).to.be.undefined;
-      expect(imp.ext.dfp_ad_unit_code).to.equal(AD_UNIT_CODE)
-    });
-
-    it('should not build gpid if dfp ad unit code / divid doesnt exist when ortb2Imp.ext.gpid does not exist', function () {
-      const AD_UNIT_CODE = '/1111/home';
-      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
-      sinon.stub(utils, 'getGptSlotInfoForAdUnitCode')
-        .returns({});
-      validBids[0].ortb2Imp = {
-        ext: {
-          data: {
-            adserver: {
-              name: 'gam',
-            }
-          }
-        }
-      }
-      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
-
-      const imp = JSON.parse(requests[0].data.r).imp[0];
-      utils.getGptSlotInfoForAdUnitCode.restore();
-      expect(imp.ext).to.be.undefined;
-    });
-
     it('should send gpid in request if ortb2Imp.ext.gpid exists when no size present', function () {
       const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID_PARAM_NO_SIZE);
       validBids[0].ortb2Imp = {

From af8fb3816be54406fd69851acc8f6fe0565f9f18 Mon Sep 17 00:00:00 2001
From: Laurentiu Badea <laurb9@users.noreply.github.com>
Date: Thu, 15 Sep 2022 05:47:46 -0700
Subject: [PATCH 263/569] OpenX handle response with missing seatbid and no nbr
 (#8999)

---
 modules/openxOrtbBidAdapter.js                |  2 +-
 test/spec/modules/openxOrtbBidAdapter_spec.js | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/modules/openxOrtbBidAdapter.js b/modules/openxOrtbBidAdapter.js
index dc79ffb47b2..50b62544dfa 100644
--- a/modules/openxOrtbBidAdapter.js
+++ b/modules/openxOrtbBidAdapter.js
@@ -275,7 +275,7 @@ function interpretOrtbResponse(resp, req) {
   }
 
   const respBody = resp.body;
-  if (!respBody || 'nbr' in respBody) {
+  if (!respBody || 'nbr' in respBody || !Array.isArray(respBody.seatbid)) {
     return [];
   }
 
diff --git a/test/spec/modules/openxOrtbBidAdapter_spec.js b/test/spec/modules/openxOrtbBidAdapter_spec.js
index 6d1e59da677..246411b457a 100644
--- a/test/spec/modules/openxOrtbBidAdapter_spec.js
+++ b/test/spec/modules/openxOrtbBidAdapter_spec.js
@@ -1019,6 +1019,37 @@ describe('OpenxRtbAdapter', function () {
       });
     });
 
+    context('when no seatbid in response', function () {
+      let bids;
+      beforeEach(function () {
+        bidRequestConfigs = [{
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain'
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]],
+            },
+          },
+          bidId: 'test-bid-id',
+          bidderRequestId: 'test-bidder-request-id',
+          auctionId: 'test-auction-id'
+        }];
+
+        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
+
+        bidResponse = {ext: {}, id: 'test-bid-id'};
+        bids = spec.interpretResponse({body: bidResponse}, bidRequest);
+      });
+
+      it('should not return any bids', function () {
+        expect(bids.length).to.equal(0);
+      });
+    });
+
     context('when there is no response', function () {
       let bids;
       beforeEach(function () {

From 0faf44e630468eeedea6f6d10229993066f6aef7 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Thu, 15 Sep 2022 09:44:04 -0600
Subject: [PATCH 264/569] CI: re-enable e2e tests (#8996)

---
 .circleci/config.yml          | 3 +++
 test/helpers/testing-utils.js | 7 ++++---
 wdio.conf.js                  | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7f9324956ca..395583ada86 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -87,6 +87,9 @@ workflows:
   commit:
     jobs:
       - build
+      - e2etest:
+          requires:
+            - build
 
 experimental:
   pipelines: true
diff --git a/test/helpers/testing-utils.js b/test/helpers/testing-utils.js
index 81f22ca471d..1336a90ecbf 100644
--- a/test/helpers/testing-utils.js
+++ b/test/helpers/testing-utils.js
@@ -1,12 +1,13 @@
 /* eslint-disable no-console */
 const {expect} = require('chai');
+const DEFAULT_TIMEOUT = 2000;
 const utils = {
   host: (process.env.TEST_SERVER_HOST) ? process.env.TEST_SERVER_HOST : 'localhost',
   protocol: (process.env.TEST_SERVER_PROTOCOL) ? 'https' : 'http',
   testPageURL: function(name) {
     return `${utils.protocol}://${utils.host}:9999/test/pages/${name}`
   },
-  waitForElement: function(elementRef, time = 2000) {
+  waitForElement: function(elementRef, time = DEFAULT_TIMEOUT) {
     let element = $(elementRef);
     element.waitForExist({timeout: time});
   },
@@ -14,7 +15,7 @@ const utils = {
     let iframe = $(frameRef);
     browser.switchToFrame(iframe);
   },
-  loadAndWaitForElement(url, selector, pause = 3000, timeout = 2000, retries = 3, attempt = 1) {
+  loadAndWaitForElement(url, selector, pause = 3000, timeout = DEFAULT_TIMEOUT, retries = 3, attempt = 1) {
     browser.url(url);
     browser.pause(pause);
     if (selector != null) {
@@ -27,7 +28,7 @@ const utils = {
       }
     }
   },
-  setupTest({url, waitFor, expectGAMCreative = null, pause = 3000, timeout = 2000, retries = 3}, name, fn) {
+  setupTest({url, waitFor, expectGAMCreative = null, pause = 3000, timeout = DEFAULT_TIMEOUT, retries = 3}, name, fn) {
     describe(name, function () {
       this.retries(retries);
       before(() => utils.loadAndWaitForElement(url, waitFor, pause, timeout, retries));
diff --git a/wdio.conf.js b/wdio.conf.js
index 4f14d4c7a6d..3d93f909971 100644
--- a/wdio.conf.js
+++ b/wdio.conf.js
@@ -51,6 +51,7 @@ exports.config = {
   user: process.env.BROWSERSTACK_USERNAME,
   key: process.env.BROWSERSTACK_ACCESS_KEY,
   maxInstances: 5, // Do not increase this, since we have only 5 parallel tests in browserstack account
+  maxInstancesPerCapability: 1,
   capabilities: getCapabilities(),
   logLevel: 'info', // put option here: info | trace | debug | warn| error | silent
   bail: 0,

From 96c6e0ff03a08e2ca424a37554d7b5b9987e2f40 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 15 Sep 2022 18:55:29 +0000
Subject: [PATCH 265/569] Prebid 7.16.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1665b80db6e..9c102c7fcde 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.16.0-pre",
+  "version": "7.16.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index f91ad0bab9e..eae335d5ae2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.16.0-pre",
+  "version": "7.16.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 0460382b241dc26434b6802ef65ed2313ee93f0b Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 15 Sep 2022 18:55:29 +0000
Subject: [PATCH 266/569] Increment version to 7.17.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9c102c7fcde..96df598093f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.16.0",
+  "version": "7.17.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index eae335d5ae2..3748f9dc76f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.16.0",
+  "version": "7.17.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 3265b0567b693aea22fb9b93d7c0cfe892b11b3e Mon Sep 17 00:00:00 2001
From: carodaio <110619753+carodaio@users.noreply.github.com>
Date: Thu, 15 Sep 2022 21:18:00 +0200
Subject: [PATCH 267/569] Caroda Bid Adapter: initial adapter release (#8845)

* WIP|

* work on the response format

* added md file

* some fixes and simplications

* made schain optional

* tests WIP

* fixed bid validation

* request common structure tests

* added privacy tests

* added bid specific logic tests

* final unit tests

* renamed setOnAny to getFirstWithKey

* changed interpretResponse to arrow function

* removed extra newline

* slight adjustment of request/response format

* added ad targeting and ad id to bid response

* fixed undefined ad id error

* fixed linting

* fix: removed setting ad id in interpret response

* fix: impoved pageview id handling when caroda is loaded later than prebid

* style: added semicolumns

* added price type bid validation

Co-authored-by: Ioan-Carol Plangu <info@plangu.com>
---
 modules/carodaBidAdapter.js                | 217 +++++++++
 modules/carodaBidAdapter.md                |  43 ++
 test/spec/modules/carodaBidAdapter_spec.js | 494 +++++++++++++++++++++
 3 files changed, 754 insertions(+)
 create mode 100644 modules/carodaBidAdapter.js
 create mode 100644 modules/carodaBidAdapter.md
 create mode 100644 test/spec/modules/carodaBidAdapter_spec.js

diff --git a/modules/carodaBidAdapter.js b/modules/carodaBidAdapter.js
new file mode 100644
index 00000000000..7267452dd4c
--- /dev/null
+++ b/modules/carodaBidAdapter.js
@@ -0,0 +1,217 @@
+// jshint esversion: 6, es3: false, node: true
+'use strict'
+
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {
+  deepAccess,
+  deepSetValue,
+  logError,
+  mergeDeep,
+  parseSizesInput
+} from '../src/utils.js';
+import { config } from '../src/config.js';
+
+const { getConfig } = config;
+
+const BIDDER_CODE = 'caroda';
+const GVLID = 954;
+
+// some state info is required to synchronize with Caroda ad server
+const topUsableWindow = getTopUsableWindow();
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid: bid => {
+    const params = bid.params || {};
+    const { ctok, placementId, priceType } = params;
+    return typeof ctok === 'string' && (
+      typeof placementId === 'string' ||
+      typeof placementId === 'undefined'
+    ) && (
+      typeof priceType === 'undefined' ||
+      priceType === 'gross' ||
+      priceType === 'net'
+    );
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    topUsableWindow.carodaPageViewId = topUsableWindow.carodaPageViewId || Math.floor(Math.random() * 1e9);
+    const pageViewId = topUsableWindow.carodaPageViewId;
+    const ortbCommon = getORTBCommon(bidderRequest);
+    const priceType =
+      getFirstWithKey(validBidRequests, 'params.priceType') ||
+      'net';
+    const test = getFirstWithKey(validBidRequests, 'params.test');
+    const currency = getConfig('currency.adServerCurrency');
+    const eids = getFirstWithKey(validBidRequests, 'userIdAsEids');
+    const schain = getFirstWithKey(validBidRequests, 'schain');
+    const request = {
+      auctionId: bidderRequest.auctionId,
+      currency,
+      hb_version: '$prebid.version$',
+      ...ortbCommon,
+      price_type: priceType
+    };
+    if (test) {
+      request.test = 1;
+    }
+    if (schain) {
+      request.schain = schain;
+    }
+    if (config.getConfig('coppa')) {
+      deepSetValue(request, 'privacy.coppa', 1);
+    }
+    if (deepAccess(bidderRequest, 'gdprConsent.gdprApplies') !== undefined) {
+      deepSetValue(
+        request,
+        'privacy.gdpr_consent',
+        bidderRequest.gdprConsent.consentString
+      );
+      deepSetValue(
+        request,
+        'privacy.gdpr',
+        bidderRequest.gdprConsent.gdprApplies & 1
+      );
+    }
+    if (bidderRequest.uspConsent) {
+      deepSetValue(request, 'privacy.us_privacy', bidderRequest.uspConsent);
+    }
+    if (eids) {
+      deepSetValue(request, 'user.eids', eids);
+    }
+    return getImps(validBidRequests, request).map(imp => ({
+      method: 'POST',
+      url: 'https://prebid.caroda.io/api/hb?entry_id=' + pageViewId,
+      data: JSON.stringify(imp)
+    }));
+  },
+  interpretResponse: (serverResponse) => {
+    if (!serverResponse.body) {
+      return;
+    }
+    const { ok, error } = serverResponse.body
+    if (error) {
+      logError(BIDDER_CODE, ': server caught', error.message);
+      return;
+    }
+    try {
+      return JSON.parse(ok.value)
+        .map((bid) => {
+          const ret = {
+            requestId: bid.bid_id,
+            cpm: bid.cpm,
+            creativeId: bid.creative_id,
+            ttl: 300,
+            netRevenue: true,
+            currency: bid.currency,
+            width: bid.w,
+            height: bid.h,
+            meta: {
+              advertiserDomains: bid.adomain || []
+            },
+            ad: bid.ad,
+            placementId: bid.placement_id
+          }
+          if (bid.adserver_targeting) {
+            ret.adserverTargeting = bid.adserver_targeting
+          }
+          return ret
+        })
+        .filter(Boolean);
+    } catch (e) {
+      logError(BIDDER_CODE, ': caught', e);
+    }
+  }
+}
+
+registerBidder(spec)
+
+function getFirstWithKey (collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
+}
+
+function getTopUsableWindow () {
+  let res = window;
+  try {
+    while (window.top !== res && res.parent.location.href.length) {
+      res = res.parent;
+    }
+  } catch (e) {}
+  return res;
+}
+
+function getORTBCommon (bidderRequest) {
+  let app, site;
+  const commonFpd = bidderRequest.ortb2 || {};
+  let { user } = commonFpd;
+  if (typeof getConfig('app') === 'object') {
+    app = getConfig('app') || {}
+    if (commonFpd.app) {
+      mergeDeep(app, commonFpd.app);
+    }
+  } else {
+    site = getConfig('site') || {};
+    if (commonFpd.site) {
+      mergeDeep(site, commonFpd.site);
+    }
+    if (!site.page) {
+      site.page = bidderRequest.refererInfo.page;
+    }
+  }
+  const device = getConfig('device') || {};
+  device.w = device.w || window.innerWidth;
+  device.h = device.h || window.innerHeight;
+  device.ua = device.ua || navigator.userAgent;
+  return {
+    app,
+    site,
+    user,
+    device
+  };
+}
+
+function getImps (validBidRequests, common) {
+  return validBidRequests.map((bid) => {
+    const floorInfo = bid.getFloor
+      ? bid.getFloor({ currency: common.currency || 'EUR' })
+      : {};
+    const bidfloor = floorInfo.floor;
+    const bidfloorcur = floorInfo.currency;
+    const { ctok, placementId } = bid.params;
+    const imp = {
+      bid_id: bid.bidId,
+      ctok,
+      bidfloor,
+      bidfloorcur,
+      ...common
+    };
+    const bannerParams = deepAccess(bid, 'mediaTypes.banner');
+    if (bannerParams && bannerParams.sizes) {
+      const sizes = parseSizesInput(bannerParams.sizes);
+      const format = sizes.map(size => {
+        const [width, height] = size.split('x');
+        const w = parseInt(width, 10);
+        const h = parseInt(height, 10);
+        return { w, h };
+      });
+      imp.banner = {
+        format
+      };
+    }
+    if (placementId) {
+      imp.placement_id = placementId;
+    }
+    const videoParams = deepAccess(bid, 'mediaTypes.video');
+    if (videoParams) {
+      imp.video = videoParams;
+    }
+    return imp;
+  })
+}
diff --git a/modules/carodaBidAdapter.md b/modules/carodaBidAdapter.md
new file mode 100644
index 00000000000..35785525038
--- /dev/null
+++ b/modules/carodaBidAdapter.md
@@ -0,0 +1,43 @@
+# Overview
+
+Module Name: Caroda Adapter
+Module Type: Bidder Adapter
+Maintainer: dev@caroda.io
+
+# Description
+
+Module that connects to Caroda demand sources to fetch bids.
+Banner and video formats are supported. 
+Use `caroda` as bidder.
+
+# Test Parameters
+```
+    var adUnits = [{
+        code: '/19968336/prebid_banner_example_1',
+        mediaTypes: {
+            banner: {
+                sizes: [[ 300, 250 ]]
+            }
+        }
+        bids: [{
+            bidder: 'caroda',
+            params: {
+                ctok: '230ce9490c5434354'
+            }
+        }]
+    }, {
+        code: '/19968336/prebid_video_example_1',
+        mediaTypes: {
+            video: {
+                context: 'outstream',
+                mimes: ['video/mp4']
+            }
+        }
+        bids: [{
+            bidder: 'caroda',
+            params: {
+                ctok: '230ce9490c5434354'
+            }
+        }]
+    }];
+```
diff --git a/test/spec/modules/carodaBidAdapter_spec.js b/test/spec/modules/carodaBidAdapter_spec.js
new file mode 100644
index 00000000000..f575e31e85d
--- /dev/null
+++ b/test/spec/modules/carodaBidAdapter_spec.js
@@ -0,0 +1,494 @@
+// jshint esversion: 6, es3: false, node: true
+import { assert } from 'chai';
+import { spec } from 'modules/carodaBidAdapter.js';
+import { config } from 'src/config.js';
+import { createEidsArray } from 'modules/userId/eids.js';
+
+describe('Caroda adapter', function () {
+  let bids = [];
+
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': 'caroda',
+      'params': {
+        'ctok': 'adf232eef344'
+      }
+    };
+
+    it('should return true when required params found', function () {
+      assert(spec.isBidRequestValid(bid));
+
+      bid.params = {
+        ctok: 'adf232eef344',
+        placementId: 'someplacement'
+      };
+      assert(spec.isBidRequestValid(bid));
+    });
+
+    it('should return false when required params are missing', function () {
+      bid.params = {};
+      assert.isFalse(spec.isBidRequestValid(bid));
+
+      bid.params = {
+        placementId: 'someplacement'
+      };
+      assert.isFalse(spec.isBidRequestValid(bid));
+    });
+  });
+
+  describe('buildRequests', function () {
+    beforeEach(function () {
+      config.resetConfig();
+      delete window.carodaPageViewId;
+    });
+    it('should send request with minimal structure', function () {
+      const validBidRequests = [{
+        bid_id: 'bidId',
+        params: {
+          'ctok': 'adf232eef344'
+        }
+      }];
+      window.top.carodaPageViewId = 12345;
+      const request = spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0];
+      assert.equal(request.method, 'POST');
+      assert.equal(request.url, 'https://prebid.caroda.io/api/hb?entry_id=12345');
+      assert.equal(request.options, undefined);
+      const data = JSON.parse(request.data)
+      assert.equal(data.ctok, 'adf232eef344');
+      assert.ok(data.site);
+      assert.ok(data.hb_version);
+      assert.ok(data.device);
+      assert.equal(data.price_type, 'net');
+    });
+
+    it('should add test to request, if test is set in parameters', function () {
+      const validBidRequests = [{
+        bid_id: 'bidId',
+        params: {
+          'ctok': 'adf232eef344',
+          'test': 1
+        }
+      }];
+      window.top.carodaPageViewId = 12345;
+      const request = spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0];
+      const data = JSON.parse(request.data)
+      assert.equal(data.test, 1);
+    });
+
+    it('should add placement_id to request when available', function () {
+      const validBidRequests = [{
+        bid_id: 'bidId',
+        params: {
+          'ctok': 'adf232eef344',
+          'placementId': 'opzafe342f'
+        }
+      }];
+      window.top.carodaPageViewId = 12345;
+      const request = spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0];
+      const data = JSON.parse(request.data);
+      assert.equal(data.placement_id, 'opzafe342f');
+    });
+
+    it('should send info about device', function () {
+      config.setConfig({
+        device: { w: 100, h: 100 }
+      });
+      const validBidRequests = [{
+        bid_id: 'bidId',
+        params: { 'ctok': 'adf232eef344' }
+      }];
+      const data = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+      assert.equal(data.device.ua, navigator.userAgent);
+      assert.equal(data.device.w, 100);
+      assert.equal(data.device.h, 100);
+    });
+
+    it('should pass supply chain object', function () {
+      const validBidRequests = [{
+        bid_id: 'bidId',
+        params: {},
+        schain: {
+          validation: 'strict',
+          config: {
+            ver: '1.0'
+          }
+        }
+      }];
+
+      let data = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+      assert.deepEqual(data.schain, {
+        validation: 'strict',
+        config: {
+          ver: '1.0'
+        }
+      });
+    });
+
+    it('should send app info', function () {
+      config.setConfig({
+        app: { id: 'appid' },
+      });
+      const ortb2 = { app: { name: 'appname' } };
+      let validBidRequests = [{
+        bid_id: 'bidId',
+        params: { mid: '1000' },
+        ortb2
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' }, ortb2 })[0].data);
+      assert.equal(request.app.id, 'appid');
+      assert.equal(request.app.name, 'appname');
+      assert.equal(request.site, undefined);
+    });
+
+    it('should send info about the site', function () {
+      config.setConfig({
+        site: {
+          id: '123123',
+          publisher: {
+            domain: 'publisher.domain.com'
+          }
+        },
+      });
+      const ortb2 = {
+        site: {
+          publisher: {
+            name: 'publisher\'s name'
+          }
+        }
+      };
+      let validBidRequests = [{
+        bid_id: 'bidId',
+        params: { mid: '1000' },
+        ortb2
+      }];
+      let refererInfo = { page: 'page' };
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo, ortb2 })[0].data);
+
+      assert.deepEqual(request.site, {
+        page: refererInfo.page,
+        publisher: {
+          domain: 'publisher.domain.com',
+          name: 'publisher\'s name'
+        },
+        id: '123123'
+      });
+    });
+
+    it('should send correct priceType value', function () {
+      let validBidRequests = [{
+        bid_id: 'bidId',
+        params: { priceType: 'gross' }
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+
+      assert.equal(request.price_type, 'gross');
+    });
+
+    it('should send currency if defined', function () {
+      config.setConfig({ currency: { adServerCurrency: 'EUR' } });
+      let validBidRequests = [{ params: {} }];
+      let refererInfo = { page: 'page' };
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo })[0].data);
+
+      assert.deepEqual(request.currency, 'EUR');
+    });
+
+    it('should pass extended ids', function () {
+      let validBidRequests = [{
+        bid_id: 'bidId',
+        params: {},
+        userIdAsEids: createEidsArray({
+          tdid: 'TTD_ID_FROM_USER_ID_MODULE',
+          pubcid: 'pubCommonId_FROM_USER_ID_MODULE'
+        })
+      }];
+
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+      assert.deepEqual(request.user.eids, [
+        { source: 'adserver.org', uids: [ { id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: { rtiPartner: 'TDID' } } ] },
+        { source: 'pubcid.org', uids: [ { id: 'pubCommonId_FROM_USER_ID_MODULE', atype: 1 } ] }
+      ]);
+    });
+
+    describe('user privacy', function () {
+      it('should send GDPR Consent data to adform if gdprApplies', function () {
+        let validBidRequests = [{ bid_id: 'bidId', params: { test: 1 } }];
+        let bidderRequest = { gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { page: 'page' } };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest)[0].data);
+
+        assert.equal(request.privacy.gdpr_consent, bidderRequest.gdprConsent.consentString);
+        assert.equal(request.privacy.gdpr, bidderRequest.gdprConsent.gdprApplies);
+        assert.equal(typeof request.privacy.gdpr, 'number');
+      });
+
+      it('should send gdpr as number', function () {
+        let validBidRequests = [{ bid_id: 'bidId', params: { test: 1 } }];
+        let bidderRequest = { gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { page: 'page' } };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest)[0].data);
+
+        assert.equal(typeof request.privacy.gdpr, 'number');
+        assert.equal(request.privacy.gdpr, 1);
+      });
+
+      it('should send CCPA Consent data', function () {
+        let validBidRequests = [{ bid_id: 'bidId', params: { test: 1 } }];
+        let bidderRequest = { uspConsent: '1YA-', refererInfo: { page: 'page' } };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest)[0].data);
+
+        assert.equal(request.privacy.us_privacy, '1YA-');
+
+        bidderRequest = { uspConsent: '1YA-', gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { page: 'page' } };
+        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest)[0].data);
+
+        assert.equal(request.privacy.us_privacy, '1YA-');
+        assert.equal(request.privacy.gdpr_consent, 'consentDataString');
+        assert.equal(request.privacy.gdpr, 1);
+      });
+
+      it('should not set coppa when coppa is not provided or is set to false', function () {
+        config.setConfig({
+        });
+        let validBidRequests = [{ bid_id: 'bidId', params: { test: 1 } }];
+        let bidderRequest = { gdprConsent: { gdprApplies: true, consentString: 'consentDataString' }, refererInfo: { page: 'page' } };
+        let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest)[0].data);
+
+        assert.equal(request.privacy.coppa, undefined);
+
+        config.setConfig({
+          coppa: false
+        });
+        request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest)[0].data);
+
+        assert.equal(request.privacy.coppa, undefined);
+      });
+      it('should set coppa to 1 when coppa is provided with value true', function () {
+        config.setConfig({
+          coppa: true
+        });
+        let validBidRequests = [{ bid_id: 'bidId', params: { test: 1 } }];
+        let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+
+        assert.equal(request.privacy.coppa, 1);
+      });
+    });
+
+    describe('bids', function () {
+      it('should be able to handle multiple bids', function () {
+        const validBidRequests = [{
+          bid_id: 'bidId',
+          params: { ctok: 'ctok1' }
+        }, {
+          bid_id: 'bidId2',
+          params: { ctok: 'ctok2' }
+        }];
+        const request = spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } });
+        assert.equal(request.length, 2);
+        const data = request.map(r => JSON.parse(r.data));
+        assert.equal(data[0].ctok, 'ctok1');
+        assert.equal(data[1].ctok, 'ctok2');
+      });
+
+      describe('price floors', function () {
+        it('should not add if floors module not configured', function () {
+          const validBidRequests = [{ bid_id: 'bidId', params: {ctok: 'ctok1'}, mediaTypes: {video: {}} }];
+          const imp = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, undefined);
+        });
+
+        it('should not add if floor price not defined', function () {
+          const validBidRequests = [ getBidWithFloor() ];
+          const imp = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, 'EUR');
+        });
+
+        it('should request floor price in adserver currency', function () {
+          config.setConfig({ currency: { adServerCurrency: 'DKK' } });
+          const validBidRequests = [ getBidWithFloor() ];
+          const imp = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+          assert.equal(imp.bidfloor, undefined);
+          assert.equal(imp.bidfloorcur, 'DKK');
+        });
+
+        it('should add correct floor values', function () {
+          const expectedFloors = [ 1, 1.3, 0.5 ];
+          const validBidRequests = expectedFloors.map(getBidWithFloor);
+          const imps = spec
+            .buildRequests(validBidRequests, { refererInfo: { page: 'page' } })
+            .map(r => JSON.parse(r.data));
+          expectedFloors.forEach((floor, index) => {
+            assert.equal(imps[index].bidfloor, floor);
+            assert.equal(imps[index].bidfloorcur, 'EUR');
+          });
+        });
+
+        function getBidWithFloor(floor) {
+          return {
+            params: { ctok: 'ctok1' },
+            mediaTypes: { video: {} },
+            getFloor: ({ currency }) => {
+              return {
+                currency: currency,
+                floor
+              };
+            }
+          };
+        }
+      });
+
+      describe('multiple media types', function () {
+        it('should use all configured media types for bidding', function () {
+          const validBidRequests = [{
+            bid_id: 'bidId',
+            params: { ctok: 'ctok1' },
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100], [200, 300]]
+              },
+              video: {}
+            }
+          }, {
+            bid_id: 'bidId2',
+            params: { ctok: 'ctok1' },
+            mediaTypes: {
+              video: {},
+              native: {}
+            }
+          }];
+          const [ first, second ] = spec
+            .buildRequests(validBidRequests, { refererInfo: { page: 'page' } })
+            .map(r => JSON.parse(r.data));
+
+          assert.ok(first.banner);
+          assert.ok(first.video);
+
+          assert.ok(second.video);
+          assert.equal(second.banner, undefined);
+        });
+      });
+
+      describe('banner', function () {
+        it('should convert sizes to openrtb format', function () {
+          const validBidRequests = [{
+            bid_id: 'bidId',
+            params: { mid: 1000 },
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100], [200, 300]]
+              }
+            }
+          }];
+          const { banner } = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+          assert.deepEqual(banner, {
+            format: [ { w: 100, h: 100 }, { w: 200, h: 300 } ]
+          });
+        });
+      });
+
+      describe('video', function () {
+        it('should pass video mediatype config', function () {
+          const validBidRequests = [{
+            bid_id: 'bidId',
+            params: { mid: 1000 },
+            mediaTypes: {
+              video: {
+                playerSize: [640, 480],
+                context: 'outstream',
+                mimes: ['video/mp4']
+              }
+            }
+          }];
+          const { video } = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } })[0].data);
+          assert.deepEqual(video, {
+            playerSize: [640, 480],
+            context: 'outstream',
+            mimes: ['video/mp4']
+          });
+        });
+      });
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should return if no body in response', function () {
+      const serverResponse = {};
+      const bidRequest = {};
+      assert.ok(!spec.interpretResponse(serverResponse, bidRequest));
+    });
+    const basicBidResponse = () => ({
+      bid_id: 'bidId',
+      cpm: 10,
+      creative_id: '12345',
+      currency: 'CZK',
+      w: 100,
+      h: 100,
+      ad: '<script....',
+      placement_id: 'opzafe23'
+    });
+    const bidRequest = () => ({
+      data: {},
+      bids: [
+        {
+          bid_id: 'bidId1',
+          params: { ctok: 'ctok1' }
+        },
+        {
+          bid_id: 'bidId2',
+          params: { ctok: 'ctok2' }
+        }
+      ]
+    });
+    it('should parse a typical ok response', function () {
+      const serverResponse = {
+        body: { ok: { value: JSON.stringify([basicBidResponse()]) } }
+      };
+      bids = spec.interpretResponse(serverResponse, bidRequest());
+      assert.equal(bids.length, 1);
+      assert.deepEqual(bids[0],
+        {
+          requestId: 'bidId',
+          cpm: 10,
+          creativeId: '12345',
+          ttl: 300,
+          netRevenue: true,
+          currency: 'CZK',
+          width: 100,
+          height: 100,
+          meta: {
+            advertiserDomains: []
+          },
+          ad: '<script....',
+          placementId: 'opzafe23'
+        });
+    });
+    it('should add adserverTargeting', function () {
+      const serverResponse = {
+        body: {
+          ok: {
+            value: JSON.stringify([{
+              ...basicBidResponse(),
+              adserver_targeting: { tag: 'value' }
+            }])
+          }
+        }
+      };
+      bids = spec.interpretResponse(serverResponse, bidRequest());
+      assert.deepEqual(bids[0].adserverTargeting, { tag: 'value' });
+    });
+    it('should add adomains', function () {
+      const serverResponse = {
+        body: {
+          ok: {
+            value: JSON.stringify([{
+              ...basicBidResponse(),
+              adomain: ['a.b.c']
+            }])
+          }
+        }
+      };
+      bids = spec.interpretResponse(serverResponse, bidRequest());
+      assert.deepEqual(bids[0].meta.advertiserDomains, ['a.b.c']);
+    });
+  });
+});

From e2676019965dbdfbc1ab0e4c9d70848488334bb3 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Thu, 15 Sep 2022 14:10:45 -0600
Subject: [PATCH 268/569] CI: let Karma manage browserstack tunnel (#9003)

* Revert "Fix browserstack tests (#8632)"

This reverts commit c2965c3b7fbe491cde72dd500279b005708d3b7a.

* Remove unneded browserstacktunnel circleci config

* Update karma `concurrency` config
---
 .circleci/config.yml | 18 ------------------
 karma.conf.maker.js  |  6 ++----
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 395583ada86..84ddcdf26ea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,28 +38,12 @@ aliases:
       name: BrowserStack End to end testing
       command: gulp e2e-test
 
-  # Download and run BrowserStack local
-  - &download_browserstack
-      name : Download BrowserStackLocal binary
-      command : |
-        # Download the browserstack binary file
-        wget "https://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-x64.zip"
-        # Unzip it
-        unzip BrowserStackLocal-linux-x64.zip
-
-  - &start_browserstack
-    name: Start BrowserStackLocal
-    command: ./BrowserStackLocal --key ${BROWSERSTACK_ACCESS_KEY} --automate-only --local-identifier ${CIRCLE_WORKFLOW_JOB_ID}
-    background: true
-
   - &unit_test_steps
     - checkout
     - restore_cache: *restore_dep_cache
     - run: npm ci
     - save_cache: *save_dep_cache
     - run: *install
-    - run: *download_browserstack
-    - run: *start_browserstack
     - run: *run_unit_test
 
   - &endtoend_test_steps
@@ -68,8 +52,6 @@ aliases:
     - run: npm install
     - save_cache: *save_dep_cache
     - run: *install
-    - run: *download_browserstack
-    - run: *start_browserstack
     - run: *run_endtoend_test
 
 version: 2
diff --git a/karma.conf.maker.js b/karma.conf.maker.js
index fd8f2e6fdd8..b20f73d74bc 100644
--- a/karma.conf.maker.js
+++ b/karma.conf.maker.js
@@ -81,9 +81,7 @@ function setBrowsers(karmaConf, browserstack) {
     karmaConf.browserStack = {
       username: process.env.BROWSERSTACK_USERNAME,
       accessKey: process.env.BROWSERSTACK_ACCESS_KEY,
-      build: 'Prebidjs Unit Tests ' + new Date().toLocaleString(),
-      startTunnel: false,
-      localIdentifier: process.env.CIRCLE_WORKFLOW_JOB_ID
+      build: 'Prebidjs Unit Tests ' + new Date().toLocaleString()
     }
     if (process.env.TRAVIS) {
       karmaConf.browserStack.startTunnel = false;
@@ -173,7 +171,7 @@ module.exports = function(codeCoverage, browserstack, watchMode, file, disableFe
     browserNoActivityTimeout: 3e5, // default 10000
     captureTimeout: 3e5, // default 60000,
     browserDisconnectTolerance: 3,
-    concurrency: 6,
+    concurrency: 5, // browserstack allows us 5 concurrent sessions
 
     plugins: plugins
   };

From c4605d582e2c9055ff7972fdad44a891d410c366 Mon Sep 17 00:00:00 2001
From: shahinrahbariasl <56240400+shahinrahbariasl@users.noreply.github.com>
Date: Thu, 15 Sep 2022 17:59:59 -0400
Subject: [PATCH 269/569] fix: fix sid location and remove its fallback logic
 [PB-1219] (#8965)

fix: update  unit test [PB-1219]

feat: add test coverage [PB-1229]

feat: add test coverage [PB-1229]

feat: add test coverage [PB-1219]

feat: add test coverage [PB-1219]

feat: add test coverage [PB-1219]

feat: add test coverage [PB-1219]

feat: add test coverage [PB-1219]

feat: add test coverage [PB-1219]

fix: remove commented code [PB-1219]]

fix: update sid location and remove its fallback logic [PB-1219]C

Co-authored-by: shahin.rahbariasl <shahin.rahbariasl@indexexchange.com>
---
 modules/ixBidAdapter.js                | 29 +++++++++-------
 test/spec/modules/ixBidAdapter_spec.js | 48 +++++++++++++++++---------
 2 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 2f946635be4..5be14ca6a21 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -13,7 +13,6 @@ import {
   logError,
   logWarn,
   mergeDeep,
-  parseGPTSingleSizeArray,
   parseQueryStringParameters
 } from '../src/utils.js';
 import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
@@ -127,10 +126,6 @@ function bidToBannerImp(bid) {
   if (impSize) {
     imp.banner.w = impSize[0];
     imp.banner.h = impSize[1];
-    // populate sid with size if not id
-    if (!deepAccess(imp, 'ext.sid')) {
-      imp.ext.sid = parseGPTSingleSizeArray(impSize);
-    }
   }
 
   imp.banner.topframe = inIframe() ? 0 : 1;
@@ -197,9 +192,6 @@ function bidToVideoImp(bid) {
     if (impSize) {
       imp.video.w = impSize[0];
       imp.video.h = impSize[1];
-      if (!(deepAccess(imp, 'ext.sid'))) {
-        imp.ext.sid = parseGPTSingleSizeArray(impSize);
-      }
     } else {
       logWarn('IX Bid Adapter: Video size is missing in [mediaTypes.video]');
       return {};
@@ -253,8 +245,8 @@ function bidToImp(bid) {
   imp.ext = {};
   imp.ext.siteID = bid.params.siteId.toString();
 
-  if (bid.params.hasOwnProperty('id') &&
-    (typeof bid.params.id === 'string' || typeof bid.params.id === 'number')) {
+  // populate imp level sid
+  if (bid.params.hasOwnProperty('id') && (typeof bid.params.id === 'string' || typeof bid.params.id === 'number')) {
     imp.ext.sid = String(bid.params.id);
   }
 
@@ -758,6 +750,7 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     const gpid = impressions[transactionIds[adUnitIndex]].gpid;
     const dfpAdUnitCode = impressions[transactionIds[adUnitIndex]].dfp_ad_unit_code;
     const tid = impressions[transactionIds[adUnitIndex]].tid;
+    const sid = impressions[transactionIds[adUnitIndex]].sid
 
     if (impressionObjects.length && BANNER in impressionObjects[0]) {
       const { id, banner: { topframe } } = impressionObjects[0];
@@ -769,16 +762,24 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
         },
       };
 
+      // We add sid in imp.ext.sid therefore, remove from banner.format[].ext
+      for (let bannerFormat of _bannerImpression.banner.format) {
+        if (bannerFormat.ext != null && bannerFormat.ext.sid != null) {
+          delete bannerFormat.ext.sid;
+        }
+      }
+
       const position = impressions[transactionIds[adUnitIndex]].pos;
       if (isInteger(position)) {
         _bannerImpression.banner.pos = position;
       }
 
-      if (dfpAdUnitCode || gpid || tid) {
+      if (dfpAdUnitCode || gpid || tid || sid) {
         _bannerImpression.ext = {};
         _bannerImpression.ext.dfp_ad_unit_code = dfpAdUnitCode;
         _bannerImpression.ext.gpid = gpid;
         _bannerImpression.ext.tid = tid;
+        _bannerImpression.ext.sid = sid;
       }
 
       if ('bidfloor' in impressionObjects[0]) {
@@ -1040,6 +1041,11 @@ function createBannerImps(validBidRequest, missingBannerSizes, bannerImps) {
   bannerImps[validBidRequest.transactionId].tagId = deepAccess(validBidRequest, 'params.tagId');
   bannerImps[validBidRequest.transactionId].pos = deepAccess(validBidRequest, 'mediaTypes.banner.pos');
 
+  const sid = deepAccess(validBidRequest, 'params.id');
+  if (sid && (typeof sid === 'string' || typeof sid === 'number')) {
+    bannerImps[validBidRequest.transactionId].sid = String(sid);
+  }
+
   const adUnitCode = validBidRequest.adUnitCode;
   const divId = document.getElementById(adUnitCode) ? adUnitCode : getGptSlotInfoForAdUnitCode(adUnitCode).divId;
   bannerImps[validBidRequest.transactionId].adUnitCode = adUnitCode;
@@ -1094,7 +1100,6 @@ function updateMissingSizes(validBidRequest, missingBannerSizes, imp) {
  */
 function createMissingBannerImp(bid, imp, newSize) {
   const newImp = deepClone(imp);
-  newImp.ext.sid = parseGPTSingleSizeArray(newSize);
   newImp.banner.w = newSize[0];
   newImp.banner.h = newSize[1];
 
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index 34c9e865909..ad3ac279712 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -1588,7 +1588,7 @@ describe('IndexexchangeAdapter', function () {
           search: 'drill',
         },
         user: {
-          keywords: Array(1000).join('#'),
+          keywords: Array(1200).join('#'),
         }
       };
 
@@ -1772,21 +1772,21 @@ describe('IndexexchangeAdapter', function () {
 
     it('impression should have correct format and value', function () {
       const impression = JSON.parse(query.r).imp[0];
+      const sidValue = DEFAULT_BANNER_VALID_BID[0].params.id;
 
       expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
       expect(impression.banner.format).to.be.length(2);
       expect(impression.banner.topframe).to.be.oneOf([0, 1]);
       expect(impression.banner.pos).to.equal(0);
       expect(impression.ext.tid).to.equal(DEFAULT_BANNER_VALID_BID[0].transactionId);
+      expect(impression.ext.sid).to.equal(sidValue);
 
       impression.banner.format.map(({ w, h, ext }, index) => {
         const size = DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[index];
-        const sidValue = utils.parseGPTSingleSizeArray(size);
 
         expect(w).to.equal(size[0]);
         expect(h).to.equal(size[1]);
         expect(ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
-        expect(ext.sid).to.equal(sidValue);
       });
     });
 
@@ -1934,7 +1934,7 @@ describe('IndexexchangeAdapter', function () {
       expect(impression.banner.format[0].h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
       expect(impression.banner.topframe).to.be.oneOf([0, 1]);
       expect(impression.banner.format[0].ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
-      expect(impression.banner.format[0].ext.sid).to.equal('50');
+      expect(impression.ext.sid).to.equal('50');
     });
 
     it('impression should have sid if id is configured as string', function () {
@@ -1948,7 +1948,7 @@ describe('IndexexchangeAdapter', function () {
       expect(impression.banner.format[0].h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
       expect(impression.banner.topframe).to.be.oneOf([0, 1]);
       expect(impression.banner.format[0].ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
-      expect(impression.banner.format[0].ext.sid).to.equal('abc');
+      expect(impression.ext.sid).to.equal('abc');
     });
 
     describe('first party data', () => {
@@ -2034,6 +2034,7 @@ describe('IndexexchangeAdapter', function () {
       const request = spec.buildRequests([DEFAULT_BANNER_VALID_BID[0], DEFAULT_VIDEO_VALID_BID[0]], {});
       it('should have banner request', () => {
         const bannerImpression = JSON.parse(request[0].data.r).imp[0];
+        const sidValue = DEFAULT_BANNER_VALID_BID[0].params.id;
 
         expect(JSON.parse(request[0].data.r).imp).to.have.lengthOf(1);
         expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
@@ -2041,15 +2042,14 @@ describe('IndexexchangeAdapter', function () {
 
         expect(bannerImpression.banner.format).to.be.length(2);
         expect(bannerImpression.banner.topframe).to.be.oneOf([0, 1]);
+        expect(bannerImpression.ext.sid).to.equal(sidValue);
 
         bannerImpression.banner.format.map(({ w, h, ext }, index) => {
           const size = DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[index];
-          const sidValue = utils.parseGPTSingleSizeArray(size);
 
           expect(w).to.equal(size[0]);
           expect(h).to.equal(size[1]);
           expect(ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
-          expect(ext.sid).to.equal(sidValue);
         });
       });
 
@@ -2068,6 +2068,7 @@ describe('IndexexchangeAdapter', function () {
 
       it('should have banner request', () => {
         const bannerImpression = JSON.parse(request[0].data.r).imp[0];
+        const sidValue = DEFAULT_BANNER_VALID_BID[0].params.id;
 
         expect(JSON.parse(request[0].data.r).imp).to.have.lengthOf(1);
         expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
@@ -2075,15 +2076,14 @@ describe('IndexexchangeAdapter', function () {
 
         expect(bannerImpression.banner.format).to.be.length(2);
         expect(bannerImpression.banner.topframe).to.be.oneOf([0, 1]);
+        expect(bannerImpression.ext.sid).to.equal(sidValue);
 
         bannerImpression.banner.format.map(({ w, h, ext }, index) => {
           const size = DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[index];
-          const sidValue = utils.parseGPTSingleSizeArray(size);
 
           expect(w).to.equal(size[0]);
           expect(h).to.equal(size[1]);
           expect(ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
-          expect(ext.sid).to.equal(sidValue);
         });
       });
 
@@ -2200,19 +2200,19 @@ describe('IndexexchangeAdapter', function () {
 
       const request = spec.buildRequests([bid, bid2], DEFAULT_OPTION)[0];
       const impression = JSON.parse(request.data.r).imp[0];
+      const sidValue = bid.params.id;
 
       expect(impression.id).to.equal(bid.bidId);
       expect(impression.banner.format).to.be.length(bid.mediaTypes.banner.sizes.length);
       expect(impression.banner.topframe).to.be.oneOf([0, 1]);
+      expect(impression.ext.sid).to.equal(sidValue);
 
       impression.banner.format.map(({ w, h, ext }, index) => {
         const size = bid.mediaTypes.banner.sizes[index];
-        const sidValue = utils.parseGPTSingleSizeArray(size);
 
         expect(w).to.equal(size[0]);
         expect(h).to.equal(size[1]);
         expect(ext.siteID).to.equal(index === 1 ? bid2.params.siteId : bid.params.siteId);
-        expect(ext.sid).to.equal(sidValue);
       });
     });
 
@@ -2236,18 +2236,18 @@ describe('IndexexchangeAdapter', function () {
 
       impressions.map((impression, impressionIndex) => {
         const firstSizeObject = bids[impressionIndex].mediaTypes.banner.sizes[0];
+        const sidValue = bids[impressionIndex].params.id;
 
         expect(impression.banner.format).to.be.length(2);
         expect(impression.banner.topframe).to.be.oneOf([0, 1]);
+        expect(impression.ext.sid).to.equal(sidValue);
 
         impression.banner.format.map(({ w, h, ext }, index) => {
           const size = bids[impressionIndex].mediaTypes.banner.sizes[index];
-          const sidValue = utils.parseGPTSingleSizeArray(size);
 
           expect(w).to.equal(size[0]);
           expect(h).to.equal(size[1]);
           expect(ext.siteID).to.equal(bids[impressionIndex].params.siteId);
-          expect(ext.sid).to.equal(sidValue);
         });
       });
     });
@@ -2295,7 +2295,6 @@ describe('IndexexchangeAdapter', function () {
 
     it('impression should have correct format and value', function () {
       const impression = JSON.parse(query.r).imp[0];
-      const sidValue = utils.parseGPTSingleSizeArray(DEFAULT_VIDEO_VALID_BID[0].params.size);
 
       expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
       expect(impression.video.w).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[0]);
@@ -2320,6 +2319,15 @@ describe('IndexexchangeAdapter', function () {
       expect(impression.video.placement).to.equal(2);
     });
 
+    it('should set imp.ext.sid for video imps if params.id exists', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.params.id = 50;
+      const request = spec.buildRequests([bid], {})[0];
+      const impression = JSON.parse(request.data.r).imp[0];
+
+      expect(impression.ext.sid).to.equal('50');
+    });
+
     it('should set correct default placement, if context is instream', function () {
       const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
       bid.mediaTypes.video.context = 'instream';
@@ -2460,6 +2468,16 @@ describe('IndexexchangeAdapter', function () {
       expect(nativeImpression.native).to.deep.equal(DEFAULT_NATIVE_IMP);
     });
 
+    it('should set imp.ext.sid for native imps if params.id exist', function() {
+      const bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID);
+      bid[0].params.id = 'abc'
+      const request = spec.buildRequests(bid, DEFAULT_OPTION);
+      const nativeImpression = JSON.parse(request[0].data.r).imp[0];
+
+      expect(nativeImpression.id).to.equal(DEFAULT_NATIVE_VALID_BID[0].bidId);
+      expect(nativeImpression.ext.sid).to.equal('abc');
+    });
+
     it('should build request with given asset properties', function() {
       let bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID)
       bid[0].nativeOrtbRequest = {
@@ -2642,12 +2660,10 @@ describe('IndexexchangeAdapter', function () {
 
           impression.banner.format.map(({ w, h, ext }, index) => {
             const size = bid.mediaTypes.banner.sizes[index];
-            const sidValue = utils.parseGPTSingleSizeArray(size);
 
             expect(w).to.equal(size[0]);
             expect(h).to.equal(size[1]);
             expect(ext.siteID).to.equal(bid.params.siteId);
-            expect(ext.sid).to.equal(sidValue);
           });
         });
       });

From c6b83253056f0bcbc67ed9ef83a088661833f745 Mon Sep 17 00:00:00 2001
From: Jozef Bartek <31618107+jbartek25@users.noreply.github.com>
Date: Fri, 16 Sep 2022 15:14:09 +0200
Subject: [PATCH 270/569] Basic ads endpoint (#9009)

---
 modules/improvedigitalBidAdapter.js                |  4 +++-
 test/spec/modules/improvedigitalBidAdapter_spec.js | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/improvedigitalBidAdapter.js b/modules/improvedigitalBidAdapter.js
index c8fc8eb7a2a..f157ed0a80a 100644
--- a/modules/improvedigitalBidAdapter.js
+++ b/modules/improvedigitalBidAdapter.js
@@ -25,6 +25,7 @@ const BIDDER_CODE = 'improvedigital';
 const CREATIVE_TTL = 300;
 
 const AD_SERVER_URL = 'https://ad.360yield.com/pb';
+const BASIC_ADS_URL = 'https://ad.360yield-basic.com/pb';
 const EXTEND_URL = 'https://pbs.360yield.com/openrtb2/auction';
 const IFRAME_SYNC_URL = 'https://hb.360yield.com/prebid-universal-creative/load-cookie.html';
 
@@ -282,9 +283,10 @@ const ID_REQUEST = {
       if (transactionId) {
         deepSetValue(request, 'source.tid', transactionId);
       }
+      const adServerUrl = hasPurpose1Consent(bidderRequest?.gdprConsent) ? AD_SERVER_URL : BASIC_ADS_URL;
       return {
         method: 'POST',
-        url: extendMode ? EXTEND_URL : AD_SERVER_URL,
+        url: extendMode ? EXTEND_URL : adServerUrl,
         data: JSON.stringify(request),
         bidderRequest
       }
diff --git a/test/spec/modules/improvedigitalBidAdapter_spec.js b/test/spec/modules/improvedigitalBidAdapter_spec.js
index 19e91cbde96..d88266af386 100644
--- a/test/spec/modules/improvedigitalBidAdapter_spec.js
+++ b/test/spec/modules/improvedigitalBidAdapter_spec.js
@@ -8,6 +8,7 @@ import { deepSetValue } from '../../../src/utils';
 describe('Improve Digital Adapter Tests', function () {
   const METHOD = 'POST';
   const AD_SERVER_URL = 'https://ad.360yield.com/pb';
+  const BASIC_ADS_URL = 'https://ad.360yield-basic.com/pb';
   const EXTEND_URL = 'https://pbs.360yield.com/openrtb2/auction';
   const IFRAME_SYNC_URL = 'https://hb.360yield.com/prebid-universal-creative/load-cookie.html';
   const INSTREAM_TYPE = 1;
@@ -752,6 +753,15 @@ describe('Improve Digital Adapter Tests', function () {
       expect(payload.app).does.not.exist;
     });
 
+    it('should call basic ads endpoint when no consent for purpose 1', function () {
+      const consent = deepClone(gdprConsent);
+      deepSetValue(consent, 'vendorData.purpose.consents.1', false);
+      const bidderRequestWithConsent = deepClone(bidderRequest);
+      bidderRequestWithConsent.gdprConsent = consent;
+      const request = spec.buildRequests([simpleBidRequest], bidderRequestWithConsent)[0];
+      expect(request.url).to.equal(BASIC_ADS_URL);
+    });
+
     it('should set extend params when extend mode enabled from global configuration', function () {
       getConfigStub = sinon.stub(config, 'getConfig');
       const bannerRequest = deepClone(simpleBidRequest);

From 5a3bb6385fe5a4a50ac536ff663865a0e0a81407 Mon Sep 17 00:00:00 2001
From: BaronJHYu <254878848@qq.com>
Date: Fri, 16 Sep 2022 21:16:43 +0800
Subject: [PATCH 271/569] Mediago Bid Adapter: support sharedIdSystem (#9008)

* Mediago Bid Adapter:new adapter

* remove console

* change spec file to fix CircleCI

* change spec file to fix CircleCI

* change spec file

* Update mediagoBidAdapter.js

* Update mediagoBidAdapter.js

* rerun CurcleCi

* update mediagoBidAdapter

Co-authored-by: BaronYu <baronwei11@gmail.com>
---
 modules/mediagoBidAdapter.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/modules/mediagoBidAdapter.js b/modules/mediagoBidAdapter.js
index 28ca4e0bc50..514c56061df 100644
--- a/modules/mediagoBidAdapter.js
+++ b/modules/mediagoBidAdapter.js
@@ -293,14 +293,19 @@ function getItems(validBidRequests, bidderRequest) {
  */
 function getParam(validBidRequests, bidderRequest) {
   const pubcid = utils.deepAccess(validBidRequests[0], 'crumbs.pubcid');
-  // console.log('wjh getParam', validBidRequests, bidderRequest);
+  const sharedid =
+    utils.deepAccess(validBidRequests[0], 'userId.sharedid.id') ||
+    utils.deepAccess(validBidRequests[0], 'userId.pubcid');
   let isMobile = isMobileAndTablet() ? 1 : 0;
   let isTest = 0;
   let auctionId = getProperty(bidderRequest, 'auctionId');
   let items = getItems(validBidRequests, bidderRequest);
 
-  const domain = document.domain;
-  const location = utils.deepAccess(bidderRequest, 'refererInfo.referer');
+  const domain =
+    utils.deepAccess(bidderRequest, 'refererInfo.domain') || document.domain;
+  const location = utils.deepAccess(bidderRequest, 'refererInfo.location');
+  const page = utils.deepAccess(bidderRequest, 'refererInfo.page');
+  const referer = utils.deepAccess(bidderRequest, 'refererInfo.ref');
 
   const timeout = bidderRequest.timeout || 2000;
 
@@ -323,14 +328,13 @@ function getParam(validBidRequests, bidderRequest) {
       },
       ext: {},
       user: {
-        buyeruid: getUserID(),
-        id: pubcid,
+        id: sharedid || pubcid || getUserID(),
       },
       site: {
         name: domain,
         domain: domain,
-        page: location,
-        ref: location,
+        page: page || location,
+        ref: referer,
         mobile: isMobile,
         cat: [], // todo
         publisher: {
@@ -454,9 +458,9 @@ export const spec = {
    * Register bidder specific code, which will execute when the adserver targeting has been set for a bid from this bidder
    * @param {Bid} The bid of which the targeting has been set
    */
-//   onSetTargeting: function (bid) {
-//     // console.log('onSetTargeting', bid);
-//     // Bidder specific code
-//   },
+  //   onSetTargeting: function (bid) {
+  //     // console.log('onSetTargeting', bid);
+  //     // Bidder specific code
+  //   },
 };
 registerBidder(spec);

From 1b4885aabb5a2b8c77f3aaf886d3ecc1c69fd9fc Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Mon, 19 Sep 2022 10:43:04 -0400
Subject: [PATCH 272/569] appnexus bid adapter - fix bid param keywords (#9012)

---
 modules/appnexusBidAdapter.js                | 46 ++++++------
 test/spec/modules/appnexusBidAdapter_spec.js | 76 ++++++++++++++++++++
 2 files changed, 100 insertions(+), 22 deletions(-)

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index 1d69e69f555..7b59ce4ee3b 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -250,10 +250,10 @@ export const spec = {
     // need to convert the string values into array of strings, to properly merge values with other existing keys later
     Object.keys(anAuctionKeywords).forEach(k => { if (isStr(anAuctionKeywords[k]) || isNumber(anAuctionKeywords[k])) anAuctionKeywords[k] = [anAuctionKeywords[k]] });
     // combine all sources of keywords (converted from string comma list to object format) into one object (that combines the values for shared keys)
-    let mergedAuctionKeywrds = mergeDeep({}, anAuctionKeywords, ...ortb2KeywordsObjList);
+    let mergedAuctionKeywords = mergeDeep({}, anAuctionKeywords, ...ortb2KeywordsObjList);
 
     // convert to final format used by adserver
-    let auctionKeywords = transformBidderParamKeywords(mergedAuctionKeywrds);
+    let auctionKeywords = transformBidderParamKeywords(mergedAuctionKeywords);
     if (auctionKeywords.length > 0) {
       auctionKeywords.forEach(deleteValues);
       payload.keywords = auctionKeywords;
@@ -1202,28 +1202,30 @@ function convertKeywordsToString(keywords) {
 function convertStringToKeywordsObj(keyStr) {
   let result = {};
 
-  // will split based on commas and will eat white space before/after the comma
-  let keywordList = keyStr.split(/\s*(?:,)\s*/);
-  keywordList.forEach(kw => {
-    // if = exists, then split
-    if (kw.indexOf('=') !== -1) {
-      let kwPair = kw.split('=');
-      let key = kwPair[0];
-      let val = kwPair[1];
-
-      // then check for existing key in result > if so add value to the array > if not, add new key and create value array
-      if (result.hasOwnProperty(key)) {
-        result[key].push(val);
+  if (isStr(keyStr) && keyStr !== '') {
+    // will split based on commas and will eat white space before/after the comma
+    let keywordList = keyStr.split(/\s*(?:,)\s*/);
+    keywordList.forEach(kw => {
+      // if = exists, then split
+      if (kw.indexOf('=') !== -1) {
+        let kwPair = kw.split('=');
+        let key = kwPair[0];
+        let val = kwPair[1];
+
+        // then check for existing key in result > if so add value to the array > if not, add new key and create value array
+        if (result.hasOwnProperty(key)) {
+          result[key].push(val);
+        } else {
+          result[key] = [val];
+        }
       } else {
-        result[key] = [val];
-      }
-    } else {
-      // make a key with '' value; if key already exists > don't add
-      if (!result.hasOwnProperty(kw)) {
-        result[kw] = [''];
+        // make a key with '' value; if key already exists > don't add
+        if (!result.hasOwnProperty(kw)) {
+          result[kw] = [''];
+        }
       }
-    }
-  });
+    });
+  }
 
   return result;
 }
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 211c0d64e67..87a4a0fbe2d 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -757,6 +757,82 @@ describe('AppNexusAdapter', function () {
       });
     }
 
+    it('should convert keyword params (when there are no ortb keywords) to proper form and attaches to request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            keywords: {
+              single: 'val',
+              singleArr: ['val'],
+              singleArrNum: [5],
+              multiValMixed: ['value1', 2, 'value3'],
+              singleValNum: 123,
+              emptyStr: '',
+              emptyArr: [''],
+              badValue: { 'foo': 'bar' } // should be dropped
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].keywords).to.deep.equal([{
+        'key': 'single',
+        'value': ['val']
+      }, {
+        'key': 'singleArr',
+        'value': ['val']
+      }, {
+        'key': 'singleArrNum',
+        'value': ['5']
+      }, {
+        'key': 'multiValMixed',
+        'value': ['value1', '2', 'value3']
+      }, {
+        'key': 'singleValNum',
+        'value': ['123']
+      }, {
+        'key': 'emptyStr'
+      }, {
+        'key': 'emptyArr'
+      }]);
+    });
+
+    it('should convert adUnit ortb2 keywords (when there are no bid param keywords) to proper form and attaches to request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          ortb2Imp: {
+            ext: {
+              data: {
+                keywords: 'ortb2=yes,ortb2test, multiValMixed=4, singleValNum=456'
+              }
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].keywords).to.deep.equal([{
+        'key': 'ortb2',
+        'value': ['yes']
+      }, {
+        'key': 'ortb2test'
+      }, {
+        'key': 'multiValMixed',
+        'value': ['4']
+      }, {
+        'key': 'singleValNum',
+        'value': ['456']
+      }]);
+    });
+
     it('should convert keyword params and adUnit ortb2 keywords to proper form and attaches to request', function () {
       let bidRequest = Object.assign({},
         bidRequests[0],

From 7f8d671642794c352a9a49e3a83f6637416aa65f Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Tue, 20 Sep 2022 04:06:34 -0700
Subject: [PATCH 273/569] Rubicon Analytics: Do not overwrite billing `type`
 (#9017)

* Do not overwrite `type`

* safe check it always comes and is non empty string
---
 modules/rubiconAnalyticsAdapter.js                |  4 ++--
 test/spec/modules/rubiconAnalyticsAdapter_spec.js | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index 3ad1bb26b47..223385159a5 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -124,9 +124,9 @@ function formatSource(src) {
 }
 
 function getBillingPayload(event) {
-  // for now we are mapping all events to type "general", later we will expand support for specific types
   let billingEvent = deepClone(event);
-  billingEvent.type = 'general';
+  // Pass along type if is string and not empty else general
+  billingEvent.type = (typeof event.type === 'string' && event.type) || 'general';
   billingEvent.accountId = accountId;
   // mark as sent
   deepSetValue(cache.billing, `${event.vendor}.${event.billingId}`, true);
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index bef3eda0afc..fdbb8235f5f 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -2366,7 +2366,7 @@ describe('rubicon analytics adapter', function () {
       });
       basicBillingAuction([{
         vendor: 'vendorName',
-        type: 'auction',
+        type: 'pageView',
         billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
       }]);
       expect(server.requests.length).to.equal(1);
@@ -2376,7 +2376,7 @@ describe('rubicon analytics adapter', function () {
       expect(message.billableEvents).to.deep.equal([{
         accountId: 1001,
         vendor: 'vendorName',
-        type: 'general', // mapping all events to endpoint as 'general' for now
+        type: 'pageView',
         billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
       }]);
     });
@@ -2398,7 +2398,7 @@ describe('rubicon analytics adapter', function () {
         },
         {
           vendor: 'vendorName',
-          type: 'auction',
+          type: 'impression',
           billingId: '743db6e3-21f2-44d4-917f-cb3488c6076f'
         },
         {
@@ -2415,13 +2415,13 @@ describe('rubicon analytics adapter', function () {
         {
           accountId: 1001,
           vendor: 'vendorName',
-          type: 'general',
+          type: 'auction',
           billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
         },
         {
           accountId: 1001,
           vendor: 'vendorName',
-          type: 'general',
+          type: 'impression',
           billingId: '743db6e3-21f2-44d4-917f-cb3488c6076f'
         }
       ]);
@@ -2450,7 +2450,7 @@ describe('rubicon analytics adapter', function () {
         {
           accountId: 1001,
           vendor: 'vendorName',
-          type: 'general',
+          type: 'auction',
           billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
         }
       ]);
@@ -2480,7 +2480,7 @@ describe('rubicon analytics adapter', function () {
         {
           accountId: 1001,
           vendor: 'vendorName',
-          type: 'general',
+          type: 'auction',
           billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
         }
       ]);

From dd0f8ac1abe77aa5ae51d2fcdec3c6932f0e4d71 Mon Sep 17 00:00:00 2001
From: Andrew Slagle <42588549+spotxslagle@users.noreply.github.com>
Date: Tue, 20 Sep 2022 10:15:07 -0600
Subject: [PATCH 274/569] Rubicon Bid Adapter: Choose video when banner
 mediaType is not present (#8997)

* Choose video when banner mediaType is not present

* Define video.params as needed

* Refactor unit tests for classifiedAsVideo

* Unit test fixes

* Add video+banner+params.video test

* Remove obsolete test
---
 modules/rubiconBidAdapter.js                | 22 +++++--
 test/spec/modules/rubiconBidAdapter_spec.js | 63 +++++++++------------
 2 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index 4817d62348a..ffcc230ac13 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -1109,15 +1109,25 @@ function mapSizes(sizes) {
 
 /**
  * Test if bid has mediaType or mediaTypes set for video.
- * Also makes sure the video object is present in the rubicon bidder params
+ * Also checks if the video object is present in the rubicon bidder params
  * @param {BidRequest} bidRequest
  * @returns {boolean}
  */
-export function hasVideoMediaType(bidRequest) {
-  if (typeof deepAccess(bidRequest, 'params.video') !== 'object') {
-    return false;
+export function classifiedAsVideo(bidRequest) {
+  let isVideo = typeof deepAccess(bidRequest, `mediaTypes.${VIDEO}`) !== 'undefined';
+  let isBanner = typeof deepAccess(bidRequest, `mediaTypes.${BANNER}`) !== 'undefined';
+  let isMissingVideoParams = typeof deepAccess(bidRequest, 'params.video') !== 'object';
+  // If an ad has both video and banner types, a legacy implementation allows choosing video over banner
+  // based on whether or not there is a video object defined in the params
+  // Given this legacy implementation, other code depends on params.video being defined
+
+  if (isBanner && isMissingVideoParams) {
+    isVideo = false;
   }
-  return (typeof deepAccess(bidRequest, `mediaTypes.${VIDEO}`) !== 'undefined');
+  if (isVideo && isMissingVideoParams) {
+    deepSetValue(bidRequest, 'params.video', {});
+  }
+  return isVideo;
 }
 
 /**
@@ -1128,7 +1138,7 @@ export function hasVideoMediaType(bidRequest) {
  */
 function bidType(bid, log = false) {
   // Is it considered video ad unit by rubicon
-  if (hasVideoMediaType(bid)) {
+  if (classifiedAsVideo(bid)) {
     // Removed legacy mediaType support. new way using mediaTypes.video object is now required
     // We require either context as instream or outstream
     if (['outstream', 'instream'].indexOf(deepAccess(bid, `mediaTypes.${VIDEO}.context`)) === -1) {
diff --git a/test/spec/modules/rubiconBidAdapter_spec.js b/test/spec/modules/rubiconBidAdapter_spec.js
index fb1b336ef92..e81ef1c805f 100644
--- a/test/spec/modules/rubiconBidAdapter_spec.js
+++ b/test/spec/modules/rubiconBidAdapter_spec.js
@@ -4,7 +4,7 @@ import {
   getPriceGranularity,
   masSizeOrdering,
   resetUserSync,
-  hasVideoMediaType,
+  classifiedAsVideo,
   resetRubiConf
 } from 'modules/rubiconBidAdapter.js';
 import {parse as parseQuery} from 'querystring';
@@ -257,7 +257,7 @@ describe('the rubicon adapter', function () {
         context: 'instream'
       },
     };
-    bid.params.video = '';
+    bid.params.video = false;
   }
 
   function createVideoBidderRequestOutstream() {
@@ -2320,57 +2320,50 @@ describe('the rubicon adapter', function () {
         });
       });
 
-      describe('hasVideoMediaType', function () {
-        it('should return true if mediaType is video and size_id is set', function () {
+      describe('classifiedAsVideo', function () {
+        it('should return true if mediaTypes is video', function () {
           createVideoBidderRequest();
-          const legacyVideoTypeBidRequest = hasVideoMediaType(bidderRequest.bids[0]);
-          expect(legacyVideoTypeBidRequest).is.equal(true);
+          const bidClassifiedAsVideo = classifiedAsVideo(bidderRequest.bids[0]);
+          expect(bidClassifiedAsVideo).is.equal(true);
         });
 
         it('should return false if trying to use legacy mediaType with video', function () {
           createVideoBidderRequest();
           delete bidderRequest.bids[0].mediaTypes;
           bidderRequest.bids[0].mediaType = 'video';
-          const legacyVideoTypeBidRequest = hasVideoMediaType(bidderRequest.bids[0]);
+          const legacyVideoTypeBidRequest = classifiedAsVideo(bidderRequest.bids[0]);
           expect(legacyVideoTypeBidRequest).is.equal(false);
         });
 
-        it('should return false if bidRequest.mediaType is not equal to video', function () {
-          expect(hasVideoMediaType({
+        it('should return false if bid.mediaTypes is not equal to video', function () {
+          expect(classifiedAsVideo({
             mediaType: 'banner'
           })).is.equal(false);
         });
 
-        it('should return false if bidRequest.mediaType is not defined', function () {
-          expect(hasVideoMediaType({})).is.equal(false);
+        it('should return false if bid.mediaTypes is not defined', function () {
+          expect(classifiedAsVideo({})).is.equal(false);
         });
 
-        it('should return true if bidRequest.mediaTypes.video.context is instream and size_id is defined', function () {
-          expect(hasVideoMediaType({
-            mediaTypes: {
-              video: {
-                context: 'instream'
-              }
-            },
-            params: {
-              video: {
-                size_id: 7
-              }
-            }
-          })).is.equal(true);
+        it('Should return false if both banner and video mediaTypes are set and params.video is not an object', function () {
+          createVideoBidderRequestNoVideo();
+          let bid = bidderRequest.bids[0];
+          bid.mediaTypes.banner = {flag: true};
+          expect(classifiedAsVideo(bid)).to.equal(false);
+        });
+        it('Should return true if both banner and video mediaTypes are set and params.video is an object', function () {
+          createVideoBidderRequestNoVideo();
+          let bid = bidderRequest.bids[0];
+          bid.mediaTypes.banner = {flag: true};
+          bid.params.video = {};
+          expect(classifiedAsVideo(bid)).to.equal(true);
         });
 
-        it('should return false if bidRequest.mediaTypes.video.context is instream but size_id is not defined', function () {
-          expect(spec.isBidRequestValid({
-            mediaTypes: {
-              video: {
-                context: 'instream'
-              }
-            },
-            params: {
-              video: {}
-            }
-          })).is.equal(false);
+        it('Should return true and create a params.video object if one is not already present', function () {
+          createVideoBidderRequestNoVideo();
+          let bid = bidderRequest.bids[0]
+          expect(classifiedAsVideo(bid)).to.equal(true);
+          expect(bid.params.video).to.not.be.undefined;
         });
       });
     });

From 8659187f69dbc08229ab6cfa4e13605cec8d64ff Mon Sep 17 00:00:00 2001
From: Olivier <osazos@adagio.io>
Date: Wed, 21 Sep 2022 15:36:46 +0200
Subject: [PATCH 275/569] AdagioBidAdapter: Native multiple js trackers + fix
 FPD handling  (#9016)

* AdagioBidAdapter: Allow multiple javascript trackers in Native

* AdagioBidAdapter: Fix partial FPD support used as params fallback

Co-authored-by: Antoine Prentout <aprentout@adagio.io>
---
 modules/adagioBidAdapter.js                | 18 ++++++++++++++--
 modules/adagioBidAdapter.md                | 12 ++++++++++-
 test/spec/modules/adagioBidAdapter_spec.js | 25 ++++++++++++++++++++--
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index ac01b317ab3..e56966af9b2 100644
--- a/modules/adagioBidAdapter.js
+++ b/modules/adagioBidAdapter.js
@@ -532,7 +532,12 @@ function _parseNativeBidResponse(bid) {
           native.impressionTrackers.push(tracker.url);
           break;
         case 2:
-          native.javascriptTrackers = `<script src=\"${tracker.url}\"></script>`;
+          const script = `<script async src=\"${tracker.url}\"></script>`;
+          if (!native.javascriptTrackers) {
+            native.javascriptTrackers = script;
+          } else {
+            native.javascriptTrackers += `\n${script}`;
+          }
           break;
       }
     });
@@ -623,7 +628,16 @@ export function setExtraParam(bid, paramName) {
 
   const detected = adgGlobalConf[paramName] || deepAccess(ortb2Conf, `site.ext.data.${paramName}`, null);
   if (detected) {
-    bid.params[paramName] = detected;
+    // First Party Data can be an array.
+    // As we consider that params detected from FPD are fallbacks, we just keep the 1st value.
+    if (Array.isArray(detected)) {
+      if (detected.length) {
+        bid.params[paramName] = detected[0].toString();
+      }
+      return;
+    }
+
+    bid.params[paramName] = detected.toString();
   }
 }
 
diff --git a/modules/adagioBidAdapter.md b/modules/adagioBidAdapter.md
index 889822d9bd4..9b48caa8233 100644
--- a/modules/adagioBidAdapter.md
+++ b/modules/adagioBidAdapter.md
@@ -10,7 +10,7 @@ Connects to Adagio demand source to fetch bids.
 
 ## Configuration
 
-Adagio require several params. These params must be set at Prebid.js global config level or at adUnit level.
+Adagio require several params. These params must be set at Prebid.js BidderConfig config level or at adUnit level.
 
 Below, the list of Adagio params and where they can be set.
 
@@ -58,6 +58,16 @@ pbjs.setConfig({
 });
 ```
 
+#### Note on FPD support
+
+Adagio will use FPD data as fallback for the params below:
+- pagetype
+- environment
+- category
+- subcategory
+
+If the FPD value is an array, the 1st value of this array will be used.
+
 ### adUnit configuration
 
 ```javascript
diff --git a/test/spec/modules/adagioBidAdapter_spec.js b/test/spec/modules/adagioBidAdapter_spec.js
index 36bb5fb1e4d..6c966a4f3dc 100644
--- a/test/spec/modules/adagioBidAdapter_spec.js
+++ b/test/spec/modules/adagioBidAdapter_spec.js
@@ -150,7 +150,9 @@ describe('Adagio bid adapter', () => {
           ext: {
             data: {
               environment: 'desktop',
-              pagetype: 'abc'
+              pagetype: 'abc',
+              category: ['cat1', 'cat2', 'cat3'],
+              subcategory: []
             }
           }
         }
@@ -170,6 +172,12 @@ describe('Adagio bid adapter', () => {
 
       setExtraParam(bid, 'pagetype')
       expect(bid.params.pagetype).to.equal('article');
+
+      setExtraParam(bid, 'category');
+      expect(bid.params.category).to.equal('cat1'); // Only the first value is kept
+
+      setExtraParam(bid, 'subcategory');
+      expect(bid.params.subcategory).to.be.undefined;
     });
 
     it('should use the adUnit param unit if defined', function() {
@@ -1081,7 +1089,7 @@ describe('Adagio bid adapter', () => {
           impressionTrackers: [
             'https://eventrack.local/impression'
           ],
-          javascriptTrackers: '<script src=\"https://eventrack.local/impression\"></script>',
+          javascriptTrackers: '<script async src=\"https://eventrack.local/impression\"></script>',
           clickTrackers: [
             'https://i.am.a.clicktracker.url'
           ],
@@ -1104,6 +1112,19 @@ describe('Adagio bid adapter', () => {
         expect(r[0].native).ok;
         expect(r[0].native).to.deep.equal(expected);
       });
+
+      it('Should handle multiple javascriptTrackers in one single string', () => {
+        const serverResponseWithNativeCopy = utils.deepClone(serverResponseWithNative);
+        serverResponseWithNativeCopy.body.bids[0].admNative.eventtrackers.push(
+          {
+            event: 1,
+            method: 2,
+            url: 'https://eventrack.local/impression-2'
+          },)
+        const r = spec.interpretResponse(serverResponseWithNativeCopy, bidRequestNative);
+        const expected = '<script async src=\"https://eventrack.local/impression\"></script>\n<script async src=\"https://eventrack.local/impression-2\"></script>';
+        expect(r[0].native.javascriptTrackers).to.equal(expected);
+      });
     });
   });
 

From a1f66dbfe9d72c954cafcf5990309fa19c88822c Mon Sep 17 00:00:00 2001
From: matthieularere-msq
 <63732822+matthieularere-msq@users.noreply.github.com>
Date: Wed, 21 Sep 2022 15:47:47 +0200
Subject: [PATCH 276/569] Mediasquare Bid Adapter: add metrics to onBidWon
 Event (#8943)

* Update mediasquareBidAdapter.js

* Update mediasquareBidAdapter.js

* Update mediasquareBidAdapter_spec.js
---
 modules/mediasquareBidAdapter.js                | 2 +-
 test/spec/modules/mediasquareBidAdapter_spec.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/mediasquareBidAdapter.js b/modules/mediasquareBidAdapter.js
index a6903830b80..c431fe2059e 100644
--- a/modules/mediasquareBidAdapter.js
+++ b/modules/mediasquareBidAdapter.js
@@ -164,7 +164,7 @@ export const spec = {
     // fires a pixel to confirm a winning bid
     let params = {'pbjs': '$prebid.version$'};
     let endpoint = document.location.search.match(/msq_test=true/) ? BIDDER_URL_TEST : BIDDER_URL_PROD;
-    let paramsToSearchFor = ['cpm', 'size', 'mediaType', 'currency', 'creativeId', 'adUnitCode', 'timeToRespond', 'requestId', 'auctionId']
+    let paramsToSearchFor = ['cpm', 'size', 'mediaType', 'currency', 'creativeId', 'adUnitCode', 'timeToRespond', 'requestId', 'auctionId', 'originalCpm', 'originalCurrency'];
     if (bid.hasOwnProperty('mediasquare')) {
       if (bid['mediasquare'].hasOwnProperty('bidder')) { params['bidder'] = bid['mediasquare']['bidder']; }
       if (bid['mediasquare'].hasOwnProperty('code')) { params['code'] = bid['mediasquare']['code']; }
diff --git a/test/spec/modules/mediasquareBidAdapter_spec.js b/test/spec/modules/mediasquareBidAdapter_spec.js
index 40d0c44e4f9..eeab047a405 100644
--- a/test/spec/modules/mediasquareBidAdapter_spec.js
+++ b/test/spec/modules/mediasquareBidAdapter_spec.js
@@ -88,6 +88,8 @@ describe('MediaSquare bid adapter tests', function () {
       'height': 250,
       'creative_id': '158534630',
       'currency': 'USD',
+      'originalCpm': 25.0123,
+      'originalCurrency': 'USD',
       'net_revenue': true,
       'ttl': 300,
       'ad': '< --- creative code --- >',

From b67e404c7fe5917bb33df04e0e9bfde4d03255e4 Mon Sep 17 00:00:00 2001
From: Luca Lavarini <89019372+luca1x@users.noreply.github.com>
Date: Wed, 21 Sep 2022 17:30:06 +0200
Subject: [PATCH 277/569] 1plusX RTD Module: Send GDPR info to PAPI (#8992)

* initial commit

* make tests work

* lint

* trailing whitespaces

* iron out some pitfalls

* correct consent sourcing
---
 modules/1plusXRtdProvider.js                | 34 +++++++--
 test/spec/modules/1plusXRtdProvider_spec.js | 78 ++++++++++++++++++++-
 2 files changed, 104 insertions(+), 8 deletions(-)

diff --git a/modules/1plusXRtdProvider.js b/modules/1plusXRtdProvider.js
index 9d010c8d298..317bb4a47af 100644
--- a/modules/1plusXRtdProvider.js
+++ b/modules/1plusXRtdProvider.js
@@ -57,16 +57,39 @@ export const extractConfig = (moduleConfig, reqBidsConfigObj) => {
   return { customerId, timeout, bidders };
 }
 
+export const extractConsent = ({ gdpr }) => {
+  if (!gdpr) {
+    return null
+  }
+  const { gdprApplies, consentString } = gdpr
+  if (!(gdprApplies == '0' || gdprApplies == '1')) {
+    throw 'TCF Consent: gdprApplies has wrong format'
+  }
+  if (!(typeof consentString === 'string')) {
+    throw 'TCF Consent: consentString is not string'
+  }
+  const result = {
+    'gdpr_applies': gdprApplies,
+    'consent_string': consentString
+  }
+  return result
+}
 /**
  * Gets the URL of Profile Api from which targeting data will be fetched
  * @param {Object} config
  * @param {string} config.customerId
  * @returns {string} URL to access 1plusX Profile API
  */
-const getPapiUrl = ({ customerId }) => {
+export const getPapiUrl = (customerId, consent) => {
   // https://[yourClientId].profiles.tagger.opecloud.com/[VERSION]/targeting?url=
   const currentUrl = encodeURIComponent(window.location.href);
-  const papiUrl = `https://${customerId}.profiles.tagger.opecloud.com/${PAPI_VERSION}/targeting?url=${currentUrl}`;
+  var papiUrl = `https://${customerId}.profiles.tagger.opecloud.com/${PAPI_VERSION}/targeting?url=${currentUrl}`;
+  if (consent) {
+    Object.entries(consent).forEach(([key, value]) => {
+      papiUrl += `&${key}=${value}`
+    })
+  }
+
   return papiUrl;
 }
 
@@ -216,14 +239,14 @@ const init = (config, userConsent) => {
  * @param {Object} reqBidsConfigObj Bid request configuration object
  * @param {Function} callback Called on completion
  * @param {Object} moduleConfig Configuration for 1plusX RTD module
- * @param {boolean} userConsent
+ * @param {Object} userConsent
  */
 const getBidRequestData = (reqBidsConfigObj, callback, moduleConfig, userConsent) => {
   try {
     // Get the required config
     const { customerId, bidders } = extractConfig(moduleConfig, reqBidsConfigObj);
     // Get PAPI URL
-    const papiUrl = getPapiUrl({ customerId })
+    const papiUrl = getPapiUrl(customerId, extractConsent(userConsent) || {})
     // Call PAPI
     getTargetingDataFromPapi(papiUrl)
       .then((papiResponse) => {
@@ -231,9 +254,6 @@ const getBidRequestData = (reqBidsConfigObj, callback, moduleConfig, userConsent
         setTargetingDataToConfig(papiResponse, { bidders });
         callback();
       })
-      .catch((error) => {
-        throw error;
-      })
   } catch (error) {
     logError(LOG_PREFIX, error);
     callback();
diff --git a/test/spec/modules/1plusXRtdProvider_spec.js b/test/spec/modules/1plusXRtdProvider_spec.js
index 9682e4b62f8..dae0e313387 100644
--- a/test/spec/modules/1plusXRtdProvider_spec.js
+++ b/test/spec/modules/1plusXRtdProvider_spec.js
@@ -5,7 +5,9 @@ import {
   extractConfig,
   buildOrtb2Updates,
   updateBidderConfig,
-  setTargetingDataToConfig
+  setTargetingDataToConfig,
+  extractConsent,
+  getPapiUrl
 } from 'modules/1plusXRtdProvider';
 
 describe('1plusXRtdProvider', () => {
@@ -251,6 +253,80 @@ describe('1plusXRtdProvider', () => {
     })
   })
 
+  describe('extractConsent', () => {
+    it('extracts consent strings correctly if given', () => {
+      const consent = {
+        gdpr: {
+          gdprApplies: 1,
+          consentString: 'myConsent'
+        }
+      }
+      const output = extractConsent(consent)
+      const expectedOutput = {
+        gdpr_applies: 1,
+        consent_string: 'myConsent'
+      }
+      expect(expectedOutput).to.deep.include(output)
+      expect(output).to.deep.include(expectedOutput)
+    })
+    it('extracts null if consent object is empty', () => {
+      const consent1 = {}
+      expect(extractConsent(consent1)).to.equal(null)
+    })
+
+    it('throws an error if the consent is malformed', () => {
+      const consent1 = {
+        gdpr: {
+          gdprApplies: 1
+        }
+      }
+      const consent2 = {
+        gdpr: {
+          consentString: 'myConsent'
+        }
+      }
+      const consent3 = {
+        gdpr: {
+          gdprApplies: 1,
+          consentString: 3
+        }
+      }
+      const consent4 = {
+        gdpr: {
+          gdprApplies: 'yes',
+          consentString: 'myConsent'
+        }
+      }
+      const consent5 = {
+        gdprApplies: 1,
+        consentString: 'myConsent'
+      }
+
+      for (const consent in [consent1, consent2, consent3, consent4, consent5]) {
+        try {
+          extractConsent(consent)
+          assert(false, 'Should be throwing an exception')
+        } catch (e) { }
+      }
+    })
+  })
+
+  describe('getPapiUrl', () => {
+    const customer = 'acme'
+    const consent = {
+      gdpr: {
+        gdprApplies: 1,
+        consentString: 'myConsent'
+      }
+    }
+
+    it('correctly builds URLs based on consent', () => {
+      const url1 = getPapiUrl(customer)
+      const url2 = getPapiUrl(customer, extractConsent(consent))
+      expect(['&consent_string=myConsent&gdpr_applies=1', '&gdpr_applies=1&consent_string=myConsent']).to.contain(url2.replace(url1, ''))
+    })
+  })
+
   describe('updateBidderConfig', () => {
     const ortb2UpdatesAppNexus = {
       site: {

From 1be384c28fba3e634bd1386968f1eaec370b8c4c Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Wed, 21 Sep 2022 15:54:28 +0000
Subject: [PATCH 278/569] Prebid 7.17.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 96df598093f..c9b6fa71d40 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.17.0-pre",
+  "version": "7.17.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 3748f9dc76f..3bdd9669ef9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.17.0-pre",
+  "version": "7.17.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 0acda04f198ec050e6d16c9e089259c908bef3ca Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Wed, 21 Sep 2022 15:54:28 +0000
Subject: [PATCH 279/569] Increment version to 7.18.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c9b6fa71d40..4dd33205a01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.17.0",
+  "version": "7.18.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 3bdd9669ef9..342805b5138 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.17.0",
+  "version": "7.18.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 0a14e91db750e3549bde19c371d1d34e877b6299 Mon Sep 17 00:00:00 2001
From: Saar Amrani <saar120@gmail.com>
Date: Thu, 22 Sep 2022 16:30:59 +0300
Subject: [PATCH 280/569] Vidazoo Bid Adapter: update unique deal id expiry
 (#9025)

* feat(module): multi size request

* fix getUserSyncs
added tests

* update(module): package-lock.json from master

* feat(module): VidazooBidAdapter - send top query params to server

* feat(module): Changed UNIQUE_DEAL_ID_EXPIRY.

Co-authored-by: Udi Talias <udi.talias@gmail.com>
Co-authored-by: roman <shmoop207@gmail.com>
---
 modules/vidazooBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index 41f3f1f2888..195851ad23a 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -10,7 +10,7 @@ const BIDDER_VERSION = '1.0.0';
 const CURRENCY = 'USD';
 const TTL_SECONDS = 60 * 5;
 const DEAL_ID_EXPIRY = 1000 * 60 * 15;
-const UNIQUE_DEAL_ID_EXPIRY = 1000 * 60 * 15;
+const UNIQUE_DEAL_ID_EXPIRY = 1000 * 60 * 60;
 const SESSION_ID_KEY = 'vidSid';
 export const SUPPORTED_ID_SYSTEMS = {
   'britepoolid': 1,

From efb2890967f9546fa29bbef286332bcbf8e9d4f3 Mon Sep 17 00:00:00 2001
From: matthieularere-msq
 <63732822+matthieularere-msq@users.noreply.github.com>
Date: Fri, 23 Sep 2022 12:40:01 +0200
Subject: [PATCH 281/569] bidwatchAnalyticsAdapter - get adId (#9027)

---
 modules/bidwatchAnalyticsAdapter.js                | 2 +-
 test/spec/modules/bidwatchAnalyticsAdapter_spec.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/bidwatchAnalyticsAdapter.js b/modules/bidwatchAnalyticsAdapter.js
index b94b7eccada..0908b02de2e 100644
--- a/modules/bidwatchAnalyticsAdapter.js
+++ b/modules/bidwatchAnalyticsAdapter.js
@@ -21,7 +21,7 @@ let allEvents = {}
 let auctionEnd = {}
 let initOptions = {}
 let endpoint = 'https://default'
-let requestsAttributes = ['adUnitCode', 'auctionId', 'bidder', 'bidderCode', 'bidId', 'cpm', 'creativeId', 'currency', 'width', 'height', 'mediaType', 'netRevenue', 'originalCpm', 'originalCurrency', 'requestId', 'size', 'source', 'status', 'timeToRespond', 'transactionId', 'ttl', 'sizes', 'mediaTypes', 'src', 'params', 'userId', 'labelAny', 'bids'];
+let requestsAttributes = ['adUnitCode', 'auctionId', 'bidder', 'bidderCode', 'bidId', 'cpm', 'creativeId', 'currency', 'width', 'height', 'mediaType', 'netRevenue', 'originalCpm', 'originalCurrency', 'requestId', 'size', 'source', 'status', 'timeToRespond', 'transactionId', 'ttl', 'sizes', 'mediaTypes', 'src', 'params', 'userId', 'labelAny', 'bids', 'adId'];
 
 function getAdapterNameForAlias(aliasName) {
   return adapterManager.aliasRegistry[aliasName] || aliasName;
diff --git a/test/spec/modules/bidwatchAnalyticsAdapter_spec.js b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
index 321d3607178..9e9d7dbe156 100644
--- a/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
+++ b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
@@ -293,6 +293,7 @@ describe('BidWatch Analytics', function () {
       expect(message.auctionEnd[0].bidsReceived[0]).not.to.have.property('ad');
       expect(message.auctionEnd[0].bidsReceived[0]).to.have.property('meta');
       expect(message.auctionEnd[0].bidsReceived[0].meta).to.have.property('advertiserDomains');
+      expect(message.auctionEnd[0].bidsReceived[0]).to.have.property('adId');
       expect(message.auctionEnd[0]).to.have.property('bidderRequests').and.to.have.lengthOf(1);
       expect(message.auctionEnd[0].bidderRequests[0]).to.have.property('gdprConsent');
       expect(message.auctionEnd[0].bidderRequests[0].gdprConsent).not.to.have.property('vendorData');
@@ -315,6 +316,7 @@ describe('BidWatch Analytics', function () {
       expect(server.requests.length).to.equal(1);
       let message = JSON.parse(server.requests[0].requestBody);
       expect(message).not.to.have.property('ad');
+      expect(message).to.have.property('adId')
       expect(message).to.have.property('cpmIncrement').and.to.equal(27.4276);
       sinon.assert.callCount(bidwatchAnalytics.track, 1);
     });

From fe6d59b2059fa3bdac191f0764fab2145f1478b0 Mon Sep 17 00:00:00 2001
From: adquery <89853721+adquery@users.noreply.github.com>
Date: Fri, 23 Sep 2022 18:17:39 +0200
Subject: [PATCH 282/569] Adquery Bid Adapter: added sizes to bid request
 (#9031)

* added sizes to bid request

* Added unit test

Co-authored-by: marcin <marcin.czerwiak@gmail.com>
---
 modules/adqueryBidAdapter.js                |  6 ++++--
 test/spec/modules/adqueryBidAdapter_spec.js | 11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/adqueryBidAdapter.js b/modules/adqueryBidAdapter.js
index 048e43641f0..be5ca4b1057 100644
--- a/modules/adqueryBidAdapter.js
+++ b/modules/adqueryBidAdapter.js
@@ -1,6 +1,6 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
-import { logInfo, buildUrl, triggerPixel } from '../src/utils.js';
+import { logInfo, buildUrl, triggerPixel, parseSizesInput } from '../src/utils.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const ADQUERY_GVLID = 902;
@@ -24,7 +24,7 @@ export const spec = {
    * @return {boolean}
    */
   isBidRequestValid: (bid) => {
-    return !!(bid && bid.params && bid.params.placementId)
+    return !!(bid && bid.params && bid.params.placementId && bid.mediaTypes.banner.sizes)
   },
 
   /**
@@ -202,6 +202,8 @@ function buildRequest(validBidRequests, bidderRequest) {
     bidderRequestId: bid.bidderRequestId,
     bidRequestsCount: bid.bidRequestsCount,
     bidderRequestsCount: bid.bidderRequestsCount,
+    sizes: parseSizesInput(bid.mediaTypes.banner.sizes).toString(),
+
   };
 }
 
diff --git a/test/spec/modules/adqueryBidAdapter_spec.js b/test/spec/modules/adqueryBidAdapter_spec.js
index 4285377e8a7..1c536620803 100644
--- a/test/spec/modules/adqueryBidAdapter_spec.js
+++ b/test/spec/modules/adqueryBidAdapter_spec.js
@@ -70,6 +70,13 @@ describe('adqueryBidAdapter', function () {
     it('should return false if any parameter missing', function () {
       expect(spec.isBidRequestValid(inValidBid)).to.be.false
     })
+
+    it('should return false when sizes for banner are not specified', () => {
+      const bid = utils.deepClone(bidRequest);
+      delete bid.mediaTypes.banner.sizes;
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
   })
 
   describe('buildRequests', function () {
@@ -108,6 +115,10 @@ describe('adqueryBidAdapter', function () {
     it('should include bidder', function () {
       expect(rdata.bidder !== null).to.be.true
     })
+
+    it('should include sizes', function () {
+      expect(rdata.sizes).not.be.null
+    })
   })
 
   describe('interpretResponse', function () {

From b02ce1b446e1f91c5ee58d44dd339e3e9914558d Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Fri, 23 Sep 2022 12:37:19 -0600
Subject: [PATCH 283/569] test for override default currency (#9022)

---
 test/spec/modules/prebidServerBidAdapter_spec.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index ff600d4ef93..69eee1c3f4a 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -3469,5 +3469,17 @@ describe('S2S Adapter', function () {
 
       expect(requestBid.ext.prebid.floors).to.deep.equal({ enabled: false });
     });
+
+    it('should override prebid server default DEFAULT_S2S_CURRENCY', function () {
+      config.setConfig({
+        currency: { adServerCurrency: 'JPY' },
+      });
+
+      const bidRequests = utils.deepClone(BID_REQUESTS);
+      adapter.callBids(REQUEST, bidRequests, addBidResponse, done, ajax);
+
+      const parsedRequestBody = JSON.parse(server.requests[1].requestBody);
+      expect(parsedRequestBody.cur).to.deep.equal(['JPY']);
+    });
   });
 });

From 6373f3490d3622f1251ad7d9b3bff66c1770e553 Mon Sep 17 00:00:00 2001
From: pokutuna <mail@pokutuna.com>
Date: Mon, 26 Sep 2022 08:55:29 +0900
Subject: [PATCH 284/569] adagioBidAdapter: restore original css display
 property after getting slot position (#9036)

---
 modules/adagioBidAdapter.js                |  3 ++-
 test/spec/modules/adagioBidAdapter_spec.js | 23 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index e56966af9b2..e59fd341bae 100644
--- a/modules/adagioBidAdapter.js
+++ b/modules/adagioBidAdapter.js
@@ -794,9 +794,10 @@ function getSlotPosition(adUnitElementId) {
 
     if (mustDisplayElement) {
       domElement.style = domElement.style || {};
+      const originalDisplay = domElement.style.display;
       domElement.style.display = 'block';
       box = domElement.getBoundingClientRect();
-      domElement.style.display = elComputedDisplay;
+      domElement.style.display = originalDisplay || null;
     }
     position.x = Math.round(box.left + scrollLeft - clientLeft);
     position.y = Math.round(box.top + scrollTop - clientTop);
diff --git a/test/spec/modules/adagioBidAdapter_spec.js b/test/spec/modules/adagioBidAdapter_spec.js
index 6c966a4f3dc..e2fde8ff2e3 100644
--- a/test/spec/modules/adagioBidAdapter_spec.js
+++ b/test/spec/modules/adagioBidAdapter_spec.js
@@ -1265,6 +1265,29 @@ describe('Adagio bid adapter', () => {
       expect(result.dom_loading).to.be.a('String');
       expect(result.user_timestamp).to.be.a('String');
     });
+
+    it('should return `adunit_position` feature when the slot is hidden', function () {
+      const elem = fixtures.getElementById();
+      sandbox.stub(window.top.document, 'getElementById').returns(elem);
+      sandbox.stub(window.top, 'getComputedStyle').returns({ display: 'none' });
+      sandbox.stub(utils, 'inIframe').returns(false);
+
+      const bidRequest = new BidRequestBuilder({
+        mediaTypes: {
+          banner: { sizes: [[300, 250]] },
+        },
+      })
+        .withParams()
+        .build();
+
+      const bidderRequest = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const result = requests[0].data.adUnits[0].features;
+
+      expect(result.adunit_position).to.match(/^[\d]+x[\d]+$/);
+      expect(elem.style.display).to.equal(null); // set null to reset style
+    });
   });
 
   describe('Adagio features when prebid in Safeframe', function() {

From f121e2a033a0708daccabfc9ff09210222c4e9e3 Mon Sep 17 00:00:00 2001
From: Yohan Boutin <yohan@seedtag.com>
Date: Mon, 26 Sep 2022 15:39:34 +0200
Subject: [PATCH 285/569] Seedtag Bid Adapter: add schain to payload (#9038)

* add schain to payload

* fix lint
---
 modules/seedtagBidAdapter.js                |  4 ++
 test/spec/modules/seedtagBidAdapter_spec.js | 45 +++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/modules/seedtagBidAdapter.js b/modules/seedtagBidAdapter.js
index 8c5ab41bd6e..5c4a3af866c 100644
--- a/modules/seedtagBidAdapter.js
+++ b/modules/seedtagBidAdapter.js
@@ -240,6 +240,10 @@ export const spec = {
       payload['uspConsent'] = bidderRequest.uspConsent
     }
 
+    if (validBidRequests[0].schain) {
+      payload.schain = validBidRequests[0].schain;
+    }
+
     const payloadString = JSON.stringify(payload)
     return {
       method: 'POST',
diff --git a/test/spec/modules/seedtagBidAdapter_spec.js b/test/spec/modules/seedtagBidAdapter_spec.js
index 092fd3ebf9a..2f38519b441 100644
--- a/test/spec/modules/seedtagBidAdapter_spec.js
+++ b/test/spec/modules/seedtagBidAdapter_spec.js
@@ -356,6 +356,51 @@ describe('Seedtag Adapter', function () {
         expect(videoBid.requestCount).to.equal(1);
       });
     });
+
+    describe('schain param', function () {
+      it('should add schain to payload when exposed on validBidRequest', function () {
+        // https://github.com/prebid/Prebid.js/blob/master/modules/schain.md#sample-code-for-passing-the-schain-object
+        const schain = {
+          validation: 'strict',
+          config: {
+            ver: '1.0',
+            complete: 1,
+            nodes: [
+              {
+                asi: 'indirectseller.com',
+                sid: '00001',
+                hp: 1,
+              },
+
+              {
+                asi: 'indirectseller-2.com',
+                sid: '00002',
+                hp: 1,
+              },
+            ],
+          },
+        };
+
+        // duplicate
+        const bidRequests = JSON.parse(JSON.stringify(validBidRequests))
+        bidRequests[0].schain = schain;
+
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+
+        const payload = JSON.parse(request.data);
+
+        expect(payload.schain).to.exist;
+        expect(payload.schain).to.deep.equal(schain);
+      });
+
+      it("shouldn't add schain to payload when not exposed", function () {
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+
+        const payload = JSON.parse(request.data);
+
+        expect(payload.schain).to.not.exist;
+      });
+    });
   });
 
   describe('interpret response method', function () {

From d313568e9f22b2adb0908f8ab147763e0c2ca7c6 Mon Sep 17 00:00:00 2001
From: ahmadlob <109217988+ahmadlob@users.noreply.github.com>
Date: Tue, 27 Sep 2022 17:40:31 +0300
Subject: [PATCH 286/569] Taboola Adapter: Adding Some Optional Chaining Checks
  (#9033)

* update-ttl-passing

* Update taboolaBidAdapter_spec.js

* add fallback default value in case of null

* add semicolons

* .

* .

* .

* ..

* ...

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* optional-chaining
---
 modules/taboolaBidAdapter.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/taboolaBidAdapter.js b/modules/taboolaBidAdapter.js
index ac4fed11fb6..39527dc33ab 100644
--- a/modules/taboolaBidAdapter.js
+++ b/modules/taboolaBidAdapter.js
@@ -60,14 +60,10 @@ export const userData = {
 
 export const internal = {
   getPageUrl: (refererInfo = {}) => {
-    return refererInfo.page || getWindowSelf().location.href;
+    return refererInfo?.page || getWindowSelf().location.href;
   },
   getReferrer: (refererInfo = {}) => {
-    if (refererInfo.ref) {
-      return refererInfo.ref;
-    } else {
-      return getWindowSelf().document.referrer;
-    }
+    return refererInfo?.ref || getWindowSelf().document.referrer;
   }
 }
 
@@ -160,7 +156,7 @@ function getSiteProperties({publisherId, bcat = []}, refererInfo) {
   return {
     id: publisherId,
     name: publisherId,
-    domain: refererInfo?.domain || window.location.host,
+    domain: refererInfo?.domain || window.location?.host,
     page: getPageUrl(refererInfo),
     ref: getReferrer(refererInfo),
     publisher: {

From 8618708bca105fa53cb8af05adb7768c86cbcbb6 Mon Sep 17 00:00:00 2001
From: Mikhail Ivanchenko <mihail.ivanchenko@nextmillennium.io>
Date: Tue, 27 Sep 2022 18:20:53 +0300
Subject: [PATCH 287/569] add video support (#9042)

---
 modules/nextMillenniumBidAdapter.js | 45 ++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index 44e70b7b981..25ad1f43e82 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -8,6 +8,8 @@ import {
   logMessage,
   parseUrl,
   triggerPixel,
+  getDefinedParams,
+  parseGPTSingleSizeArrayToRtbSize,
 } from '../src/utils.js';
 
 import CONSTANTS from '../src/constants.json';
@@ -22,6 +24,10 @@ const ENDPOINT = 'https://pbs.nextmillmedia.com/openrtb2/auction';
 const TEST_ENDPOINT = 'https://test.pbs.nextmillmedia.com/openrtb2/auction';
 const SYNC_ENDPOINT = 'https://statics.nextmillmedia.com/load-cookie.html?v=4';
 const TIME_TO_LIVE = 360;
+const VIDEO_PARAMS = [
+  'api', 'linearity', 'maxduration', 'mimes', 'minduration', 'placement',
+  'playbackmethod', 'protocols', 'startdelay'
+];
 
 const EXPIRENCE_WURL = 20 * 60000;
 const wurlMap = {};
@@ -72,21 +78,38 @@ export const spec = {
 
         device,
         site,
-        'imp': [{
-          'banner': {
-            'format': (sizes || []).map(s => { return {w: s[0], h: s[1]} })
-          },
+        imp: []
+      };
 
-          'ext': {
-            'prebid': {
-              'storedrequest': {
-                'id': id
-              }
-            }
+      const imp = {
+        ext: {
+          prebid: {
+            storedrequest: {id}
           }
-        }]
+        }
+      };
+
+      if (deepAccess(bid, 'mediaTypes.banner')) {
+        imp.banner = {
+          format: (sizes || []).map(s => { return {w: s[0], h: s[1]} })
+        };
       };
 
+      const video = deepAccess(bid, 'mediaTypes.video');
+      if (video) {
+        imp.video = getDefinedParams(video, VIDEO_PARAMS);
+        if (video.playerSize) {
+          imp.video = Object.assign(
+            imp.video, parseGPTSingleSizeArrayToRtbSize(video.playerSize[0]) || {}
+          );
+        } else if (video.w && video.h) {
+          imp.video.w = video.w;
+          imp.video.h = video.h;
+        };
+      };
+
+      postBody.imp.push(imp);
+
       const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
       const uspConsent = bidderRequest && bidderRequest.uspConsent;
 

From 9114a8d331e32f83b03fee21441cd258532686f5 Mon Sep 17 00:00:00 2001
From: mmoschovas <63253416+mmoschovas@users.noreply.github.com>
Date: Tue, 27 Sep 2022 13:12:35 -0400
Subject: [PATCH 288/569] Fix floors bug in Nativo adapter (#9041)

---
 modules/nativoBidAdapter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/nativoBidAdapter.js b/modules/nativoBidAdapter.js
index 54c99b17834..7177abecae0 100644
--- a/modules/nativoBidAdapter.js
+++ b/modules/nativoBidAdapter.js
@@ -465,8 +465,9 @@ export function parseFloorPriceData(bidRequest) {
     // Setup price floor data per media type
     let mediaTypeData = bidMediaTypes[mediaType]
     let mediaTypeFloorPriceData = {}
+    let mediaTypeSizes = mediaTypeData.sizes || mediaTypeData.playerSize || [];
     // Step through each size of the media type so we can get floor data for each size per media type
-    mediaTypeData.sizes.forEach((size) => {
+    mediaTypeSizes.forEach((size) => {
       // Get floor price data per the getFloor method and respective media type / size combination
       const priceFloorData = bidRequest.getFloor({
         currency: FLOOR_PRICE_CURRENCY,

From bcc6cd5258f972b62c9a47b44ff566bec54d8f2e Mon Sep 17 00:00:00 2001
From: southern-growthcode
 <79725079+southern-growthcode@users.noreply.github.com>
Date: Tue, 27 Sep 2022 14:58:17 -0400
Subject: [PATCH 289/569] GrowthCode ID Module: initial module release (#9011)

* Initial check-in ofthe GrowthCode Adaptor

* Growthcode ID System

* Working on test module

* Tests for the growthCode Id System

* Clean up tests for GrowthCode

* Fixed the default values for shareID

* Remove Test HTML Page

* Remove file

* Updated MD file to switch client ID to partner ID
---
 modules/growthCodeIdSystem.js                | 164 +++++++++++++++++++
 modules/growthCodeIdSystem.md                |  37 +++++
 modules/userId/eids.js                       |  19 +++
 test/spec/modules/growthCodeIdSystem_spec.js |  83 ++++++++++
 4 files changed, 303 insertions(+)
 create mode 100644 modules/growthCodeIdSystem.js
 create mode 100644 modules/growthCodeIdSystem.md
 create mode 100644 test/spec/modules/growthCodeIdSystem_spec.js

diff --git a/modules/growthCodeIdSystem.js b/modules/growthCodeIdSystem.js
new file mode 100644
index 00000000000..68fe2c7e925
--- /dev/null
+++ b/modules/growthCodeIdSystem.js
@@ -0,0 +1,164 @@
+/**
+ * This module adds GrowthCodeId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/growthCodeIdSystem
+ * @requires module:modules/userId
+ */
+
+import {logError, logInfo, tryAppendQueryString} from '../src/utils.js';
+import {ajax} from '../src/ajax.js';
+import { submodule } from '../src/hook.js'
+import { getStorageManager } from '../src/storageManager.js';
+
+const GCID_EXPIRY = 45;
+const MODULE_NAME = 'growthCodeId';
+const GC_DATA_KEY = '_gc_data';
+const ENDPOINT_URL = 'https://p2.gcprivacy.com/v1/pb?'
+
+export const storage = getStorageManager({ gvlid: undefined, moduleName: MODULE_NAME });
+
+/**
+ * Read GrowthCode data from cookie or local storage
+ * @param key
+ * @return {string}
+ */
+export function readData(key) {
+  try {
+    if (storage.hasLocalStorage()) {
+      return storage.getDataFromLocalStorage(key);
+    }
+    if (storage.cookiesAreEnabled()) {
+      return storage.getCookie(key);
+    }
+  } catch (error) {
+    logError(error);
+  }
+}
+
+/**
+ * Store GrowthCode data in either cookie or local storage
+ * expiration date: 45 days
+ * @param key
+ * @param {string} value
+ */
+function storeData(key, value) {
+  try {
+    logInfo(MODULE_NAME + ': storing data: key=' + key + ' value=' + value);
+
+    if (value) {
+      if (storage.hasLocalStorage()) {
+        storage.setDataInLocalStorage(key, value);
+      }
+      const expiresStr = (new Date(Date.now() + (GCID_EXPIRY * (60 * 60 * 24 * 1000)))).toUTCString();
+      if (storage.cookiesAreEnabled()) {
+        storage.setCookie(key, value, expiresStr, 'LAX');
+      }
+    }
+  } catch (error) {
+    logError(error);
+  }
+}
+
+/**
+ * Parse json if possible, else return null
+ * @param data
+ * @param {object|null}
+ */
+function tryParse(data) {
+  try {
+    return JSON.parse(data);
+  } catch (err) {
+    logError(err);
+    return null;
+  }
+}
+
+/** @type {Submodule} */
+export const growthCodeIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {{string}} value
+   * @returns {{growthCodeId: {string}}|undefined}
+   */
+  decode(value) {
+    return value && value !== '' ? { 'growthCodeId': value } : undefined;
+  },
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config, consentData) {
+    const configParams = (config && config.params) || {};
+    if (!configParams || typeof configParams.pid !== 'string') {
+      logError('User ID - GrowthCodeID submodule requires a valid Partner ID to be defined');
+      return;
+    }
+
+    const gdpr = (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) ? 1 : 0;
+    const consentString = gdpr ? consentData.consentString : '';
+    if (gdpr && !consentString) {
+      logInfo('Consent string is required to call GrowthCode id.');
+      return;
+    }
+
+    let publisherId = configParams.publisher_id ? configParams.publisher_id : '_sharedID';
+
+    let sharedId;
+    if (configParams.publisher_id_storage === 'html5') {
+      sharedId = storage.getDataFromLocalStorage(publisherId, null) ? (storage.getDataFromLocalStorage(publisherId, null)) : null;
+    } else {
+      sharedId = storage.getCookie(publisherId, null) ? (storage.getCookie(publisherId, null)) : null;
+    }
+    if (!sharedId) {
+      logError('User ID - Publisher ID is not correctly setup.');
+    }
+
+    const resp = function(callback) {
+      let gcData = tryParse(readData(GC_DATA_KEY));
+      if (gcData) {
+        callback(gcData);
+      } else {
+        let segment = window.location.pathname.substr(1).replace(/\/+$/, '');
+        if (segment === '') {
+          segment = 'home';
+        }
+
+        let url = configParams.url ? configParams.url : ENDPOINT_URL;
+        url = tryAppendQueryString(url, 'pid', configParams.pid);
+        url = tryAppendQueryString(url, 'uid', sharedId);
+        url = tryAppendQueryString(url, 'u', window.location.href);
+        url = tryAppendQueryString(url, 'h', window.location.hostname);
+        url = tryAppendQueryString(url, 's', segment);
+        url = tryAppendQueryString(url, 'r', document.referrer);
+
+        ajax(url, {
+          success: response => {
+            let respJson = tryParse(response);
+            // If response is a valid json and should save is true
+            if (respJson) {
+              storeData(GC_DATA_KEY, JSON.stringify(respJson))
+              callback(respJson);
+            } else {
+              callback();
+            }
+          },
+          error: error => {
+            logError(MODULE_NAME + ': ID fetch encountered an error', error);
+            callback();
+          }
+        }, undefined, {method: 'GET', withCredentials: true})
+      }
+    };
+    return { callback: resp };
+  }
+};
+
+submodule('userId', growthCodeIdSubmodule);
diff --git a/modules/growthCodeIdSystem.md b/modules/growthCodeIdSystem.md
new file mode 100644
index 00000000000..f804686a7a9
--- /dev/null
+++ b/modules/growthCodeIdSystem.md
@@ -0,0 +1,37 @@
+## GrowthCode User ID Submodule
+
+GrowthCode provides Id Enrichment for requests. 
+
+## Building Prebid with GrowthCode Support
+
+First, make sure to add the GrowthCode submodule to your Prebid.js package with:
+
+```
+gulp build --modules=growthCodeIdSystem,userId
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    userIds: [{
+      name: 'growthCodeId',
+      params: {
+          pid: 'TEST01', // Set your Partner ID here for production (obtained from Growthcode)
+          publisher_id: '_sharedID',
+          publisher_id_storage: 'html5'
+      }
+    }]
+  }
+});
+```
+
+| Param under userSync.userIds[] | Scope    | Type   | Description | Example         |
+|--------------------------------|----------|--------| --- |-----------------|
+| name                           | Required | String | The name of this module. | `"growthCodeId"` |
+| params                         | Required | Object | Details of module params. |                 |
+| params.pid                     | Required | String | This is the Parter ID value obtained from GrowthCode | `"TEST01"`        |
+| params.url | Optional | String | Custom URL for server | |
+| params.publisher_id | Optional | String | Name if the variable that holds your publisher ID | `"_sharedID"` |
+| params.publisher_id_storage | Optional | String | Publisher ID storage (cookie, html5) | `"html5"` |
diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index 689916f6a3e..23dc9809041 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -5,6 +5,25 @@ export const USER_IDS_CONFIG = {
 
   // key-name : {config}
 
+  // GrowthCode
+  'growthCodeId': {
+    getValue: function(data) {
+      return data.gc_id
+    },
+    source: 'growthcode.io',
+    atype: 1,
+    getUidExt: function(data) {
+      const extendedData = pick(data, [
+        'h1',
+        'h2',
+        'h3',
+      ]);
+      if (Object.keys(extendedData).length) {
+        return extendedData;
+      }
+    }
+  },
+
   // trustpid
   'trustpid': {
     source: 'trustpid.com',
diff --git a/test/spec/modules/growthCodeIdSystem_spec.js b/test/spec/modules/growthCodeIdSystem_spec.js
new file mode 100644
index 00000000000..dce995d25e0
--- /dev/null
+++ b/test/spec/modules/growthCodeIdSystem_spec.js
@@ -0,0 +1,83 @@
+import { growthCodeIdSubmodule } from 'modules/growthCodeIdSystem.js';
+import * as utils from 'src/utils.js';
+import { server } from 'test/mocks/xhr.js';
+import { uspDataHandler } from 'src/adapterManager.js';
+import {expect} from 'chai';
+import {getStorageManager} from '../../../src/storageManager.js';
+
+const GCID_EXPIRY = 45;
+const MODULE_NAME = 'growthCodeId';
+const SHAREDID = 'fe9c5c89-7d56-4666-976d-e07e73b3b664';
+
+export const storage = getStorageManager({ gvlid: undefined, moduleName: MODULE_NAME });
+
+const getIdParams = {params: {
+  pid: 'TEST01',
+  publisher_id: '_sharedid',
+  publisher_id_storage: 'html5',
+}};
+
+describe('growthCodeIdSystem', () => {
+  let logErrorStub;
+
+  beforeEach(function () {
+    logErrorStub = sinon.stub(utils, 'logError');
+    storage.setDataInLocalStorage('_sharedid', SHAREDID);
+    const expiresStr = (new Date(Date.now() + (GCID_EXPIRY * (60 * 60 * 24 * 1000)))).toUTCString();
+    if (storage.cookiesAreEnabled()) {
+      storage.setCookie('_sharedid', SHAREDID, expiresStr, 'LAX');
+    }
+  });
+
+  afterEach(function () {
+    logErrorStub.restore();
+  });
+
+  describe('name', () => {
+    it('should expose the name of the submodule', () => {
+      expect(growthCodeIdSubmodule.name).to.equal('growthCodeId');
+    });
+  });
+
+  it('should NOT call the growthcode id endpoint if gdpr applies but consent string is missing', function () {
+    let submoduleCallback = growthCodeIdSubmodule.getId(getIdParams, { gdprApplies: true }, undefined);
+    expect(submoduleCallback).to.be.undefined;
+  });
+
+  it('should log an error if pid configParam was not passed when getId', function () {
+    growthCodeIdSubmodule.getId();
+    expect(logErrorStub.callCount).to.be.equal(1);
+  });
+
+  it('should log an error if sharedId (LocalStore) is not setup correctly', function () {
+    growthCodeIdSubmodule.getId({params: {
+      pid: 'TEST01',
+      publisher_id: '_sharedid_bad',
+      publisher_id_storage: 'html5',
+    }});
+    expect(logErrorStub.callCount).to.be.equal(1);
+  });
+
+  it('should log an error if sharedId (LocalStore) is not setup correctly', function () {
+    growthCodeIdSubmodule.getId({params: {
+      pid: 'TEST01',
+      publisher_id: '_sharedid_bad',
+      publisher_id_storage: 'cookie',
+    }});
+    expect(logErrorStub.callCount).to.be.equal(1);
+  });
+
+  it('should call the growthcode id endpoint', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = growthCodeIdSubmodule.getId(getIdParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url.substr(0, 85)).to.be.eq('https://p2.gcprivacy.com/v1/pb?pid=TEST01&uid=' + SHAREDID + '&u=');
+    request.respond(
+      200,
+      {},
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+})

From 0eb39e96c0356d9812d9fe9fc9e116436b81cab4 Mon Sep 17 00:00:00 2001
From: TheMediaGrid <44166371+TheMediaGrid@users.noreply.github.com>
Date: Wed, 28 Sep 2022 22:40:00 +0300
Subject: [PATCH 290/569] TheMediaGrid: fix trustx aliasing in s2s (#9043)

---
 modules/gridBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index d1743ac63af..3ac67df0016 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -39,7 +39,7 @@ let hasSynced = false;
 
 export const spec = {
   code: BIDDER_CODE,
-  aliases: ['playwire', 'adlivetech', 'trustx'],
+  aliases: ['playwire', 'adlivetech', { code: 'trustx', skipPbsAliasing: true }],
   supportedMediaTypes: [ BANNER, VIDEO ],
   /**
    * Determines whether or not the given bid request is valid.

From 28233e15fbfe3bf19b1b36b5b3d8bbb3052ddf9a Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Wed, 28 Sep 2022 20:04:58 +0000
Subject: [PATCH 291/569] Prebid 7.18.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4dd33205a01..65a56800890 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.18.0-pre",
+  "version": "7.18.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 342805b5138..65263587b77 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.18.0-pre",
+  "version": "7.18.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 28f02fa47b6448f3d25d80df17f13ee75cab0141 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Wed, 28 Sep 2022 20:04:58 +0000
Subject: [PATCH 292/569] Increment version to 7.19.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 65a56800890..3ff09b29460 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.18.0",
+  "version": "7.19.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 65263587b77..c15fc675fa7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.18.0",
+  "version": "7.19.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From f32e0805a10c118d1c49e070d14ff80f9e3b7417 Mon Sep 17 00:00:00 2001
From: Elad Yosifon <elad-yosifon@users.noreply.github.com>
Date: Thu, 29 Sep 2022 15:31:17 +0300
Subject: [PATCH 293/569] Rubicon. bugfix for singleRequest config regression
 (#9050)

* fix rubicon singleRequest config regression #9049

* manually kick off testing

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/rubiconBidAdapter.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index ffcc230ac13..254799b995d 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -333,7 +333,7 @@ export const spec = {
       }
     });
 
-    if (rubiConf.singleRequest !== true) {
+    if (config.getConfig('rubicon.singleRequest') !== true) {
       // bids are not grouped if single request mode is not enabled
       requests = videoRequests.concat(bidRequests.filter(bidRequest => bidType(bidRequest) === 'banner').map(bidRequest => {
         const bidParams = spec.createSlotParams(bidRequest, bidderRequest);
@@ -1279,8 +1279,7 @@ export function hasValidSupplyChainParams(schain) {
 }
 
 /**
- * Creates a URL key value param, encoding the
- * param unless the key is schain
+ * Creates a URL key value param, encoding the param unless the key is schain
  * @param {String} key
  * @param {String} param
  * @returns {String}

From d5434eaad4a05945aa2245802ac109baa3740f85 Mon Sep 17 00:00:00 2001
From: dzhang-criteo <87757739+dzhang-criteo@users.noreply.github.com>
Date: Thu, 29 Sep 2022 18:21:16 +0200
Subject: [PATCH 294/569] Criteo bid adapter: Update FastBid default version
 (#9054)

---
 modules/criteoBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 98aa58f5a70..f3988a2fa4e 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -27,7 +27,7 @@ const LOG_PREFIX = 'Criteo: ';
   Unminified source code can be found in the privately shared repo: https://github.com/Prebid-org/prebid-js-external-js-criteo/blob/master/dist/prod.js
 */
 const FAST_BID_VERSION_PLACEHOLDER = '%FAST_BID_VERSION%';
-export const FAST_BID_VERSION_CURRENT = 123;
+export const FAST_BID_VERSION_CURRENT = 130;
 const FAST_BID_VERSION_LATEST = 'latest';
 const FAST_BID_VERSION_NONE = 'none';
 const PUBLISHER_TAG_URL_TEMPLATE = 'https://static.criteo.net/js/ld/publishertag.prebid' + FAST_BID_VERSION_PLACEHOLDER + '.js';

From f992a0d143529a5dd3e46c0fb6b83f93312254a0 Mon Sep 17 00:00:00 2001
From: MK Platform <88486298+mediakeys-platform@users.noreply.github.com>
Date: Thu, 29 Sep 2022 21:48:26 +0200
Subject: [PATCH 295/569] Native multiple js trackers (#9019)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: François Maturel <francoismaturel@dijit.fr>
---
 modules/mediakeysBidAdapter.js                |  7 +-
 modules/mediakeysBidAdapter.md                | 90 ++++++++++---------
 test/spec/modules/mediakeysBidAdapter_spec.js | 23 ++++-
 3 files changed, 76 insertions(+), 44 deletions(-)

diff --git a/modules/mediakeysBidAdapter.js b/modules/mediakeysBidAdapter.js
index 8c2b2c32e1c..60ced650329 100644
--- a/modules/mediakeysBidAdapter.js
+++ b/modules/mediakeysBidAdapter.js
@@ -572,7 +572,12 @@ function nativeBidResponseHandler(bid) {
           native.impressionTrackers.push(tracker.url);
           break;
         case 2:
-          native.javascriptTrackers = `<script src=\"${tracker.url}\"></script>`;
+          const script = `<script async src=\"${tracker.url}\"></script>`;
+          if (!native.javascriptTrackers) {
+            native.javascriptTrackers = script;
+          } else {
+            native.javascriptTrackers += `\n${script}`;
+          }
           break;
       }
     });
diff --git a/modules/mediakeysBidAdapter.md b/modules/mediakeysBidAdapter.md
index ec313c2fe3a..b0654771d19 100644
--- a/modules/mediakeysBidAdapter.md
+++ b/modules/mediakeysBidAdapter.md
@@ -14,9 +14,10 @@ Connects to Mediakeys demand source to fetch bids.
 
 ## Banner only Ad Unit
 
-```
-var adUnits = [
-{
+The Mediakeys adapter accepts any valid OpenRTB Spec 2.5 property.
+
+```javascript
+var adUnits = [{
     code: 'test',
     mediaTypes: {
         banner: {
@@ -27,20 +28,26 @@ var adUnits = [
         bidder: 'mediakeys',
         params: {} // no params required.
     }]
-},
+}]
 ```
 
 ## Native only Ad Unit
 
 The Mediakeys adapter accepts two optional params for native requests. Please see the [OpenRTB Native Ads Specification](https://www.iab.com/wp-content/uploads/2018/03/OpenRTB-Native-Ads-Specification-Final-1.2.pdf) for valid values.
 
-```
-var adUnits = [
-{
+```javascript
+var adUnits = [{
     code: 'test',
     mediaTypes: {
         native: {
-            type: 'image',
+            title: {
+                required: true,
+                len: 120
+            },
+            image: {
+                required: true,
+                sizes: [300, 250]
+            }
         }
     },
     bids: [{
@@ -52,7 +59,7 @@ var adUnits = [
             }
         }
     }]
-},
+}]
 ```
 
 ## Video only Ad Unit
@@ -61,63 +68,65 @@ The Mediakeys adapter accepts any valid openRTB 2.5 video property. Properties c
 
 ### Outstream context
 
-```
-var adUnits = [
-{
+```javascript
+var adUnits = [{
     code: 'test',
     mediaTypes: {
         video: {
             context: 'outstream',
-            playerSize: [300, 250],
+            playerSize: [1280, 720],
             // additional OpenRTB video params
             // placement: 2,
             // api: [1],
             // …
+            mimes: ['video/mp4'],
+            protocols: [2, 3],
+            skip: 0
         }
     },
     renderer: {
         url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+        // the render method must fetch the vast xml document before displaying video
         render: function (bid) {
-            var bidReqConfig = pbjs.adUnits.find(bidReq => bidReq.bidId === bid.impid);
-
-            if (bidReqConfig && bidReqConfig.mediaTypes && bidReqConfig.mediaTypes.video && bidReqConfig.mediaTypes.video.context === 'outstream') {
-                var adResponse = fetch(bid.vastUrl).then(resp => resp.text()).then(text => ({
-                    ad: {
-                        video: {
-                            content: text,
-                            player_width: bid.width || bidReqConfig.mediaTypes.video.playerSize[0],
-                            player_height: bid.height || bidReqConfig.mediaTypes.video.playerSize[1],
-                        }
+            var adResponse = fetch(bid.vastUrl).then(resp => resp.text()).then(text => ({
+                ad: {
+                    video: {
+                        content: text,
+                        player_height: bid.playerHeight,
+                        player_width: bid.playerWidth
                     }
-                }))
-
-                adResponse.then((ad) => {
-                    bid.renderer.push(() => {
-                        ANOutstreamVideo.renderAd({
-                            targetId: bid.adUnitCode,
-                            adResponse: ad
-                        });
+                }
+            }))
+
+            adResponse.then((content) => {
+                bid.renderer.push(() => {
+                    ANOutstreamVideo.renderAd({
+                        targetId: bid.adUnitCode,
+                        adResponse: content
                     });
-                })
-            }
+                });
+            })
         }
     },
     bids: [{
         bidder: 'mediakeys',
         params: {
             video: {
-                // additional OpenRTB video params. Will be merged with params defined at mediaTypes level
+                // additional OpenRTB video params.
+                // will be merged with params defined at mediaTypes level
+                api: [1]
             }
         }
     }]
-},
+}]
 ```
 
 ### Instream context
 
-```
-var adUnits = [
-{
+For Instream Video, you have to enable the Instream Tracking Module to have Prebid emit the onBidWon required event.
+
+```javascript
+var adUnits = [{
     code: 'test',
     mediaTypes: {
         video: {
@@ -132,8 +141,9 @@ var adUnits = [
     bids: [{
         bidder: 'mediakeys',
         params: {
-            // additional OpenRTB video params. Will be merged with params defined at mediaTypes level
+            // additional OpenRTB video params.
+            // will be merged with params defined at mediaTypes level
         }
     }]
-},
+}]
 ```
diff --git a/test/spec/modules/mediakeysBidAdapter_spec.js b/test/spec/modules/mediakeysBidAdapter_spec.js
index 47ac54d49df..393b6ac6764 100644
--- a/test/spec/modules/mediakeysBidAdapter_spec.js
+++ b/test/spec/modules/mediakeysBidAdapter_spec.js
@@ -808,8 +808,8 @@ describe('mediakeysBidAdapter', function () {
             ]
           },
           eventtrackers: [
-            { event: 1, method: 1, url: 'https://click.me' },
-            { event: 1, method: 2, url: 'https://click-script.me' }
+            { event: 1, method: 1, url: 'https://eventrack.me/impression' },
+            { event: 1, method: 2, url: 'https://eventrack-js.me/impression-1' }
           ]
         };
 
@@ -845,9 +845,11 @@ describe('mediakeysBidAdapter', function () {
         expect(response[0].native.clickUrl).to.exist;
         expect(response[0].native.clickTrackers).to.exist;
         expect(response[0].native.clickTrackers.length).to.equal(1);
-        expect(response[0].native.javascriptTrackers).to.equal('<script src="https://click-script.me"></script>');
         expect(response[0].native.impressionTrackers).to.exist;
         expect(response[0].native.impressionTrackers.length).to.equal(1);
+        expect(response[0].native.impressionTrackers[0]).to.equal('https://eventrack.me/impression');
+        expect(response[0].native.javascriptTrackers).to.exist;
+        expect(response[0].native.javascriptTrackers).to.equal('<script async src="https://eventrack-js.me/impression-1"></script>');
       });
 
       it('should ignore eventtrackers with a unsupported type', function() {
@@ -859,6 +861,21 @@ describe('mediakeysBidAdapter', function () {
         expect(response[0].native.impressionTrackers).to.exist;
         expect(response[0].native.impressionTrackers.length).to.equal(0);
       })
+
+      it('Should handle multiple javascriptTrackers in one single string', () => {
+        const rawServerResponseNativeCopy = utils.deepClone(rawServerResponseNative);
+        const nativeObjectCopy = utils.deepClone(nativeObject);
+        nativeObjectCopy.eventtrackers.push(
+          {
+            event: 1,
+            method: 2,
+            url: 'https://eventrack-js.me/impression-2'
+          },)
+        rawServerResponseNativeCopy.body.seatbid[0].bid[0].adm = JSON.stringify(nativeObjectCopy);
+        const response = spec.interpretResponse(rawServerResponseNativeCopy, request);
+        const expected = '<script async src=\"https://eventrack-js.me/impression-1\"></script>\n<script async src=\"https://eventrack-js.me/impression-2\"></script>';
+        expect(response[0].native.javascriptTrackers).to.equal(expected);
+      });
     });
   });
 

From e3689efe9a5655bddd832460eddc70e958310ca7 Mon Sep 17 00:00:00 2001
From: Maxim Schuwalow <16665913+mschuwalow@users.noreply.github.com>
Date: Thu, 29 Sep 2022 23:00:44 +0200
Subject: [PATCH 296/569] LiveIntent UserId Module: Allow resolving uid2
 (#9053)

* [CM-587] Allow resolving uid2 and custom attributes

* change order of conditions

* update config format

* update parameter name

* use release version of live-connect
---
 modules/liveIntentIdSystem.js                 | 44 ++++++++++--
 package-lock.json                             | 16 ++---
 package.json                                  |  2 +-
 .../modules/liveIntentIdMinimalSystem_spec.js | 70 ++++++++++++++++---
 test/spec/modules/liveIntentIdSystem_spec.js  | 70 ++++++++++++++++---
 5 files changed, 172 insertions(+), 30 deletions(-)

diff --git a/modules/liveIntentIdSystem.js b/modules/liveIntentIdSystem.js
index 68cbb3b2412..724bf5ece6a 100644
--- a/modules/liveIntentIdSystem.js
+++ b/modules/liveIntentIdSystem.js
@@ -14,6 +14,7 @@ import { MinimalLiveConnect } from 'live-connect-js/esm/minimal-live-connect.js'
 
 const MODULE_NAME = 'liveIntentId';
 export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME});
+const defaultRequestedAttributes = {'nonId': true}
 const calls = {
   ajaxGet: (url, onSuccess, onError, timeout) => {
     ajaxBuilder(timeout)(
@@ -57,6 +58,23 @@ function parseLiveIntentCollectorConfig(collectConfig) {
   return config;
 }
 
+/**
+ * Create requestedAttributes array to pass to liveconnect
+ * @function
+ * @param {Object} overrides - object with boolean values that will override defaults { 'foo': true, 'bar': false }
+ * @returns {Array}
+ */
+function parseRequestedAttributes(overrides) {
+  function createParameterArray(config) {
+    return Object.entries(config).flatMap(([k, v]) => (typeof v === 'boolean' && v) ? [k] : []);
+  }
+  if (typeof overrides === 'object') {
+    return createParameterArray({...defaultRequestedAttributes, ...overrides})
+  } else {
+    return createParameterArray(defaultRequestedAttributes);
+  }
+}
+
 function initializeLiveConnect(configParams) {
   configParams = configParams || {};
   if (liveConnect) {
@@ -66,7 +84,8 @@ function initializeLiveConnect(configParams) {
   const publisherId = configParams.publisherId || 'any';
   const identityResolutionConfig = {
     source: 'prebid',
-    publisherId: publisherId
+    publisherId: publisherId,
+    requestedAttributes: parseRequestedAttributes(configParams.requestedAttributesOverrides)
   };
   if (configParams.url) {
     identityResolutionConfig.url = configParams.url
@@ -136,9 +155,24 @@ export const liveIntentIdSubmodule = {
   decode(value, config) {
     const configParams = (config && config.params) || {};
     function composeIdObject(value) {
-      const base = { 'lipbid': value.unifiedId };
-      delete value.unifiedId;
-      return { 'lipb': { ...base, ...value } };
+      const result = {};
+
+      // old versions stored lipbid in unifiedId. Ensure that we can still read the data.
+      const lipbid = value.nonId || value.unifiedId
+      if (lipbid) {
+        value.lipbid = lipbid
+        delete value.unifiedId
+        result.lipb = value
+      }
+
+      // Lift usage of uid2 by exposing uid2 if we were asked to resolve it.
+      // As adapters are applied in lexicographical order, we will always
+      // be overwritten by the 'proper' uid2 module if it is present.
+      if (value.uid2) {
+        result.uid2 = { 'id': value.uid2 }
+      }
+
+      return result
     }
 
     if (!liveConnect) {
@@ -146,7 +180,7 @@ export const liveIntentIdSubmodule = {
     }
     tryFireEvent();
 
-    return (value && typeof value['unifiedId'] === 'string') ? composeIdObject(value) : undefined;
+    return composeIdObject(value);
   },
 
   /**
diff --git a/package-lock.json b/package-lock.json
index 3ff09b29460..629cf03fcc7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "7.15.0-pre",
+      "version": "7.16.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
@@ -22,7 +22,7 @@
         "express": "^4.15.4",
         "fun-hooks": "^0.9.9",
         "just-clone": "^1.0.2",
-        "live-connect-js": "2.3.3"
+        "live-connect-js": "2.4.0"
       },
       "devDependencies": {
         "@babel/eslint-parser": "^7.16.5",
@@ -14416,9 +14416,9 @@
       "dev": true
     },
     "node_modules/live-connect-js": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-2.3.3.tgz",
-      "integrity": "sha512-WfY6v1jVutW/OGPvm0OaWAHc0MvB5MDdSuniZ+n9cpCltArWHTJtAsjWe8T+ACmdLAlZS9z7hzL3ntLnq+J0yQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-2.4.0.tgz",
+      "integrity": "sha512-MSBLKfnXoxH+pqwji/Mf8yZu3VZMq4tnNfwMw7NTWN5a+TBM6f0RWgwui1YMA3nHmMhX/nzxxsso0SkyKcF0fA==",
       "dependencies": {
         "tiny-hashes": "1.0.1"
       },
@@ -33706,9 +33706,9 @@
       "dev": true
     },
     "live-connect-js": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-2.3.3.tgz",
-      "integrity": "sha512-WfY6v1jVutW/OGPvm0OaWAHc0MvB5MDdSuniZ+n9cpCltArWHTJtAsjWe8T+ACmdLAlZS9z7hzL3ntLnq+J0yQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-2.4.0.tgz",
+      "integrity": "sha512-MSBLKfnXoxH+pqwji/Mf8yZu3VZMq4tnNfwMw7NTWN5a+TBM6f0RWgwui1YMA3nHmMhX/nzxxsso0SkyKcF0fA==",
       "requires": {
         "tiny-hashes": "1.0.1"
       }
diff --git a/package.json b/package.json
index c15fc675fa7..eec3b6a9da9 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "express": "^4.15.4",
     "fun-hooks": "^0.9.9",
     "just-clone": "^1.0.2",
-    "live-connect-js": "2.3.3"
+    "live-connect-js": "2.4.0"
   },
   "optionalDependencies": {
     "fsevents": "^2.3.2"
diff --git a/test/spec/modules/liveIntentIdMinimalSystem_spec.js b/test/spec/modules/liveIntentIdMinimalSystem_spec.js
index b0f97ae0300..6a5afa58da2 100644
--- a/test/spec/modules/liveIntentIdMinimalSystem_spec.js
+++ b/test/spec/modules/liveIntentIdMinimalSystem_spec.js
@@ -47,7 +47,7 @@ describe('LiveIntentMinimalId', function() {
 
   it('should not return a decoded identifier when the unifiedId is not present in the value', function() {
     const result = liveIntentIdSubmodule.decode({ additionalData: 'data' });
-    expect(result).to.be.undefined;
+    expect(result).to.be.eql({});
   });
 
   it('should initialize LiveConnect and send no data', function() {
@@ -64,7 +64,7 @@ describe('LiveIntentMinimalId', function() {
     let submoduleCallback = liveIntentIdSubmodule.getId({ params: {...defaultConfigParams.params, ...{'url': 'https://dummy.liveintent.com/idex'}} }).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[0];
-    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/prebid/89899');
+    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/prebid/89899?resolve=nonId');
     request.respond(
       200,
       responseHeader,
@@ -85,7 +85,7 @@ describe('LiveIntentMinimalId', function() {
     } }).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[0];
-    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/rubicon/89899');
+    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/rubicon/89899?resolve=nonId');
     request.respond(
       200,
       responseHeader,
@@ -100,7 +100,7 @@ describe('LiveIntentMinimalId', function() {
     let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[0];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899');
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?resolve=nonId');
     request.respond(
       200,
       responseHeader,
@@ -115,7 +115,7 @@ describe('LiveIntentMinimalId', function() {
     let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[0];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899');
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?resolve=nonId');
     request.respond(
       503,
       responseHeader,
@@ -132,7 +132,7 @@ describe('LiveIntentMinimalId', function() {
     let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[0];
-    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}`);
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&resolve=nonId`);
     request.respond(
       200,
       responseHeader,
@@ -155,7 +155,7 @@ describe('LiveIntentMinimalId', function() {
     let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[0];
-    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&_thirdPC=third-pc`);
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&_thirdPC=third-pc&resolve=nonId`);
     request.respond(
       200,
       responseHeader,
@@ -177,7 +177,61 @@ describe('LiveIntentMinimalId', function() {
     let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[0];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?_thirdPC=%7B%22key%22%3A%22value%22%7D');
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?_thirdPC=%7B%22key%22%3A%22value%22%7D&resolve=nonId');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should decode a unifiedId to lipbId and remove it', function() {
+    const result = liveIntentIdSubmodule.decode({ unifiedId: 'data' });
+    expect(result).to.eql({'lipb': {'lipbid': 'data'}});
+  });
+
+  it('should decode a nonId to lipbId', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'data' });
+    expect(result).to.eql({'lipb': {'lipbid': 'data', 'nonId': 'data'}});
+  });
+
+  it('should resolve extra attributes', function() {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      ...{ requestedAttributesOverrides: { 'foo': true, 'bar': false } }
+    } }).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?resolve=nonId&resolve=foo`);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should decode a uid2 to a seperate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', uid2: 'bar' });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'uid2': 'bar'}, 'uid2': {'id': 'bar'}});
+  });
+
+  it('should decode values with uid2 but no nonId', function() {
+    const result = liveIntentIdSubmodule.decode({ uid2: 'bar' });
+    expect(result).to.eql({'uid2': {'id': 'bar'}});
+  });
+
+  it('should allow disabling nonId resolution', function() {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      ...{ requestedAttributesOverrides: { 'nonId': false, 'uid2': true } }
+    } }).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?resolve=uid2`);
     request.respond(
       200,
       responseHeader,
diff --git a/test/spec/modules/liveIntentIdSystem_spec.js b/test/spec/modules/liveIntentIdSystem_spec.js
index 1ea7b5be4ad..3c22cda1154 100644
--- a/test/spec/modules/liveIntentIdSystem_spec.js
+++ b/test/spec/modules/liveIntentIdSystem_spec.js
@@ -111,7 +111,7 @@ describe('LiveIntentId', function() {
 
   it('should not return a decoded identifier when the unifiedId is not present in the value', function() {
     const result = liveIntentIdSubmodule.decode({ additionalData: 'data' });
-    expect(result).to.be.undefined;
+    expect(result).to.be.eql({});
   });
 
   it('should fire an event when decode', function() {
@@ -133,7 +133,7 @@ describe('LiveIntentId', function() {
     let submoduleCallback = liveIntentIdSubmodule.getId({ params: {...defaultConfigParams.params, ...{'url': 'https://dummy.liveintent.com/idex'}} }).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[1];
-    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/prebid/89899');
+    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/prebid/89899?resolve=nonId');
     request.respond(
       204,
       responseHeader
@@ -153,7 +153,7 @@ describe('LiveIntentId', function() {
     } }).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[1];
-    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/rubicon/89899');
+    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/rubicon/89899?resolve=nonId');
     request.respond(
       200,
       responseHeader,
@@ -168,7 +168,7 @@ describe('LiveIntentId', function() {
     let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[1];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899');
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?resolve=nonId');
     request.respond(
       200,
       responseHeader,
@@ -183,7 +183,7 @@ describe('LiveIntentId', function() {
     let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[1];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899');
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?resolve=nonId');
     request.respond(
       503,
       responseHeader,
@@ -200,7 +200,7 @@ describe('LiveIntentId', function() {
     let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[1];
-    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}`);
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&resolve=nonId`);
     request.respond(
       200,
       responseHeader,
@@ -223,7 +223,7 @@ describe('LiveIntentId', function() {
     let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[1];
-    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&_thirdPC=third-pc`);
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&_thirdPC=third-pc&resolve=nonId`);
     request.respond(
       200,
       responseHeader,
@@ -245,7 +245,7 @@ describe('LiveIntentId', function() {
     let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
     submoduleCallback(callBackSpy);
     let request = server.requests[1];
-    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?_thirdPC=%7B%22key%22%3A%22value%22%7D');
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?_thirdPC=%7B%22key%22%3A%22value%22%7D&resolve=nonId');
     request.respond(
       200,
       responseHeader,
@@ -259,4 +259,58 @@ describe('LiveIntentId', function() {
     liveIntentIdSubmodule.getId(defaultConfigParams);
     expect(imgStub.getCall(0).args[0]).to.match(/.*ae=.+/);
   });
+
+  it('should decode a unifiedId to lipbId and remove it', function() {
+    const result = liveIntentIdSubmodule.decode({ unifiedId: 'data' });
+    expect(result).to.eql({'lipb': {'lipbid': 'data'}});
+  });
+
+  it('should decode a nonId to lipbId', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'data' });
+    expect(result).to.eql({'lipb': {'lipbid': 'data', 'nonId': 'data'}});
+  });
+
+  it('should resolve extra attributes', function() {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      ...{ requestedAttributesOverrides: { 'foo': true, 'bar': false } }
+    } }).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[1];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?resolve=nonId&resolve=foo`);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should decode a uid2 to a seperate object when present', function() {
+    const result = liveIntentIdSubmodule.decode({ nonId: 'foo', uid2: 'bar' });
+    expect(result).to.eql({'lipb': {'lipbid': 'foo', 'nonId': 'foo', 'uid2': 'bar'}, 'uid2': {'id': 'bar'}});
+  });
+
+  it('should decode values with uid2 but no nonId', function() {
+    const result = liveIntentIdSubmodule.decode({ uid2: 'bar' });
+    expect(result).to.eql({'uid2': {'id': 'bar'}});
+  });
+
+  it('should allow disabling nonId resolution', function() {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      ...{ requestedAttributesOverrides: { 'nonId': false, 'uid2': true } }
+    } }).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[1];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?resolve=uid2`);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
 });

From 525d824c256df42aa136b41535c1de378fd9e5a1 Mon Sep 17 00:00:00 2001
From: eugen-tikhonov <31205179+eugen-tikhonov@users.noreply.github.com>
Date: Fri, 30 Sep 2022 00:21:32 +0300
Subject: [PATCH 297/569] clean.io RTD Module: Added additional properties on
 Billable Event. (#9052)

Co-authored-by: yevhen.tykhonov <yevhen.tykhonov@gmail.com>
---
 modules/cleanioRtdProvider.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/cleanioRtdProvider.js b/modules/cleanioRtdProvider.js
index a6ac3fc1317..09c5f722d7f 100644
--- a/modules/cleanioRtdProvider.js
+++ b/modules/cleanioRtdProvider.js
@@ -161,10 +161,9 @@ let startBillableEvents = function() {
       vendor: 'clean.io',
       billingId: generateUUID(),
       type: 'impression',
-      // TODO: if absolutely crucial, winnerBidResponse may be used
-      // to track down auctionId and transactionId
-      // However, those seem to be of importance for Demand Managers,
-      // while these billable events are for publishers
+      auctionId: winnerBidResponse.auctionId,
+      transactionId: winnerBidResponse.transactionId,
+      bidId: winnerBidResponse.requestId,
     });
   });
 }

From 3174cd764de6780c200df5a49779f8ccd6dbb250 Mon Sep 17 00:00:00 2001
From: Bill Newman <huddled.masses1650@gmail.com>
Date: Fri, 30 Sep 2022 17:08:32 +0300
Subject: [PATCH 298/569] Colossus Bid Adapter: update buildRequests - add tid
 to request data (#9056)

* add video&native traffic colossus ssp

* Native obj validation

* Native obj validation #2

* Added size field in requests

* fixed test

* fix merge conflicts

* move to 3.0

* move to 3.0

* fix IE11 new URL issue

* fix IE11 new URL issue

* fix IE11 new URL issue

* https for 3.0

* add https test

* add ccp and schain features

* fix test

* sync with upstream, fix conflicts

* Update colossussspBidAdapter.js

remove commented code

* Update colossussspBidAdapter.js

lint fix

* identity extensions

* identity extensions

* fix

* fix

* fix

* fix

* fix

* add tests for user ids

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* add gdpr support

* add gdpr support

* id5id support

* Update colossussspBidAdapter.js

add bidfloor parameter

* Update colossussspBidAdapter.js

check bidfloor

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter_spec.js

* use floor module

* Revert "use floor module"

This reverts commit f0c5c248627567e669d8eed4f2bb9a26a857e2ad.

* use floor module

* update to 5v

* fix

* add uid2 and bidFloor support

* fix

* add pbadslot support

* fix conflicts

* add onBidWon

* refactor

* add test for onBidWon()

* fix

* add group_id

* Trigger circleci

* fix

* update user sync

* fix window.location

* fix test

* updates

* fix conflict

* fix

* updates

* remove traffic param

* add transactionId to request data for colossusssp adapter

* Send tid in placements array

Co-authored-by: Vladislav Isaiko <vladis@smartyads.com>
Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>
Co-authored-by: Mykhailo Yaremchuk <m.yaremchuk@smartyads.com>
---
 modules/colossussspBidAdapter.js                | 3 ++-
 test/spec/modules/colossussspBidAdapter_spec.js | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/colossussspBidAdapter.js b/modules/colossussspBidAdapter.js
index 9a0ff3a5422..c1560680a6e 100644
--- a/modules/colossussspBidAdapter.js
+++ b/modules/colossussspBidAdapter.js
@@ -97,7 +97,7 @@ export const spec = {
       secure: location.protocol === 'https:' ? 1 : 0,
       host: location.host,
       page: location.pathname,
-      placements: placements,
+      placements: placements
     };
 
     if (bidderRequest) {
@@ -117,6 +117,7 @@ export const spec = {
         placementId: bid.params.placement_id,
         groupId: bid.params.group_id,
         bidId: bid.bidId,
+        tid: bid.transactionId,
         eids: [],
         floor: {}
       };
diff --git a/test/spec/modules/colossussspBidAdapter_spec.js b/test/spec/modules/colossussspBidAdapter_spec.js
index f32a0bf4ebe..8b06868390a 100644
--- a/test/spec/modules/colossussspBidAdapter_spec.js
+++ b/test/spec/modules/colossussspBidAdapter_spec.js
@@ -101,7 +101,7 @@ describe('ColossussspAdapter', function () {
       let placements = data['placements'];
       for (let i = 0; i < placements.length; i++) {
         let placement = placements[i];
-        expect(placement).to.have.all.keys('placementId', 'groupId', 'eids', 'bidId', 'traffic', 'sizes', 'schain', 'floor', 'gpid');
+        expect(placement).to.have.all.keys('placementId', 'groupId', 'eids', 'bidId', 'traffic', 'sizes', 'schain', 'floor', 'gpid', 'tid');
         expect(placement.schain).to.be.an('object')
         expect(placement.placementId).to.be.a('number');
         expect(placement.groupId).to.be.a('number');
@@ -110,6 +110,7 @@ describe('ColossussspAdapter', function () {
         expect(placement.sizes).to.be.an('array');
         expect(placement.floor).to.be.an('object');
         expect(placement.gpid).to.be.an('string');
+        expect(placement.tid).to.be.an('string');
       }
     });
 
@@ -143,7 +144,7 @@ describe('ColossussspAdapter', function () {
         let placement = placements[i];
         expect(placement).to.have.all.keys('placementId', 'groupId', 'eids', 'bidId', 'traffic', 'schain', 'floor', 'gpid', 'sizes',
           'playerSize', 'minduration', 'maxduration', 'mimes', 'protocols', 'startdelay', 'placement', 'skip', 'skipafter',
-          'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity'
+          'minbitrate', 'maxbitrate', 'delivery', 'playbackmethod', 'api', 'linearity', 'tid'
         );
         expect(placement.schain).to.be.an('object')
         expect(placement.placementId).to.be.a('number');
@@ -155,6 +156,7 @@ describe('ColossussspAdapter', function () {
         expect(placement.playerSize).to.be.an('array');
         expect(placement.minduration).to.be.an('number');
         expect(placement.maxduration).to.be.an('number');
+        expect(placement.tid).to.be.an('string');
       }
     });
 

From 1a865cc2654c050bc5139dbdad808b3ac8e3cf78 Mon Sep 17 00:00:00 2001
From: Saveliev Taras <t.savelev@gmail.com>
Date: Fri, 30 Sep 2022 17:10:14 +0300
Subject: [PATCH 299/569] Yandex Bid Adapter: added bidfloors support (#9057)

* changed bidder URL to bs.yandex.ru
* added additional inforamtion about referer
* added nurl support

Co-authored-by: Taras Saveliev <t-saveliev@yandex-team.ru>
---
 modules/yandexBidAdapter.js                | 39 +++++++++++++++++-----
 test/spec/modules/yandexBidAdapter_spec.js | 13 +++++---
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/modules/yandexBidAdapter.js b/modules/yandexBidAdapter.js
index 7da2872a3a6..af465453c22 100644
--- a/modules/yandexBidAdapter.js
+++ b/modules/yandexBidAdapter.js
@@ -1,9 +1,10 @@
-import {formatQS, deepAccess} from '../src/utils.js';
+import { formatQS, deepAccess, triggerPixel } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'yandex';
-const BIDDER_URL = 'https://bs-metadsp.yandex.ru/metadsp';
+const BIDDER_URL = 'https://bs.yandex.ru/metadsp';
 const DEFAULT_TTL = 180;
+const DEFAULT_CURRENCY = 'EUR';
 const SSP_ID = 10500;
 
 export const spec = {
@@ -19,9 +20,13 @@ export const spec = {
     const consentString = deepAccess(bidderRequest, 'gdprConsent.consentString');
 
     let referrer = '';
+    let domain = '';
+    let page = '';
+
     if (bidderRequest && bidderRequest.refererInfo) {
-      // TODO: is 'domain' the right value here?
-      referrer = bidderRequest.refererInfo.domain
+      referrer = bidderRequest.refererInfo.ref;
+      domain = bidderRequest.refererInfo.domain;
+      page = bidderRequest.refererInfo.page;
     }
 
     return validBidRequests.map((bidRequest) => {
@@ -30,17 +35,25 @@ export const spec = {
 
       const queryParams = {
         'imp-id': impId,
-        'target-ref': targetRef || referrer,
+        'target-ref': targetRef || domain,
         'ssp-id': SSP_ID,
       };
       if (gdprApplies !== undefined) {
         queryParams['gdpr'] = 1;
         queryParams['tcf-consent'] = consentString;
       }
+
+      const floorInfo = bidRequest.getFloor ? bidRequest.getFloor({
+        currency: DEFAULT_CURRENCY
+      }) : {};
+      const bidfloor = floorInfo.floor;
+      const bidfloorcur = floorInfo.currency;
+
       const imp = {
         id: impId,
+        bidfloor,
+        bidfloorcur,
       };
-
       const bannerParams = deepAccess(bidRequest, 'mediaTypes.banner');
       if (bannerParams) {
         const [ w, h ] = bannerParams.sizes[0];
@@ -58,7 +71,8 @@ export const spec = {
           id: bidRequest.bidId,
           imp: [imp],
           site: {
-            page: referrer,
+            ref_url: referrer,
+            page_url: page,
           },
         },
         options: {
@@ -84,7 +98,7 @@ export const spec = {
       let prBid = {
         requestId: bidRequest.bidId,
         cpm: rtbBid.price,
-        currency: cur || 'USD',
+        currency: cur || DEFAULT_CURRENCY,
         width: rtbBid.w,
         height: rtbBid.h,
         creativeId: rtbBid.adid,
@@ -102,6 +116,15 @@ export const spec = {
       return prBid;
     });
   },
+
+  onBidWon: function (bid) {
+    const nurl = bid['nurl'];
+
+    if (!nurl) {
+      return;
+    }
+    triggerPixel(nurl);
+  }
 }
 
 registerBidder(spec);
diff --git a/test/spec/modules/yandexBidAdapter_spec.js b/test/spec/modules/yandexBidAdapter_spec.js
index f4b15d6dbc4..eee53771a80 100644
--- a/test/spec/modules/yandexBidAdapter_spec.js
+++ b/test/spec/modules/yandexBidAdapter_spec.js
@@ -64,7 +64,9 @@ describe('Yandex adapter', function () {
 
     const bidderRequest = {
       refererInfo: {
-        domain: 'yandex.ru'
+        domain: 'ya.ru',
+        ref: 'https://ya.ru/',
+        page: 'https://ya.ru/',
       },
       gdprConsent
     };
@@ -72,7 +74,7 @@ describe('Yandex adapter', function () {
     it('creates a valid banner request', function () {
       const bannerRequest = getBidRequest();
       bannerRequest.getFloor = () => ({
-        currency: 'USD',
+        currency: 'EUR',
         // floor: 0.5
       });
 
@@ -89,11 +91,11 @@ describe('Yandex adapter', function () {
       const parsedRequestUrl = parseUrl(url);
       const { search: query } = parsedRequestUrl
 
-      expect(parsedRequestUrl.hostname).to.equal('bs-metadsp.yandex.ru');
+      expect(parsedRequestUrl.hostname).to.equal('bs.yandex.ru');
       expect(parsedRequestUrl.pathname).to.equal('/metadsp/123');
 
       expect(query['imp-id']).to.equal('1');
-      expect(query['target-ref']).to.equal('yandex.ru');
+      expect(query['target-ref']).to.equal('ya.ru');
       expect(query['ssp-id']).to.equal('10500');
 
       expect(query['gdpr']).to.equal('1');
@@ -101,7 +103,8 @@ describe('Yandex adapter', function () {
 
       expect(request.data).to.exist;
       expect(data.site).to.not.equal(null);
-      expect(data.site.page).to.equal('yandex.ru');
+      expect(data.site.page_url).to.equal('https://ya.ru/');
+      expect(data.site.ref_url).to.equal('https://ya.ru/');
 
       // expect(data.device).to.not.equal(null);
       // expect(data.device.w).to.equal(window.innerWidth);

From beab6654e189fff34bff43d0c35b46bdbfb657d2 Mon Sep 17 00:00:00 2001
From: Yuki Tsujii <yuki.tsujii.37@gmail.com>
Date: Sat, 1 Oct 2022 02:59:57 +0900
Subject: [PATCH 300/569] dgkeywordRtdProvider submodule: support 1plusX SDK
 (#8984)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 1plusX SDKによる収集に対応するように修正

* localStrageを読み込むかどうかはparams設定で変更できるように修正

Co-authored-by: mediaconsortium-develop <mediaconsortium-develop@bi.garage.co.jp>
---
 modules/dgkeywordRtdProvider.js               | 24 +++++-
 .../spec/modules/dgkeywordRtdProvider_spec.js | 84 ++++++++++++++++++-
 2 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/modules/dgkeywordRtdProvider.js b/modules/dgkeywordRtdProvider.js
index e2a29375f25..032cb4a780a 100644
--- a/modules/dgkeywordRtdProvider.js
+++ b/modules/dgkeywordRtdProvider.js
@@ -20,10 +20,8 @@ import { getGlobal } from '../src/prebidGlobal.js';
  * @param {Object} userConsent
  */
 export function getDgKeywordsAndSet(reqBidsConfigObj, callback, moduleConfig, userConsent) {
-  const URL = 'https://mediaconsortium.profiles.tagger.opecloud.com/api/v1?url=';
   const PROFILE_TIMEOUT_MS = 1000;
   const timeout = (moduleConfig && moduleConfig.params && moduleConfig.params.timeout && Number(moduleConfig.params.timeout) > 0) ? Number(moduleConfig.params.timeout) : PROFILE_TIMEOUT_MS;
-  const url = (moduleConfig && moduleConfig.params && moduleConfig.params.url) ? moduleConfig.params.url : URL + encodeURIComponent(window.location.href);
   const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
   callback = (function(cb) {
     let done = false;
@@ -43,7 +41,7 @@ export function getDgKeywordsAndSet(reqBidsConfigObj, callback, moduleConfig, us
   } else {
     logMessage('[dgkeyword sub module] dgkeyword targets:', setKeywordTargetBidders);
     logMessage('[dgkeyword sub module] get targets from profile api start.');
-    ajax(url, {
+    ajax(getProfileApiUrl(moduleConfig?.params?.url, moduleConfig?.params?.disableReadFpid), {
       success: function(response) {
         const res = JSON.parse(response);
         if (!isFinish) {
@@ -98,6 +96,26 @@ export function getDgKeywordsAndSet(reqBidsConfigObj, callback, moduleConfig, us
   }
 }
 
+export function getProfileApiUrl(customeUrl, disableReadFpid) {
+  const URL = 'https://mediaconsortium.profiles.tagger.opecloud.com/api/v1';
+  const fpid = (disableReadFpid) ? '' : readFpidFromLocalStrage();
+  let url = customeUrl || URL;
+  url = url + '?url=' + encodeURIComponent(window.location.href) + ((fpid) ? `&fpid=${fpid}` : '');
+  return url;
+}
+
+export function readFpidFromLocalStrage() {
+  try {
+    const fpid = window.localStorage.getItem('ope_fpid');
+    if (fpid) {
+      return fpid;
+    }
+    return null;
+  } catch (error) {
+    return null;
+  }
+}
+
 /**
  * get all bidder which hava {dgkeyword: true} in params
  * @param {Object} adUnits
diff --git a/test/spec/modules/dgkeywordRtdProvider_spec.js b/test/spec/modules/dgkeywordRtdProvider_spec.js
index 5ecec48f6b4..16f2906b681 100644
--- a/test/spec/modules/dgkeywordRtdProvider_spec.js
+++ b/test/spec/modules/dgkeywordRtdProvider_spec.js
@@ -302,7 +302,7 @@ describe('Digital Garage Keyword Module', function () {
             JSON.stringify(DUMMY_RESPONSE)
           );
         }
-      }, 1000);
+      }, 50);
     });
     it('should get profiles ok(200).', function (done) {
       let pbjs = cloneDeep(config);
@@ -347,5 +347,87 @@ describe('Digital Garage Keyword Module', function () {
         JSON.stringify(DUMMY_RESPONSE)
       );
     });
+    it('change url.', function (done) {
+      const dummyUrl = 'https://www.test.com/test'
+      let pbjs = cloneDeep(config);
+      pbjs.adUnits = cloneDeep(AD_UNITS);
+      if (IGNORE_SET_ORTB2) {
+        pbjs._ignoreSetOrtb2 = true;
+      }
+      let moduleConfig = cloneDeep(DEF_CONFIG);
+      moduleConfig.params.url = dummyUrl;
+      dgRtd.getDgKeywordsAndSet(
+        pbjs,
+        () => {
+          const url = dgRtd.getProfileApiUrl(dummyUrl);
+          expect(url.indexOf('?fpid=') === -1).to.equal(true);
+          expect(url).to.equal(server.requests[0].url);
+          done();
+        },
+        moduleConfig,
+        null
+      );
+      const request = server.requests[0];
+      request.respond(
+        200,
+        DUMMY_RESPONSE_HEADER,
+        JSON.stringify(DUMMY_RESPONSE)
+      );
+    });
+    it('add fpid stored in local strage.', function (done) {
+      const uuid = 'uuid_abcdefghijklmnopqrstuvwxyz';
+      let pbjs = cloneDeep(config);
+      pbjs.adUnits = cloneDeep(AD_UNITS);
+      if (IGNORE_SET_ORTB2) {
+        pbjs._ignoreSetOrtb2 = true;
+      }
+      let moduleConfig = cloneDeep(DEF_CONFIG);
+      window.localStorage.setItem('ope_fpid', uuid);
+      dgRtd.getDgKeywordsAndSet(
+        pbjs,
+        () => {
+          const url = dgRtd.getProfileApiUrl(null);
+          expect(url.indexOf(uuid) > 0).to.equal(true);
+          expect(url).to.equal(server.requests[0].url);
+          done();
+        },
+        moduleConfig,
+        null
+      );
+      const request = server.requests[0];
+      request.respond(
+        200,
+        DUMMY_RESPONSE_HEADER,
+        JSON.stringify(DUMMY_RESPONSE)
+      );
+    });
+    it('disable fpid stored in local strage.', function (done) {
+      const uuid = 'uuid_abcdefghijklmnopqrstuvwxyz';
+      let pbjs = cloneDeep(config);
+      pbjs.adUnits = cloneDeep(AD_UNITS);
+      if (IGNORE_SET_ORTB2) {
+        pbjs._ignoreSetOrtb2 = true;
+      }
+      let moduleConfig = cloneDeep(DEF_CONFIG);
+      window.localStorage.setItem('ope_fpid', uuid);
+      moduleConfig.params.disableReadFpid = true;
+      dgRtd.getDgKeywordsAndSet(
+        pbjs,
+        () => {
+          const url = dgRtd.getProfileApiUrl(null, moduleConfig.params.disableReadFpid);
+          expect(url.indexOf(uuid) > 0).to.equal(false);
+          expect(url).to.equal(server.requests[0].url);
+          done();
+        },
+        moduleConfig,
+        null
+      );
+      const request = server.requests[0];
+      request.respond(
+        200,
+        DUMMY_RESPONSE_HEADER,
+        JSON.stringify(DUMMY_RESPONSE)
+      );
+    });
   });
 });

From ba2c5362b7b387694ec89bf8265f3c9c66c60c79 Mon Sep 17 00:00:00 2001
From: jennylt <48404417+jennylt@users.noreply.github.com>
Date: Sun, 2 Oct 2022 19:49:31 +0300
Subject: [PATCH 301/569] Taboola bid adapter: Set netRevenue to true (#9064)

* create taboola adapter

* create taboola adapter md

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* update the md

* update the Maintainer email

* * update MD page
* refactor code for better readability
* small fix in UT

* * add privacy to the request builder
* add relevant Ut
* small fixes in UT

* * code refactoring + add more accurate way to get page url and referer
* add relevant Ut
* small fixes in md

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * update end point url
* update UT
* Update banner End point structure

* small fixes + update epi url

* remove the destruction from the bidResponse property

* (update the unit tests) remove the destruction from the bidResponse property

* fix tests

* fix tests - run stubs on each test

* rerun because of another adapter flaky test

* rerun because of another adapter flaky test

* fix cors issue, switch between height, width position

* update badv, bcat to be based in the ortb2 to support prebid 7 new protocols + update Ut

* retry run circleci

* retry run circleci

* pull from upstream
update md (placement + pub )

* update badv, bcat UT

* rerun build

* rerun build

* support storageAllowed restriction on unit tests for prebid 7

* create taboola adapter

* create taboola adapter md

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* update the md

* update the Maintainer email

* * update MD page
* refactor code for better readability
* small fix in UT

* * add privacy to the request builder
* add relevant Ut
* small fixes in UT

* * code refactoring + add more accurate way to get page url and referer
* add relevant Ut
* small fixes in md

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * update end point url
* update UT
* Update banner End point structure

* small fixes + update epi url

* remove the destruction from the bidResponse property

* (update the unit tests) remove the destruction from the bidResponse property

* fix tests

* fix tests - run stubs on each test

* rerun because of another adapter flaky test

* rerun because of another adapter flaky test

* fix cors issue, switch between height, width position

* update badv, bcat to be based in the ortb2 to support prebid 7 new protocols + update Ut

* retry run circleci

* retry run circleci

* pull from upstream
update md (placement + pub )

* update badv, bcat UT

* rerun build

* rerun build

* support storageAllowed restriction on unit tests for prebid 7

* support storageAllowed restriction on unit tests for prebid 7

* add it also to the aftereach

* add it also to the aftereach

* change the api endpoint https protocol

* update Taboola prebid documentation:
tagId, publisherId, bidFloor.

* update bid response ttl to 60 seconds.

* update Taboola prebid documentation.

* update-ttl-passing

* Update taboolaBidAdapter_spec.js

* add fallback default value in case of null

* add semicolons

* .

* .

* .

* ..

* ...

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* optional-chaining

* set netRevenue to true.

Co-authored-by: Michael <michael.ziso@taboola.com>
Co-authored-by: mikiz <31058500+mikizi@users.noreply.github.com>
Co-authored-by: Ahmad Lobany <ahmad.l@taboola.com>
Co-authored-by: ahmadlob <109217988+ahmadlob@users.noreply.github.com>
---
 modules/taboolaBidAdapter.js                | 2 +-
 test/spec/modules/taboolaBidAdapter_spec.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/taboolaBidAdapter.js b/modules/taboolaBidAdapter.js
index 39527dc33ab..13f04848dd6 100644
--- a/modules/taboolaBidAdapter.js
+++ b/modules/taboolaBidAdapter.js
@@ -237,7 +237,7 @@ function getBid(requestId, currency, bidResponse) {
     width,
     height,
     meta,
-    netRevenue: false
+    netRevenue: true
   };
 }
 
diff --git a/test/spec/modules/taboolaBidAdapter_spec.js b/test/spec/modules/taboolaBidAdapter_spec.js
index 5899b03a26d..b41a17a8e0a 100644
--- a/test/spec/modules/taboolaBidAdapter_spec.js
+++ b/test/spec/modules/taboolaBidAdapter_spec.js
@@ -449,7 +449,7 @@ describe('Taboola Adapter', function () {
           cpm: bid.price,
           creativeId: bid.crid,
           ttl: 60,
-          netRevenue: false,
+          netRevenue: true,
           currency: serverResponse.body.cur,
           mediaType: 'banner',
           ad: bid.adm,
@@ -475,7 +475,7 @@ describe('Taboola Adapter', function () {
           cpm: bid.price,
           creativeId: bid.crid,
           ttl: 125,
-          netRevenue: false,
+          netRevenue: true,
           currency: serverResponse.body.cur,
           mediaType: 'banner',
           ad: bid.adm,

From e5fc600f2c6374ffa2858b7793fd1170a9bde920 Mon Sep 17 00:00:00 2001
From: adquery <89853721+adquery@users.noreply.github.com>
Date: Mon, 3 Oct 2022 14:03:07 +0200
Subject: [PATCH 302/569] update user ID module (#9062)

Co-authored-by: marcin <marcin.czerwiak@gmail.com>
---
 modules/adqueryIdSystem.js                | 16 ++++++++--------
 test/spec/modules/adqueryIdSystem_spec.js |  2 --
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/adqueryIdSystem.js b/modules/adqueryIdSystem.js
index 85421bf588d..d9552a470d0 100644
--- a/modules/adqueryIdSystem.js
+++ b/modules/adqueryIdSystem.js
@@ -8,7 +8,7 @@
 import {ajax} from '../src/ajax.js';
 import {getStorageManager} from '../src/storageManager.js';
 import {submodule} from '../src/hook.js';
-import * as utils from '../src/utils.js';
+import { isFn, isStr, isPlainObject, logError } from '../src/utils.js';
 
 const MODULE_NAME = 'qid';
 const AU_GVLID = 902;
@@ -21,9 +21,9 @@ export const storage = getStorageManager({gvlid: AU_GVLID, moduleName: 'qid'});
  * @param {String} defaultVal
  */
 function paramOrDefault(param, defaultVal, arg) {
-  if (utils.isFn(param)) {
+  if (isFn(param)) {
     return param(arg);
-  } else if (utils.isStr(param)) {
+  } else if (isStr(param)) {
     return param;
   }
   return defaultVal;
@@ -51,7 +51,7 @@ export const adqueryIdSubmodule = {
    */
   decode(value) {
     let qid = storage.getDataFromLocalStorage('qid');
-    if (utils.isStr(qid)) {
+    if (isStr(qid)) {
       return {qid: qid};
     }
     return (value && typeof value['qid'] === 'string') ? { 'qid': value['qid'] } : undefined;
@@ -63,7 +63,7 @@ export const adqueryIdSubmodule = {
    * @returns {IdResponse|undefined}
    */
   getId(config) {
-    if (!utils.isPlainObject(config.params)) {
+    if (!isPlainObject(config.params)) {
       config.params = {};
     }
     const url = paramOrDefault(config.params.url,
@@ -72,7 +72,7 @@ export const adqueryIdSubmodule = {
 
     const resp = function (callback) {
       let qid = storage.getDataFromLocalStorage('qid');
-      if (utils.isStr(qid)) {
+      if (isStr(qid)) {
         const responseObj = {qid: qid};
         callback(responseObj);
       } else {
@@ -83,13 +83,13 @@ export const adqueryIdSubmodule = {
               try {
                 responseObj = JSON.parse(response);
               } catch (error) {
-                utils.logError(error);
+                logError(error);
               }
             }
             callback(responseObj);
           },
           error: error => {
-            utils.logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
+            logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
             callback();
           }
         };
diff --git a/test/spec/modules/adqueryIdSystem_spec.js b/test/spec/modules/adqueryIdSystem_spec.js
index ab98b253b33..a6b4e9d1529 100644
--- a/test/spec/modules/adqueryIdSystem_spec.js
+++ b/test/spec/modules/adqueryIdSystem_spec.js
@@ -1,7 +1,5 @@
 import { adqueryIdSubmodule, storage } from 'modules/adqueryIdSystem.js';
 import { server } from 'test/mocks/xhr.js';
-import {amxIdSubmodule} from '../../../modules/amxIdSystem';
-import * as utils from '../../../src/utils';
 
 const config = {
   storage: {

From 20d3c851883939b9241f941e0b82d9e861164ba4 Mon Sep 17 00:00:00 2001
From: guiann <guillaume.andouard@adyoulike.com>
Date: Mon, 3 Oct 2022 16:55:14 +0200
Subject: [PATCH 303/569] Prebid Core: Improve Native ad robustness to null
 values (#9010)

* add required clickurl in every native adrequest

* allows the native response to be given as is to prebid if possible

* add unit tests on new Native case

* Handle meta object in bid response with default addomains array

* fix icon retrieval in Native case

* Update priorities in case of multiple mediatypes given

* improve robustness and fix associated unit test on picture urls

* add support for params.size parameter

* add unit test on new size format

* Makes sure the playerSize format is consistent

* enable Vast response on bidder adapter

* fix lint errors

* add test on Vast format case

* add userId to bidrequest

* revert package-lock.json changes

* improve multiple mediatype handling

* Expose adyoulike GVL id

* fix icurl issue when retreiving icon for Native mediatype

* update unit tests on icon url in native mediatype

* target video endpoint when video mediatype is present

* add unit test on video endpoint

* detect if bid request has video

* remove console log

* Add size information in Video bid + unit tests

* Remove unused method (old video retrieval)

* update pagereferrer and pageUrl values

* improve null robustness in native getAssetValue

* change function body and add unit test

Co-authored-by: GuillaumeA <guillaume.andouard@openweb.com>
---
 src/native.js            | 6 +-----
 test/spec/native_spec.js | 5 +++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/native.js b/src/native.js
index de77b10f7e6..022ece457f5 100644
--- a/src/native.js
+++ b/src/native.js
@@ -449,11 +449,7 @@ export function getAllAssetsMessage(data, adObject, {getNativeReq = getNativeReq
  * appropriate for sending in adserver targeting or placeholder replacement.
  */
 function getAssetValue(value) {
-  if (typeof value === 'object' && value.url) {
-    return value.url;
-  }
-
-  return value;
+  return value?.url || value;
 }
 
 function getNativeKeys(adUnit) {
diff --git a/test/spec/native_spec.js b/test/spec/native_spec.js
index 72eee1be85d..23350781a3d 100644
--- a/test/spec/native_spec.js
+++ b/test/spec/native_spec.js
@@ -190,6 +190,11 @@ describe('native.js', function () {
     expect(targeting.hb_native_foo).to.equal(bid.native.foo);
   });
 
+  it('can get targeting from null native keys', () => {
+    const targeting = getNativeTargeting({...bid, native: {...bid.native, displayUrl: null}});
+    expect(targeting.hb_native_displayurl).to.not.be.ok;
+  })
+
   it('sends placeholders for configured assets', function () {
     const adUnit = {
       transactionId: 'au',

From 73725f309308cab64ebe60c0cade92f8ca92146d Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 4 Oct 2022 07:12:12 -0700
Subject: [PATCH 304/569] Debugging module: do not force `ad` in mocked bid
 responses (#9059)

---
 modules/debugging/bidInterceptor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/debugging/bidInterceptor.js b/modules/debugging/bidInterceptor.js
index 5bfb8993cd1..775f8fc3da2 100644
--- a/modules/debugging/bidInterceptor.js
+++ b/modules/debugging/bidInterceptor.js
@@ -126,7 +126,7 @@ Object.assign(BidInterceptor.prototype, {
         Object.entries(ref).forEach(([key, val]) => {
           if (typeof val === 'function') {
             result[key] = val(...args);
-          } else if (typeof val === 'object') {
+          } else if (val != null && typeof val === 'object') {
             result[key] = replFn({args, ref: val})
           } else {
             result[key] = val;
@@ -138,7 +138,7 @@ Object.assign(BidInterceptor.prototype, {
     return (bid, ...args) => {
       const response = this.responseDefaults(bid);
       mergeDeep(response, replFn({args: [bid, ...args]}));
-      if (!response.ad) {
+      if (!response.hasOwnProperty('ad') && !response.hasOwnProperty('adUrl')) {
         response.ad = this.defaultAd(bid, response);
       }
       response.isDebug = true;

From 0c68e20af8d0b437ed420467ad656f57d5d2a8eb Mon Sep 17 00:00:00 2001
From: Nick Jacob <nickbjacob@gmail.com>
Date: Tue, 4 Oct 2022 12:02:16 -0400
Subject: [PATCH 305/569] empty string adUnitId parameter is treated as missing
 (#9071)

---
 modules/amxBidAdapter.js                | 2 +-
 test/spec/modules/amxBidAdapter_spec.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/amxBidAdapter.js b/modules/amxBidAdapter.js
index c5ce3745526..d1bd2edeee4 100644
--- a/modules/amxBidAdapter.js
+++ b/modules/amxBidAdapter.js
@@ -147,7 +147,7 @@ function convertRequest(bid) {
   const tid = deepAccess(bid, 'params.tagId');
 
   const au =
-    bid.params != null && typeof bid.params.adUnitId === 'string'
+    bid.params != null && typeof bid.params.adUnitId === 'string' && bid.params.adUnitId !== ''
       ? bid.params.adUnitId
       : bid.adUnitCode;
 
diff --git a/test/spec/modules/amxBidAdapter_spec.js b/test/spec/modules/amxBidAdapter_spec.js
index fe85e874c3b..d71e9ab5cba 100644
--- a/test/spec/modules/amxBidAdapter_spec.js
+++ b/test/spec/modules/amxBidAdapter_spec.js
@@ -359,6 +359,7 @@ describe('AmxBidAdapter', () => {
             bidId: sampleRequestId + '_2',
             params: {
               ...sampleBidRequestBase.params,
+              adUnitId: '',
               tagId: 'example',
             },
           },
@@ -404,12 +405,12 @@ describe('AmxBidAdapter', () => {
 
     it('can build a video request', () => {
       const { data } = spec.buildRequests(
-        [sampleBidRequestVideo],
+        [{...sampleBidRequestVideo, params: { ...sampleBidRequestVideo.params, adUnitId: 'custom-auid' }}],
         sampleBidderRequest
       );
       expect(Object.keys(data.m).length).to.equal(1);
       expect(data.m[sampleRequestId + '_video']).to.deep.equal({
-        au: 'div-gpt-ad-example',
+        au: 'custom-auid',
         ms: [[[300, 150]], [], [[360, 250]]],
         av: true,
         aw: 360,

From 0b05e58909a683695f68b40204b51bc20e9a07a6 Mon Sep 17 00:00:00 2001
From: shahinrahbariasl <56240400+shahinrahbariasl@users.noreply.github.com>
Date: Tue, 4 Oct 2022 15:49:36 -0400
Subject: [PATCH 306/569] feat: set request source tid to auctionId [PB-1296]
 (#9051)

Co-authored-by: shahin.rahbariasl <shahin.rahbariasl@indexexchange.com>
---
 modules/ixBidAdapter.js                | 12 +++++++-----
 test/spec/modules/ixBidAdapter_spec.js |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 5be14ca6a21..1d2dd5b9908 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -602,13 +602,15 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     r.ext.ixdiag.err = cachedErrors;
   }
 
+  // set source.tid to auctionId for outgoing request to Exchange.
+  r.source = {
+    tid: validBidRequests[0].auctionId,
+  }
+
   // if an schain is provided, send it along
   if (validBidRequests[0].schain) {
-    r.source = {
-      ext: {
-        schain: validBidRequests[0].schain
-      }
-    };
+    r.source.ext = {};
+    r.source.ext.schain = validBidRequests[0].schain;
   }
 
   if (userEids.length > 0) {
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index ad3ac279712..b9001a556b1 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -1739,6 +1739,7 @@ describe('IndexexchangeAdapter', function () {
       expect(payload.source.ext.schain).to.deep.equal(SAMPLE_SCHAIN);
       expect(payload.imp).to.be.an('array');
       expect(payload.imp).to.have.lengthOf(1);
+      expect(payload.source.tid).to.equal(DEFAULT_BANNER_VALID_BID[0].auctionId);
     });
 
     it('payload should have correct format and value for r.id when bidderRequestId is a number ', function () {
@@ -1767,7 +1768,7 @@ describe('IndexexchangeAdapter', function () {
 
     it('payload should not include schain when not provided', function () {
       const payload = JSON.parse(queryWithoutSchain.r);
-      expect(payload.source).to.not.exist; // source object currently only written for schain
+      expect(payload.source.schain).to.not.exist; // source object currently only written for schain
     });
 
     it('impression should have correct format and value', function () {

From 40b73d5dbed9db515ed83cc34f67b7364bdffe36 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 4 Oct 2022 13:47:02 -0700
Subject: [PATCH 307/569] Debugging module: graceful handling of missing
 sessionStorage (#9070)

---
 modules/debugging/debugging.js          | 12 ++++++++++--
 test/spec/modules/debugging_mod_spec.js |  9 +++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/modules/debugging/debugging.js b/modules/debugging/debugging.js
index bf16eaf85a6..8a4ad7a9545 100644
--- a/modules/debugging/debugging.js
+++ b/modules/debugging/debugging.js
@@ -49,9 +49,17 @@ function saveDebuggingConfig(debugConfig, {sessionStorage = window.sessionStorag
   }
 }
 
-export function getConfig(debugging, {sessionStorage = window.sessionStorage, DEBUG_KEY, config, hook, logger} = {}) {
+export function getConfig(debugging, {getStorage = () => window.sessionStorage, DEBUG_KEY, config, hook, logger} = {}) {
   if (debugging == null) return;
-  saveDebuggingConfig(debugging, {sessionStorage, DEBUG_KEY});
+  let sessionStorage;
+  try {
+    sessionStorage = getStorage();
+  } catch (e) {
+    logger.logError(`sessionStorage is not available: debugging configuration will not persist on page reload`, e);
+  }
+  if (sessionStorage != null) {
+    saveDebuggingConfig(debugging, {sessionStorage, DEBUG_KEY});
+  }
   if (!debugging.enabled) {
     disableDebugging({hook, logger});
   } else {
diff --git a/test/spec/modules/debugging_mod_spec.js b/test/spec/modules/debugging_mod_spec.js
index 360c670cf3b..8c7f0e84bce 100644
--- a/test/spec/modules/debugging_mod_spec.js
+++ b/test/spec/modules/debugging_mod_spec.js
@@ -273,6 +273,15 @@ describe('bid interceptor', () => {
   });
 });
 
+describe('Debugging config', () => {
+  it('should behave gracefully when sessionStorage throws', () => {
+    const logError = sinon.stub();
+    const getStorage = () => { throw new Error() };
+    getConfig({enabled: false}, {getStorage, logger: {logError}, hook});
+    expect(logError.called).to.be.true;
+  });
+});
+
 describe('bidderBidInterceptor', () => {
   let next, interceptBids, onCompletion, interceptResult, done, addBid;
 

From 9ea583a2c8bb4052fbeca84b38fa08ae5aea7a97 Mon Sep 17 00:00:00 2001
From: Love Sharma <sharmak.love@gmail.com>
Date: Wed, 5 Oct 2022 09:28:17 -0400
Subject: [PATCH 308/569] feat: added support for feature [PB-905] (#9032)

Co-authored-by: Love Sharma <love.sharma@indexexchange.com>
---
 modules/ixBidAdapter.js                | 105 ++++++++++--
 test/spec/modules/ixBidAdapter_spec.js | 220 ++++++++++++++++++++++++-
 2 files changed, 306 insertions(+), 19 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 1d2dd5b9908..6913c98013c 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -13,7 +13,8 @@ import {
   logError,
   logWarn,
   mergeDeep,
-  parseQueryStringParameters
+  parseQueryStringParameters,
+  safeJSONParse
 } from '../src/utils.js';
 import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
@@ -99,8 +100,46 @@ const VIDEO_PARAMS_ALLOW_LIST = [
   'playerSize', 'w', 'h'
 ];
 const LOCAL_STORAGE_KEY = 'ixdiag';
+export const LOCAL_STORAGE_FEATURE_TOGGLES_KEY = `${BIDDER_CODE}_features`;
 let hasRegisteredHandler = false;
 export const storage = getStorageManager({gvlid: GLOBAL_VENDOR_ID, bidderCode: BIDDER_CODE});
+export const FEATURE_TOGGLES = {
+  featureToggles: {},
+  isFeatureEnabled: function(ft) {
+    return deepAccess(this.featureToggles, `features.${ft}.activated`)
+  },
+  getFeatureToggles: function() {
+    if (storage.localStorageIsEnabled()) {
+      const parsedToggles = safeJSONParse(storage.getDataFromLocalStorage(LOCAL_STORAGE_FEATURE_TOGGLES_KEY));
+      if (deepAccess(parsedToggles, 'expiry') && parsedToggles.expiry >= new Date().getTime()) {
+        this.featureToggles = parsedToggles
+      } else {
+        this.clearFeatureToggles();
+      }
+    }
+  },
+  setFeatureToggles: function(serverResponse) {
+    const responseBody = serverResponse.body;
+    const expiryTime = new Date();
+    const toggles = deepAccess(responseBody, 'ext.features');
+
+    if (toggles) {
+      this.featureToggles = {
+        expiry: expiryTime.setHours(expiryTime.getHours() + 1),
+        features: toggles
+      }
+      if (storage.localStorageIsEnabled()) {
+        storage.setDataInLocalStorage(LOCAL_STORAGE_FEATURE_TOGGLES_KEY, JSON.stringify(this.featureToggles));
+      }
+    }
+  },
+  clearFeatureToggles: function() {
+    this.featureToggles = {};
+    if (storage.localStorageIsEnabled()) {
+      storage.removeDataFromLocalStorage(LOCAL_STORAGE_FEATURE_TOGGLES_KEY);
+    }
+  }
+};
 let siteID = 0;
 let gdprConsent = '';
 let usPrivacy = '';
@@ -578,6 +617,7 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
   r.ext = {};
   r.ext.source = 'prebid';
   r.ext.ixdiag = {};
+  r.ext.ixdiag.ls = storage.localStorageIsEnabled();
   r.imp = [];
   r.at = 1;
 
@@ -667,14 +707,17 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
   // Use the siteId in the first bid request as the main siteId.
   siteID = validBidRequests[0].params.siteId;
   payload.s = siteID;
-  if (version) {
-    payload.v = version;
-  }
-  payload.ac = 'j';
-  payload.sd = 1;
 
-  if (version === VIDEO_ENDPOINT_VERSION) {
-    payload.nf = 1;
+  if (!FEATURE_TOGGLES.isFeatureEnabled('pbjs_enable_post')) {
+    if (version) {
+      payload.v = version;
+    }
+    payload.ac = 'j';
+    payload.sd = 1;
+
+    if (version === VIDEO_ENDPOINT_VERSION) {
+      payload.nf = 1;
+    }
   }
 
   // Parse additional runtime configs.
@@ -720,9 +763,11 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
       }
     }
 
-    // Create t in payload if timeout is configured.
-    if (typeof otherIxConfig.timeout === 'number') {
-      payload.t = otherIxConfig.timeout;
+    if (!FEATURE_TOGGLES.isFeatureEnabled('pbjs_enable_post')) {
+      // Create t in payload if timeout is configured.
+      if (typeof otherIxConfig.timeout === 'number') {
+        payload.t = otherIxConfig.timeout;
+      }
     }
   }
 
@@ -868,12 +913,27 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
       requestSequenceNumber++;
       clonedPayload.r = JSON.stringify(r);
 
-      requests.push({
-        method: 'GET',
-        url: baseUrl,
-        data: clonedPayload,
-        validBidRequests
-      });
+      let requestData;
+
+      if (FEATURE_TOGGLES.isFeatureEnabled('pbjs_enable_post')) {
+        requestData = {
+          method: 'POST',
+          url: baseUrl + '?s=' + payload.s,
+          data: deepClone(r),
+          option: {
+            contentType: 'text/plain',
+          },
+          validBidRequests
+        }
+      } else {
+        requestData = {
+          method: 'GET',
+          url: baseUrl,
+          data: clonedPayload,
+          validBidRequests
+        }
+      }
+      requests.push(requestData);
 
       currentRequestSize = baseRequestSize;
       r.imp = [];
@@ -1383,6 +1443,7 @@ export const spec = {
     const videoImps = {}; // Stores created video impressions
     const nativeImps = {}; // Stores created native impressions
     const missingBannerSizes = {}; // To capture the missing sizes i.e not configured for ix
+    FEATURE_TOGGLES.getFeatureToggles();
 
     // Step 1: Create impresssions from IX params
     validBidRequests.forEach((validBidRequest) => {
@@ -1453,6 +1514,7 @@ export const spec = {
     let bid = null;
 
     if (!serverResponse.hasOwnProperty('body') || !serverResponse.body.hasOwnProperty('seatbid')) {
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
       return bids;
     }
 
@@ -1465,7 +1527,13 @@ export const spec = {
 
       // Transform rawBid in bid response to the format that will be accepted by prebid.
       const innerBids = seatbid[i].bid;
-      let requestBid = JSON.parse(bidderRequest.data.r);
+      let requestBid;
+
+      if (FEATURE_TOGGLES.isFeatureEnabled('pbjs_enable_post')) {
+        requestBid = bidderRequest.data;
+      } else {
+        requestBid = safeJSONParse(bidderRequest.data.r);
+      }
 
       for (let j = 0; j < innerBids.length; j++) {
         const bidRequest = getBidRequest(innerBids[j].impid, requestBid.imp, bidderRequest.validBidRequests);
@@ -1493,6 +1561,7 @@ export const spec = {
       }
     }
 
+    FEATURE_TOGGLES.setFeatureToggles(serverResponse);
     return bids;
   },
 
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index b9001a556b1..b110c9a4872 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -2,7 +2,7 @@ import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
 import { expect } from 'chai';
 import { newBidder } from 'src/adapters/bidderFactory.js';
-import { spec, storage, ERROR_CODES } from '../../../modules/ixBidAdapter.js';
+import { spec, storage, ERROR_CODES, FEATURE_TOGGLES, LOCAL_STORAGE_FEATURE_TOGGLES_KEY } from '../../../modules/ixBidAdapter.js';
 import { createEidsArray } from 'modules/userId/eids.js';
 import { deepAccess, deepClone } from '../../../src/utils.js';
 
@@ -3295,6 +3295,224 @@ describe('IndexexchangeAdapter', function () {
     });
   });
 
+  describe('Features', () => {
+    let localStorageValues = {};
+    let sandbox = sinon.sandbox.create();
+    let setDataInLocalStorageStub;
+    let getDataFromLocalStorageStub;
+    let removeDataFromLocalStorageStub;
+    const serverResponse = {
+      body: {
+        ext: {
+          features: {
+            test: {
+              activated: false
+            }
+          }
+        }
+      }
+    };
+
+    beforeEach(() => {
+      localStorageValues = {};
+      sandbox = sinon.sandbox.create();
+      setDataInLocalStorageStub = sandbox.stub(storage, 'setDataInLocalStorage').callsFake((key, value) => localStorageValues[key] = value);
+      getDataFromLocalStorageStub = sandbox.stub(storage, 'getDataFromLocalStorage').callsFake((key) => localStorageValues[key]);
+      removeDataFromLocalStorageStub = sandbox.stub(storage, 'removeDataFromLocalStorage').callsFake((key) => delete localStorageValues[key]);
+    });
+
+    afterEach(() => {
+      setDataInLocalStorageStub.restore();
+      getDataFromLocalStorageStub.restore();
+      removeDataFromLocalStorageStub.restore();
+      serverResponse.body.ext.features = {
+        test: {
+          activated: false
+        }
+      };
+      localStorageValues = {};
+      sandbox.restore();
+    });
+
+    it('should store features in internal cache', () => {
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+      expect(FEATURE_TOGGLES.isFeatureEnabled('test')).to.be.false;
+    });
+
+    it('should retrieve features from internal cache', () => {
+      const feature = {
+        ext: {
+          features: {
+            test: {
+              activated: true
+            }
+          }
+        }
+      }
+      FEATURE_TOGGLES.setFeatureToggles(feature);
+      feature.ext.features.test.activated = false;
+      FEATURE_TOGGLES.featureToggles = {
+        features: feature.ext.features
+      };
+      expect(FEATURE_TOGGLES.isFeatureEnabled('test')).to.be.false;
+    });
+
+    it('should store features in localstorage when enabled', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      serverResponse.body.ext.features.test.activated = true;
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+
+      const lsData = JSON.parse(storage.getDataFromLocalStorage(LOCAL_STORAGE_FEATURE_TOGGLES_KEY));
+      expect(lsData.features.test.activated).to.be.true;
+    });
+
+    it('should retrive features from localstorage when enabled', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      serverResponse.body.ext.features.test.activated = true;
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+      FEATURE_TOGGLES.featureToggles = {};
+      FEATURE_TOGGLES.getFeatureToggles(LOCAL_STORAGE_FEATURE_TOGGLES_KEY);
+      expect(FEATURE_TOGGLES.isFeatureEnabled('test')).to.be.true;
+    });
+
+    it('should remove features from after expiry', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      const expiryTime = new Date();
+      localStorageValues = {
+        expiry: expiryTime.setHours(expiryTime.getHours() - 2),
+        features: {
+          test: {
+            activated: true
+          }
+        }
+      }
+      FEATURE_TOGGLES.getFeatureToggles(LOCAL_STORAGE_FEATURE_TOGGLES_KEY);
+      expect(FEATURE_TOGGLES.isFeatureEnabled('test')).to.be.undefined;
+      expect(FEATURE_TOGGLES.featureToggles).to.deep.equal({});
+    });
+
+    it('should create POST request when pbjs_enable_post feature is active', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      serverResponse.body.ext.features.pbjs_enable_post = {
+        activated: true
+      };
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+      const builtRequests = {
+        banner: {
+          request: spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0],
+          siteId: DEFAULT_BANNER_VALID_BID[0].params.siteId
+        },
+        video: {
+          request: spec.buildRequests(DEFAULT_VIDEO_VALID_BID, DEFAULT_OPTION)[0],
+          siteId: DEFAULT_VIDEO_VALID_BID[0].params.siteId
+        },
+        native: {
+          request: spec.buildRequests(DEFAULT_NATIVE_VALID_BID, DEFAULT_OPTION)[0],
+          siteId: DEFAULT_NATIVE_VALID_BID[0].params.siteId
+        }
+      };
+
+      Object.keys(builtRequests).forEach((reqType) => {
+        const request = builtRequests[reqType].request;
+        const siteId = builtRequests[reqType].siteId;
+        expect(request.method).to.equal('POST');
+        expect(request.option.contentType).to.equal('text/plain');
+        expect(request.url).to.be.equal(`${IX_SECURE_ENDPOINT}?s=${siteId}`);
+        expect(request.data.r).to.be.undefined;
+        expect(request.data.ac).to.be.undefined;
+        expect(request.data.sd).to.be.undefined;
+        expect(request.data.v).to.be.undefined;
+        expect(request.data.nf).to.be.undefined;
+      });
+    });
+
+    it('should create GET request when pbjs_enable_post feature is disabled', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      serverResponse.body.ext.features.pbjs_enable_post = {
+        activated: false
+      };
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+      const builtRequests = {
+        banner: {
+          request: spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0],
+          siteId: DEFAULT_BANNER_VALID_BID[0].params.siteId
+        },
+        video: {
+          request: spec.buildRequests(DEFAULT_VIDEO_VALID_BID, DEFAULT_OPTION)[0],
+          siteId: DEFAULT_VIDEO_VALID_BID[0].params.siteId
+        },
+        native: {
+          request: spec.buildRequests(DEFAULT_NATIVE_VALID_BID, DEFAULT_OPTION)[0],
+          siteId: DEFAULT_NATIVE_VALID_BID[0].params.siteId
+        }
+      };
+
+      Object.keys(builtRequests).forEach((reqType) => {
+        const request = builtRequests[reqType].request;
+        const siteId = builtRequests[reqType].siteId;
+        expect(request.method).to.equal('GET');
+        expect(request.url).to.equal(IX_SECURE_ENDPOINT);
+        expect(request.data.r).to.exist;
+        expect(request.data.ac).to.equal('j');
+        expect(request.data.sd).to.equal(1);
+        expect(request.data.s).to.equal(siteId);
+        if (reqType == 'video') {
+          expect(request.data.nf).to.equal(1);
+        }
+
+        if (reqType === 'native') {
+          expect(request.data.v).to.be.undefined;
+        }
+      });
+    });
+
+    it('should interpertResponse correctly when pbjs_enable_post feature is active', function () {
+      serverResponse.body.ext.features.pbjs_enable_post = {
+        activated: true
+      };
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+      const postBiddderRequestData = {
+        id: '345',
+        imp: [
+          {
+            id: '1a2b3c4e',
+            banner: {
+              w: 300,
+              h: 250,
+              placement: 1
+            }
+          }
+        ],
+        site: {
+          ref: 'https://ref.com/ref.html',
+          page: 'https://page.com'
+        },
+      };
+      const expectedParse = [
+        {
+          requestId: '1a2b3c4d',
+          cpm: 1,
+          creativeId: '12345',
+          width: 300,
+          height: 250,
+          mediaType: 'banner',
+          ad: '<a target="_blank" href="https://www.indexexchange.com"></a>',
+          currency: 'USD',
+          ttl: 300,
+          netRevenue: true,
+          meta: {
+            networkId: 50,
+            brandId: 303325,
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com']
+          }
+        }
+      ];
+      const result = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, { data: postBiddderRequestData, validBidRequests: [] });
+      expect(result[0]).to.deep.equal(expectedParse[0]);
+    });
+  });
+
   describe('LocalStorage error codes', () => {
     let TODAY = new Date().toISOString().slice(0, 10);
     const key = 'ixdiag';

From f0a9d941714869ec8cdbe93ae820ca9c3dff26fd Mon Sep 17 00:00:00 2001
From: Yohan Boutin <yohan@seedtag.com>
Date: Wed, 5 Oct 2022 17:19:07 +0200
Subject: [PATCH 309/569] add a realistic schain object in the unit test
 (#9077)

---
 test/spec/modules/seedtagBidAdapter_spec.js | 33 ++++++++++-----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/test/spec/modules/seedtagBidAdapter_spec.js b/test/spec/modules/seedtagBidAdapter_spec.js
index 2f38519b441..05d609e8003 100644
--- a/test/spec/modules/seedtagBidAdapter_spec.js
+++ b/test/spec/modules/seedtagBidAdapter_spec.js
@@ -361,28 +361,25 @@ describe('Seedtag Adapter', function () {
       it('should add schain to payload when exposed on validBidRequest', function () {
         // https://github.com/prebid/Prebid.js/blob/master/modules/schain.md#sample-code-for-passing-the-schain-object
         const schain = {
-          validation: 'strict',
-          config: {
-            ver: '1.0',
-            complete: 1,
-            nodes: [
-              {
-                asi: 'indirectseller.com',
-                sid: '00001',
-                hp: 1,
-              },
+          ver: '1.0',
+          complete: 1,
+          nodes: [
+            {
+              asi: 'indirectseller.com',
+              sid: '00001',
+              hp: 1,
+            },
 
-              {
-                asi: 'indirectseller-2.com',
-                sid: '00002',
-                hp: 1,
-              },
-            ],
-          },
+            {
+              asi: 'indirectseller-2.com',
+              sid: '00002',
+              hp: 1,
+            },
+          ],
         };
 
         // duplicate
-        const bidRequests = JSON.parse(JSON.stringify(validBidRequests))
+        const bidRequests = JSON.parse(JSON.stringify(validBidRequests));
         bidRequests[0].schain = schain;
 
         const request = spec.buildRequests(bidRequests, bidderRequest);

From b04ba3b09b35c5edc4588b569de618d0899ae432 Mon Sep 17 00:00:00 2001
From: Samuel Adu <samuel.adu@gmail.com>
Date: Wed, 5 Oct 2022 16:30:23 +0100
Subject: [PATCH 310/569] Pass device width and height in openRTB payload to
 YSSP (#9078)

Co-authored-by: slimkrazy <sam@slimkrazy.com>
---
 modules/yahoosspBidAdapter.js                | 4 +++-
 test/spec/modules/yahoosspBidAdapter_spec.js | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/yahoosspBidAdapter.js b/modules/yahoosspBidAdapter.js
index 71b1ddca2c4..51d9bd30b84 100644
--- a/modules/yahoosspBidAdapter.js
+++ b/modules/yahoosspBidAdapter.js
@@ -237,7 +237,9 @@ function generateOpenRtbObject(bidderRequest, bid) {
       device: {
         dnt: 0,
         ua: navigator.userAgent,
-        ip: deepAccess(bid, 'params.bidOverride.device.ip') || deepAccess(bid, 'params.ext.ip') || undefined
+        ip: deepAccess(bid, 'params.bidOverride.device.ip') || deepAccess(bid, 'params.ext.ip') || undefined,
+        w: window.screen.width,
+        h: window.screen.height
       },
       regs: {
         ext: {
diff --git a/test/spec/modules/yahoosspBidAdapter_spec.js b/test/spec/modules/yahoosspBidAdapter_spec.js
index 6e52e9c57db..e0b6390832b 100644
--- a/test/spec/modules/yahoosspBidAdapter_spec.js
+++ b/test/spec/modules/yahoosspBidAdapter_spec.js
@@ -847,7 +847,9 @@ describe('YahooSSP Bid Adapter:', () => {
       expect(data.device).to.deep.equal({
         dnt: 0,
         ua: navigator.userAgent,
-        ip: undefined
+        ip: undefined,
+        w: window.screen.width,
+        h: window.screen.height
       });
 
       expect(data.regs).to.deep.equal({

From 5d09d25fc5a094a19d18f3b8ce14b8fdfc53fdfd Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Wed, 5 Oct 2022 10:00:23 -0700
Subject: [PATCH 311/569] Multiple bid adapters: use auctionId for `source.tid`
 (#9074)

---
 modules/adfBidAdapter.js                         | 2 +-
 modules/adkernelAdnBidAdapter.js                 | 1 +
 modules/adxcgBidAdapter.js                       | 2 +-
 modules/dianomiBidAdapter.js                     | 2 +-
 modules/finativeBidAdapter.js                    | 2 +-
 modules/improvedigitalBidAdapter.js              | 4 ++--
 modules/readpeakBidAdapter.js                    | 2 +-
 modules/seedingAllianceBidAdapter.js             | 2 +-
 modules/sharethroughBidAdapter.js                | 2 +-
 modules/talkadsBidAdapter.js                     | 1 +
 modules/truereachBidAdapter.js                   | 1 +
 modules/ttdBidAdapter.js                         | 2 +-
 package-lock.json                                | 2 +-
 test/spec/modules/adfBidAdapter_spec.js          | 5 ++---
 test/spec/modules/adxcgBidAdapter_spec.js        | 5 ++---
 test/spec/modules/dianomiBidAdapter_spec.js      | 5 ++---
 test/spec/modules/sharethroughBidAdapter_spec.js | 3 ++-
 test/spec/modules/ttdBidAdapter_spec.js          | 6 +++---
 18 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/modules/adfBidAdapter.js b/modules/adfBidAdapter.js
index a3fb128437b..d8e598deb8f 100644
--- a/modules/adfBidAdapter.js
+++ b/modules/adfBidAdapter.js
@@ -93,7 +93,7 @@ export const spec = {
     const adxDomain = setOnAny(validBidRequests, 'params.adxDomain') || 'adx.adform.net';
 
     const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
-    const tid = validBidRequests[0].transactionId;
+    const tid = bidderRequest.auctionId;
     const test = setOnAny(validBidRequests, 'params.test');
     const currency = getConfig('currency.adServerCurrency');
     const cur = currency && [ currency ];
diff --git a/modules/adkernelAdnBidAdapter.js b/modules/adkernelAdnBidAdapter.js
index 4612310a9a4..3e348e0795d 100644
--- a/modules/adkernelAdnBidAdapter.js
+++ b/modules/adkernelAdnBidAdapter.js
@@ -61,6 +61,7 @@ function buildRequestParams(tags, bidderRequest) {
   let {auctionId, gdprConsent, uspConsent, transactionId, refererInfo} = bidderRequest;
   let req = {
     id: auctionId,
+    // TODO: transactionId is undefined here, should this be auctionId? see #8573
     tid: transactionId,
     site: buildSite(refererInfo),
     imp: tags
diff --git a/modules/adxcgBidAdapter.js b/modules/adxcgBidAdapter.js
index 4d6fd6fe841..564960cf2c9 100644
--- a/modules/adxcgBidAdapter.js
+++ b/modules/adxcgBidAdapter.js
@@ -98,7 +98,7 @@ export const spec = {
     device.dnt = getDNT() ? 1 : 0;
     device.language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
 
-    const tid = validBidRequests[0].transactionId;
+    const tid = bidderRequest.auctionId;
     const test = setOnAny(validBidRequests, 'params.test');
     const currency = getConfig('currency.adServerCurrency');
     const cur = currency && [ currency ];
diff --git a/modules/dianomiBidAdapter.js b/modules/dianomiBidAdapter.js
index 83b0ea0ae70..f8f47df1239 100644
--- a/modules/dianomiBidAdapter.js
+++ b/modules/dianomiBidAdapter.js
@@ -112,7 +112,7 @@ export const spec = {
       setOnAny(validBidRequests, 'params.pt') ||
       setOnAny(validBidRequests, 'params.priceType') ||
       'net';
-    const tid = validBidRequests[0].transactionId;
+    const tid = bidderRequest.auctionId;
     const currency = getConfig('currency.adServerCurrency');
     const cur = currency && [currency];
     const eids = setOnAny(validBidRequests, 'userIdAsEids');
diff --git a/modules/finativeBidAdapter.js b/modules/finativeBidAdapter.js
index 6368fc011cc..b236ddb3d95 100644
--- a/modules/finativeBidAdapter.js
+++ b/modules/finativeBidAdapter.js
@@ -63,7 +63,7 @@ export const spec = {
     // convert Native ORTB definition to old-style prebid native definition
     validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
     const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
-    const tid = validBidRequests[0].transactionId;
+    const tid = bidderRequest.auctionId;
     const cur = [config.getConfig('currency.adServerCurrency') || DEFAULT_CUR];
     let url = bidderRequest.refererInfo.referer;
 
diff --git a/modules/improvedigitalBidAdapter.js b/modules/improvedigitalBidAdapter.js
index f157ed0a80a..044c27dc9e8 100644
--- a/modules/improvedigitalBidAdapter.js
+++ b/modules/improvedigitalBidAdapter.js
@@ -307,10 +307,10 @@ const ID_REQUEST = {
     }
     // In the single request mode, split imps between those going to the ad server and those going to extend server
     if (extendImps.length) {
-      requests.push(formatRequest(extendImps, null, true));
+      requests.push(formatRequest(extendImps, bidderRequest.auctionId, true));
     }
     if (adServerImps.length) {
-      requests.push(formatRequest(adServerImps, null, false));
+      requests.push(formatRequest(adServerImps, bidderRequest.auctionId, false));
     }
 
     return requests;
diff --git a/modules/readpeakBidAdapter.js b/modules/readpeakBidAdapter.js
index 1572a3df0df..844e287c622 100644
--- a/modules/readpeakBidAdapter.js
+++ b/modules/readpeakBidAdapter.js
@@ -41,7 +41,7 @@ export const spec = {
       cur: [currency],
       source: {
         fd: 1,
-        tid: bidRequests[0].transactionId,
+        tid: bidderRequest.auctionId,
         ext: {
           prebid: '$prebid.version$'
         }
diff --git a/modules/seedingAllianceBidAdapter.js b/modules/seedingAllianceBidAdapter.js
index 03fe99d7a71..64b9cd5d4aa 100755
--- a/modules/seedingAllianceBidAdapter.js
+++ b/modules/seedingAllianceBidAdapter.js
@@ -67,7 +67,7 @@ export const spec = {
     validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
 
     const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
-    const tid = validBidRequests[0].transactionId;
+    const tid = bidderRequest.auctionId;
     const cur = [config.getConfig('currency.adServerCurrency') || DEFAULT_CUR];
     let url = bidderRequest.refererInfo.page;
 
diff --git a/modules/sharethroughBidAdapter.js b/modules/sharethroughBidAdapter.js
index 4ae8b98efa4..0c8b84fd0c5 100644
--- a/modules/sharethroughBidAdapter.js
+++ b/modules/sharethroughBidAdapter.js
@@ -52,7 +52,7 @@ export const sharethroughAdapterSpec = {
         ext: {},
       },
       source: {
-        tid: bidRequests[0].transactionId,
+        tid: bidderRequest.auctionId,
         ext: {
           version: '$prebid.version$',
           str: VERSION,
diff --git a/modules/talkadsBidAdapter.js b/modules/talkadsBidAdapter.js
index 22f4bc1eac8..9c3e13bae47 100644
--- a/modules/talkadsBidAdapter.js
+++ b/modules/talkadsBidAdapter.js
@@ -63,6 +63,7 @@ export const spec = {
       cur: CURRENCY,
       timeout: poBidderRequest.timeout,
       auction_id: paValidBidRequests[0].auctionId,
+      // TODO: should this use auctionId? see #8573
       transaction_id: paValidBidRequests[0].transactionId,
       bids: laBids,
       gdpr: { applies: false, consent: false },
diff --git a/modules/truereachBidAdapter.js b/modules/truereachBidAdapter.js
index 46774275bba..e343842543d 100755
--- a/modules/truereachBidAdapter.js
+++ b/modules/truereachBidAdapter.js
@@ -25,6 +25,7 @@ export const spec = {
 
     let siteId = deepAccess(validBidRequests[0], 'params.site_id');
 
+    // TODO: should this use auctionId? see #8573
     let url = BIDDER_URL + siteId + '?hb=1&transactionId=' + validBidRequests[0].transactionId;
 
     return {
diff --git a/modules/ttdBidAdapter.js b/modules/ttdBidAdapter.js
index 3a23c75b01b..882f7e58960 100644
--- a/modules/ttdBidAdapter.js
+++ b/modules/ttdBidAdapter.js
@@ -59,7 +59,7 @@ function getBidFloor(bid) {
 
 function getSource(validBidRequests) {
   let source = {
-    tid: validBidRequests[0].transactionId
+    tid: validBidRequests[0].auctionId
   };
   if (validBidRequests[0].schain) {
     utils.deepSetValue(source, 'ext.schain', validBidRequests[0].schain);
diff --git a/package-lock.json b/package-lock.json
index 629cf03fcc7..50555bda183 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "7.16.0-pre",
+      "version": "7.19.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
diff --git a/test/spec/modules/adfBidAdapter_spec.js b/test/spec/modules/adfBidAdapter_spec.js
index b1c2d0b4ad2..eb560bb1bae 100644
--- a/test/spec/modules/adfBidAdapter_spec.js
+++ b/test/spec/modules/adfBidAdapter_spec.js
@@ -170,11 +170,10 @@ describe('Adf adapter', function () {
       let validBidRequests = [{
         bidId: 'bidId',
         params: { siteId: 'siteId' },
-        transactionId: 'transactionId'
       }];
-      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data);
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' }, auctionId: 'tid' }).data);
 
-      assert.equal(request.source.tid, validBidRequests[0].transactionId);
+      assert.equal(request.source.tid, 'tid');
       assert.equal(request.source.fd, 1);
     });
 
diff --git a/test/spec/modules/adxcgBidAdapter_spec.js b/test/spec/modules/adxcgBidAdapter_spec.js
index 32e9921f0ae..e2d9e2a15e4 100644
--- a/test/spec/modules/adxcgBidAdapter_spec.js
+++ b/test/spec/modules/adxcgBidAdapter_spec.js
@@ -164,11 +164,10 @@ describe('Adxcg adapter', function () {
       let validBidRequests = [{
         bidId: 'bidId',
         params: {siteId: 'siteId'},
-        transactionId: 'transactionId'
       }];
-      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
+      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}, auctionId: 'tid'}).data);
 
-      assert.equal(request.source.tid, validBidRequests[0].transactionId);
+      assert.equal(request.source.tid, 'tid');
       assert.equal(request.source.fd, 1);
     });
 
diff --git a/test/spec/modules/dianomiBidAdapter_spec.js b/test/spec/modules/dianomiBidAdapter_spec.js
index 50673b79572..61509913c41 100644
--- a/test/spec/modules/dianomiBidAdapter_spec.js
+++ b/test/spec/modules/dianomiBidAdapter_spec.js
@@ -159,14 +159,13 @@ describe('Dianomi adapter', () => {
         {
           bidId: 'bidId',
           params: { smartadId: 1234 },
-          transactionId: 'transactionId',
         },
       ];
       let request = JSON.parse(
-        spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' } }).data
+        spec.buildRequests(validBidRequests, { refererInfo: { page: 'page' }, auctionId: 'tid' }).data
       );
 
-      assert.equal(request.source.tid, validBidRequests[0].transactionId);
+      assert.equal(request.source.tid, 'tid');
       assert.equal(request.source.fd, 1);
     });
 
diff --git a/test/spec/modules/sharethroughBidAdapter_spec.js b/test/spec/modules/sharethroughBidAdapter_spec.js
index bc9affd4d0d..56e10a74240 100644
--- a/test/spec/modules/sharethroughBidAdapter_spec.js
+++ b/test/spec/modules/sharethroughBidAdapter_spec.js
@@ -172,6 +172,7 @@ describe('sharethrough adapter spec', function () {
         refererInfo: {
           ref: 'https://referer.com',
         },
+        auctionId: 'auction-id'
       };
     });
 
@@ -233,7 +234,7 @@ describe('sharethrough adapter spec', function () {
             expect(openRtbReq.device.ua).to.equal(navigator.userAgent);
             expect(openRtbReq.regs.coppa).to.equal(1);
 
-            expect(openRtbReq.source.tid).to.equal(bidRequests[0].transactionId);
+            expect(openRtbReq.source.tid).to.equal(bidderRequest.auctionId);
             expect(openRtbReq.source.ext.version).not.to.be.undefined;
             expect(openRtbReq.source.ext.str).not.to.be.undefined;
             expect(openRtbReq.source.ext.schain).to.deep.equal(bidRequests[0].schain);
diff --git a/test/spec/modules/ttdBidAdapter_spec.js b/test/spec/modules/ttdBidAdapter_spec.js
index aa2e84b619e..60c00f4e4b9 100644
--- a/test/spec/modules/ttdBidAdapter_spec.js
+++ b/test/spec/modules/ttdBidAdapter_spec.js
@@ -272,10 +272,10 @@ describe('ttdBidAdapter', function () {
       expect(requestBody.imp[0].ext.gpid).to.equal(gpid);
     });
 
-    it('sends transaction id in source.tid', function () {
+    it('sends auction id in source.tid', function () {
       const requestBody = testBuildRequests(baseBannerBidRequests, baseBidderRequest).data;
       expect(requestBody.source).to.be.not.null;
-      expect(requestBody.source.tid).to.equal('1111474f-58b1-4368-b812-84f8c937a099');
+      expect(requestBody.source.tid).to.equal(baseBidderRequest.auctionId);
     });
 
     it('includes the ad size in the bid request', function () {
@@ -557,7 +557,7 @@ describe('ttdBidAdapter', function () {
       const requestBody = testBuildRequests(baseBannerMultipleBidRequests, baseBidderRequest).data;
       expect(requestBody.imp.length).to.equal(2);
       expect(requestBody.source).to.be.not.null;
-      expect(requestBody.source.tid).to.equal('1111474f-58b1-4368-b812-84f8c937a099');
+      expect(requestBody.source.tid).to.equal(baseBidderRequest.auctionId);
       expect(requestBody.imp[0].ext).to.be.not.null;
       expect(requestBody.imp[0].ext.tid).to.equal('8651474f-58b1-4368-b812-84f8c937a099');
       expect(requestBody.imp[1].ext).to.be.not.null;

From 7186178c38630983f43c9097e122a9f8a1b2b8af Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Wed, 5 Oct 2022 10:01:21 -0700
Subject: [PATCH 312/569] PBS adapter: set `source.tid` to auction ID (#9073)

---
 modules/prebidServerBidAdapter/index.js          | 2 +-
 src/adapterManager.js                            | 6 ++----
 test/spec/modules/prebidServerBidAdapter_spec.js | 7 +++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 7b2d05479e5..562e5aaa1db 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -742,7 +742,7 @@ Object.assign(ORTB2.prototype, {
     }
     const request = {
       id: firstBidRequest.auctionId,
-      source: {tid: s2sBidRequest.tid},
+      source: {tid: firstBidRequest.auctionId},
       tmax: s2sConfig.timeout,
       imp: imps,
       // to do: add setconfig option to pass test = 1
diff --git a/src/adapterManager.js b/src/adapterManager.js
index 472693a6888..4722013d5f0 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -357,8 +357,6 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
 
   let counter = 0;
 
-  // $.source.tid MUST be a unique UUID and also THE SAME between all PBS Requests for a given Auction
-  const sourceTid = generateUUID();
   _s2sConfigs.forEach((s2sConfig) => {
     if (s2sConfig && uniqueServerBidRequests[counter] && getS2SBidderSet(s2sConfig).has(uniqueServerBidRequests[counter].bidderCode)) {
       // s2s should get the same client side timeout as other client side requests.
@@ -374,7 +372,7 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
       let uniqueServerRequests = serverBidRequests.filter(serverBidRequest => serverBidRequest.uniquePbsTid === uniquePbsTid);
 
       if (s2sAdapter) {
-        let s2sBidRequest = {tid: sourceTid, 'ad_units': adUnitsS2SCopy, s2sConfig, ortb2Fragments};
+        let s2sBidRequest = {'ad_units': adUnitsS2SCopy, s2sConfig, ortb2Fragments};
         if (s2sBidRequest.ad_units.length) {
           let doneCbs = uniqueServerRequests.map(bidRequest => {
             bidRequest.start = timestamp();
@@ -387,7 +385,7 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
           // fire BID_REQUESTED event for each s2s bidRequest
           uniqueServerRequests.forEach(bidRequest => {
             // add the new sourceTid
-            events.emit(CONSTANTS.EVENTS.BID_REQUESTED, {...bidRequest, tid: sourceTid});
+            events.emit(CONSTANTS.EVENTS.BID_REQUESTED, {...bidRequest, tid: bidRequest.auctionId});
           });
 
           // make bid requests
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 69eee1c3f4a..925f92fb08b 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -607,15 +607,14 @@ describe('S2S Adapter', function () {
       resetSyncedStatus();
     });
 
-    it('should set id to auction ID and source.tid to tid', function () {
+    it('should set id and source.tid to auction ID', function () {
       config.setConfig({ s2sConfig: CONFIG });
 
       adapter.callBids(OUTSTREAM_VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(requestBid.id).to.equal('173afb6d132ba3');
-      expect(requestBid.source).to.be.an('object');
-      expect(requestBid.source.tid).to.equal('437fbbf5-33f5-487a-8e16-a7112903cfe5');
+      expect(requestBid.id).to.equal(BID_REQUESTS[0].auctionId);
+      expect(requestBid.source.tid).to.equal(BID_REQUESTS[0].auctionId);
     });
 
     it('should block request if config did not define p1Consent URL in endpoint object config', function () {

From 5c81f1ba3e8fa8cc85a7134adcd97c1ed4dd046c Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Wed, 5 Oct 2022 13:48:50 -0700
Subject: [PATCH 313/569] Prebid core: accept pub-defined transactionId from
 `ortb2Imp.ext.tid` (#9072)

---
 src/prebid.js                   |  6 ++---
 test/spec/unit/pbjs_api_spec.js | 44 +++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/prebid.js b/src/prebid.js
index 53e32ee287b..18826fc7205 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -662,10 +662,10 @@ export const startAuction = hook('async', function ({ bidsBackHandler, timeout:
 
     const bidders = allBidders.filter(bidder => !s2sBidders.has(bidder));
 
-    adUnit.transactionId = generateUUID();
-
+    const tid = adUnit.ortb2Imp?.ext?.tid || generateUUID();
+    adUnit.transactionId = tid;
     // Populate ortb2Imp.ext.tid with transactionId. Specifying a transaction ID per item in the ortb impression array, lets multiple transaction IDs be transmitted in a single bid request.
-    deepSetValue(adUnit, 'ortb2Imp.ext.tid', adUnit.transactionId)
+    deepSetValue(adUnit, 'ortb2Imp.ext.tid', tid);
 
     bidders.forEach(bidder => {
       const adapter = bidderRegistry[bidder];
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index 3cee2b6b679..6757ef42094 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -1841,6 +1841,50 @@ describe('Unit: Prebid Module', function () {
           .and.to.match(/[a-f0-9\-]{36}/i);
       });
 
+      describe('transactionId', () => {
+        let adUnit;
+        beforeEach(() => {
+          adUnit = {
+            code: 'adUnit',
+            mediaTypes: {
+              banner: {
+                sizes: [300, 250]
+              }
+            },
+            bids: [
+              {
+                bidder: 'mock-bidder',
+              }
+            ]
+          };
+        });
+        it('should be set to ortb2Imp.ext.tid, if specified', () => {
+          $$PREBID_GLOBAL$$.requestBids({
+            adUnits: [
+              {...adUnit, ortb2Imp: {ext: {tid: 'custom-tid'}}}
+            ]
+          });
+          sinon.assert.match(auctionArgs.adUnits[0], {
+            transactionId: 'custom-tid',
+            ortb2Imp: {
+              ext: {
+                tid: 'custom-tid'
+              }
+            }
+          })
+        });
+        it('should be copied to ortb2Imp.ext.tid, if not specified', () => {
+          $$PREBID_GLOBAL$$.requestBids({
+            adUnits: [
+              adUnit
+            ]
+          });
+          const tid = auctionArgs.adUnits[0].transactionId;
+          expect(tid).to.exist;
+          expect(auctionArgs.adUnits[0].ortb2Imp.ext.tid).to.eql(tid);
+        });
+      });
+
       it('should always set ortb2.ext.tid same as transactionId in adUnits', function () {
         $$PREBID_GLOBAL$$.requestBids({
           adUnits: [

From d1ac4f28fdba2b6a474784700ca315a936078ca9 Mon Sep 17 00:00:00 2001
From: Aaron Price <67345931+AaronColbyPrice@users.noreply.github.com>
Date: Wed, 5 Oct 2022 19:33:00 -0700
Subject: [PATCH 314/569] Conversant Analytics Adapter: initial release (#8981)

* cnvr_analytics-adapter - First implementation of Conversant Prebid Analytics adapter
- commits squashed to 1 checkin
- testing
- documentation
- throttling

* cnvr_analytics-adapter - cicircle fix

* cnvr_analytics-adapter - code review tweaks, handle multiple bids from 1 bidder for 1 adslot
---
 modules/conversantAnalyticsAdapter.js         | 560 ++++++++++
 modules/conversantAnalyticsAdapter.md         |  47 +
 .../conversantAnalyticsAdapter_spec.js        | 963 ++++++++++++++++++
 3 files changed, 1570 insertions(+)
 create mode 100644 modules/conversantAnalyticsAdapter.js
 create mode 100644 modules/conversantAnalyticsAdapter.md
 create mode 100644 test/spec/modules/conversantAnalyticsAdapter_spec.js

diff --git a/modules/conversantAnalyticsAdapter.js b/modules/conversantAnalyticsAdapter.js
new file mode 100644
index 00000000000..6e88f403bae
--- /dev/null
+++ b/modules/conversantAnalyticsAdapter.js
@@ -0,0 +1,560 @@
+import {ajax} from '../src/ajax.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import CONSTANTS from '../src/constants.json';
+import {getGlobal} from '../src/prebidGlobal.js';
+import adapterManager from '../src/adapterManager.js';
+import {logInfo, logError, logMessage, deepAccess, isInteger} from '../src/utils.js';
+
+const {
+  EVENTS: { AUCTION_END, AD_RENDER_FAILED, BID_TIMEOUT, BID_WON }
+} = CONSTANTS;
+const GVLID = 24;
+const ANALYTICS_TYPE = 'endpoint';
+
+// for local testing set domain to 127.0.0.1:8290
+const URL = 'https://web.hb.ad.cpe.dotomi.com/cvx/event/prebidanalytics';
+const ANALYTICS_CODE = 'conversant';
+
+export const CNVR_CONSTANTS = {
+  LOG_PREFIX: 'Conversant analytics adapter: ',
+  // Maximum time to keep an item in the cache before it gets purged
+  MAX_MILLISECONDS_IN_CACHE: 30000,
+  // How often cache cleanup will run
+  CACHE_CLEANUP_TIME_IN_MILLIS: 30000,
+  // Should be float from 0-1, 0 is turned off, 1 is sample every instance
+  DEFAULT_SAMPLE_RATE: 1,
+
+  // BID STATUS CODES
+  WIN: 10,
+  BID: 20,
+  NO_BID: 30,
+  TIMEOUT: 40,
+  RENDER_FAILED: 50
+};
+
+// Saves passed in options from the bid adapter
+const initOptions = {};
+
+// Simple flag to help handle any tear down needed on disable
+let conversantAnalyticsEnabled = false;
+
+export const cnvrHelper = {
+  // Turns on sampling for an instance of prebid analytics.
+  doSample: true,
+
+  /**
+   * Used to hold data for RENDER FAILED events so we can send a payload back that will match our original auction data.
+   * Contains the following key/value data:
+   * <adId> => {
+   *     'bidderCode': <bidderCode>,
+   *     'adUnitCode': <adUnitCode>,
+   *     'auctionId': <auctionId>,
+   *     'timeReceived': Date.now()  //For cache cleaning
+   * }
+   */
+  adIdLookup: {},
+
+  /**
+   * Time out events happen before AUCTION END so we can save them in a cache and report them at the same time as the
+   * AUCTION END event.  Has the following data and key is based off of auctionId, adUnitCode, bidderCode from
+   * keyStr = getLookupKey(auctionId, adUnitCode, bidderCode);
+   * <keyStr> => {
+   *     timeReceived: Date.now() //so cache can be purged in case it doesn't get cleaned out at auctionEnd
+   * }
+   */
+  timeoutCache: {},
+
+  /**
+   * Lookup of auction IDs to auction start timestamps
+   */
+  auctionIdTimestampCache: {}
+};
+
+/**
+ * Cleanup timer for the adIdLookup and timeoutCache caches. If all works properly then the caches are self-cleaning
+ * but in case something goes sideways we poll periodically to cleanup old values to prevent a memory leak
+ */
+let cacheCleanupInterval;
+
+let conversantAnalytics = Object.assign(
+  adapter({URL, ANALYTICS_TYPE}),
+  {
+    track({eventType, args}) {
+      if (cnvrHelper.doSample) {
+        logMessage(CNVR_CONSTANTS.LOG_PREFIX + ' track(): ' + eventType, args);
+        switch (eventType) {
+          case AUCTION_END:
+            onAuctionEnd(args);
+            break;
+          case AD_RENDER_FAILED:
+            onAdRenderFailed(args);
+            break;
+          case BID_WON:
+            onBidWon(args);
+            break;
+          case BID_TIMEOUT:
+            onBidTimeout(args);
+            break;
+        } // END switch
+      } else {
+        logMessage(CNVR_CONSTANTS.LOG_PREFIX + ' - ' + eventType + ': skipped due to sampling');
+      }// END IF(cnvrHelper.doSample)
+    } // END track()
+  }
+);
+
+// ================================================== EVENT HANDLERS ===================================================
+/**
+ * We get the list of timeouts before the endAution, cache them temporarily in a global cache and the endAuction event
+ * will pick them up.  Uses getLookupKey() to create the key to the entry from auctionId, adUnitCode and bidderCode.
+ * Saves a single value of timeReceived so we can do cache purging periodically.
+ *
+ * Current assumption is that the timeout will always be an array even if it is just one object in the array.
+ * @param args  [{
+    "bidId": "80882409358b8a8",
+    "bidder": "conversant",
+    "adUnitCode": "MedRect",
+    "auctionId": "afbd6e0b-e45b-46ab-87bf-c0bac0cb8881"
+  }, {
+    "bidId": "9da4c107a6f24c8",
+    "bidder": "conversant",
+    "adUnitCode": "Leaderboard",
+    "auctionId": "afbd6e0b-e45b-46ab-87bf-c0bac0cb8881"
+  }
+ ]
+ */
+function onBidTimeout(args) {
+  args.forEach(timedOutBid => {
+    const timeoutCacheKey = cnvrHelper.getLookupKey(timedOutBid.auctionId, timedOutBid.adUnitCode, timedOutBid.bidder);
+    cnvrHelper.timeoutCache[timeoutCacheKey] = {
+      timeReceived: Date.now()
+    }
+  });
+}
+
+/**
+ * Bid won occurs after auctionEnd so we need to send this separately. We also save an entry in the adIdLookup cache
+ * so that if the render fails we can match up important data so we can send a valid RENDER FAILED event back.
+ * @param args bidWon args
+ */
+function onBidWon(args) {
+  const bidderCode = args.bidderCode;
+  const adUnitCode = args.adUnitCode;
+  const auctionId = args.auctionId;
+  let timestamp = args.requestTimestamp ? args.requestTimestamp : Date.now();
+
+  // Make sure we have all the data we need
+  if (!bidderCode || !adUnitCode || !auctionId) {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'onBidWon() did not get all the necessary data to process the event.');
+    return;
+  }
+
+  if (cnvrHelper.auctionIdTimestampCache[auctionId]) {
+    timestamp = cnvrHelper.auctionIdTimestampCache[auctionId].timeReceived; // Don't delete, could be multiple winners/auction, allow cleanup to handle
+  }
+
+  const bidWonPayload = cnvrHelper.createPayload('bid_won', auctionId, timestamp);
+
+  const adUnitPayload = cnvrHelper.createAdUnit();
+  bidWonPayload.adUnits[adUnitCode] = adUnitPayload;
+
+  const bidPayload = cnvrHelper.createBid(CNVR_CONSTANTS.WIN, args.timeToRespond);
+  bidPayload.adSize = cnvrHelper.createAdSize(args.width, args.height);
+  bidPayload.cpm = args.cpm;
+  bidPayload.originalCpm = args.originalCpm;
+  bidPayload.currency = args.currency;
+  bidPayload.mediaType = args.mediaType;
+  adUnitPayload.bids[bidderCode] = [bidPayload];
+
+  if (!cnvrHelper.adIdLookup[args.adId]) {
+    cnvrHelper.adIdLookup[args.adId] = {
+      'bidderCode': bidderCode,
+      'adUnitCode': adUnitCode,
+      'auctionId': auctionId,
+      'timeReceived': Date.now() // For cache cleaning
+    };
+  }
+
+  sendData(bidWonPayload);
+}
+
+/**
+ * RENDER FAILED occurs after AUCTION END and BID WON, the payload does not have all the data we need so we use
+ * adIdLookup to pull data from a BID WON event to populate our payload
+ * @param args = {
+ *  reason: <value>
+ *  message: <value>
+ *  adId: <value> --optional
+ *  bid: {object?} --optional: unsure what this looks like but guessing it is {bidder: <value>, params: {object}}
+ *    }
+ */
+function onAdRenderFailed(args) {
+  const adId = args.adId;
+  // Make sure we have all the data we need, adId is optional so it's not guaranteed, without that we can't match it up
+  // to our adIdLookup data.
+  if (!adId || !cnvrHelper.adIdLookup[adId]) {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + "onAdRenderFailed(): Unable to process RENDER FAILED because adId is missing or doesn't match a record in our cache.");
+    return; // Either no adId to match against a bidWon event, or no data saved from a bidWon event that matches the adId
+  }
+  const adIdObj = cnvrHelper.adIdLookup[adId];
+  const adUnitCode = adIdObj['adUnitCode'];
+  const bidderCode = adIdObj['bidderCode'];
+  const auctionId = adIdObj['auctionId'];
+  delete cnvrHelper.adIdLookup[adId]; // cleanup our cache
+
+  if (!bidderCode || !adUnitCode || !auctionId) {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'onAdRenderFailed(): Unable to process RENDER FAILED because lookup cache did not have all the data we required.');
+    return;
+  }
+
+  let timestamp = Date.now();
+  if (cnvrHelper.auctionIdTimestampCache[auctionId]) {
+    timestamp = cnvrHelper.auctionIdTimestampCache[auctionId].timeReceived; // Don't delete, could be multiple winners/auction, allow cleanup to handle
+  }
+
+  const renderFailedPayload = cnvrHelper.createPayload('render_failed', auctionId, timestamp);
+  const adUnitPayload = cnvrHelper.createAdUnit();
+  adUnitPayload.bids[bidderCode] = [cnvrHelper.createBid(CNVR_CONSTANTS.RENDER_FAILED, 0)];
+  adUnitPayload.bids[bidderCode][0].message = 'REASON: ' + args.reason + '. MESSAGE: ' + args.message;
+  renderFailedPayload.adUnits[adUnitCode] = adUnitPayload;
+  sendData(renderFailedPayload);
+}
+
+/**
+ * AUCTION END contains bid and no bid info and all of the auction info we need. This sends the bulk of the information
+ * about the auction back to the servers.  It will also check the timeoutCache for any matching bids, if any are found
+ * then they will be removed from the cache and send back with this payload.
+ * @param args AUCTION END payload, fairly large data structure, main objects are 'adUnits[]', 'bidderRequests[]',
+ * 'noBids[]', 'bidsReceived[]'... 'winningBids[]' seems to be always blank.
+ */
+function onAuctionEnd(args) {
+  const auctionId = args.auctionId;
+  if (!auctionId) {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'onAuctionEnd(): No auctionId in args supplied so unable to process event.');
+    return;
+  }
+
+  const auctionTimestamp = args.timestamp ? args.timestamp : Date.now();
+  cnvrHelper.auctionIdTimestampCache[auctionId] = { timeReceived: auctionTimestamp };
+
+  const auctionEndPayload = cnvrHelper.createPayload('auction_end', auctionId, auctionTimestamp);
+  // Get bid request information from adUnits
+  if (!Array.isArray(args.adUnits)) {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'onAuctionEnd(): adUnits not defined in arguments.');
+    return;
+  }
+
+  args.adUnits.forEach(adUnit => {
+    const cnvrAdUnit = cnvrHelper.createAdUnit();
+    // Initialize bids with bidderCode
+    adUnit.bids.forEach(bid => {
+      cnvrAdUnit.bids[bid.bidder] = []; // support multiple bids from a bidder for different sizes/media types //cnvrHelper.initializeBidDefaults();
+
+      // Check for cached timeout responses
+      const timeoutKey = cnvrHelper.getLookupKey(auctionId, adUnit.code, bid.bidder);
+      if (cnvrHelper.timeoutCache[timeoutKey]) {
+        cnvrAdUnit.bids[bid.bidder].push(cnvrHelper.createBid(CNVR_CONSTANTS.TIMEOUT, args.timeout));
+        delete cnvrHelper.timeoutCache[timeoutKey];
+      }
+    });
+
+    // Ad media types for the ad slot
+    if (cnvrHelper.keyExistsAndIsObject(adUnit, 'mediaTypes')) {
+      Object.entries(adUnit.mediaTypes).forEach(([mediaTypeName]) => {
+        cnvrAdUnit.mediaTypes.push(mediaTypeName);
+      });
+    }
+
+    // Ad sizes listed under the size key
+    if (Array.isArray(adUnit.sizes) && adUnit.sizes.length >= 1) {
+      adUnit.sizes.forEach(size => {
+        if (!Array.isArray(size) || size.length !== 2) {
+          logMessage(CNVR_CONSTANTS.LOG_PREFIX + 'Unknown object while retrieving adUnit sizes.', adUnit);
+          return; // skips to next item
+        }
+        cnvrAdUnit.sizes.push(cnvrHelper.createAdSize(size[0], size[1]));
+      });
+    }
+
+    // If the Ad Slot is not unique then ad sizes and media types merge them together
+    if (auctionEndPayload.adUnits[adUnit.code]) {
+      // Merge ad sizes
+      Array.prototype.push.apply(auctionEndPayload.adUnits[adUnit.code].sizes, cnvrAdUnit.sizes);
+      // Merge mediaTypes
+      Array.prototype.push.apply(auctionEndPayload.adUnits[adUnit.code].mediaTypes, cnvrAdUnit.mediaTypes);
+    } else {
+      auctionEndPayload.adUnits[adUnit.code] = cnvrAdUnit;
+    }
+  });
+
+  if (Array.isArray(args.noBids)) {
+    args.noBids.forEach(noBid => {
+      const bidPayloadArray = deepAccess(auctionEndPayload, 'adUnits.' + noBid.adUnitCode + '.bids.' + noBid.bidder);
+
+      if (bidPayloadArray) {
+        bidPayloadArray.push(cnvrHelper.createBid(CNVR_CONSTANTS.NO_BID, 0)); // no time to respond info for this, would have to capture event and save it there
+      } else {
+        logMessage(CNVR_CONSTANTS.LOG_PREFIX + 'Unable to locate bid object via adUnitCode/bidderCode in payload for noBid reply in END_AUCTION', Object.assign({}, noBid));
+      }
+    });
+  } else {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'onAuctionEnd(): noBids not defined in arguments.');
+  }
+
+  // Get bid data from bids sent
+  if (Array.isArray(args.bidsReceived)) {
+    args.bidsReceived.forEach(bid => {
+      const bidPayloadArray = deepAccess(auctionEndPayload, 'adUnits.' + bid.adUnitCode + '.bids.' + bid.bidderCode);
+      if (bidPayloadArray) {
+        const bidPayload = cnvrHelper.createBid(CNVR_CONSTANTS.BID, bid.timeToRespond);
+        bidPayload.originalCpm = bid.originalCpm;
+        bidPayload.cpm = bid.cpm;
+        bidPayload.currency = bid.currency;
+        bidPayload.mediaType = bid.mediaType;
+        bidPayload.adSize = {
+          'w': bid.width,
+          'h': bid.height
+        };
+        bidPayloadArray.push(bidPayload);
+      } else {
+        logMessage(CNVR_CONSTANTS.LOG_PREFIX + 'Unable to locate bid object via adUnitCode/bidderCode in payload for bid reply in END_AUCTION', Object.assign({}, bid));
+      }
+    });
+  } else {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'onAuctionEnd(): bidsReceived not defined in arguments.');
+  }
+  // We need to remove any duplicate ad sizes from merging ad-slots or overlap in different media types and also
+  // media-types from merged ad-slots in twin bids.
+  Object.keys(auctionEndPayload.adUnits).forEach(function(adCode) {
+    auctionEndPayload.adUnits[adCode].sizes = cnvrHelper.deduplicateArray(auctionEndPayload.adUnits[adCode].sizes);
+    auctionEndPayload.adUnits[adCode].mediaTypes = cnvrHelper.deduplicateArray(auctionEndPayload.adUnits[adCode].mediaTypes);
+  });
+
+  sendData(auctionEndPayload);
+}
+
+// =============================================== START OF HELPERS ===================================================
+
+/**
+ * Helper to verify a key exists and is a data type of Object (not a function, or array)
+ * @param parent The parent that we want to check the key for
+ * @param key The key which we want to check
+ * @returns {boolean} True if it's an object and exists, false otherwise (null, array, primitive, function)
+ */
+cnvrHelper.keyExistsAndIsObject = function (parent, key) {
+  if (!parent.hasOwnProperty(key)) {
+    return false;
+  }
+  return typeof parent[key] === 'object' &&
+    !Array.isArray(parent[key]) &&
+    parent[key] !== null;
+}
+
+/**
+ * De-duplicate an array that could contain primitives or objects/associative arrays.
+ * A temporary array is used to store a string representation of each object that we look at.  If an object matches
+ * one found in the temp array then it is ignored.
+ * @param array An array
+ * @returns {*} A de-duplicated array.
+ */
+cnvrHelper.deduplicateArray = function(array) {
+  if (!array || !Array.isArray(array)) {
+    return array;
+  }
+
+  const tmpArray = [];
+  return array.filter(function (tmpObj) {
+    if (tmpArray.indexOf(JSON.stringify(tmpObj)) < 0) {
+      tmpArray.push(JSON.stringify(tmpObj));
+      return tmpObj;
+    }
+  });
+};
+
+/**
+ * Generic method to look at each key/value pair of a cache object and looks at the 'timeReceived' key, if more than
+ * the max wait time has passed then just delete the key.
+ * @param cacheObj one of our cache objects [adIdLookup or timeoutCache]
+ * @param currTime the current timestamp at the start of the most recent timer execution.
+ */
+cnvrHelper.cleanCache = function(cacheObj, currTime) {
+  Object.keys(cacheObj).forEach(key => {
+    const timeInCache = currTime - cacheObj[key].timeReceived;
+    if (timeInCache >= CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE) {
+      delete cacheObj[key];
+    }
+  });
+};
+
+/**
+ * Helper to create an object lookup key for our timeoutCache
+ * @param auctionId id of the auction
+ * @param adUnitCode ad unit code
+ * @param bidderCode bidder code
+ * @returns string concatenation of all the params into a string key for timeoutCache
+ */
+cnvrHelper.getLookupKey = function(auctionId, adUnitCode, bidderCode) {
+  return auctionId + '-' + adUnitCode + '-' + bidderCode;
+};
+
+/**
+ * Creates our root payload object that gets sent back to the server
+ * @param payloadType string type of payload (AUCTION_END, BID_WON, RENDER_FAILED)
+ * @param auctionId id for the auction
+ * @param timestamp timestamp in milliseconds of auction start time.
+ * @returns
+ *  {{
+ *    requestType: *,
+ *    adUnits: {},
+ *    auction: {
+ *      auctionId: *,
+ *      preBidVersion: *,
+ *      sid: *}
+ * }}  Basic structure of our object that we return to the server.
+ */
+cnvrHelper.createPayload = function(payloadType, auctionId, timestamp) {
+  return {
+    requestType: payloadType,
+    globalSampleRate: initOptions.global_sample_rate,
+    cnvrSampleRate: initOptions.cnvr_sample_rate,
+    auction: {
+      auctionId: auctionId,
+      preBidVersion: getGlobal().version,
+      sid: initOptions.site_id,
+      auctionTimestamp: timestamp
+    },
+    adUnits: {}
+  };
+};
+
+/**
+ * Helper to create an adSize object, if the value passed in is not an int then set it to -1
+ * @param width in pixels (must be an int)
+ * @param height in peixl (must be an int)
+ * @returns {{w: *, h: *}} a fully valid adSize object
+ */
+cnvrHelper.createAdSize = function(width, height) {
+  if (!isInteger(width)) {
+    width = -1;
+  }
+  if (!isInteger(height)) {
+    height = -1;
+  }
+  return {
+    'w': width,
+    'h': height
+  };
+};
+
+/**
+ * Helper to create the basic structure of our adUnit payload
+ * @returns {{sizes: [], bids: {}}} Basic adUnit payload structure as follows
+ */
+cnvrHelper.createAdUnit = function() {
+  return {
+    sizes: [],
+    mediaTypes: [],
+    bids: {}
+  };
+};
+
+/**
+ * Helper to create a basic bid payload object.
+ */
+cnvrHelper.createBid = function (eventCode, timeToRespond) {
+  return {
+    'eventCodes': [eventCode],
+    'timeToRespond': timeToRespond
+  };
+};
+
+/**
+ * Helper to get the sampling rates from an object and validate the result.
+ * @param parentObj Parent object that has the sampling property
+ * @param propNm Name of the sampling property
+ * @param defaultSampleRate A default value to apply if there is a problem
+ * @returns {number} returns a float number from 0 (always off) to 1 (always on)
+ */
+cnvrHelper.getSampleRate = function(parentObj, propNm, defaultSampleRate) {
+  let sampleRate = defaultSampleRate;
+  if (parentObj && typeof parentObj[propNm] !== 'undefined') {
+    sampleRate = parseFloat(parentObj[propNm]);
+    if (Number.isNaN(sampleRate) || sampleRate > 1) {
+      sampleRate = defaultSampleRate;
+    } else if (sampleRate < 0) {
+      sampleRate = 0;
+    }
+  }
+  return sampleRate;
+}
+
+/**
+ * Helper function to send data back to server.  Need to make sure we don't trigger a CORS preflight by not adding
+ * extra header params.
+ * @param payload our JSON payload from either AUCTION END, BID WIN, RENDER FAILED
+ */
+function sendData(payload) {
+  ajax(URL, function () {}, JSON.stringify(payload), {contentType: 'text/plain'});
+}
+
+// =============================== BOILERPLATE FOR PRE-BID ANALYTICS SETUP  ============================================
+// save the base class function
+conversantAnalytics.originEnableAnalytics = conversantAnalytics.enableAnalytics;
+conversantAnalytics.originDisableAnalytics = conversantAnalytics.disableAnalytics;
+
+// override enableAnalytics so we can get access to the config passed in from the page
+conversantAnalytics.enableAnalytics = function (config) {
+  if (!config || !config.options || !config.options.site_id) {
+    logError(CNVR_CONSTANTS.LOG_PREFIX + 'siteId is required.');
+    return;
+  }
+
+  cacheCleanupInterval = setInterval(
+    function() {
+      const currTime = Date.now();
+      cnvrHelper.cleanCache(cnvrHelper.adIdLookup, currTime);
+      cnvrHelper.cleanCache(cnvrHelper.timeoutCache, currTime);
+      cnvrHelper.cleanCache(cnvrHelper.auctionIdTimestampCache, currTime);
+    },
+    CNVR_CONSTANTS.CACHE_CLEANUP_TIME_IN_MILLIS
+  );
+
+  Object.assign(initOptions, config.options);
+
+  initOptions.global_sample_rate = cnvrHelper.getSampleRate(initOptions, 'sampling', 1);
+  initOptions.cnvr_sample_rate = cnvrHelper.getSampleRate(initOptions, 'cnvr_sampling', CNVR_CONSTANTS.DEFAULT_SAMPLE_RATE);
+
+  logInfo(CNVR_CONSTANTS.LOG_PREFIX + 'Conversant sample rate set to ' + initOptions.cnvr_sample_rate);
+  logInfo(CNVR_CONSTANTS.LOG_PREFIX + 'Global sample rate set to ' + initOptions.global_sample_rate);
+  // Math.random() pseudo-random number in the range 0 to less than 1 (inclusive of 0, but not 1)
+  cnvrHelper.doSample = Math.random() < initOptions.cnvr_sample_rate;
+
+  conversantAnalyticsEnabled = true;
+  conversantAnalytics.originEnableAnalytics(config); // call the base class function
+};
+
+/**
+ * Cleanup code for any timers and caches.
+ */
+conversantAnalytics.disableAnalytics = function () {
+  if (!conversantAnalyticsEnabled) {
+    return;
+  }
+
+  // Cleanup our caches and disable our timer
+  clearInterval(cacheCleanupInterval);
+  cnvrHelper.timeoutCache = {};
+  cnvrHelper.adIdLookup = {};
+  cnvrHelper.auctionIdTimestampCache = {};
+
+  conversantAnalyticsEnabled = false;
+  conversantAnalytics.originDisableAnalytics();
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: conversantAnalytics,
+  code: ANALYTICS_CODE,
+  gvlid: GVLID
+});
+
+export default conversantAnalytics;
diff --git a/modules/conversantAnalyticsAdapter.md b/modules/conversantAnalyticsAdapter.md
new file mode 100644
index 00000000000..51db983a8bd
--- /dev/null
+++ b/modules/conversantAnalyticsAdapter.md
@@ -0,0 +1,47 @@
+# Overview
+- Module Name: Conversant Bidder Adapter
+- Module Type: Analytics Adapter
+- Maintainer: mediapsr@conversantmedia.com
+
+## Description
+
+Analytics adapter for Conversant is used to track performance of Prebid auctions.  See the usage below for how to 
+configure the adapter for your webpage. To enable analytics and gain access to the data publishers will need
+ to contact their Conversant representative.
+
+## Setup
+
+Before any analytics are recorded for your website you will need to have a Conversant representative turn
+on Prebid analytics for your website.  
+
+The simplest configuration to add Conversant Prebid analytics to your page is as follows:
+
+```
+    pbjs.que.push(function() {
+        pbjs.enableAnalytics({
+            provider: 'conversant',
+            options: {
+                site_id: '<YOUR_SITE_ID>'
+            }
+        })
+    });
+```
+
+Additionally the following options are supported:
+
+- **sampleRate**: Expects an integer from 0 to 100. By default only 50% (corresponds to a value of 50) of instances are enabled
+for Conversant Prebid Analytics. This field allows the publisher to override that percentage to sample
+at a higher or lower rate. '0' would completely disable sampling and '100' would capture every instance.
+
+### Complete Example
+```
+    pbjs.que.push(function() {
+        pbjs.enableAnalytics({
+            provider: 'conversant',
+            options: {
+                site_id: '1234',
+                sampleRate: 90
+            }
+        })
+    });
+```
diff --git a/test/spec/modules/conversantAnalyticsAdapter_spec.js b/test/spec/modules/conversantAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..48b68d09bc7
--- /dev/null
+++ b/test/spec/modules/conversantAnalyticsAdapter_spec.js
@@ -0,0 +1,963 @@
+import sinon from 'sinon';
+import {expect} from 'chai';
+import {default as conversantAnalytics, CNVR_CONSTANTS, cnvrHelper} from 'modules/conversantAnalyticsAdapter';
+import * as utils from 'src/utils.js';
+import * as prebidGlobal from 'src/prebidGlobal';
+
+import constants from 'src/constants.json'
+
+let events = require('src/events');
+
+describe('Conversant analytics adapter tests', function() {
+  let sandbox; // sinon sandbox to make restoring all stubbed objects easier
+  let xhr; // xhr stub from sinon for capturing data sent via ajax
+  let clock; // clock stub from sinon to mock our cache cleanup interval
+
+  const PREBID_VERSION = '1.2';
+  const SITE_ID = 108060;
+
+  let requests = [];
+  const DATESTAMP = Date.now();
+
+  const VALID_CONFIGURATION = {
+    options: {
+      site_id: SITE_ID
+    }
+  };
+
+  const VALID_ALWAYS_SAMPLE_CONFIG = {
+    options: {
+      site_id: SITE_ID,
+      cnvr_sampling: 1
+    }
+  };
+
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(events, 'getEvents').returns([]); // need to stub this otherwise unwanted events seem to get fired during testing
+    xhr = sandbox.useFakeXMLHttpRequest(); // allows us to capture ajax requests
+    xhr.onCreate = function (req) { requests.push(req); }; // save ajax requests in a private array for testing purposes
+    let getGlobalStub = {
+      version: PREBID_VERSION,
+      getUserIds: function() { // userIdTargeting.js init() gets called on AUCTION_END so we need to mock this function.
+        return {};
+      }
+    };
+    sandbox.stub(prebidGlobal, 'getGlobal').returns(getGlobalStub); // getGlobal does not seem to be available in testing so need to mock it
+    clock = sandbox.useFakeTimers(DATESTAMP); // to use sinon fake timers they MUST be created before the interval/timeout is created in the code you are testing.
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+    requests = []; // clean up any requests in our ajax request capture array.
+  });
+
+  describe('Initialization Tests', function() {
+    it('should log error if site id is not passed', function() {
+      sandbox.stub(utils, 'logError');
+
+      conversantAnalytics.enableAnalytics();
+      expect(utils.logError.calledWith(CNVR_CONSTANTS.LOG_PREFIX + 'siteId is required.')).to.be.true;
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should not log error if valid config is passed', function() {
+      sandbox.stub(utils, 'logError');
+      sandbox.stub(utils, 'logInfo');
+
+      conversantAnalytics.enableAnalytics(VALID_CONFIGURATION);
+      expect(utils.logError.called).to.equal(false);
+      expect(utils.logInfo.called).to.equal(true);
+      expect(
+        utils.logInfo.calledWith(
+          CNVR_CONSTANTS.LOG_PREFIX + 'Conversant sample rate set to ' + CNVR_CONSTANTS.DEFAULT_SAMPLE_RATE
+        )
+      ).to.be.true;
+      expect(
+        utils.logInfo.calledWith(
+          CNVR_CONSTANTS.LOG_PREFIX + 'Global sample rate set to 1'
+        )
+      ).to.be.true;
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should sample when sampling set to 1', function() {
+      sandbox.stub(utils, 'logError');
+      conversantAnalytics.enableAnalytics(VALID_ALWAYS_SAMPLE_CONFIG);
+      expect(utils.logError.called).to.equal(false);
+      expect(cnvrHelper.doSample).to.equal(true);
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should NOT sample when sampling set to 0', function() {
+      sandbox.stub(utils, 'logError');
+      const NEVER_SAMPLE_CONFIG = utils.deepClone(VALID_ALWAYS_SAMPLE_CONFIG);
+      NEVER_SAMPLE_CONFIG['options'].cnvr_sampling = 0;
+      conversantAnalytics.enableAnalytics(NEVER_SAMPLE_CONFIG);
+      expect(utils.logError.called).to.equal(false);
+      expect(cnvrHelper.doSample).to.equal(false);
+      conversantAnalytics.disableAnalytics();
+    });
+  });
+
+  describe('Helper Function Tests', function() {
+    it('should cleanup up cache objects', function() {
+      conversantAnalytics.enableAnalytics(VALID_CONFIGURATION);
+
+      cnvrHelper.adIdLookup['keep'] = {timeReceived: DATESTAMP + 1};
+      cnvrHelper.adIdLookup['delete'] = {timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE};
+
+      cnvrHelper.timeoutCache['keep'] = {timeReceived: DATESTAMP + 1};
+      cnvrHelper.timeoutCache['delete'] = {timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE};
+
+      cnvrHelper.auctionIdTimestampCache['keep'] = {timeReceived: DATESTAMP + 1};
+      cnvrHelper.auctionIdTimestampCache['delete'] = {timeReceived: DATESTAMP - CNVR_CONSTANTS.MAX_MILLISECONDS_IN_CACHE};
+
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(2);
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(2);
+      expect(Object.keys(cnvrHelper.auctionIdTimestampCache)).to.have.lengthOf(2);
+
+      clock.tick(CNVR_CONSTANTS.CACHE_CLEANUP_TIME_IN_MILLIS);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(1);
+      expect(Object.keys(cnvrHelper.auctionIdTimestampCache)).to.have.lengthOf(1);
+
+      conversantAnalytics.disableAnalytics();
+
+      // After disable we should cleanup the cache
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.auctionIdTimestampCache)).to.have.lengthOf(0);
+    });
+
+    it('createBid() should return correct object', function() {
+      const EVENT_CODE = 1;
+      const TIME = 2;
+      let bid = cnvrHelper.createBid(EVENT_CODE, 2);
+      expect(bid).to.deep.equal({'eventCodes': [EVENT_CODE], 'timeToRespond': TIME});
+    });
+
+    it('createAdUnit() should return correct object', function() {
+      let adUnit = cnvrHelper.createAdUnit();
+      expect(adUnit).to.deep.equal({
+        sizes: [],
+        mediaTypes: [],
+        bids: {}
+      });
+    });
+
+    it('createAdSize() should return correct object', function() {
+      let adSize = cnvrHelper.createAdSize(1, 2);
+      expect(adSize).to.deep.equal({w: 1, h: 2});
+
+      adSize = cnvrHelper.createAdSize();
+      expect(adSize).to.deep.equal({w: -1, h: -1});
+
+      adSize = cnvrHelper.createAdSize('foo', 'bar');
+      expect(adSize).to.deep.equal({w: -1, h: -1});
+    });
+
+    it('getLookupKey() should return correct object', function() {
+      let key = cnvrHelper.getLookupKey(undefined, undefined, undefined);
+      expect(key).to.equal('undefined-undefined-undefined');
+
+      key = cnvrHelper.getLookupKey('foo', 'bar', 'baz');
+      expect(key).to.equal('foo-bar-baz');
+    });
+
+    it('createPayload() should return correct object', function() {
+      const REQUEST_TYPE = 'foo';
+      const AUCTION_ID = '124 abc';
+      const myDate = Date.now();
+      conversantAnalytics.enableAnalytics(VALID_ALWAYS_SAMPLE_CONFIG);
+
+      let payload = cnvrHelper.createPayload(REQUEST_TYPE, AUCTION_ID, myDate);
+      expect(payload).to.deep.equal({
+        cnvrSampleRate: 1,
+        globalSampleRate: 1,
+        requestType: REQUEST_TYPE,
+        auction: {
+          auctionId: AUCTION_ID,
+          auctionTimestamp: myDate,
+          sid: VALID_ALWAYS_SAMPLE_CONFIG.options.site_id,
+          preBidVersion: PREBID_VERSION
+        },
+        adUnits: {}
+      });
+
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('keyExistsAndIsObject() should return correct data', function() {
+      let data = {
+        a: [],
+        b: 1,
+        c: 'foo',
+        d: function () { return true; },
+        e: {}
+      };
+      expect(cnvrHelper.keyExistsAndIsObject(data, 'foobar')).to.be.false;
+      expect(cnvrHelper.keyExistsAndIsObject(data, 'a')).to.be.false;
+      expect(cnvrHelper.keyExistsAndIsObject(data, 'b')).to.be.false;
+      expect(cnvrHelper.keyExistsAndIsObject(data, 'c')).to.be.false;
+      expect(cnvrHelper.keyExistsAndIsObject(data, 'd')).to.be.false;
+      expect(cnvrHelper.keyExistsAndIsObject(data, 'e')).to.be.true;
+    });
+
+    it('deduplicateArray() should return correct data', function () {
+      let arrayOfObjects = [{w: 1, h: 2}, {w: 2, h: 3}, {w: 1, h: 2}];
+      let array = [3, 2, 1, 1, 2, 3];
+      let empty;
+      let notArray = 3;
+      let emptyArray = [];
+
+      expect(JSON.stringify(cnvrHelper.deduplicateArray(array))).to.equal(JSON.stringify([3, 2, 1]));
+      expect(JSON.stringify(cnvrHelper.deduplicateArray(arrayOfObjects))).to.equal(JSON.stringify([{w: 1, h: 2}, {w: 2, h: 3}]));
+      expect(JSON.stringify(cnvrHelper.deduplicateArray(emptyArray))).to.equal(JSON.stringify([]));
+      expect(cnvrHelper.deduplicateArray(empty)).to.be.undefined;
+      expect(cnvrHelper.deduplicateArray(notArray)).to.equal(notArray);
+    });
+
+    it('getSampleRate() should return correct data', function () {
+      let obj = {
+        sampling: 1,
+        cnvr_sampling: 0.5,
+        too_big: 1.2,
+        too_small: -1,
+        string: 'foo',
+        object: {},
+      }
+      const DEFAULT_VAL = 0.11;
+      expect(cnvrHelper.getSampleRate(obj, 'sampling', DEFAULT_VAL)).to.equal(1);
+      expect(cnvrHelper.getSampleRate(obj, 'cnvr_sampling', DEFAULT_VAL)).to.equal(0.5);
+      expect(cnvrHelper.getSampleRate(obj, 'too_big', DEFAULT_VAL)).to.equal(DEFAULT_VAL);
+      expect(cnvrHelper.getSampleRate(obj, 'string', DEFAULT_VAL)).to.equal(DEFAULT_VAL);
+      expect(cnvrHelper.getSampleRate(obj, 'object', DEFAULT_VAL)).to.equal(DEFAULT_VAL);
+      expect(cnvrHelper.getSampleRate(obj, 'not_a_key', DEFAULT_VAL)).to.equal(DEFAULT_VAL);
+      expect(cnvrHelper.getSampleRate(obj, 'too_small', DEFAULT_VAL)).to.equal(0);
+    });
+  });
+
+  describe('Bid Timeout Event Tests', function() {
+    const BID_TIMEOUT_PAYLOAD = [{
+      'bidId': '80882409358b8a8',
+      'bidder': 'conversant',
+      'adUnitCode': 'MedRect',
+      'auctionId': 'afbd6e0b-e45b-46ab-87bf-c0bac0cb8881'
+    }, {
+      'bidId': '9da4c107a6f24c8',
+      'bidder': 'conversant',
+      'adUnitCode': 'Leaderboard',
+      'auctionId': 'afbd6e0b-e45b-46ab-87bf-c0bac0cb8881'
+    }];
+
+    beforeEach(function () {
+      conversantAnalytics.enableAnalytics(VALID_ALWAYS_SAMPLE_CONFIG);
+    });
+
+    afterEach(function () {
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should put both items in timeout cache', function() {
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(0);
+      events.emit(constants.EVENTS.BID_TIMEOUT, BID_TIMEOUT_PAYLOAD);
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(2);
+
+      BID_TIMEOUT_PAYLOAD.forEach(timeoutBid => {
+        const key = cnvrHelper.getLookupKey(timeoutBid.auctionId, timeoutBid.adUnitCode, timeoutBid.bidder);
+        expect(cnvrHelper.timeoutCache[key].timeReceived).to.not.be.undefined;
+      });
+      expect(requests).to.have.lengthOf(0);
+    });
+  });
+
+  describe('Render Failed Tests', function() {
+    const RENDER_FAILED_PAYLOAD = {
+      reason: 'reason',
+      message: 'value',
+      adId: '57e03aeafd83a68'
+    };
+
+    const RENDER_FAILED_PAYLOAD_NO_ADID = {
+      reason: 'reason',
+      message: 'value'
+    };
+
+    beforeEach(function () {
+      conversantAnalytics.enableAnalytics(VALID_ALWAYS_SAMPLE_CONFIG);
+    });
+
+    afterEach(function () {
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should empty adIdLookup and send data', function() {
+      cnvrHelper.adIdLookup[RENDER_FAILED_PAYLOAD.adId] = {
+        bidderCode: 'bidderCode',
+        adUnitCode: 'adUnitCode',
+        auctionId: 'auctionId',
+        timeReceived: Date.now()
+      };
+
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
+      events.emit(constants.EVENTS.AD_RENDER_FAILED, RENDER_FAILED_PAYLOAD);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0); // object should be removed
+      expect(requests).to.have.lengthOf(1);
+      const data = JSON.parse(requests[0].requestBody);
+
+      expect(data.auction.auctionId).to.equal('auctionId');
+      expect(data.auction.preBidVersion).to.equal(PREBID_VERSION);
+      expect(data.auction.sid).to.equal(SITE_ID);
+      expect(data.adUnits['adUnitCode'].bids['bidderCode'][0].eventCodes.includes(CNVR_CONSTANTS.RENDER_FAILED)).to.be.true;
+      expect(data.adUnits['adUnitCode'].bids['bidderCode'][0].message).to.have.lengthOf.above(0);
+    });
+
+    it('should not send data if no adId', function() {
+      cnvrHelper.adIdLookup[RENDER_FAILED_PAYLOAD.adId] = {
+        bidderCode: 'bidderCode',
+        adUnitCode: 'adUnitCode',
+        auctionId: 'auctionId',
+        timeReceived: Date.now()
+      };
+
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
+      events.emit(constants.EVENTS.AD_RENDER_FAILED, RENDER_FAILED_PAYLOAD_NO_ADID);
+      expect(requests).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1); // same object in cache as before... no change
+      expect(cnvrHelper.adIdLookup[RENDER_FAILED_PAYLOAD.adId]).to.not.be.undefined;
+    });
+
+    it('should not send data if bad data in lookup', function() {
+      cnvrHelper.adIdLookup[RENDER_FAILED_PAYLOAD.adId] = {
+        bidderCode: 'bidderCode',
+        auctionId: 'auctionId',
+        timeReceived: Date.now()
+      };
+      expect(requests).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
+      events.emit(constants.EVENTS.AD_RENDER_FAILED, RENDER_FAILED_PAYLOAD);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0); // object should be removed but no call made to send data
+      expect(requests).to.have.lengthOf(0);
+    });
+  });
+
+  describe('Bid Won Tests', function() {
+    const GOOD_BID_WON_ARGS = {
+      bidderCode: 'conversant',
+      width: 300,
+      height: 250,
+      statusMessage: 'Bid available',
+      adId: '57e03aeafd83a68',
+      requestId: '2c2a5485a076898',
+      mediaType: 'banner',
+      source: 'client',
+      currency: 'USD',
+      cpm: 4,
+      creativeId: '29123_55016759',
+      ttl: 300,
+      netRevenue: true,
+      ad: '<foobar add goes here />',
+      originalCpm: 0.04,
+      originalCurrency: 'USD',
+      auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+      responseTimestamp: 1583851418626,
+      requestTimestamp: 1583851418292,
+      bidder: 'conversant',
+      adUnitCode: 'div-gpt-ad-1460505748561-0',
+      timeToRespond: 334,
+      pbLg: '4.00',
+      pbMg: '4.00',
+      pbHg: '4.00',
+      pbAg: '4.00',
+      pbDg: '4.00',
+      pbCg: '',
+      size: '300x250',
+      adserverTargeting: {
+        hb_bidder: 'conversant',
+        hb_adid: '57e03aeafd83a68',
+        hb_pb: '4.00',
+        hb_size: '300x250',
+        hb_source: 'client',
+        hb_format: 'banner'
+      },
+      status: 'rendered',
+      params: [
+        {
+          site_id: '108060'
+        }
+      ]
+    };
+
+    // no adUnitCode, auctionId or bidderCode will cause a failure
+    const BAD_BID_WON_ARGS = {
+      bidderCode: 'conversant',
+      width: 300,
+      height: 250,
+      statusMessage: 'Bid available',
+      adId: '57e03aeafd83a68',
+      requestId: '2c2a5485a076898',
+      mediaType: 'banner',
+      source: 'client',
+      currency: 'USD',
+      cpm: 4,
+      originalCpm: 0.04,
+      originalCurrency: 'USD',
+      bidder: 'conversant',
+      adUnitCode: 'div-gpt-ad-1460505748561-0',
+      size: '300x250',
+      status: 'rendered',
+      params: [
+        {
+          site_id: '108060'
+        }
+      ]
+    };
+
+    beforeEach(function () {
+      conversantAnalytics.enableAnalytics(VALID_ALWAYS_SAMPLE_CONFIG);
+    });
+
+    afterEach(function () {
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should not send data or put a record in adIdLookup when bad data provided', function() {
+      expect(requests).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0);
+      events.emit(constants.EVENTS.BID_WON, BAD_BID_WON_ARGS);
+      expect(requests).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0);
+    });
+
+    it('should send data and put a record in adIdLookup', function() {
+      const myAuctionStart = Date.now();
+      cnvrHelper.auctionIdTimestampCache[GOOD_BID_WON_ARGS.auctionId] = {timeReceived: myAuctionStart};
+
+      expect(requests).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(0);
+      events.emit(constants.EVENTS.BID_WON, GOOD_BID_WON_ARGS);
+
+      // Check that adIdLookup was set correctly
+      expect(Object.keys(cnvrHelper.adIdLookup)).to.have.lengthOf(1);
+      expect(cnvrHelper.adIdLookup[GOOD_BID_WON_ARGS.adId].auctionId).to.equal(GOOD_BID_WON_ARGS.auctionId);
+      expect(cnvrHelper.adIdLookup[GOOD_BID_WON_ARGS.adId].adUnitCode).to.equal(GOOD_BID_WON_ARGS.adUnitCode);
+      expect(cnvrHelper.adIdLookup[GOOD_BID_WON_ARGS.adId].bidderCode).to.equal(GOOD_BID_WON_ARGS.bidderCode);
+      expect(cnvrHelper.adIdLookup[GOOD_BID_WON_ARGS.adId].timeReceived).to.not.be.undefined;
+
+      expect(requests).to.have.lengthOf(1);
+      const data = JSON.parse(requests[0].requestBody);
+      expect(data.requestType).to.equal('bid_won');
+      expect(data.auction.auctionId).to.equal(GOOD_BID_WON_ARGS.auctionId);
+      expect(data.auction.preBidVersion).to.equal(PREBID_VERSION);
+      expect(data.auction.sid).to.equal(VALID_ALWAYS_SAMPLE_CONFIG.options.site_id);
+      expect(data.auction.auctionTimestamp).to.equal(myAuctionStart);
+
+      expect(typeof data.adUnits).to.equal('object');
+      expect(Object.keys(data.adUnits)).to.have.lengthOf(1);
+
+      expect(Object.keys(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids)).to.have.lengthOf(1);
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].eventCodes.includes(CNVR_CONSTANTS.WIN)).to.be.true;
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].cpm).to.equal(GOOD_BID_WON_ARGS.cpm);
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].originalCpm).to.equal(GOOD_BID_WON_ARGS.originalCpm);
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].currency).to.equal(GOOD_BID_WON_ARGS.currency);
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].timeToRespond).to.equal(GOOD_BID_WON_ARGS.timeToRespond);
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].adSize.w).to.equal(GOOD_BID_WON_ARGS.width);
+      expect(data.adUnits[GOOD_BID_WON_ARGS.adUnitCode].bids[GOOD_BID_WON_ARGS.bidderCode][0].adSize.h).to.equal(GOOD_BID_WON_ARGS.height);
+    });
+  });
+
+  describe('Auction End Tests', function() {
+    const AUCTION_END_PAYLOAD = {
+      auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+      timestamp: 1583851418288,
+      auctionEnd: 1583851418628,
+      auctionStatus: 'completed',
+      adUnits: [
+        {
+          code: 'div-gpt-ad-1460505748561-0',
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [300, 250],
+                [100, 200]
+              ]
+            }
+          },
+          bids: [
+            {
+              bidder: 'appnexus',
+              params: {
+                placementId: 13144370
+              }
+            },
+            {
+              bidder: 'conversant',
+              params: {
+                site_id: '108060'
+              }
+            }
+          ],
+          sizes: [
+            [300, 250],
+            [100, 200]
+          ],
+          transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba17'
+        },
+        {
+          code: 'div-gpt-ad-1460505748561-0',
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [300, 250],
+                [100, 200]
+              ]
+            },
+            video: {
+              playerSize: [
+                [300, 250],
+                [600, 400]
+              ]
+            }
+          },
+          sizes: [
+            [300, 250],
+            [100, 200],
+            [600, 400]
+          ],
+          bids: [
+            {
+              bidder: 'appnexus',
+              params: {
+                placementId: 13144370
+              }
+            },
+            {
+              bidder: 'conversant',
+              params: {
+                site_id: '108060'
+              }
+            }
+          ],
+          transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba18'
+        },
+        {
+          code: 'div-gpt-ad-1460505748561-1',
+          mediaTypes: {
+            native: {
+              type: 'image'
+            }
+          },
+          bids: [
+            {
+              bidder: 'appnexus',
+              params: {
+                placementId: 13144371
+              }
+            }
+          ],
+          transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba10'
+        }
+      ],
+      adUnitCodes: [
+        'div-gpt-ad-1460505748561-0'
+      ],
+      bidderRequests: [
+        {
+          bidderCode: 'conversant',
+          auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+          bidderRequestId: '13f16db358d4c58',
+          bids: [
+            {
+              bidder: 'conversant',
+              params: {
+                site_id: '108060'
+              },
+              mediaTypes: {
+                banner: {
+                  sizes: [
+                    [
+                      300,
+                      250
+                    ]
+                  ]
+                }
+              },
+              adUnitCode: 'div-gpt-ad-1460505748561-0',
+              transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba17',
+              sizes: [
+                [
+                  300,
+                  250
+                ]
+              ],
+              bidId: '2c2a5485a076898',
+              bidderRequestId: '13f16db358d4c58',
+              auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+              src: 'client',
+              bidRequestsCount: 1,
+              bidderRequestsCount: 1,
+              bidderWinsCount: 0
+            }
+          ],
+          auctionStart: 1583851418288,
+          timeout: 3000,
+          refererInfo: {
+            referer: 'http://localhost:9999/integrationExamples/gpt/hello_analytics1.html',
+            reachedTop: true,
+            numIframes: 0,
+            stack: [
+              'http://localhost:9999/integrationExamples/gpt/hello_analytics1.html'
+            ]
+          },
+          start: 1583851418292
+        },
+        {
+          bidderCode: 'appnexus',
+          auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+          bidderRequestId: '3e8179f67f31b98',
+          bids: [
+            {
+              bidder: 'appnexus',
+              params: {
+                placementId: 13144370
+              },
+              mediaTypes: {
+                banner: {
+                  sizes: [
+                    [
+                      300,
+                      250
+                    ]
+                  ]
+                }
+              },
+              adUnitCode: 'div-gpt-ad-1460505748561-0',
+              transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba17',
+              sizes: [
+                [
+                  300,
+                  250
+                ]
+              ],
+              bidId: '40a1d3ac6b79668',
+              bidderRequestId: '3e8179f67f31b98',
+              auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+              src: 'client',
+              bidRequestsCount: 1,
+              bidderRequestsCount: 1,
+              bidderWinsCount: 0
+            },
+            {
+              bidder: 'appnexus',
+              params: {
+                placementId: 13144370
+              },
+              mediaTypes: {
+                native: {
+                  type: 'image'
+                }
+              },
+              adUnitCode: 'div-gpt-ad-1460505748561-1',
+              transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba17',
+              sizes: [],
+              bidId: '40a1d3ac6b79668',
+              bidderRequestId: '3e8179f67f31b98',
+              auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+              src: 'client',
+              bidRequestsCount: 1,
+              bidderRequestsCount: 1,
+              bidderWinsCount: 0
+            }
+          ],
+          auctionStart: 1583851418288,
+          timeout: 3000,
+          refererInfo: {
+            referer: 'http://localhost:9999/integrationExamples/gpt/hello_analytics1.html',
+            reachedTop: true,
+            numIframes: 0,
+            stack: [
+              'http://localhost:9999/integrationExamples/gpt/hello_analytics1.html'
+            ]
+          },
+          start: 1583851418295
+        }
+      ],
+      noBids: [
+        {
+          bidder: 'appnexus',
+          params: {
+            placementId: 13144370
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [
+                  300,
+                  250
+                ]
+              ]
+            }
+          },
+          adUnitCode: 'div-gpt-ad-1460505748561-0',
+          transactionId: '5fa8a7d7-2a73-4d1c-b73a-ff9f5b53ba17',
+          sizes: [
+            [
+              300,
+              250
+            ]
+          ],
+          bidId: '40a1d3ac6b79668',
+          bidderRequestId: '3e8179f67f31b98',
+          auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+          src: 'client',
+          bidRequestsCount: 1,
+          bidderRequestsCount: 1,
+          bidderWinsCount: 0
+        }
+      ],
+      bidsReceived: [
+        {
+          bidderCode: 'conversant',
+          width: 300,
+          height: 250,
+          statusMessage: 'Bid available',
+          adId: '57e03aeafd83a68',
+          requestId: '2c2a5485a076898',
+          mediaType: 'banner',
+          source: 'client',
+          currency: 'USD',
+          cpm: 4,
+          creativeId: '29123_55016759',
+          ttl: 300,
+          netRevenue: true,
+          ad: '<foobar add goes here />',
+          originalCpm: 0.04,
+          originalCurrency: 'USD',
+          auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+          responseTimestamp: 1583851418626,
+          requestTimestamp: 1583851418292,
+          bidder: 'conversant',
+          adUnitCode: 'div-gpt-ad-1460505748561-0',
+          timeToRespond: 334,
+          pbLg: '4.00',
+          pbMg: '4.00',
+          pbHg: '4.00',
+          pbAg: '4.00',
+          pbDg: '4.00',
+          pbCg: '',
+          size: '300x250',
+          adserverTargeting: {
+            hb_bidder: 'conversant',
+            hb_adid: '57e03aeafd83a68',
+            hb_pb: '4.00',
+            hb_size: '300x250',
+            hb_source: 'client',
+            hb_format: 'banner'
+          }
+        }, {
+          bidderCode: 'conversant',
+          height: 100,
+          statusMessage: 'Bid available',
+          width: 200,
+          adId: '57e03aeafd83a68',
+          requestId: '2c2a5485a076898',
+          mediaType: 'banner',
+          source: 'client',
+          currency: 'USD',
+          cpm: 4,
+          creativeId: '29123_55016759',
+          ttl: 300,
+          netRevenue: true,
+          ad: '<foobar add goes here />',
+          originalCpm: 0.04,
+          originalCurrency: 'USD',
+          auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+          responseTimestamp: 1583851418626,
+          requestTimestamp: 1583851418292,
+          bidder: 'conversant',
+          adUnitCode: 'div-gpt-ad-1460505748561-0',
+          timeToRespond: 334,
+          pbLg: '4.00',
+          pbMg: '4.00',
+          pbHg: '4.00',
+          pbAg: '4.00',
+          pbDg: '4.00',
+          pbCg: '',
+          size: '100x200',
+          adserverTargeting: {
+            hb_bidder: 'conversant',
+            hb_adid: '57e03aeafd83a68',
+            hb_pb: '4.00',
+            hb_size: '300x250',
+            hb_source: 'client',
+            hb_format: 'banner'
+          }
+        }, {
+          bidderCode: 'appnexus',
+          statusMessage: 'Bid available',
+          adId: '57e03aeafd83a68',
+          requestId: '2c2a5485a076898',
+          mediaType: 'native',
+          source: 'client',
+          currency: 'USD',
+          cpm: 4,
+          creativeId: '29123_55016759',
+          ttl: 300,
+          netRevenue: true,
+          ad: '<foobar add goes here />',
+          originalCpm: 0.04,
+          originalCurrency: 'USD',
+          auctionId: '85e1bf44-4035-4e24-bd3c-b1ba367fe294',
+          responseTimestamp: 1583851418626,
+          requestTimestamp: 1583851418292,
+          bidder: 'appnexus',
+          adUnitCode: 'div-gpt-ad-1460505748561-1',
+          timeToRespond: 334,
+          pbLg: '4.00',
+          pbMg: '4.00',
+          pbHg: '4.00',
+          pbAg: '4.00',
+          pbDg: '4.00',
+          pbCg: '',
+          adserverTargeting: {
+            hb_bidder: 'appnexus',
+            hb_adid: '57e03aeafd83a68',
+            hb_pb: '4.00',
+            hb_size: '300x250',
+            hb_source: 'client',
+            hb_format: 'banner'
+          }
+        }
+      ],
+      winningBids: [],
+      timeout: 3000
+    };
+
+    beforeEach(function () {
+      conversantAnalytics.enableAnalytics(VALID_ALWAYS_SAMPLE_CONFIG);
+    });
+
+    afterEach(function () {
+      conversantAnalytics.disableAnalytics();
+    });
+
+    it('should not do anything when auction id doesnt exist', function() {
+      sandbox.stub(utils, 'logError');
+
+      let BAD_ARGS = JSON.parse(JSON.stringify(AUCTION_END_PAYLOAD));
+      delete BAD_ARGS.auctionId;
+      expect(requests).to.have.lengthOf(0);
+      events.emit(constants.EVENTS.AUCTION_END, BAD_ARGS);
+      expect(requests).to.have.lengthOf(0);
+      expect(
+        utils.logError.calledWith(
+          CNVR_CONSTANTS.LOG_PREFIX + 'onAuctionEnd(): No auctionId in args supplied so unable to process event.'
+        )
+      ).to.be.true;
+    });
+
+    it('should send the expected data', function() {
+      sandbox.stub(utils, 'logError');
+      sandbox.stub(utils, 'logWarn'); /* .callsFake((arg, arg1, arg2) => { //debugging stuff
+        console.error(arg);
+        if (arg1) console.error(arg1);
+        if (arg2) console.error(arg2);
+      }); */
+      expect(requests).to.have.lengthOf(0);
+      const AUCTION_ID = AUCTION_END_PAYLOAD.auctionId;
+      const AD_UNIT_CODE = AUCTION_END_PAYLOAD.adUnits[0].code;
+      const AD_UNIT_CODE_NATIVE = AUCTION_END_PAYLOAD.adUnits[2].code;
+      const timeoutKey = cnvrHelper.getLookupKey(AUCTION_ID, AD_UNIT_CODE, 'appnexus');
+      cnvrHelper.timeoutCache[timeoutKey] = { timeReceived: Date.now() };
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(1);
+      expect(utils.logError.called).to.equal(false);
+      expect(Object.keys(cnvrHelper.auctionIdTimestampCache)).to.have.lengthOf(0);
+
+      events.emit(constants.EVENTS.AUCTION_END, AUCTION_END_PAYLOAD);
+      expect(utils.logError.called).to.equal(false);
+      expect(requests).to.have.lengthOf(1);
+      expect(Object.keys(cnvrHelper.timeoutCache)).to.have.lengthOf(0);
+      expect(Object.keys(cnvrHelper.auctionIdTimestampCache)).to.have.lengthOf(1);
+      expect(cnvrHelper.auctionIdTimestampCache[AUCTION_END_PAYLOAD.auctionId].timeReceived).to.equal(AUCTION_END_PAYLOAD.timestamp);
+
+      const data = JSON.parse(requests[0].requestBody);
+      expect(data.requestType).to.equal('auction_end');
+      expect(data.auction.auctionId).to.equal(AUCTION_ID);
+      expect(data.auction.preBidVersion).to.equal(PREBID_VERSION);
+      expect(data.auction.sid).to.equal(VALID_ALWAYS_SAMPLE_CONFIG.options.site_id);
+
+      expect(Object.keys(data.adUnits)).to.have.lengthOf(2);
+
+      expect(data.adUnits[AD_UNIT_CODE].sizes).to.have.lengthOf(3);
+      expect(data.adUnits[AD_UNIT_CODE].sizes[0].w).to.equal(300);
+      expect(data.adUnits[AD_UNIT_CODE].sizes[0].h).to.equal(250);
+      expect(data.adUnits[AD_UNIT_CODE].sizes[1].w).to.equal(100);
+      expect(data.adUnits[AD_UNIT_CODE].sizes[1].h).to.equal(200);
+      expect(data.adUnits[AD_UNIT_CODE].sizes[2].w).to.equal(600);
+      expect(data.adUnits[AD_UNIT_CODE].sizes[2].h).to.equal(400);
+
+      expect(data.adUnits[AD_UNIT_CODE].mediaTypes).to.have.lengthOf(2);
+      expect(data.adUnits[AD_UNIT_CODE].mediaTypes[0]).to.equal('banner');
+      expect(data.adUnits[AD_UNIT_CODE].mediaTypes[1]).to.equal('video');
+
+      expect(data.adUnits[AD_UNIT_CODE_NATIVE].mediaTypes).to.have.lengthOf(1);
+      expect(data.adUnits[AD_UNIT_CODE_NATIVE].mediaTypes[0]).to.equal('native');
+      expect(data.adUnits[AD_UNIT_CODE_NATIVE].sizes).to.have.lengthOf(0);
+
+      expect(Object.keys(data.adUnits[AD_UNIT_CODE].bids)).to.have.lengthOf(2);
+      const cnvrBidsArray = data.adUnits[AD_UNIT_CODE].bids['conversant'];
+      // testing multiple bids from same bidder
+      expect(cnvrBidsArray).to.have.lengthOf(2);
+      expect(cnvrBidsArray[0].eventCodes.includes(CNVR_CONSTANTS.BID)).to.be.true;
+      expect(cnvrBidsArray[0].cpm).to.equal(4);
+      expect(cnvrBidsArray[0].originalCpm).to.equal(0.04);
+      expect(cnvrBidsArray[0].currency).to.equal('USD');
+      expect(cnvrBidsArray[0].timeToRespond).to.equal(334);
+      expect(cnvrBidsArray[0].adSize.w).to.equal(300);
+      expect(cnvrBidsArray[0].adSize.h).to.equal(250);
+      expect(cnvrBidsArray[0].mediaType).to.equal('banner');
+      // 2nd bid different size
+      expect(cnvrBidsArray[1].eventCodes.includes(CNVR_CONSTANTS.BID)).to.be.true;
+      expect(cnvrBidsArray[1].cpm).to.equal(4);
+      expect(cnvrBidsArray[1].originalCpm).to.equal(0.04);
+      expect(cnvrBidsArray[1].currency).to.equal('USD');
+      expect(cnvrBidsArray[1].timeToRespond).to.equal(334);
+      expect(cnvrBidsArray[1].adSize.w).to.equal(200);
+      expect(cnvrBidsArray[1].adSize.h).to.equal(100);
+      expect(cnvrBidsArray[1].mediaType).to.equal('banner');
+
+      const apnBidsArray = data.adUnits[AD_UNIT_CODE].bids['appnexus'];
+      expect(apnBidsArray).to.have.lengthOf(2);
+      let apnBid = apnBidsArray[0];
+      expect(apnBid.originalCpm).to.be.undefined;
+      expect(apnBid.eventCodes.includes(CNVR_CONSTANTS.TIMEOUT)).to.be.true;
+      expect(apnBid.cpm).to.be.undefined;
+      expect(apnBid.currency).to.be.undefined;
+      expect(apnBid.timeToRespond).to.equal(3000);
+      expect(apnBid.adSize).to.be.undefined;
+      expect(apnBid.mediaType).to.be.undefined;
+      apnBid = apnBidsArray[1];
+      expect(apnBid.originalCpm).to.be.undefined;
+      expect(apnBid.eventCodes.includes(CNVR_CONSTANTS.NO_BID)).to.be.true;
+      expect(apnBid.cpm).to.be.undefined;
+      expect(apnBid.currency).to.be.undefined;
+      expect(apnBid.timeToRespond).to.equal(0);
+      expect(apnBid.adSize).to.be.undefined;
+      expect(apnBid.mediaType).to.be.undefined;
+
+      expect(Object.keys(data.adUnits[AD_UNIT_CODE_NATIVE].bids)).to.have.lengthOf(1);
+      const apnNativeBidsArray = data.adUnits[AD_UNIT_CODE_NATIVE].bids['appnexus'];
+      expect(apnNativeBidsArray).to.have.lengthOf(1);
+      const apnNativeBid = apnNativeBidsArray[0];
+      expect(apnNativeBid.eventCodes.includes(CNVR_CONSTANTS.BID)).to.be.true;
+      expect(apnNativeBid.cpm).to.equal(4);
+      expect(apnNativeBid.originalCpm).to.equal(0.04);
+      expect(apnNativeBid.currency).to.equal('USD');
+      expect(apnNativeBid.timeToRespond).to.equal(334);
+      expect(apnNativeBid.adSize.w).to.be.undefined;
+      expect(apnNativeBid.adSize.h).to.be.undefined;
+      expect(apnNativeBid.mediaType).to.equal('native');
+    });
+  });
+});

From a86b60a1eec59ef7d8511a4f5671270f6c615053 Mon Sep 17 00:00:00 2001
From: TheMediaGrid <44166371+TheMediaGrid@users.noreply.github.com>
Date: Thu, 6 Oct 2022 12:48:23 +0300
Subject: [PATCH 315/569] TheMediaGrid: Support multiRequest param (#9061)

* Added TheMediaGridNM Bid Adapter

* Updated required params for TheMediaGridNM Bid Adapter

* Update TheMediGridNM Bid Adapter

* Fix tests for TheMediaGridNM Bid Adapter

* Fixes after review for TheMediaGridNM Bid Adapter

* Add support of multi-format in TheMediaGrid Bid Adapter

* Update sync url for grid and gridNM Bid Adapters

* TheMediaGrid Bid Adapter: added keywords adUnit parameter

* Update TheMediaGrid Bid Adapter to support keywords from config

* Implement new request format for TheMediaGrid Bid Adapter

* Fix jwpseg params for TheMediaGrid Bid Adapter

* Update unit tests for The Media Grid Bid Adapter

* Fix typo in TheMediaGrid Bid Adapter

* Added test for jwTargeting in TheMediaGrid Bid Adapter

* The new request format was made by default in TheMediaGrid Bid Adapter

* Update userId format in ad request for TheMediaGrid Bid Adapter

* Added bidFloor parameter for TheMediaGrid Bid Adapter

* Fix for review TheMediaGrid Bid Adapter

* Support floorModule in TheMediaGrid Bid Adapter

* Fix empty bidfloor for TheMediaGrid Bid Adapter

* Some change to restart autotests

* Fix userIds format for TheMediaGrid Bid Adapter

* Remove digitrust userId from TheMediaGrid Bid Adapter

* Protocols was added in video section in ad request for TheMediaGrid Bid Adapter

* TheMediaGrid: fix trouble with alias using

* TheMediaGridNM: fix trouble with alias

* TheMediaGrid Bid Adapter: added support of PBAdSlot module

* TheMediaGrid Bid Adapter: fix typo

* GridNM Bid Adapter: use absent in params data from mediaTypes

* GridNM Bid Adapter: fix md file + add advertiserDomains support

* TheMediaGrid and gridNM Bid Adapter: minor netRevenue fixes

* gridNM Bid Adapter updates after review

* TheMediaGrid Bid Adapter: fix keywords workflow

* fix testing and kick off lgtm again

* TheMediaGrid: added ext.bidder.grid.demandSource processing

* TheMediaGrid: added user.id from fpd cookie

* TheMediaGrid: control cookie setting via bidder config

* TheMediaGrid: use localStorage instead cookie

* TheMediaGridNM Bid Adapter: update adapter to use /hbjson endpoint

* TheMediaGridNM: fix unnecessary conditions

* TheMediaGrid: fix bug with nurl field in response

* TheMediaGrid: update test

* TheMediaGridNM: fix possible bug with nurl

* TheMediaGrid: added alias as playwire

* TheMediaGrid: added alias as adlivetech

* TheMediaGrid: fix sync url workflow

* TrustX: fix sync url worflow + remove old syncurl

* TheMediaGrid: added instl support

* TheMediaGrid: fix test for instl

* TheMediaGrid: update md file

* TheMediaGrid: reformat segments for permutive rtd module

* TrustX: send all ortb2.user.data in user.data

* TheMediaGrid: remove permutive segments reformating

* TrustX: remove permutive segments reformating

* TheMediaGrid & TrustX: fix typo

* TheMediaGrid: support bid.ortb2.site.content

* TheMediaGrid: support multiRequest param

* TheMediaGrid: add test for multiRequest case

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/gridBidAdapter.js                | 304 ++++++++++++++---------
 test/spec/modules/gridBidAdapter_spec.js | 118 ++++++---
 2 files changed, 274 insertions(+), 148 deletions(-)

diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index 3ac67df0016..e46d6e352fa 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -72,10 +72,14 @@ export const spec = {
     let forceBidderName = false;
     let {bidderRequestId, auctionId, gdprConsent, uspConsent, timeout, refererInfo} = bidderRequest || {};
 
-    // TODO: is 'page' the right value here?
     const referer = refererInfo ? encodeURIComponent(refererInfo.page) : '';
+    const bidderTimeout = config.getConfig('bidderTimeout') || timeout;
+    const tmax = timeout ? Math.min(bidderTimeout, timeout) : bidderTimeout;
     const imp = [];
     const bidsMap = {};
+    const requests = [];
+    const sources = [];
+    const bidsArray = [];
 
     validBidRequests.forEach((bid) => {
       if (!bidderRequestId) {
@@ -93,7 +97,8 @@ export const spec = {
       if (!endpoint) {
         endpoint = ALIAS_CONFIG[bid.bidder] && ALIAS_CONFIG[bid.bidder].endpoint;
       }
-      const { params: { uid, keywords, forceBidder }, mediaTypes, bidId, adUnitCode, rtd, ortb2Imp } = bid;
+      const { params: { uid, keywords, forceBidder, multiRequest }, mediaTypes, bidId, adUnitCode, rtd, ortb2Imp } = bid;
+      const { pubdata, secid, pubid, source, content: bidParamsContent } = bid.params;
       bidsMap[bidId] = bid;
       const bidFloor = _getFloor(mediaTypes || {}, bid);
       const jwTargeting = rtd && rtd.jwplayer && rtd.jwplayer.targeting;
@@ -105,9 +110,10 @@ export const spec = {
           content = jwTargeting.content;
         }
       }
+
       let impObj = {
         id: bidId.toString(),
-        tagid: uid.toString(),
+        tagid: (secid || uid).toString(),
         ext: {
           divid: adUnitCode.toString()
         }
@@ -150,7 +156,54 @@ export const spec = {
       }
 
       if (impObj.banner || impObj.video) {
-        imp.push(impObj);
+        if (multiRequest) {
+          const reqSource = {
+            tid: bid.auctionId && bid.auctionId.toString(),
+            ext: {
+              wrapper: 'Prebid_js',
+              wrapper_version: '$prebid.version$'
+            }
+          };
+          if (bid.schain) {
+            reqSource.ext.schain = bid.schain;
+          }
+          const request = {
+            id: bid.bidderRequestId && bid.bidderRequestId.toString(),
+            site: {
+              page: referer,
+            },
+            tmax,
+            source: reqSource,
+            imp: [impObj]
+          };
+
+          if (pubid) {
+            request.site.publisher = { id: pubid };
+          }
+
+          const reqJwpseg = (pubdata && pubdata.jwpseg) || (jwTargeting && jwTargeting.segments);
+
+          const siteContent = bidParamsContent || (jwTargeting && jwTargeting.content);
+
+          if (siteContent) {
+            request.site.content = siteContent;
+          }
+
+          if (reqJwpseg && reqJwpseg.length) {
+            request.user = {
+              data: [{
+                name: 'iow_labs_pub_data',
+                segment: segmentProcessing(reqJwpseg, 'jwpseg'),
+              }]
+            };
+          }
+
+          requests.push(request);
+          sources.push(source);
+          bidsArray.push(bid);
+        } else {
+          imp.push(impObj);
+        }
       }
 
       if (!forceBidderName && forceBidder && ALIAS_CONFIG[forceBidder]) {
@@ -165,7 +218,7 @@ export const spec = {
       this.forceBidderName = forceBidderName;
     }
 
-    const source = {
+    const reqSource = {
       tid: auctionId && auctionId.toString(),
       ext: {
         wrapper: 'Prebid_js',
@@ -174,28 +227,25 @@ export const spec = {
     };
 
     if (schain) {
-      source.ext.schain = schain;
+      reqSource.ext.schain = schain;
     }
 
-    const bidderTimeout = config.getConfig('bidderTimeout') || timeout;
-    const tmax = timeout ? Math.min(bidderTimeout, timeout) : bidderTimeout;
-
-    let request = {
+    const mainRequest = (imp.length || !requests.length) ? {
       id: bidderRequestId && bidderRequestId.toString(),
       site: {
         page: referer
       },
       tmax,
-      source,
+      source: reqSource,
       imp
-    };
+    } : null;
 
     if (content) {
-      request.site.content = content;
+      mainRequest.site.content = content;
     }
 
     if (jwpseg && jwpseg.length) {
-      user = {
+      mainRequest.user = {
         data: [{
           name: 'iow_labs_pub_data',
           segment: segmentProcessing(jwpseg, 'jwpseg'),
@@ -203,131 +253,151 @@ export const spec = {
       };
     }
 
-    const ortb2UserData = deepAccess(bidderRequest, 'ortb2.user.data');
-    if (ortb2UserData && ortb2UserData.length) {
-      if (!user) {
-        user = { data: [] };
+    [...requests, mainRequest].forEach((request) => {
+      if (!request) {
+        return;
       }
-      user = mergeDeep(user, {
-        data: [...ortb2UserData]
-      });
-    }
 
-    if (gdprConsent && gdprConsent.consentString) {
-      userExt = {consent: gdprConsent.consentString};
-    }
+      const ortb2UserData = deepAccess(bidderRequest, 'ortb2.user.data');
+      if (ortb2UserData && ortb2UserData.length) {
+        user = request.user || { data: [] };
+        user = mergeDeep(user, {
+          data: [...ortb2UserData]
+        });
+      }
 
-    const ortb2UserExtDevice = deepAccess(bidderRequest, 'ortb2.user.ext.device');
-    if (ortb2UserExtDevice) {
-      userExt = userExt || {};
-      userExt.device = { ...ortb2UserExtDevice };
-    }
+      if (gdprConsent && gdprConsent.consentString) {
+        userExt = {consent: gdprConsent.consentString};
+      }
 
-    if (userIdAsEids && userIdAsEids.length) {
-      userExt = userExt || {};
-      userExt.eids = [...userIdAsEids];
-    }
+      const ortb2UserExtDevice = deepAccess(bidderRequest, 'ortb2.user.ext.device');
+      if (ortb2UserExtDevice) {
+        userExt = userExt || {};
+        userExt.device = { ...ortb2UserExtDevice };
+      }
 
-    if (userExt && Object.keys(userExt).length) {
-      user = user || {};
-      user.ext = userExt;
-    }
+      if (userIdAsEids && userIdAsEids.length) {
+        userExt = userExt || {};
+        userExt.eids = [...userIdAsEids];
+      }
 
-    const fpdUserId = getUserIdFromFPDStorage();
+      if (userExt && Object.keys(userExt).length) {
+        user = user || {};
+        user.ext = userExt;
+      }
 
-    if (fpdUserId) {
-      user = user || {};
-      user.id = fpdUserId.toString();
-    }
+      const fpdUserId = getUserIdFromFPDStorage();
 
-    if (user) {
-      request.user = user;
-    }
+      if (fpdUserId) {
+        user = user || {};
+        user.id = fpdUserId.toString();
+      }
 
-    const userKeywords = deepAccess(bidderRequest, 'ortb2.user.keywords') || null;
-    const siteKeywords = deepAccess(bidderRequest, 'ortb2.site.keywords') || null;
+      if (user) {
+        request.user = user;
+      }
 
-    if (userKeywords) {
-      pageKeywords = pageKeywords || {};
-      pageKeywords.user = pageKeywords.user || {};
-      pageKeywords.user.ortb2 = [
-        {
-          name: 'keywords',
-          keywords: userKeywords.split(','),
-        }
-      ];
-    }
-    if (siteKeywords) {
-      pageKeywords = pageKeywords || {};
-      pageKeywords.site = pageKeywords.site || {};
-      pageKeywords.site.ortb2 = [
-        {
-          name: 'keywords',
-          keywords: siteKeywords.split(','),
-        }
-      ];
-    }
+      const userKeywords = deepAccess(bidderRequest, 'ortb2.user.keywords') || null;
+      const siteKeywords = deepAccess(bidderRequest, 'ortb2.site.keywords') || null;
 
-    if (pageKeywords) {
-      pageKeywords = reformatKeywords(pageKeywords);
-      if (pageKeywords) {
-        request.ext = {
-          keywords: pageKeywords
-        };
+      if (userKeywords) {
+        pageKeywords = pageKeywords || {};
+        pageKeywords.user = pageKeywords.user || {};
+        pageKeywords.user.ortb2 = [
+          {
+            name: 'keywords',
+            keywords: userKeywords.split(','),
+          }
+        ];
+      }
+      if (siteKeywords) {
+        pageKeywords = pageKeywords || {};
+        pageKeywords.site = pageKeywords.site || {};
+        pageKeywords.site.ortb2 = [
+          {
+            name: 'keywords',
+            keywords: siteKeywords.split(','),
+          }
+        ];
       }
-    }
 
-    if (gdprConsent && gdprConsent.gdprApplies) {
-      request.regs = {
-        ext: {
-          gdpr: gdprConsent.gdprApplies ? 1 : 0
+      if (pageKeywords) {
+        pageKeywords = reformatKeywords(pageKeywords);
+        if (pageKeywords) {
+          request.ext = {
+            keywords: pageKeywords
+          };
         }
-      };
-    }
-
-    if (uspConsent) {
-      if (!request.regs) {
-        request.regs = {ext: {}};
       }
-      request.regs.ext.us_privacy = uspConsent;
-    }
 
-    if (config.getConfig('coppa') === true) {
-      if (!request.regs) {
-        request.regs = {};
+      if (gdprConsent && gdprConsent.gdprApplies) {
+        request.regs = {
+          ext: {
+            gdpr: gdprConsent.gdprApplies ? 1 : 0
+          }
+        };
       }
-      request.regs.coppa = 1;
-    }
 
-    const site = deepAccess(bidderRequest, 'ortb2.site');
-    if (site) {
-      const pageCategory = [...(site.cat || []), ...(site.pagecat || [])].filter((category) => {
-        return category && typeof category === 'string'
-      });
-      if (pageCategory.length) {
-        request.site.cat = pageCategory;
-      }
-      const genre = deepAccess(site, 'content.genre');
-      if (genre && typeof genre === 'string') {
-        request.site.content = {...request.site.content, genre};
+      if (uspConsent) {
+        if (!request.regs) {
+          request.regs = {ext: {}};
+        }
+        request.regs.ext.us_privacy = uspConsent;
       }
-      const data = deepAccess(site, 'content.data');
-      if (data && data.length) {
-        const siteContent = request.site.content || {};
-        request.site.content = mergeDeep(siteContent, { data });
+
+      if (config.getConfig('coppa') === true) {
+        if (!request.regs) {
+          request.regs = {};
+        }
+        request.regs.coppa = 1;
       }
-      const id = deepAccess(site, 'content.id');
-      if (id) {
-        request.site.content = {...request.site.content, id};
+
+      const site = deepAccess(bidderRequest, 'ortb2.site');
+      if (site) {
+        const pageCategory = [...(site.cat || []), ...(site.pagecat || [])].filter((category) => {
+          return category && typeof category === 'string'
+        });
+        if (pageCategory.length) {
+          request.site.cat = pageCategory;
+        }
+        const genre = deepAccess(site, 'content.genre');
+        if (genre && typeof genre === 'string') {
+          request.site.content = {...request.site.content, genre};
+        }
+        const data = deepAccess(site, 'content.data');
+        if (data && data.length) {
+          const siteContent = request.site.content || {};
+          request.site.content = mergeDeep(siteContent, { data });
+        }
+        const id = deepAccess(site, 'content.id');
+        if (id) {
+          request.site.content = {...request.site.content, id};
+        }
       }
-    }
+    });
 
-    return {
+    return [...requests.map((req, i) => {
+      let sp;
+      const url = (endpoint || ENDPOINT_URL).replace(/[?&]sp=([^?&=]+)/, (i, found) => {
+        if (found) {
+          sp = found;
+        }
+        return '';
+      });
+      let currentSource = sources[i] || sp;
+      const urlWithParams = url + (url.indexOf('?') > -1 ? '&' : '?') + 'no_mapping=1' + (currentSource ? `&sp=${currentSource}` : '');
+      return {
+        method: 'POST',
+        url: urlWithParams,
+        data: JSON.stringify(req),
+        bid: bidsArray[i],
+      };
+    }), ...(mainRequest ? [{
       method: 'POST',
       url: endpoint || ENDPOINT_URL,
-      data: JSON.stringify(request),
+      data: JSON.stringify(mainRequest),
       bidsMap
-    };
+    }] : [])];
   },
   /**
    * Unpack the response from the server into a list of bids.
@@ -395,7 +465,7 @@ export const spec = {
  */
 function _getFloor (mediaTypes, bid) {
   const curMediaType = mediaTypes.video ? 'video' : 'banner';
-  let floor = bid.params.bidFloor || 0;
+  let floor = bid.params.bidFloor || bid.params.floorcpm || 0;
 
   if (typeof bid.getFloor === 'function') {
     const floorInfo = bid.getFloor({
@@ -431,7 +501,7 @@ function _addBidResponse(serverBid, bidRequest, bidResponses, RendererConst, bid
   if (!serverBid.auid) errorMessage = LOG_ERROR_MESS.noAuid + JSON.stringify(serverBid);
   if (!errorMessage && !serverBid.adm && !serverBid.nurl) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
   else {
-    const bid = bidRequest.bidsMap[serverBid.impid];
+    const bid = bidRequest.bidsMap ? bidRequest.bidsMap[serverBid.impid] : bidRequest.bid;
     if (bid) {
       const bidResponse = {
         requestId: bid.bidId, // bid.bidderRequestId
@@ -483,7 +553,7 @@ function _addBidResponse(serverBid, bidRequest, bidResponses, RendererConst, bid
 }
 
 function createVideoRequest(bid, mediaType) {
-  const {playerSize, mimes, durationRangeSec, protocols} = mediaType;
+  const { playerSize, mimes, durationRangeSec, protocols } = mediaType;
   const size = (playerSize || bid.sizes || [])[0];
   if (!size) return;
 
diff --git a/test/spec/modules/gridBidAdapter_spec.js b/test/spec/modules/gridBidAdapter_spec.js
index 94524e07fb3..f98ca683024 100644
--- a/test/spec/modules/gridBidAdapter_spec.js
+++ b/test/spec/modules/gridBidAdapter_spec.js
@@ -126,7 +126,7 @@ describe('TheMediaGrid Adapter', function () {
           genre: 'Adventure'
         }
       };
-      const request = spec.buildRequests([bidRequests[0]], {...bidderRequest, ortb2: {site}});
+      const [request] = spec.buildRequests([bidRequests[0]], {...bidderRequest, ortb2: {site}});
       const payload = parseRequest(request.data);
       expect(payload.site.cat).to.deep.equal([...site.cat, ...site.pagecat]);
       expect(payload.site.content.genre).to.deep.equal(site.content.genre);
@@ -137,7 +137,7 @@ describe('TheMediaGrid Adapter', function () {
       const getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').callsFake(
         arg => arg === 'tmguid' ? fpdUserIdVal : null);
 
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      const [request] = spec.buildRequests([bidRequests[0]], bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.deep.equal({
@@ -174,7 +174,7 @@ describe('TheMediaGrid Adapter', function () {
       const getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').callsFake(
         arg => arg === 'tmguid' ? fpdUserIdVal : null);
 
-      const request = spec.buildRequests([bidRequests[0], bidRequests[1]], bidderRequest);
+      const [request] = spec.buildRequests([bidRequests[0], bidRequests[1]], bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.deep.equal({
@@ -220,7 +220,7 @@ describe('TheMediaGrid Adapter', function () {
       const getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').callsFake(
         arg => arg === 'tmguid' ? fpdUserIdVal : null);
 
-      const request = spec.buildRequests(bidRequests.slice(0, 3), bidderRequest);
+      const [request] = spec.buildRequests(bidRequests.slice(0, 3), bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.deep.equal({
@@ -270,12 +270,68 @@ describe('TheMediaGrid Adapter', function () {
       getDataFromLocalStorageStub.restore();
     });
 
+    it('should attach valid params to the tags with multiRequest', function () {
+      const fpdUserIdVal = '0b0f84a1-1596-4165-9742-2e1a7dfac57f';
+      const getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').callsFake(
+        arg => arg === 'tmguid' ? fpdUserIdVal : null);
+
+      const bidMultiRequests = bidRequests.slice(0, 3).map((bidReq) => ({
+        ...bidReq,
+        params: { ...bidReq.params, multiRequest: true }
+      }));
+      bidMultiRequests[1].params.pubid = 'some_pub_id';
+      bidMultiRequests[2].params.source = 'jwp';
+      const requests = spec.buildRequests(bidMultiRequests, bidderRequest);
+      requests.forEach((request, i) => {
+        expect(request.data).to.be.an('string');
+        const payload = parseRequest(request.data);
+        const banner = bidMultiRequests[i].mediaTypes ? bidRequests[i].mediaTypes.banner : { sizes: bidMultiRequests[i].sizes };
+        const video = bidMultiRequests[i].mediaTypes && bidMultiRequests[i].mediaTypes.video;
+        const source = bidMultiRequests[i].params.source;
+        const url = `https://grid.bidswitch.net/hbjson?no_mapping=1${source ? `&sp=${source}` : ''}`;
+        expect(request.url).to.equal(url);
+        expect(payload).to.deep.equal({
+          'id': bidderRequest.bidderRequestId,
+          'site': {
+            'page': referrer,
+            ...(bidMultiRequests[i].params.pubid && { 'publisher': { 'id': bidMultiRequests[i].params.pubid } })
+          },
+          'tmax': bidderRequest.timeout,
+          'source': {
+            'tid': bidderRequest.auctionId,
+            'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+          },
+          'user': {
+            'id': fpdUserIdVal
+          },
+          'imp': [{
+            'id': bidMultiRequests[i].bidId,
+            'tagid': bidMultiRequests[i].params.uid,
+            'ext': {'divid': bidMultiRequests[i].adUnitCode},
+            ...(bidMultiRequests[i].params.bidFloor && { 'bidfloor': bidMultiRequests[i].params.bidFloor }),
+            ...(banner && { banner: {
+              'w': banner.sizes[0][0],
+              'h': banner.sizes[0][1],
+              'format': banner.sizes.map(([w, h]) => ({ w, h }))
+            }}),
+            ...(video && { video: {
+              'w': video.playerSize[0][0],
+              'h': video.playerSize[0][1],
+              'mimes': video.mimes
+            }})
+          }]
+        });
+      });
+
+      getDataFromLocalStorageStub.restore();
+    });
+
     it('should support mixed mediaTypes', function () {
       const fpdUserIdVal = '0b0f84a1-1596-4165-9742-2e1a7dfac57f';
       const getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').callsFake(
         arg => arg === 'tmguid' ? fpdUserIdVal : null);
 
-      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const [request] = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.deep.equal({
@@ -341,7 +397,7 @@ describe('TheMediaGrid Adapter', function () {
 
     it('if gdprConsent is present payload must have gdpr params', function () {
       const gdprBidderRequest = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: true}}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, gdprBidderRequest);
+      const [request] = spec.buildRequests(bidRequests, gdprBidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('user');
@@ -354,7 +410,7 @@ describe('TheMediaGrid Adapter', function () {
 
     it('if usPrivacy is present payload must have us_privacy param', function () {
       const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
+      const [request] = spec.buildRequests(bidRequests, bidderRequestWithUSP);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('regs');
@@ -387,7 +443,7 @@ describe('TheMediaGrid Adapter', function () {
           userIdAsEids: eids
         }, bid);
       });
-      const request = spec.buildRequests(bidRequestsWithUserIds, bidderRequest);
+      const [request] = spec.buildRequests(bidRequestsWithUserIds, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('user');
@@ -403,7 +459,7 @@ describe('TheMediaGrid Adapter', function () {
       };
       const ortb2 = {user: {ext: {device: ortb2UserExtDevice}}};
 
-      const request = spec.buildRequests(bidRequests, {...bidderRequest, ortb2});
+      const [request] = spec.buildRequests(bidRequests, {...bidderRequest, ortb2});
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('user');
@@ -427,7 +483,7 @@ describe('TheMediaGrid Adapter', function () {
           schain: schain
         }, bid);
       });
-      const request = spec.buildRequests(bidRequestsWithSChain, bidderRequest);
+      const [request] = spec.buildRequests(bidRequestsWithSChain, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('source');
@@ -451,7 +507,7 @@ describe('TheMediaGrid Adapter', function () {
           }
         }, bid);
       });
-      const request = spec.buildRequests(bidRequestsWithJwTargeting, bidderRequest);
+      const [request] = spec.buildRequests(bidRequestsWithJwTargeting, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('user');
@@ -494,7 +550,7 @@ describe('TheMediaGrid Adapter', function () {
         }
       };
       const bidRequestWithKW = { ...bidRequests[0], params: { ...bidRequests[0].params, keywords } }
-      const request = spec.buildRequests([bidRequestWithKW], {...bidderRequest, ortb2});
+      const [request] = spec.buildRequests([bidRequestWithKW], {...bidderRequest, ortb2});
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload.ext.keywords).to.deep.equal({
@@ -556,7 +612,7 @@ describe('TheMediaGrid Adapter', function () {
         }
       ];
       const ortb2 = {user: {data: userData}};
-      const request = spec.buildRequests([bidRequests[0]], {...bidderRequest, ortb2});
+      const [request] = spec.buildRequests([bidRequests[0]], {...bidderRequest, ortb2});
       const payload = parseRequest(request.data);
       expect(payload.user.data).to.deep.equal(userData);
     });
@@ -575,7 +631,7 @@ describe('TheMediaGrid Adapter', function () {
         }
       ];
       const ortb2 = {site: { content: { data: contentData } }};
-      const request = spec.buildRequests([bidRequests[0]], {...bidderRequest, ortb2});
+      const [request] = spec.buildRequests([bidRequests[0]], {...bidderRequest, ortb2});
       const payload = parseRequest(request.data);
       expect(payload.site.content.data).to.deep.equal(contentData);
     });
@@ -608,7 +664,7 @@ describe('TheMediaGrid Adapter', function () {
           }
         }
       });
-      const request = spec.buildRequests([bidRequestsWithJwTargeting], {...bidderRequest, ortb2});
+      const [request] = spec.buildRequests([bidRequestsWithJwTargeting], {...bidderRequest, ortb2});
       const payload = parseRequest(request.data);
       expect(payload.user.data).to.deep.equal([{
         name: 'iow_labs_pub_data',
@@ -622,7 +678,7 @@ describe('TheMediaGrid Adapter', function () {
     it('should have site.content.id filled from config ortb2.site.content.id', function () {
       const contentId = 'jw_abc';
       const ortb2 = {site: {content: {id: contentId}}};
-      const request = spec.buildRequests([bidRequests[0]], {...bidderRequest, ortb2});
+      const [request] = spec.buildRequests([bidRequests[0]], {...bidderRequest, ortb2});
       const payload = parseRequest(request.data);
       expect(payload.site.content.id).to.equal(contentId);
     });
@@ -630,7 +686,7 @@ describe('TheMediaGrid Adapter', function () {
     it('should be right tmax when timeout in config is less then timeout in bidderRequest', function() {
       const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
         arg => arg === 'bidderTimeout' ? 2000 : null);
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      const [request] = spec.buildRequests([bidRequests[0]], bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload.tmax).to.equal(2000);
@@ -639,7 +695,7 @@ describe('TheMediaGrid Adapter', function () {
     it('should be right tmax when timeout in bidderRequest is less then timeout in config', function() {
       const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
         arg => arg === 'bidderTimeout' ? 5000 : null);
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      const [request] = spec.buildRequests([bidRequests[0]], bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload.tmax).to.equal(3000);
@@ -648,7 +704,7 @@ describe('TheMediaGrid Adapter', function () {
     it('should contain regs.coppa if coppa is true in config', function () {
       const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
         arg => arg === 'coppa' ? true : null);
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      const [request] = spec.buildRequests([bidRequests[0]], bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('regs');
@@ -680,7 +736,7 @@ describe('TheMediaGrid Adapter', function () {
       const bidRequestsWithOrtb2Imp = bidRequests.slice(0, 3).map((bid, ind) => {
         return Object.assign(ortb2Imp[ind] ? { ortb2Imp: ortb2Imp[ind] } : {}, bid);
       });
-      const request = spec.buildRequests(bidRequestsWithOrtb2Imp, bidderRequest);
+      const [request] = spec.buildRequests(bidRequestsWithOrtb2Imp, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload.imp[0].ext).to.deep.equal({
@@ -716,7 +772,7 @@ describe('TheMediaGrid Adapter', function () {
       const bidRequestsWithOrtb2Imp = bidRequests.slice(0, 3).map((bid, ind) => {
         return Object.assign(ortb2Imp[ind] ? { ortb2Imp: ortb2Imp[ind] } : {}, bid);
       });
-      const request = spec.buildRequests(bidRequestsWithOrtb2Imp, bidderRequest);
+      const [request] = spec.buildRequests(bidRequestsWithOrtb2Imp, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload.imp[0].instl).to.equal(1);
@@ -750,7 +806,7 @@ describe('TheMediaGrid Adapter', function () {
         timeout: 3000
       };
       const parsedReferrer = encodeURIComponent(bidderRequestWithNumId.refererInfo.page);
-      const request = spec.buildRequests([bidRequestWithNumId], bidderRequestWithNumId);
+      const [request] = spec.buildRequests([bidRequestWithNumId], bidderRequestWithNumId);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.deep.equal({
@@ -792,7 +848,7 @@ describe('TheMediaGrid Adapter', function () {
         }
       }, bidRequests[1]);
       it('should return the value from getFloor if present', function () {
-        const request = spec.buildRequests([bidRequest], bidderRequest);
+        const [request] = spec.buildRequests([bidRequest], bidderRequest);
         expect(request.data).to.be.an('string');
         const payload = parseRequest(request.data);
         expect(payload.imp[0].bidfloor).to.equal(floorTestData.floor);
@@ -801,7 +857,7 @@ describe('TheMediaGrid Adapter', function () {
         const bidfloor = 0.80;
         const bidRequestsWithFloor = { ...bidRequest };
         bidRequestsWithFloor.params = Object.assign({bidFloor: bidfloor}, bidRequestsWithFloor.params);
-        const request = spec.buildRequests([bidRequestsWithFloor], bidderRequest);
+        const [request] = spec.buildRequests([bidRequestsWithFloor], bidderRequest);
         expect(request.data).to.be.an('string');
         const payload = parseRequest(request.data);
         expect(payload.imp[0].bidfloor).to.equal(floorTestData.floor);
@@ -810,7 +866,7 @@ describe('TheMediaGrid Adapter', function () {
         const bidfloor = 1.80;
         const bidRequestsWithFloor = { ...bidRequest };
         bidRequestsWithFloor.params = Object.assign({bidFloor: bidfloor}, bidRequestsWithFloor.params);
-        const request = spec.buildRequests([bidRequestsWithFloor], bidderRequest);
+        const [request] = spec.buildRequests([bidRequestsWithFloor], bidderRequest);
         expect(request.data).to.be.an('string');
         const payload = parseRequest(request.data);
         expect(payload.imp[0].bidfloor).to.equal(bidfloor);
@@ -844,7 +900,7 @@ describe('TheMediaGrid Adapter', function () {
           'auctionId': '1cbd2feafe5e8b',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
+      const [request] = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
           'requestId': '659423fff799cb',
@@ -904,7 +960,7 @@ describe('TheMediaGrid Adapter', function () {
           'auctionId': '1fa09aee5c8c99',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
+      const [request] = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
           'requestId': '659423fff799cb',
@@ -1050,7 +1106,7 @@ describe('TheMediaGrid Adapter', function () {
         {'bid': [{'impid': '112432ab4f34', 'price': 1.80, 'adm': '<VAST version=\"3.0\">\n<Ad id=\"32115432\"><\/Ad>\n<\/VAST>', 'nurl': 'https://wrong_url.com', 'auid': 14, content_type: 'video', 'adomain': ['example.com'], w: 300, h: 600}], 'seat': '2'},
         {'bid': [{'impid': 'a74b342f8cd', 'price': 1.50, 'nurl': '', 'auid': 15, content_type: 'video'}], 'seat': '2'}
       ];
-      const request = spec.buildRequests(bidRequests);
+      const [request] = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
           'requestId': '659423fff799cb',
@@ -1167,7 +1223,7 @@ describe('TheMediaGrid Adapter', function () {
           'auctionId': '1fa09aee5c84d34',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
+      const [request] = spec.buildRequests(bidRequests);
       const result = spec.interpretResponse({'body': {'seatbid': responses.slice(2)}}, request);
       expect(result.length).to.equal(0);
     });
@@ -1237,7 +1293,7 @@ describe('TheMediaGrid Adapter', function () {
           'auctionId': '32a1f276cb87cb8',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
+      const [request] = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
           'requestId': '2164be6358b9',
@@ -1344,7 +1400,7 @@ describe('TheMediaGrid Adapter', function () {
         ],
         'seat': '1'
       };
-      const request = spec.buildRequests(bidRequests);
+      const [request] = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
           'requestId': '26d6f897b516',

From 17b9b32f5a66d52367866b7339d5a9c36a116d57 Mon Sep 17 00:00:00 2001
From: Jason Quaccia <jlquaccia@gmail.com>
Date: Thu, 6 Oct 2022 04:55:38 -0700
Subject: [PATCH 316/569] Prebid Core: Refine coordination of PBS+PBJS Floors
 (#8865)

* stronger coordination between pbs and pbjs floors

* reverted changes for test page

* spacing change

* refactored code

* reverted change to adunits html

* refactored pbjs to pbs floormin logic

* refactored pbjs to pbs floormin logic

* removed comment

* refactored code

* updated logic

* no longer ignoring currencies

* added fallback to deprecating prebid.floorMin and repositioned where floorMinCur is set

* progress

* updated floorMinCur logic

* reverted code on example pages

* format adjustmnet

* format adjustment

* format adjustment

* updated currency conversion logic

* updated currency conversion logic

* updated floorMinCur default for ortb2

* resolved conflicts

* formatting

* formatting

* added few comments explaining the logic for this change

Co-authored-by: Jason Quaccia <jasonquaccia@RWC-WS233.local>
---
 modules/prebidServerBidAdapter/index.js       |  55 ++++--
 .../modules/prebidServerBidAdapter_spec.js    | 156 ++++++++++++++++++
 2 files changed, 199 insertions(+), 12 deletions(-)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 562e5aaa1db..5bdf9868d24 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -522,6 +522,8 @@ Object.assign(ORTB2.prototype, {
     let imps = [];
     let aliases = {};
     const firstBidRequest = bidRequests[0];
+    let floorMin = null;
+    let floorMinCur = null;
 
     // transform ad unit into array of OpenRTB impression objects
     let impIds = new Set();
@@ -671,21 +673,21 @@ Object.assign(ORTB2.prototype, {
 
       mergeDeep(imp, mediaTypes);
 
+      const convertCurrency = typeof getGlobal().convertCurrency !== 'function'
+        ? (amount) => amount
+        : (amount, from, to) => {
+          if (from === to) return amount;
+          let result = null;
+          try {
+            result = getGlobal().convertCurrency(amount, from, to);
+          } catch (e) {
+          }
+          return result;
+        }
+
       const floor = (() => {
         // we have to pick a floor for the imp - here we attempt to find the minimum floor
         // across all bids for this adUnit
-
-        const convertCurrency = typeof getGlobal().convertCurrency !== 'function'
-          ? (amount) => amount
-          : (amount, from, to) => {
-            if (from === to) return amount;
-            let result = null;
-            try {
-              result = getGlobal().convertCurrency(amount, from, to);
-            } catch (e) {
-            }
-            return result;
-          }
         const s2sCurrency = config.getConfig('currency.adServerCurrency') || DEFAULT_S2S_CURRENCY;
 
         return adUnit.bids
@@ -696,6 +698,7 @@ Object.assign(ORTB2.prototype, {
               const {currency, floor} = bid.getFloor({
                 currency: s2sCurrency
               });
+
               return {
                 currency,
                 floor: parseFloat(floor)
@@ -717,11 +720,13 @@ Object.assign(ORTB2.prototype, {
               min.ref = min.min = floor;
             } else {
               const value = convertCurrency(floor.floor, floor.currency, min.ref.currency);
+
               if (value != null && value < min.ref.floor) {
                 min.ref.floor = value;
                 min.min = floor;
               }
             }
+
             return min;
           }, {}).min
       })();
@@ -729,6 +734,26 @@ Object.assign(ORTB2.prototype, {
       if (floor) {
         imp.bidfloor = floor.floor;
         imp.bidfloorcur = floor.currency;
+
+        // logic below relates to https://github.com/prebid/Prebid.js/issues/8749 and does the following:
+        // 1. check client-side floors (ref bidfloor/bidfloorcur & ortb2Imp floorMin/floorMinCur (if present))
+        // 2. set pbs req wide floorMinCur to the first floor currency found when iterating over imp's
+        //    (if currency conversion logic present, convert all imp floor values to this currency)
+        // 3. compare/store ref to lowest floorMin value as each imp is iterated over
+        // 4. set req wide floorMin and floorMinCur values for pbs after iterations are done
+        if (floorMinCur == null) { floorMinCur = floor.currency }
+        const ortb2ImpFloorMin = imp.ext?.prebid?.floors?.floorMin || imp.ext?.prebid?.floorMin;
+        const ortb2ImpFloorCur = imp.ext?.prebid?.floors?.floorMinCur || imp.ext?.prebid?.floorMinCur || floorMinCur;
+
+        const convertedFloorMinValue = convertCurrency(floor.floor, floor.currency, floorMinCur);
+        const convertedOrtb2ImpFloorMinValue = ortb2ImpFloorMin && ortb2ImpFloorCur ? convertCurrency(ortb2ImpFloorMin, ortb2ImpFloorCur, floorMinCur) : false;
+
+        const lowestImpFloorMin = convertedOrtb2ImpFloorMinValue && convertedOrtb2ImpFloorMinValue < convertedFloorMinValue
+          ? convertedOrtb2ImpFloorMinValue
+          : convertedFloorMinValue;
+
+        deepSetValue(imp, 'ext.prebid.floors.floorMin', lowestImpFloorMin);
+        if (floorMin == null || floorMin > lowestImpFloorMin) { floorMin = lowestImpFloorMin }
       }
 
       if (imp.banner || imp.video || imp.native) {
@@ -903,6 +928,12 @@ Object.assign(ORTB2.prototype, {
     addBidderFirstPartyDataToRequest(request, s2sBidRequest.ortb2Fragments?.bidder || {});
 
     request.imp.forEach((imp) => this.impRequested[imp.id] = imp);
+
+    if (request.ext?.prebid?.floors?.enabled) {
+      request.ext.prebid.floors.floorMin = floorMin;
+      request.ext.prebid.floors.floorMinCur = floorMinCur;
+    }
+
     return request;
   },
 
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 925f92fb08b..c3ca3261193 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -3480,5 +3480,161 @@ describe('S2S Adapter', function () {
       const parsedRequestBody = JSON.parse(server.requests[1].requestBody);
       expect(parsedRequestBody.cur).to.deep.equal(['JPY']);
     });
+
+    it('should correctly set the floorMin key when multiple bids with various bidfloors exist', function () {
+      const s2sConfig = Object.assign({}, CONFIG, {
+        extPrebid: {
+          floors: {
+            enabled: true
+          }
+        },
+        bidders: ['b1', 'b2']
+      });
+
+      const bidderRequests = [
+        {
+          ...BID_REQUESTS[0],
+          bidderCode: 'b1',
+          bids: [{
+            bidder: 'b1',
+            bidId: 1,
+            getFloor: () => ({
+              currency: 'US',
+              floor: 1.23
+            })
+          }]
+        },
+        {
+          ...BID_REQUESTS[0],
+          bidderCode: 'b2',
+          bids: [{
+            bidder: 'b2',
+            bidId: 2,
+            getFloor: () => ({
+              currency: 'EUR',
+              floor: 3.21
+            })
+          }],
+        }
+      ];
+
+      const adUnits = [
+        {
+          code: 'au1',
+          transactionId: 't1',
+          mediaTypes: {
+            banner: {sizes: [1, 1]}
+          },
+          bids: [{bidder: 'b1', bid_id: 1}]
+        },
+        {
+          code: 'au2',
+          transactionId: 't2',
+          bids: [{bidder: 'b2', bid_id: 2}],
+          mediaTypes: {
+            banner: {sizes: [1, 1]}
+          }
+        }
+      ];
+
+      const _config = {
+        s2sConfig: s2sConfig,
+      };
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+      s2sBidRequest.ad_units = adUnits;
+      config.setConfig(_config);
+
+      adapter.callBids(s2sBidRequest, bidderRequests, addBidResponse, done, ajax);
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.imp[0].bidfloor).to.equal(1.23);
+      expect(requestBid.imp[1].bidfloor).to.equal(3.21);
+
+      // first imp floorCur should be set
+      expect(requestBid.ext.prebid.floors).to.deep.equal({ enabled: true, floorMin: 1.23, floorMinCur: 'US' });
+    });
+
+    it('should correctly set the floorMin key when multiple bids with various bidfloors exist and ortb2Imp contains the lowest floorMin', function () {
+      const s2sConfig = Object.assign({}, CONFIG, {
+        extPrebid: {
+          floors: {
+            enabled: true
+          }
+        },
+        bidders: ['b1', 'b2']
+      });
+
+      const bidderRequests = [
+        {
+          ...BID_REQUESTS[0],
+          bidderCode: 'b1',
+          bids: [{
+            bidder: 'b1',
+            bidId: 1,
+            getFloor: () => ({
+              currency: 'CUR',
+              floor: 1.23
+            })
+          }]
+        },
+        {
+          ...BID_REQUESTS[0],
+          bidderCode: 'b2',
+          bids: [{
+            bidder: 'b2',
+            bidId: 2,
+            getFloor: () => ({
+              currency: 'CUR',
+              floor: 3.21
+            })
+          }],
+        }
+      ];
+
+      const adUnits = [
+        {
+          code: 'au1',
+          transactionId: 't1',
+          mediaTypes: {
+            banner: {sizes: [1, 1]}
+          },
+          bids: [{bidder: 'b1', bid_id: 1}]
+        },
+        {
+          code: 'au2',
+          transactionId: 't2',
+          bids: [{bidder: 'b2', bid_id: 2}],
+          mediaTypes: {
+            banner: {sizes: [1, 1]}
+          },
+          ortb2Imp: {
+            ext: {
+              prebid: {
+                floors: {
+                  floorMin: 1
+                }
+              }
+            }
+          }
+        }
+      ];
+
+      const _config = {
+        s2sConfig: s2sConfig,
+      };
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+      s2sBidRequest.ad_units = adUnits;
+      config.setConfig(_config);
+
+      adapter.callBids(s2sBidRequest, bidderRequests, addBidResponse, done, ajax);
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.imp[0].bidfloor).to.equal(1.23);
+      expect(requestBid.imp[1].bidfloor).to.equal(3.21);
+
+      expect(requestBid.ext.prebid.floors).to.deep.equal({ enabled: true, floorMin: 1, floorMinCur: 'CUR' });
+    });
   });
 });

From 5c21bdc9581cbdac04f9c60d662456070294ef35 Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Thu, 6 Oct 2022 07:49:19 -0600
Subject: [PATCH 317/569] Vuukle Bid Adapter: support
 gdpr/usp/coppa/schain/gvlid (#9023)

* add gdpr/usp/coppa/schain/gvlid

* restore getConfig

* fix linting
---
 modules/vuukleBidAdapter.js                | 37 ++++++++-
 test/spec/modules/vuukleBidAdapter_spec.js | 87 ++++++++++++++++++++++
 2 files changed, 121 insertions(+), 3 deletions(-)

diff --git a/modules/vuukleBidAdapter.js b/modules/vuukleBidAdapter.js
index ddf96b3e940..f3ab2562ef4 100644
--- a/modules/vuukleBidAdapter.js
+++ b/modules/vuukleBidAdapter.js
@@ -1,18 +1,24 @@
-import { parseSizesInput } from '../src/utils.js';
+import { parseSizesInput, deepAccess } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'vuukle';
 const URL = 'https://pb.vuukle.com/adapter';
 const TIME_TO_LIVE = 360;
+const VENDOR_ID = 1004;
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: VENDOR_ID,
+  supportedMediaTypes: [ BANNER ],
 
   isBidRequestValid: function(bid) {
     return true
   },
 
-  buildRequests: function(bidRequests) {
+  buildRequests: function(bidRequests, bidderRequest) {
+    bidderRequest = bidderRequest || {};
     const requests = bidRequests.map(function (bid) {
       const parseSized = parseSizesInput(bid.sizes);
       const arrSize = parseSized[0].split('x');
@@ -25,10 +31,27 @@ export const spec = {
         rnd: Math.random(),
         bidId: bid.bidId,
         source: 'pbjs',
+        schain: JSON.stringify(bid.schain),
+        requestId: bid.bidderRequestId,
+        tmax: bidderRequest.timeout,
+        gdpr: (bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) ? 1 : 0,
+        consentGiven: vuukleGetConsentGiven(bidderRequest.gdprConsent),
         version: '$prebid.version$',
-        v: 1,
+        v: 2,
       };
 
+      if (bidderRequest.uspConsent) {
+        params.uspConsent = bidderRequest.uspConsent;
+      }
+
+      if (config.getConfig('coppa') === true) {
+        params.coppa = 1;
+      }
+
+      if (bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString) {
+        params.consent = bidderRequest.gdprConsent.consentString;
+      }
+
       return {
         method: 'GET',
         url: URL,
@@ -65,3 +88,11 @@ export const spec = {
   },
 }
 registerBidder(spec);
+
+function vuukleGetConsentGiven(gdprConsent) {
+  let consentGiven = 0;
+  if (typeof gdprConsent !== 'undefined') {
+    consentGiven = deepAccess(gdprConsent, `vendorData.vendor.consents.${VENDOR_ID}`) ? 1 : 0;
+  }
+  return consentGiven;
+}
diff --git a/test/spec/modules/vuukleBidAdapter_spec.js b/test/spec/modules/vuukleBidAdapter_spec.js
index 17353a40b85..32ba74867bb 100644
--- a/test/spec/modules/vuukleBidAdapter_spec.js
+++ b/test/spec/modules/vuukleBidAdapter_spec.js
@@ -1,5 +1,6 @@
 import { expect } from 'chai';
 import { spec } from 'modules/vuukleBidAdapter.js';
+import { config } from '../../../src/config.js';
 
 describe('vuukleBidAdapterTests', function() {
   let bidRequestData = {
@@ -34,6 +35,13 @@ describe('vuukleBidAdapterTests', function() {
     expect(req_data.bidId).to.equal('testbid');
   });
 
+  it('validate_generated_params_tmax', function() {
+    request = spec.buildRequests(bidRequestData.bids, {timeout: 1234});
+    let req_data = request[0].data;
+
+    expect(req_data.tmax).to.equal(1234);
+  });
+
   it('validate_response_params', function() {
     let serverResponse = {
       body: {
@@ -58,4 +66,83 @@ describe('vuukleBidAdapterTests', function() {
     expect(bid.creativeId).to.equal('12345');
     expect(bid.meta.advertiserDomains).to.deep.equal(['example.com']);
   });
+
+  describe('consent handling', function() {
+    const bidderRequest = {
+      gdprConsent: {
+        consentString: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+        gdprApplies: 1,
+        vendorData: {
+          vendor: {
+            consents: {
+              1004: 1
+            }
+          }
+        }
+      }
+    }
+
+    it('must handle consent 1/1', function() {
+      request = spec.buildRequests(bidRequestData.bids, bidderRequest);
+      let req_data = request[0].data;
+
+      expect(req_data.gdpr).to.equal(1);
+      expect(req_data.consentGiven).to.equal(1);
+      expect(req_data.consent).to.equal('COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw');
+    })
+
+    it('must handle consent 0/1', function() {
+      bidderRequest.gdprConsent.gdprApplies = 0;
+      request = spec.buildRequests(bidRequestData.bids, bidderRequest);
+      let req_data = request[0].data;
+
+      expect(req_data.gdpr).to.equal(0);
+      expect(req_data.consentGiven).to.equal(1);
+    })
+
+    it('must handle consent 0/0', function() {
+      bidderRequest.gdprConsent.gdprApplies = 0;
+      bidderRequest.gdprConsent.vendorData = undefined;
+      request = spec.buildRequests(bidRequestData.bids, bidderRequest);
+      let req_data = request[0].data;
+
+      expect(req_data.gdpr).to.equal(0);
+      expect(req_data.consentGiven).to.equal(0);
+    })
+
+    it('must handle consent undef', function() {
+      request = spec.buildRequests(bidRequestData.bids, {});
+      let req_data = request[0].data;
+
+      expect(req_data.gdpr).to.equal(0);
+      expect(req_data.consentGiven).to.equal(0);
+    })
+  })
+
+  it('must handle usp consent', function() {
+    request = spec.buildRequests(bidRequestData.bids, {uspConsent: '1YNN'});
+    let req_data = request[0].data;
+
+    expect(req_data.uspConsent).to.equal('1YNN');
+  })
+
+  it('must handle undefined usp consent', function() {
+    request = spec.buildRequests(bidRequestData.bids, {});
+    let req_data = request[0].data;
+
+    expect(req_data.uspConsent).to.equal(undefined);
+  })
+
+  it('must handle coppa flag', function() {
+    sinon.stub(config, 'getConfig')
+      .withArgs('coppa')
+      .returns(true);
+
+    request = spec.buildRequests(bidRequestData.bids);
+    let req_data = request[0].data;
+
+    expect(req_data.coppa).to.equal(1);
+
+    config.getConfig.restore();
+  })
 });

From 0229b5444742a018b3a935f0d2546b2e4061b82c Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Thu, 6 Oct 2022 08:13:41 -0700
Subject: [PATCH 318/569] Prebid core: add utility to retrieve user agent
 client hints (#8826)

* Prebid core: add utility to retrieve user agent client hints

* Cache enrichments FPD between auctions

* Set device.sua from fpdEnrichment
---
 libraries/fpd/sua.js                          |  98 +++++++
 modules/enrichmentFpdModule.js                |  47 +++-
 test/spec/fpd/sua_spec.js                     | 244 ++++++++++++++++++
 test/spec/modules/enrichmentFpdModule_spec.js |  57 +++-
 test/spec/modules/fpdModule_spec.js           |   9 +
 5 files changed, 434 insertions(+), 21 deletions(-)
 create mode 100644 libraries/fpd/sua.js
 create mode 100644 test/spec/fpd/sua_spec.js

diff --git a/libraries/fpd/sua.js b/libraries/fpd/sua.js
new file mode 100644
index 00000000000..b6a46763514
--- /dev/null
+++ b/libraries/fpd/sua.js
@@ -0,0 +1,98 @@
+import {isEmptyStr, isStr, isEmpty} from '../../src/utils.js';
+import {GreedyPromise} from '../../src/utils/promise.js';
+
+export const SUA_SOURCE_UNKNOWN = 0;
+export const SUA_SOURCE_LOW_ENTROPY = 1;
+export const SUA_SOURCE_HIGH_ENTROPY = 2;
+export const SUA_SOURCE_UA_HEADER = 3;
+
+// "high entropy" (i.e. privacy-sensitive) fields that can be requested from the navigator.
+export const HIGH_ENTROPY_HINTS = [
+  'architecture',
+  'bitness',
+  'model',
+  'platformVersion',
+  'fullVersionList'
+]
+
+/**
+ * Returns low entropy UA client hints encoded as an ortb2.6 device.sua object; or null if no UA client hints are available.
+ */
+export const getLowEntropySUA = lowEntropySUAAccessor();
+
+/**
+ * Returns a promise to high entropy UA client hints encoded as an ortb2.6 device.sua object, or null if no UA client hints are available.
+ *
+ * Note that the return value is a promise because the underlying browser API returns a promise; this
+ * seems to plan for additional controls (such as alerts / permission request prompts to the user); it's unclear
+ * at the moment if this means that asking for more hints would result in slower / more expensive calls.
+ *
+ * @param {Array[String]} hints hints to request, defaults to all (HIGH_ENTROPY_HINTS).
+ */
+export const getHighEntropySUA = highEntropySUAAccessor();
+
+export function lowEntropySUAAccessor(uaData = window.navigator?.userAgentData) {
+  const sua = isEmpty(uaData) ? null : Object.freeze(uaDataToSUA(SUA_SOURCE_LOW_ENTROPY, uaData));
+  return function () {
+    return sua;
+  }
+}
+
+export function highEntropySUAAccessor(uaData = window.navigator?.userAgentData) {
+  const cache = {};
+  const keys = new WeakMap();
+  return function (hints = HIGH_ENTROPY_HINTS) {
+    if (!keys.has(hints)) {
+      const sorted = Array.from(hints);
+      sorted.sort();
+      keys.set(hints, sorted.join('|'));
+    }
+    const key = keys.get(hints);
+    if (!cache.hasOwnProperty(key)) {
+      try {
+        cache[key] = uaData.getHighEntropyValues(hints).then(result => {
+          return isEmpty(result) ? null : Object.freeze(uaDataToSUA(SUA_SOURCE_HIGH_ENTROPY, result))
+        }).catch(() => null);
+      } catch (e) {
+        cache[key] = GreedyPromise.resolve(null);
+      }
+    }
+    return cache[key];
+  }
+}
+
+/**
+ * Convert a User Agent client hints object to an ORTB 2.6 device.sua fragment
+ * https://iabtechlab.com/wp-content/uploads/2022/04/OpenRTB-2-6_FINAL.pdf
+ *
+ * @param source source of the UAData object (0 to 3)
+ * @param uaData https://developer.mozilla.org/en-US/docs/Web/API/NavigatorUAData/
+ * @return {{}}
+ */
+export function uaDataToSUA(source, uaData) {
+  function toBrandVersion(brand, version) {
+    const bv = {brand};
+    if (isStr(version) && !isEmptyStr(version)) {
+      bv.version = version.split('.');
+    }
+    return bv;
+  }
+
+  const sua = {source};
+  if (uaData.platform) {
+    sua.platform = toBrandVersion(uaData.platform, uaData.platformVersion);
+  }
+  if (uaData.fullVersionList || uaData.brands) {
+    sua.browsers = (uaData.fullVersionList || uaData.brands).map(({brand, version}) => toBrandVersion(brand, version));
+  }
+  if (uaData.hasOwnProperty('mobile')) {
+    sua.mobile = uaData.mobile ? 1 : 0;
+  }
+  ['model', 'bitness', 'architecture'].forEach(prop => {
+    const value = uaData[prop];
+    if (isStr(value)) {
+      sua[prop] = value;
+    }
+  })
+  return sua;
+}
diff --git a/modules/enrichmentFpdModule.js b/modules/enrichmentFpdModule.js
index ed9381f4e4d..a4d7c06d0fb 100644
--- a/modules/enrichmentFpdModule.js
+++ b/modules/enrichmentFpdModule.js
@@ -7,11 +7,15 @@ import { timestamp, mergeDeep } from '../src/utils.js';
 import { submodule } from '../src/hook.js';
 import {getRefererInfo, parseDomain} from '../src/refererDetection.js';
 import { getCoreStorageManager } from '../src/storageManager.js';
+import {GreedyPromise} from '../src/utils/promise.js';
+import {getHighEntropySUA, getLowEntropySUA} from '../libraries/fpd/sua.js';
 
-let ortb2 = {};
+let ortb2;
 let win = (window === window.top) ? window : window.top;
 export const coreStorage = getCoreStorageManager('enrichmentFpd');
 
+export const sua = {he: getHighEntropySUA, le: getLowEntropySUA};
+
 /**
   * Find the root domain
   * @param {string|undefined} fullDomain
@@ -124,6 +128,17 @@ function setKeywords() {
   if (keywords && keywords.content) mergeDeep(ortb2, { site: { keywords: keywords.content.replace(/\s/g, '') } });
 }
 
+function setDeviceSua(hints) {
+  let data = Array.isArray(hints) && hints.length === 0
+    ? GreedyPromise.resolve(sua.le())
+    : sua.he(hints);
+  return data.then((sua) => {
+    if (sua != null) {
+      mergeDeep(ortb2, {device: {sua}});
+    }
+  })
+}
+
 /**
  * Checks the Global Privacy Control status, and if exists and is true, merges into regs.ext.gpc
  */
@@ -137,30 +152,34 @@ function setGpc() {
 /**
  * Resets modules global ortb2 data
  */
-const resetOrtb2 = () => { ortb2 = {} };
+export const resetEnrichments = () => { ortb2 = null };
 
-function runEnrichments() {
+function runEnrichments(fpdConf) {
   setReferer();
   setPage();
   setDomain();
   setDimensions();
   setKeywords();
   setGpc();
-
-  return ortb2;
+  return setDeviceSua(fpdConf.uaHints).then(() => ortb2);
 }
 
-/**
- * Sets default values to ortb2 if exists and adds currency and ortb2 setConfig callbacks on init
- */
 export function processFpd(fpdConf, {global}) {
-  resetOrtb2();
-
-  return {
-    global: (!fpdConf.skipEnrichments) ? mergeDeep(runEnrichments(), global) : global
-  };
+  if (fpdConf.skipEnrichments) {
+    return {global};
+  } else {
+    let ready;
+    if (ortb2 == null) {
+      ortb2 = {};
+      ready = runEnrichments(fpdConf);
+    } else {
+      ready = GreedyPromise.resolve();
+    }
+    return ready.then(() => ({
+      global: mergeDeep({}, ortb2, global)
+    }))
+  }
 }
-
 /** @type {firstPartyDataSubmodule} */
 export const enrichmentsSubmodule = {
   name: 'enrichments',
diff --git a/test/spec/fpd/sua_spec.js b/test/spec/fpd/sua_spec.js
new file mode 100644
index 00000000000..121922fa78d
--- /dev/null
+++ b/test/spec/fpd/sua_spec.js
@@ -0,0 +1,244 @@
+import {
+  highEntropySUAAccessor,
+  lowEntropySUAAccessor,
+  SUA_SOURCE_HIGH_ENTROPY,
+  SUA_SOURCE_LOW_ENTROPY,
+  SUA_SOURCE_UNKNOWN,
+  suaFromUAData,
+  uaDataToSUA
+} from '../../../libraries/fpd/sua.js';
+
+describe('uaDataToSUA', () => {
+  Object.entries({
+    'platform': 'platform',
+    'browsers': 'brands',
+    'mobile': 'mobile',
+    'architecture': 'architecture',
+    'model': 'model',
+    'bitness': 'bitness'
+  }).forEach(([suaKey, uaKey]) => {
+    it(`should not set ${suaKey} if ${uaKey} is missing from UAData`, () => {
+      const example = {
+        platform: 'Windows',
+        brands: [{brand: 'Mock', version: 'mk'}],
+        mobile: true,
+        model: 'mockModel',
+        bitness: '64',
+        architecture: 'arm'
+      }
+      delete example[uaKey];
+      const sua = uaDataToSUA(SUA_SOURCE_UNKNOWN, example);
+      expect(sua.hasOwnProperty(suaKey)).to.be.false;
+    })
+  });
+
+  it('should convert low-entropy userAgentData', () => {
+    const sua = uaDataToSUA(SUA_SOURCE_LOW_ENTROPY, {
+      'brands': [
+        {
+          'brand': '.Not/A)Brand',
+          'version': '99'
+        },
+        {
+          'brand': 'Google Chrome',
+          'version': '103'
+        },
+        {
+          'brand': 'Chromium',
+          'version': '103'
+        }
+      ],
+      'mobile': false,
+      'platform': 'Linux'
+    });
+
+    expect(sua).to.eql({
+      source: SUA_SOURCE_LOW_ENTROPY,
+      mobile: 0,
+      platform: {
+        brand: 'Linux',
+      },
+      browsers: [
+        {
+          brand: '.Not/A)Brand',
+          version: [
+            '99'
+          ]
+        },
+        {
+          brand: 'Google Chrome',
+          version: [
+            '103'
+          ]
+        },
+        {
+          brand: 'Chromium',
+          version: [
+            '103'
+          ]
+        }
+      ]
+    })
+  });
+
+  it('should convert high entropy properties', () => {
+    const uaData = {
+      architecture: 'x86',
+      bitness: '64',
+      fullVersionList: [
+        {
+          'brand': '.Not/A)Brand',
+          'version': '99.0.0.0'
+        },
+        {
+          'brand': 'Google Chrome',
+          'version': '103.0.5060.134'
+        },
+        {
+          'brand': 'Chromium',
+          'version': '103.0.5060.134'
+        }
+      ],
+      brands: [
+        {
+          'brand': '.Not/A)Brand',
+          'version': '99'
+        },
+        {
+          'brand': 'Google Chrome',
+          'version': '103'
+        },
+        {
+          'brand': 'Chromium',
+          'version': '103'
+        }
+      ],
+      model: 'mockModel',
+      platform: 'Linux',
+      platformVersion: '5.14.0'
+    }
+
+    expect(uaDataToSUA(SUA_SOURCE_HIGH_ENTROPY, uaData)).to.eql({
+      source: SUA_SOURCE_HIGH_ENTROPY,
+      architecture: 'x86',
+      bitness: '64',
+      model: 'mockModel',
+      platform: {
+        brand: 'Linux',
+        version: [
+          '5',
+          '14',
+          '0'
+        ]
+      },
+      browsers: [
+        {
+          brand: '.Not/A)Brand',
+          version: [
+            '99',
+            '0',
+            '0',
+            '0'
+          ]
+        },
+        {
+          brand: 'Google Chrome',
+          version: [
+            '103',
+            '0',
+            '5060',
+            '134'
+          ]
+        },
+        {
+          brand: 'Chromium',
+          version: [
+            '103',
+            '0',
+            '5060',
+            '134'
+          ]
+        }
+      ]
+    })
+  })
+});
+
+describe('lowEntropySUAAccessor', () => {
+  function getSUA(uaData) {
+    return lowEntropySUAAccessor(uaData)();
+  }
+
+  it('should not be modifiable', () => {
+    const sua = getSUA({});
+    expect(() => { sua.prop = 'value'; }).to.throw();
+  });
+
+  it('should return null if no uaData is available', () => {
+    expect(getSUA(null)).to.eql(null);
+  })
+
+  it('should return null if uaData is empty', () => {
+    expect(getSUA({})).to.eql(null);
+  })
+});
+
+describe('highEntropySUAAccessor', () => {
+  let userAgentData, uaResult, getSUA;
+  beforeEach(() => {
+    uaResult = {};
+    userAgentData = {
+      getHighEntropyValues: sinon.stub().callsFake(() => Promise.resolve(uaResult))
+    };
+    getSUA = highEntropySUAAccessor(userAgentData);
+  });
+
+  describe('should resolve to null if', () => {
+    it('uaData is not available', () => {
+      getSUA = highEntropySUAAccessor(null);
+      return getSUA().then((result) => {
+        expect(result).to.eql(null);
+      })
+    });
+    it('getHighEntropyValues is not avialable', () => {
+      delete userAgentData.getHighEntropyValues;
+      return getSUA().then((result) => {
+        expect(result).to.eql(null);
+      })
+    });
+    it('getHighEntropyValues throws', () => {
+      userAgentData.getHighEntropyValues.callsFake(() => { throw new Error() });
+      return getSUA().then((result) => {
+        expect(result).to.eql(null);
+      })
+    });
+    it('getHighEntropyValues rejects', () => {
+      userAgentData.getHighEntropyValues.callsFake(() => Promise.reject(new Error()));
+      return getSUA().then((result) => {
+        expect(result).to.eql(null);
+      })
+    });
+    it('getHighEntropyValues returns an empty object', () => {
+      userAgentData.getHighEntropyValues.callsFake(() => Promise.resolve({}));
+      return getSUA().then((result) => {
+        expect(result).to.eql(null);
+      });
+    })
+  });
+  it('should pass hints to userAgentData', () => {
+    getSUA(['h1', 'h2']);
+    sinon.assert.calledWith(userAgentData.getHighEntropyValues, ['h1', 'h2']);
+  });
+
+  it('should cache results for a set of hints', () => {
+    getSUA(['h1', 'h2']);
+    getSUA(['h2', 'h1']);
+    sinon.assert.calledOnce(userAgentData.getHighEntropyValues);
+  });
+
+  it('should return unmodifiable objects', () => {
+    return getSUA().then(result => {
+      expect(() => { result.prop = 'value'; }).to.throw();
+    })
+  })
+})
diff --git a/test/spec/modules/enrichmentFpdModule_spec.js b/test/spec/modules/enrichmentFpdModule_spec.js
index acdf873d7a6..1c6cab5afec 100644
--- a/test/spec/modules/enrichmentFpdModule_spec.js
+++ b/test/spec/modules/enrichmentFpdModule_spec.js
@@ -1,6 +1,8 @@
 import { expect } from 'chai';
 import { getRefererInfo } from 'src/refererDetection.js';
-import { processFpd, coreStorage } from 'modules/enrichmentFpdModule.js';
+import {processFpd, coreStorage, resetEnrichments} from 'modules/enrichmentFpdModule.js';
+import * as enrichmentModule from 'modules/enrichmentFpdModule.js';
+import {GreedyPromise} from '../../../src/utils/promise.js';
 
 describe('the first party data enrichment module', function() {
   let width;
@@ -11,6 +13,8 @@ describe('the first party data enrichment module', function() {
   let coreStorageStub;
   let canonical;
   let keywords;
+  let lowEntropySuaStub;
+  let highEntropySuaStub;
 
   before(function() {
     canonical = document.createElement('link');
@@ -20,6 +24,7 @@ describe('the first party data enrichment module', function() {
   });
 
   beforeEach(function() {
+    resetEnrichments();
     querySelectorStub = sinon.stub(window.top.document, 'querySelector');
     querySelectorStub.withArgs("link[rel='canonical']").returns(canonical);
     querySelectorStub.withArgs("meta[name='keywords']").returns(keywords);
@@ -35,6 +40,8 @@ describe('the first party data enrichment module', function() {
       .returns(null) // co.uk
       .onSecondCall()
       .returns('writeable'); // domain.co.uk
+    lowEntropySuaStub = sinon.stub(enrichmentModule.sua, 'le').callsFake(() => null);
+    highEntropySuaStub = sinon.stub(enrichmentModule.sua, 'he').callsFake(() => GreedyPromise.resolve());
   });
 
   afterEach(function() {
@@ -46,13 +53,21 @@ describe('the first party data enrichment module', function() {
     canonical.rel = 'canonical';
     keywords = document.createElement('meta');
     keywords.name = 'keywords';
+    lowEntropySuaStub.restore();
+    highEntropySuaStub.restore();
   });
 
+  function syncProcessFpd(fpdConf, ortb2Fragments) {
+    let result;
+    processFpd(fpdConf, ortb2Fragments).then((res) => { result = res; });
+    return result;
+  };
+
   it('adds ref and device values', function() {
     width = 800;
     height = 500;
 
-    let validated = processFpd({}, {}).global;
+    let validated = syncProcessFpd({}, {}).global;
 
     const {ref, page, domain} = getRefererInfo();
     expect(validated.site.ref).to.equal(ref || undefined);
@@ -67,7 +82,7 @@ describe('the first party data enrichment module', function() {
     height = 500;
     canonical.href = 'https://www.subdomain.domain.co.uk/path?query=12345';
 
-    let validated = processFpd({}, {}).global;
+    let validated = syncProcessFpd({}, {}).global;
 
     expect(validated.site.ref).to.equal(getRefererInfo().ref || undefined);
     expect(validated.site.page).to.equal('https://www.subdomain.domain.co.uk/path?query=12345');
@@ -82,7 +97,7 @@ describe('the first party data enrichment module', function() {
     height = 500;
     keywords.content = 'value1,value2,value3';
 
-    let validated = processFpd({}, {}).global;
+    let validated = syncProcessFpd({}, {}).global;
 
     expect(validated.site.keywords).to.equal('value1,value2,value3');
   });
@@ -91,7 +106,7 @@ describe('the first party data enrichment module', function() {
     width = 800;
     height = 500;
 
-    let validated = processFpd({}, {global: {device: {w: 1200, h: 700}, site: {ref: 'https://someUrl.com', page: 'test.com'}}}).global;
+    let validated = syncProcessFpd({}, {global: {device: {w: 1200, h: 700}, site: {ref: 'https://someUrl.com', page: 'test.com'}}}).global;
 
     expect(validated.site.ref).to.equal('https://someUrl.com');
     expect(validated.site.page).to.equal('test.com');
@@ -99,16 +114,44 @@ describe('the first party data enrichment module', function() {
     expect(validated.site.keywords).to.be.undefined;
   });
 
+  it('does not run enrichments again on the second call', () => {
+    width = 1;
+    height = 2;
+    const first = syncProcessFpd({}, {}).global;
+    width = 3;
+    const second = syncProcessFpd({}, {}).global;
+    expect(first).to.eql(second);
+  });
+
+  describe('device.sua', () => {
+    it('does not set device.sua if resolved sua is null', () => {
+      const sua = syncProcessFpd({}, {}).global.device?.sua;
+      expect(sua).to.not.exist;
+    });
+    it('uses low entropy values if uaHints is []', () => {
+      lowEntropySuaStub.callsFake(() => ({mock: 'sua'}));
+      const sua = syncProcessFpd({uaHints: []}, {}).global.device.sua;
+      expect(sua).to.eql({mock: 'sua'});
+    });
+    it('uses high entropy values otherwise', () => {
+      highEntropySuaStub.callsFake((hints) => GreedyPromise.resolve({hints}));
+      const sua = syncProcessFpd({uaHints: ['h1', 'h2']}, {}).global.device.sua;
+      expect(sua).to.eql({hints: ['h1', 'h2']});
+    })
+  })
+
   it('should store a reference to gpc witin ortb2.regs.ext if it has been enabled', function() {
     let validated;
     width = 800;
     height = 500;
 
-    validated = processFpd({}, {}).global;
+    validated = syncProcessFpd({}, {}).global;
     expect(validated.regs).to.equal(undefined);
 
+    resetEnrichments();
+
     const globalPrivacyControlStub = sinon.stub(window, 'navigator').value({globalPrivacyControl: true});
-    validated = processFpd({}, {}).global;
+    validated = syncProcessFpd({}, {}).global;
     expect(validated.regs.ext.gpc).to.equal(1);
     globalPrivacyControlStub.restore();
   });
diff --git a/test/spec/modules/fpdModule_spec.js b/test/spec/modules/fpdModule_spec.js
index 498bed29243..8e95f462830 100644
--- a/test/spec/modules/fpdModule_spec.js
+++ b/test/spec/modules/fpdModule_spec.js
@@ -4,6 +4,8 @@ import {getRefererInfo} from 'src/refererDetection.js';
 import {processFpd, registerSubmodules, startAuctionHook, reset} from 'modules/fpdModule/index.js';
 import * as enrichmentModule from 'modules/enrichmentFpdModule.js';
 import * as validationModule from 'modules/validationFpdModule/index.js';
+import {resetEnrichments} from 'modules/enrichmentFpdModule.js';
+import {GreedyPromise} from '../../../src/utils/promise.js';
 
 describe('the first party data module', function () {
   afterEach(function () {
@@ -57,6 +59,8 @@ describe('the first party data module', function () {
     let querySelectorStub;
     let canonical;
     let keywords;
+    let lowEntropySuaStub;
+    let highEntropySuaStub;
 
     before(function() {
       reset();
@@ -70,6 +74,7 @@ describe('the first party data module', function () {
     });
 
     beforeEach(function() {
+      resetEnrichments();
       querySelectorStub = sinon.stub(window.top.document, 'querySelector');
       querySelectorStub.withArgs("link[rel='canonical']").returns(canonical);
       querySelectorStub.withArgs("meta[name='keywords']").returns(keywords);
@@ -79,6 +84,8 @@ describe('the first party data module', function () {
       heightStub = sinon.stub(window.top, 'innerHeight').get(function () {
         return height;
       });
+      lowEntropySuaStub = sinon.stub(enrichmentModule.sua, 'le').callsFake(() => null);
+      highEntropySuaStub = sinon.stub(enrichmentModule.sua, 'he').callsFake(() => GreedyPromise.resolve());
     });
 
     afterEach(function() {
@@ -89,6 +96,8 @@ describe('the first party data module', function () {
       canonical.rel = 'canonical';
       keywords = document.createElement('meta');
       keywords.name = 'keywords';
+      lowEntropySuaStub.restore();
+      highEntropySuaStub.restore();
     });
 
     it('filters ortb2 data that is set', function () {

From f407e47f96f12834bd79092bc1b5bd0203967598 Mon Sep 17 00:00:00 2001
From: AndBeyondMediaHB <107686862+AndBeyondMediaHB@users.noreply.github.com>
Date: Thu, 6 Oct 2022 19:49:08 +0300
Subject: [PATCH 319/569] AndBeyond.Media adapter: update bidder code (#9005)

* add andBeyondMedia adapter

* update bidderCode

* update biddercode

* change  andbeyond.media => andbeyond

* changes

* updates

* rename files

* updates

Co-authored-by: Vlad Isaiko <vladis@smartyads.com>
---
 .../{andBeyondMediaBidAdapter.js => beyondmediaBidAdapter.js}   | 0
 .../{andBeyondMediaBidAdapter.md => beyondmediaBidAdapter.md}   | 2 +-
 ...ondMediaBidAdapter_spec.js => beyondmediaBidAdapter_spec.js} | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename modules/{andBeyondMediaBidAdapter.js => beyondmediaBidAdapter.js} (100%)
 rename modules/{andBeyondMediaBidAdapter.md => beyondmediaBidAdapter.md} (99%)
 rename test/spec/modules/{andBeyondMediaBidAdapter_spec.js => beyondmediaBidAdapter_spec.js} (99%)

diff --git a/modules/andBeyondMediaBidAdapter.js b/modules/beyondmediaBidAdapter.js
similarity index 100%
rename from modules/andBeyondMediaBidAdapter.js
rename to modules/beyondmediaBidAdapter.js
diff --git a/modules/andBeyondMediaBidAdapter.md b/modules/beyondmediaBidAdapter.md
similarity index 99%
rename from modules/andBeyondMediaBidAdapter.md
rename to modules/beyondmediaBidAdapter.md
index ebb44a7779c..e828bdfd808 100644
--- a/modules/andBeyondMediaBidAdapter.md
+++ b/modules/beyondmediaBidAdapter.md
@@ -76,4 +76,4 @@ AndBeyond.Media bid adapter supports Banner, Video (instream and outstream) and
                     ]
                 }
             ];
-```
\ No newline at end of file
+```
diff --git a/test/spec/modules/andBeyondMediaBidAdapter_spec.js b/test/spec/modules/beyondmediaBidAdapter_spec.js
similarity index 99%
rename from test/spec/modules/andBeyondMediaBidAdapter_spec.js
rename to test/spec/modules/beyondmediaBidAdapter_spec.js
index b739bec288e..a4c1125fa5f 100644
--- a/test/spec/modules/andBeyondMediaBidAdapter_spec.js
+++ b/test/spec/modules/beyondmediaBidAdapter_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { spec } from '../../../modules/andBeyondMediaBidAdapter.js';
+import { spec } from '../../../modules/beyondmediaBidAdapter.js';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 

From 63adafbd3338f845c152f3f1f0ba38a7e3537223 Mon Sep 17 00:00:00 2001
From: Andrew Slagle <42588549+spotxslagle@users.noreply.github.com>
Date: Thu, 6 Oct 2022 12:28:36 -0600
Subject: [PATCH 320/569] Prebid Core: Allow Cpm Custom Rounding (#9018)

* Allow custom rounding functions

* Add custom rounding unit tests

* Default to Math.floor when passed an invalid rounding function

* Add error logging

* Fix import statement
---
 src/cpmBucketManager.js            |  25 +-
 test/spec/cpmBucketManager_spec.js | 416 +++++++++++++++++------------
 2 files changed, 261 insertions(+), 180 deletions(-)

diff --git a/src/cpmBucketManager.js b/src/cpmBucketManager.js
index bd003ddb86d..5bb6675b8e1 100644
--- a/src/cpmBucketManager.js
+++ b/src/cpmBucketManager.js
@@ -1,5 +1,6 @@
 import {find} from './polyfill.js';
-import { isEmpty } from './utils.js';
+import { isEmpty, logWarn } from './utils.js';
+import { config } from './config.js';
 
 const _defaultPrecision = 2;
 const _lgPriceConfig = {
@@ -118,6 +119,11 @@ function getCpmTarget(cpm, bucket, granularityMultiplier) {
   const precision = typeof bucket.precision !== 'undefined' ? bucket.precision : _defaultPrecision;
   const increment = bucket.increment * granularityMultiplier;
   const bucketMin = bucket.min * granularityMultiplier;
+  let roundingFunction = Math.floor;
+  let customRoundingFunction = config.getConfig('cpmRoundingFunction');
+  if (typeof customRoundingFunction === 'function') {
+    roundingFunction = customRoundingFunction;
+  }
 
   // start increments at the bucket min and then add bucket min back to arrive at the correct rounding
   // note - we're padding the values to avoid using decimals in the math prior to flooring
@@ -125,10 +131,23 @@ function getCpmTarget(cpm, bucket, granularityMultiplier) {
   //   (eg 4.01 / 0.01 = 400.99999999999994)
   // min precison should be 2 to move decimal place over.
   let pow = Math.pow(10, precision + 2);
-  let cpmToFloor = ((cpm * pow) - (bucketMin * pow)) / (increment * pow);
-  let cpmTarget = ((Math.floor(cpmToFloor)) * increment) + bucketMin;
+  let cpmToRound = ((cpm * pow) - (bucketMin * pow)) / (increment * pow);
+  let cpmTarget;
+  let invalidRounding;
+  // It is likely that we will be passed {cpmRoundingFunction: roundingFunction()}
+  // rather than the expected {cpmRoundingFunction: roundingFunction}. Default back to floor in that case
+  try {
+    cpmTarget = (roundingFunction(cpmToRound) * increment) + bucketMin;
+  } catch (err) {
+    invalidRounding = true;
+  }
+  if (invalidRounding || typeof cpmTarget !== 'number') {
+    logWarn('Invalid rounding function passed in config');
+    cpmTarget = (Math.floor(cpmToRound) * increment) + bucketMin;
+  }
   // force to 10 decimal places to deal with imprecise decimal/binary conversions
   //    (for example 0.1 * 3 = 0.30000000000000004)
+
   cpmTarget = Number(cpmTarget.toFixed(10));
   return cpmTarget.toFixed(precision);
 }
diff --git a/test/spec/cpmBucketManager_spec.js b/test/spec/cpmBucketManager_spec.js
index 0b8635a4e3b..044c65ca504 100644
--- a/test/spec/cpmBucketManager_spec.js
+++ b/test/spec/cpmBucketManager_spec.js
@@ -1,195 +1,257 @@
 import { expect } from 'chai';
-import {getPriceBucketString, isValidPriceConfig} from 'src/cpmBucketManager.js';
+import { getPriceBucketString, isValidPriceConfig } from 'src/cpmBucketManager.js';
+import { config } from 'src/config.js';
+
 let cpmFixtures = require('test/fixtures/cpmInputsOutputs.json');
 
 describe('cpmBucketManager', function () {
-  it('getPriceBucketString function generates the correct price strings', function () {
-    let input = cpmFixtures.cpmInputs;
-    for (let i = 0; i < input.length; i++) {
-      let output = getPriceBucketString(input[i]);
-      let jsonOutput = JSON.stringify(output);
-      expect(jsonOutput).to.deep.equal(JSON.stringify(cpmFixtures.priceStringOutputs[i]));
-    }
-  });
-
-  it('gets the correct custom bucket strings', function () {
-    let cpm = 16.50908;
-    let customConfig = {
-      'buckets': [{
-        'precision': 4,
-        'max': 3,
-        'increment': 0.01,
-      },
-      {
-        'precision': 4,
-        'max': 18,
-        'increment': 0.05,
-        'cap': true
+  describe('getPriceBucketString', function () {
+    it('getPriceBucketString function generates the correct price strings', function () {
+      let input = cpmFixtures.cpmInputs;
+      for (let i = 0; i < input.length; i++) {
+        let output = getPriceBucketString(input[i]);
+        let jsonOutput = JSON.stringify(output);
+        expect(jsonOutput).to.deep.equal(JSON.stringify(cpmFixtures.priceStringOutputs[i]));
       }
-      ]
-    };
-    let expected = '{"low":"5.00","med":"16.50","high":"16.50","auto":"16.50","dense":"16.50","custom":"16.5000"}';
-    let output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-  });
+    });
 
-  it('gets the correct custom bucket strings with irregular increment', function () {
-    let cpm = 14.50908;
-    let customConfig = {
-      'buckets': [{
-        'precision': 4,
-        'max': 4,
-        'increment': 0.01,
-      },
-      {
-        'precision': 4,
-        'max': 18,
-        'increment': 0.3,
-        'cap': true
-      }
-      ]
-    };
-    let expected = '{"low":"5.00","med":"14.50","high":"14.50","auto":"14.50","dense":"14.50","custom":"14.5000"}';
-    let output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-  });
-
-  it('gets the correct custom bucket strings in non-USD currency', function () {
-    let cpm = 16.50908 * 110.49;
-    let customConfig = {
-      'buckets': [{
-        'precision': 4,
-        'max': 3,
-        'increment': 0.01,
-      },
-      {
-        'precision': 4,
-        'max': 18,
-        'increment': 0.05,
-        'cap': true
-      }
-      ]
-    };
-    let expected = '{"low":"552.45","med":"1823.09","high":"1823.09","auto":"1823.09","dense":"1823.09","custom":"1823.0850"}';
-    let output = getPriceBucketString(cpm, customConfig, 110.49);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-  });
-
-  it('gets the correct custom bucket strings with specific cpms that round oddly with certain increments', function () {
-    let customConfig = {
-      'buckets': [{
-        'precision': 4,
-        'max': 4,
-        'increment': 0.10,
-      }]
-    };
-    let cpm = 2.21;
-    let expected = '{"low":"2.00","med":"2.20","high":"2.21","auto":"2.20","dense":"2.21","custom":"2.2000"}';
-    let output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    cpm = 3.15;
-    expected = '{"low":"3.00","med":"3.10","high":"3.15","auto":"3.15","dense":"3.15","custom":"3.1000"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    customConfig = {
-      'buckets': [{
-        'precision': 3,
-        'max': 6,
-        'increment': 0.08,
-      }]
-    };
-    cpm = 4.89;
-    expected = '{"low":"4.50","med":"4.80","high":"4.89","auto":"4.85","dense":"4.85","custom":"4.880"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    customConfig = {
-      'buckets': [{
-        'precision': 3,
-        'max': 6,
-        'increment': 0.05,
-      }]
-    };
-    cpm = 2.98;
-    expected = '{"low":"2.50","med":"2.90","high":"2.98","auto":"2.95","dense":"2.98","custom":"2.950"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    cpm = 2.99;
-    expected = '{"low":"2.50","med":"2.90","high":"2.99","auto":"2.95","dense":"2.99","custom":"2.950"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    customConfig = {
-      'buckets': [{
-        'precision': 2,
-        'max': 6,
-        'increment': 0.01,
-      }]
-    };
-    cpm = 4.01;
-    expected = '{"low":"4.00","med":"4.00","high":"4.01","auto":"4.00","dense":"4.00","custom":"4.01"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    cpm = 4.68;
-    expected = '{"low":"4.50","med":"4.60","high":"4.68","auto":"4.65","dense":"4.65","custom":"4.68"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-
-    cpm = 4.69;
-    expected = '{"low":"4.50","med":"4.60","high":"4.69","auto":"4.65","dense":"4.65","custom":"4.69"}';
-    output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-  });
-
-  it('gets custom bucket strings and it should honor 0', function () {
-    let cpm = 16.50908;
-    let customConfig = {
-      'buckets': [
+    it('gets the correct custom bucket strings', function () {
+      let cpm = 16.50908;
+      let customConfig = {
+        'buckets': [{
+          'precision': 4,
+          'max': 3,
+          'increment': 0.01,
+        },
         {
-          'precision': 0,
+          'precision': 4,
           'max': 18,
           'increment': 0.05,
-        }
-      ]
-    };
-    let expected = '{"low":"5.00","med":"16.50","high":"16.50","auto":"16.50","dense":"16.50","custom":"17"}';
-    let output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
-  });
+          'cap': true
+        }]
+      };
+      let expected = '{"low":"5.00","med":"16.50","high":"16.50","auto":"16.50","dense":"16.50","custom":"16.5000"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
 
-  it('gets the custom bucket strings without passing precision and it should honor the default precision', function () {
-    let cpm = 16.50908;
-    let customConfig = {
-      'buckets': [
+    it('gets the correct custom bucket strings with irregular increment', function () {
+      let cpm = 14.50908;
+      let customConfig = {
+        'buckets': [{
+          'precision': 4,
+          'max': 4,
+          'increment': 0.01,
+        },
         {
+          'precision': 4,
+          'max': 18,
+          'increment': 0.3,
+          'cap': true
+        }]
+      };
+      let expected = '{"low":"5.00","med":"14.50","high":"14.50","auto":"14.50","dense":"14.50","custom":"14.5000"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('gets the correct custom bucket strings in non-USD currency', function () {
+      let cpm = 16.50908 * 110.49;
+      let customConfig = {
+        'buckets': [{
+          'precision': 4,
+          'max': 3,
+          'increment': 0.01,
+        },
+        {
+          'precision': 4,
           'max': 18,
           'increment': 0.05,
-        }
-      ]
-    };
-    let expected = '{"low":"5.00","med":"16.50","high":"16.50","auto":"16.50","dense":"16.50","custom":"16.50"}';
-    let output = getPriceBucketString(cpm, customConfig);
-    expect(JSON.stringify(output)).to.deep.equal(expected);
+          'cap': true
+        }]
+      };
+      let expected = '{"low":"552.45","med":"1823.09","high":"1823.09","auto":"1823.09","dense":"1823.09","custom":"1823.0850"}';
+      let output = getPriceBucketString(cpm, customConfig, 110.49);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('gets the correct custom bucket strings with specific cpms that round oddly with certain increments', function () {
+      let customConfig = {
+        'buckets': [{
+          'precision': 4,
+          'max': 4,
+          'increment': 0.10,
+        }]
+      };
+      let cpm = 2.21;
+      let expected = '{"low":"2.00","med":"2.20","high":"2.21","auto":"2.20","dense":"2.21","custom":"2.2000"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      cpm = 3.15;
+      expected = '{"low":"3.00","med":"3.10","high":"3.15","auto":"3.15","dense":"3.15","custom":"3.1000"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      customConfig = {
+        'buckets': [{
+          'precision': 3,
+          'max': 6,
+          'increment': 0.08,
+        }]
+      };
+      cpm = 4.89;
+      expected = '{"low":"4.50","med":"4.80","high":"4.89","auto":"4.85","dense":"4.85","custom":"4.880"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      customConfig = {
+        'buckets': [{
+          'precision': 3,
+          'max': 6,
+          'increment': 0.05,
+        }]
+      };
+      cpm = 2.98;
+      expected = '{"low":"2.50","med":"2.90","high":"2.98","auto":"2.95","dense":"2.98","custom":"2.950"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      cpm = 2.99;
+      expected = '{"low":"2.50","med":"2.90","high":"2.99","auto":"2.95","dense":"2.99","custom":"2.950"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      customConfig = {
+        'buckets': [{
+          'precision': 2,
+          'max': 6,
+          'increment': 0.01,
+        }]
+      };
+      cpm = 4.01;
+      expected = '{"low":"4.00","med":"4.00","high":"4.01","auto":"4.00","dense":"4.00","custom":"4.01"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      cpm = 4.68;
+      expected = '{"low":"4.50","med":"4.60","high":"4.68","auto":"4.65","dense":"4.65","custom":"4.68"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+
+      cpm = 4.69;
+      expected = '{"low":"4.50","med":"4.60","high":"4.69","auto":"4.65","dense":"4.65","custom":"4.69"}';
+      output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('gets custom bucket strings and it should honor 0', function () {
+      let cpm = 16.50908;
+      let customConfig = {
+        'buckets': [
+          {
+            'precision': 0,
+            'max': 18,
+            'increment': 0.05,
+          }
+        ]
+      };
+      let expected = '{"low":"5.00","med":"16.50","high":"16.50","auto":"16.50","dense":"16.50","custom":"17"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('gets the custom bucket strings without passing precision and it should honor the default precision', function () {
+      let cpm = 16.50908;
+      let customConfig = {
+        'buckets': [
+          {
+            'max': 18,
+            'increment': 0.05,
+          }
+        ]
+      };
+      let expected = '{"low":"5.00","med":"16.50","high":"16.50","auto":"16.50","dense":"16.50","custom":"16.50"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('defaults to Math.floor if no rounding function is provided', function () {
+      let cpm = 6.516;
+      let customConfig = {
+        'buckets': [
+          {
+            'max': 18,
+            'increment': 0.05,
+          }
+        ]
+      };
+      let expected = '{"low":"5.00","med":"6.50","high":"6.51","auto":"6.50","dense":"6.50","custom":"6.50"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('accepts custom rounding functions', function () {
+      let cpm = 6.516;
+      let customConfig = {
+        'buckets': [
+          {
+            'max': 18,
+            'increment': 0.05,
+          }
+        ]
+      };
+      let getConfig = config.getConfig;
+      config.getConfig = () => Math.ceil;
+      let expected = '{"low":"5.00","med":"6.60","high":"6.52","auto":"6.60","dense":"6.55","custom":"6.55"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      config.getConfig = getConfig;
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
+
+    it('will default to Math.floor if passed an invalid rounding function', function () {
+      let cpm = 6.516;
+      let customConfig = {
+        'buckets': [
+          {
+            'max': 18,
+            'increment': 0.05,
+          }
+        ]
+      };
+      let getConfig = config.getConfig;
+      config.getConfig = () => Math.ceil(5.3);
+      let expected = '{"low":"5.00","med":"6.50","high":"6.51","auto":"6.50","dense":"6.50","custom":"6.50"}';
+      let output = getPriceBucketString(cpm, customConfig);
+      config.getConfig = getConfig;
+      expect(JSON.stringify(output)).to.deep.equal(expected);
+    });
   });
 
-  it('checks whether custom config is valid', function () {
-    let badConfig = {
-      'buckets': [{
-        'max': 3,
-        'increment': 0.01,
-      },
-      {
-        'max': 18,
-        // missing increment prop
-        'cap': true
-      }
-      ]
-    };
+  describe('isValidPriceConfig', function () {
+    it('checks whether custom config is valid', function () {
+      let badConfig = {
+        'buckets': [{
+          'max': 3,
+          'increment': 0.01,
+        },
+        {
+          'max': 18,
+          // missing increment prop
+          'cap': true
+        }]
+      };
+      expect(isValidPriceConfig(badConfig)).to.be.false;
 
-    expect(isValidPriceConfig(badConfig)).to.be.false;
+      let customConfig = {
+        'buckets': [
+          {
+            'max': 18,
+            'increment': 0.05,
+          }
+        ]
+      };
+      expect(isValidPriceConfig(customConfig)).to.be.true;
+    });
   });
 });

From 912934d7067ca65783662e8a21f92248cf4a1f6e Mon Sep 17 00:00:00 2001
From: jsfledd <jsfledd@users.noreply.github.com>
Date: Thu, 6 Oct 2022 11:48:12 -0700
Subject: [PATCH 321/569] Nativo Bid Adapter: change QS param referrer value
 (#9083)

* Initial nativoBidAdapter document creation (js, md and spec)

* Fulling working prebid using nativoBidAdapter. Support for GDPR and CCPA in user syncs.

* Added defult size settings based on the largest ad unit. Added response body validation. Added consent to request url qs params.

* Changed bidder endpoint url

* Changed double quotes to single quotes.

* Reverted package-json.lock to remove modifications from PR

* Added optional bidder param 'url' so the ad server can force- match an existing placement

* Lint fix. Added space after if.

* Added new QS param to send various adUnit data to adapter endpopint

* Updated unit test for new QS param

* Added qs param to keep track of ad unit refreshes

* Updated bidMap key default value

* Updated refresh increment logic

* Refactored spread operator for IE11 support

* Updated isBidRequestValid check

* Refactored Object.enties to use Object.keys to fix CircleCI testing errors

* Updated bid mapping key creation to prioritize ad unit code over placementId

* Added filtering by ad, advertiser and campaign.

* Merged master

* Added more robust bidDataMap with multiple key access

* Deduped filer values

* Rolled back package.json

* Duped upstream/master's package.lock file ... not sure how it got changed in the first place

* Small refactor of filterData length check. Removed comparison with 0 since a length value of 0 is already falsy.

* Added bid sizes to request

* Fixed function name in spec. Added unit tests.

* Added priceFloor module support

* Added protection agains empty url parameter

* Changed ntv_url QS param to use referrer.location instead of referrer.page

* Removed testing 'only' flag
---
 modules/nativoBidAdapter.js                |  2 +-
 test/spec/modules/nativoBidAdapter_spec.js | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/nativoBidAdapter.js b/modules/nativoBidAdapter.js
index 7177abecae0..7eb37ea8b82 100644
--- a/modules/nativoBidAdapter.js
+++ b/modules/nativoBidAdapter.js
@@ -145,7 +145,7 @@ export const spec = {
         'params.url',
       )
       if (pageUrl == undefined || pageUrl === '') {
-        pageUrl = bidderRequest.refererInfo.page
+        pageUrl = bidderRequest.refererInfo.location
       }
 
       placementId = deepAccess(bidRequest, 'params.placementId')
diff --git a/test/spec/modules/nativoBidAdapter_spec.js b/test/spec/modules/nativoBidAdapter_spec.js
index be6b07f9acc..4cd4c92281b 100644
--- a/test/spec/modules/nativoBidAdapter_spec.js
+++ b/test/spec/modules/nativoBidAdapter_spec.js
@@ -125,12 +125,23 @@ describe('nativoBidAdapterTests', function () {
       expect(request.url).to.include('ntv_pas')
     })
 
+    it('ntv_url should contain query params', function () {
+      const request = spec.buildRequests(bidRequests, {
+        bidderRequestId: 123456,
+        refererInfo: {
+          location: 'https://www.test.com?queryTest=true',
+        },
+      })
+      console.log(request.url) // eslint-disable-line no-console
+      expect(request.url).to.include(encodeURIComponent('?queryTest=true'))
+    })
+
     it('ntv_url parameter should NOT be empty even if the utl parameter was set as an empty value', function () {
       bidRequests[0].params.url = ''
       const request = spec.buildRequests(bidRequests, {
         bidderRequestId: 123456,
         refererInfo: {
-          referer: 'https://www.test.com',
+          location: 'https://www.test.com',
         },
       })
 
@@ -144,7 +155,7 @@ describe('nativoBidAdapterTests', function () {
       const request = spec.buildRequests(bidRequests, {
         bidderRequestId: 123456,
         refererInfo: {
-          referer: 'https://www.test.com',
+          location: 'https://www.test.com',
         },
       })
 

From 28fe695fe51cfa30d73f3469f70d83b427fabec2 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 6 Oct 2022 19:08:01 +0000
Subject: [PATCH 322/569] Prebid 7.19.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 50555bda183..84f89b32d97 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.19.0-pre",
+  "version": "7.19.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index eec3b6a9da9..22c8bb68640 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.19.0-pre",
+  "version": "7.19.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From e3d0038f365bf3b0ff68709f7bd4e10d5bb1d36d Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 6 Oct 2022 19:08:02 +0000
Subject: [PATCH 323/569] Increment version to 7.20.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 84f89b32d97..9a4b993de72 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.19.0",
+  "version": "7.20.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 22c8bb68640..5fe3556a11e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.19.0",
+  "version": "7.20.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 5ca852960ecf2cd2bce083c1b086432608560574 Mon Sep 17 00:00:00 2001
From: Denis Logachov <denis@adkernel.com>
Date: Mon, 10 Oct 2022 16:55:44 +0300
Subject: [PATCH 324/569] Adkernel Bid Adapter: rtbdemand.com alias (#9087)

* Adkernel Bid Adapter: rtbdemand.com alias

* Update adkernelBidAdapter.js
---
 modules/adkernelBidAdapter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index ff7d3be6ebf..b0449418a87 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -79,7 +79,6 @@ export const spec = {
     {code: 'audiencemedia'},
     {code: 'waardex_ak'},
     {code: 'roqoon'},
-    {code: 'andbeyond'},
     {code: 'adbite'},
     {code: 'houseofpubs'},
     {code: 'torchad'},
@@ -97,7 +96,8 @@ export const spec = {
     {code: 'felixads'},
     {code: 'motionspots'},
     {code: 'sonic_twist'},
-    {code: 'displayioads'}
+    {code: 'displayioads'},
+    {code: 'rtbdemand_com'}
   ],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 

From be1995b57337555e9788420508cabdfdb9ec0cc0 Mon Sep 17 00:00:00 2001
From: Mike Marcus <mike@lotame.com>
Date: Mon, 10 Oct 2022 10:03:59 -0400
Subject: [PATCH 325/569] Lotame Panorama Id System: bug fixes (#9092)

* GRUE-246 fixed bug to test for emnpty value before returning, fixed bug to check for null values and to convert a string to an int before treating it as a timestamp.

* GRUE-246 Removed trailing space.
---
 modules/lotamePanoramaIdSystem.js                | 16 ++++++++++------
 test/spec/modules/lotamePanoramaIdSystem_spec.js |  1 -
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/lotamePanoramaIdSystem.js b/modules/lotamePanoramaIdSystem.js
index a03626d4a1f..832d98e4f83 100644
--- a/modules/lotamePanoramaIdSystem.js
+++ b/modules/lotamePanoramaIdSystem.js
@@ -28,6 +28,7 @@ const DAYS_TO_CACHE = 7;
 const DAY_MS = 60 * 60 * 24 * 1000;
 const MISSING_CORE_CONSENT = 111;
 const GVLID = 95;
+const ID_HOST = 'id.crwdcntrl.net';
 
 export const storage = getStorageManager({gvlid: GVLID, moduleName: MODULE_NAME});
 let cookieDomain;
@@ -57,12 +58,14 @@ function setProfileId(profileId) {
  * Get the Lotame profile id by checking cookies first and then local storage
  */
 function getProfileId() {
+  let profileId;
   if (storage.cookiesAreEnabled()) {
-    return storage.getCookie(KEY_PROFILE, undefined);
+    profileId = storage.getCookie(KEY_PROFILE, undefined);
   }
-  if (storage.hasLocalStorage()) {
-    return storage.getDataFromLocalStorage(KEY_PROFILE, undefined);
+  if (!profileId && storage.hasLocalStorage()) {
+    profileId = storage.getDataFromLocalStorage(KEY_PROFILE, undefined);
   }
+  return profileId;
 }
 
 /**
@@ -78,10 +81,11 @@ function getFromStorage(key) {
     const storedValueExp = storage.getDataFromLocalStorage(
       `${key}_exp`, undefined
     );
-    if (storedValueExp === '') {
+
+    if (storedValueExp === '' || storedValueExp === null) {
       value = storage.getDataFromLocalStorage(key, undefined);
     } else if (storedValueExp) {
-      if ((new Date(storedValueExp)).getTime() - Date.now() > 0) {
+      if ((new Date(parseInt(storedValueExp, 10))).getTime() - Date.now() > 0) {
         value = storage.getDataFromLocalStorage(key, undefined);
       }
     }
@@ -284,7 +288,7 @@ export const lotamePanoramaIdSubmodule = {
 
       const url = buildUrl({
         protocol: 'https',
-        host: `id.crwdcntrl.net`,
+        host: ID_HOST,
         pathname: '/id',
         search: isEmpty(queryParams) ? undefined : queryParams,
       });
diff --git a/test/spec/modules/lotamePanoramaIdSystem_spec.js b/test/spec/modules/lotamePanoramaIdSystem_spec.js
index 090144ab158..5dc055ac080 100644
--- a/test/spec/modules/lotamePanoramaIdSystem_spec.js
+++ b/test/spec/modules/lotamePanoramaIdSystem_spec.js
@@ -70,7 +70,6 @@ describe('LotameId', function() {
 
     it('should call the remote server when getId is called', function () {
       expect(request.url).to.be.eq('https://id.crwdcntrl.net/id');
-
       expect(callBackSpy.calledOnce).to.be.true;
     });
 

From 728748633a1226d7097cc5765c2b7b24aef91dea Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Tue, 11 Oct 2022 05:07:02 -0600
Subject: [PATCH 326/569] Eplanning Bid Adapter: add support for video (#9044)

* add video

* move up imptypes logic

* fix linting

* update curly braces

* fix spaces linting

* fix line
---
 modules/eplanningBidAdapter.js                |  50 ++-
 test/spec/modules/eplanningBidAdapter_spec.js | 286 +++++++++++++++++-
 2 files changed, 333 insertions(+), 3 deletions(-)

diff --git a/modules/eplanningBidAdapter.js b/modules/eplanningBidAdapter.js
index 0d37b72f4ad..b60c3571d47 100644
--- a/modules/eplanningBidAdapter.js
+++ b/modules/eplanningBidAdapter.js
@@ -2,6 +2,7 @@ import {getWindowSelf, isEmpty, parseSizesInput, isGptPubadsDefined, isSlotMatch
 import {getGlobal} from '../src/prebidGlobal.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {getStorageManager} from '../src/storageManager.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'eplanning';
 export const storage = getStorageManager({bidderCode: BIDDER_CODE});
@@ -19,9 +20,14 @@ const STORAGE_VIEW_PREFIX = 'pbvi_';
 const mobileUserAgent = isMobileUserAgent();
 const PRIORITY_ORDER_FOR_MOBILE_SIZES_ASC = ['1x1', '300x50', '320x50', '300x250'];
 const PRIORITY_ORDER_FOR_DESKTOP_SIZES_ASC = ['1x1', '970x90', '970x250', '160x600', '300x600', '728x90', '300x250'];
+const VAST_INSTREAM = 1;
+const VAST_OUTSTREAM = 2;
+const VAST_VERSION_DEFAULT = 3;
+const DEFAULT_SIZE_VAST = '640x480';
 
 export const spec = {
   code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
 
   isBidRequestValid: function(bid) {
     return Boolean(bid.params.ci) || Boolean(bid.params.t);
@@ -86,6 +92,10 @@ export const spec = {
           params['e_' + id] = (typeof userIds[id] === 'object') ? encodeURIComponent(JSON.stringify(userIds[id])) : encodeURIComponent(userIds[id]);
         }
       }
+      if (spaces.impType) {
+        params.vctx = spaces.impType & VAST_INSTREAM ? VAST_INSTREAM : VAST_OUTSTREAM;
+        params.vv = VAST_VERSION_DEFAULT;
+      }
     }
 
     return {
@@ -108,7 +118,6 @@ export const spec = {
               cpm: ad.pr,
               width: ad.w,
               height: ad.h,
-              ad: ad.adm,
               ttl: TTL,
               creativeId: ad.crid,
               netRevenue: NET_REVENUE,
@@ -119,6 +128,13 @@ export const spec = {
                 advertiserDomains: ad.adom
               };
             }
+            if (isVastResponse(ad)) {
+              bidResponse.vastXml = ad.adm;
+              bidResponse.mediaTypes = VIDEO;
+            } else {
+              bidResponse.ad = ad.adm;
+            }
+
             bidResponses.push(bidResponse);
           });
         }
@@ -236,17 +252,42 @@ function getSpacesStruct(bids) {
   return e;
 }
 
+function getFirstSizeVast(sizes) {
+  if (sizes == undefined || !Array.isArray(sizes)) {
+    return undefined;
+  }
+
+  let size = Array.isArray(sizes[0]) ? sizes[0] : sizes;
+
+  return (Array.isArray(size) && size.length == 2) ? size : undefined;
+}
+
 function cleanName(name) {
   return name.replace(/_|\.|-|\//g, '').replace(/\)\(|\(|\)|:/g, '_').replace(/^_+|_+$/g, '');
 }
 
 function getSpaces(bidRequests, ml) {
+  let impType = bidRequests.reduce((previousBits, bid) => (bid.mediaTypes && bid.mediaTypes[VIDEO]) ? (bid.mediaTypes[VIDEO].context == 'outstream' ? (previousBits | 2) : (previousBits | 1)) : previousBits, 0);
+  // Only one type of auction is supported at a time
+  if (impType) {
+    bidRequests = bidRequests.filter((bid) => bid.mediaTypes && bid.mediaTypes[VIDEO] && (impType & VAST_INSTREAM ? (!bid.mediaTypes[VIDEO].context || bid.mediaTypes[VIDEO].context == 'instream') : (bid.mediaTypes[VIDEO].context == 'outstream')));
+  }
+
   let spacesStruct = getSpacesStruct(bidRequests);
-  let es = {str: '', vs: '', map: {}};
+  let es = {str: '', vs: '', map: {}, impType: impType};
   es.str = Object.keys(spacesStruct).map(size => spacesStruct[size].map((bid, i) => {
     es.vs += getVs(bid);
 
     let name;
+
+    if (impType) {
+      let firstSize = getFirstSizeVast(bid.mediaTypes[VIDEO].playerSize);
+      let sizeVast = firstSize ? firstSize.join('x') : DEFAULT_SIZE_VAST;
+      name = 'video_' + sizeVast + '_' + i;
+      es.map[name] = bid.bidId;
+      return name + ':' + sizeVast + ';1';
+    }
+
     if (ml) {
       name = cleanName(bid.adUnitCode);
     } else {
@@ -462,4 +503,9 @@ function registerAuction(storageID) {
 
   return true;
 }
+
+function isVastResponse(bid) {
+  return bid.adm.match(/^(<VAST)|(<VideoAdServingTemplate)/gmi);
+}
+
 registerBidder(spec);
diff --git a/test/spec/modules/eplanningBidAdapter_spec.js b/test/spec/modules/eplanningBidAdapter_spec.js
index db70f7956d7..a356c9cee95 100644
--- a/test/spec/modules/eplanningBidAdapter_spec.js
+++ b/test/spec/modules/eplanningBidAdapter_spec.js
@@ -7,6 +7,7 @@ import * as utils from 'src/utils.js';
 import {hook} from '../../../src/hook.js';
 import {getGlobal} from '../../../src/prebidGlobal.js';
 import { makeSlot } from '../integration/faker/googletag.js';
+import {BANNER, VIDEO} from '../../../src/mediaTypes.js';
 
 describe('E-Planning Adapter', function () {
   const adapter = newBidder('spec');
@@ -19,6 +20,7 @@ describe('E-Planning Adapter', function () {
   const CLEAN_ADUNIT_CODE2 = '300x250_1';
   const CLEAN_ADUNIT_CODE = '300x250_0';
   const CLEAN_ADUNIT_CODE_ML = 'adunitco_de';
+  const CLEAN_ADUNIT_CODE_VAST = 'VIDEO_300x250_0';
   const BID_ID = '123456789';
   const BID_ID2 = '987654321';
   const BID_ID3 = '998877665';
@@ -30,6 +32,9 @@ describe('E-Planning Adapter', function () {
   const CRID = '1234567890';
   const TEST_ISV = 'leles.e-planning.net';
   const ADOMAIN = 'adomain.com';
+  const ADM_VAST = '<VAST version=\"2.0\">\n<Ad id=\"602833\">\n<Wrapper>\n<AdSystem>Acudeo Compatible</AdSystem>\n<VASTAdTagURI>\nhttp://demo.tremormedia.com/proddev/vast/vast_inline_linear.xml\n</VASTAdTagURI>\n<Impression><![CDATA[https://cndigrazia34.devel.e-planning.net:444/eli/4/19911d/6584303d5d0da8bc?i=0123456789012345&fi=0123456789abcdef&pb=<% EXCHANGE_EPBID_49 %>&nfc=1&S=<% SERVER_ID %>&rnd=733663791&bk=0123456789abcdef]]></Impression><Impression>http://myTrackingURL/wrapper/impression</Impression>\n<Creatives>\n<Creative AdID=\"602833\">\n<Linear>\n<TrackingEvents></TrackingEvents>\n</Linear>\n</Creative>\n<Creative AdID=\"602833-Companion\">\n<CompanionAds>\n<Companion width=\"300\" height=\"250\">\n<StaticResource creativeType=\"image/jpeg\">\nhttp://demo.tremormedia.com/proddev/vast/300x250_banner1.jpg\n</StaticResource>\n<TrackingEvents>\n<Tracking event=\"creativeView\">\nhttp://myTrackingURL/wrapper/firstCompanionCreativeView\n</Tracking>\n</TrackingEvents>\n<CompanionClickThrough>http://www.tremormedia.com</CompanionClickThrough>\n</Companion>\n<Companion width=\"728\" height=\"90\">\n<StaticResource creativeType=\"image/jpeg\">\nhttp://demo.tremormedia.com/proddev/vast/728x90_banner1.jpg\n</StaticResource>\n<CompanionClickThrough>http://www.tremormedia.com</CompanionClickThrough>\n</Companion>\n</CompanionAds>\n</Creative>\n</Creatives>\n</Wrapper>\n</Ad>\n</VAST>\n';
+  const ADM_VAST_VV_1 = '<VideoAdServingTemplate xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"vast_loose.xsd\">test</VideoAdServingTemplate>';
+  const DEFAULT_SIZE_VAST = '640x480';
   const validBid = {
     'bidder': 'eplanning',
     'bidId': BID_ID,
@@ -69,6 +74,110 @@ describe('E-Planning Adapter', function () {
     },
     'sizes': [[300, 250], [300, 600]],
   };
+  const validBidSpaceOutstream = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    },
+    'mediaTypes': {
+      'video': {
+        'context': 'outstream',
+        'playerSize': [300, 600],
+        'mimes': ['video/mp4'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'playbackmethod': [2],
+        'skip': 1
+      }
+    },
+  };
+  const validBidOutstreamNoSize = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    },
+    'mediaTypes': {
+      'video': {
+        'context': 'outstream',
+        'mimes': ['video/mp4'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'playbackmethod': [2],
+        'skip': 1
+      }
+    },
+  };
+  const validBidOutstreamNSizes = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    },
+    'mediaTypes': {
+      'video': {
+        'context': 'outstream',
+        'playerSize': [[300, 600], [400, 500], [500, 500]],
+        'mimes': ['video/mp4'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'playbackmethod': [2],
+        'skip': 1
+      }
+    },
+  };
+  const bidOutstreamInvalidSizes = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    },
+    'mediaTypes': {
+      'video': {
+        'context': 'outstream',
+        'playerSize': 'invalidSize',
+        'mimes': ['video/mp4'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'playbackmethod': [2],
+        'skip': 1
+      }
+    },
+  };
+  const validBidSpaceInstream = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    },
+    'mediaTypes': {
+      'video': {
+        'context': 'instream',
+        'mimes': ['video/mp4'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'playbackmethod': [2],
+        'skip': 1
+      }
+    },
+  };
+  const validBidSpaceVastNoContext = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    },
+    'mediaTypes': {
+      'video': {
+        'mimes': ['video/mp4'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'playbackmethod': [2],
+        'skip': 1
+      }
+    },
+  };
   const validBidView = {
     'bidder': 'eplanning',
     'bidId': BID_ID,
@@ -145,6 +254,14 @@ describe('E-Planning Adapter', function () {
       }
     }
   };
+  const validBidNoSize = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+      'sn': SN,
+    }
+  };
   const response = {
     body: {
       'sI': {
@@ -176,6 +293,68 @@ describe('E-Planning Adapter', function () {
       ]
     }
   };
+  const responseVast = {
+    body: {
+      'sI': {
+        'k': '12345'
+      },
+      'sec': {
+        'k': 'ROS'
+      },
+      'sp': [{
+        'k': CLEAN_ADUNIT_CODE_VAST,
+        'a': [{
+          'adm': ADM_VAST,
+          'id': '7854abc56248f874',
+          'i': I_ID,
+          'fi': '7854abc56248f872',
+          'ip': '45621afd87462104',
+          'w': W,
+          'h': H,
+          'crid': CRID,
+          'pr': CPM
+        }],
+      }],
+      'cs': [
+        'http://a-sync-url.com/',
+        {
+          'u': 'http://another-sync-url.com/test.php?&partner=123456&endpoint=us-east',
+          'ifr': true
+        }
+      ]
+    }
+  };
+  const responseVastVV1 = {
+    body: {
+      'sI': {
+        'k': '12345'
+      },
+      'sec': {
+        'k': 'ROS'
+      },
+      'sp': [{
+        'k': CLEAN_ADUNIT_CODE_VAST,
+        'a': [{
+          'adm': ADM_VAST_VV_1,
+          'id': '7854abc56248f874',
+          'i': I_ID,
+          'fi': '7854abc56248f872',
+          'ip': '45621afd87462104',
+          'w': W,
+          'h': H,
+          'crid': CRID,
+          'pr': CPM
+        }],
+      }],
+      'cs': [
+        'http://a-sync-url.com/',
+        {
+          'u': 'http://another-sync-url.com/test.php?&partner=123456&endpoint=us-east',
+          'ifr': true
+        }
+      ]
+    }
+  };
   const responseWithTwoAdunits = {
     body: {
       'sI': {
@@ -411,6 +590,77 @@ describe('E-Planning Adapter', function () {
       expect(e).to.equal('300x250_0:300x250,300x600+100x100_0:100x100');
     });
 
+    it('should return correct e parameter with support vast with one space with size outstream', function () {
+      let bidRequests = [validBidSpaceOutstream];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_300x600_0:300x600;1');
+      expect(data.vctx).to.equal(2);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('should correctly return the e parameter with n sizes in playerSize', function () {
+      let bidRequests = [validBidOutstreamNSizes];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_300x600_0:300x600;1');
+      expect(data.vctx).to.equal(2);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('should correctly return the e parameter with invalid sizes in playerSize', function () {
+      let bidRequests = [bidOutstreamInvalidSizes];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_' + DEFAULT_SIZE_VAST + '_0:' + DEFAULT_SIZE_VAST + ';1');
+      expect(data.vctx).to.equal(2);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('should return correct e parameter with support vast with one space with size default outstream', function () {
+      let bidRequests = [validBidOutstreamNoSize];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_640x480_0:640x480;1');
+      expect(data.vctx).to.equal(2);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('should return correct e parameter with support vast with one space with size instream', function () {
+      let bidRequests = [validBidSpaceInstream];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_640x480_0:640x480;1');
+      expect(data.vctx).to.equal(1);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('should return correct e parameter with support vast with one space with size default and vctx default', function () {
+      let bidRequests = [validBidSpaceVastNoContext];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_640x480_0:640x480;1');
+      expect(data.vctx).to.equal(1);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('if 2 bids arrive, one outstream and the other instream, instream has more priority', function () {
+      let bidRequests = [validBidSpaceOutstream, validBidSpaceInstream];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_640x480_0:640x480;1');
+      expect(data.vctx).to.equal(1);
+      expect(data.vv).to.equal(3);
+    });
+    it('if 2 bids arrive, one outstream and another banner, outstream has more priority', function () {
+      let bidRequests = [validBidSpaceOutstream, validBidSpaceName];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_300x600_0:300x600;1');
+      expect(data.vctx).to.equal(2);
+      expect(data.vv).to.equal(3);
+    });
+
+    it('should return correct e parameter with support vast with one space outstream', function () {
+      let bidRequests = [validBidSpaceOutstream, validBidOutstreamNoSize];
+      const data = spec.buildRequests(bidRequests, bidderRequest).data;
+      expect(data.e).to.equal('video_300x600_0:300x600;1+video_640x480_1:640x480;1');
+      expect(data.vctx).to.equal(2);
+      expect(data.vv).to.equal(3);
+    });
+
     it('should return correct e parameter with linear mapping attribute with more than one adunit', function () {
       let bidRequestsML = [validBidMappingLinear];
       const NEW_CODE = ADUNIT_CODE + '2';
@@ -588,6 +838,40 @@ describe('E-Planning Adapter', function () {
       };
       expect(bidResponse).to.deep.equal(expectedResponse);
     });
+
+    it('should correctly map the parameters in the response vast', function () {
+      const bidResponse = spec.interpretResponse(responseVast, { adUnitToBidId: { [CLEAN_ADUNIT_CODE_VAST]: BID_ID } })[0];
+      const expectedResponse = {
+        requestId: BID_ID,
+        cpm: CPM,
+        width: W,
+        height: H,
+        ttl: 120,
+        creativeId: CRID,
+        netRevenue: true,
+        currency: 'USD',
+        vastXml: ADM_VAST,
+        mediaTypes: VIDEO
+      };
+      expect(bidResponse).to.deep.equal(expectedResponse);
+    });
+
+    it('should correctly map the parameters in the response vast vv 1', function () {
+      const bidResponse = spec.interpretResponse(responseVastVV1, { adUnitToBidId: { [CLEAN_ADUNIT_CODE_VAST]: BID_ID } })[0];
+      const expectedResponse = {
+        requestId: BID_ID,
+        cpm: CPM,
+        width: W,
+        height: H,
+        ttl: 120,
+        creativeId: CRID,
+        netRevenue: true,
+        currency: 'USD',
+        vastXml: ADM_VAST_VV_1,
+        mediaTypes: VIDEO
+      };
+      expect(bidResponse).to.deep.equal(expectedResponse);
+    });
   });
 
   describe('getUserSyncs', function () {
@@ -1029,7 +1313,7 @@ describe('E-Planning Adapter', function () {
       sandbox.restore();
     })
 
-    it('should add eids to the request ', function() {
+    it('should add eids to the request', function() {
       let bidRequests = [validBidView];
       const expected_id5id = encodeURIComponent(JSON.stringify({ uid: 'ID5-ZHMOL_IfFSt7_lVYX8rBZc6GH3XMWyPQOBUfr4bm0g!', ext: { linkType: 1 } }));
       const request = spec.buildRequests(bidRequests, bidderRequest);

From 958acaef24e8a92a47f40d5a983d0a3434eae839 Mon Sep 17 00:00:00 2001
From: Samuel Adu <samuel.adu@gmail.com>
Date: Tue, 11 Oct 2022 15:33:11 +0100
Subject: [PATCH 327/569] ConnectID: Support new easy-opt out method (#9069)

* Respect custom opt-out override localstorage key.

* Wrap opt-out check in a function.

* Rename function

* Add unit tests

Co-authored-by: slimkrazy <sam@slimkrazy.com>
---
 modules/connectIdSystem.js                | 17 ++++++++++++++++-
 test/spec/modules/connectIdSystem_spec.js | 20 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/modules/connectIdSystem.js b/modules/connectIdSystem.js
index 2da2eda4c77..4fad832302f 100644
--- a/modules/connectIdSystem.js
+++ b/modules/connectIdSystem.js
@@ -7,18 +7,27 @@
 
 import {ajax} from '../src/ajax.js';
 import {submodule} from '../src/hook.js';
-import {formatQS, logError} from '../src/utils.js';
 import {includes} from '../src/polyfill.js';
+import {formatQS, logError} from '../src/utils.js';
 
 const MODULE_NAME = 'connectId';
 const VENDOR_ID = 25;
 const PLACEHOLDER = '__PIXEL_ID__';
 const UPS_ENDPOINT = `https://ups.analytics.yahoo.com/ups/${PLACEHOLDER}/fed`;
+const OVERRIDE_OPT_OUT_KEY = 'connectIdOptOut';
 
 function isEUConsentRequired(consentData) {
   return !!(consentData && consentData.gdpr && consentData.gdpr.gdprApplies);
 }
 
+function userHasOptedOut() {
+  try {
+    return localStorage.getItem(OVERRIDE_OPT_OUT_KEY) === '1';
+  } catch {
+    return false;
+  }
+}
+
 /** @type {Submodule} */
 export const connectIdSubmodule = {
   /**
@@ -36,6 +45,9 @@ export const connectIdSubmodule = {
    * @returns {{connectId: string} | undefined}
    */
   decode(value) {
+    if (userHasOptedOut()) {
+      return undefined;
+    }
     return (typeof value === 'object' && value.connectid)
       ? {connectId: value.connectid} : undefined;
   },
@@ -47,6 +59,9 @@ export const connectIdSubmodule = {
    * @returns {IdResponse|undefined}
    */
   getId(config, consentData) {
+    if (userHasOptedOut()) {
+      return;
+    }
     const params = config.params || {};
     if (!params || typeof params.he !== 'string' ||
       (typeof params.pixelId === 'undefined' && typeof params.endpoint === 'undefined')) {
diff --git a/test/spec/modules/connectIdSystem_spec.js b/test/spec/modules/connectIdSystem_spec.js
index 41135a74515..fe3cb81c2ea 100644
--- a/test/spec/modules/connectIdSystem_spec.js
+++ b/test/spec/modules/connectIdSystem_spec.js
@@ -76,6 +76,26 @@ describe('Yahoo ConnectID Submodule', () => {
       expect(result.callback).to.be.a('function');
     });
 
+    it('returns an undefined if the Yahoo specific opt-out key is present in local storage', () => {
+      localStorage.setItem('connectIdOptOut', '1');
+      expect(invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID
+      }, consentData)).to.be.undefined;
+      localStorage.removeItem('connectIdOptOut');
+    });
+
+    it('returns an object with the callback function if the correct params are passed and Yahoo opt-out value is not "1"', () => {
+      localStorage.setItem('connectIdOptOut', 'true');
+      let result = invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+      localStorage.removeItem('connectIdOptOut');
+    });
+
     it('Makes an ajax GET request to the production API endpoint with query params', () => {
       invokeGetIdAPI({
         he: HASHED_EMAIL,

From 5e18b2dce96549b9d340d1380d048561e780de61 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 11 Oct 2022 07:53:08 -0700
Subject: [PATCH 328/569] Core & multiple modules: introduce new `bidRejected`
 event, and refactor bid rejection logic (#9013)

* Separate code path for bid rejection

* Client side bidder rejections

* Rejection reasons in constants.json

* PBS rejections

* priceFloors

* currency

* Filter out NO_BID bids from targeting

* Reject bids whose size does not match the request

* Do not allow PBS stored impressions to go through without allowUnknownBidderCodes
---
 modules/categoryTranslation.js                |   8 +-
 modules/currency.js                           |  22 +-
 modules/dchain.js                             |   4 +-
 modules/debugging/legacy.js                   |   4 +-
 modules/mass.js                               |   4 +-
 modules/multibid/index.js                     |  10 +-
 modules/prebidServerBidAdapter/index.js       |  16 +-
 modules/priceFloors.js                        |  30 +--
 src/adapters/bidderFactory.js                 |  24 +-
 src/auction.js                                | 209 ++++++++++++------
 src/constants.json                            |   8 +
 src/prebid.js                                 |   5 +-
 src/targeting.js                              |  45 ++--
 test/fixtures/fixtures.js                     |   3 +-
 test/spec/auctionmanager_spec.js              | 130 +++++++++--
 test/spec/modules/currency_spec.js            |  20 +-
 .../modules/prebidServerBidAdapter_spec.js    |  54 ++++-
 test/spec/modules/priceFloors_spec.js         |  10 +-
 test/spec/unit/core/bidderFactory_spec.js     |  77 ++++++-
 test/spec/unit/core/targeting_spec.js         |  37 +++-
 test/spec/unit/pbjs_api_spec.js               |   6 +-
 21 files changed, 509 insertions(+), 217 deletions(-)

diff --git a/modules/categoryTranslation.js b/modules/categoryTranslation.js
index 57267095ff0..ba73aa01b85 100644
--- a/modules/categoryTranslation.js
+++ b/modules/categoryTranslation.js
@@ -34,13 +34,13 @@ export const registerAdserver = hook('async', function(adServer) {
 }, 'registerAdserver');
 registerAdserver();
 
-export const getAdserverCategoryHook = timedBidResponseHook('categoryTranslation', function getAdserverCategoryHook(fn, adUnitCode, bid) {
+export const getAdserverCategoryHook = timedBidResponseHook('categoryTranslation', function getAdserverCategoryHook(fn, adUnitCode, bid, reject) {
   if (!bid) {
-    return fn.call(this, adUnitCode); // if no bid, call original and let it display warnings
+    return fn.call(this, adUnitCode, bid, reject); // if no bid, call original and let it display warnings
   }
 
   if (!config.getConfig('adpod.brandCategoryExclusion')) {
-    return fn.call(this, adUnitCode, bid);
+    return fn.call(this, adUnitCode, bid, reject);
   }
 
   let localStorageKey = (config.getConfig('brandCategoryTranslation.translationFile')) ? DEFAULT_IAB_TO_FW_MAPPING_KEY_PUB : DEFAULT_IAB_TO_FW_MAPPING_KEY;
@@ -63,7 +63,7 @@ export const getAdserverCategoryHook = timedBidResponseHook('categoryTranslation
       logError('Translation mapping data not found in local storage');
     }
   }
-  fn.call(this, adUnitCode, bid);
+  fn.call(this, adUnitCode, bid, reject);
 });
 
 export function initTranslation(url, localStorageKey) {
diff --git a/modules/currency.js b/modules/currency.js
index f0ad6681afa..2c8070bcb08 100644
--- a/modules/currency.js
+++ b/modules/currency.js
@@ -1,10 +1,9 @@
-import { logInfo, logWarn, logError, logMessage } from '../src/utils.js';
-import { getGlobal } from '../src/prebidGlobal.js';
-import { createBid } from '../src/bidfactory.js';
+import {logError, logInfo, logMessage, logWarn} from '../src/utils.js';
+import {getGlobal} from '../src/prebidGlobal.js';
 import CONSTANTS from '../src/constants.json';
-import { ajax } from '../src/ajax.js';
-import { config } from '../src/config.js';
-import { getHook } from '../src/hook.js';
+import {ajax} from '../src/ajax.js';
+import {config} from '../src/config.js';
+import {getHook} from '../src/hook.js';
 import {defer} from '../src/utils/promise.js';
 import {timedBidResponseHook} from '../src/utils/perfMetrics.js';
 
@@ -181,9 +180,9 @@ function resetCurrency() {
   bidderCurrencyDefault = {};
 }
 
-export const addBidResponseHook = timedBidResponseHook('currency', function addBidResponseHook(fn, adUnitCode, bid) {
+export const addBidResponseHook = timedBidResponseHook('currency', function addBidResponseHook(fn, adUnitCode, bid, reject) {
   if (!bid) {
-    return fn.call(this, adUnitCode); // if no bid, call original and let it display warnings
+    return fn.call(this, adUnitCode, bid, reject); // if no bid, call original and let it display warnings
   }
 
   let bidder = bid.bidderCode || bid.bidder;
@@ -209,10 +208,10 @@ export const addBidResponseHook = timedBidResponseHook('currency', function addB
 
   // execute immediately if the bid is already in the desired currency
   if (bid.currency === adServerCurrency) {
-    return fn.call(this, adUnitCode, bid);
+    return fn.call(this, adUnitCode, bid, reject);
   }
 
-  bidResponseQueue.push(wrapFunction(fn, this, [adUnitCode, bid]));
+  bidResponseQueue.push(wrapFunction(fn, this, [adUnitCode, bid, reject]));
   if (!currencySupportEnabled || currencyRatesLoaded) {
     processBidResponseQueue();
   } else {
@@ -239,7 +238,8 @@ function wrapFunction(fn, context, params) {
         }
       } catch (e) {
         logWarn('Returning NO_BID, getCurrencyConversion threw error: ', e);
-        params[1] = createBid(CONSTANTS.STATUS.NO_BID, bid.getIdentifiers());
+        // TODO: in v8, this should not continue with a "NO_BID"
+        params[1] = params[2](CONSTANTS.REJECTION_REASON.CANNOT_CONVERT_CURRENCY);
       }
     }
     return fn.apply(context, params);
diff --git a/modules/dchain.js b/modules/dchain.js
index 79e20520e93..daf97a7551f 100644
--- a/modules/dchain.js
+++ b/modules/dchain.js
@@ -109,7 +109,7 @@ function isValidDchain(bid) {
   }
 }
 
-export const addBidResponseHook = timedBidResponseHook('dchain', function addBidResponseHook(fn, adUnitCode, bid) {
+export const addBidResponseHook = timedBidResponseHook('dchain', function addBidResponseHook(fn, adUnitCode, bid, reject) {
   const basicDchain = {
     ver: '1.0',
     complete: 0,
@@ -140,7 +140,7 @@ export const addBidResponseHook = timedBidResponseHook('dchain', function addBid
     bid.meta.dchain = basicDchain;
   }
 
-  fn(adUnitCode, bid);
+  fn(adUnitCode, bid, reject);
 });
 
 export function init() {
diff --git a/modules/debugging/legacy.js b/modules/debugging/legacy.js
index 15b05cded64..e83b99c5194 100644
--- a/modules/debugging/legacy.js
+++ b/modules/debugging/legacy.js
@@ -54,7 +54,7 @@ export function applyBidOverrides(overrideObj, bidObj, bidType, logger) {
   }, bidObj);
 }
 
-export function addBidResponseHook(next, adUnitCode, bid) {
+export function addBidResponseHook(next, adUnitCode, bid, reject) {
   const {overrides, logger} = this;
 
   if (bidderExcluded(overrides.bidders, bid.bidderCode)) {
@@ -70,7 +70,7 @@ export function addBidResponseHook(next, adUnitCode, bid) {
     });
   }
 
-  next(adUnitCode, bid);
+  next(adUnitCode, bid, reject);
 }
 
 export function addBidderRequestsHook(next, bidderRequests) {
diff --git a/modules/mass.js b/modules/mass.js
index 6a01f06bd90..113fdce8d4f 100644
--- a/modules/mass.js
+++ b/modules/mass.js
@@ -78,7 +78,7 @@ export function updateRenderers() {
 /**
  * Before hook for 'addBidResponse'.
  */
-export const addBidResponseHook = timedBidResponseHook('mass', function addBidResponseHook(next, adUnitCode, bid, {index = auctionManager.index} = {}) {
+export const addBidResponseHook = timedBidResponseHook('mass', function addBidResponseHook(next, adUnitCode, bid, reject, {index = auctionManager.index} = {}) {
   let renderer;
   for (let i = 0; i < renderers.length; i++) {
     if (renderers[i].match(bid)) {
@@ -104,7 +104,7 @@ export const addBidResponseHook = timedBidResponseHook('mass', function addBidRe
     addListenerOnce();
   }
 
-  next(adUnitCode, bid);
+  next(adUnitCode, bid, reject);
 });
 
 /**
diff --git a/modules/multibid/index.js b/modules/multibid/index.js
index fb28be83fa8..76f4ede8f8e 100644
--- a/modules/multibid/index.js
+++ b/modules/multibid/index.js
@@ -99,7 +99,7 @@ export function adjustBidderRequestsHook(fn, bidderRequests) {
    * @param {String} ad unit code for bid
    * @param {Object} bid object
 */
-export const addBidResponseHook = timedBidResponseHook('multibid', function addBidResponseHook(fn, adUnitCode, bid) {
+export const addBidResponseHook = timedBidResponseHook('multibid', function addBidResponseHook(fn, adUnitCode, bid, reject) {
   let floor = deepAccess(bid, 'floorData.floorValue');
 
   if (!config.getConfig('multibid')) resetMultiConfig();
@@ -107,7 +107,7 @@ export const addBidResponseHook = timedBidResponseHook('multibid', function addB
   // Else checks if multiconfig exists and bid bidderCode exists within config
   // Else continue with no modifications
   if (hasMultibid && multiConfig[bid.bidderCode] && deepAccess(bid, 'video.context') === 'adpod') {
-    fn.call(this, adUnitCode, bid);
+    fn.call(this, adUnitCode, bid, reject);
   } else if (hasMultibid && multiConfig[bid.bidderCode]) {
     // Set property multibidPrefix on bid
     if (multiConfig[bid.bidderCode].prefix) bid.multibidPrefix = multiConfig[bid.bidderCode].prefix;
@@ -127,7 +127,7 @@ export const addBidResponseHook = timedBidResponseHook('multibid', function addB
         if (multiConfig[bid.bidderCode].prefix) bid.targetingBidder = multiConfig[bid.bidderCode].prefix + length;
         if (length === multiConfig[bid.bidderCode].maxbids) multibidUnits[adUnitCode][bid.bidderCode].maxReached = true;
 
-        fn.call(this, adUnitCode, bid);
+        fn.call(this, adUnitCode, bid, reject);
       } else {
         logWarn(`Filtering multibid received from bidder ${bid.bidderCode}: ` + ((multibidUnits[adUnitCode][bid.bidderCode].maxReached) ? `Maximum bid limit reached for ad unit code ${adUnitCode}` : 'Bid cpm under floors value.'));
       }
@@ -137,10 +137,10 @@ export const addBidResponseHook = timedBidResponseHook('multibid', function addB
       deepSetValue(multibidUnits, [adUnitCode, bid.bidderCode], {ads: [bid]});
       if (multibidUnits[adUnitCode][bid.bidderCode].ads.length === multiConfig[bid.bidderCode].maxbids) multibidUnits[adUnitCode][bid.bidderCode].maxReached = true;
 
-      fn.call(this, adUnitCode, bid);
+      fn.call(this, adUnitCode, bid, reject);
     }
   } else {
-    fn.call(this, adUnitCode, bid);
+    fn.call(this, adUnitCode, bid, reject);
   }
 });
 
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 5bdf9868d24..856b962e8a0 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -950,10 +950,6 @@ Object.assign(ORTB2.prototype, {
         (seatbid.bid || []).forEach(bid => {
           let bidRequest = this.getBidRequest(bid.impid, seatbid.seat);
           if (bidRequest == null) {
-            if (!s2sConfig.allowUnknownBidderCodes) {
-              logWarn(`PBS adapter received bid from unknown bidder (${seatbid.seat}), but 's2sConfig.allowUnknownBidderCodes' is not set. Ignoring bid.`);
-              return;
-            }
             // for stored impression, a request was made with bidder code `null`. Pick it up here so that NO_BID, BID_WON, etc events
             // can work as expected (otherwise, the original request will always result in NO_BID).
             bidRequest = this.getBidRequest(bid.impid, null);
@@ -968,6 +964,7 @@ Object.assign(ORTB2.prototype, {
             transactionId: this.adUnitsByImp[bid.impid].transactionId,
             auctionId: this.auctionId,
           });
+          bidObject.requestBidder = bidRequest?.bidder;
           bidObject.requestTimestamp = this.requestTimestamp;
           bidObject.cpm = cpm;
           if (bid?.ext?.prebid?.meta?.adaptercode) {
@@ -1158,8 +1155,15 @@ export function PrebidServer() {
         onBid: function ({adUnit, bid}) {
           const metrics = bid.metrics = s2sBidRequest.metrics.fork().renameWith();
           metrics.checkpoint('addBidResponse');
-          if (metrics.measureTime('addBidResponse.validate', () => isValid(adUnit, bid))) {
-            addBidResponse(adUnit, bid);
+          if ((bid.requestId == null || bid.requestBidder == null) && !s2sBidRequest.s2sConfig.allowUnknownBidderCodes) {
+            logWarn(`PBS adapter received bid from unknown bidder (${bid.bidder}), but 's2sConfig.allowUnknownBidderCodes' is not set. Ignoring bid.`);
+            addBidResponse.reject(adUnit, bid, CONSTANTS.REJECTION_REASON.BIDDER_DISALLOWED);
+          } else {
+            if (metrics.measureTime('addBidResponse.validate', () => isValid(adUnit, bid))) {
+              addBidResponse(adUnit, bid);
+            } else {
+              addBidResponse.reject(adUnit, bid, CONSTANTS.REJECTION_REASON.INVALID);
+            }
           }
         }
       })
diff --git a/modules/priceFloors.js b/modules/priceFloors.js
index e4203fd73d3..5aee87d474e 100644
--- a/modules/priceFloors.js
+++ b/modules/priceFloors.js
@@ -20,7 +20,6 @@ import {ajaxBuilder} from '../src/ajax.js';
 import * as events from '../src/events.js';
 import CONSTANTS from '../src/constants.json';
 import {getHook} from '../src/hook.js';
-import {createBid} from '../src/bidfactory.js';
 import {find} from '../src/polyfill.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {bidderSettings} from '../src/bidderSettings.js';
@@ -694,11 +693,11 @@ function shouldFloorBid(floorData, floorInfo, bid) {
  * @summary The main driving force of floors. On bidResponse we hook in and intercept bidResponses.
  * And if the rule we find determines a bid should be floored we will do so.
  */
-export const addBidResponseHook = timedBidResponseHook('priceFloors', function addBidResponseHook(fn, adUnitCode, bid) {
+export const addBidResponseHook = timedBidResponseHook('priceFloors', function addBidResponseHook(fn, adUnitCode, bid, reject) {
   let floorData = _floorDataForAuction[bid.auctionId];
   // if no floor data then bail
   if (!floorData || !bid || floorData.skipped) {
-    return fn.call(this, adUnitCode, bid);
+    return fn.call(this, adUnitCode, bid, reject);
   }
 
   const matchingBidRequest = auctionManager.index.getBidRequest(bid);
@@ -708,7 +707,7 @@ export const addBidResponseHook = timedBidResponseHook('priceFloors', function a
 
   if (!floorInfo.matchingFloor) {
     logWarn(`${MODULE_NAME}: unable to determine a matching price floor for bidResponse`, bid);
-    return fn.call(this, adUnitCode, bid);
+    return fn.call(this, adUnitCode, bid, reject);
   }
 
   // determine the base cpm to use based on if the currency matches the floor currency
@@ -724,7 +723,7 @@ export const addBidResponseHook = timedBidResponseHook('priceFloors', function a
       adjustedCpm = getGlobal().convertCurrency(bid.cpm, bidResponseCurrency.toUpperCase(), floorCurrency);
     } catch (err) {
       logError(`${MODULE_NAME}: Unable do get currency conversion for bidResponse to Floor Currency. Do you have Currency module enabled? ${bid}`);
-      return fn.call(this, adUnitCode, bid);
+      return fn.call(this, adUnitCode, bid, reject);
     }
   }
 
@@ -737,25 +736,12 @@ export const addBidResponseHook = timedBidResponseHook('priceFloors', function a
   // now do the compare!
   if (shouldFloorBid(floorData, floorInfo, bid)) {
     // bid fails floor -> throw it out
-    // create basic bid no-bid with necessary data fro analytics adapters
-    let flooredBid = createBid(CONSTANTS.STATUS.NO_BID, bid.getIdentifiers());
-    Object.assign(flooredBid, pick(bid, [
-      'floorData',
-      'width',
-      'height',
-      'mediaType',
-      'currency',
-      'originalCpm',
-      'originalCurrency',
-      'getCpmInNewCurrency',
-    ]));
-    flooredBid.status = CONSTANTS.BID_STATUS.BID_REJECTED;
-    // if floor not met update bid with 0 cpm so it is not included downstream and marked as no-bid
-    flooredBid.cpm = 0;
+    // continue with a "NO_BID" bid, TODO: remove this in v8
+    const flooredBid = reject(CONSTANTS.REJECTION_REASON.FLOOR_NOT_MET);
     logWarn(`${MODULE_NAME}: ${flooredBid.bidderCode}'s Bid Response for ${adUnitCode} was rejected due to floor not met (adjusted cpm: ${bid?.floorData?.cpmAfterAdjustments}, floor: ${floorInfo?.matchingFloor})`, bid);
-    return fn.call(this, adUnitCode, flooredBid);
+    return fn.call(this, adUnitCode, flooredBid, reject);
   }
-  return fn.call(this, adUnitCode, bid);
+  return fn.call(this, adUnitCode, bid, reject);
 });
 
 config.getConfig('floors', config => handleSetFloorsConfig(config.floors));
diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
index c60f4b8a015..d0b716d656d 100644
--- a/src/adapters/bidderFactory.js
+++ b/src/adapters/bidderFactory.js
@@ -202,6 +202,8 @@ export function newBidder(spec) {
         adUnitCodesHandled[adUnitCode] = true;
         if (metrics.measureTime('addBidResponse.validate', () => isValid(adUnitCode, bid))) {
           addBidResponse(adUnitCode, bid);
+        } else {
+          addBidResponse.reject(adUnitCode, bid, CONSTANTS.REJECTION_REASON.INVALID)
         }
       }
 
@@ -262,6 +264,7 @@ export function newBidder(spec) {
             bid.adapterCode = bidRequest.bidder;
             if (isInvalidAlternateBidder(bid.bidderCode, bidRequest.bidder)) {
               logWarn(`${bid.bidderCode} is not a registered partner or known bidder of ${bidRequest.bidder}, hence continuing without bid. If you wish to support this bidder, please mark allowAlternateBidderCodes as true in bidderSettings.`);
+              addBidResponse.reject(bidRequest.adUnitCode, bid, CONSTANTS.REJECTION_REASON.BIDDER_DISALLOWED)
               return;
             }
             // creating a copy of original values as cpm and currency are modified later
@@ -272,6 +275,7 @@ export function newBidder(spec) {
             addBidWithCode(bidRequest.adUnitCode, prebidBid);
           } else {
             logWarn(`Bidder ${spec.code} made bid for unknown request ID: ${bid.requestId}. Ignoring.`);
+            addBidResponse.reject(null, bid, CONSTANTS.REJECTION_REASON.INVALID_REQUEST_ID);
           }
         },
         onCompletion: afterAllResponses,
@@ -541,24 +545,22 @@ export function getIabSubCategory(bidderCode, category) {
 
 // check that the bid has a width and height set
 function validBidSize(adUnitCode, bid, {index = auctionManager.index} = {}) {
-  if ((bid.width || parseInt(bid.width, 10) === 0) && (bid.height || parseInt(bid.height, 10) === 0)) {
-    bid.width = parseInt(bid.width, 10);
-    bid.height = parseInt(bid.height, 10);
-    return true;
-  }
-
   const bidRequest = index.getBidRequest(bid);
   const mediaTypes = index.getMediaTypes(bid);
 
   const sizes = (bidRequest && bidRequest.sizes) || (mediaTypes && mediaTypes.banner && mediaTypes.banner.sizes);
-  const parsedSizes = parseSizesInput(sizes);
+  const parsedSizes = parseSizesInput(sizes).map(sz => sz.split('x').map(n => parseInt(n, 10)));
+
+  if ((bid.width || parseInt(bid.width, 10) === 0) && (bid.height || parseInt(bid.height, 10) === 0)) {
+    bid.width = parseInt(bid.width, 10);
+    bid.height = parseInt(bid.height, 10);
+    return parsedSizes.length === 0 || parsedSizes.some(([w, h]) => bid.width === w && bid.height === h);
+  }
 
   // if a banner impression has one valid size, we assign that size to any bid
   // response that does not explicitly set width or height
   if (parsedSizes.length === 1) {
-    const [ width, height ] = parsedSizes[0].split('x');
-    bid.width = parseInt(width, 10);
-    bid.height = parseInt(height, 10);
+    ([bid.width, bid.height] = parsedSizes[0]);
     return true;
   }
 
@@ -600,7 +602,7 @@ export function isValid(adUnitCode, bid, {index = auctionManager.index} = {}) {
     return false;
   }
   if (bid.mediaType === 'banner' && !validBidSize(adUnitCode, bid, {index})) {
-    logError(errorMessage(`Banner bids require a width and height`));
+    logError(errorMessage(`Banner bids require a width and height that match one of the requested sizes`));
     return false;
   }
 
diff --git a/src/auction.js b/src/auction.js
index 81280e0833c..26561d87d71 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -58,26 +58,41 @@
  */
 
 import {
-  flatten, timestamp, adUnitsFilter, deepAccess, getValue, parseUrl, generateUUID,
-  logMessage, bind, logError, logInfo, logWarn, isEmpty, _each, isFn, isEmptyStr
+  _each,
+  adUnitsFilter,
+  bind,
+  deepAccess,
+  flatten,
+  generateUUID,
+  getValue,
+  isEmpty,
+  isEmptyStr,
+  isFn,
+  logError,
+  logInfo,
+  logMessage,
+  logWarn,
+  parseUrl,
+  timestamp
 } from './utils.js';
-import { getPriceBucketString } from './cpmBucketManager.js';
-import { getNativeTargeting } from './native.js';
-import { getCacheUrl, store } from './videoCache.js';
-import { Renderer } from './Renderer.js';
-import { config } from './config.js';
-import { userSync } from './userSync.js';
-import { hook } from './hook.js';
+import {getPriceBucketString} from './cpmBucketManager.js';
+import {getNativeTargeting} from './native.js';
+import {getCacheUrl, store} from './videoCache.js';
+import {Renderer} from './Renderer.js';
+import {config} from './config.js';
+import {userSync} from './userSync.js';
+import {hook} from './hook.js';
 import {find, includes} from './polyfill.js';
-import { OUTSTREAM } from './video.js';
-import { VIDEO } from './mediaTypes.js';
+import {OUTSTREAM} from './video.js';
+import {VIDEO} from './mediaTypes.js';
 import {auctionManager} from './auctionManager.js';
 import {bidderSettings} from './bidderSettings.js';
-import * as events from './events.js'
+import * as events from './events.js';
 import adapterManager from './adapterManager.js';
 import CONSTANTS from './constants.json';
 import {GreedyPromise} from './utils/promise.js';
 import {useMetrics} from './utils/perfMetrics.js';
+import {createBid} from './bidfactory.js';
 
 const { syncUsers } = userSync;
 
@@ -119,24 +134,26 @@ export function resetAuctionState() {
   */
 export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, auctionId, ortb2Fragments, metrics}) {
   metrics = useMetrics(metrics);
-  let _adUnits = adUnits;
-  let _labels = labels;
-  let _adUnitCodes = adUnitCodes;
+  const _adUnits = adUnits;
+  const _labels = labels;
+  const _adUnitCodes = adUnitCodes;
+  const _auctionId = auctionId || generateUUID();
+  const _timeout = cbTimeout;
+  const _timelyBidders = new Set();
+  let _bidsRejected = [];
+  let _callback = callback;
   let _bidderRequests = [];
   let _bidsReceived = [];
   let _noBids = [];
+  let _winningBids = [];
   let _auctionStart;
   let _auctionEnd;
-  let _auctionId = auctionId || generateUUID();
-  let _auctionStatus;
-  let _callback = callback;
   let _timer;
-  let _timeout = cbTimeout;
-  let _winningBids = [];
-  let _timelyBidders = new Set();
+  let _auctionStatus;
 
   function addBidRequests(bidderRequests) { _bidderRequests = _bidderRequests.concat(bidderRequests); }
   function addBidReceived(bidsReceived) { _bidsReceived = _bidsReceived.concat(bidsReceived); }
+  function addBidRejected(bidsRejected) { _bidsRejected = _bidsRejected.concat(bidsRejected); }
   function addNoBid(noBid) { _noBids = _noBids.concat(noBid); }
 
   function getProperties() {
@@ -151,6 +168,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
       bidderRequests: _bidderRequests,
       noBids: _noBids,
       bidsReceived: _bidsReceived,
+      bidsRejected: _bidsRejected,
       winningBids: _winningBids,
       timeout: _timeout,
       metrics: metrics
@@ -352,6 +370,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
 
   return {
     addBidReceived,
+    addBidRejected,
     addNoBid,
     executeCallback,
     callBids,
@@ -372,7 +391,14 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
   };
 }
 
-export const addBidResponse = hook('sync', function(adUnitCode, bid) {
+/**
+ * Hook into this to intercept bids before they are added to an auction.
+ *
+ * @param adUnitCode
+ * @param bid
+ * @param {function(String)} reject: a function that, when called, rejects `bid` with the given reason.
+ */
+export const addBidResponse = hook('sync', function(adUnitCode, bid, reject) {
   this.dispatch.call(null, adUnitCode, bid);
 }, 'addBidResponse');
 
@@ -425,20 +451,49 @@ export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionM
     }
   }
 
-  function handleBidResponse(adUnitCode, bid) {
+  function handleBidResponse(adUnitCode, bid, handler) {
     bidResponseMap[bid.requestId] = true;
-
+    addCommonResponseProperties(bid, adUnitCode)
     outstandingBidsAdded++;
-    let auctionId = auctionInstance.getAuctionId();
+    return handler(afterBidAdded);
+  }
 
-    let bidResponse = getPreparedBidForAuction({adUnitCode, bid, auctionId});
+  function acceptBidResponse(adUnitCode, bid) {
+    handleBidResponse(adUnitCode, bid, (done) => {
+      let bidResponse = getPreparedBidForAuction(bid);
 
-    if (bidResponse.mediaType === 'video') {
-      tryAddVideoBid(auctionInstance, bidResponse, afterBidAdded);
-    } else {
-      addBidToAuction(auctionInstance, bidResponse);
-      afterBidAdded();
-    }
+      if (bidResponse.mediaType === 'video') {
+        tryAddVideoBid(auctionInstance, bidResponse, done);
+      } else {
+        addBidToAuction(auctionInstance, bidResponse);
+        done();
+      }
+    });
+  }
+
+  function rejectBidResponse(adUnitCode, bid, reason) {
+    return handleBidResponse(adUnitCode, bid, (done) => {
+      // return a "NO_BID" replacement that the caller can decide to continue with
+      // TODO: remove this in v8; see https://github.com/prebid/Prebid.js/issues/8956
+      const noBid = createBid(CONSTANTS.STATUS.NO_BID, bid.getIdentifiers());
+      Object.assign(noBid, Object.fromEntries(Object.entries(bid).filter(([k]) => !noBid.hasOwnProperty(k) && ![
+        'ad',
+        'adUrl',
+        'vastXml',
+        'vastUrl',
+        'native',
+      ].includes(k))));
+      noBid.status = CONSTANTS.BID_STATUS.BID_REJECTED;
+      noBid.cpm = 0;
+
+      bid.rejectionReason = reason;
+      logWarn(`Bid from ${bid.bidder || 'unknown bidder'} was rejected: ${reason}`, bid)
+      events.emit(CONSTANTS.EVENTS.BID_REJECTED, bid);
+      auctionInstance.addBidRejected(bid);
+      done();
+
+      return noBid;
+    })
   }
 
   function adapterDone() {
@@ -470,12 +525,24 @@ export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionM
   }
 
   return {
-    addBidResponse: function (adUnit, bid) {
-      const bidderRequest = index.getBidderRequest(bid);
-      waitFor((bidderRequest && bidderRequest.bidderRequestId) || '', addBidResponse.call({
-        dispatch: handleBidResponse,
-      }, adUnit, bid));
-    },
+    addBidResponse: (function () {
+      function addBid(adUnitCode, bid) {
+        const bidderRequest = index.getBidderRequest(bid);
+        waitFor((bidderRequest && bidderRequest.bidderRequestId) || '', addBidResponse.call({
+          dispatch: acceptBidResponse,
+        }, adUnitCode, bid, (() => {
+          let rejection;
+          return (reason) => {
+            if (rejection == null) {
+              rejection = rejectBidResponse(adUnitCode, bid, reason);
+            }
+            return rejection;
+          }
+        })()));
+      }
+      addBid.reject = rejectBidResponse;
+      return addBid;
+    })(),
     adapterDone: function () {
       guard(this, adapterDone.bind(this))
     }
@@ -492,9 +559,7 @@ export function doCallbacksIfTimedout(auctionInstance, bidResponse) {
 export function addBidToAuction(auctionInstance, bidResponse) {
   setupBidTargeting(bidResponse);
 
-  const metrics = useMetrics(bidResponse.metrics);
-  metrics.timeSince('addBidResponse', 'addBidResponse.total');
-
+  useMetrics(bidResponse.metrics).timeSince('addBidResponse', 'addBidResponse.total');
   events.emit(CONSTANTS.EVENTS.BID_RESPONSE, bidResponse);
   auctionInstance.addBidReceived(bidResponse);
 
@@ -595,35 +660,41 @@ export const callPrebidCache = hook('async', function(auctionInstance, bidRespon
   batchAndStore(auctionInstance, bidResponse, afterBidAdded);
 }, 'callPrebidCache');
 
-// Postprocess the bids so that all the universal properties exist, no matter which bidder they came from.
-// This should be called before addBidToAuction().
-function getPreparedBidForAuction({adUnitCode, bid, auctionId}, {index = auctionManager.index} = {}) {
-  const bidderRequest = index.getBidderRequest(bid);
-  const start = (bidderRequest && bidderRequest.start) || bid.requestTimestamp;
-
-  let bidObject = Object.assign({}, bid, {
-    auctionId,
-    responseTimestamp: timestamp(),
-    requestTimestamp: start,
-    cpm: parseFloat(bid.cpm) || 0,
-    bidder: bid.bidderCode,
+/**
+ * Augment `bidResponse` with properties that are common across all bids - including rejected bids.
+ *
+ */
+function addCommonResponseProperties(bidResponse, adUnitCode, {index = auctionManager.index} = {}) {
+  const bidderRequest = index.getBidderRequest(bidResponse);
+  const start = (bidderRequest && bidderRequest.start) || bidResponse.requestTimestamp;
+
+  Object.assign(bidResponse, {
+    responseTimestamp: bidResponse.responseTimestamp || timestamp(),
+    requestTimestamp: bidResponse.requestTimestamp || start,
+    cpm: bidResponse.cpm || parseFloat(bidResponse.cpm) || 0,
+    bidder: bidResponse.bidder || bidResponse.bidderCode,
     adUnitCode
   });
 
-  bidObject.timeToRespond = bidObject.responseTimestamp - bidObject.requestTimestamp;
+  bidResponse.timeToRespond = bidResponse.responseTimestamp - bidResponse.requestTimestamp;
+}
 
+/**
+ * Add additional bid response properties that are universal for all _accepted_ bids.
+ */
+function getPreparedBidForAuction(bid, {index = auctionManager.index} = {}) {
   // Let listeners know that now is the time to adjust the bid, if they want to.
   //
   // CAREFUL: Publishers rely on certain bid properties to be available (like cpm),
   // but others to not be set yet (like priceStrings). See #1372 and #1389.
-  events.emit(CONSTANTS.EVENTS.BID_ADJUSTMENT, bidObject);
+  events.emit(CONSTANTS.EVENTS.BID_ADJUSTMENT, bid);
 
   // a publisher-defined renderer can be used to render bids
-  const adUnitRenderer = index.getAdUnit(bidObject).renderer;
+  const adUnitRenderer = index.getAdUnit(bid).renderer;
 
   // a publisher can also define a renderer for a mediaType
-  const bidObjectMediaType = bidObject.mediaType;
-  const mediaTypes = index.getMediaTypes(bidObject);
+  const bidObjectMediaType = bid.mediaType;
+  const mediaTypes = index.getMediaTypes(bid);
   const bidMediaType = mediaTypes && mediaTypes[bidObjectMediaType];
 
   var mediaTypeRenderer = bidMediaType && bidMediaType.renderer;
@@ -639,25 +710,25 @@ function getPreparedBidForAuction({adUnitCode, bid, auctionId}, {index = auction
 
   if (renderer) {
     // be aware, an adapter could already have installed the bidder, in which case this overwrite's the existing adapter
-    bidObject.renderer = Renderer.install({ url: renderer.url, config: renderer.options });// rename options to config, to make it consistent?
-    bidObject.renderer.setRender(renderer.render);
+    bid.renderer = Renderer.install({ url: renderer.url, config: renderer.options });// rename options to config, to make it consistent?
+    bid.renderer.setRender(renderer.render);
   }
 
   // Use the config value 'mediaTypeGranularity' if it has been defined for mediaType, else use 'customPriceBucket'
   const mediaTypeGranularity = getMediaTypeGranularity(bid.mediaType, mediaTypes, config.getConfig('mediaTypePriceGranularity'));
   const priceStringsObj = getPriceBucketString(
-    bidObject.cpm,
+    bid.cpm,
     (typeof mediaTypeGranularity === 'object') ? mediaTypeGranularity : config.getConfig('customPriceBucket'),
     config.getConfig('currency.granularityMultiplier')
   );
-  bidObject.pbLg = priceStringsObj.low;
-  bidObject.pbMg = priceStringsObj.med;
-  bidObject.pbHg = priceStringsObj.high;
-  bidObject.pbAg = priceStringsObj.auto;
-  bidObject.pbDg = priceStringsObj.dense;
-  bidObject.pbCg = priceStringsObj.custom;
-
-  return bidObject;
+  bid.pbLg = priceStringsObj.low;
+  bid.pbMg = priceStringsObj.med;
+  bid.pbHg = priceStringsObj.high;
+  bid.pbAg = priceStringsObj.auto;
+  bid.pbDg = priceStringsObj.dense;
+  bid.pbCg = priceStringsObj.custom;
+
+  return bid;
 }
 
 function setupBidTargeting(bidObject) {
diff --git a/src/constants.json b/src/constants.json
index ad57fb45c4f..30ade5fccbe 100644
--- a/src/constants.json
+++ b/src/constants.json
@@ -29,6 +29,7 @@
     "BID_TIMEOUT": "bidTimeout",
     "BID_REQUESTED": "bidRequested",
     "BID_RESPONSE": "bidResponse",
+    "BID_REJECTED": "bidRejected",
     "NO_BID": "noBid",
     "BID_WON": "bidWon",
     "BIDDER_DONE": "bidderDone",
@@ -119,6 +120,13 @@
     "RENDERED": "rendered",
     "BID_REJECTED": "bidRejected"
   },
+  "REJECTION_REASON": {
+    "INVALID": "Bid has missing or invalid properties",
+    "INVALID_REQUEST_ID": "Invalid request ID",
+    "BIDDER_DISALLOWED": "Bidder code is not allowed by allowedAlternateBidderCodes / allowUnknownBidderCodes",
+    "FLOOR_NOT_MET": "Bid does not meet price floor",
+    "CANNOT_CONVERT_CURRENCY": "Unable to convert currency"
+  },
   "PREBID_NATIVE_DATA_KEYS_TO_ORTB": {
     "body": "desc",
     "body2": "desc2",
diff --git a/src/prebid.js b/src/prebid.js
index 18826fc7205..a0981cd387a 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -36,7 +36,7 @@ import {listenMessagesFromCreative} from './secureCreatives.js';
 import {userSync} from './userSync.js';
 import {config} from './config.js';
 import {auctionManager} from './auctionManager.js';
-import {filters, targeting} from './targeting.js';
+import {isBidUsable, targeting} from './targeting.js';
 import {hook, wrapHook} from './hook.js';
 import {loadSession} from './debugging.js';
 import {includes} from './polyfill.js';
@@ -296,8 +296,7 @@ $$PREBID_GLOBAL$$.getAdserverTargetingForAdUnitCodeStr = function (adunitCode) {
 $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode = function (adunitCode) {
   if (adunitCode) {
     const bid = auctionManager.getAllBidsForAdUnitCode(adunitCode)
-      .filter(filters.isUnusedBid)
-      .filter(filters.isBidNotExpired)
+      .filter(isBidUsable)
 
     return bid.length ? bid.reduce(getHighestCpm) : {}
   } else {
diff --git a/src/targeting.js b/src/targeting.js
index d2b3e9f8470..a427867e890 100644
--- a/src/targeting.js
+++ b/src/targeting.js
@@ -1,15 +1,28 @@
 import {
-  uniques, isGptPubadsDefined, getHighestCpm, getOldestHighestCpmBid, groupBy, isAdUnitCodeMatchingSlot, timestamp,
-  deepAccess, deepClone, logError, logWarn, logInfo, isFn, isArray, logMessage, isStr,
+  deepAccess,
+  deepClone,
+  getHighestCpm,
+  getOldestHighestCpmBid,
+  groupBy,
+  isAdUnitCodeMatchingSlot,
+  isArray,
+  isFn,
+  isGptPubadsDefined,
+  isStr,
+  logError,
+  logInfo,
+  logMessage,
+  logWarn,
+  timestamp,
+  uniques,
 } from './utils.js';
-import { config } from './config.js';
-import { NATIVE_TARGETING_KEYS } from './native.js';
-import { auctionManager } from './auctionManager.js';
-import { sizeSupported } from './sizeMapping.js';
-import { ADPOD } from './mediaTypes.js';
-import { hook } from './hook.js';
-import { bidderSettings } from './bidderSettings.js';
-import {includes, find} from './polyfill.js';
+import {config} from './config.js';
+import {NATIVE_TARGETING_KEYS} from './native.js';
+import {auctionManager} from './auctionManager.js';
+import {ADPOD} from './mediaTypes.js';
+import {hook} from './hook.js';
+import {bidderSettings} from './bidderSettings.js';
+import {find, includes} from './polyfill.js';
 import CONSTANTS from './constants.json';
 
 var pbTargetingKeys = [];
@@ -32,10 +45,17 @@ const isBidNotExpired = (bid) => (bid.responseTimestamp + bid.ttl * 1000 - TTL_B
 const isUnusedBid = (bid) => bid && ((bid.status && !includes([CONSTANTS.BID_STATUS.RENDERED], bid.status)) || !bid.status);
 
 export let filters = {
+  isActualBid(bid) {
+    return bid.getStatusCode() === CONSTANTS.STATUS.GOOD
+  },
   isBidNotExpired,
   isUnusedBid
 };
 
+export function isBidUsable(bid) {
+  return !Object.values(filters).some((predicate) => !predicate(bid));
+}
+
 // If two bids are found for same adUnitCode, we will use the highest one to take part in auction
 // This can happen in case of concurrent auctions
 // If adUnitBidLimit is set above 0 return top N number of bids
@@ -449,10 +469,7 @@ export function newTargeting(auctionManager) {
 
     bidsReceived = bidsReceived
       .filter(bid => deepAccess(bid, 'video.context') !== ADPOD)
-      .filter(bid => bid.mediaType !== 'banner' || sizeSupported([bid.width, bid.height]))
-      .filter(filters.isUnusedBid)
-      .filter(filters.isBidNotExpired)
-    ;
+      .filter(isBidUsable);
 
     return getHighestCpmBidsFromBidPool(bidsReceived, getOldestHighestCpmBid);
   }
diff --git a/test/fixtures/fixtures.js b/test/fixtures/fixtures.js
index b0fbd7da806..b66d885c113 100644
--- a/test/fixtures/fixtures.js
+++ b/test/fixtures/fixtures.js
@@ -1,5 +1,6 @@
 // jscs:disable
 import CONSTANTS from 'src/constants.json';
+import {createBid} from '../../src/bidfactory.js';
 const utils = require('src/utils.js');
 
 function convertTargetingsFromOldToNew(targetings) {
@@ -1268,7 +1269,7 @@ export function createBidReceived({bidder, cpm, auctionId, responseTimestamp, ad
   if (typeof status !== 'undefined') {
     bid.status = status;
   }
-  return bid;
+  return Object.assign(createBid(CONSTANTS.STATUS.GOOD), bid);
 }
 
 export function getServerTestingsAds() {
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index 49ae13c43cc..105401a62a4 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -21,6 +21,7 @@ import {auctionManager} from '../../src/auctionManager.js';
 import 'modules/debugging/index.js' // some tests look for debugging side effects
 import {AuctionIndex} from '../../src/auctionIndex.js';
 import {expect} from 'chai';
+import {deepClone} from '../../src/utils.js';
 
 var assert = require('assert');
 
@@ -57,7 +58,16 @@ function mockBid(opts) {
     'currency': 'USD',
     'netRevenue': true,
     'ttl': 360,
-    getSize: () => '300x250'
+    getSize: () => '300x250',
+    getIdentifiers() {
+      return {
+        src: this.source,
+        bidder: this.bidderCode,
+        bidId: this.requestId,
+        transactionId: this.transactionId,
+        auctionId: this.auctionId
+      }
+    }
   };
 }
 
@@ -1323,6 +1333,7 @@ describe('auctionmanager.js', function () {
       getAdUnits: () => getBidRequests().flatMap(br => br.bids).map(br => ({ code: br.adUnitCode, transactionId: br.transactionId, mediaTypes: br.mediaTypes })),
       getAuctionId: () => '1',
       addBidReceived: () => true,
+      addBidRejected: () => true,
       getTimeout: () => 1000,
       getAuctionStart: () => start,
     }
@@ -1382,26 +1393,32 @@ describe('auctionmanager.js', function () {
       bidRequests = null;
     });
 
-    it('should call auction done after bid is added to auction for mediaType banner', function () {
-      let ADUNIT_CODE2 = 'adUnitCode2';
-      let BIDDER_CODE2 = 'sampleBidder2';
-
-      let bids1 = [mockBid({ bidderCode: BIDDER_CODE1, transactionId: ADUNIT_CODE1 })];
-      let bids2 = [mockBid({ bidderCode: BIDDER_CODE2, transactionId: ADUNIT_CODE2 })];
-      bidRequests = [
-        mockBidRequest(bids[0]),
-        mockBidRequest(bids1[0], { adUnitCode: ADUNIT_CODE1 }),
-        mockBidRequest(bids2[0], { adUnitCode: ADUNIT_CODE2 })
-      ];
-      let cbs = auctionCallbacks(doneSpy, auction);
-      cbs.addBidResponse.call(bidRequests[0], ADUNIT_CODE, bids[0]);
-      cbs.adapterDone.call(bidRequests[0]);
-      cbs.addBidResponse.call(bidRequests[1], ADUNIT_CODE1, bids1[0]);
-      cbs.adapterDone.call(bidRequests[1]);
-      cbs.addBidResponse.call(bidRequests[2], ADUNIT_CODE2, bids2[0]);
-      cbs.adapterDone.call(bidRequests[2]);
-      assert.equal(doneSpy.callCount, 1);
-    });
+    Object.entries({
+      'added to': (cbs) => cbs.addBidResponse,
+      'rejected from': (cbs) => cbs.addBidResponse.reject,
+    }).forEach(([t, getMethod]) => {
+      it(`should call auction done after bid is ${t} auction for mediaType banner`, function () {
+        let ADUNIT_CODE2 = 'adUnitCode2';
+        let BIDDER_CODE2 = 'sampleBidder2';
+
+        let bids1 = [mockBid({ bidderCode: BIDDER_CODE1, transactionId: ADUNIT_CODE1 })];
+        let bids2 = [mockBid({ bidderCode: BIDDER_CODE2, transactionId: ADUNIT_CODE2 })];
+        bidRequests = [
+          mockBidRequest(bids[0]),
+          mockBidRequest(bids1[0], { adUnitCode: ADUNIT_CODE1 }),
+          mockBidRequest(bids2[0], { adUnitCode: ADUNIT_CODE2 })
+        ];
+        let cbs = auctionCallbacks(doneSpy, auction);
+        const method = getMethod(cbs);
+        method(ADUNIT_CODE, bids[0]);
+        cbs.adapterDone.call(bidRequests[0]);
+        method(ADUNIT_CODE1, bids1[0]);
+        cbs.adapterDone.call(bidRequests[1]);
+        method(ADUNIT_CODE2, bids2[0]);
+        cbs.adapterDone.call(bidRequests[2]);
+        assert.equal(doneSpy.callCount, 1);
+      });
+    })
 
     it('should call auction done after prebid cache is complete for mediaType video', function() {
       bids[0].mediaType = 'video';
@@ -1543,6 +1560,77 @@ describe('auctionmanager.js', function () {
         });
       })
     });
+
+    describe('when bids are rejected', () => {
+      let cbs, bid, expectedRejection;
+      const onBidRejected = sinon.stub();
+      const REJECTION_REASON = 'Bid rejected';
+      const AU_CODE = 'au';
+
+      function rejectHook(fn, adUnitCode, bid, reject) {
+        reject(REJECTION_REASON);
+        reject(REJECTION_REASON); // second call should do nothing
+      }
+
+      before(() => {
+        addBidResponse.before(rejectHook, 999);
+        events.on(CONSTANTS.EVENTS.BID_REJECTED, onBidRejected);
+      });
+
+      after(() => {
+        addBidResponse.getHooks({hook: rejectHook}).remove();
+        events.off(CONSTANTS.EVENTS.BID_REJECTED, onBidRejected);
+      });
+
+      beforeEach(() => {
+        onBidRejected.reset();
+        bid = mockBid({bidderCode: BIDDER_CODE});
+        bidRequests = [
+          mockBidRequest(bid),
+        ];
+        cbs = auctionCallbacks(doneSpy, auction);
+        expectedRejection = sinon.match(Object.assign({}, bid, {
+          rejectionReason: REJECTION_REASON,
+          adUnitCode: AU_CODE
+        }));
+        auction.addBidRejected = sinon.stub();
+      });
+
+      Object.entries({
+        'with addBidResponse.reject': () => cbs.addBidResponse.reject(AU_CODE, deepClone(bid), REJECTION_REASON),
+        'from addBidResponse hooks': () => cbs.addBidResponse(AU_CODE, deepClone(bid))
+      }).forEach(([t, rejectBid]) => {
+        describe(t, () => {
+          it('should emit a BID_REJECTED event', () => {
+            rejectBid();
+            sinon.assert.calledWith(onBidRejected, expectedRejection);
+          });
+
+          it('should pass bid to auction.addBidRejected', () => {
+            rejectBid();
+            sinon.assert.calledWith(auction.addBidRejected, expectedRejection);
+          });
+        })
+      });
+
+      it('should return a NO_BID replacement', () => {
+        const noBid = cbs.addBidResponse.reject(AU_CODE, {...bid, statusMessage: 'Bid available', status: CONSTANTS.BID_STATUS.RENDERED}, 'Rejected');
+        sinon.assert.match(noBid, {
+          status: CONSTANTS.BID_STATUS.BID_REJECTED,
+          statusMessage: 'Bid returned empty or error response',
+          cpm: 0,
+          requestId: bid.requestId,
+          auctionId: bid.auctionId,
+          adUnitCode: AU_CODE,
+          rejectionReason: undefined,
+        });
+      });
+
+      it('addBidResponse hooks should not be able to reject the same bid twice', () => {
+        cbs.addBidResponse(AU_CODE, bid);
+        expect(auction.addBidRejected.calledOnce).to.be.true;
+      });
+    })
   });
 
   describe('auctionOptions', function() {
diff --git a/test/spec/modules/currency_spec.js b/test/spec/modules/currency_spec.js
index 6eb4f929a42..b674cb5976d 100644
--- a/test/spec/modules/currency_spec.js
+++ b/test/spec/modules/currency_spec.js
@@ -351,6 +351,11 @@ describe('currency', function () {
   });
 
   describe('currency.addBidResponseDecorator', function () {
+    let reject;
+    beforeEach(() => {
+      reject = sinon.stub().returns({status: 'rejected'});
+    });
+
     it('should leave bid at 1 when currency support is not enabled and fromCurrency is USD', function () {
       setConfig({});
       var bid = makeBid({ 'cpm': 1, 'currency': 'USD' });
@@ -368,8 +373,9 @@ describe('currency', function () {
       var innerBid;
       addBidResponseHook(function(adCodeId, bid) {
         innerBid = bid;
-      }, 'elementId', bid);
-      expect(innerBid.statusMessage).to.equal('Bid returned empty or error response');
+      }, 'elementId', bid, reject);
+      expect(innerBid.status).to.equal('rejected');
+      expect(reject.calledOnce).to.be.true;
     });
 
     it('should not buffer bid when currency is already in desired currency', function () {
@@ -395,8 +401,9 @@ describe('currency', function () {
       var innerBid;
       addBidResponseHook(function(adCodeId, bid) {
         innerBid = bid;
-      }, 'elementId', bid);
-      expect(innerBid.statusMessage).to.equal('Bid returned empty or error response');
+      }, 'elementId', bid, reject);
+      expect(innerBid.status).to.equal('rejected');
+      expect(reject.calledOnce).to.be.true;
     });
 
     it('should result in NO_BID when adServerCurrency is not supported in file', function () {
@@ -407,8 +414,9 @@ describe('currency', function () {
       var innerBid;
       addBidResponseHook(function(adCodeId, bid) {
         innerBid = bid;
-      }, 'elementId', bid);
-      expect(innerBid.statusMessage).to.equal('Bid returned empty or error response');
+      }, 'elementId', bid, reject);
+      expect(innerBid.status).to.equal('rejected');
+      expect(reject.calledOnce).to.be.true;
     });
 
     it('should return 1 when currency support is enabled and same currency code is requested as is set to adServerCurrency', function () {
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index c3ca3261193..b5209e5be12 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -536,6 +536,8 @@ describe('S2S Adapter', function () {
     addBidResponse = sinon.spy(),
     done = sinon.spy();
 
+  addBidResponse.reject = sinon.spy();
+
   function prepRequest(req) {
     req.ad_units.forEach((adUnit) => {
       delete adUnit.nativeParams
@@ -595,6 +597,7 @@ describe('S2S Adapter', function () {
 
   afterEach(function () {
     addBidResponse.resetHistory();
+    addBidResponse.reject = sinon.spy();
     done.resetHistory();
   });
 
@@ -2903,6 +2906,16 @@ describe('S2S Adapter', function () {
       });
     }
 
+    it('should reject invalid bids', () => {
+      config.setConfig({ s2sConfig: CONFIG });
+      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const response = deepClone(RESPONSE_OPENRTB);
+      Object.assign(response.seatbid[0].bid[0], {w: null, h: null});
+      server.requests[0].respond(200, {}, JSON.stringify(response));
+      expect(addBidResponse.reject.calledOnce).to.be.true;
+      expect(addBidResponse.called).to.be.false;
+    });
+
     it('does not (by default) allow bids that were not requested', function () {
       config.setConfig({ s2sConfig: CONFIG });
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
@@ -2911,6 +2924,7 @@ describe('S2S Adapter', function () {
       server.requests[0].respond(200, {}, JSON.stringify(response));
 
       expect(addBidResponse.called).to.be.false;
+      expect(addBidResponse.reject.calledOnce).to.be.true;
     });
 
     it('allows unrequested bids if config.allowUnknownBidderCodes', function () {
@@ -2924,17 +2938,35 @@ describe('S2S Adapter', function () {
       expect(addBidResponse.calledWith(sinon.match.any, sinon.match({ bidderCode: 'unknown' }))).to.be.true;
     });
 
-    it('uses "null" request\'s ID for all responses, when a null request is present', function () {
-      const cfg = {...CONFIG, allowUnknownBidderCodes: true};
-      config.setConfig({s2sConfig: cfg});
-      const req = {...REQUEST, s2sConfig: cfg, ad_units: [{...REQUEST.ad_units[0], bids: [{bidder: null, bid_id: 'testId'}]}]};
-      const bidReq = {...BID_REQUESTS[0], bidderCode: null, bids: [{...BID_REQUESTS[0].bids[0], bidder: null, bidId: 'testId'}]}
-      adapter.callBids(req, [bidReq], addBidResponse, done, ajax);
-      const response = deepClone(RESPONSE_OPENRTB);
-      response.seatbid[0].seat = 'storedImpression';
-      server.requests[0].respond(200, {}, JSON.stringify(response));
-      sinon.assert.calledWith(addBidResponse, sinon.match.any, sinon.match({bidderCode: 'storedImpression', requestId: 'testId'}))
-    });
+    describe('stored impressions', () => {
+      let bidReq, response;
+
+      function mks2sReq(s2sConfig = CONFIG) {
+        return {...REQUEST, s2sConfig, ad_units: [{...REQUEST.ad_units[0], bids: [{bidder: null, bid_id: 'testId'}]}]};
+      }
+
+      beforeEach(() => {
+        bidReq = {...BID_REQUESTS[0], bidderCode: null, bids: [{...BID_REQUESTS[0].bids[0], bidder: null, bidId: 'testId'}]}
+        response = deepClone(RESPONSE_OPENRTB);
+        response.seatbid[0].seat = 'storedImpression';
+      })
+
+      it('uses "null" request\'s ID for all responses, when a null request is present', function () {
+        const cfg = {...CONFIG, allowUnknownBidderCodes: true};
+        config.setConfig({s2sConfig: cfg});
+        adapter.callBids(mks2sReq(cfg), [bidReq], addBidResponse, done, ajax);
+        server.requests[0].respond(200, {}, JSON.stringify(response));
+        sinon.assert.calledWith(addBidResponse, sinon.match.any, sinon.match({bidderCode: 'storedImpression', requestId: 'testId'}))
+      });
+
+      it('does not allow null requests (= stored impressions) if allowUnknownBidderCodes is not set', () => {
+        config.setConfig({s2sConfig: CONFIG});
+        adapter.callBids(mks2sReq(), [bidReq], addBidResponse, done, ajax);
+        server.requests[0].respond(200, {}, JSON.stringify(response));
+        expect(addBidResponse.called).to.be.false;
+        expect(addBidResponse.reject.calledOnce).to.be.true;
+      });
+    })
 
     it('copies ortb2Imp to response when there is only a null bid', () => {
       const cfg = {...CONFIG};
diff --git a/test/spec/modules/priceFloors_spec.js b/test/spec/modules/priceFloors_spec.js
index cbdd4d179e3..b7d771814d0 100644
--- a/test/spec/modules/priceFloors_spec.js
+++ b/test/spec/modules/priceFloors_spec.js
@@ -1665,7 +1665,7 @@ describe('the price floors module', function () {
   });
   describe('bidResponseHook tests', function () {
     const AUCTION_ID = '123456';
-    let returnedBidResponse, indexStub;
+    let returnedBidResponse, indexStub, reject;
     let adUnit = {
       transactionId: 'au',
       code: 'test_div_1'
@@ -1681,6 +1681,7 @@ describe('the price floors module', function () {
     };
     beforeEach(function () {
       returnedBidResponse = {};
+      reject = sinon.stub().returns({status: 'rejected'});
       indexStub = sinon.stub(auctionManager, 'index');
       indexStub.get(() => stubAuctionIndex({adUnits: [adUnit]}));
     });
@@ -1693,7 +1694,7 @@ describe('the price floors module', function () {
       let next = (adUnitCode, bid) => {
         returnedBidResponse = bid;
       };
-      addBidResponseHook(next, bidResp.adUnitCode, Object.assign(createBid(CONSTANTS.STATUS.GOOD, {auctionId: AUCTION_ID}), bidResp));
+      addBidResponseHook(next, bidResp.adUnitCode, Object.assign(createBid(CONSTANTS.STATUS.GOOD, {auctionId: AUCTION_ID}), bidResp), reject);
     };
     it('continues with the auction if not floors data is present without any flooring', function () {
       runBidResponse();
@@ -1710,9 +1711,8 @@ describe('the price floors module', function () {
       _floorDataForAuction[AUCTION_ID] = utils.deepClone(basicFloorConfig);
       _floorDataForAuction[AUCTION_ID].data.values = { 'banner': 1.0 };
       runBidResponse();
-      expect(returnedBidResponse).to.haveOwnProperty('floorData');
-      expect(returnedBidResponse.status).to.equal(CONSTANTS.BID_STATUS.BID_REJECTED);
-      expect(returnedBidResponse.cpm).to.equal(0);
+      expect(reject.calledOnce).to.be.true;
+      expect(returnedBidResponse.status).to.equal('rejected');
     });
     it('if it finds a rule and does not floor should update the bid accordingly', function () {
       _floorDataForAuction[AUCTION_ID] = utils.deepClone(basicFloorConfig);
diff --git a/test/spec/unit/core/bidderFactory_spec.js b/test/spec/unit/core/bidderFactory_spec.js
index 7164e468e71..fa6cf7e6bb5 100644
--- a/test/spec/unit/core/bidderFactory_spec.js
+++ b/test/spec/unit/core/bidderFactory_spec.js
@@ -1,4 +1,4 @@
-import { newBidder, registerBidder, preloadBidderMappingFile, storage } from 'src/adapters/bidderFactory.js';
+import {newBidder, registerBidder, preloadBidderMappingFile, storage, isValid} from 'src/adapters/bidderFactory.js';
 import adapterManager from 'src/adapterManager.js';
 import * as ajax from 'src/ajax.js';
 import { expect } from 'chai';
@@ -62,6 +62,7 @@ describe('bidders created by newBidder', function () {
     };
 
     addBidResponseStub = sinon.stub();
+    addBidResponseStub.reject = sinon.stub();
     doneStub = sinon.stub();
   });
 
@@ -508,7 +509,7 @@ describe('bidders created by newBidder', function () {
       expect(userSyncStub.firstCall.args[2]).to.equal('usersync.com');
     });
 
-    it('should logError when required bid response params are missing', function () {
+    it('should logError and reject bid when required bid response params are missing', function () {
       const bidder = newBidder(spec);
 
       const bid = {
@@ -532,9 +533,10 @@ describe('bidders created by newBidder', function () {
       bidder.callBids(MOCK_BIDS_REQUEST, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
       expect(logErrorSpy.calledOnce).to.equal(true);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
     });
 
-    it('should logError when required bid response params are undefined', function () {
+    it('should logError and reject bid when required response params are undefined', function () {
       const bidder = newBidder(spec);
 
       const bid = {
@@ -562,6 +564,7 @@ describe('bidders created by newBidder', function () {
       bidder.callBids(MOCK_BIDS_REQUEST, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
       expect(logErrorSpy.calledOnce).to.equal(true);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
     });
 
     it('should require requestId from interpretResponse', () => {
@@ -586,6 +589,7 @@ describe('bidders created by newBidder', function () {
       bidder.callBids(MOCK_BIDS_REQUEST, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
       expect(addBidResponseStub.called).to.be.false;
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
     });
   });
 
@@ -856,6 +860,7 @@ describe('validate bid response: ', function () {
     });
 
     addBidResponseStub = sinon.stub();
+    addBidResponseStub.reject = sinon.stub();
     doneStub = sinon.stub();
     ajaxStub = sinon.stub(ajax, 'ajax').callsFake(function(url, callbacks) {
       const fakeResponse = sinon.stub();
@@ -954,7 +959,8 @@ describe('validate bid response: ', function () {
       spec.interpretResponse.returns(bids1);
       bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
-      expect(addBidResponseStub.calledOnce).to.equal(false);
+      expect(addBidResponseStub.called).to.equal(false);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
       expect(logErrorSpy.calledWithMatch('Ignoring bid: Native bid missing some required properties.')).to.equal(true);
     });
   }
@@ -1074,7 +1080,8 @@ describe('validate bid response: ', function () {
       spec.interpretResponse.returns(bids1);
       bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
-      expect(addBidResponseStub.calledOnce).to.equal(false);
+      expect(addBidResponseStub.called).to.equal(false);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
       expect(logWarnSpy.callCount).to.equal(1);
     });
 
@@ -1085,7 +1092,8 @@ describe('validate bid response: ', function () {
       spec.interpretResponse.returns(bids1);
       bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
-      expect(addBidResponseStub.calledOnce).to.equal(false);
+      expect(addBidResponseStub.called).to.equal(false);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
     });
 
     it('should log warning when the particular bidder is not specified in allowedAlternateBidderCodes and allowAlternateBidderCodes flag is true', function () {
@@ -1096,7 +1104,8 @@ describe('validate bid response: ', function () {
       spec.interpretResponse.returns(bids1);
       bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
-      expect(addBidResponseStub.calledOnce).to.equal(false);
+      expect(addBidResponseStub.called).to.equal(false);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
       expect(logWarnSpy.callCount).to.equal(1);
     });
 
@@ -1147,7 +1156,8 @@ describe('validate bid response: ', function () {
       spec.interpretResponse.returns(bids1);
       bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
-      expect(addBidResponseStub.calledOnce).to.equal(false);
+      expect(addBidResponseStub.called).to.equal(false);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
       expect(logWarnSpy.callCount).to.equal(1);
     });
 
@@ -1159,7 +1169,7 @@ describe('validate bid response: ', function () {
       spec.interpretResponse.returns(bids1);
       bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
-      expect(addBidResponseStub.calledOnce).to.equal(true);
+      expect(addBidResponseStub.called).to.equal(true);
       expect(logWarnSpy.callCount).to.equal(0);
       expect(logErrorSpy.callCount).to.equal(0);
     });
@@ -1172,8 +1182,9 @@ describe('validate bid response: ', function () {
       spec.interpretResponse.returns(bids1);
       bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
-      expect(addBidResponseStub.calledOnce).to.equal(false);
+      expect(addBidResponseStub.called).to.equal(false);
       expect(logWarnSpy.callCount).to.equal(1);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
     });
 
     it('should not accept the bid, when bidderSetting is missing for the bidder. It should fallback to standard setting and reject the bid', function () {
@@ -1183,7 +1194,8 @@ describe('validate bid response: ', function () {
       spec.interpretResponse.returns(bids1);
       bidder.callBids(bidRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
-      expect(addBidResponseStub.calledOnce).to.equal(false);
+      expect(addBidResponseStub.called).to.equal(false);
+      expect(addBidResponseStub.reject.calledOnce).to.be.true;
       expect(logWarnSpy.callCount).to.equal(1);
     });
   });
@@ -1385,3 +1397,46 @@ describe('preload mapping url hook', function() {
     clock.restore();
   });
 });
+
+describe('bid response isValid', () => {
+  describe('size check', () => {
+    let req, index;
+
+    beforeEach(() => {
+      req = {
+        ...MOCK_BIDS_REQUEST.bids[0],
+        mediaTypes: {
+          banner: {
+            sizes: [[1, 2], [3, 4]]
+          }
+        }
+      }
+    });
+
+    function mkResponse(width, height) {
+      return {
+        requestId: req.bidId,
+        width,
+        height,
+        cpm: 1,
+        ttl: 60,
+        creativeId: '123',
+        netRevenue: true,
+        currency: 'USD',
+        mediaType: 'banner',
+      }
+    }
+
+    function checkValid(bid) {
+      return isValid('au', bid, {index: stubAuctionIndex({bidRequests: [req]})});
+    }
+
+    it('should succeed when response has a size that was in request', () => {
+      expect(checkValid(mkResponse(3, 4))).to.be.true;
+    });
+
+    it('should fail when response has a size that was not in request', () => {
+      expect(checkValid(mkResponse(10, 11))).to.be.false;
+    });
+  })
+});
diff --git a/test/spec/unit/core/targeting_spec.js b/test/spec/unit/core/targeting_spec.js
index 4585ddbfaaf..448f1b36e3a 100644
--- a/test/spec/unit/core/targeting_spec.js
+++ b/test/spec/unit/core/targeting_spec.js
@@ -6,8 +6,14 @@ import CONSTANTS from 'src/constants.json';
 import { auctionManager } from 'src/auctionManager.js';
 import * as utils from 'src/utils.js';
 import {deepClone} from 'src/utils.js';
+import {createBid} from '../../../../src/bidfactory.js';
+import {hook} from '../../../../src/hook.js';
 
-const bid1 = {
+function mkBid(bid, status = CONSTANTS.STATUS.GOOD) {
+  return Object.assign(createBid(status), bid);
+}
+
+const sampleBid = {
   'bidderCode': 'rubicon',
   'width': '300',
   'height': '250',
@@ -39,7 +45,9 @@ const bid1 = {
   'ttl': 300
 };
 
-const bid2 = {
+const bid1 = mkBid(sampleBid);
+
+const bid2 = mkBid({
   'bidderCode': 'rubicon',
   'width': '300',
   'height': '250',
@@ -67,9 +75,9 @@ const bid2 = {
   'netRevenue': true,
   'currency': 'USD',
   'ttl': 300
-};
+});
 
-const bid3 = {
+const bid3 = mkBid({
   'bidderCode': 'rubicon',
   'width': '300',
   'height': '600',
@@ -97,9 +105,9 @@ const bid3 = {
   'netRevenue': true,
   'currency': 'USD',
   'ttl': 300
-};
+});
 
-const nativeBid1 = {
+const nativeBid1 = mkBid({
   'bidderCode': 'appnexus',
   'width': 0,
   'height': 0,
@@ -165,8 +173,9 @@ const nativeBid1 = {
     [CONSTANTS.NATIVE_KEYS.image]: 'http://vcdn.adnxs.com/p/creative-image/94/22/cd/0f/9422cd0f-f400-45d3-80f5-2b92629d9257.jpg',
     [CONSTANTS.NATIVE_KEYS.icon]: 'http://vcdn.adnxs.com/p/creative-image/bd/59/a6/c6/bd59a6c6-0851-411d-a16d-031475a51312.png'
   }
-};
-const nativeBid2 = {
+});
+
+const nativeBid2 = mkBid({
   'bidderCode': 'dgads',
   'width': 0,
   'height': 0,
@@ -222,7 +231,7 @@ const nativeBid2 = {
     [CONSTANTS.NATIVE_KEYS.sponsoredBy]: 'test.com',
     [CONSTANTS.NATIVE_KEYS.clickUrl]: 'http://prebid.org/'
   }
-};
+});
 
 describe('targeting tests', function () {
   let sandbox;
@@ -231,6 +240,10 @@ describe('targeting tests', function () {
   let bidCacheFilterFunction;
   let undef;
 
+  before(() => {
+    hook.ready();
+  });
+
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
 
@@ -287,6 +300,12 @@ describe('targeting tests', function () {
       bidExpiryStub.restore();
     });
 
+    it('should filter out NO_BID bids', () => {
+      bidsReceived = [mkBid(sampleBid, CONSTANTS.STATUS.NO_BID)];
+      const tg = targetingInstance.getAllTargeting();
+      expect(tg[bidsReceived[0].adUnitCode]).to.eql({});
+    });
+
     describe('when handling different adunit targeting value types', function () {
       const adUnitCode = '/123456/header-bid-tag-0';
       const adServerTargeting = {};
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index 6757ef42094..aac36ee76a1 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -200,6 +200,7 @@ describe('Unit: Prebid Module', function () {
     hook.ready();
     $$PREBID_GLOBAL$$.requestBids.getHooks().remove();
     resetDebugging();
+    sinon.stub(filters, 'isActualBid').returns(true); // stub this out so that we can use vanilla objects as bids
   });
 
   beforeEach(function () {
@@ -216,6 +217,7 @@ describe('Unit: Prebid Module', function () {
 
   after(function() {
     auctionManager.clearAllAuctions();
+    filters.isActualBid.restore();
   });
 
   describe('and global adUnits', () => {
@@ -504,8 +506,8 @@ describe('Unit: Prebid Module', function () {
           'client_initiated_ad_counting': true,
           'rtb': {
             'banner': {
-              'width': 728,
-              'height': 90,
+              'width': 300,
+              'height': 250,
               'content': '<!-- Creative -->'
             },
             'trackers': [{

From 31522176dda74a1e962f192af6a30defc071808c Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Wed, 12 Oct 2022 09:20:02 -0400
Subject: [PATCH 329/569] Appnexus Bid Adapter: add support for debug params
 via query string (#9091)

* appnexus bid adapter - add support for debug params via query string

* add unit test and some updates
---
 modules/appnexusBidAdapter.js                | 21 +++++++++++++++--
 test/spec/modules/appnexusBidAdapter_spec.js | 24 ++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index 7b59ce4ee3b..cabbb448960 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -11,6 +11,7 @@ import {
   getMinValueFromArray,
   getParameterByName,
   getUniqueIdentifierStr,
+  getWindowFromDocument,
   isArray,
   isArrayOfNums,
   isEmpty,
@@ -23,8 +24,7 @@ import {
   logMessage,
   logWarn,
   mergeDeep,
-  transformBidderParamKeywords,
-  getWindowFromDocument
+  transformBidderParamKeywords
 } from '../src/utils.js';
 import {Renderer} from '../src/Renderer.js';
 import {config} from '../src/config.js';
@@ -47,6 +47,11 @@ const VIDEO_RTB_TARGETING = ['minduration', 'maxduration', 'skip', 'skipafter',
 const USER_PARAMS = ['age', 'externalUid', 'segments', 'gender', 'dnt', 'language'];
 const APP_DEVICE_PARAMS = ['geo', 'device_id']; // appid is collected separately
 const DEBUG_PARAMS = ['enabled', 'dongle', 'member_id', 'debug_timeout'];
+const DEBUG_QUERY_PARAM_MAP = {
+  'apn_debug_dongle': 'dongle',
+  'apn_debug_member_id': 'member_id',
+  'apn_debug_timeout': 'debug_timeout'
+};
 const VIDEO_MAPPING = {
   playback_method: {
     'unknown': 0,
@@ -184,6 +189,18 @@ export const spec = {
         logError('AppNexus Debug Auction Cookie Error:\n\n' + e);
       }
     } else {
+      Object.keys(DEBUG_QUERY_PARAM_MAP).forEach(qparam => {
+        let qval = getParameterByName(qparam);
+        if (isStr(qval) && qval !== '') {
+          debugObj[DEBUG_QUERY_PARAM_MAP[qparam]] = qval;
+          debugObj.enabled = true;
+        }
+      });
+      debugObj = convertTypes({
+        'member_id': 'number',
+        'debug_timeout': 'number'
+      }, debugObj);
+
       const debugBidRequest = find(bidRequests, hasDebug);
       if (debugBidRequest && debugBidRequest.debug) {
         debugObj = debugBidRequest.debug;
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 87a4a0fbe2d..5cd189da9a1 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -4,6 +4,7 @@ import { newBidder } from 'src/adapters/bidderFactory.js';
 import * as bidderFactory from 'src/adapters/bidderFactory.js';
 import { auctionManager } from 'src/auctionManager.js';
 import { deepClone } from 'src/utils.js';
+import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
 
 const ENDPOINT = 'https://ib.adnxs.com/ut/v3/prebid';
@@ -370,6 +371,29 @@ describe('AppNexusAdapter', function () {
       });
     });
 
+    it('should add debug params from query', function () {
+      let getParamStub = sinon.stub(utils, 'getParameterByName').callsFake(function(par) {
+        if (par === 'apn_debug_dongle') return 'abcdef';
+        if (par === 'apn_debug_member_id') return '1234';
+        if (par === 'apn_debug_timeout') return '1000';
+
+        return '';
+      });
+
+      let bidRequest = deepClone(bidRequests[0]);
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.debug).to.exist.and.to.deep.equal({
+        'dongle': 'abcdef',
+        'enabled': true,
+        'member_id': 1234,
+        'debug_timeout': 1000
+      });
+
+      getParamStub.restore();
+    });
+
     it('should attach reserve param when either bid param or getFloor function exists', function () {
       let getFloorResponse = { currency: 'USD', floor: 3 };
       let request, payload = null;

From 50f6d12a97d9b63f04deea3cc3ff9a23280e88b0 Mon Sep 17 00:00:00 2001
From: shakhaltb <108469576+shakhaltb@users.noreply.github.com>
Date: Wed, 12 Oct 2022 21:11:31 +0300
Subject: [PATCH 330/569] Taboola Bid Adapter: fix multiple impressions bug
 (#9104)

* create taboola adapter

* create taboola adapter md

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* update the md

* update the Maintainer email

* * update MD page
* refactor code for better readability
* small fix in UT

* * add privacy to the request builder
* add relevant Ut
* small fixes in UT

* * code refactoring + add more accurate way to get page url and referer
* add relevant Ut
* small fixes in md

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * update end point url
* update UT
* Update banner End point structure

* small fixes + update epi url

* remove the destruction from the bidResponse property

* (update the unit tests) remove the destruction from the bidResponse property

* fix tests

* fix tests - run stubs on each test

* rerun because of another adapter flaky test

* rerun because of another adapter flaky test

* fix cors issue, switch between height, width position

* update badv, bcat to be based in the ortb2 to support prebid 7 new protocols + update Ut

* retry run circleci

* retry run circleci

* pull from upstream
update md (placement + pub )

* update badv, bcat UT

* rerun build

* rerun build

* support storageAllowed restriction on unit tests for prebid 7

* create taboola adapter

* create taboola adapter md

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* update the md

* update the Maintainer email

* * update MD page
* refactor code for better readability
* small fix in UT

* * add privacy to the request builder
* add relevant Ut
* small fixes in UT

* * code refactoring + add more accurate way to get page url and referer
* add relevant Ut
* small fixes in md

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * update end point url
* update UT
* Update banner End point structure

* small fixes + update epi url

* remove the destruction from the bidResponse property

* (update the unit tests) remove the destruction from the bidResponse property

* fix tests

* fix tests - run stubs on each test

* rerun because of another adapter flaky test

* rerun because of another adapter flaky test

* fix cors issue, switch between height, width position

* update badv, bcat to be based in the ortb2 to support prebid 7 new protocols + update Ut

* retry run circleci

* retry run circleci

* pull from upstream
update md (placement + pub )

* update badv, bcat UT

* rerun build

* rerun build

* support storageAllowed restriction on unit tests for prebid 7

* support storageAllowed restriction on unit tests for prebid 7

* add it also to the aftereach

* add it also to the aftereach

* change the api endpoint https protocol

* update Taboola prebid documentation:
tagId, publisherId, bidFloor.

* update bid response ttl to 60 seconds.

* update Taboola prebid documentation.

* update-ttl-passing

* Update taboolaBidAdapter_spec.js

* add fallback default value in case of null

* add semicolons

* .

* .

* .

* ..

* ...

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* optional-chaining

* set netRevenue to true.

* fix bid response in case we have multiple impressions

* add test

* fix lint

Co-authored-by: Michael <michael.ziso@taboola.com>
Co-authored-by: mikiz <31058500+mikizi@users.noreply.github.com>
Co-authored-by: jenny.l <jenny.l@taboola.com>
Co-authored-by: jennylt <48404417+jennylt@users.noreply.github.com>
Co-authored-by: Ahmad Lobany <ahmad.l@taboola.com>
Co-authored-by: ahmadlob <109217988+ahmadlob@users.noreply.github.com>
---
 modules/taboolaBidAdapter.js                |   8 +-
 test/spec/modules/taboolaBidAdapter_spec.js | 121 ++++++++++++++++++--
 2 files changed, 114 insertions(+), 15 deletions(-)

diff --git a/modules/taboolaBidAdapter.js b/modules/taboolaBidAdapter.js
index 13f04848dd6..d4bf6623f9b 100644
--- a/modules/taboolaBidAdapter.js
+++ b/modules/taboolaBidAdapter.js
@@ -147,7 +147,7 @@ export const spec = {
       return [];
     }
 
-    return bids.map((bid, id) => getBid(bid.bidId, currency, bidResponses[id])).filter(Boolean);
+    return bidResponses.map((bidResponse) => getBid(bids, currency, bidResponse)).filter(Boolean);
   },
 };
 
@@ -204,7 +204,7 @@ function getBidResponses({body}) {
 
   const {seatbid, cur} = body;
 
-  if (!seatbid.length || !seatbid[0].bid) {
+  if (!seatbid.length || !seatbid[0].bid || !seatbid[0].bid.length) {
     return [];
   }
 
@@ -214,14 +214,14 @@ function getBidResponses({body}) {
   };
 }
 
-function getBid(requestId, currency, bidResponse) {
+function getBid(bids, currency, bidResponse) {
   if (!bidResponse) {
     return;
   }
   const {
     price: cpm, crid: creativeId, adm: ad, w: width, h: height, exp: ttl, adomain: advertiserDomains, meta = {}
   } = bidResponse;
-
+  let requestId = bids[bidResponse.impid - 1].bidId;
   if (advertiserDomains && advertiserDomains.length > 0) {
     meta.advertiserDomains = advertiserDomains
   }
diff --git a/test/spec/modules/taboolaBidAdapter_spec.js b/test/spec/modules/taboolaBidAdapter_spec.js
index b41a17a8e0a..9af11363957 100644
--- a/test/spec/modules/taboolaBidAdapter_spec.js
+++ b/test/spec/modules/taboolaBidAdapter_spec.js
@@ -4,7 +4,7 @@ import {config} from '../../../src/config'
 import * as utils from '../../../src/utils'
 
 describe('Taboola Adapter', function () {
-  let hasLocalStorage, cookiesAreEnabled, getDataFromLocalStorage, localStorageIsEnabled, getCookie;
+  let hasLocalStorage, cookiesAreEnabled, getDataFromLocalStorage, localStorageIsEnabled, getCookie, commonBidRequest;
 
   beforeEach(() => {
     hasLocalStorage = sinon.stub(userData.storageManager, 'hasLocalStorage');
@@ -12,7 +12,7 @@ describe('Taboola Adapter', function () {
     getCookie = sinon.stub(userData.storageManager, 'getCookie');
     getDataFromLocalStorage = sinon.stub(userData.storageManager, 'getDataFromLocalStorage');
     localStorageIsEnabled = sinon.stub(userData.storageManager, 'localStorageIsEnabled');
-
+    commonBidRequest = createBidRequest();
     $$PREBID_GLOBAL$$.bidderSettings = {
       taboola: {
         storageAllowed: true
@@ -30,19 +30,19 @@ describe('Taboola Adapter', function () {
     $$PREBID_GLOBAL$$.bidderSettings = {};
   })
 
-  const commonBidRequest = {
+  const displayBidRequestParams = {
+    sizes: [[300, 250], [300, 600]]
+  }
+
+  const createBidRequest = () => ({
     bidder: 'taboola',
     params: {
       publisherId: 'publisherId',
       tagId: 'placement name'
     },
-    bidId: 'aa43860a-4644-442a-b5e0-93f268cs4d19',
-    auctionId: '65746dca-26f3-4186-be13-dfa63469b1b7',
-  }
-
-  const displayBidRequestParams = {
-    sizes: [[300, 250], [300, 600]]
-  }
+    bidId: utils.generateUUID(),
+    auctionId: utils.generateUUID(),
+  });
 
   describe('isBidRequestValid', function () {
     it('should fail when bid is invalid - tagId isn`t defined', function () {
@@ -132,7 +132,7 @@ describe('Taboola Adapter', function () {
 
   describe('buildRequests', function () {
     const defaultBidRequest = {
-      ...commonBidRequest,
+      ...createBidRequest(),
       ...displayBidRequestParams,
     }
 
@@ -441,6 +441,105 @@ describe('Taboola Adapter', function () {
       overriddenServerResponse.body.seatbid[0].bid = bid;
     });
 
+    it('should interpret multi impression request', function () {
+      const multiRequest = {
+        bids: [
+          {
+            ...createBidRequest(),
+            ...displayBidRequestParams
+          },
+          {
+            ...createBidRequest(),
+            ...displayBidRequestParams
+          }
+        ]
+      }
+
+      const multiServerResponse = {
+        body: {
+          'id': '49ffg4d58ef9a163a69fhgfghd4fad03621b9e036f24f7_15',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '0b3dd94348-134b-435f-8db5-6bf5afgfc39e86c',
+                  'impid': '2',
+                  'price': 0.342068,
+                  'adid': '2785119545551083381',
+                  'adm': 'ADM2',
+                  'adomain': [
+                    'example.xyz'
+                  ],
+                  'cid': '15744349',
+                  'crid': '278195503434041083381',
+                  'w': 300,
+                  'h': 250,
+                  'exp': 60,
+                  'lurl': 'http://us-trc.taboola.com/sample'
+                },
+                {
+                  'id': '0b3dd94348-134b-435f-8db5-6bf5afgfc39e86c',
+                  'impid': '1',
+                  'price': 0.342068,
+                  'adid': '2785119545551083381',
+                  'adm': 'ADM1',
+                  'adomain': [
+                    'example.xyz'
+                  ],
+                  'cid': '15744349',
+                  'crid': '278195503434041083381',
+                  'w': 300,
+                  'h': 250,
+                  'exp': 60,
+                  'lurl': 'http://us-trc.taboola.com/sample'
+                }
+              ],
+              'seat': '14204545260'
+            }
+          ],
+          'bidid': 'da43860a-4644-442a-b5e0-93f268cf8d19',
+          'cur': 'USD'
+        }
+      };
+
+      const [bid] = multiServerResponse.body.seatbid[0].bid;
+      const expectedRes = [
+        {
+          requestId: multiRequest.bids[1].bidId,
+          cpm: bid.price,
+          creativeId: bid.crid,
+          ttl: 60,
+          netRevenue: true,
+          currency: multiServerResponse.body.cur,
+          mediaType: 'banner',
+          ad: multiServerResponse.body.seatbid[0].bid[0].adm,
+          width: bid.w,
+          height: bid.h,
+          meta: {
+            'advertiserDomains': bid.adomain
+          },
+        },
+        {
+          requestId: multiRequest.bids[0].bidId,
+          cpm: bid.price,
+          creativeId: bid.crid,
+          ttl: 60,
+          netRevenue: true,
+          currency: multiServerResponse.body.cur,
+          mediaType: 'banner',
+          ad: multiServerResponse.body.seatbid[0].bid[1].adm,
+          width: bid.w,
+          height: bid.h,
+          meta: {
+            'advertiserDomains': bid.adomain
+          },
+        }
+      ]
+
+      const res = spec.interpretResponse(multiServerResponse, multiRequest)
+      expect(res).to.deep.equal(expectedRes)
+    });
+
     it('should interpret display response', function () {
       const [bid] = serverResponse.body.seatbid[0].bid;
       const expectedRes = [

From c0f8bc9248435398809a675b11f6ef556101c7d7 Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Wed, 12 Oct 2022 12:08:16 -0700
Subject: [PATCH 331/569] Magnite Analytics Adapter: New Adapter (#9068)

* stash

* mgni analytics done?

* test not finished

* remove log

* get rid of console log

* pass render transaction id

* add bid Id

* fix bidder done

* fix tests

* Handle PPI elementids case

* added lots of test + minor fixes

* implement Michele review comments
fix clashing rubicon configs in tests

* michele fixes

* sometimes bidWons do not have "bidId"
so use "requestId"

* add logs so we can debug on page

* handle currency conversion errors better

* bug fixes

* time since page load

* Magnite MD

* Move session to auction init

* Change adUnitMap to transactionId
Add delay processing to Bid Won

* oops
---
 modules/magniteAnalyticsAdapter.js            |  902 ++++++++
 modules/magniteAnalyticsAdapter.md            |   18 +
 modules/rubiconAnalyticsAdapter.js            |   23 +-
 .../modules/magniteAnalyticsAdapter_spec.js   | 1942 +++++++++++++++++
 .../modules/rubiconAnalyticsAdapter_spec.js   |    5 +-
 5 files changed, 2878 insertions(+), 12 deletions(-)
 create mode 100644 modules/magniteAnalyticsAdapter.js
 create mode 100644 modules/magniteAnalyticsAdapter.md
 create mode 100644 test/spec/modules/magniteAnalyticsAdapter_spec.js

diff --git a/modules/magniteAnalyticsAdapter.js b/modules/magniteAnalyticsAdapter.js
new file mode 100644
index 00000000000..dba847e1b07
--- /dev/null
+++ b/modules/magniteAnalyticsAdapter.js
@@ -0,0 +1,902 @@
+import { generateUUID, mergeDeep, deepAccess, parseUrl, logError, pick, isEmpty, logWarn, debugTurnedOn, parseQS, getWindowLocation, isAdUnitCodeMatchingSlot, isNumber, deepSetValue, deepClone, logInfo, isGptPubadsDefined } from '../src/utils.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import CONSTANTS from '../src/constants.json';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const RUBICON_GVL_ID = 52;
+export const storage = getStorageManager({ gvlid: RUBICON_GVL_ID, moduleName: 'magnite' });
+const COOKIE_NAME = 'mgniSession';
+const LAST_SEEN_EXPIRE_TIME = 1800000; // 30 mins
+const END_EXPIRE_TIME = 21600000; // 6 hours
+const MODULE_NAME = 'Magnite Analytics';
+const BID_REJECTED_IPF = 'rejected-ipf';
+
+// List of known rubicon aliases
+// This gets updated on auction init to account for any custom aliases present
+let rubiconAliases = ['rubicon'];
+
+const pbsErrorMap = {
+  1: 'timeout-error',
+  2: 'input-error',
+  3: 'connect-error',
+  4: 'request-error',
+  999: 'generic-error'
+}
+
+let prebidGlobal = getGlobal();
+const {
+  EVENTS: {
+    AUCTION_INIT,
+    AUCTION_END,
+    BID_REQUESTED,
+    BID_RESPONSE,
+    BIDDER_DONE,
+    BID_TIMEOUT,
+    BID_WON,
+    BILLABLE_EVENT
+  },
+  STATUS: {
+    GOOD,
+    NO_BID
+  },
+  BID_STATUS: {
+    BID_REJECTED
+  }
+} = CONSTANTS;
+
+// The saved state of rubicon specific setConfig controls
+export let rubiConf;
+// Saving state of all our data we want
+let cache;
+const resetConfs = () => {
+  cache = {
+    auctions: {},
+    auctionOrder: [],
+    timeouts: {},
+    billing: {},
+    pendingEvents: {},
+    eventPending: false,
+    elementIdMap: {},
+    sessionData: {}
+  }
+  rubiConf = {
+    pvid: generateUUID().slice(0, 8),
+    analyticsEventDelay: 500,
+    analyticsBatchTimeout: 5000,
+    analyticsProcessDelay: 1,
+    dmBilling: {
+      enabled: false,
+      vendors: [],
+      waitForAuction: true
+    }
+  }
+}
+resetConfs();
+
+config.getConfig('rubicon', config => {
+  mergeDeep(rubiConf, config.rubicon);
+  if (deepAccess(config, 'rubicon.updatePageView') === true) {
+    rubiConf.pvid = generateUUID().slice(0, 8)
+  }
+});
+
+// pbs confs
+let serverConfig;
+config.getConfig('s2sConfig', ({ s2sConfig }) => {
+  serverConfig = s2sConfig;
+});
+
+const DEFAULT_INTEGRATION = 'pbjs';
+
+const adUnitIsOnlyInstream = adUnit => {
+  return adUnit.mediaTypes && Object.keys(adUnit.mediaTypes).length === 1 && deepAccess(adUnit, 'mediaTypes.video.context') === 'instream';
+}
+
+const sendPendingEvents = () => {
+  cache.pendingEvents.trigger = `batched-${Object.keys(cache.pendingEvents).sort().join('-')}`;
+  sendEvent(cache.pendingEvents);
+  cache.pendingEvents = {};
+  cache.eventPending = false;
+}
+
+const addEventToQueue = (event, auctionId, eventName) => {
+  // If it's auction has not left yet, add it there
+  if (cache.auctions[auctionId] && !cache.auctions[auctionId].sent) {
+    cache.auctions[auctionId].pendingEvents = mergeDeep(cache.auctions[auctionId].pendingEvents, event);
+  } else if (rubiConf.analyticsEventDelay > 0) {
+    // else if we are trying to batch stuff up, add it to pending events to be fired
+    cache.pendingEvents = mergeDeep(cache.pendingEvents, event);
+
+    // If no event is pending yet, start a timer for them to be sent and attempted to be gathered together
+    if (!cache.eventPending) {
+      setTimeout(sendPendingEvents, rubiConf.analyticsEventDelay);
+      cache.eventPending = true;
+    }
+  } else {
+    // else - send it solo
+    event.trigger = `solo-${eventName}`;
+    sendEvent(event);
+  }
+}
+
+const sendEvent = payload => {
+  const event = {
+    ...getTopLevelDetails(),
+    ...payload
+  }
+  ajax(
+    endpoint,
+    null,
+    JSON.stringify(event),
+    {
+      contentType: 'application/json'
+    }
+  );
+}
+
+const sendAuctionEvent = (auctionId, trigger) => {
+  let auctionCache = cache.auctions[auctionId];
+  const auctionEvent = formatAuction(auctionCache.auction);
+
+  auctionCache.sent = true;
+  sendEvent({
+    auctions: [auctionEvent],
+    ...(auctionCache.pendingEvents || {}), // if any pending events were attached
+    trigger
+  });
+}
+
+const formatAuction = auction => {
+  const auctionEvent = deepClone(auction);
+
+  auctionEvent.samplingFactor = 1;
+
+  // We stored adUnits and bids as objects for quick lookups, now they are mapped into arrays for PBA
+  auctionEvent.adUnits = Object.entries(auctionEvent.adUnits).map(([tid, adUnit]) => {
+    adUnit.bids = Object.entries(adUnit.bids).map(([bidId, bid]) => {
+      // determine adUnit.status from its bid statuses. Use priority below to determine, higher index is better
+      let statusPriority = ['error', 'no-bid', 'success'];
+      if (statusPriority.indexOf(bid.status) > statusPriority.indexOf(adUnit.status)) {
+        adUnit.status = bid.status;
+      }
+
+      // If PBS told us to overwrite the bid ID, do so
+      if (bid.pbsBidId) {
+        bid.oldBidId = bid.bidId;
+        bid.bidId = bid.pbsBidId;
+        delete bid.pbsBidId;
+      }
+      return bid;
+    });
+    return adUnit;
+  });
+  return auctionEvent;
+}
+
+const isBillingEventValid = event => {
+  // vendor is whitelisted
+  const isWhitelistedVendor = rubiConf.dmBilling.vendors.includes(event.vendor);
+  // event is not duplicated
+  const isNotDuplicate = typeof deepAccess(cache.billing, `${event.vendor}.${event.billingId}`) !== 'boolean';
+  // billingId is defined and a string
+  return typeof event.billingId === 'string' && isWhitelistedVendor && isNotDuplicate;
+}
+
+const formatBillingEvent = event => {
+  let billingEvent = deepClone(event);
+  // Pass along type if is string and not empty else general
+  billingEvent.type = (typeof event.type === 'string' && event.type) || 'general';
+  billingEvent.accountId = accountId;
+  // mark as sent
+  deepSetValue(cache.billing, `${event.vendor}.${event.billingId}`, true);
+  return billingEvent;
+}
+
+const getBidPrice = bid => {
+  // get the cpm from bidResponse
+  let cpm;
+  let currency;
+  if (bid.status === BID_REJECTED && typeof deepAccess(bid, 'floorData.cpmAfterAdjustments') === 'number') {
+    // if bid was rejected and bid.floorData.cpmAfterAdjustments use it
+    cpm = bid.floorData.cpmAfterAdjustments;
+    currency = bid.floorData.floorCurrency;
+  } else if (typeof bid.currency === 'string' && bid.currency.toUpperCase() === 'USD') {
+    // bid is in USD use it
+    return Number(bid.cpm);
+  } else {
+    // else grab cpm
+    cpm = bid.cpm;
+    currency = bid.currency;
+  }
+  // if after this it is still going and is USD then return it.
+  if (currency === 'USD') {
+    return Number(cpm);
+  }
+  // otherwise we convert and return
+  try {
+    return Number(prebidGlobal.convertCurrency(cpm, currency, 'USD'));
+  } catch (err) {
+    logWarn(`${MODULE_NAME}: Could not determine the bidPriceUSD of the bid `, bid);
+    bid.conversionError = true;
+    bid.ogCurrency = currency;
+    bid.ogPrice = cpm;
+    return 0;
+  }
+}
+
+export const parseBidResponse = (bid, previousBidResponse) => {
+  // The current bidResponse for this matching requestId/bidRequestId
+  let responsePrice = getBidPrice(bid)
+  // we need to compare it with the previous one (if there was one) log highest only
+  // THIS WILL CHANGE WITH ALLOWING MULTIBID BETTER
+  if (previousBidResponse && previousBidResponse.bidPriceUSD > responsePrice) {
+    return previousBidResponse;
+  }
+
+  return pick(bid, [
+    'bidPriceUSD', () => responsePrice,
+    'dealId', dealId => dealId || undefined,
+    'mediaType',
+    'dimensions', () => {
+      const width = bid.width || bid.playerWidth;
+      const height = bid.height || bid.playerHeight;
+      return (width && height) ? { width, height } : undefined;
+    },
+    'floorValue', () => deepAccess(bid, 'floorData.floorValue'),
+    'floorRuleValue', () => deepAccess(bid, 'floorData.floorRuleValue'),
+    'floorRule', () => debugTurnedOn() ? deepAccess(bid, 'floorData.floorRule') : undefined,
+    'adomains', () => {
+      const adomains = deepAccess(bid, 'meta.advertiserDomains');
+      const validAdomains = Array.isArray(adomains) && adomains.filter(domain => typeof domain === 'string');
+      return validAdomains && validAdomains.length > 0 ? validAdomains.slice(0, 10) : undefined
+    },
+    'conversionError', conversionError => conversionError === true || undefined, // only pass if exactly true
+    'ogCurrency',
+    'ogPrice'
+  ]);
+}
+
+const addFloorData = floorData => {
+  if (floorData.location === 'noData') {
+    return pick(floorData, [
+      'location',
+      'fetchStatus',
+      'floorProvider as provider'
+    ]);
+  } else {
+    return pick(floorData, [
+      'location',
+      'modelVersion as modelName',
+      'modelWeight',
+      'modelTimestamp',
+      'skipped',
+      'enforcement', () => deepAccess(floorData, 'enforcements.enforceJS'),
+      'dealsEnforced', () => deepAccess(floorData, 'enforcements.floorDeals'),
+      'skipRate',
+      'fetchStatus',
+      'floorMin',
+      'floorProvider as provider'
+    ]);
+  }
+}
+
+let pageReferer;
+
+const getTopLevelDetails = () => {
+  let payload = {
+    channel: 'web',
+    integration: rubiConf.int_type || DEFAULT_INTEGRATION,
+    referrerUri: pageReferer,
+    version: '$prebid.version$',
+    referrerHostname: magniteAdapter.referrerHostname || getHostNameFromReferer(pageReferer),
+    timestamps: {
+      timeSincePageLoad: performance.now(),
+      eventTime: Date.now(),
+      prebidLoaded: magniteAdapter.MODULE_INITIALIZED_TIME
+    }
+  }
+
+  // Add DM wrapper details
+  if (rubiConf.wrapperName) {
+    payload.wrapper = {
+      name: rubiConf.wrapperName,
+      family: rubiConf.wrapperFamily,
+      rule: rubiConf.rule_name
+    }
+  }
+
+  if (cache.sessionData) {
+    // gather session info
+    payload.session = pick(cache.sessionData, [
+      'id',
+      'pvid',
+      'start',
+      'expires'
+    ]);
+    // Any FPKVS set?
+    if (!isEmpty(cache.sessionData.fpkvs)) {
+      payload.fpkvs = Object.keys(cache.sessionData.fpkvs).map(key => {
+        return { key, value: cache.sessionData.fpkvs[key] };
+      });
+    }
+  }
+  return payload;
+}
+
+export const getHostNameFromReferer = referer => {
+  try {
+    magniteAdapter.referrerHostname = parseUrl(referer, { noDecodeWholeURL: true }).hostname;
+  } catch (e) {
+    logError(`${MODULE_NAME}: Unable to parse hostname from supplied url: `, referer, e);
+    magniteAdapter.referrerHostname = '';
+  }
+  return magniteAdapter.referrerHostname
+};
+
+const getRpaCookie = () => {
+  let encodedCookie = storage.getDataFromLocalStorage(COOKIE_NAME);
+  if (encodedCookie) {
+    try {
+      return JSON.parse(window.atob(encodedCookie));
+    } catch (e) {
+      logError(`${MODULE_NAME}: Unable to decode ${COOKIE_NAME} value: `, e);
+    }
+  }
+  return {};
+}
+
+const setRpaCookie = (decodedCookie) => {
+  try {
+    storage.setDataInLocalStorage(COOKIE_NAME, window.btoa(JSON.stringify(decodedCookie)));
+  } catch (e) {
+    logError(`${MODULE_NAME}: Unable to encode ${COOKIE_NAME} value: `, e);
+  }
+}
+
+const updateRpaCookie = () => {
+  const currentTime = Date.now();
+  let decodedRpaCookie = getRpaCookie();
+  if (
+    !Object.keys(decodedRpaCookie).length ||
+    (currentTime - decodedRpaCookie.lastSeen) > LAST_SEEN_EXPIRE_TIME ||
+    decodedRpaCookie.expires < currentTime
+  ) {
+    decodedRpaCookie = {
+      id: generateUUID(),
+      start: currentTime,
+      expires: currentTime + END_EXPIRE_TIME, // six hours later,
+    }
+  }
+  // possible that decodedRpaCookie is undefined, and if it is, we probably are blocked by storage or some other exception
+  if (Object.keys(decodedRpaCookie).length) {
+    decodedRpaCookie.lastSeen = currentTime;
+    decodedRpaCookie.fpkvs = { ...decodedRpaCookie.fpkvs, ...getFpkvs() };
+    decodedRpaCookie.pvid = rubiConf.pvid;
+    setRpaCookie(decodedRpaCookie)
+  }
+  return decodedRpaCookie;
+}
+
+/*
+  Filters and converts URL Params into an object and returns only KVs that match the 'utm_KEY' format
+*/
+const getUtmParams = () => {
+  let search;
+
+  try {
+    search = parseQS(getWindowLocation().search);
+  } catch (e) {
+    search = {};
+  }
+
+  return Object.keys(search).reduce((accum, param) => {
+    if (param.match(/utm_/)) {
+      accum[param.replace(/utm_/, '')] = search[param];
+    }
+    return accum;
+  }, {});
+}
+
+const getFpkvs = () => {
+  rubiConf.fpkvs = Object.assign((rubiConf.fpkvs || {}), getUtmParams());
+
+  // convert all values to strings
+  Object.keys(rubiConf.fpkvs).forEach(key => {
+    rubiConf.fpkvs[key] = rubiConf.fpkvs[key] + '';
+  });
+
+  return rubiConf.fpkvs;
+}
+
+/*
+  Checks the alias registry for any entries of the rubicon bid adapter.
+  adds to the rubiconAliases list if found
+*/
+const setRubiconAliases = (aliasRegistry) => {
+  const otherAliases = Object.keys(aliasRegistry).filter(alias => aliasRegistry[alias] === 'rubicon');
+  rubiconAliases.push(...otherAliases);
+}
+
+const sizeToDimensions = size => {
+  return {
+    width: size.w || size[0],
+    height: size.h || size[1]
+  };
+}
+
+const findMatchingAdUnitFromAuctions = (matchesFunction, returnFirstMatch) => {
+  // finding matching adUnit / auction
+  let matches = {};
+
+  // loop through auctions in order and adunits
+  for (const auctionId of cache.auctionOrder) {
+    const auction = cache.auctions[auctionId].auction;
+    for (const transactionId in auction.adUnits) {
+      const adUnit = auction.adUnits[transactionId];
+
+      // check if this matches
+      let doesMatch;
+      try {
+        doesMatch = matchesFunction(adUnit, auction);
+      } catch (error) {
+        logWarn(`${MODULE_NAME}: Error running matches function: ${returnFirstMatch}`, error);
+        doesMatch = false;
+      }
+      if (doesMatch) {
+        matches = { adUnit, auction };
+
+        // we either return first match or we want last one matching so go to end
+        if (returnFirstMatch) return matches;
+      }
+    }
+  }
+  return matches;
+}
+
+const getRenderingIds = bidWonData => {
+  // if bid caching off -> return the bidWon auction id
+  if (!config.getConfig('useBidCache')) {
+    return {
+      renderTransactionId: bidWonData.transactionId,
+      renderAuctionId: bidWonData.auctionId
+    };
+  }
+
+  // a rendering auction id is the LATEST auction / adunit which contains GAM ID's
+  const matchingFunction = (adUnit, auction) => {
+    // does adUnit match our bidWon and gam id's are present
+    const gamHasRendered = deepAccess(cache, `auctions.${auction.auctionId}.gamRenders.${adUnit.transactionId}`);
+    return adUnit.adUnitCode === bidWonData.adUnitCode && gamHasRendered;
+  }
+  let { adUnit, auction } = findMatchingAdUnitFromAuctions(matchingFunction, false);
+  // If no match was found, we will use the actual bid won auction id
+  return {
+    renderTransactionId: (adUnit && adUnit.transactionId) || bidWonData.transactionId,
+    renderAuctionId: (auction && auction.auctionId) || bidWonData.auctionId
+  }
+}
+
+const formatBidWon = bidWonData => {
+  // get transaction and auction id of where this "rendered"
+  const { renderTransactionId, renderAuctionId } = getRenderingIds(bidWonData);
+
+  const isCachedBid = renderTransactionId !== bidWonData.transactionId;
+  logInfo(`${MODULE_NAME}: Bid Won : `, {
+    isCachedBid,
+    renderAuctionId,
+    renderTransactionId,
+    sourceAuctionId: bidWonData.auctionId,
+    sourceTransactionId: bidWonData.transactionId,
+  });
+
+  // get the bid from the source auction id
+  let bid = deepAccess(cache, `auctions.${bidWonData.auctionId}.auction.adUnits.${bidWonData.transactionId}.bids.${bidWonData.requestId}`);
+  let adUnit = deepAccess(cache, `auctions.${bidWonData.auctionId}.auction.adUnits.${bidWonData.transactionId}`);
+  let bidWon = {
+    ...bid,
+    sourceAuctionId: bidWonData.auctionId,
+    renderAuctionId,
+    transactionId: bidWonData.transactionId,
+    sourceTransactionId: bidWonData.transactionId,
+    bidId: bid.pbsBidId || bidWonData.bidId || bidWonData.requestId, // if PBS had us overwrite bidId, use that as signal
+    renderTransactionId,
+    accountId,
+    siteId: adUnit.siteId,
+    zoneId: adUnit.zoneId,
+    mediaTypes: adUnit.mediaTypes,
+    adUnitCode: adUnit.adUnitCode,
+    isCachedBid: isCachedBid || undefined // only send if it is true (save some space)
+  }
+  delete bidWon.pbsBidId; // if pbsBidId is there delete it (no need to pass it)
+  return bidWon;
+}
+
+const formatGamEvent = (slotEvent, adUnit, auction) => {
+  const gamEvent = pick(slotEvent, [
+    // these come in as `null` from Gpt, which when stringified does not get removed
+    // so set explicitly to undefined when not a number
+    'advertiserId', advertiserId => isNumber(advertiserId) ? advertiserId : undefined,
+    'creativeId', creativeId => isNumber(slotEvent.sourceAgnosticCreativeId) ? slotEvent.sourceAgnosticCreativeId : isNumber(creativeId) ? creativeId : undefined,
+    'lineItemId', lineItemId => isNumber(slotEvent.sourceAgnosticLineItemId) ? slotEvent.sourceAgnosticLineItemId : isNumber(lineItemId) ? lineItemId : undefined,
+    'adSlot', () => slotEvent.slot.getAdUnitPath(),
+    'isSlotEmpty', () => slotEvent.isEmpty || undefined
+  ]);
+  gamEvent.auctionId = auction.auctionId;
+  gamEvent.transactionId = adUnit.transactionId;
+  return gamEvent;
+}
+
+const subscribeToGamSlots = () => {
+  window.googletag.pubads().addEventListener('slotRenderEnded', event => {
+    const isMatchingAdSlot = isAdUnitCodeMatchingSlot(event.slot);
+
+    // We want to find the FIRST auction - adUnit that matches and does not have gam data yet
+    const matchingFunction = (adUnit, auction) => {
+      // first it has to match the slot
+      // if the code is present in the elementIdMap then we use the matched id as code here
+      const elementIds = cache.elementIdMap[adUnit.adUnitCode] || [adUnit.adUnitCode];
+      const matchesSlot = elementIds.some(isMatchingAdSlot);
+
+      // next it has to have NOT already been counted as gam rendered
+      const gamHasRendered = deepAccess(cache, `auctions.${auction.auctionId}.gamRenders.${adUnit.transactionId}`);
+      return matchesSlot && !gamHasRendered;
+    }
+    let { adUnit, auction } = findMatchingAdUnitFromAuctions(matchingFunction, true);
+
+    const slotName = `${event.slot.getAdUnitPath()} - ${event.slot.getSlotElementId()}`;
+
+    if (!adUnit || !auction) {
+      logInfo(`${MODULE_NAME}: Could not find matching adUnit for Gam Render: `, {
+        slotName
+      });
+      return;
+    }
+    const auctionId = auction.auctionId;
+
+    logInfo(`${MODULE_NAME}: Gam Render: `, {
+      slotName,
+      transactionId: adUnit.transactionId,
+      auctionId: auctionId,
+      adUnit: adUnit,
+    });
+
+    // if we have an adunit, then we need to make a gam event
+    const gamEvent = formatGamEvent(event, adUnit, auction);
+
+    // marking that this prebid adunit has had its matching gam render found
+    deepSetValue(cache, `auctions.${auctionId}.gamRenders.${adUnit.transactionId}`, true);
+
+    addEventToQueue({ gamRenders: [gamEvent] }, auctionId, 'gam');
+
+    // If this auction now has all gam slots rendered, fire the payload
+    if (!cache.auctions[auctionId].sent && Object.keys(cache.auctions[auctionId].gamRenders).every(tid => cache.auctions[auctionId].gamRenders[tid])) {
+      // clear the auction end timeout
+      clearTimeout(cache.timeouts[auctionId]);
+      delete cache.timeouts[auctionId];
+
+      // wait for bid wons a bit or send right away
+      if (rubiConf.analyticsEventDelay > 0) {
+        setTimeout(() => {
+          sendAuctionEvent(auctionId, 'gam-delayed');
+        }, rubiConf.analyticsEventDelay);
+      } else {
+        sendAuctionEvent(auctionId, 'gam');
+      }
+    }
+  });
+}
+
+let accountId;
+let endpoint;
+
+let magniteAdapter = adapter({ analyticsType: 'endpoint' });
+
+magniteAdapter.originEnableAnalytics = magniteAdapter.enableAnalytics;
+function enableMgniAnalytics(config = {}) {
+  let error = false;
+  // endpoint
+  endpoint = deepAccess(config, 'options.endpoint');
+  if (!endpoint) {
+    logError(`${MODULE_NAME}: required endpoint missing`);
+    error = true;
+  }
+  // accountId
+  accountId = Number(deepAccess(config, 'options.accountId'));
+  if (!accountId) {
+    logError(`${MODULE_NAME}: required accountId missing`);
+    error = true;
+  }
+  if (!error) {
+    magniteAdapter.originEnableAnalytics(config);
+  }
+  // listen to gam slot renders!
+  if (isGptPubadsDefined()) {
+    subscribeToGamSlots();
+  } else {
+    window.googletag = window.googletag || {};
+    window.googletag.cmd = window.googletag.cmd || [];
+    window.googletag.cmd.push(() => subscribeToGamSlots());
+  }
+};
+
+const handleBidWon = args => {
+  const bidWon = formatBidWon(args);
+  addEventToQueue({ bidsWon: [bidWon] }, bidWon.renderAuctionId, 'bidWon');
+}
+
+magniteAdapter.enableAnalytics = enableMgniAnalytics;
+
+magniteAdapter.originDisableAnalytics = magniteAdapter.disableAnalytics;
+magniteAdapter.disableAnalytics = function () {
+  // trick analytics module to register our enable back as main one
+  magniteAdapter._oldEnable = enableMgniAnalytics;
+  endpoint = undefined;
+  accountId = undefined;
+  resetConfs();
+  magniteAdapter.originDisableAnalytics();
+}
+
+magniteAdapter.MODULE_INITIALIZED_TIME = Date.now();
+magniteAdapter.referrerHostname = '';
+
+magniteAdapter.track = ({ eventType, args }) => {
+  switch (eventType) {
+    case AUCTION_INIT:
+      // Update session
+      cache.sessionData = storage.localStorageIsEnabled() && updateRpaCookie();
+      // set the rubicon aliases
+      setRubiconAliases(adapterManager.aliasRegistry);
+
+      // latest page "referer"
+      pageReferer = deepAccess(args, 'bidderRequests.0.refererInfo.page');
+
+      // set auction level data
+      let auctionData = pick(args, [
+        'auctionId',
+        'timestamp as auctionStart',
+        'timeout as clientTimeoutMillis',
+      ]);
+      auctionData.accountId = accountId;
+
+      // Order bidders were called
+      auctionData.bidderOrder = args.bidderRequests.map(bidderRequest => bidderRequest.bidderCode);
+
+      // Price Floors information
+      const floorData = deepAccess(args, 'bidderRequests.0.bids.0.floorData');
+      if (floorData) {
+        auctionData.floors = addFloorData(floorData);
+      }
+
+      // GDPR info
+      const gdprData = deepAccess(args, 'bidderRequests.0.gdprConsent');
+      if (gdprData) {
+        auctionData.gdpr = pick(gdprData, [
+          'gdprApplies as applies',
+          'consentString',
+          'apiVersion as version'
+        ]);
+      }
+
+      // User ID Data included in auction
+      const userIds = Object.keys(deepAccess(args, 'bidderRequests.0.bids.0.userId', {})).map(id => {
+        return { provider: id, hasId: true }
+      });
+      if (userIds.length) {
+        auctionData.user = { ids: userIds };
+      }
+
+      if (serverConfig) {
+        auctionData.serverTimeoutMillis = serverConfig.timeout;
+      }
+
+      // lets us keep a map of adunit and wether it had a gam or bid won render yet, used to track when to send events
+      let gamRenders = {};
+      // adunits saved as map of transactionIds
+      auctionData.adUnits = args.adUnits.reduce((adMap, adUnit) => {
+        let ad = pick(adUnit, [
+          'code as adUnitCode',
+          'transactionId',
+          'mediaTypes', mediaTypes => Object.keys(mediaTypes),
+          'sizes as dimensions', sizes => sizes.map(sizeToDimensions),
+        ]);
+        ad.pbAdSlot = deepAccess(adUnit, 'ortb2Imp.ext.data.pbadslot');
+        ad.pattern = deepAccess(adUnit, 'ortb2Imp.ext.data.aupname');
+        ad.gpid = deepAccess(adUnit, 'ortb2Imp.ext.gpid');
+        ad.bids = {};
+        adMap[adUnit.transactionId] = ad;
+        gamRenders[adUnit.transactionId] = false;
+
+        // Handle case elementId's (div Id's) are set on adUnit - PPI
+        const elementIds = deepAccess(adUnit, 'ortb2Imp.ext.data.elementid');
+        if (elementIds) {
+          cache.elementIdMap[adUnit.code] = cache.elementIdMap[adUnit.code] || [];
+          // set it to array if set to string to be careful (should be array of strings)
+          const newIds = typeof elementIds === 'string' ? [elementIds] : elementIds;
+          newIds.forEach(id => {
+            if (!cache.elementIdMap[adUnit.code].includes(id)) {
+              cache.elementIdMap[adUnit.code].push(id);
+            }
+          });
+        }
+        return adMap;
+      }, {});
+
+      // holding our pba data to send
+      cache.auctions[args.auctionId] = {
+        auction: auctionData,
+        gamRenders,
+        pendingEvents: {}
+      }
+      break;
+    case BID_REQUESTED:
+      args.bids.forEach(bid => {
+        const adUnit = deepAccess(cache, `auctions.${args.auctionId}.auction.adUnits.${bid.transactionId}`);
+        adUnit.bids[bid.bidId] = pick(bid, [
+          'bidder',
+          'bidId',
+          'source', () => bid.src === 's2s' ? 'server' : 'client',
+          'status', () => 'no-bid'
+        ]);
+        // set acct site zone id on adunit
+        if ((!adUnit.siteId || !adUnit.zoneId) && rubiconAliases.indexOf(bid.bidder) !== -1) {
+          if (deepAccess(bid, 'params.accountId') == accountId) {
+            adUnit.accountId = parseInt(accountId);
+            adUnit.siteId = parseInt(deepAccess(bid, 'params.siteId'));
+            adUnit.zoneId = parseInt(deepAccess(bid, 'params.zoneId'));
+          }
+        }
+      });
+      break;
+    case BID_RESPONSE:
+      const auctionEntry = deepAccess(cache, `auctions.${args.auctionId}.auction`);
+      const adUnit = deepAccess(auctionEntry, `adUnits.${args.transactionId}`);
+      let bid = adUnit.bids[args.requestId];
+
+      // if this came from multibid, there might now be matching bid, so check
+      // THIS logic will change when we support multibid per bid request
+      if (!bid && args.originalRequestId) {
+        let ogBid = adUnit.bids[args.originalRequestId];
+        // create new bid
+        adUnit.bids[args.requestId] = {
+          ...ogBid,
+          bidId: args.requestId,
+          bidderDetail: args.targetingBidder
+        };
+        bid = adUnit.bids[args.requestId];
+      }
+
+      // if we have not set enforcements yet set it (This is hidden from bidders until now so we have to get from here)
+      if (typeof deepAccess(auctionEntry, 'floors.enforcement') !== 'boolean' && deepAccess(args, 'floorData.enforcements')) {
+        auctionEntry.floors.enforcement = args.floorData.enforcements.enforceJS;
+        auctionEntry.floors.dealsEnforced = args.floorData.enforcements.floorDeals;
+      }
+
+      // Log error if no matching bid!
+      if (!bid) {
+        logError(`${MODULE_NAME}: Could not find associated bid request for bid response with requestId: `, args.requestId);
+        break;
+      }
+
+      // set bid status
+      switch (args.getStatusCode()) {
+        case GOOD:
+          bid.status = 'success';
+          delete bid.error; // it's possible for this to be set by a previous timeout
+          break;
+        case NO_BID:
+          bid.status = args.status === BID_REJECTED ? BID_REJECTED_IPF : 'no-bid';
+          delete bid.error;
+          break;
+        default:
+          bid.status = 'error';
+          bid.error = {
+            code: 'request-error'
+          };
+      }
+      bid.clientLatencyMillis = args.timeToRespond || Date.now() - cache.auctions[args.auctionId].auction.auctionStart;
+      bid.bidResponse = parseBidResponse(args, bid.bidResponse);
+
+      // if pbs gave us back a bidId, we need to use it and update our bidId to PBA
+      const pbsBidId = (args.pbsBidId == 0 ? generateUUID() : args.pbsBidId) || (args.seatBidId == 0 ? generateUUID() : args.seatBidId);
+      if (pbsBidId) {
+        bid.pbsBidId = pbsBidId;
+      }
+      break;
+    case BIDDER_DONE:
+      const serverError = deepAccess(args, 'serverErrors.0');
+      const serverResponseTimeMs = args.serverResponseTimeMs;
+      args.bids.forEach(bid => {
+        let cachedBid = deepAccess(cache, `auctions.${bid.auctionId}.auction.adUnits.${bid.transactionId}.bids.${bid.bidId}`);
+        if (typeof bid.serverResponseTimeMs !== 'undefined') {
+          cachedBid.serverLatencyMillis = bid.serverResponseTimeMs;
+        } else if (serverResponseTimeMs && bid.source === 's2s') {
+          cachedBid.serverLatencyMillis = serverResponseTimeMs;
+        }
+        // if PBS said we had an error, and this bid has not been processed by BID_RESPONSE YET
+        if (serverError && (!cachedBid.status || ['no-bid', 'error'].indexOf(cachedBid.status) !== -1)) {
+          cachedBid.status = 'error';
+          cachedBid.error = {
+            code: pbsErrorMap[serverError.code] || pbsErrorMap[999],
+            description: serverError.message
+          }
+        }
+
+        // set client latency if not done yet
+        if (!cachedBid.clientLatencyMillis) {
+          cachedBid.clientLatencyMillis = Date.now() - cache.auctions[args.auctionId].auction.auctionStart;
+        }
+      });
+      break;
+    case BID_WON:
+      // Allowing us to delay bidWon handling so it happens at right time
+      // we expect it to happen after gpt slotRenderEnded, but have seen it happen before when testing
+      // this will ensure it happens after if set
+      if (rubiConf.analyticsProcessDelay > 0) {
+        setTimeout(() => {
+          handleBidWon(args);
+        }, rubiConf.analyticsProcessDelay);
+      } else {
+        handleBidWon(args);
+      }
+      break;
+    case AUCTION_END:
+      let auctionCache = cache.auctions[args.auctionId];
+      // if for some reason the auction did not do its normal thing, this could be undefied so bail
+      if (!auctionCache) {
+        break;
+      }
+      // Set this auction as being done
+      auctionCache.auction.auctionEnd = args.auctionEnd;
+
+      // keeping order of auctions and if the payload has been sent or not
+      cache.auctionOrder.push(args.auctionId);
+
+      const isOnlyInstreamAuction = args.adUnits && args.adUnits.every(adUnit => adUnitIsOnlyInstream(adUnit));
+
+      // if we are not waiting OR it is instream only auction
+      if (isOnlyInstreamAuction || rubiConf.analyticsBatchTimeout === 0) {
+        sendAuctionEvent(args.auctionId, 'solo-auction');
+      } else {
+        // start timer to send batched payload just in case we don't hear any BID_WON events
+        cache.timeouts[args.auctionId] = setTimeout(() => {
+          sendAuctionEvent(args.auctionId, 'auctionEnd');
+        }, rubiConf.analyticsBatchTimeout);
+      }
+      break;
+    case BID_TIMEOUT:
+      args.forEach(badBid => {
+        let bid = deepAccess(cache, `auctions.${badBid.auctionId}.auction.adUnits.${badBid.transactionId}.bids.${badBid.bidId}`, {});
+        // might be set already by bidder-done, so do not overwrite
+        if (bid.status !== 'error') {
+          bid.status = 'error';
+          bid.error = {
+            code: 'timeout-error',
+            description: 'prebid.js timeout' // will help us diff if timeout was set by PBS or PBJS
+          };
+        }
+      });
+      break;
+    case BILLABLE_EVENT:
+      if (rubiConf.dmBilling.enabled && isBillingEventValid(args)) {
+        // add to the map indicating it has not been sent yet
+        deepSetValue(cache.billing, `${args.vendor}.${args.billingId}`, false);
+        const billingEvent = formatBillingEvent(args);
+        addEventToQueue({ billableEvents: [billingEvent] }, args.auctionId, 'billing');
+      } else {
+        logInfo(`${MODULE_NAME}: Billing event ignored`, args);
+      }
+      break;
+  }
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: magniteAdapter,
+  code: 'magnite',
+  gvlid: RUBICON_GVL_ID
+});
+
+export default magniteAdapter;
diff --git a/modules/magniteAnalyticsAdapter.md b/modules/magniteAnalyticsAdapter.md
new file mode 100644
index 00000000000..a9ad0f4345b
--- /dev/null
+++ b/modules/magniteAnalyticsAdapter.md
@@ -0,0 +1,18 @@
+# Magnite Analytics Adapter
+
+```
+Module Name:  Magnite Analytics Adapter
+Module Type:  Analytics Adapter
+Maintainer: demand-manager-support@magnite.com
+```
+
+## How to configure?
+```
+pbjs.enableAnalytics({
+    provider: 'magnite',
+    options: {
+        accountId: 12345, // The account id assigned to you by the Magnite Team
+        endpoint: 'http:localhost:9999/event' // Given by the Magnite Team
+    }
+});
+```
diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index 223385159a5..76043b71c64 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -62,15 +62,20 @@ const cache = {
 
 const BID_REJECTED_IPF = 'rejected-ipf';
 
-export let rubiConf = {
-  pvid: generateUUID().slice(0, 8),
-  analyticsEventDelay: 0,
-  dmBilling: {
-    enabled: false,
-    vendors: [],
-    waitForAuction: true
+export let rubiConf;
+export const resetRubiConf = () => {
+  rubiConf = {
+    pvid: generateUUID().slice(0, 8),
+    analyticsEventDelay: 0,
+    dmBilling: {
+      enabled: false,
+      vendors: [],
+      waitForAuction: true
+    }
   }
-};
+}
+resetRubiConf();
+
 // we are saving these as global to this module so that if a pub accidentally overwrites the entire
 // rubicon object, then we do not lose other data
 config.getConfig('rubicon', config => {
@@ -418,7 +423,7 @@ function getBidPrice(bid) {
   }
 }
 
-export function parseBidResponse(bid, previousBidResponse, auctionFloorData) {
+export function parseBidResponse(bid, previousBidResponse) {
   // The current bidResponse for this matching requestId/bidRequestId
   let responsePrice = getBidPrice(bid)
   // we need to compare it with the previous one (if there was one)
diff --git a/test/spec/modules/magniteAnalyticsAdapter_spec.js b/test/spec/modules/magniteAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..eb9ba190e33
--- /dev/null
+++ b/test/spec/modules/magniteAnalyticsAdapter_spec.js
@@ -0,0 +1,1942 @@
+import magniteAdapter, {
+  parseBidResponse,
+  getHostNameFromReferer,
+  storage,
+  rubiConf,
+} from '../../../modules/magniteAnalyticsAdapter.js';
+import CONSTANTS from 'src/constants.json';
+import { config } from 'src/config.js';
+import { server } from 'test/mocks/xhr.js';
+import * as mockGpt from '../integration/faker/googletag.js';
+import {
+  setConfig,
+  addBidResponseHook,
+} from 'modules/currency.js';
+import { getGlobal } from '../../../src/prebidGlobal.js';
+import { deepAccess } from '../../../src/utils.js';
+
+let events = require('src/events.js');
+let utils = require('src/utils.js');
+
+const {
+  EVENTS: {
+    AUCTION_INIT,
+    AUCTION_END,
+    BID_REQUESTED,
+    BID_RESPONSE,
+    BIDDER_DONE,
+    BID_WON,
+    BID_TIMEOUT,
+    BILLABLE_EVENT
+  }
+} = CONSTANTS;
+
+const STUBBED_UUID = '12345678-1234-1234-1234-123456789abc';
+
+// Mock Event Data
+const MOCK = {
+  AUCTION_INIT: {
+    'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+    'timestamp': 1658868383741,
+    'adUnits': [
+      {
+        'code': 'box',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                250
+              ]
+            ]
+          }
+        },
+        'bids': [
+          {
+            'bidder': 'rubicon',
+            'params': {
+              'accountId': 1001,
+              'siteId': 267318,
+              'zoneId': 1861698
+            }
+          }
+        ],
+        'sizes': [
+          [
+            300,
+            250
+          ]
+        ],
+        'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+        'ortb2Imp': {
+          'ext': {
+            'tid': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+            'data': {
+              'adserver': {
+                'name': 'gam',
+                'adslot': '/1234567/prebid-slot'
+              },
+              'pbadslot': '/1234567/prebid-slot'
+            },
+            'gpid': '/1234567/prebid-slot'
+          }
+        }
+      }
+    ],
+    'bidderRequests': [
+      {
+        'bidderCode': 'rubicon',
+        'bids': [
+          {
+            'bidder': 'rubicon',
+            'params': {
+              'accountId': 1001,
+              'siteId': 267318,
+              'zoneId': 1861698,
+            },
+            'adUnitCode': 'box',
+            'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+            'bidId': '23fcd8cf4bf0d7',
+            'src': 'client',
+            'startTime': 1658868383748
+          }
+        ],
+        'refererInfo': {
+          'page': 'http://a-test-domain.com:8000/test_pages/sanity/TEMP/prebidTest.html?pbjs_debug=true',
+        },
+      }
+    ],
+    'timeout': 3000,
+    'config': {
+      'accountId': 1001,
+      'endpoint': 'https://pba-event-service-alb-dev.use1.fanops.net/event'
+    }
+  },
+  BID_REQUESTED: {
+    'bidderCode': 'rubicon',
+    'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+    'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+    'bids': [
+      {
+        'bidder': 'rubicon',
+        'params': {
+          'accountId': 1001,
+          'siteId': 267318,
+          'zoneId': 1861698,
+        },
+        'adUnitCode': 'box',
+        'bidId': '23fcd8cf4bf0d7',
+        'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+        'src': 'client',
+      }
+    ]
+  },
+  BID_RESPONSE: {
+    'bidderCode': 'rubicon',
+    'width': 300,
+    'height': 250,
+    'adId': '3c0b59947ced11',
+    'requestId': '23fcd8cf4bf0d7',
+    'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+    'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+    'mediaType': 'banner',
+    'source': 'client',
+    'currency': 'USD',
+    'creativeId': '4954828',
+    'cpm': 3.4,
+    'ttl': 300,
+    'netRevenue': true,
+    'ad': '<html></html>',
+    'bidder': 'rubicon',
+    'adUnitCode': 'box',
+    'timeToRespond': 271,
+    'size': '300x250',
+    'status': 'rendered',
+    getStatusCode: () => 1,
+  },
+  AUCTION_END: {
+    'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+    'auctionEnd': 1658868384019,
+  },
+  BIDDER_DONE: {
+    'bidderCode': 'rubicon',
+    'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+    'bids': [
+      {
+        'bidder': 'rubicon',
+        'adUnitCode': 'box',
+        'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+        'bidId': '23fcd8cf4bf0d7',
+        'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+        'src': 'client',
+      }
+    ]
+  },
+  BID_WON: {
+    'bidderCode': 'rubicon',
+    'bidId': '23fcd8cf4bf0d7',
+    'adId': '3c0b59947ced11',
+    'requestId': '23fcd8cf4bf0d7',
+    'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+    'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+    'mediaType': 'banner',
+    'currency': 'USD',
+    'cpm': 3.4,
+    'ttl': 300,
+    'bidder': 'rubicon',
+    'adUnitCode': 'box',
+    'status': 'rendered',
+  }
+}
+
+const ANALYTICS_MESSAGE = {
+  'channel': 'web',
+  'integration': 'pbjs',
+  'referrerUri': 'http://a-test-domain.com:8000/test_pages/sanity/TEMP/prebidTest.html?pbjs_debug=true',
+  'version': '$prebid.version$',
+  'referrerHostname': 'a-test-domain.com',
+  'timestamps': {
+    'timeSincePageLoad': 500,
+    'eventTime': 1519767014281,
+    'prebidLoaded': magniteAdapter.MODULE_INITIALIZED_TIME
+  },
+  'wrapper': {
+    'name': '10000_fakewrapper_test'
+  },
+  'session': {
+    'id': '12345678-1234-1234-1234-123456789abc',
+    'pvid': '12345678',
+    'start': 1519767013781,
+    'expires': 1519788613781
+  },
+  'auctions': [
+    {
+      'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+      'auctionStart': 1658868383741,
+      'samplingFactor': 1,
+      'clientTimeoutMillis': 3000,
+      'accountId': 1001,
+      'bidderOrder': [
+        'rubicon'
+      ],
+      'serverTimeoutMillis': 1000,
+      'adUnits': [
+        {
+          'adUnitCode': 'box',
+          'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+          'mediaTypes': [
+            'banner'
+          ],
+          'dimensions': [
+            {
+              'width': 300,
+              'height': 250
+            }
+          ],
+          'pbAdSlot': '/1234567/prebid-slot',
+          'gpid': '/1234567/prebid-slot',
+          'bids': [
+            {
+              'bidder': 'rubicon',
+              'bidId': '23fcd8cf4bf0d7',
+              'source': 'client',
+              'status': 'success',
+              'clientLatencyMillis': 271,
+              'bidResponse': {
+                'bidPriceUSD': 3.4,
+                'mediaType': 'banner',
+                'dimensions': {
+                  'width': 300,
+                  'height': 250
+                }
+              }
+            }
+          ],
+          'accountId': 1001,
+          'siteId': 267318,
+          'zoneId': 1861698,
+          'status': 'success'
+        }
+      ],
+      'auctionEnd': 1658868384019
+    }
+  ],
+  'gamRenders': [
+    {
+      'adSlot': 'box',
+      'advertiserId': 1111,
+      'creativeId': 2222,
+      'lineItemId': 3333,
+      'auctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+      'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a'
+    }
+  ],
+  'bidsWon': [
+    {
+      'bidder': 'rubicon',
+      'bidId': '23fcd8cf4bf0d7',
+      'source': 'client',
+      'status': 'success',
+      'clientLatencyMillis': 271,
+      'bidResponse': {
+        'bidPriceUSD': 3.4,
+        'mediaType': 'banner',
+        'dimensions': {
+          'width': 300,
+          'height': 250
+        }
+      },
+      'sourceAuctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+      'renderAuctionId': '99785e47-a7c8-4c8a-ae05-ef1c717a4b4d',
+      'sourceTransactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+      'renderTransactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+      'transactionId': '7b10a106-89ea-4e19-bc51-9b2e970fc42a',
+      'accountId': 1001,
+      'siteId': 267318,
+      'zoneId': 1861698,
+      'mediaTypes': [
+        'banner'
+      ],
+      'adUnitCode': 'box'
+    }
+  ],
+  'trigger': 'gam-delayed'
+}
+
+describe('magnite analytics adapter', function () {
+  let sandbox;
+  let clock;
+  let getDataFromLocalStorageStub, setDataInLocalStorageStub, localStorageIsEnabledStub;
+  let gptSlot0;
+  let gptSlotRenderEnded0;
+  beforeEach(function () {
+    mockGpt.enable();
+    gptSlot0 = mockGpt.makeSlot({ code: 'box' });
+    gptSlotRenderEnded0 = {
+      eventName: 'slotRenderEnded',
+      params: {
+        slot: gptSlot0,
+        isEmpty: false,
+        advertiserId: 1111,
+        sourceAgnosticCreativeId: 2222,
+        sourceAgnosticLineItemId: 3333
+      }
+    };
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    setDataInLocalStorageStub = sinon.stub(storage, 'setDataInLocalStorage');
+    localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+    sandbox = sinon.sandbox.create();
+
+    localStorageIsEnabledStub.returns(true);
+
+    sandbox.stub(events, 'getEvents').returns([]);
+
+    sandbox.stub(utils, 'generateUUID').returns(STUBBED_UUID);
+
+    clock = sandbox.useFakeTimers(1519767013781);
+
+    magniteAdapter.referrerHostname = '';
+
+    config.setConfig({
+      s2sConfig: {
+        timeout: 1000,
+        accountId: 10000,
+      },
+      rubicon: {
+        wrapperName: '10000_fakewrapper_test'
+      }
+    })
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+    config.resetConfig();
+    mockGpt.enable();
+    getDataFromLocalStorageStub.restore();
+    setDataInLocalStorageStub.restore();
+    localStorageIsEnabledStub.restore();
+    magniteAdapter.disableAnalytics();
+  });
+
+  it('should require accountId', function () {
+    sandbox.stub(utils, 'logError');
+
+    magniteAdapter.enableAnalytics({
+      options: {
+        endpoint: '//localhost:9999/event'
+      }
+    });
+
+    expect(utils.logError.called).to.equal(true);
+  });
+
+  it('should require endpoint', function () {
+    sandbox.stub(utils, 'logError');
+
+    magniteAdapter.enableAnalytics({
+      options: {
+        accountId: 1001
+      }
+    });
+
+    expect(utils.logError.called).to.equal(true);
+  });
+
+  describe('config subscribe', function () {
+    it('should update the pvid if user asks', function () {
+      expect(utils.generateUUID.called).to.equal(false);
+      config.setConfig({ rubicon: { updatePageView: true } });
+      expect(utils.generateUUID.called).to.equal(true);
+    });
+    it('should merge in and preserve older set configs', function () {
+      config.setConfig({
+        rubicon: {
+          wrapperName: '1001_general',
+          int_type: 'dmpbjs',
+          fpkvs: {
+            source: 'fb'
+          },
+          updatePageView: true
+        }
+      });
+      expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 500,
+        analyticsBatchTimeout: 5000,
+        analyticsProcessDelay: 1,
+        dmBilling: {
+          enabled: false,
+          vendors: [],
+          waitForAuction: true
+        },
+        pvid: '12345678',
+        wrapperName: '1001_general',
+        int_type: 'dmpbjs',
+        fpkvs: {
+          source: 'fb'
+        },
+        updatePageView: true
+      });
+
+      // update it with stuff
+      config.setConfig({
+        rubicon: {
+          analyticsBatchTimeout: 3000,
+          fpkvs: {
+            link: 'email'
+          }
+        }
+      });
+      expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 500,
+        analyticsBatchTimeout: 3000,
+        analyticsProcessDelay: 1,
+        dmBilling: {
+          enabled: false,
+          vendors: [],
+          waitForAuction: true
+        },
+        pvid: '12345678',
+        wrapperName: '1001_general',
+        int_type: 'dmpbjs',
+        fpkvs: {
+          source: 'fb',
+          link: 'email'
+        },
+        updatePageView: true
+      });
+
+      // overwriting specific edge keys should update them
+      config.setConfig({
+        rubicon: {
+          fpkvs: {
+            link: 'iMessage',
+            source: 'twitter'
+          }
+        }
+      });
+      expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 500,
+        analyticsBatchTimeout: 3000,
+        analyticsProcessDelay: 1,
+        dmBilling: {
+          enabled: false,
+          vendors: [],
+          waitForAuction: true
+        },
+        pvid: '12345678',
+        wrapperName: '1001_general',
+        int_type: 'dmpbjs',
+        fpkvs: {
+          link: 'iMessage',
+          source: 'twitter'
+        },
+        updatePageView: true
+      });
+    });
+  });
+
+  describe('when handling events', function () {
+    function performStandardAuction({
+      gptEvents = [gptSlotRenderEnded0],
+      auctionId = MOCK.AUCTION_INIT.auctionId,
+      eventDelay = rubiConf.analyticsEventDelay,
+      sendBidWon = true
+    } = {}) {
+      events.emit(AUCTION_INIT, { ...MOCK.AUCTION_INIT, auctionId });
+      events.emit(BID_REQUESTED, { ...MOCK.BID_REQUESTED, auctionId });
+      events.emit(BID_RESPONSE, { ...MOCK.BID_RESPONSE, auctionId });
+      events.emit(BIDDER_DONE, { ...MOCK.BIDDER_DONE, auctionId });
+      events.emit(AUCTION_END, { ...MOCK.AUCTION_END, auctionId });
+
+      if (gptEvents && gptEvents.length) {
+        gptEvents.forEach(gptEvent => mockGpt.emitEvent(gptEvent.eventName, gptEvent.params));
+      }
+
+      if (sendBidWon) {
+        events.emit(BID_WON, { ...MOCK.BID_WON, auctionId });
+      }
+
+      if (eventDelay > 0) {
+        clock.tick(eventDelay);
+      }
+    }
+
+    beforeEach(function () {
+      magniteAdapter.enableAnalytics({
+        options: {
+          endpoint: '//localhost:9999/event',
+          accountId: 1001
+        }
+      });
+      config.setConfig({ rubicon: { updatePageView: true } });
+    });
+
+    it('should build a batched message from prebid events', function () {
+      performStandardAuction();
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+
+      expect(request.url).to.equal('//localhost:9999/event');
+
+      let message = JSON.parse(request.requestBody);
+
+      expect(message).to.deep.equal(ANALYTICS_MESSAGE);
+    });
+
+    it('should pass along bidderOrder correctly', function () {
+      const auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+
+      auctionInit.bidderRequests = auctionInit.bidderRequests.concat([
+        { bidderCode: 'pubmatic' },
+        { bidderCode: 'ix' },
+        { bidderCode: 'appnexus' }
+      ])
+
+      events.emit(AUCTION_INIT, auctionInit);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      clock.tick(rubiConf.analyticsBatchTimeout + 1000);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message.auctions[0].bidderOrder).to.deep.equal([
+        'rubicon',
+        'pubmatic',
+        'ix',
+        'appnexus'
+      ]);
+    });
+
+    it('should pass along user ids', function () {
+      let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+      auctionInit.bidderRequests[0].bids[0].userId = {
+        criteoId: 'sadfe4334',
+        lotamePanoramaId: 'asdf3gf4eg',
+        pubcid: 'dsfa4545-svgdfs5',
+        sharedId: { id1: 'asdf', id2: 'sadf4344' }
+      };
+
+      events.emit(AUCTION_INIT, auctionInit);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      clock.tick(rubiConf.analyticsBatchTimeout + 1000);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+
+      expect(message.auctions[0].user).to.deep.equal({
+        ids: [
+          { provider: 'criteoId', 'hasId': true },
+          { provider: 'lotamePanoramaId', 'hasId': true },
+          { provider: 'pubcid', 'hasId': true },
+          { provider: 'sharedId', 'hasId': true },
+        ]
+      });
+    });
+
+    // A-Domain tests
+    [
+      { input: ['magnite.com'], expected: ['magnite.com'] },
+      { input: ['magnite.com', 'prebid.org'], expected: ['magnite.com', 'prebid.org'] },
+      { input: [123, 'prebid.org', false, true, [], 'magnite.com', {}], expected: ['prebid.org', 'magnite.com'] },
+      { input: 'not array', expected: undefined },
+      { input: [], expected: undefined },
+    ].forEach((test, index) => {
+      it(`should handle adomain correctly - #${index + 1}`, function () {
+        events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+        let bidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+        bidResponse.meta = {
+          advertiserDomains: test.input
+        }
+
+        events.emit(BID_RESPONSE, bidResponse);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+        events.emit(BID_WON, MOCK.BID_WON);
+        clock.tick(rubiConf.analyticsBatchTimeout + 1000);
+
+        let message = JSON.parse(server.requests[0].requestBody);
+        expect(message.auctions[0].adUnits[0].bids[0].bidResponse.adomains).to.deep.equal(test.expected);
+      });
+    });
+
+    describe('with session handling', function () {
+      const expectedPvid = STUBBED_UUID.slice(0, 8);
+      beforeEach(function () {
+        config.setConfig({ rubicon: { updatePageView: true } });
+      });
+
+      it('should not log any session data if local storage is not enabled', function () {
+        localStorageIsEnabledStub.returns(false);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        delete expectedMessage.session;
+        delete expectedMessage.fpkvs;
+
+        performStandardAuction();
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+
+        expect(request.url).to.equal('//localhost:9999/event');
+
+        let message = JSON.parse(request.requestBody);
+
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should should pass along custom rubicon kv and pvid when defined', function () {
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              source: 'fb',
+              link: 'email'
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          { key: 'source', value: 'fb' },
+          { key: 'link', value: 'email' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should convert kvs to strings before sending', function () {
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              number: 24,
+              boolean: false,
+              string: 'hello',
+              array: ['one', 2, 'three'],
+              object: { one: 'two' }
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          { key: 'number', value: '24' },
+          { key: 'boolean', value: 'false' },
+          { key: 'string', value: 'hello' },
+          { key: 'array', value: 'one,2,three' },
+          { key: 'object', value: '[object Object]' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should use the query utm param rubicon kv value and pass updated kv and pvid when defined', function () {
+        sandbox.stub(utils, 'getWindowLocation').returns({ 'search': '?utm_source=other', 'pbjs_debug': 'true' });
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              source: 'fb',
+              link: 'email'
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          { key: 'source', value: 'other' },
+          { key: 'link', value: 'email' }
+        ]
+
+        message.fpkvs.sort((left, right) => left.key < right.key);
+        expectedMessage.fpkvs.sort((left, right) => left.key < right.key);
+
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should pick up existing localStorage and use its values', function () {
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519767017881, // 15 mins before "now"
+          expires: 1519767039481, // six hours later
+          lastSeen: 1519766113781,
+          fpkvs: { source: 'tw' }
+        };
+        getDataFromLocalStorageStub.withArgs('mgniSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              link: 'email' // should merge this with what is in the localStorage!
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session = {
+          id: '987654',
+          start: 1519767017881,
+          expires: 1519767039481,
+          pvid: expectedPvid
+        }
+        expectedMessage.fpkvs = [
+          { key: 'source', value: 'tw' },
+          { key: 'link', value: 'email' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: '987654', // should have stayed same
+          start: 1519767017881, // should have stayed same
+          expires: 1519767039481, // should have stayed same
+          lastSeen: 1519767013781, // lastSeen updated to our auction init time
+          fpkvs: { source: 'tw', link: 'email' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+
+      it('should overwrite matching localstorge value and use its remaining values', function () {
+        sandbox.stub(utils, 'getWindowLocation').returns({ 'search': '?utm_source=fb&utm_click=dog' });
+
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519766113781, // 15 mins before "now"
+          expires: 1519787713781, // six hours later
+          lastSeen: 1519766113781,
+          fpkvs: { source: 'tw', link: 'email' }
+        };
+        getDataFromLocalStorageStub.withArgs('mgniSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              link: 'email' // should merge this with what is in the localStorage!
+            }
+          }
+        });
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session = {
+          id: '987654',
+          start: 1519766113781,
+          expires: 1519787713781,
+          pvid: expectedPvid
+        }
+        expectedMessage.fpkvs = [
+          { key: 'source', value: 'fb' },
+          { key: 'link', value: 'email' },
+          { key: 'click', value: 'dog' }
+        ]
+
+        message.fpkvs.sort((left, right) => left.key < right.key);
+        expectedMessage.fpkvs.sort((left, right) => left.key < right.key);
+
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: '987654', // should have stayed same
+          start: 1519766113781, // should have stayed same
+          expires: 1519787713781, // should have stayed same
+          lastSeen: 1519767013781, // lastSeen updated to our auction init time
+          fpkvs: { source: 'fb', link: 'email', click: 'dog' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+
+      it('should throw out session if lastSeen > 30 mins ago and create new one', function () {
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519764313781, // 45 mins before "now"
+          expires: 1519785913781, // six hours later
+          lastSeen: 1519764313781, // 45 mins before "now"
+          fpkvs: { source: 'tw' }
+        };
+        getDataFromLocalStorageStub.withArgs('mgniSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              link: 'email' // should merge this with what is in the localStorage!
+            }
+          }
+        });
+
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        // session should match what is already in ANALYTICS_MESSAGE, just need to add pvid
+        expectedMessage.session.pvid = expectedPvid;
+
+        // the saved fpkvs should have been thrown out since session expired
+        expectedMessage.fpkvs = [
+          { key: 'link', value: 'email' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: STUBBED_UUID, // should have generated not used input
+          start: 1519767013781, // updated to whenever auction init started
+          expires: 1519788613781, // 6 hours after start
+          lastSeen: 1519767013781, // lastSeen updated to our "now"
+          fpkvs: { link: 'email' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+
+      it('should throw out session if past expires time and create new one', function () {
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519745353781, // 6 hours before "expires"
+          expires: 1519766953781, // little more than six hours ago
+          lastSeen: 1519767008781, // 5 seconds ago
+          fpkvs: { source: 'tw' }
+        };
+        getDataFromLocalStorageStub.withArgs('mgniSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({
+          rubicon: {
+            fpkvs: {
+              link: 'email' // should merge this with what is in the localStorage!
+            }
+          }
+        });
+
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        // session should match what is already in ANALYTICS_MESSAGE, just need to add pvid
+        expectedMessage.session.pvid = expectedPvid;
+
+        // the saved fpkvs should have been thrown out since session expired
+        expectedMessage.fpkvs = [
+          { key: 'link', value: 'email' }
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: STUBBED_UUID, // should have generated and not used same one
+          start: 1519767013781, // updated to whenever auction init started
+          expires: 1519788613781, // 6 hours after start
+          lastSeen: 1519767013781, // lastSeen updated to our "now"
+          fpkvs: { link: 'email' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+    });
+
+    it('should send gam data if adunit has elementid ortb2 fields', function () {
+      // update auction init mock to have the elementids in the adunit
+      // and change adUnitCode to be hashes
+      let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+      auctionInit.adUnits[0].ortb2Imp.ext.data.elementid = [gptSlot0.getSlotElementId()];
+      auctionInit.adUnits[0].code = '1a2b3c4d';
+
+      // bid request
+      let bidRequested = utils.deepClone(MOCK.BID_REQUESTED);
+      bidRequested.bids[0].adUnitCode = '1a2b3c4d';
+
+      // bid response
+      let bidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+      bidResponse.adUnitCode = '1a2b3c4d';
+
+      // bidder done
+      let bidderDone = utils.deepClone(MOCK.BIDDER_DONE);
+      bidderDone.bids[0].adUnitCode = '1a2b3c4d';
+
+      // bidder done
+      let bidWon = utils.deepClone(MOCK.BID_WON);
+      bidWon.adUnitCode = '1a2b3c4d';
+
+      // Run auction
+      events.emit(AUCTION_INIT, auctionInit);
+      events.emit(BID_REQUESTED, bidRequested);
+      events.emit(BID_RESPONSE, bidResponse);
+      events.emit(BIDDER_DONE, bidderDone);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      // emmit gpt events and bidWon
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+      events.emit(BID_WON, bidWon);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+      // new adUnitCodes in payload
+      expectedMessage.auctions[0].adUnits[0].adUnitCode = '1a2b3c4d';
+      expectedMessage.bidsWon[0].adUnitCode = '1a2b3c4d';
+      expect(message).to.deep.equal(expectedMessage);
+    });
+
+    it('should delay the event call depending on analyticsEventDelay config', function () {
+      config.setConfig({
+        rubicon: {
+          analyticsEventDelay: 2000
+        }
+      });
+      performStandardAuction({ eventDelay: 0 });
+
+      // Should not be sent until delay
+      expect(server.requests.length).to.equal(0);
+
+      // tick the clock and it should fire
+      clock.tick(2000);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+
+      // The timestamps should be changed from the default by (set eventDelay (2000) - eventDelay default (500))
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+      expectedMessage.timestamps.eventTime = expectedMessage.timestamps.eventTime + 1500;
+      expectedMessage.timestamps.timeSincePageLoad = expectedMessage.timestamps.timeSincePageLoad + 1500;
+
+      expect(message).to.deep.equal(expectedMessage);
+    });
+
+    ['seatBidId', 'pbsBidId'].forEach(pbsParam => {
+      it(`should overwrite prebid bidId with incoming PBS ${pbsParam}`, function () {
+        // bid response
+        let seatBidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+        seatBidResponse[pbsParam] = 'abc-123-do-re-me';
+
+        // Run auction
+        events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(BID_RESPONSE, seatBidResponse);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+        // emmit gpt events and bidWon
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+        events.emit(BID_WON, MOCK.BID_WON);
+
+        // tick the event delay time plus processing delay
+        clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+        // new adUnitCodes in payload
+        expectedMessage.auctions[0].adUnits[0].bids[0].bidId = 'abc-123-do-re-me';
+        expectedMessage.auctions[0].adUnits[0].bids[0].oldBidId = '23fcd8cf4bf0d7';
+        expectedMessage.bidsWon[0].bidId = 'abc-123-do-re-me';
+        expect(message).to.deep.equal(expectedMessage);
+      });
+    });
+
+    [0, '0'].forEach(pbsParam => {
+      it(`should generate new bidId if incoming pbsBidId is ${pbsParam}`, function () {
+        // bid response
+        let seatBidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+        seatBidResponse.pbsBidId = pbsParam;
+
+        // Run auction
+        events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(BID_RESPONSE, seatBidResponse);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+        // emmit gpt events and bidWon
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+        events.emit(BID_WON, MOCK.BID_WON);
+
+        // tick the event delay time plus processing delay
+        clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+        // new adUnitCodes in payload
+        expectedMessage.auctions[0].adUnits[0].bids[0].bidId = STUBBED_UUID;
+        expectedMessage.auctions[0].adUnits[0].bids[0].oldBidId = '23fcd8cf4bf0d7';
+        expectedMessage.bidsWon[0].bidId = STUBBED_UUID;
+        expect(message).to.deep.equal(expectedMessage);
+      });
+    });
+
+    it(`should pick highest cpm if more than one bidResponse comes in`, function () {
+      // Run auction
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      const bidResp = utils.deepClone(MOCK.BID_RESPONSE);
+
+      // emit some bid responses
+      [1.0, 5.5, 0.1].forEach(cpm => {
+        events.emit(BID_RESPONSE, { ...bidResp, cpm });
+      });
+
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      // emmit gpt events and bidWon
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+      events.emit(BID_WON, MOCK.BID_WON);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+      // highest cpm in payload
+      expectedMessage.auctions[0].adUnits[0].bids[0].bidResponse.bidPriceUSD = 5.5;
+      expectedMessage.bidsWon[0].bidResponse.bidPriceUSD = 5.5;
+      expect(message).to.deep.equal(expectedMessage);
+    });
+
+    it('should send bid won events by themselves if emitted after auction pba payload is sent', function () {
+      performStandardAuction({ sendBidWon: false });
+
+      // Now send bidWon
+      events.emit(BID_WON, MOCK.BID_WON);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      // should see two server requests
+      expect(server.requests.length).to.equal(2);
+
+      // first is normal analytics event without bidWon
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+      delete expectedMessage.bidsWon;
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message).to.deep.equal(expectedMessage);
+
+      // second is just a bidWon (remove gam and auction event)
+      message = JSON.parse(server.requests[1].requestBody);
+
+      let expectedMessage2 = utils.deepClone(ANALYTICS_MESSAGE);
+      delete expectedMessage2.auctions;
+      delete expectedMessage2.gamRenders;
+
+      // second event should be event delay time after first one
+      expectedMessage2.timestamps.eventTime = expectedMessage.timestamps.eventTime + rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay;
+      expectedMessage2.timestamps.timeSincePageLoad = expectedMessage.timestamps.timeSincePageLoad + rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay;
+
+      // trigger is `batched-bidsWon`
+      expectedMessage2.trigger = 'batched-bidsWon';
+
+      expect(message).to.deep.equal(expectedMessage2);
+    });
+
+    it('should send gamRender events by themselves if emitted after auction pba payload is sent', function () {
+      // dont send extra events and hit the batch timeout
+      performStandardAuction({ gptEvents: [], sendBidWon: false, eventDelay: rubiConf.analyticsBatchTimeout });
+
+      // Now send gptEvent and bidWon
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+      events.emit(BID_WON, MOCK.BID_WON);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      // should see two server requests
+      expect(server.requests.length).to.equal(2);
+
+      // first is normal analytics event without bidWon or gam
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+      delete expectedMessage.bidsWon;
+      delete expectedMessage.gamRenders;
+
+      // timing changes a bit -> timestamps should be batchTimeout - event delay later
+      const expectedExtraTime = rubiConf.analyticsBatchTimeout - rubiConf.analyticsEventDelay;
+      expectedMessage.timestamps.eventTime = expectedMessage.timestamps.eventTime + expectedExtraTime;
+      expectedMessage.timestamps.timeSincePageLoad = expectedMessage.timestamps.timeSincePageLoad + expectedExtraTime;
+
+      // since gam event did not fire, the trigger should be auctionEnd
+      expectedMessage.trigger = 'auctionEnd';
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message).to.deep.equal(expectedMessage);
+
+      // second is gam and bid won
+      message = JSON.parse(server.requests[1].requestBody);
+
+      let expectedMessage2 = utils.deepClone(ANALYTICS_MESSAGE);
+      // second event should be event delay time after first one
+      expectedMessage2.timestamps.eventTime = expectedMessage.timestamps.eventTime + rubiConf.analyticsEventDelay;
+      expectedMessage2.timestamps.timeSincePageLoad = expectedMessage.timestamps.timeSincePageLoad + rubiConf.analyticsEventDelay;
+      delete expectedMessage2.auctions;
+
+      // trigger should be `batched-bidsWon-gamRender`
+      expectedMessage2.trigger = 'batched-bidsWon-gamRenders';
+
+      expect(message).to.deep.equal(expectedMessage2);
+    });
+
+    it('should send all events solo if delay and batch set to 0', function () {
+      const defaultDelay = rubiConf.analyticsEventDelay;
+      config.setConfig({
+        rubicon: {
+          analyticsBatchTimeout: 0,
+          analyticsEventDelay: 0,
+          analyticsProcessDelay: 0
+        }
+      });
+
+      performStandardAuction({ eventDelay: 0 });
+
+      // should be 3 requests
+      expect(server.requests.length).to.equal(3);
+
+      // grab expected 3 requests from default message
+      let { auctions, gamRenders, bidsWon, ...rest } = utils.deepClone(ANALYTICS_MESSAGE);
+
+      // rest of payload should have timestamps changed to be - default eventDelay since we changed it to 0
+      rest.timestamps.eventTime = rest.timestamps.eventTime - defaultDelay;
+      rest.timestamps.timeSincePageLoad = rest.timestamps.timeSincePageLoad - defaultDelay;
+
+      // loop through and assert events fired in correct order with correct stuff
+      [
+        { expectedMessage: { auctions, ...rest }, trigger: 'solo-auction' },
+        { expectedMessage: { gamRenders, ...rest }, trigger: 'solo-gam' },
+        { expectedMessage: { bidsWon, ...rest }, trigger: 'solo-bidWon' },
+      ].forEach((stuff, requestNum) => {
+        let message = JSON.parse(server.requests[requestNum].requestBody);
+        stuff.expectedMessage.trigger = stuff.trigger;
+        expect(message).to.deep.equal(stuff.expectedMessage);
+      });
+    });
+
+    it(`should correctly mark bids as timed out`, function () {
+      // Run auction (simulate bidder timed out in 1000 ms)
+      const auctionStart = Date.now() - 1000;
+      events.emit(AUCTION_INIT, { ...MOCK.AUCTION_INIT, timestamp: auctionStart });
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // emit bid timeout
+      events.emit(BID_TIMEOUT, [
+        {
+          auctionId: MOCK.AUCTION_INIT.auctionId,
+          adUnitCode: MOCK.AUCTION_INIT.adUnits[0].code,
+          bidId: MOCK.BID_REQUESTED.bids[0].bidId,
+          transactionId: MOCK.AUCTION_INIT.adUnits[0].transactionId,
+        }
+      ]);
+
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      // emmit gpt events and bidWon
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+      // should see error time out bid
+      expectedMessage.auctions[0].adUnits[0].bids[0].status = 'error';
+      expectedMessage.auctions[0].adUnits[0].bids[0].error = {
+        code: 'timeout-error',
+        description: 'prebid.js timeout' // will help us diff if timeout was set by PBS or PBJS
+      };
+
+      // should not see bidResponse or bidsWon
+      delete expectedMessage.auctions[0].adUnits[0].bids[0].bidResponse;
+      delete expectedMessage.bidsWon;
+
+      // adunit should be marked as error
+      expectedMessage.auctions[0].adUnits[0].status = 'error';
+
+      // timed out in 1000 ms
+      expectedMessage.auctions[0].adUnits[0].bids[0].clientLatencyMillis = 1000;
+
+      expectedMessage.auctions[0].auctionStart = auctionStart;
+
+      expect(message).to.deep.equal(expectedMessage);
+    });
+
+    [
+      { name: 'aupname', adUnitPath: 'adUnits.0.ortb2Imp.ext.data.aupname', eventPath: 'auctions.0.adUnits.0.pattern', input: '1234/mycoolsite/*&gpt_leaderboard&deviceType=mobile' },
+      { name: 'gpid', adUnitPath: 'adUnits.0.ortb2Imp.ext.gpid', eventPath: 'auctions.0.adUnits.0.gpid', input: '1234/gpid/path' },
+      { name: 'pbadslot', adUnitPath: 'adUnits.0.ortb2Imp.ext.data.pbadslot', eventPath: 'auctions.0.adUnits.0.pbAdSlot', input: '1234/pbadslot/path' }
+    ].forEach(test => {
+      it(`should correctly pass ${test.name}`, function () {
+        // bid response
+        let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+        utils.deepSetValue(auctionInit, test.adUnitPath, test.input);
+
+        // Run auction
+        events.emit(AUCTION_INIT, auctionInit);
+        events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+        events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+        events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+        events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+        // emmit gpt events and bidWon
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+        events.emit(BID_WON, MOCK.BID_WON);
+
+        // tick the event delay time plus processing delay
+        clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+
+        // pattern in payload
+        expect(deepAccess(message, test.eventPath)).to.equal(test.input);
+      });
+    });
+
+    it('should pass bidderDetail for multibid auctions', function () {
+      let bidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+      bidResponse.targetingBidder = 'rubi2';
+      bidResponse.originalRequestId = bidResponse.requestId;
+      bidResponse.requestId = '1a2b3c4d5e6f7g8h9';
+
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_RESPONSE, bidResponse);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      // emmit gpt events and bidWon
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+      let bidWon = utils.deepClone(MOCK.BID_WON);
+      bidWon.bidId = bidWon.requestId = '1a2b3c4d5e6f7g8h9';
+      bidWon.bidderDetail = 'rubi2';
+      events.emit(BID_WON, bidWon);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      expect(server.requests.length).to.equal(1);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+      // expect an extra bid added
+      expectedMessage.auctions[0].adUnits[0].bids.push({
+        ...ANALYTICS_MESSAGE.auctions[0].adUnits[0].bids[0],
+        bidderDetail: 'rubi2',
+        bidId: '1a2b3c4d5e6f7g8h9'
+      });
+
+      // bid won is our extra bid
+      expectedMessage.bidsWon[0].bidderDetail = 'rubi2';
+      expectedMessage.bidsWon[0].bidId = '1a2b3c4d5e6f7g8h9';
+
+      expect(message).to.deep.equal(expectedMessage);
+    });
+
+    it('should pass bidderDetail for multibid auctions', function () {
+      // Set the rates
+      setConfig({
+        adServerCurrency: 'JPY',
+        rates: {
+          USD: {
+            JPY: 100
+          }
+        }
+      });
+
+      // set our bid response to JPY
+      let bidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+      bidResponse.currency = 'JPY';
+      bidResponse.cpm = 100;
+
+      // Now add the bidResponse hook which hooks on the currenct conversion function onto the bid response
+      let innerBid;
+      addBidResponseHook(function (adCodeId, bid) {
+        innerBid = bid;
+      }, 'elementId', bidResponse);
+
+      // Use the rubi analytics parseBidResponse Function to get the resulting cpm from the bid response!
+      const bidResponseObj = parseBidResponse(innerBid);
+      expect(bidResponseObj).to.have.property('bidPriceUSD');
+      expect(bidResponseObj.bidPriceUSD).to.equal(1.0);
+    });
+
+    it('should use the integration type provided in the config instead of the default', () => {
+      config.setConfig({
+        rubicon: {
+          int_type: 'testType'
+        }
+      })
+
+      performStandardAuction();
+
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.integration).to.equal('testType');
+    });
+
+    it('should correctly pass bid.source when is s2s', () => {
+      // Run auction
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+
+      const bidReq = utils.deepClone(MOCK.BID_REQUESTED);
+      bidReq.bids[0].src = 's2s';
+
+      events.emit(BID_REQUESTED, bidReq);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      // emmit gpt events and bidWon
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+      events.emit(BID_WON, MOCK.BID_WON);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+
+      expect(server.requests.length).to.equal(1);
+      let request = server.requests[0];
+      let message = JSON.parse(request.requestBody);
+      let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+
+      // bid source should be 'server'
+      expectedMessage.auctions[0].adUnits[0].bids[0].source = 'server';
+      expectedMessage.bidsWon[0].source = 'server';
+      expect(message).to.deep.equal(expectedMessage);
+    });
+
+    describe('when handling bid caching', () => {
+      let auctionInits, bidRequests, bidResponses, bidsWon;
+      beforeEach(function () {
+        // set timing stuff to 0 so we clearly know when things fire
+        config.setConfig({
+          useBidCache: true,
+          rubicon: {
+            analyticsEventDelay: 0,
+            analyticsBatchTimeout: 0,
+            analyticsProcessDelay: 0
+          }
+        });
+
+        // setup 3 auctions
+        auctionInits = [
+          { ...MOCK.AUCTION_INIT, auctionId: 'auctionId-1', adUnits: [{ ...MOCK.AUCTION_INIT.adUnits[0], transactionId: 'tid-1' }] },
+          { ...MOCK.AUCTION_INIT, auctionId: 'auctionId-2', adUnits: [{ ...MOCK.AUCTION_INIT.adUnits[0], transactionId: 'tid-2' }] },
+          { ...MOCK.AUCTION_INIT, auctionId: 'auctionId-3', adUnits: [{ ...MOCK.AUCTION_INIT.adUnits[0], transactionId: 'tid-3' }] }
+        ];
+        bidRequests = [
+          { ...MOCK.BID_REQUESTED, auctionId: 'auctionId-1', bids: [{ ...MOCK.BID_REQUESTED.bids[0], bidId: 'bidId-1', transactionId: 'tid-1' }] },
+          { ...MOCK.BID_REQUESTED, auctionId: 'auctionId-2', bids: [{ ...MOCK.BID_REQUESTED.bids[0], bidId: 'bidId-2', transactionId: 'tid-2' }] },
+          { ...MOCK.BID_REQUESTED, auctionId: 'auctionId-3', bids: [{ ...MOCK.BID_REQUESTED.bids[0], bidId: 'bidId-3', transactionId: 'tid-3' }] }
+        ];
+        bidResponses = [
+          { ...MOCK.BID_RESPONSE, auctionId: 'auctionId-1', transactionId: 'tid-1', requestId: 'bidId-1' },
+          { ...MOCK.BID_RESPONSE, auctionId: 'auctionId-2', transactionId: 'tid-2', requestId: 'bidId-2' },
+          { ...MOCK.BID_RESPONSE, auctionId: 'auctionId-3', transactionId: 'tid-3', requestId: 'bidId-3' },
+        ];
+        bidsWon = [
+          { ...MOCK.BID_WON, auctionId: 'auctionId-1', transactionId: 'tid-1', bidId: 'bidId-1', requestId: 'bidId-1' },
+          { ...MOCK.BID_WON, auctionId: 'auctionId-2', transactionId: 'tid-2', bidId: 'bidId-2', requestId: 'bidId-2' },
+          { ...MOCK.BID_WON, auctionId: 'auctionId-3', transactionId: 'tid-3', bidId: 'bidId-3', requestId: 'bidId-3' },
+        ];
+      });
+      function runBasicAuction(auctionNum) {
+        events.emit(AUCTION_INIT, auctionInits[auctionNum]);
+        events.emit(BID_REQUESTED, bidRequests[auctionNum]);
+        events.emit(BID_RESPONSE, bidResponses[auctionNum]);
+        events.emit(BIDDER_DONE, { ...MOCK.BIDDER_DONE, auctionId: auctionInits[auctionNum].auctionId });
+        events.emit(AUCTION_END, { ...MOCK.AUCTION_END, auctionId: auctionInits[auctionNum].auctionId });
+      }
+      it('should select earliest auction to attach to', () => {
+        // get 3 auctions pending to send events
+        runBasicAuction(0);
+        runBasicAuction(1);
+        runBasicAuction(2);
+
+        // emmit a gptEvent should attach to first auction
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+        // should be 4 requests so far (3 auctions + 1 gamRender)
+        expect(server.requests.length).to.equal(4);
+
+        // 4th should be gamRender and should have Auciton # 1's id's
+        const message = JSON.parse(server.requests[3].requestBody);
+        const expectedMessage = {
+          ...ANALYTICS_MESSAGE.gamRenders[0],
+          auctionId: 'auctionId-1',
+          transactionId: 'tid-1'
+        };
+        expect(message.gamRenders).to.deep.equal([expectedMessage]);
+
+        // emit bidWon from first auction
+        events.emit(BID_WON, bidsWon[0]);
+
+        // another request which is bidWon
+        expect(server.requests.length).to.equal(5);
+        const message1 = JSON.parse(server.requests[4].requestBody);
+        const expectedMessage1 = {
+          ...ANALYTICS_MESSAGE.bidsWon[0],
+          sourceAuctionId: 'auctionId-1',
+          renderAuctionId: 'auctionId-1',
+          sourceTransactionId: 'tid-1',
+          renderTransactionId: 'tid-1',
+          transactionId: 'tid-1',
+          bidId: 'bidId-1',
+        };
+        expect(message1.bidsWon).to.deep.equal([expectedMessage1]);
+      });
+
+      [
+        { useBidCache: true, expectedRenderId: 3 },
+        { useBidCache: false, expectedRenderId: 2 }
+      ].forEach(test => {
+        it(`should match bidWon to correct render auction if useBidCache is ${test.useBidCache}`, () => {
+          config.setConfig({ useBidCache: test.useBidCache });
+          // get 3 auctions pending to send events
+          runBasicAuction(0);
+          runBasicAuction(1);
+          runBasicAuction(2);
+
+          // emmit 3 gpt Events, first two "empty"
+          mockGpt.emitEvent(gptSlotRenderEnded0.eventName, {
+            slot: gptSlot0,
+            isEmpty: true,
+          });
+          mockGpt.emitEvent(gptSlotRenderEnded0.eventName, {
+            slot: gptSlot0,
+            isEmpty: true,
+          });
+          // last one is valid
+          mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+
+          // should be 6 requests so far (3 auctions + 3 gamRender)
+          expect(server.requests.length).to.equal(6);
+
+          // 4th should be gamRender and should have Auciton # 1's id's
+          const message = JSON.parse(server.requests[3].requestBody);
+          const expectedMessage = {
+            auctionId: 'auctionId-1',
+            transactionId: 'tid-1',
+            isSlotEmpty: true,
+            adSlot: 'box'
+          };
+          expect(message.gamRenders).to.deep.equal([expectedMessage]);
+
+          // 5th should be gamRender and should have Auciton # 2's id's
+          const message1 = JSON.parse(server.requests[4].requestBody);
+          const expectedMessage1 = {
+            auctionId: 'auctionId-2',
+            transactionId: 'tid-2',
+            isSlotEmpty: true,
+            adSlot: 'box'
+          };
+          expect(message1.gamRenders).to.deep.equal([expectedMessage1]);
+
+          // 6th should be gamRender and should have Auciton # 3's id's
+          const message2 = JSON.parse(server.requests[5].requestBody);
+          const expectedMessage2 = {
+            ...ANALYTICS_MESSAGE.gamRenders[0],
+            auctionId: 'auctionId-3',
+            transactionId: 'tid-3'
+          };
+          expect(message2.gamRenders).to.deep.equal([expectedMessage2]);
+
+          // emit bidWon from second auction
+          // it should pick out render information from 3rd auction and source from 1st
+          events.emit(BID_WON, bidsWon[1]);
+
+          // another request which is bidWon
+          expect(server.requests.length).to.equal(7);
+          const message3 = JSON.parse(server.requests[6].requestBody);
+          const expectedMessage3 = {
+            ...ANALYTICS_MESSAGE.bidsWon[0],
+            sourceAuctionId: 'auctionId-2',
+            renderAuctionId: `auctionId-${test.expectedRenderId}`,
+            sourceTransactionId: 'tid-2',
+            renderTransactionId: `tid-${test.expectedRenderId}`,
+            transactionId: 'tid-2',
+            bidId: 'bidId-2'
+          };
+          if (test.useBidCache) expectedMessage3.isCachedBid = true
+          expect(message3.bidsWon).to.deep.equal([expectedMessage3]);
+        });
+      });
+
+      it('should still fire bidWon if no gam match found', () => {
+        // get 3 auctions pending to send events
+        runBasicAuction(0);
+        runBasicAuction(1);
+        runBasicAuction(2);
+
+        // emit bidWon from 3rd auction - it should still fire even though no associated gamRender found
+        events.emit(BID_WON, bidsWon[2]);
+
+        // another request which is bidWon
+        expect(server.requests.length).to.equal(4);
+        const message1 = JSON.parse(server.requests[3].requestBody);
+        const expectedMessage1 = {
+          ...ANALYTICS_MESSAGE.bidsWon[0],
+          sourceAuctionId: 'auctionId-3',
+          renderAuctionId: 'auctionId-3',
+          sourceTransactionId: 'tid-3',
+          renderTransactionId: 'tid-3',
+          transactionId: 'tid-3',
+          bidId: 'bidId-3',
+        };
+        expect(message1.bidsWon).to.deep.equal([expectedMessage1]);
+      });
+    });
+  });
+
+  describe('billing events integration', () => {
+    beforeEach(function () {
+      magniteAdapter.enableAnalytics({
+        options: {
+          endpoint: '//localhost:9999/event',
+          accountId: 1001
+        }
+      });
+      // default dmBilling
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: false,
+            vendors: [],
+            waitForAuction: true
+          }
+        }
+      })
+    });
+    afterEach(function () {
+      magniteAdapter.disableAnalytics();
+    });
+    const basicBillingAuction = (billingEvents = []) => {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      billingEvents.forEach(ev => events.emit(BILLABLE_EVENT, ev));
+
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+      events.emit(BID_WON, MOCK.BID_WON);
+
+      // tick the event delay time plus processing delay
+      clock.tick(rubiConf.analyticsEventDelay + rubiConf.analyticsProcessDelay);
+    }
+    it('should ignore billing events when not enabled', () => {
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      }]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.billableEvents).to.be.undefined;
+    });
+    it('should ignore billing events when enabled but vendor is not whitelisted', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true
+          }
+        }
+      });
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      }]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.billableEvents).to.be.undefined;
+    });
+    it('should ignore billing events if billingId is not defined or billingId is not a string', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+      basicBillingAuction([
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+        },
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: true
+        },
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 1233434
+        },
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: null
+        }
+      ]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.billableEvents).to.be.undefined;
+    });
+    it('should pass along billing event in same payload if same auctionId', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'pageView',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965',
+        auctionId: MOCK.AUCTION_INIT.auctionId
+      }]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message).to.haveOwnProperty('auctions');
+      expect(message.billableEvents).to.deep.equal([{
+        accountId: 1001,
+        vendor: 'vendorName',
+        type: 'pageView',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965',
+        auctionId: MOCK.AUCTION_INIT.auctionId
+      }]);
+    });
+    it('should pass NOT pass along billing event in same payload if no auctionId', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965',
+      }]);
+      expect(server.requests.length).to.equal(2);
+
+      // first is the billing event
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message).to.not.haveOwnProperty('auctions');
+      expect(message.billableEvents).to.deep.equal([{
+        accountId: 1001,
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      }]);
+
+      // second is auctions
+      message = JSON.parse(server.requests[1].requestBody);
+      expect(message).to.haveOwnProperty('auctions');
+      expect(message).to.not.haveOwnProperty('billableEvents');
+    });
+    it('should pass along multiple billing events but filter out duplicates', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+      basicBillingAuction([
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965',
+          auctionId: MOCK.AUCTION_INIT.auctionId
+        },
+        {
+          vendor: 'vendorName',
+          type: 'impression',
+          billingId: '743db6e3-21f2-44d4-917f-cb3488c6076f',
+          auctionId: MOCK.AUCTION_INIT.auctionId
+        },
+        {
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965',
+          auctionId: MOCK.AUCTION_INIT.auctionId
+        }
+      ]);
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message).to.haveOwnProperty('auctions');
+      expect(message.billableEvents).to.deep.equal([
+        {
+          accountId: 1001,
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965',
+          auctionId: MOCK.AUCTION_INIT.auctionId
+        },
+        {
+          accountId: 1001,
+          vendor: 'vendorName',
+          type: 'impression',
+          billingId: '743db6e3-21f2-44d4-917f-cb3488c6076f',
+          auctionId: MOCK.AUCTION_INIT.auctionId
+        }
+      ]);
+    });
+    it('should pass along event right away if no pending auction', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          analyticsEventDelay: 0,
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName']
+          }
+        }
+      });
+
+      events.emit(BILLABLE_EVENT, {
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      });
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message).to.not.haveOwnProperty('auctions');
+      expect(message.billableEvents).to.deep.equal([
+        {
+          accountId: 1001,
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+        }
+      ]);
+    });
+    it('should pass along event right away if pending auction but not waiting', () => {
+      // off by default
+      config.setConfig({
+        rubicon: {
+          dmBilling: {
+            enabled: true,
+            vendors: ['vendorName'],
+            waitForAuction: false
+          }
+        }
+      });
+      // should fire right away, and then auction later
+      basicBillingAuction([{
+        vendor: 'vendorName',
+        type: 'auction',
+        billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+      }]);
+      expect(server.requests.length).to.equal(2);
+      const billingRequest = server.requests[0];
+      const billingMessage = JSON.parse(billingRequest.requestBody);
+      expect(billingMessage).to.not.haveOwnProperty('auctions');
+      expect(billingMessage.billableEvents).to.deep.equal([
+        {
+          accountId: 1001,
+          vendor: 'vendorName',
+          type: 'auction',
+          billingId: 'f8558d41-62de-4349-bc7b-2dbee1e69965'
+        }
+      ]);
+      // auction event after
+      const auctionRequest = server.requests[1];
+      const auctionMessage = JSON.parse(auctionRequest.requestBody);
+      // should not double pass events!
+      expect(auctionMessage).to.not.haveOwnProperty('billableEvents');
+    });
+  });
+
+  it('getHostNameFromReferer correctly grabs hostname from an input URL', function () {
+    let inputUrl = 'https://www.prebid.org/some/path?pbjs_debug=true';
+    expect(getHostNameFromReferer(inputUrl)).to.equal('www.prebid.org');
+    inputUrl = 'https://www.prebid.com/some/path?pbjs_debug=true';
+    expect(getHostNameFromReferer(inputUrl)).to.equal('www.prebid.com');
+    inputUrl = 'https://prebid.org/some/path?pbjs_debug=true';
+    expect(getHostNameFromReferer(inputUrl)).to.equal('prebid.org');
+    inputUrl = 'http://xn--p8j9a0d9c9a.xn--q9jyb4c/';
+    expect(typeof getHostNameFromReferer(inputUrl)).to.equal('string');
+
+    // not non-UTF char's in query / path which break if noDecodeWholeURL not set
+    inputUrl = 'https://prebid.org/search_results/%95x%8Em%92%CA/?category=000';
+    expect(getHostNameFromReferer(inputUrl)).to.equal('prebid.org');
+  });
+
+  describe(`handle currency conversions`, () => {
+    const origConvertCurrency = getGlobal().convertCurrency;
+    afterEach(() => {
+      if (origConvertCurrency != null) {
+        getGlobal().convertCurrency = origConvertCurrency;
+      } else {
+        delete getGlobal().convertCurrency;
+      }
+    });
+
+    it(`should convert successfully`, () => {
+      getGlobal().convertCurrency = () => 1.0;
+      const bidCopy = utils.deepClone(MOCK.BID_RESPONSE);
+      bidCopy.currency = 'JPY';
+      bidCopy.cpm = 100;
+
+      const bidResponseObj = parseBidResponse(bidCopy);
+      expect(bidResponseObj.conversionError).to.equal(undefined);
+      expect(bidResponseObj.ogCurrency).to.equal(undefined);
+      expect(bidResponseObj.ogPrice).to.equal(undefined);
+      expect(bidResponseObj.bidPriceUSD).to.equal(1.0);
+    });
+
+    it(`should catch error and set to zero with conversionError flag true`, () => {
+      getGlobal().convertCurrency = () => {
+        throw new Error('I am an error');
+      };
+      const bidCopy = utils.deepClone(MOCK.BID_RESPONSE);
+      bidCopy.currency = 'JPY';
+      bidCopy.cpm = 100;
+
+      const bidResponseObj = parseBidResponse(bidCopy);
+      expect(bidResponseObj.conversionError).to.equal(true);
+      expect(bidResponseObj.ogCurrency).to.equal('JPY');
+      expect(bidResponseObj.ogPrice).to.equal(100);
+      expect(bidResponseObj.bidPriceUSD).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index fdbb8235f5f..05b6cc6b6f4 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -4,6 +4,7 @@ import rubiconAnalyticsAdapter, {
   getHostNameFromReferer,
   storage,
   rubiConf,
+  resetRubiConf
 } from 'modules/rubiconAnalyticsAdapter.js';
 import CONSTANTS from 'src/constants.json';
 import { config } from 'src/config.js';
@@ -667,6 +668,7 @@ describe('rubicon analytics adapter', function () {
       expect(utils.generateUUID.called).to.equal(true);
     });
     it('should merge in and preserve older set configs', function () {
+      resetRubiConf();
       config.setConfig({
         rubicon: {
           wrapperName: '1001_general',
@@ -689,7 +691,6 @@ describe('rubicon analytics adapter', function () {
         fpkvs: {
           source: 'fb'
         },
-        updatePageView: true
       });
 
       // update it with stuff
@@ -714,7 +715,6 @@ describe('rubicon analytics adapter', function () {
           source: 'fb',
           link: 'email'
         },
-        updatePageView: true
       });
 
       // overwriting specific edge keys should update them
@@ -740,7 +740,6 @@ describe('rubicon analytics adapter', function () {
           link: 'iMessage',
           source: 'twitter'
         },
-        updatePageView: true
       });
     });
   });

From b9e060746d81688f41f3d67be081f384202f518b Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Wed, 12 Oct 2022 15:02:02 -0700
Subject: [PATCH 332/569] UserID: call gpt `setPublisherProvidedId` only when
 PPID is available (#9099)

---
 modules/userId/index.js          | 35 +++++++++++++++-----------
 test/spec/modules/userId_spec.js | 43 +++++++++++++++++++++++++++++---
 2 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/modules/userId/index.js b/modules/userId/index.js
index ca4a67019ec..73295011089 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -425,6 +425,7 @@ function processSubmoduleCallbacks(submodules, cb) {
         }
         // cache decoded value (this is copied to every adUnit bid)
         submodule.idObj = submodule.submodule.decode(idObj, submodule.config);
+        updatePPID(submodule.idObj);
       } else {
         logInfo(`${MODULE_NAME}: ${submodule.submodule.name} - request id responded with an empty value`);
       }
@@ -613,9 +614,9 @@ function idSystemInitializer({delay = GreedyPromise.timeout} = {}) {
 
 let initIdSystem;
 
-function getPPID() {
+function getPPID(eids = getUserIdsAsEids() || []) {
   // userSync.ppid should be one of the 'source' values in getUserIdsAsEids() eg pubcid.org or id5-sync.com
-  const matchingUserId = ppidSource && (getUserIdsAsEids() || []).find(userID => userID.source === ppidSource);
+  const matchingUserId = ppidSource && eids.find(userID => userID.source === ppidSource);
   if (matchingUserId && typeof deepAccess(matchingUserId, 'uids.0.id') === 'string') {
     const ppidValue = matchingUserId.uids[0].id.replace(/[\W_]/g, '');
     if (ppidValue.length >= 32 && ppidValue.length <= 150) {
@@ -642,18 +643,6 @@ export const requestBidsHook = timedAuctionHook('userId', function requestBidsHo
   ]).then(() => {
     // pass available user id data to bid adapters
     addIdDataToAdUnitBids(reqBidsConfigObj.adUnits || getGlobal().adUnits, initializedSubmodules);
-    const ppid = getPPID();
-    if (ppid) {
-      if (isGptPubadsDefined()) {
-        window.googletag.pubads().setPublisherProvidedId(ppid);
-      } else {
-        window.googletag = window.googletag || {};
-        window.googletag.cmd = window.googletag.cmd || [];
-        window.googletag.cmd.push(function() {
-          window.googletag.pubads().setPublisherProvidedId(ppid);
-        });
-      }
-    }
     uidMetrics().join(useMetrics(reqBidsConfigObj.metrics), {propagate: false, includeGroups: true});
     // calling fn allows prebid to continue processing
     fn.call(this, reqBidsConfigObj);
@@ -853,6 +842,24 @@ function populateSubmoduleId(submodule, consentData, storedConsentData, forceRef
       if (response.id) { submodule.idObj = submodule.submodule.decode(response.id, submodule.config); }
     }
   }
+  updatePPID(submodule.idObj);
+}
+
+function updatePPID(userIds = getUserIds()) {
+  if (userIds && ppidSource) {
+    const ppid = getPPID(createEidsArray(userIds));
+    if (ppid) {
+      if (isGptPubadsDefined()) {
+        window.googletag.pubads().setPublisherProvidedId(ppid);
+      } else {
+        window.googletag = window.googletag || {};
+        window.googletag.cmd = window.googletag.cmd || [];
+        window.googletag.cmd.push(function() {
+          window.googletag.pubads().setPublisherProvidedId(ppid);
+        });
+      }
+    }
+  }
 }
 
 function initSubmodules(dest, submodules, consentData, forceRefresh = false) {
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index e6058673d41..4e9be5417e2 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -405,6 +405,9 @@ describe('User ID', function () {
       init(config);
       setSubmoduleRegistry([amxIdSubmodule, sharedIdSystemSubmodule, identityLinkSubmodule, imuIdSubmodule]);
 
+      // before ppid should not be set
+      expect(window.googletag._ppid).to.equal(undefined);
+
       config.setConfig({
         userSync: {
           ppid: 'pubcid.org',
@@ -416,19 +419,52 @@ describe('User ID', function () {
           ]
         }
       });
-      // before ppid should not be set
-      expect(window.googletag._ppid).to.equal(undefined);
       return expectImmediateBidHook(() => {}, {adUnits}).then(() => {
         // ppid should have been set without dashes and stuff
         expect(window.googletag._ppid).to.equal('pubCommonidvaluepubCommonidvalue');
       });
     });
 
+    it('should set PPID when the source needs to call out to the network', () => {
+      let adUnits = [getAdUnitMock()];
+      init(config);
+      const callback = sinon.stub();
+      setSubmoduleRegistry([{
+        name: 'sharedId',
+        getId: function () {
+          return {callback}
+        },
+        decode(d) {
+          return d
+        }
+      }]);
+      config.setConfig({
+        userSync: {
+          ppid: 'pubcid.org',
+          auctionDelay: 10,
+          userIds: [
+            {
+              name: 'sharedId',
+            }
+          ]
+        }
+      });
+      return expectImmediateBidHook(() => {}, {adUnits}).then(() => {
+        expect(window.googletag._ppid).to.be.undefined;
+        const uid = 'thismustbelongerthan32characters'
+        callback.yield({pubcid: uid});
+        expect(window.googletag._ppid).to.equal(uid);
+      });
+    });
+
     it('should set googletag ppid correctly for imuIdSubmodule', function () {
       let adUnits = [getAdUnitMock()];
       init(config);
       setSubmoduleRegistry([imuIdSubmodule]);
 
+      // before ppid should not be set
+      expect(window.googletag._ppid).to.equal(undefined);
+
       config.setConfig({
         userSync: {
           ppid: 'ppid.intimatemerger.com',
@@ -437,8 +473,7 @@ describe('User ID', function () {
           ]
         }
       });
-      // before ppid should not be set
-      expect(window.googletag._ppid).to.equal(undefined);
+
       return expectImmediateBidHook(() => {}, {adUnits}).then(() => {
         // ppid should have been set without dashes and stuff
         expect(window.googletag._ppid).to.equal('imppidvalueimppidvalueimppidvalue');

From 0e8dcb395ca59c1d2a2c3170309cbae09ddb8741 Mon Sep 17 00:00:00 2001
From: vrtcal-dev <50931150+vrtcal-dev@users.noreply.github.com>
Date: Thu, 13 Oct 2022 09:22:44 -0500
Subject: [PATCH 333/569] Added support for 3rd party user IDs (#9105)

Co-authored-by: Ubuntu <ubuntu@ip-172-31-25-92.us-west-1.compute.internal>
---
 modules/vrtcalBidAdapter.js                |  8 +++++++-
 test/spec/modules/vrtcalBidAdapter_spec.js | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/modules/vrtcalBidAdapter.js b/modules/vrtcalBidAdapter.js
index 36276973c20..301d278493b 100644
--- a/modules/vrtcalBidAdapter.js
+++ b/modules/vrtcalBidAdapter.js
@@ -27,6 +27,11 @@ export const spec = {
       let ccpa = '';
       let coppa = 0;
       let tmax = 0;
+      let eids = [];
+
+      if (bidRequests[0].userIdAsEids && bidRequests[0].userIdAsEids.length > 0) {
+        eids = bidRequests[0].userIdAsEids;
+      }
 
       if (bid && bid.gdprConsent) {
         gdprApplies = bid.gdprConsent.gdprApplies ? 1 : 0;
@@ -74,7 +79,8 @@ export const spec = {
         },
         user: {
           ext: {
-            consent: gdprConsent
+            consent: gdprConsent,
+            eids: eids
           }
         }
       };
diff --git a/test/spec/modules/vrtcalBidAdapter_spec.js b/test/spec/modules/vrtcalBidAdapter_spec.js
index 2f9f1b96142..d911745d378 100644
--- a/test/spec/modules/vrtcalBidAdapter_spec.js
+++ b/test/spec/modules/vrtcalBidAdapter_spec.js
@@ -2,6 +2,7 @@ import { expect } from 'chai'
 import { spec } from 'modules/vrtcalBidAdapter'
 import { newBidder } from 'src/adapters/bidderFactory'
 import { config } from 'src/config.js';
+import { createEidsArray } from 'modules/userId/eids.js';
 
 describe('vrtcalBidAdapter', function () {
   const adapter = newBidder(spec)
@@ -27,6 +28,7 @@ describe('vrtcalBidAdapter', function () {
         'bidId': 'bidID0001',
         'bidderRequestId': 'br0001',
         'auctionId': 'auction0001',
+        'userIdAsEids': {}
       }
     ];
 
@@ -58,7 +60,7 @@ describe('vrtcalBidAdapter', function () {
       config.setConfig({ coppa: false });
 
       request = spec.buildRequests(bidRequests);
-      expect(request[0].data).to.match(/"user":{"ext":{"consent":"gdpr-consent-string"}}/);
+      expect(request[0].data).to.match(/"user":{"ext":{"consent":"gdpr-consent-string"/);
       expect(request[0].data).to.match(/"regs":{"coppa":0,"ext":{"gdpr":1,"us_privacy":"ccpa-consent-string"}}/);
     });
 
@@ -67,6 +69,15 @@ describe('vrtcalBidAdapter', function () {
       request = spec.buildRequests(bidRequests);
       expect(request[0].data).to.match(/"tmax":435/);
     });
+
+    it('pass 3rd party IDs with the request when present', function () {
+      bidRequests[0].userIdAsEids = createEidsArray({
+        tdid: 'TTD_ID_FROM_USER_ID_MODULE'
+      });
+
+      request = spec.buildRequests(bidRequests);
+      expect(request[0].data).to.include(JSON.stringify({ext: {consent: 'gdpr-consent-string', eids: [{source: 'adserver.org', uids: [{id: 'TTD_ID_FROM_USER_ID_MODULE', atype: 1, ext: {rtiPartner: 'TDID'}}]}]}}));
+    });
   });
 
   describe('interpretResponse', function () {

From eb00d839eb198c6155a26a3c415600c575c90102 Mon Sep 17 00:00:00 2001
From: radubarbos <raduiquest79@gmail.com>
Date: Thu, 13 Oct 2022 17:42:17 +0300
Subject: [PATCH 334/569] Yahoossp and Aol Bid Adapters:  Added epsilon.com
 user id source (#9096)

* Added epsilon.com user id source to yahoossp and aol bid adapters.

* Added epsilon.com user id source to yahoossp and aol bid adapters- unit test.

* Added epsilon.com user id source to yahoossp and aol bid adapters- unit test.

Co-authored-by: dumitrubarbos <dumitru-radu.barbos@yahooinc.com>
---
 modules/aolBidAdapter.js                     | 27 ++++++++++-
 modules/yahoosspBidAdapter.js                |  2 +-
 test/spec/modules/aolBidAdapter_spec.js      | 51 ++++++++++++++++----
 test/spec/modules/yahoosspBidAdapter_spec.js | 45 +++++++++++++++++
 4 files changed, 113 insertions(+), 12 deletions(-)

diff --git a/modules/aolBidAdapter.js b/modules/aolBidAdapter.js
index c9f64ab66b0..d38c373ff1f 100644
--- a/modules/aolBidAdapter.js
+++ b/modules/aolBidAdapter.js
@@ -31,15 +31,38 @@ const SYNC_TYPES = {
 };
 
 const SUPPORTED_USER_ID_SOURCES = [
+  'admixer.net',
   'adserver.org',
+  'adtelligent.com',
+  'akamai.com',
+  'amxrtb.com',
+  'audigent.com',
+  'britepool.com',
   'criteo.com',
+  'crwdcntrl.net',
+  'deepintent.com',
+  'epsilon.com',
+  'hcn.health',
   'id5-sync.com',
+  'idx.lat',
   'intentiq.com',
+  'intimatemerger.com',
   'liveintent.com',
+  'liveramp.com',
+  'mediawallahscript.com',
+  'merkleinc.com',
+  'netid.de',
+  'neustar.biz',
+  'nextroll.com',
+  'novatiq.com',
+  'parrable.com',
+  'pubcid.org',
   'quantcast.com',
+  'tapad.com',
+  'uidapi.com',
   'verizonmedia.com',
-  'liveramp.com',
-  'yahoo.com'
+  'yahoo.com',
+  'zeotap.com'
 ];
 
 const pubapiTemplate = template`${'host'}/pubapi/3.0/${'network'}/${'placement'}/${'pageid'}/${'sizeid'}/ADTECH;v=2;cmd=bid;cors=yes;alias=${'alias'};misc=${'misc'};${'dynamicParams'}`;
diff --git a/modules/yahoosspBidAdapter.js b/modules/yahoosspBidAdapter.js
index 51d9bd30b84..8f9ede4fccc 100644
--- a/modules/yahoosspBidAdapter.js
+++ b/modules/yahoosspBidAdapter.js
@@ -30,6 +30,7 @@ const SUPPORTED_USER_ID_SOURCES = [
   'criteo.com',
   'crwdcntrl.net',
   'deepintent.com',
+  'epsilon.com',
   'hcn.health',
   'id5-sync.com',
   'idx.lat',
@@ -46,7 +47,6 @@ const SUPPORTED_USER_ID_SOURCES = [
   'parrable.com',
   'pubcid.org',
   'quantcast.com',
-  'quantcast.com',
   'tapad.com',
   'uidapi.com',
   'verizonmedia.com',
diff --git a/test/spec/modules/aolBidAdapter_spec.js b/test/spec/modules/aolBidAdapter_spec.js
index 50622180ad0..57ce37145f4 100644
--- a/test/spec/modules/aolBidAdapter_spec.js
+++ b/test/spec/modules/aolBidAdapter_spec.js
@@ -81,20 +81,46 @@ describe('AolAdapter', function () {
   const ONE_DISPLAY_TTL = 60;
   const ONE_MOBILE_TTL = 3600;
   const SUPPORTED_USER_ID_SOURCES = {
-    'adserver.org': '100',
-    'criteo.com': '200',
-    'id5-sync.com': '300',
-    'intentiq.com': '400',
-    'liveintent.com': '500',
-    'quantcast.com': '600',
-    'verizonmedia.com': '700',
-    'liveramp.com': '800'
+    'admixer.net': '100',
+    'adserver.org': '200',
+    'adtelligent.com': '300',
+    'amxrtb.com': '500',
+    'audigent.com': '600',
+    'britepool.com': '700',
+    'criteo.com': '800',
+    'crwdcntrl.net': '900',
+    'deepintent.com': '1000',
+    'epsilon.com': '1100',
+    'hcn.health': '1200',
+    'id5-sync.com': '1300',
+    'idx.lat': '1400',
+    'intentiq.com': '1500',
+    'intimatemerger.com': '1600',
+    'liveintent.com': '1700',
+    'liveramp.com': '1800',
+    'mediawallahscript.com': '1900',
+    'netid.de': '2100',
+    'neustar.biz': '2200',
+    'pubcid.org': '2600',
+    'quantcast.com': '2700',
+    'tapad.com': '2800',
+    'zeotap.com': '3200'
   };
 
   const USER_ID_DATA = {
+    admixerId: SUPPORTED_USER_ID_SOURCES['admixer.net'],
+    adtelligentId: SUPPORTED_USER_ID_SOURCES['adtelligent.com'],
+    amxId: SUPPORTED_USER_ID_SOURCES['amxrtb.com'],
+    britepoolid: SUPPORTED_USER_ID_SOURCES['britepool.com'],
     criteoId: SUPPORTED_USER_ID_SOURCES['criteo.com'],
     connectid: SUPPORTED_USER_ID_SOURCES['verizonmedia.com'],
+    dmdId: SUPPORTED_USER_ID_SOURCES['hcn.health'],
+    hadronId: SUPPORTED_USER_ID_SOURCES['audigent.com'],
+    lotamePanoramaId: SUPPORTED_USER_ID_SOURCES['crwdcntrl.net'],
+    deepintentId: SUPPORTED_USER_ID_SOURCES['deepintent.com'],
+    fabrickId: SUPPORTED_USER_ID_SOURCES['neustar.biz'],
     idl_env: SUPPORTED_USER_ID_SOURCES['liveramp.com'],
+    IDP: SUPPORTED_USER_ID_SOURCES['zeotap.com'],
     lipb: {
       lipbid: SUPPORTED_USER_ID_SOURCES['liveintent.com'],
       segments: ['100', '200']
@@ -104,8 +130,15 @@ describe('AolAdapter', function () {
       uid: SUPPORTED_USER_ID_SOURCES['id5-sync.com'],
       ext: {foo: 'bar'}
     },
+    idx: SUPPORTED_USER_ID_SOURCES['idx.lat'],
+    imuid: SUPPORTED_USER_ID_SOURCES['intimatemerger.com'],
     intentIqId: SUPPORTED_USER_ID_SOURCES['intentiq.com'],
-    quantcastId: SUPPORTED_USER_ID_SOURCES['quantcast.com']
+    mwOpenLinkId: SUPPORTED_USER_ID_SOURCES['mediawallahscript.com'],
+    netId: SUPPORTED_USER_ID_SOURCES['netid.de'],
+    quantcastId: SUPPORTED_USER_ID_SOURCES['quantcast.com'],
+    publinkId: SUPPORTED_USER_ID_SOURCES['epsilon.com'],
+    pubcid: SUPPORTED_USER_ID_SOURCES['pubcid.org'],
+    tapadId: SUPPORTED_USER_ID_SOURCES['tapad.com']
   };
 
   function createCustomBidRequest({bids, params} = {}) {
diff --git a/test/spec/modules/yahoosspBidAdapter_spec.js b/test/spec/modules/yahoosspBidAdapter_spec.js
index e0b6390832b..32bc94b73fa 100644
--- a/test/spec/modules/yahoosspBidAdapter_spec.js
+++ b/test/spec/modules/yahoosspBidAdapter_spec.js
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import { config } from 'src/config.js';
 import { BANNER, VIDEO } from 'src/mediaTypes.js';
 import { spec } from 'modules/yahoosspBidAdapter.js';
+import {createEidsArray} from '../../../modules/userId/eids';
 
 const DEFAULT_BID_ID = '84ab500420319d';
 const DEFAULT_BID_DCN = '2093845709823475';
@@ -835,6 +836,50 @@ describe('YahooSSP Bid Adapter:', () => {
     });
   });
 
+  describe('User data', () => {
+    it('should set the allowed sources user eids', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      validBidRequests[0].userIdAsEids = createEidsArray({
+        admixerId: 'admixerId_FROM_USER_ID_MODULE',
+        adtelligentId: 'adtelligentId_FROM_USER_ID_MODULE',
+        amxId: 'amxId_FROM_USER_ID_MODULE',
+        britepoolid: 'britepoolid_FROM_USER_ID_MODULE',
+        deepintentId: 'deepintentId_FROM_USER_ID_MODULE',
+        publinkId: 'publinkId_FROM_USER_ID_MODULE',
+        intentIqId: 'intentIqId_FROM_USER_ID_MODULE',
+        idl_env: 'idl_env_FROM_USER_ID_MODULE',
+        imuid: 'imuid_FROM_USER_ID_MODULE',
+        criteoId: 'criteoId_FROM_USER_ID_MODULE',
+        fabrickId: 'fabrickId_FROM_USER_ID_MODULE',
+      });
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+
+      expect(data.user.ext.eids).to.deep.equal([
+        {source: 'admixer.net', uids: [{id: 'admixerId_FROM_USER_ID_MODULE', atype: 3}]},
+        {source: 'adtelligent.com', uids: [{id: 'adtelligentId_FROM_USER_ID_MODULE', atype: 3}]},
+        {source: 'amxrtb.com', uids: [{id: 'amxId_FROM_USER_ID_MODULE', atype: 1}]},
+        {source: 'britepool.com', uids: [{id: 'britepoolid_FROM_USER_ID_MODULE', atype: 3}]},
+        {source: 'deepintent.com', uids: [{id: 'deepintentId_FROM_USER_ID_MODULE', atype: 3}]},
+        {source: 'epsilon.com', uids: [{id: 'publinkId_FROM_USER_ID_MODULE', atype: 3}]},
+        {source: 'intentiq.com', uids: [{id: 'intentIqId_FROM_USER_ID_MODULE', atype: 1}]},
+        {source: 'liveramp.com', uids: [{id: 'idl_env_FROM_USER_ID_MODULE', atype: 3}]},
+        {source: 'intimatemerger.com', uids: [{id: 'imuid_FROM_USER_ID_MODULE', atype: 1}]},
+        {source: 'criteo.com', uids: [{id: 'criteoId_FROM_USER_ID_MODULE', atype: 1}]},
+        {source: 'neustar.biz', uids: [{id: 'fabrickId_FROM_USER_ID_MODULE', atype: 1}]}
+      ]);
+    });
+
+    it('should not set not allowed user eids sources', () => {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      validBidRequests[0].userIdAsEids = createEidsArray({
+        justId: 'justId_FROM_USER_ID_MODULE'
+      });
+      const data = spec.buildRequests(validBidRequests, bidderRequest).data;
+
+      expect(data.user.ext.eids).to.deep.equal([]);
+    });
+  });
+
   describe('Request Payload oRTB bid validation:', () => {
     it('should generate a valid openRTB bid-request object in the data field', () => {
       const { validBidRequests, bidderRequest } = generateBuildRequestMock({});

From 091fa06ea3c08fb9ad131a9d551a5720e9a7bfe3 Mon Sep 17 00:00:00 2001
From: github-tom-kuhnen <101572885+github-tom-kuhnen@users.noreply.github.com>
Date: Thu, 13 Oct 2022 17:15:06 +0200
Subject: [PATCH 335/569] New Teads User ID Module (#9048)

---
 modules/.submodules.json                |   1 +
 modules/teadsIdSystem.js                | 234 ++++++++++++++++++++
 modules/teadsIdSystem.md                |  22 ++
 test/spec/modules/teadsIdSystem_spec.js | 271 ++++++++++++++++++++++++
 4 files changed, 528 insertions(+)
 create mode 100644 modules/teadsIdSystem.js
 create mode 100644 modules/teadsIdSystem.md
 create mode 100644 test/spec/modules/teadsIdSystem_spec.js

diff --git a/modules/.submodules.json b/modules/.submodules.json
index d3665dd38f4..bd00333a1d9 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -36,6 +36,7 @@
       "quantcastIdSystem",
       "sharedIdSystem",
       "tapadIdSystem",
+      "teadsIdSystem",
       "tncIdSystem",
       "trustpidSystem",
       "uid2IdSystem",
diff --git a/modules/teadsIdSystem.js b/modules/teadsIdSystem.js
new file mode 100644
index 00000000000..20ca4dca460
--- /dev/null
+++ b/modules/teadsIdSystem.js
@@ -0,0 +1,234 @@
+/**
+ * This module adds TeadsId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/teadsIdSystem
+ * @requires module:modules/userId
+ */
+
+import {isStr, isNumber, logError, logInfo, isEmpty, timestamp} from '../src/utils.js'
+import {ajax} from '../src/ajax.js';
+import {submodule} from '../src/hook.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {uspDataHandler} from '../src/adapterManager.js';
+
+const MODULE_NAME = 'teadsId';
+const GVL_ID = 132;
+const FP_TEADS_ID_COOKIE_NAME = '_tfpvi';
+const EXPIRED_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:01 GMT';
+
+export const gdprStatus = {
+  GDPR_DOESNT_APPLY: 0,
+  CMP_NOT_FOUND_OR_ERROR: 22,
+  GDPR_APPLIES_PUBLISHER: 12,
+};
+
+export const gdprReason = {
+  GDPR_DOESNT_APPLY: 0,
+  CMP_NOT_FOUND: 220,
+  GDPR_APPLIES_PUBLISHER_CLASSIC: 120,
+};
+
+export const storage = getStorageManager({gvlid: GVL_ID, moduleName: MODULE_NAME});
+
+/** @type {Submodule} */
+export const teadsIdSubmodule = {
+  /**
+     * used to link submodule with config
+     * @type {string}
+     */
+  name: MODULE_NAME,
+  /**
+     * decode the stored id value for passing to bid requests
+     * @function
+     * @param {string} value
+     * @returns {{teadsId:string}}
+     */
+  decode(value) {
+    return {teadsId: value}
+  },
+  /**
+     * performs action to obtain id and return a value in the callback's response argument
+     * @function
+     * @param {SubmoduleConfig} [submoduleConfig]
+     * @param {ConsentData} [consentData]
+     * @returns {IdResponse|undefined}
+     */
+  getId(submoduleConfig, consentData) {
+    const resp = function (callback) {
+      const url = buildAnalyticsTagUrl(submoduleConfig, consentData);
+
+      const callbacks = {
+        success: (bodyResponse, responseObj) => {
+          if (responseObj && responseObj.status === 200) {
+            if (isStr(bodyResponse) && !isEmpty(bodyResponse)) {
+              const cookiesMaxAge = getTimestampFromDays(365); // 1 year
+              const expirationCookieDate = getCookieExpirationDate(cookiesMaxAge);
+              storage.setCookie(FP_TEADS_ID_COOKIE_NAME, bodyResponse, expirationCookieDate);
+              callback(bodyResponse);
+            } else {
+              storage.setCookie(FP_TEADS_ID_COOKIE_NAME, '', EXPIRED_COOKIE_DATE);
+              callback();
+            }
+          } else {
+            logInfo(`${MODULE_NAME}: Server error while fetching ID`);
+            callback();
+          }
+        },
+        error: error => {
+          logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
+          callback();
+        }
+      };
+
+      ajax(url, callbacks, undefined, {method: 'GET'});
+    };
+    return {callback: resp};
+  }
+};
+
+/**
+ * Build the full URL from the Submodule config & consentData
+ * @param submoduleConfig
+ * @param consentData
+ * @returns {string}
+ */
+export function buildAnalyticsTagUrl(submoduleConfig, consentData) {
+  const pubId = getPublisherId(submoduleConfig);
+  const teadsViewerId = getTeadsViewerId();
+  const status = getGdprStatus(consentData);
+  const gdprConsentString = getGdprConsentString(consentData);
+  const ccpaConsentString = getCcpaConsentString(uspDataHandler?.getConsentData());
+  const gdprReason = getGdprReasonFromStatus(status);
+  const params = {
+    analytics_tag_id: pubId,
+    tfpvi: teadsViewerId,
+    gdpr_consent: gdprConsentString,
+    gdpr_status: status,
+    gdpr_reason: gdprReason,
+    ccpa_consent: ccpaConsentString,
+    sv: 'prebid-v1',
+  };
+
+  const url = 'https://at.teads.tv/fpc';
+  const queryParams = new URLSearchParams();
+
+  for (const param in params) {
+    queryParams.append(param, params[param]);
+  }
+
+  return url + '?' + queryParams.toString();
+}
+
+/**
+ * Extract the Publisher ID from the Submodule config
+ * @returns {string}
+ * @param submoduleConfig
+ */
+export function getPublisherId(submoduleConfig) {
+  const pubId = submoduleConfig?.params?.pubId;
+  const prefix = 'PUB_';
+  if (isNumber(pubId)) {
+    return prefix + pubId.toString();
+  }
+  if (isStr(pubId) && parseInt(pubId)) {
+    return prefix + pubId;
+  }
+  return '';
+}
+
+/**
+ * Extract the GDPR status from the given consentData
+ * @param consentData
+ * @returns {number}
+ */
+export function getGdprStatus(consentData) {
+  const gdprApplies = consentData?.gdprApplies;
+  if (gdprApplies === true) {
+    return gdprStatus.GDPR_APPLIES_PUBLISHER;
+  } else if (gdprApplies === false) {
+    return gdprStatus.GDPR_DOESNT_APPLY;
+  } else {
+    return gdprStatus.CMP_NOT_FOUND_OR_ERROR;
+  }
+}
+
+/**
+ * Extract the GDPR consent string from the given consentData
+ * @param consentData
+ * @returns {string}
+ */
+export function getGdprConsentString(consentData) {
+  const consentString = consentData?.consentString;
+  if (isStr(consentString)) {
+    return consentString;
+  } else {
+    return '';
+  }
+}
+
+/**
+ * Map the GDPR reason from the given GDPR status
+ * @param status
+ * @returns {number}
+ */
+function getGdprReasonFromStatus(status) {
+  switch (status) {
+    case gdprStatus.GDPR_DOESNT_APPLY:
+      return gdprReason.GDPR_DOESNT_APPLY;
+    case gdprStatus.CMP_NOT_FOUND_OR_ERROR:
+      return gdprReason.CMP_NOT_FOUND;
+    case gdprStatus.GDPR_APPLIES_PUBLISHER:
+      return gdprReason.GDPR_APPLIES_PUBLISHER_CLASSIC;
+    default:
+      return -1;
+  }
+}
+
+/**
+ * Return the well formatted CCPA consent string
+ * @param ccpaConsentString
+ * @returns {string|*}
+ */
+export function getCcpaConsentString(ccpaConsentString) {
+  if (isStr(ccpaConsentString)) {
+    return ccpaConsentString;
+  } else {
+    return '';
+  }
+}
+
+/**
+ * Get the cookie expiration date string from a given Date and a max age
+ * @param {number} maxAge
+ * @returns {string}
+ */
+export function getCookieExpirationDate(maxAge) {
+  return new Date(timestamp() + maxAge).toUTCString()
+}
+
+/**
+ * Get cookie from Cookie or Local Storage
+ * @returns {string}
+ */
+function getTeadsViewerId() {
+  const teadsViewerId = readCookie()
+  if (isStr(teadsViewerId)) {
+    return teadsViewerId
+  } else {
+    return '';
+  }
+}
+
+function readCookie() {
+  return storage.cookiesAreEnabled(null) ? storage.getCookie(FP_TEADS_ID_COOKIE_NAME, null) : null;
+}
+
+/**
+ * Return a number of milliseconds from given days number
+ * @param days
+ * @returns {number}
+ */
+export function getTimestampFromDays(days) {
+  return days * 24 * 60 * 60 * 1000;
+}
+submodule('userId', teadsIdSubmodule);
diff --git a/modules/teadsIdSystem.md b/modules/teadsIdSystem.md
new file mode 100644
index 00000000000..b898ceaeacf
--- /dev/null
+++ b/modules/teadsIdSystem.md
@@ -0,0 +1,22 @@
+# Overview
+
+Module Name: Teads Id System
+Module Type: User Id System
+Maintainer: innov-ssp@teads.com
+
+# Description
+
+Teads user identification system. GDPR & CCPA compliant.
+
+## Example configuration for publishers:
+
+    pbjs.setConfig({
+        userSync: {
+            userIds: [{
+                name: 'teadsId',
+                params: {
+                    pubId: 1234
+                }
+            }]
+        }
+    });
diff --git a/test/spec/modules/teadsIdSystem_spec.js b/test/spec/modules/teadsIdSystem_spec.js
new file mode 100644
index 00000000000..7b977e2fb2b
--- /dev/null
+++ b/test/spec/modules/teadsIdSystem_spec.js
@@ -0,0 +1,271 @@
+import {
+  teadsIdSubmodule,
+  storage,
+  buildAnalyticsTagUrl,
+  getGdprStatus,
+  gdprStatus,
+  getPublisherId,
+  getGdprConsentString,
+  getCookieExpirationDate, getTimestampFromDays, getCcpaConsentString
+} from 'modules/teadsIdSystem.js';
+import {server} from 'test/mocks/xhr.js';
+import * as utils from '../../../src/utils.js';
+
+const FP_TEADS_ID_COOKIE_NAME = '_tfpvi';
+const teadsCookieIdSent = 'teadsCookieIdSent';
+const EXPIRED_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:01 GMT';
+
+describe('TeadsIdSystem', function () {
+  describe('buildAnalyticsTagUrl', function () {
+    it('return complete URL of server request', function () {
+      const submoduleConfig = {
+        params: {
+          pubId: 1234
+        }
+      };
+
+      const consentData = {
+        gdprApplies: true,
+        consentString: 'abc123=='
+      }
+
+      const result = buildAnalyticsTagUrl(submoduleConfig, consentData);
+      const expected = 'https://at.teads.tv/fpc?analytics_tag_id=PUB_1234&tfpvi=&gdpr_consent=abc123%3D%3D&gdpr_status=12&gdpr_reason=120&ccpa_consent=&sv=prebid-v1'
+      expect(result).to.be.equal(expected);
+    })
+  });
+
+  describe('getPublisherId', function () {
+    it('return empty string if params.pubId param is missing', function () {
+      const submoduleConfig = {};
+      const result = getPublisherId(submoduleConfig);
+      const expected = '';
+      expect(result).to.be.equal(expected);
+    });
+    it('return empty string if params.pubId param has a wrong value', function () {
+      const pubIdDifferentValues = [null, undefined, false, true, {}, [], 'abc123'];
+
+      pubIdDifferentValues.forEach((value) => {
+        const submoduleConfig = {
+          params: {
+            pubId: value
+          }
+        };
+        const result = getPublisherId(submoduleConfig);
+        const expected = '';
+        expect(result).to.be.equal(expected);
+      });
+    });
+    it('return a publisherId prefixed by PUB_ string if params.pubId has a good value', function () {
+      const pubIdDifferentValues = [1234, '1234'];
+
+      pubIdDifferentValues.forEach((value) => {
+        const submoduleConfig = {
+          params: {
+            pubId: value
+          }
+        };
+        const result = getPublisherId(submoduleConfig);
+        const expected = 'PUB_1234';
+        expect(result).to.be.equal(expected);
+      });
+    });
+  });
+
+  describe('getGdprConsentString', function () {
+    it('return empty consentString if no consentData given', function () {
+      const consentDataDifferentValues = [{}, undefined, null];
+
+      consentDataDifferentValues.forEach((value) => {
+        const result = getGdprConsentString(value);
+        const expected = '';
+        expect(result).to.be.equal(expected);
+      });
+    });
+    it('return empty consentString if consentString has a wrong format', function () {
+      const consentStringDifferentValues = [1, 0, undefined, null, {}];
+
+      consentStringDifferentValues.forEach((value) => {
+        const consentData = {
+          consentString: value
+        };
+        const result = getGdprConsentString(consentData);
+        const expected = '';
+        expect(result).to.be.equal(expected);
+      });
+    });
+    it('return a good consentString if present and a correct format', function () {
+      const consentData = {
+        consentString: 'consent-string-teads-O1'
+      };
+      const result = getGdprConsentString(consentData);
+      const expected = 'consent-string-teads-O1';
+      expect(result).to.be.equal(expected);
+    });
+  });
+
+  describe('getCcpaConsentString', function () {
+    it('return empty CCPA consentString if no CCPA data is available or a wrong format', function () {
+      const consentDataDifferentValues = [{}, undefined, null, 123];
+
+      consentDataDifferentValues.forEach((value) => {
+        const result = getCcpaConsentString(value);
+        const expected = '';
+        expect(result).to.be.equal(expected);
+      });
+    });
+    it('return CCPA consentString if CCPA data is available and a good format', function () {
+      const consentData = '1NYN';
+      const result = getCcpaConsentString(consentData);
+      const expected = '1NYN';
+      expect(result).to.be.equal(expected);
+    });
+  });
+
+  describe('getGdprStatus', function () {
+    it('return CMP_NOT_FOUND_OR_ERROR if no given consentData', function () {
+      const consentDataDifferentValues = [{}, undefined, null];
+
+      consentDataDifferentValues.forEach((value) => {
+        const result = getGdprStatus(value);
+        const expected = gdprStatus.CMP_NOT_FOUND_OR_ERROR;
+        expect(result).to.be.equal(expected);
+      });
+    });
+    it('return CMP_NOT_FOUND_OR_ERROR if gdprApplies param has a wrong format', function () {
+      const gdprAppliesDifferentValues = ['yes', 'true', 1, 0, undefined, null, {}];
+
+      gdprAppliesDifferentValues.forEach((value) => {
+        const consentData = {
+          gdprApplies: value
+        };
+        const result = getGdprStatus(consentData);
+        const expected = gdprStatus.CMP_NOT_FOUND_OR_ERROR;
+        expect(result).to.be.equal(expected);
+      });
+    });
+    it('return GDPR_DOESNT_APPLY if gdprApplies are false', function () {
+      const consentData = {
+        gdprApplies: false
+      };
+      const result = getGdprStatus(consentData);
+      const expected = gdprStatus.GDPR_DOESNT_APPLY;
+      expect(result).to.be.equal(expected);
+    });
+    it('return GDPR_APPLIES_PUBLISHER if gdprApplies are true', function () {
+      const consentData = {
+        gdprApplies: true
+      };
+      const result = getGdprStatus(consentData);
+      const expected = gdprStatus.GDPR_APPLIES_PUBLISHER;
+      expect(result).to.be.equal(expected);
+    })
+  });
+
+  describe('getExpirationDate', function () {
+    it('return Date Formatted if no given consentData', function () {
+      let timeStampStub;
+      timeStampStub = sinon.stub(utils, 'timestamp').returns(Date.UTC(2022, 8, 19, 14, 30, 50, 0));
+      const cookiesMaxAge = getTimestampFromDays(365);
+
+      const result = getCookieExpirationDate(cookiesMaxAge);
+      const expected = 'Tue, 19 Sep 2023 14:30:50 GMT';
+      expect(result).to.be.equal(expected);
+      timeStampStub.restore();
+    });
+  });
+
+  describe('getId', function () {
+    let setCookieStub, setLocalStorageStub, removeFromLocalStorageStub, logErrorStub, logInfoStub, timeStampStub;
+    const teadsUrl = 'https://at.teads.tv/fpc';
+    const timestampNow = new Date().getTime();
+
+    beforeEach(function () {
+      setCookieStub = sinon.stub(storage, 'setCookie');
+      timeStampStub = sinon.stub(utils, 'timestamp').returns(timestampNow);
+      logErrorStub = sinon.stub(utils, 'logError');
+      logInfoStub = sinon.stub(utils, 'logInfo');
+    });
+
+    afterEach(function () {
+      setCookieStub.restore();
+      timeStampStub.restore();
+      logErrorStub.restore();
+      logInfoStub.restore();
+    });
+
+    it('should log an error and continue to callback if request errors', function () {
+      const config = {
+        params: {}
+      };
+
+      const callbackSpy = sinon.spy();
+      const callback = teadsIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      expect(request.url).to.include(teadsUrl);
+      request.respond(503, null, 'Unavailable');
+      expect(logErrorStub.calledOnce).to.be.true;
+    });
+
+    it('should log an info and continue to callback if status 204 is sent', function () {
+      const config = {
+        params: {}
+      };
+
+      const callbackSpy = sinon.spy();
+      const callback = teadsIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      expect(request.url).to.include(teadsUrl);
+      request.respond(204, null, 'Unavailable');
+      expect(logInfoStub.calledOnce).to.be.true;
+    });
+
+    it('should call the callback with the response body if status 200 is sent', function () {
+      const config = {
+        params: {}
+      };
+
+      const callbackSpy = sinon.spy();
+      const callback = teadsIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      expect(request.url).to.include(teadsUrl);
+      request.respond(200, {'Content-Type': 'application/json'}, teadsCookieIdSent);
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal(teadsCookieIdSent);
+    });
+
+    it('should save teadsId in cookie and local storage if it was returned by API', function () {
+      const config = {
+        params: {}
+      };
+      const result = teadsIdSubmodule.getId(config, {});
+      result.callback((id) => {
+        expect(id).to.be.deep.equal(teadsCookieIdSent);
+      });
+
+      let request = server.requests[0];
+      request.respond(200, {'Content-Type': 'application/json'}, teadsCookieIdSent);
+
+      const cookiesMaxAge = getTimestampFromDays(365); // 1 year
+      const expirationCookieDate = getCookieExpirationDate(cookiesMaxAge);
+      expect(setCookieStub.calledWith(FP_TEADS_ID_COOKIE_NAME, teadsCookieIdSent, expirationCookieDate)).to.be.true;
+    });
+
+    it('should delete teadsId in cookie and local storage if it was not returned by API', function () {
+      const config = {
+        params: {}
+      };
+      const result = teadsIdSubmodule.getId(config, {});
+      result.callback((id) => {
+        expect(id).to.be.undefined
+      });
+
+      let request = server.requests[0];
+      request.respond(200, {'Content-Type': 'application/json'}, '');
+
+      expect(setCookieStub.calledWith(FP_TEADS_ID_COOKIE_NAME, '', EXPIRED_COOKIE_DATE)).to.be.true;
+    });
+  });
+});

From 3bf0535847c484a22fc7d428623d42d578b3796e Mon Sep 17 00:00:00 2001
From: Oleksandr <114110452+PolishchukPixFuture@users.noreply.github.com>
Date: Thu, 13 Oct 2022 12:32:47 -0400
Subject: [PATCH 336/569] PixFuture Bid Adapter: redisigned user sync (#9067)

* - Redisigned User Sync; - Added GVLID;

* Delete modules.json

* MD file cleanup

* MD file cleanup

* kick off cicrleci

Co-authored-by: Vitali Ioussoupov <84333122+pixfuture-media@users.noreply.github.com>
Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/pixfutureBidAdapter.js | 61 +++++++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 15 deletions(-)

diff --git a/modules/pixfutureBidAdapter.js b/modules/pixfutureBidAdapter.js
index 4c4935e93a4..41b1151e72a 100644
--- a/modules/pixfutureBidAdapter.js
+++ b/modules/pixfutureBidAdapter.js
@@ -1,8 +1,8 @@
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {getStorageManager} from '../src/storageManager.js';
-import {BANNER} from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
-import {find, includes} from '../src/polyfill.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import { find, includes } from '../src/polyfill.js';
 import {
   convertCamelToUnderscore,
   deepAccess,
@@ -13,14 +13,17 @@ import {
   isPlainObject,
   transformBidderParamKeywords
 } from '../src/utils.js';
-import {auctionManager} from '../src/auctionManager.js';
-import {hasPurpose1Consent} from '../src/utils/gpdr.js';
+import { auctionManager } from '../src/auctionManager.js';
 
 const SOURCE = 'pbjs';
 const storageManager = getStorageManager({bidderCode: 'pixfuture'});
 const USER_PARAMS = ['age', 'externalUid', 'segments', 'gender', 'dnt', 'language'];
+let pixID = '';
+const GVLID = 839;
+
 export const spec = {
   code: 'pixfuture',
+  gvlid: GVLID,
   hostname: 'https://gosrv.pixfuture.com',
 
   getHostname() {
@@ -41,6 +44,10 @@ export const spec = {
     const tags = validBidRequests.map(bidToTag);
     const hostname = this.getHostname();
     return validBidRequests.map((bidRequest) => {
+      if (bidRequest.params.pix_id) {
+        pixID = bidRequest.params.pix_id
+      }
+
       let referer = '';
       if (bidderRequest && bidderRequest.refererInfo) {
         referer = bidderRequest.refererInfo.page || '';
@@ -123,7 +130,7 @@ export const spec = {
       const ret = {
         url: `${hostname}/pixservices`,
         method: 'POST',
-        options: {withCredentials: false},
+        options: {withCredentials: true},
         data: {
           v: $$PREBID_GLOBAL$$.version,
           pageUrl: referer,
@@ -162,15 +169,39 @@ export const spec = {
 
     return bids;
   },
-  getUserSyncs: function (syncOptions, bid, gdprConsent) {
-    var pixid = '';
-    if (typeof bid[0] === 'undefined' || bid[0] === null) { pixid = '0'; } else { pixid = bid[0].body.pix_id; }
-    if (syncOptions.iframeEnabled && hasPurpose1Consent(gdprConsent)) {
-      return [{
+  getUserSyncs: function (syncOptions, bid, gdprConsent, uspConsent) {
+    const syncs = [];
+
+    let syncurl = 'pixid=' + pixID;
+    let gdpr = (gdprConsent && gdprConsent.gdprApplies) ? 1 : 0;
+    let consent = gdprConsent ? encodeURIComponent(gdprConsent.consentString || '') : '';
+
+    // Attaching GDPR Consent Params in UserSync url
+    syncurl += '&gdprconcent=' + gdpr + '&adsync=' + consent;
+
+    // CCPA
+    if (uspConsent) {
+      syncurl += '&us_privacy=' + encodeURIComponent(uspConsent);
+    }
+
+    // coppa compliance
+    if (config.getConfig('coppa') === true) {
+      syncurl += '&coppa=1';
+    }
+
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
         type: 'iframe',
-        url: 'https://gosrv.pixfuture.com/cookiesync?adsync=' + gdprConsent.consentString + '&pixid=' + pixid + '&gdprconcent=' + gdprConsent.gdprApplies
-      }];
+        url: 'https://gosrv.pixfuture.com/cookiesync?f=b&' + syncurl
+      });
+    } else {
+      syncs.push({
+        type: 'image',
+        url: 'https://gosrv.pixfuture.com/cookiesync?f=i&' + syncurl
+      });
     }
+
+    return syncs;
   }
 };
 

From 35549ae23d6af3f751e87865dc70ce8ee75e051a Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 13 Oct 2022 16:49:33 +0000
Subject: [PATCH 337/569] Prebid 7.20.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9a4b993de72..3e7fa29fa35 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.20.0-pre",
+  "version": "7.20.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 5fe3556a11e..1968e68c130 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.20.0-pre",
+  "version": "7.20.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 1ec822051546333fbb51e22d9b587c038c0e1689 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 13 Oct 2022 16:49:33 +0000
Subject: [PATCH 338/569] Increment version to 7.21.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3e7fa29fa35..a33d475f355 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.20.0",
+  "version": "7.21.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 1968e68c130..2310cb73311 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.20.0",
+  "version": "7.21.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From ec662d0fae2a31e4e39a9d2122d5dd9631466eac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 10:12:59 -0700
Subject: [PATCH 339/569] Bump minimist, gulp-clean and mocha (#9111)

Bumps [minimist](https://github.com/minimistjs/minimist) to 1.2.6 and updates ancestor dependencies [minimist](https://github.com/minimistjs/minimist), [gulp-clean](https://github.com/peter-vilja/gulp-clean) and [mocha](https://github.com/mochajs/mocha). These dependencies need to be updated together.


Updates `minimist` from 0.0.8 to 1.2.6
- [Release notes](https://github.com/minimistjs/minimist/releases)
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v0.0.8...v1.2.6)

Updates `gulp-clean` from 0.3.2 to 0.4.0
- [Release notes](https://github.com/peter-vilja/gulp-clean/releases)
- [Commits](https://github.com/peter-vilja/gulp-clean/compare/v0.3.2...v0.4.0)

Updates `mocha` from 5.2.0 to 10.0.0
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mochajs/mocha/compare/v5.2.0...v10.0.0)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
- dependency-name: gulp-clean
  dependency-type: direct:development
- dependency-name: mocha
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 1900 ++++++++++++++-------------------------------
 package.json      |    4 +-
 2 files changed, 604 insertions(+), 1300 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a33d475f355..2ae7f9f3931 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "7.19.0-pre",
+      "version": "7.21.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
@@ -55,7 +55,7 @@
         "faker": "^5.5.3",
         "fs.extra": "^1.3.2",
         "gulp": "^4.0.0",
-        "gulp-clean": "^0.3.2",
+        "gulp-clean": "^0.4.0",
         "gulp-concat": "^2.6.0",
         "gulp-connect": "^5.7.0",
         "gulp-eslint": "^6.0.0",
@@ -88,7 +88,7 @@
         "karma-spec-reporter": "^0.0.32",
         "karma-webpack": "^5.0.0",
         "lodash": "^4.17.21",
-        "mocha": "^5.0.0",
+        "mocha": "^10.0.0",
         "morgan": "^1.10.0",
         "opn": "^5.4.0",
         "resolve-from": "^5.0.0",
@@ -1673,18 +1673,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@eslint/eslintrc/node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -3052,15 +3040,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
     "node_modules/@wdio/mocha-framework/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -3216,18 +3195,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@wdio/mocha-framework/node_modules/yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -3734,6 +3701,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/ansi-cyan": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+      "integrity": "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -3761,6 +3740,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ansi-red": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+      "integrity": "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -3967,15 +3958,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -6039,12 +6021,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/commander": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-      "dev": true
-    },
     "node_modules/commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -6437,18 +6413,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
-      "dependencies": {
-        "array-find-index": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -8008,18 +7972,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/eslint/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -9347,15 +9299,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -9896,381 +9839,84 @@
       }
     },
     "node_modules/gulp-clean": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.3.2.tgz",
-      "integrity": "sha512-1pSOrC+PLKkEQz1HFl5L+TG0LV3/Tz/Y25lRk1IjTsE/agXWcqeeicBFJ1vDgokF+musc0vSBdm3xLXUU8cP1Q==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.4.0.tgz",
+      "integrity": "sha512-DARK8rNMo4lHOFLGTiHEJdf19GuoBDHqGUaypz+fOhrvOs3iFO7ntdYtdpNxv+AzSJBx/JfypF0yEj9ks1IStQ==",
       "dev": true,
       "dependencies": {
-        "gulp-util": "^2.2.14",
-        "rimraf": "^2.2.8",
-        "through2": "^0.4.2"
+        "fancy-log": "^1.3.2",
+        "plugin-error": "^0.1.2",
+        "rimraf": "^2.6.2",
+        "through2": "^2.0.3",
+        "vinyl": "^2.1.0"
       },
       "engines": {
         "node": ">=0.9"
       }
     },
-    "node_modules/gulp-clean/node_modules/ansi-regex": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-      "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/ansi-styles": {
+    "node_modules/gulp-clean/node_modules/arr-diff": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-      "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/chalk": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-      "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^1.1.0",
-        "escape-string-regexp": "^1.0.0",
-        "has-ansi": "^0.1.0",
-        "strip-ansi": "^0.3.0",
-        "supports-color": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/clone-stats": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-      "dev": true
-    },
-    "node_modules/gulp-clean/node_modules/dateformat": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-      "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-      "dev": true,
-      "dependencies": {
-        "get-stdin": "^4.0.1",
-        "meow": "^3.3.0"
-      },
-      "bin": {
-        "dateformat": "bin/cli.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/gulp-util": {
-      "version": "2.2.20",
-      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
-      "integrity": "sha512-9rtv4sj9EtCWYGD15HQQvWtRBtU9g1t0+w29tphetHxjxEAuBKQJkhGqvlLkHEtUjEgoqIpsVwPKU1yMZAa+wA==",
-      "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^0.5.0",
-        "dateformat": "^1.0.7-1.2.3",
-        "lodash._reinterpolate": "^2.4.1",
-        "lodash.template": "^2.4.1",
-        "minimist": "^0.2.0",
-        "multipipe": "^0.1.0",
-        "through2": "^0.5.0",
-        "vinyl": "^0.2.1"
-      },
-      "engines": {
-        "node": ">= 0.9"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/gulp-util/node_modules/through2": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-      "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.0.17",
-        "xtend": "~3.0.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/gulp-util/node_modules/xtend": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-      "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/has-ansi": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-      "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^0.2.0"
-      },
-      "bin": {
-        "has-ansi": "cli.js"
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-clean/node_modules/indent-string": {
+    "node_modules/gulp-clean/node_modules/arr-union": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
       "dev": true,
-      "dependencies": {
-        "repeating": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/gulp-clean/node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-clean/node_modules/lodash._reinterpolate": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
-      "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
-      "dev": true
-    },
-    "node_modules/gulp-clean/node_modules/lodash.defaults": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-      "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
-      "dev": true,
-      "dependencies": {
-        "lodash._objecttypes": "~2.4.1",
-        "lodash.keys": "~2.4.1"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/lodash.template": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
-      "integrity": "sha512-5yLOQwlS69xbaez3g9dA1i0GMAj8pLDHp8lhA4V7M1vRam1lqD76f0jg5EV+65frbqrXo1WH9ZfKalfYBzJ5yQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._escapestringchar": "~2.4.1",
-        "lodash._reinterpolate": "~2.4.1",
-        "lodash.defaults": "~2.4.1",
-        "lodash.escape": "~2.4.1",
-        "lodash.keys": "~2.4.1",
-        "lodash.templatesettings": "~2.4.1",
-        "lodash.values": "~2.4.1"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/lodash.templatesettings": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
-      "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "~2.4.1",
-        "lodash.escape": "~2.4.1"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
-      "dev": true,
-      "dependencies": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/meow/node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
-    },
-    "node_modules/gulp-clean/node_modules/minimist": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.1.tgz",
-      "integrity": "sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==",
-      "dev": true
-    },
-    "node_modules/gulp-clean/node_modules/object-keys": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-      "dev": true
-    },
-    "node_modules/gulp-clean/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+    "node_modules/gulp-clean/node_modules/array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
       "dev": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-clean/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+    "node_modules/gulp-clean/node_modules/extend-shallow": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
       "dev": true,
       "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "kind-of": "^1.1.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-clean/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/read-pkg": {
+    "node_modules/gulp-clean/node_modules/kind-of": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+      "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
       "dev": true,
-      "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-clean/node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+    "node_modules/gulp-clean/node_modules/plugin-error": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+      "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
       "dev": true,
       "dependencies": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
+        "ansi-cyan": "^0.1.1",
+        "ansi-red": "^0.1.1",
+        "arr-diff": "^1.0.1",
+        "arr-union": "^2.0.1",
+        "extend-shallow": "^1.1.2"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -10288,107 +9934,14 @@
         "rimraf": "bin.js"
       }
     },
-    "node_modules/gulp-clean/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/gulp-clean/node_modules/strip-ansi": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-      "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^0.2.1"
-      },
-      "bin": {
-        "strip-ansi": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "dependencies": {
-        "get-stdin": "^4.0.1"
-      },
-      "bin": {
-        "strip-indent": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/supports-color": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-      "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
-      "dev": true,
-      "bin": {
-        "supports-color": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/gulp-clean/node_modules/through2": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-      "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.0.17",
-        "xtend": "~2.1.1"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/vinyl": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
-      "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
-      "dev": true,
-      "dependencies": {
-        "clone-stats": "~0.0.1"
-      },
-      "engines": {
-        "node": ">= 0.9"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/xtend": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-      "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
       "dev": true,
       "dependencies": {
-        "object-keys": "~0.4.0"
-      },
-      "engines": {
-        "node": ">=0.4"
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
       }
     },
     "node_modules/gulp-cli": {
@@ -11253,18 +10806,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/gulp-eslint/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/gulp-eslint/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -12068,9 +11609,9 @@
       }
     },
     "node_modules/he": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true,
       "bin": {
         "he": "bin/he"
@@ -14478,51 +14019,18 @@
       "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
       "dev": true
     },
-    "node_modules/lodash._escapehtmlchar": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
-      "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=",
-      "dev": true,
-      "dependencies": {
-        "lodash._htmlescapes": "~2.4.1"
-      }
-    },
-    "node_modules/lodash._escapestringchar": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz",
-      "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=",
-      "dev": true
-    },
     "node_modules/lodash._getnative": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
       "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
       "dev": true
     },
-    "node_modules/lodash._htmlescapes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
-      "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=",
-      "dev": true
-    },
     "node_modules/lodash._isiterateecall": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
       "dev": true
     },
-    "node_modules/lodash._isnative": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-      "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=",
-      "dev": true
-    },
-    "node_modules/lodash._objecttypes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-      "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=",
-      "dev": true
-    },
     "node_modules/lodash._reescape": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
@@ -14541,31 +14049,12 @@
       "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
       "dev": true
     },
-    "node_modules/lodash._reunescapedhtml": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
-      "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=",
-      "dev": true,
-      "dependencies": {
-        "lodash._htmlescapes": "~2.4.1",
-        "lodash.keys": "~2.4.1"
-      }
-    },
     "node_modules/lodash._root": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
       "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
       "dev": true
     },
-    "node_modules/lodash._shimkeys": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-      "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
-      "dev": true,
-      "dependencies": {
-        "lodash._objecttypes": "~2.4.1"
-      }
-    },
     "node_modules/lodash.clone": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
@@ -14595,17 +14084,6 @@
       "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=",
       "dev": true
     },
-    "node_modules/lodash.escape": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
-      "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
-      "dev": true,
-      "dependencies": {
-        "lodash._escapehtmlchar": "~2.4.1",
-        "lodash._reunescapedhtml": "~2.4.1",
-        "lodash.keys": "~2.4.1"
-      }
-    },
     "node_modules/lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
@@ -14648,26 +14126,6 @@
       "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
       "dev": true
     },
-    "node_modules/lodash.keys": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-      "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-      "dev": true,
-      "dependencies": {
-        "lodash._isnative": "~2.4.1",
-        "lodash._shimkeys": "~2.4.1",
-        "lodash.isobject": "~2.4.1"
-      }
-    },
-    "node_modules/lodash.keys/node_modules/lodash.isobject": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-      "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
-      "dev": true,
-      "dependencies": {
-        "lodash._objecttypes": "~2.4.1"
-      }
-    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -14723,15 +14181,6 @@
       "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=",
       "dev": true
     },
-    "node_modules/lodash.values": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
-      "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
-      "dev": true,
-      "dependencies": {
-        "lodash.keys": "~2.4.1"
-      }
-    },
     "node_modules/lodash.zip": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
@@ -14822,19 +14271,6 @@
         "loose-envify": "cli.js"
       }
     },
-    "node_modules/loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
-      "dependencies": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/loupe": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
@@ -16145,122 +15581,316 @@
       "dev": true
     },
     "node_modules/mocha": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz",
+      "integrity": "sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==",
       "dev": true,
       "dependencies": {
+        "@ungap/promise-all-settled": "1.1.2",
+        "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
-        "commander": "2.15.1",
-        "debug": "3.1.0",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "glob": "7.1.2",
-        "growl": "1.10.5",
-        "he": "1.1.1",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "supports-color": "5.4.0"
+        "chokidar": "3.5.3",
+        "debug": "4.3.4",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.2.0",
+        "he": "1.2.0",
+        "js-yaml": "4.1.0",
+        "log-symbols": "4.1.0",
+        "minimatch": "5.0.1",
+        "ms": "2.1.3",
+        "nanoid": "3.3.3",
+        "serialize-javascript": "6.0.0",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "workerpool": "6.2.1",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
       },
       "bin": {
         "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
+        "mocha": "bin/mocha.js"
       },
       "engines": {
-        "node": ">= 4.0.0"
+        "node": ">= 14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
       }
     },
-    "node_modules/mocha/node_modules/debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+    "node_modules/mocha/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/mocha/node_modules/diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+    "node_modules/mocha/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
-        "node": ">=0.3.1"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/mocha/node_modules/glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+    "node_modules/mocha/node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=8"
       }
     },
-    "node_modules/mocha/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+    "node_modules/mocha/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/mocha/node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+    "node_modules/mocha/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": "*"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/mocha/node_modules/minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
+    "node_modules/mocha/node_modules/debug/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/mocha/node_modules/mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
-      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+    "node_modules/mocha/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
       "dependencies": {
-        "minimist": "0.0.8"
+        "argparse": "^2.0.1"
       },
       "bin": {
-        "mkdirp": "bin/cmd.js"
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/mocha/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/minimatch": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/mocha/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
-    "node_modules/mocha/node_modules/supports-color": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+    "node_modules/mocha/node_modules/nanoid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/mocha/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "yocto-queue": "^0.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/workerpool": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mocha/node_modules/yargs-parser": {
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/morgan": {
@@ -19988,6 +19618,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/suffix": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
@@ -21580,16 +21222,6 @@
         "he": "^1.2.0"
       }
     },
-    "node_modules/vue-template-compiler/node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "optional": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
     "node_modules/walk": {
       "version": "2.3.15",
       "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.15.tgz",
@@ -23576,12 +23208,6 @@
             "type-fest": "^0.20.2"
           }
         },
-        "strip-json-comments": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-          "dev": true
-        },
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -24742,12 +24368,6 @@
             "path-exists": "^4.0.0"
           }
         },
-        "he": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-          "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-          "dev": true
-        },
         "js-yaml": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -24853,12 +24473,6 @@
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
-        "strip-json-comments": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-          "dev": true
-        },
         "yargs": {
           "version": "16.2.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -25281,6 +24895,15 @@
       "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "dev": true
     },
+    "ansi-cyan": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+      "integrity": "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
     "ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -25299,6 +24922,15 @@
         "ansi-wrap": "0.1.0"
       }
     },
+    "ansi-red": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+      "integrity": "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==",
+      "dev": true,
+      "requires": {
+        "ansi-wrap": "0.1.0"
+      }
+    },
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -25459,12 +25091,6 @@
       "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
       "dev": true
     },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true
-    },
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -27095,12 +26721,6 @@
       "integrity": "sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==",
       "dev": true
     },
-    "commander": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-      "dev": true
-    },
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -27417,15 +27037,6 @@
       "integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
       "dev": true
     },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
-      "requires": {
-        "array-find-index": "^1.0.1"
-      }
-    },
     "custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -28476,12 +28087,6 @@
             "lru-cache": "^6.0.0"
           }
         },
-        "strip-json-comments": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-          "dev": true
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -29726,12 +29331,6 @@
       "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
       "dev": true
     },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
-    },
     "get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -30171,315 +29770,66 @@
       }
     },
     "gulp-clean": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.3.2.tgz",
-      "integrity": "sha512-1pSOrC+PLKkEQz1HFl5L+TG0LV3/Tz/Y25lRk1IjTsE/agXWcqeeicBFJ1vDgokF+musc0vSBdm3xLXUU8cP1Q==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.4.0.tgz",
+      "integrity": "sha512-DARK8rNMo4lHOFLGTiHEJdf19GuoBDHqGUaypz+fOhrvOs3iFO7ntdYtdpNxv+AzSJBx/JfypF0yEj9ks1IStQ==",
       "dev": true,
       "requires": {
-        "gulp-util": "^2.2.14",
-        "rimraf": "^2.2.8",
-        "through2": "^0.4.2"
+        "fancy-log": "^1.3.2",
+        "plugin-error": "^0.1.2",
+        "rimraf": "^2.6.2",
+        "through2": "^2.0.3",
+        "vinyl": "^2.1.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
-          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
-          "dev": true
-        },
-        "ansi-styles": {
+        "arr-diff": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
-          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-          "dev": true
-        },
-        "camelcase-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-          "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+          "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
           "dev": true,
           "requires": {
-            "camelcase": "^2.0.0",
-            "map-obj": "^1.0.0"
-          }
-        },
-        "chalk": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
-          "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^1.1.0",
-            "escape-string-regexp": "^1.0.0",
-            "has-ansi": "^0.1.0",
-            "strip-ansi": "^0.3.0",
-            "supports-color": "^0.2.0"
-          }
-        },
-        "clone-stats": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-          "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-          "dev": true
-        },
-        "dateformat": {
-          "version": "1.0.12",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-          "dev": true,
-          "requires": {
-            "get-stdin": "^4.0.1",
-            "meow": "^3.3.0"
-          }
-        },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "dev": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "arr-flatten": "^1.0.1",
+            "array-slice": "^0.2.3"
           }
         },
-        "gulp-util": {
-          "version": "2.2.20",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
-          "integrity": "sha512-9rtv4sj9EtCWYGD15HQQvWtRBtU9g1t0+w29tphetHxjxEAuBKQJkhGqvlLkHEtUjEgoqIpsVwPKU1yMZAa+wA==",
-          "dev": true,
-          "requires": {
-            "chalk": "^0.5.0",
-            "dateformat": "^1.0.7-1.2.3",
-            "lodash._reinterpolate": "^2.4.1",
-            "lodash.template": "^2.4.1",
-            "minimist": "^0.2.0",
-            "multipipe": "^0.1.0",
-            "through2": "^0.5.0",
-            "vinyl": "^0.2.1"
-          },
-          "dependencies": {
-            "through2": {
-              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-              "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-              "dev": true,
-              "requires": {
-                "readable-stream": "~1.0.17",
-                "xtend": "~3.0.0"
-              }
-            },
-            "xtend": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-              "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-              "dev": true
-            }
-          }
-        },
-        "has-ansi": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^0.2.0"
-          }
-        },
-        "indent-string": {
+        "arr-union": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-          "dev": true,
-          "requires": {
-            "repeating": "^2.0.0"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
-        "lodash._reinterpolate": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
-          "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
-          "dev": true
-        },
-        "lodash.defaults": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
-          "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
-          "dev": true,
-          "requires": {
-            "lodash._objecttypes": "~2.4.1",
-            "lodash.keys": "~2.4.1"
-          }
-        },
-        "lodash.template": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
-          "integrity": "sha512-5yLOQwlS69xbaez3g9dA1i0GMAj8pLDHp8lhA4V7M1vRam1lqD76f0jg5EV+65frbqrXo1WH9ZfKalfYBzJ5yQ==",
-          "dev": true,
-          "requires": {
-            "lodash._escapestringchar": "~2.4.1",
-            "lodash._reinterpolate": "~2.4.1",
-            "lodash.defaults": "~2.4.1",
-            "lodash.escape": "~2.4.1",
-            "lodash.keys": "~2.4.1",
-            "lodash.templatesettings": "~2.4.1",
-            "lodash.values": "~2.4.1"
-          }
-        },
-        "lodash.templatesettings": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
-          "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
-          "dev": true,
-          "requires": {
-            "lodash._reinterpolate": "~2.4.1",
-            "lodash.escape": "~2.4.1"
-          }
-        },
-        "map-obj": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+          "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
           "dev": true
         },
-        "meow": {
-          "version": "3.7.0",
-          "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-          "integrity": "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
-          "dev": true,
-          "requires": {
-            "camelcase-keys": "^2.0.0",
-            "decamelize": "^1.1.2",
-            "loud-rejection": "^1.0.0",
-            "map-obj": "^1.0.1",
-            "minimist": "^1.1.3",
-            "normalize-package-data": "^2.3.4",
-            "object-assign": "^4.0.1",
-            "read-pkg-up": "^1.0.1",
-            "redent": "^1.0.0",
-            "trim-newlines": "^1.0.0"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.6",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-              "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-              "dev": true
-            }
-          }
-        },
-        "minimist": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.1.tgz",
-          "integrity": "sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==",
-          "dev": true
-        },
-        "object-keys": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-          "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
+        "array-slice": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+          "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
           "dev": true
         },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+        "extend-shallow": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+          "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
           "dev": true,
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "kind-of": "^1.1.0"
           }
         },
-        "path-type": {
+        "kind-of": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
           "dev": true
         },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-          "dev": true,
-          "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "redent": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-          "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+        "plugin-error": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+          "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
           "dev": true,
           "requires": {
-            "indent-string": "^2.1.0",
-            "strip-indent": "^1.0.1"
+            "ansi-cyan": "^0.1.1",
+            "ansi-red": "^0.1.1",
+            "arr-diff": "^1.0.1",
+            "arr-union": "^2.0.1",
+            "extend-shallow": "^1.1.2"
           }
         },
         "rimraf": {
@@ -30491,77 +29841,14 @@
             "glob": "^7.1.3"
           }
         },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
-          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^0.2.1"
-          }
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
-        },
-        "strip-indent": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-          "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-          "dev": true,
-          "requires": {
-            "get-stdin": "^4.0.1"
-          }
-        },
-        "supports-color": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
-          "dev": true
-        },
         "through2": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-          "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.0.17",
-            "xtend": "~2.1.1"
-          }
-        },
-        "trim-newlines": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-          "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
-          "dev": true
-        },
-        "vinyl": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
-          "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
-          "dev": true,
-          "requires": {
-            "clone-stats": "~0.0.1"
-          }
-        },
-        "xtend": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "dev": true,
           "requires": {
-            "object-keys": "~0.4.0"
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
         }
       }
@@ -31265,12 +30552,6 @@
             "is-fullwidth-code-point": "^2.0.0"
           }
         },
-        "strip-json-comments": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-          "dev": true
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -31927,9 +31208,9 @@
       "dev": true
     },
     "he": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true
     },
     "highlight.js": {
@@ -33759,51 +33040,18 @@
       "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
       "dev": true
     },
-    "lodash._escapehtmlchar": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz",
-      "integrity": "sha1-32fDu2t+jh6DGrSL+geVuSr+iZ0=",
-      "dev": true,
-      "requires": {
-        "lodash._htmlescapes": "~2.4.1"
-      }
-    },
-    "lodash._escapestringchar": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz",
-      "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I=",
-      "dev": true
-    },
     "lodash._getnative": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
       "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
       "dev": true
     },
-    "lodash._htmlescapes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
-      "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=",
-      "dev": true
-    },
     "lodash._isiterateecall": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
       "dev": true
     },
-    "lodash._isnative": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
-      "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=",
-      "dev": true
-    },
-    "lodash._objecttypes": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
-      "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=",
-      "dev": true
-    },
     "lodash._reescape": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
@@ -33822,31 +33070,12 @@
       "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
       "dev": true
     },
-    "lodash._reunescapedhtml": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
-      "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=",
-      "dev": true,
-      "requires": {
-        "lodash._htmlescapes": "~2.4.1",
-        "lodash.keys": "~2.4.1"
-      }
-    },
     "lodash._root": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
       "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
       "dev": true
     },
-    "lodash._shimkeys": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz",
-      "integrity": "sha1-bpzJZm/wgfC1psl4uD4kLmlJ0gM=",
-      "dev": true,
-      "requires": {
-        "lodash._objecttypes": "~2.4.1"
-      }
-    },
     "lodash.clone": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
@@ -33876,17 +33105,6 @@
       "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=",
       "dev": true
     },
-    "lodash.escape": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
-      "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
-      "dev": true,
-      "requires": {
-        "lodash._escapehtmlchar": "~2.4.1",
-        "lodash._reunescapedhtml": "~2.4.1",
-        "lodash.keys": "~2.4.1"
-      }
-    },
     "lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
@@ -33929,28 +33147,6 @@
       "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
       "dev": true
     },
-    "lodash.keys": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
-      "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-      "dev": true,
-      "requires": {
-        "lodash._isnative": "~2.4.1",
-        "lodash._shimkeys": "~2.4.1",
-        "lodash.isobject": "~2.4.1"
-      },
-      "dependencies": {
-        "lodash.isobject": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
-          "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
-          "dev": true,
-          "requires": {
-            "lodash._objecttypes": "~2.4.1"
-          }
-        }
-      }
-    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -34006,15 +33202,6 @@
       "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=",
       "dev": true
     },
-    "lodash.values": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
-      "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
-      "dev": true,
-      "requires": {
-        "lodash.keys": "~2.4.1"
-      }
-    },
     "lodash.zip": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
@@ -34082,16 +33269,6 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
-      "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      }
-    },
     "loupe": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
@@ -35004,97 +34181,227 @@
       "dev": true
     },
     "mocha": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz",
+      "integrity": "sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==",
       "dev": true,
       "requires": {
+        "@ungap/promise-all-settled": "1.1.2",
+        "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
-        "commander": "2.15.1",
-        "debug": "3.1.0",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "glob": "7.1.2",
-        "growl": "1.10.5",
-        "he": "1.1.1",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "supports-color": "5.4.0"
+        "chokidar": "3.5.3",
+        "debug": "4.3.4",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.2.0",
+        "he": "1.2.0",
+        "js-yaml": "4.1.0",
+        "log-symbols": "4.1.0",
+        "minimatch": "5.0.1",
+        "ms": "2.1.3",
+        "nanoid": "3.3.3",
+        "serialize-javascript": "6.0.0",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "workerpool": "6.2.1",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "diff": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-          "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
           "dev": true
         },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "balanced-match": "^1.0.0"
           }
         },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
-            "brace-expansion": "^1.1.7"
+            "ms": "2.1.2"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.1.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+              "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+              "dev": true
+            }
           }
         },
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
           "dev": true
         },
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
           "dev": true,
           "requires": {
-            "minimist": "0.0.8"
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        },
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^5.0.0"
+          }
+        },
+        "log-symbols": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+          "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "is-unicode-supported": "^0.1.0"
+          }
+        },
+        "minimatch": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+          "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
           }
         },
         "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         },
-        "supports-color": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+        "nanoid": {
+          "version": "3.3.3",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+          "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^3.0.2"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "workerpool": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+          "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "16.2.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.0",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
           }
+        },
+        "yargs-parser": {
+          "version": "20.2.4",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+          "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+          "dev": true
         }
       }
     },
@@ -38032,6 +37339,12 @@
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
     "suffix": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
@@ -39279,15 +38592,6 @@
       "requires": {
         "de-indent": "^1.0.2",
         "he": "^1.2.0"
-      },
-      "dependencies": {
-        "he": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-          "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-          "dev": true,
-          "optional": true
-        }
       }
     },
     "walk": {
diff --git a/package.json b/package.json
index 2310cb73311..ed80a9c94a7 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "faker": "^5.5.3",
     "fs.extra": "^1.3.2",
     "gulp": "^4.0.0",
-    "gulp-clean": "^0.3.2",
+    "gulp-clean": "^0.4.0",
     "gulp-concat": "^2.6.0",
     "gulp-connect": "^5.7.0",
     "gulp-eslint": "^6.0.0",
@@ -97,7 +97,7 @@
     "karma-spec-reporter": "^0.0.32",
     "karma-webpack": "^5.0.0",
     "lodash": "^4.17.21",
-    "mocha": "^5.0.0",
+    "mocha": "^10.0.0",
     "morgan": "^1.10.0",
     "opn": "^5.4.0",
     "resolve-from": "^5.0.0",

From e7dd6dd46876bb48b5700d997e412ca5f900369d Mon Sep 17 00:00:00 2001
From: pm-nitin-shirsat <107102698+pm-nitin-shirsat@users.noreply.github.com>
Date: Fri, 14 Oct 2022 19:50:53 +0530
Subject: [PATCH 340/569] Pubmatic Bid Adapter: use new dealpriority in deal
 tier module execution (#9103)

* Implement functionality for deal priority

* Update test cases

* kick off test manually

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/pubmaticBidAdapter.js                | 30 ++++++++-
 test/spec/modules/pubmaticBidAdapter_spec.js | 65 ++++++++++++++++++--
 2 files changed, 87 insertions(+), 8 deletions(-)

diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index 7f346b1c7b0..02198042474 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -1,7 +1,7 @@
-import { logWarn, _each, isBoolean, isStr, isArray, inIframe, mergeDeep, deepAccess, isNumber, deepSetValue, logInfo, logError, deepClone, convertTypes, uniques } from '../src/utils.js';
+import { getBidRequest, logWarn, _each, isBoolean, isStr, isArray, inIframe, mergeDeep, deepAccess, isNumber, deepSetValue, logInfo, logError, deepClone, convertTypes, uniques } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO, NATIVE } from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
+import { BANNER, VIDEO, NATIVE, ADPOD } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
 import { bidderSettings } from '../src/bidderSettings.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
@@ -953,6 +953,29 @@ function _assignRenderer(newBid, request) {
   }
 }
 
+/**
+ * In case of adpod video context, assign prebiddealpriority to the dealtier property of adpod-video bid,
+ * so that adpod module can set the hb_pb_cat_dur targetting key.
+ * @param {*} newBid
+ * @param {*} bid
+ * @param {*} request
+ * @returns
+ */
+export function assignDealTier(newBid, bid, request) {
+  if (!bid?.ext?.prebiddealpriority) return;
+  const bidRequest = getBidRequest(newBid.requestId, [request.bidderRequest]);
+  const videoObj = deepAccess(bidRequest, 'mediaTypes.video');
+  if (videoObj?.context != ADPOD) return;
+
+  const duration = bid?.ext?.video?.duration || videoObj?.maxduration;
+  // if (!duration) return;
+  newBid.video = {
+    context: ADPOD,
+    durationSeconds: duration,
+    dealTier: bid.ext.prebiddealpriority
+  };
+}
+
 function isNonEmptyArray(test) {
   if (isArray(test) === true) {
     if (test.length > 0) {
@@ -1265,6 +1288,7 @@ export const spec = {
                         newBid.height = bid.hasOwnProperty('h') ? bid.h : req.video.h;
                         newBid.vastXml = bid.adm;
                         _assignRenderer(newBid, request);
+                        assignDealTier(newBid, bid, request);
                         break;
                       case NATIVE:
                         _parseNativeResponse(bid, newBid);
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
index 3f341fd259f..13b4e31b5c7 100644
--- a/test/spec/modules/pubmaticBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -1,7 +1,7 @@
-import {expect} from 'chai';
-import {spec, checkVideoPlacement, _getDomainFromURL} from 'modules/pubmaticBidAdapter.js';
+import { expect } from 'chai';
+import { spec, checkVideoPlacement, _getDomainFromURL, assignDealTier } from 'modules/pubmaticBidAdapter.js';
 import * as utils from 'src/utils.js';
-import {config} from 'src/config.js';
+import { config } from 'src/config.js';
 import { createEidsArray } from 'modules/userId/eids.js';
 import { bidderSettings } from 'src/bidderSettings.js';
 const constants = require('src/constants.json');
@@ -4063,9 +4063,64 @@ describe('PubMatic adapter', function () {
       expect(data.imp[0]['video']['h']).to.equal(videoBidRequests[0].mediaTypes.video.playerSize[1]);
       expect(data.imp[0]['video']['battr']).to.equal(undefined);
     });
+
+    describe('Assign Deal Tier (i.e. prebidDealPriority)', function () {
+      let videoSeatBid, request, newBid;
+      // let data = JSON.parse(request.data);
+      beforeEach(function () {
+        videoSeatBid = videoBidResponse.body.seatbid[0].bid[0];
+        // const adpodValidOutstreamBidRequest = validOutstreamBidRequest.bids[0].mediaTypes.video.context = 'adpod';
+        request = spec.buildRequests(bidRequests, validOutstreamBidRequest);
+        newBid = {
+          requestId: '47acc48ad47af5'
+        };
+        videoSeatBid.ext = videoSeatBid.ext || {};
+        videoSeatBid.ext.video = videoSeatBid.ext.video || {};
+        // videoBidRequests[0].mediaTypes.video = videoBidRequests[0].mediaTypes.video || {};
+      });
+
+      it('should not assign video object if deal priority is missing', function () {
+        assignDealTier(newBid, videoSeatBid, request);
+        expect(newBid.video).to.equal(undefined);
+        expect(newBid.video).to.not.exist;
+      });
+
+      it('should not assign video object if context is not a adpod', function () {
+        videoSeatBid.ext.prebiddealpriority = 5;
+        assignDealTier(newBid, videoSeatBid, request);
+        expect(newBid.video).to.equal(undefined);
+        expect(newBid.video).to.not.exist;
+      });
+
+      describe('when video deal tier object is present', function () {
+        beforeEach(function () {
+          videoSeatBid.ext.prebiddealpriority = 5;
+          request.bidderRequest.bids[0].mediaTypes.video = {
+            ...request.bidderRequest.bids[0].mediaTypes.video,
+            context: 'adpod',
+            maxduration: 50
+          };
+        });
+
+        it('should set video deal tier object, when maxduration is present in ext', function () {
+          assignDealTier(newBid, videoSeatBid, request);
+          expect(newBid.video.durationSeconds).to.equal(50);
+          expect(newBid.video.context).to.equal('adpod');
+          expect(newBid.video.dealTier).to.equal(5);
+        });
+
+        it('should set video deal tier object, when duration is present in ext', function () {
+          videoSeatBid.ext.video.duration = 20;
+          assignDealTier(newBid, videoSeatBid, request);
+          expect(newBid.video.durationSeconds).to.equal(20);
+          expect(newBid.video.context).to.equal('adpod');
+          expect(newBid.video.dealTier).to.equal(5);
+        });
+      });
+    });
   });
 
-  describe('Marketplace params', function() {
+  describe('Marketplace params', function () {
     let sandbox, utilsMock, newBidRequests, newBidResponses;
     beforeEach(() => {
       utilsMock = sinon.mock(utils);
@@ -4082,7 +4137,7 @@ describe('PubMatic adapter', function () {
       sandbox.restore();
     })
 
-    it('Should add bidder code as groupm for marketplace groupm response', function () {
+    it('Should add bidder code as groupm for marketplace groupm response ', function () {
       let request = spec.buildRequests(newBidRequests, {
         auctionId: 'new-auction-id'
       });

From 301a82f8c26c2e16c59689ccc2299b7a901f75b6 Mon Sep 17 00:00:00 2001
From: Carlos Felix <carlos.felix@33across.com>
Date: Fri, 14 Oct 2022 09:47:08 -0500
Subject: [PATCH 341/569] 33Across Bid Adapter: Add structured user agent
 information to RTB payload (#9112)

* Add UA high entropy values to the request

* 33x specs: use the right format for "sua" version values
---
 modules/33acrossBidAdapter.js                | 29 ++++++++-----
 test/spec/modules/33acrossBidAdapter_spec.js | 45 +++++++++++++++++++-
 2 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/modules/33acrossBidAdapter.js b/modules/33acrossBidAdapter.js
index 89c00897571..d9524a281f8 100644
--- a/modules/33acrossBidAdapter.js
+++ b/modules/33acrossBidAdapter.js
@@ -11,6 +11,7 @@ import {
   logWarn,
   getWindowSelf,
   mergeDeep,
+  pick
 } from '../src/utils.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
@@ -242,7 +243,8 @@ function _getMRAKey(bidRequest) {
 // Infer the necessary data from valid bid for a minimal ttxRequest and create HTTP request
 function _createServerRequest({ bidRequests, gdprConsent = {}, uspConsent, pageUrl, ttxSettings }) {
   const ttxRequest = {};
-  const { siteId, test } = bidRequests[0].params;
+  const firstBidRequest = bidRequests[0];
+  const { siteId, test } = firstBidRequest.params;
 
   /*
    * Infer data for the request payload
@@ -254,13 +256,13 @@ function _createServerRequest({ bidRequests, gdprConsent = {}, uspConsent, pageU
   });
 
   ttxRequest.site = { id: siteId };
-  ttxRequest.device = _buildDeviceORTB();
+  ttxRequest.device = _buildDeviceORTB(firstBidRequest.ortb2?.device);
 
   if (pageUrl) {
     ttxRequest.site.page = pageUrl;
   }
 
-  ttxRequest.id = bidRequests[0].auctionId;
+  ttxRequest.id = firstBidRequest.auctionId;
 
   if (gdprConsent.consentString) {
     ttxRequest.user = setExtensions(ttxRequest.user, {
@@ -268,9 +270,9 @@ function _createServerRequest({ bidRequests, gdprConsent = {}, uspConsent, pageU
     });
   }
 
-  if (Array.isArray(bidRequests[0].userIdAsEids) && bidRequests[0].userIdAsEids.length > 0) {
+  if (Array.isArray(firstBidRequest.userIdAsEids) && firstBidRequest.userIdAsEids.length > 0) {
     ttxRequest.user = setExtensions(ttxRequest.user, {
-      'eids': bidRequests[0].userIdAsEids
+      'eids': firstBidRequest.userIdAsEids
     });
   }
 
@@ -294,9 +296,9 @@ function _createServerRequest({ bidRequests, gdprConsent = {}, uspConsent, pageU
     }
   };
 
-  if (bidRequests[0].schain) {
+  if (firstBidRequest.schain) {
     ttxRequest.source = setExtensions(ttxRequest.source, {
-      'schain': bidRequests[0].schain
+      'schain': firstBidRequest.schain
     });
   }
 
@@ -739,10 +741,9 @@ function _createSync({ siteId = 'zzz000000000003zzz', gdprConsent = {}, uspConse
 }
 
 // BUILD REQUESTS: DEVICE
-function _buildDeviceORTB() {
+function _buildDeviceORTB(device = {}) {
   const win = getWindowSelf();
-
-  return {
+  const deviceProps = {
     ext: {
       ttx: {
         ...getScreenDimensions(),
@@ -752,7 +753,13 @@ function _buildDeviceORTB() {
         mtp: win.navigator.maxTouchPoints
       }
     }
-  };
+  }
+
+  if (device.sua) {
+    deviceProps.sua = pick(device.sua, [ 'browsers', 'platform', 'model' ]);
+  }
+
+  return deviceProps;
 }
 
 function getTopMostAccessibleWindow() {
diff --git a/test/spec/modules/33acrossBidAdapter_spec.js b/test/spec/modules/33acrossBidAdapter_spec.js
index 3657f7da912..2680544d00b 100644
--- a/test/spec/modules/33acrossBidAdapter_spec.js
+++ b/test/spec/modules/33acrossBidAdapter_spec.js
@@ -43,6 +43,17 @@ describe('33acrossBidAdapter:', function () {
             ah: 500,
             mtp: 0
           }
+        },
+        sua: {
+          browsers: [{
+            brand: 'Google Chrome',
+            version: ['104', '0', '5112', '79']
+          }],
+          platform: {
+            brand: 'macOS',
+            version: ['11', '6', '8']
+          },
+          model: ''
         }
       },
       id: 'r1',
@@ -305,7 +316,23 @@ describe('33acrossBidAdapter:', function () {
         adUnitCode: 'div-id',
         auctionId: 'r1',
         mediaTypes: {},
-        transactionId: 't1'
+        transactionId: 't1',
+        ortb2: {
+          device: {
+            sua: {
+              browsers: [{
+                brand: 'Google Chrome',
+                version: ['104', '0', '5112', '79']
+              }],
+              platform: {
+                brand: 'macOS',
+                version: ['11', '6', '8']
+              },
+              model: '',
+              mobile: false
+            }
+          }
+        }
       }
     ];
 
@@ -322,6 +349,22 @@ describe('33acrossBidAdapter:', function () {
         auctionId: 'r1',
         mediaTypes: {},
         transactionId: 't2',
+        ortb2: {
+          device: {
+            sua: {
+              browsers: [{
+                brand: 'Google Chrome',
+                version: ['104', '0', '5112', '79']
+              }],
+              platform: {
+                brand: 'macOS',
+                version: ['11', '6', '8']
+              },
+              model: '',
+              mobile: false
+            }
+          }
+        },
         ...bidParams
       });
 

From 9aa8e61e1862de600647af061dec7d3b4660b525 Mon Sep 17 00:00:00 2001
From: guiann <guillaume.andouard@adyoulike.com>
Date: Fri, 14 Oct 2022 17:11:52 +0200
Subject: [PATCH 342/569] AdYouLike Bid Adapter : fix page and ref Url values
 (#9109)

* add required clickurl in every native adrequest

* allows the native response to be given as is to prebid if possible

* add unit tests on new Native case

* Handle meta object in bid response with default addomains array

* fix icon retrieval in Native case

* Update priorities in case of multiple mediatypes given

* improve robustness and fix associated unit test on picture urls

* add support for params.size parameter

* add unit test on new size format

* Makes sure the playerSize format is consistent

* enable Vast response on bidder adapter

* fix lint errors

* add test on Vast format case

* add userId to bidrequest

* revert package-lock.json changes

* improve multiple mediatype handling

* Expose adyoulike GVL id

* fix icurl issue when retreiving icon for Native mediatype

* update unit tests on icon url in native mediatype

* target video endpoint when video mediatype is present

* add unit test on video endpoint

* detect if bid request has video

* remove console log

* Add size information in Video bid + unit tests

* Remove unused method (old video retrieval)

* update pagereferrer and pageUrl values

* improve null robustness in native getAssetValue

* change function body and add unit test

* fix pageUrl in case not given i ortb2

* adjust pageUrl and referrer values

* add unit tests on new priority behaviour

Co-authored-by: GuillaumeA <guillaume.andouard@openweb.com>
---
 modules/adyoulikeBidAdapter.js                | 18 ++++++++++++------
 test/spec/modules/adyoulikeBidAdapter_spec.js |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/adyoulikeBidAdapter.js b/modules/adyoulikeBidAdapter.js
index b0b132abd1c..f7473b3bad4 100644
--- a/modules/adyoulikeBidAdapter.js
+++ b/modules/adyoulikeBidAdapter.js
@@ -227,17 +227,23 @@ function createEndpointQS(bidderRequest) {
   const qs = {};
   if (bidderRequest) {
     const ref = bidderRequest.refererInfo;
-    if (ref?.location) {
-      // RefererUrl will be removed in a future version.
-      qs.RefererUrl = encodeURIComponent(ref.location);
-      if (ref.numIframes > 0) {
-        qs.SafeFrame = true;
+    if (ref) {
+      if (ref.location) {
+        // RefererUrl will be removed in a future version.
+        qs.RefererUrl = encodeURIComponent(ref.location);
+        if (!ref.reachedTop) {
+          qs.SafeFrame = true;
+        }
       }
+
+      qs.PageUrl = encodeURIComponent(ref.topmostLocation);
+      qs.PageReferrer = encodeURIComponent(ref.location);
     }
 
+    // retreive info from ortb2 object if present (prebid7)
     const siteInfo = bidderRequest.ortb2?.site;
     if (siteInfo) {
-      qs.PageUrl = encodeURIComponent(siteInfo.page);
+      qs.PageUrl = encodeURIComponent(siteInfo.page || ref?.topmostLocation);
       qs.PageReferrer = encodeURIComponent(siteInfo.ref || ref?.location);
     }
   }
diff --git a/test/spec/modules/adyoulikeBidAdapter_spec.js b/test/spec/modules/adyoulikeBidAdapter_spec.js
index bab0776a5f4..e6a153d501a 100644
--- a/test/spec/modules/adyoulikeBidAdapter_spec.js
+++ b/test/spec/modules/adyoulikeBidAdapter_spec.js
@@ -18,7 +18,7 @@ describe('Adyoulike Adapter', function () {
       consentString: consentString,
       gdprApplies: true
     },
-    refererInfo: {location: referrerUrl, canonicalUrl, domain},
+    refererInfo: {location: referrerUrl, canonicalUrl, domain, topmostLocation: 'fakePageURL'},
     ortb2: {site: {page: pageUrl, ref: referrerUrl}}
   };
   const bidRequestWithEmptyPlacement = [

From ced1a9dac8a1e97911c89dea699a4b1488a38b7e Mon Sep 17 00:00:00 2001
From: matthieularere-msq
 <63732822+matthieularere-msq@users.noreply.github.com>
Date: Fri, 14 Oct 2022 21:44:23 +0200
Subject: [PATCH 343/569] Mediasquare Bid Adapter: add video renderer + change
 with floors (#9079)

---
 modules/mediasquareBidAdapter.js              | 45 +++++++++++++++++--
 .../modules/mediasquareBidAdapter_spec.js     |  6 ++-
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/modules/mediasquareBidAdapter.js b/modules/mediasquareBidAdapter.js
index c431fe2059e..819ff280e35 100644
--- a/modules/mediasquareBidAdapter.js
+++ b/modules/mediasquareBidAdapter.js
@@ -3,6 +3,7 @@ import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import {Renderer} from '../src/Renderer.js';
 
 const BIDDER_CODE = 'mediasquare';
 const BIDDER_URL_PROD = 'https://pbs-front.mediasquare.fr/'
@@ -10,6 +11,8 @@ const BIDDER_URL_TEST = 'https://bidder-test.mediasquare.fr/'
 const BIDDER_ENDPOINT_AUCTION = 'msq_prebid';
 const BIDDER_ENDPOINT_WINNING = 'winning';
 
+const OUTSTREAM_RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+
 export const spec = {
   code: BIDDER_CODE,
   gvlid: 791,
@@ -40,11 +43,15 @@ export const spec = {
     const test = config.getConfig('debug') ? 1 : 0;
     let adunitValue = null;
     Object.keys(validBidRequests).forEach(key => {
+      floor = {};
       adunitValue = validBidRequests[key];
       if (typeof adunitValue.getFloor === 'function') {
-        floor = adunitValue.getFloor({currency: 'EUR', mediaType: '*', size: '*'});
-      } else {
-        floor = {};
+        if (Array.isArray(adunitValue.sizes)) {
+          adunitValue.sizes.forEach(value => {
+            let tmpFloor = adunitValue.getFloor({currency: 'USD', mediaType: '*', size: value});
+            if (tmpFloor != {}) { floor[value.join('x')] = tmpFloor; }
+          });
+        }
       }
       codes.push({
         owner: adunitValue.params.owner,
@@ -132,6 +139,7 @@ export const spec = {
           if ('url' in value['video']) { bidResponse['vastUrl'] = value['video']['url'] }
           if ('xml' in value['video']) { bidResponse['vastXml'] = value['video']['xml'] }
           bidResponse['mediaType'] = 'video';
+          bidResponse['renderer'] = createRenderer(value, OUTSTREAM_RENDERER_URL);
         }
         if (value.hasOwnProperty('deal_id')) { bidResponse['dealId'] = value['deal_id']; }
         bidResponses.push(bidResponse);
@@ -182,4 +190,35 @@ export const spec = {
   }
 
 }
+
+function outstreamRender(bid) {
+  bid.renderer.push(() => {
+    window.ANOutstreamVideo.renderAd({
+      sizes: [bid.width, bid.height],
+      targetId: bid.adUnitCode,
+      adResponse: bid.adResponse,
+      rendererOptions: {
+        showBigPlayButton: false,
+        showProgressBar: 'bar',
+        showVolume: false,
+        allowFullscreen: true,
+        skippable: false,
+        content: bid.vastXml
+      }
+    });
+  });
+}
+
+function createRenderer(bid, url) {
+  const renderer = Renderer.install({
+    id: bid.bidId,
+    url: url,
+    loaded: false,
+    adUnitCode: bid.adUnitCode,
+    targetId: bid.adUnitCode
+  });
+  renderer.setRender(outstreamRender);
+  return renderer;
+}
+
 registerBidder(spec);
diff --git a/test/spec/modules/mediasquareBidAdapter_spec.js b/test/spec/modules/mediasquareBidAdapter_spec.js
index eeab047a405..346d02d91d0 100644
--- a/test/spec/modules/mediasquareBidAdapter_spec.js
+++ b/test/spec/modules/mediasquareBidAdapter_spec.js
@@ -78,7 +78,8 @@ describe('MediaSquare bid adapter tests', function () {
       owner: 'test',
       code: 'publishername_atf_desktop_rg_pave'
     },
-    getFloor: function (a) { return { currency: 'EUR', floor: 1.0 }; },
+    sizes: [[300, 250]],
+    getFloor: function (a) { return { currency: 'USD', floor: 1.0 }; },
   }];
   var BID_RESPONSE = {'body': {
     'responses': [{
@@ -142,7 +143,7 @@ describe('MediaSquare bid adapter tests', function () {
     const requestfloor = spec.buildRequests(FLOORS_PARAMS, DEFAULT_OPTIONS);
     const responsefloor = JSON.parse(requestfloor.data);
     expect(responsefloor.codes[0]).to.have.property('floor').exist;
-    expect(responsefloor.codes[0].floor).to.have.property('floor').and.to.equal(1.0);
+    expect(responsefloor.codes[0].floor).to.have.property('300x250').and.to.have.property('floor').and.to.equal(1);
   });
 
   it('Verify parse response', function () {
@@ -239,6 +240,7 @@ describe('MediaSquare bid adapter tests', function () {
     const bid = response[0];
     expect(bid).to.have.property('vastXml');
     expect(bid).to.have.property('vastUrl');
+    expect(bid).to.have.property('renderer');
     delete BID_RESPONSE.body.responses[0].video;
   });
 });

From d8f25b92ed2d04ab578681076a35217548fc5df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Fermeaux?=
 <32789499+fermeaux@users.noreply.github.com>
Date: Mon, 17 Oct 2022 18:29:58 +0200
Subject: [PATCH 344/569] Ogury Bid Adapter: Add xandr sync (#9118)

---
 modules/oguryBidAdapter.js                |  8 +++-
 test/spec/modules/oguryBidAdapter_spec.js | 50 +++++++++++++++--------
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/modules/oguryBidAdapter.js b/modules/oguryBidAdapter.js
index f0ed3c24a31..cb082f2d9a9 100644
--- a/modules/oguryBidAdapter.js
+++ b/modules/oguryBidAdapter.js
@@ -11,7 +11,7 @@ const DEFAULT_TIMEOUT = 1000;
 const BID_HOST = 'https://mweb-hb.presage.io/api/header-bidding-request';
 const TIMEOUT_MONITORING_HOST = 'https://ms-ads-monitoring-events.presage.io';
 const MS_COOKIE_SYNC_DOMAIN = 'https://ms-cookie-sync.presage.io';
-const ADAPTER_VERSION = '1.2.13';
+const ADAPTER_VERSION = '1.3.0';
 
 function getClientWidth() {
   const documentElementClientWidth = window.top.document.documentElement.clientWidth
@@ -56,6 +56,10 @@ function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
     {
       type: 'image',
       url: `${MS_COOKIE_SYNC_DOMAIN}/ttd/init-sync?iab_string=${(gdprConsent && gdprConsent.consentString) || ''}&source=prebid`
+    },
+    {
+      type: 'image',
+      url: `${MS_COOKIE_SYNC_DOMAIN}/xandr/init-sync?iab_string=${(gdprConsent && gdprConsent.consentString) || ''}&source=prebid`
     }
   ]
 }
@@ -209,6 +213,6 @@ export const spec = {
   onBidWon,
   getWindowContext,
   onTimeout
-};
+}
 
 registerBidder(spec);
diff --git a/test/spec/modules/oguryBidAdapter_spec.js b/test/spec/modules/oguryBidAdapter_spec.js
index 8871d2d0886..b9e4b44b571 100644
--- a/test/spec/modules/oguryBidAdapter_spec.js
+++ b/test/spec/modules/oguryBidAdapter_spec.js
@@ -119,26 +119,30 @@ describe('OguryBidAdapter', function () {
       };
     });
 
-    it('should return syncs array with two elements of type image', () => {
+    it('should return syncs array with three elements of type image', () => {
       const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
 
-      expect(userSyncs).to.have.lengthOf(2);
+      expect(userSyncs).to.have.lengthOf(3);
       expect(userSyncs[0].type).to.equal('image');
       expect(userSyncs[0].url).to.contain('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch');
       expect(userSyncs[1].type).to.equal('image');
       expect(userSyncs[1].url).to.contain('https://ms-cookie-sync.presage.io/ttd/init-sync');
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.contain('https://ms-cookie-sync.presage.io/xandr/init-sync');
     });
 
     it('should set the source as query param', () => {
       const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
       expect(userSyncs[0].url).to.contain('source=prebid');
       expect(userSyncs[1].url).to.contain('source=prebid');
+      expect(userSyncs[2].url).to.contain('source=prebid');
     });
 
     it('should set the tcString as query param', () => {
       const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
       expect(userSyncs[0].url).to.contain(`iab_string=${gdprConsent.consentString}`);
       expect(userSyncs[1].url).to.contain(`iab_string=${gdprConsent.consentString}`);
+      expect(userSyncs[2].url).to.contain(`iab_string=${gdprConsent.consentString}`);
     });
 
     it('should return an empty array when pixel is disable', () => {
@@ -146,82 +150,94 @@ describe('OguryBidAdapter', function () {
       expect(spec.getUserSyncs(syncOptions, [], gdprConsent)).to.have.lengthOf(0);
     });
 
-    it('should return syncs array with two elements of type image when consentString is undefined', () => {
+    it('should return syncs array with three elements of type image when consentString is undefined', () => {
       gdprConsent = {
         gdprApplies: true,
         consentString: undefined
       };
 
       const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
-      expect(userSyncs).to.have.lengthOf(2);
+      expect(userSyncs).to.have.lengthOf(3);
       expect(userSyncs[0].type).to.equal('image');
       expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
       expect(userSyncs[1].type).to.equal('image');
       expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
     });
 
-    it('should return syncs array with two elements of type image when consentString is null', () => {
+    it('should return syncs array with three elements of type image when consentString is null', () => {
       gdprConsent = {
         gdprApplies: true,
         consentString: null
       };
 
       const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
-      expect(userSyncs).to.have.lengthOf(2);
+      expect(userSyncs).to.have.lengthOf(3);
       expect(userSyncs[0].type).to.equal('image');
       expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
       expect(userSyncs[1].type).to.equal('image');
       expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
     });
 
-    it('should return syncs array with two elements of type image when gdprConsent is undefined', () => {
+    it('should return syncs array with three elements of type image when gdprConsent is undefined', () => {
       gdprConsent = undefined;
 
       const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
-      expect(userSyncs).to.have.lengthOf(2);
+      expect(userSyncs).to.have.lengthOf(3);
       expect(userSyncs[0].type).to.equal('image');
       expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
       expect(userSyncs[1].type).to.equal('image');
       expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
     });
 
-    it('should return syncs array with two elements of type image when gdprConsent is null', () => {
+    it('should return syncs array with three elements of type image when gdprConsent is null', () => {
       gdprConsent = null;
 
       const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
-      expect(userSyncs).to.have.lengthOf(2);
+      expect(userSyncs).to.have.lengthOf(3);
       expect(userSyncs[0].type).to.equal('image');
       expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
       expect(userSyncs[1].type).to.equal('image');
       expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
     });
 
-    it('should return syncs array with two elements of type image when gdprConsent is null and gdprApplies is false', () => {
+    it('should return syncs array with three elements of type image when gdprConsent is null and gdprApplies is false', () => {
       gdprConsent = {
         gdprApplies: false,
         consentString: null
       };
 
       const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
-      expect(userSyncs).to.have.lengthOf(2);
+      expect(userSyncs).to.have.lengthOf(3);
       expect(userSyncs[0].type).to.equal('image');
       expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
       expect(userSyncs[1].type).to.equal('image');
       expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
     });
 
-    it('should return syncs array with two elements of type image when gdprConsent is empty string and gdprApplies is false', () => {
+    it('should return syncs array with three elements of type image when gdprConsent is empty string and gdprApplies is false', () => {
       gdprConsent = {
         gdprApplies: false,
         consentString: ''
       };
 
       const userSyncs = spec.getUserSyncs(syncOptions, [], gdprConsent);
-      expect(userSyncs).to.have.lengthOf(2);
+      expect(userSyncs).to.have.lengthOf(3);
       expect(userSyncs[0].type).to.equal('image');
       expect(userSyncs[0].url).to.equal('https://ms-cookie-sync.presage.io/v1/init-sync/bid-switch?iab_string=&source=prebid')
       expect(userSyncs[1].type).to.equal('image');
       expect(userSyncs[1].url).to.equal('https://ms-cookie-sync.presage.io/ttd/init-sync?iab_string=&source=prebid')
+      expect(userSyncs[2].type).to.equal('image');
+      expect(userSyncs[2].url).to.equal('https://ms-cookie-sync.presage.io/xandr/init-sync?iab_string=&source=prebid')
     });
   });
 
@@ -279,7 +295,7 @@ describe('OguryBidAdapter', function () {
       },
       ext: {
         prebidversion: '$prebid.version$',
-        adapterversion: '1.2.13'
+        adapterversion: '1.3.0'
       },
       device: {
         w: stubbedWidth,
@@ -659,7 +675,7 @@ describe('OguryBidAdapter', function () {
           advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[0].adomain
         },
         nurl: openRtbBidResponse.body.seatbid[0].bid[0].nurl,
-        adapterVersion: '1.2.13',
+        adapterVersion: '1.3.0',
         prebidVersion: '$prebid.version$'
       }, {
         requestId: openRtbBidResponse.body.seatbid[0].bid[1].impid,
@@ -676,7 +692,7 @@ describe('OguryBidAdapter', function () {
           advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[1].adomain
         },
         nurl: openRtbBidResponse.body.seatbid[0].bid[1].nurl,
-        adapterVersion: '1.2.13',
+        adapterVersion: '1.3.0',
         prebidVersion: '$prebid.version$'
       }]
 

From 86bc747fa65c4ab0adeee2f136567fb0bf0dc9a1 Mon Sep 17 00:00:00 2001
From: haruka-yamashita2 <39541428+haruka-yamashita2@users.noreply.github.com>
Date: Tue, 18 Oct 2022 04:31:35 +0900
Subject: [PATCH 345/569] Dac ID Module:  (#9040)

* update dacIdSystem module and related files

* modify decoded id and related files

* remove useless import

* update dacIdSystem.md

* fix the linting errors
---
 modules/dacIdSystem.js                       | 172 ++++++++++++++++---
 modules/dacIdSystem.md                       |   9 +-
 modules/yieldoneBidAdapter.js                |  11 +-
 test/spec/modules/dacIdSystem_spec.js        | 104 +++++++++--
 test/spec/modules/yieldoneBidAdapter_spec.js |   5 +-
 5 files changed, 254 insertions(+), 47 deletions(-)

diff --git a/modules/dacIdSystem.js b/modules/dacIdSystem.js
index 73b5c7420cf..856e1976bb1 100644
--- a/modules/dacIdSystem.js
+++ b/modules/dacIdSystem.js
@@ -5,12 +5,111 @@
  * @requires module:modules/userId
  */
 
-import { submodule } from '../src/hook.js';
-import { getStorageManager } from '../src/storageManager.js';
+import {
+  logError,
+  logInfo,
+  logWarn
+} from '../src/utils.js';
+import {
+  ajax
+} from '../src/ajax.js'
+import {
+  submodule
+} from '../src/hook.js';
+import {
+  getStorageManager
+} from '../src/storageManager.js';
 
 export const storage = getStorageManager();
 
-export const cookieKey = '_a1_f';
+export const FUUID_COOKIE_NAME = '_a1_f';
+export const AONEID_COOKIE_NAME = '_a1_d';
+export const API_URL = 'https://penta.a.one.impact-ad.jp/aud';
+const COOKIES_EXPIRES = 60 * 60 * 24 * 1000; // 24h
+const LOG_PREFIX = 'User ID - dacId submodule: ';
+
+/**
+ * @returns {{fuuid: string, uid: string}} -
+ */
+function getCookieId() {
+  return {
+    fuuid: storage.getCookie(FUUID_COOKIE_NAME),
+    uid: storage.getCookie(AONEID_COOKIE_NAME)
+  };
+}
+
+/**
+ * set uid to cookie.
+ * @param {string} uid -
+ * @returns {void} -
+ */
+function setAoneidToCookie(uid) {
+  if (uid) {
+    const expires = new Date(Date.now() + COOKIES_EXPIRES).toUTCString();
+    storage.setCookie(
+      AONEID_COOKIE_NAME,
+      uid,
+      expires,
+      'none'
+    );
+  }
+}
+
+/**
+ * @param {string} oid -
+ * @param {string} fuuid -
+ * @returns {string} -
+ */
+function getApiUrl(oid, fuuid) {
+  return `${API_URL}?oid=${oid}&fu=${fuuid}`;
+}
+
+/**
+ * @param {string} oid -
+ * @param {string} fuuid -
+ * @returns {{callback: function}} -
+ */
+function fetchAoneId(oid, fuuid) {
+  return {
+    callback: (callback) => {
+      const ret = {
+        fuuid,
+        uid: undefined
+      };
+      const callbacks = {
+        success: (response) => {
+          if (response) {
+            try {
+              const responseObj = JSON.parse(response);
+              if (responseObj.error) {
+                logWarn(LOG_PREFIX + 'There is no permission to use API: ' + responseObj.error);
+                return callback(ret);
+              }
+              if (!responseObj.uid) {
+                logWarn(LOG_PREFIX + 'AoneId is null');
+                return callback(ret);
+              }
+              ret.uid = responseObj.uid;
+              setAoneidToCookie(ret.uid);
+            } catch (error) {
+              logError(LOG_PREFIX + error);
+            }
+          }
+          callback(ret);
+        },
+        error: (error) => {
+          logError(LOG_PREFIX + error);
+          callback(ret);
+        }
+      };
+      const apiUrl = getApiUrl(oid, fuuid);
+      ajax(apiUrl, callbacks, undefined, {
+        method: 'GET',
+        withCredentials: true
+      });
+    },
+  };
+}
 
 export const dacIdSystemSubmodule = {
   /**
@@ -20,38 +119,57 @@ export const dacIdSystemSubmodule = {
   name: 'dacId',
 
   /**
-   * performs action to obtain id
-   * @function
-   * @returns { {id: {dacId: string}} | undefined }
+   * decode the stored id value for passing to bid requests
+   * @param { {fuuid: string, uid: string} } id
+   * @returns { {dacId: {fuuid: string, dacId: string} } | undefined }
    */
-  getId: function() {
-    const newId = storage.getCookie(cookieKey);
-    if (!newId) {
-      return undefined;
-    }
-    const result = {
-      dacId: newId
+  decode(id) {
+    if (id && typeof id === 'object') {
+      return {
+        dacId: {
+          fuuid: id.fuuid,
+          id: id.uid
+        }
+      }
     }
-    return {id: result};
   },
 
   /**
-   * decode the stored id value for passing to bid requests
+   * performs action to obtain id
    * @function
-   * @param { {dacId: string} } value
-   * @returns { {dacId: {id: string} } | undefined }
+   * @returns { {id: {fuuid: string, uid: string}} | undefined }
    */
-  decode: function(value) {
-    if (value && typeof value === 'object') {
-      const result = {};
-      if (value.dacId) {
-        result.id = value.dacId
-      }
-      return {dacId: result};
+  getId(config) {
+    const cookie = getCookieId();
+
+    if (!cookie.fuuid) {
+      logInfo(LOG_PREFIX + 'There is no fuuid in cookie')
+      return undefined;
     }
-    return undefined;
-  },
 
-}
+    if (cookie.fuuid && cookie.uid) {
+      logInfo(LOG_PREFIX + 'There is fuuid and AoneId in cookie')
+      return {
+        id: {
+          fuuid: cookie.fuuid,
+          uid: cookie.uid
+        }
+      };
+    }
+
+    const configParams = (config && config.params) || {};
+    if (!configParams || typeof configParams.oid !== 'string') {
+      logWarn(LOG_PREFIX + 'oid is not defined');
+      return {
+        id: {
+          fuuid: cookie.fuuid,
+          uid: undefined
+        }
+      };
+    }
+
+    return fetchAoneId(configParams.oid, cookie.fuuid);
+  }
+};
 
 submodule('userId', dacIdSystemSubmodule);
diff --git a/modules/dacIdSystem.md b/modules/dacIdSystem.md
index 0239b4557e9..c78b8ff2741 100644
--- a/modules/dacIdSystem.md
+++ b/modules/dacIdSystem.md
@@ -1,7 +1,7 @@
 ## AudienceOne User ID Submodule
 
 AudienceOne ID, provided by [D.A.Consortium Inc.](https://www.dac.co.jp/), is ID for ad targeting by using 1st party cookie.
-Please contact D.A.Consortium Inc. before using this ID.
+Please visit [https://solutions.dac.co.jp/audienceone](https://solutions.dac.co.jp/audienceone) and request your Owner ID to get started.
 
 ## Building Prebid with AudienceOne ID Support
 
@@ -17,7 +17,10 @@ The following configuration parameters are available:
 pbjs.setConfig({
     userSync: {
         userIds: [{
-            name: 'dacId'
+            name: 'dacId',
+            params: {
+                'oid': '55h67qm4ck37vyz5'
+            }
         }]
     }
 });
@@ -26,3 +29,5 @@ pbjs.setConfig({
 | Param under userSync.userIds[] | Scope | Type | Description | Example |
 | --- | --- | --- | --- | --- |
 | name | Required | String | The name of this module. | `"dacId"` |
+| params | Required | Object | Details of module params. | |
+| params.oid | Required | String | This is the Owner ID value obtained via D.A.Consortium Inc. | `"55h67qm4ck37vyz5"` |
\ No newline at end of file
diff --git a/modules/yieldoneBidAdapter.js b/modules/yieldoneBidAdapter.js
index c07911c9e1f..4c5f1687641 100644
--- a/modules/yieldoneBidAdapter.js
+++ b/modules/yieldoneBidAdapter.js
@@ -74,10 +74,13 @@ export const spec = {
       }
 
       // DACID
-      const dacId = deepAccess(bidRequest, 'userId.dacId.id');
-      if (isStr(dacId) && !isEmpty(dacId)) {
-        payload.dac_id = dacId;
-        payload.fuuid = dacId;
+      const fuuid = deepAccess(bidRequest, 'userId.dacId.fuuid');
+      const dacid = deepAccess(bidRequest, 'userId.dacId.id');
+      if (isStr(fuuid) && !isEmpty(fuuid)) {
+        payload.fuuid = fuuid;
+      }
+      if (isStr(dacid) && !isEmpty(dacid)) {
+        payload.dac_id = dacid;
       }
 
       // ID5
diff --git a/test/spec/modules/dacIdSystem_spec.js b/test/spec/modules/dacIdSystem_spec.js
index d78b4a69000..0246e65a310 100644
--- a/test/spec/modules/dacIdSystem_spec.js
+++ b/test/spec/modules/dacIdSystem_spec.js
@@ -1,8 +1,16 @@
-import { dacIdSystemSubmodule, storage, cookieKey } from 'modules/dacIdSystem.js';
+import {
+  dacIdSystemSubmodule,
+  storage,
+  FUUID_COOKIE_NAME,
+  AONEID_COOKIE_NAME
+} from 'modules/dacIdSystem.js';
+import { server } from 'test/mocks/xhr.js';
 
-const DACID_DUMMY_VALUE = 'dacIdTest';
+const FUUID_DUMMY_VALUE = 'dacIdTest';
+const AONEID_DUMMY_VALUE = '12345'
 const DACID_DUMMY_OBJ = {
-  dacId: DACID_DUMMY_VALUE
+  fuuid: FUUID_DUMMY_VALUE,
+  uid: AONEID_DUMMY_VALUE
 };
 
 describe('dacId module', function () {
@@ -23,24 +31,98 @@ describe('dacId module', function () {
     ''
   ]
 
+  const configParamTestCase = {
+    params: {
+      oid: [
+        '637c1b6fc26bfad0', // valid
+        'e8316b39c08029e1' // invalid
+      ]
+    }
+  }
+
   describe('getId()', function () {
-    it('should return the uid when it exists in cookie', function () {
-      getCookieStub.withArgs(cookieKey).returns(DACID_DUMMY_VALUE);
+    it('should return undefined when oid & fuuid not exist', function () {
+      // no oid, no fuuid
       const id = dacIdSystemSubmodule.getId();
-      expect(id).to.be.deep.equal({id: {dacId: DACID_DUMMY_VALUE}});
+      expect(id).to.equal(undefined);
     });
 
-    cookieTestCasesForEmpty.forEach(testCase => it('should return the uid when it not exists in cookie', function () {
-      getCookieStub.withArgs(cookieKey).returns(testCase);
+    it('should return fuuid when oid not exists but fuuid exists', function () {
+      // no oid, fuuid
+      getCookieStub.withArgs(FUUID_COOKIE_NAME).returns(FUUID_DUMMY_VALUE);
       const id = dacIdSystemSubmodule.getId();
-      expect(id).to.be.deep.equal(undefined);
+      expect(id).to.be.deep.equal({
+        id: {
+          fuuid: FUUID_DUMMY_VALUE,
+          uid: undefined
+        }
+      });
+    });
+
+    it('should return fuuid when oid is invalid but fuuid exists', function () {
+      // invalid oid, fuuid, no AoneId
+      getCookieStub.withArgs(FUUID_COOKIE_NAME).returns(FUUID_DUMMY_VALUE);
+      const id = dacIdSystemSubmodule.getId(configParamTestCase.params.oid[1]);
+      expect(id).to.be.deep.equal({
+        id: {
+          fuuid: FUUID_DUMMY_VALUE,
+          uid: undefined
+        }
+      });
+    });
+
+    cookieTestCasesForEmpty.forEach(testCase => it('should return undefined when fuuid not exists', function () {
+      // valid oid, no fuuid, no AoneId
+      getCookieStub.withArgs(FUUID_COOKIE_NAME).returns(testCase);
+      const id = dacIdSystemSubmodule.getId(configParamTestCase.params.oid[0]);
+      expect(id).to.equal(undefined);
     }));
+
+    it('should return AoneId when AoneId not exists', function () {
+      // valid oid, fuuid, no AoneId
+      getCookieStub.withArgs(FUUID_COOKIE_NAME).returns(FUUID_DUMMY_VALUE);
+      const callbackSpy = sinon.spy();
+      const callback = dacIdSystemSubmodule.getId({params: {oid: configParamTestCase.params.oid[0]}}).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({'uid': AONEID_DUMMY_VALUE}));
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal({fuuid: 'dacIdTest', uid: AONEID_DUMMY_VALUE});
+    });
+
+    cookieTestCasesForEmpty.forEach(testCase => it('should return undefined when AoneId not exists & API result is empty', function () {
+      // valid oid, fuuid, no AoneId, API result empty
+      getCookieStub.withArgs(FUUID_COOKIE_NAME).returns(FUUID_DUMMY_VALUE);
+      const callbackSpy = sinon.spy();
+      const callback = dacIdSystemSubmodule.getId({params: {oid: configParamTestCase.params.oid[0]}}).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({'uid': testCase}));
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal({fuuid: 'dacIdTest', uid: undefined});
+    }));
+
+    it('should return the fuuid & AoneId when they exist', function () {
+      // valid oid, fuuid, AoneId
+      getCookieStub.withArgs(FUUID_COOKIE_NAME).returns(FUUID_DUMMY_VALUE);
+      getCookieStub.withArgs(AONEID_COOKIE_NAME).returns(AONEID_DUMMY_VALUE);
+      const id = dacIdSystemSubmodule.getId(configParamTestCase.params.oid[0]);
+      expect(id).to.be.deep.equal({
+        id: {
+          fuuid: FUUID_DUMMY_VALUE,
+          uid: AONEID_DUMMY_VALUE
+        }
+      });
+    });
   });
 
   describe('decode()', function () {
-    it('should return the uid when it exists in cookie', function () {
+    it('should return fuuid & AoneId when they exist', function () {
       const decoded = dacIdSystemSubmodule.decode(DACID_DUMMY_OBJ);
-      expect(decoded).to.be.deep.equal({dacId: {id: DACID_DUMMY_VALUE}});
+      expect(decoded).to.be.deep.equal({
+        dacId: {
+          fuuid: FUUID_DUMMY_VALUE,
+          id: AONEID_DUMMY_VALUE
+        }
+      });
     });
 
     it('should return the undefined when decode id is not "string"', function () {
diff --git a/test/spec/modules/yieldoneBidAdapter_spec.js b/test/spec/modules/yieldoneBidAdapter_spec.js
index e41764b2876..59bd4a80081 100644
--- a/test/spec/modules/yieldoneBidAdapter_spec.js
+++ b/test/spec/modules/yieldoneBidAdapter_spec.js
@@ -1,7 +1,6 @@
 import { expect } from 'chai';
 import { spec } from 'modules/yieldoneBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
-import { deepClone } from 'src/utils.js';
 
 const ENDPOINT = 'https://y.one.impact-ad.jp/h_bid';
 const USER_SYNC_URL = 'https://y.one.impact-ad.jp/push_sync';
@@ -428,12 +427,12 @@ describe('yieldoneBidAdapter', function() {
         const bidRequests = [
           {
             params: {placementId: '0'},
-            userId: {dacId: {id: 'dacId_sample'}},
+            userId: {dacId: {fuuid: 'fuuid_sample', id: 'dacId_sample'}},
           },
         ];
         const request = spec.buildRequests(bidRequests, bidderRequest);
+        expect(request[0].data.fuuid).to.equal('fuuid_sample');
         expect(request[0].data.dac_id).to.equal('dacId_sample');
-        expect(request[0].data.fuuid).to.equal('dacId_sample');
       });
     });
 

From 5de1a29e0c8a69875d3da4cc52f6573b2899be6d Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Mon, 17 Oct 2022 15:41:09 -0400
Subject: [PATCH 346/569] TTD Bid Adapter: add support for site.ref & user.data
 (#9107)

* Update ttdBidAdapter.js

* Update ttdBidAdapter.js

* Update ttdBidAdapter.js
---
 modules/ttdBidAdapter.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/ttdBidAdapter.js b/modules/ttdBidAdapter.js
index 882f7e58960..a855c07dc86 100644
--- a/modules/ttdBidAdapter.js
+++ b/modules/ttdBidAdapter.js
@@ -121,12 +121,20 @@ function getUser(bidderRequest) {
     utils.deepSetValue(user, 'ext.eids', eids);
   }
 
+  // gather user.data
+  const ortb2UserData = utils.deepAccess(bidderRequest, 'ortb2.user.data');
+  if (ortb2UserData && ortb2UserData.length) {
+    user = utils.mergeDeep(user, {
+      data: [...ortb2UserData]
+    });
+  };
   return user;
 }
 
 function getSite(bidderRequest, firstPartyData) {
   var site = {
     page: utils.deepAccess(bidderRequest, 'refererInfo.page'),
+    ref: utils.deepAccess(bidderRequest, 'refererInfo.ref'),
     publisher: {
       id: utils.deepAccess(bidderRequest, 'bids.0.params.publisherId'),
     },

From 86db8ebd1065a077af35eed57abde6274cb3da89 Mon Sep 17 00:00:00 2001
From: Luca Lavarini <89019372+luca1x@users.noreply.github.com>
Date: Tue, 18 Oct 2022 00:04:59 +0200
Subject: [PATCH 347/569] init (#9115)

---
 modules/1plusXRtdProvider.js                | 37 ++++++++++++++---
 test/spec/modules/1plusXRtdProvider_spec.js | 44 ++++++++++++++-------
 2 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/modules/1plusXRtdProvider.js b/modules/1plusXRtdProvider.js
index 317bb4a47af..390f4f4cd81 100644
--- a/modules/1plusXRtdProvider.js
+++ b/modules/1plusXRtdProvider.js
@@ -13,6 +13,7 @@ const MODULE_NAME = '1plusX';
 const ORTB2_NAME = '1plusX.com'
 const PAPI_VERSION = 'v1.0';
 const LOG_PREFIX = '[1plusX RTD Module]: ';
+const OPE_FPID = 'ope_fpid'
 const LEGACY_SITE_KEYWORDS_BIDDERS = ['appnexus'];
 export const segtaxes = {
   // cf. https://github.com/InteractiveAdvertisingBureau/openrtb/pull/108
@@ -57,6 +58,12 @@ export const extractConfig = (moduleConfig, reqBidsConfigObj) => {
   return { customerId, timeout, bidders };
 }
 
+/**
+ * Extracts consent from the prebid consent object and translates it
+ * into a 1plusX profile api query parameter parameter dict
+ * @param {object} prebid gdpr object
+ * @returns dictionary of papi gdpr query parameters
+ */
 export const extractConsent = ({ gdpr }) => {
   if (!gdpr) {
     return null
@@ -65,8 +72,8 @@ export const extractConsent = ({ gdpr }) => {
   if (!(gdprApplies == '0' || gdprApplies == '1')) {
     throw 'TCF Consent: gdprApplies has wrong format'
   }
-  if (!(typeof consentString === 'string')) {
-    throw 'TCF Consent: consentString is not string'
+  if (consentString && typeof consentString != 'string') {
+    throw 'TCF Consent: consentString must be string if defined'
   }
   const result = {
     'gdpr_applies': gdprApplies,
@@ -74,13 +81,30 @@ export const extractConsent = ({ gdpr }) => {
   }
   return result
 }
+
+/**
+ * Extracts the OPE first party id field from local storage
+ * @returns fpid string if found, else null
+ */
+export const extractFpid = () => {
+  try {
+    const fpid = window.localStorage.getItem(OPE_FPID);
+    if (fpid) {
+      return fpid;
+    }
+    return null;
+  } catch (error) {
+    return null;
+  }
+}
 /**
  * Gets the URL of Profile Api from which targeting data will be fetched
- * @param {Object} config
  * @param {string} config.customerId
+ * @param {object} consent query params as dict
+ * @param {string} oneplusx first party id (nullable)
  * @returns {string} URL to access 1plusX Profile API
  */
-export const getPapiUrl = (customerId, consent) => {
+export const getPapiUrl = (customerId, consent, fpid) => {
   // https://[yourClientId].profiles.tagger.opecloud.com/[VERSION]/targeting?url=
   const currentUrl = encodeURIComponent(window.location.href);
   var papiUrl = `https://${customerId}.profiles.tagger.opecloud.com/${PAPI_VERSION}/targeting?url=${currentUrl}`;
@@ -89,6 +113,9 @@ export const getPapiUrl = (customerId, consent) => {
       papiUrl += `&${key}=${value}`
     })
   }
+  if (fpid) {
+    papiUrl += `&fpid=${fpid}`
+  }
 
   return papiUrl;
 }
@@ -246,7 +273,7 @@ const getBidRequestData = (reqBidsConfigObj, callback, moduleConfig, userConsent
     // Get the required config
     const { customerId, bidders } = extractConfig(moduleConfig, reqBidsConfigObj);
     // Get PAPI URL
-    const papiUrl = getPapiUrl(customerId, extractConsent(userConsent) || {})
+    const papiUrl = getPapiUrl(customerId, extractConsent(userConsent) || {}, extractFpid())
     // Call PAPI
     getTargetingDataFromPapi(papiUrl)
       .then((papiResponse) => {
diff --git a/test/spec/modules/1plusXRtdProvider_spec.js b/test/spec/modules/1plusXRtdProvider_spec.js
index dae0e313387..496c005f470 100644
--- a/test/spec/modules/1plusXRtdProvider_spec.js
+++ b/test/spec/modules/1plusXRtdProvider_spec.js
@@ -9,6 +9,8 @@ import {
   extractConsent,
   getPapiUrl
 } from 'modules/1plusXRtdProvider';
+import assert from 'assert';
+import { extractFpid } from '../../../modules/1plusXRtdProvider';
 
 describe('1plusXRtdProvider', () => {
   // Fake server config
@@ -276,41 +278,50 @@ describe('1plusXRtdProvider', () => {
 
     it('throws an error if the consent is malformed', () => {
       const consent1 = {
-        gdpr: {
-          gdprApplies: 1
-        }
-      }
-      const consent2 = {
         gdpr: {
           consentString: 'myConsent'
         }
       }
-      const consent3 = {
+      const consent2 = {
         gdpr: {
           gdprApplies: 1,
           consentString: 3
         }
       }
-      const consent4 = {
+      const consent3 = {
         gdpr: {
           gdprApplies: 'yes',
           consentString: 'myConsent'
         }
       }
-      const consent5 = {
-        gdprApplies: 1,
-        consentString: 'myConsent'
+      const consent4 = {
+        gdpr: {}
       }
 
-      for (const consent in [consent1, consent2, consent3, consent4, consent5]) {
+      for (const consent of [consent1, consent2, consent3, consent4]) {
+        var failed = false;
         try {
           extractConsent(consent)
-          assert(false, 'Should be throwing an exception')
-        } catch (e) { }
+        } catch (e) {
+          failed = true;
+        } finally {
+          assert(failed, 'Should be throwing an exception')
+        }
       }
     })
   })
 
+  describe('extractFpid', () => {
+    it('correctly extracts an ope fpid if present', () => {
+      window.localStorage.setItem('ope_fpid', 'oneplusx_test_key')
+      const id1 = extractFpid()
+      window.localStorage.removeItem('ope_fpid')
+      const id2 = extractFpid()
+      expect(id1).to.equal('oneplusx_test_key')
+      expect(id2).to.equal(null)
+    })
+  })
+
   describe('getPapiUrl', () => {
     const customer = 'acme'
     const consent = {
@@ -320,11 +331,16 @@ describe('1plusXRtdProvider', () => {
       }
     }
 
-    it('correctly builds URLs based on consent', () => {
+    it('correctly builds URLs if gdpr parameters are present', () => {
       const url1 = getPapiUrl(customer)
       const url2 = getPapiUrl(customer, extractConsent(consent))
       expect(['&consent_string=myConsent&gdpr_applies=1', '&gdpr_applies=1&consent_string=myConsent']).to.contain(url2.replace(url1, ''))
     })
+
+    it('correctly builds URLs if fpid parameters are present')
+    const url1 = getPapiUrl(customer)
+    const url2 = getPapiUrl(customer, {}, 'my_first_party_id')
+    expect(url2.replace(url1, '')).to.equal('&fpid=my_first_party_id')
   })
 
   describe('updateBidderConfig', () => {

From 4fc33aae6be21ace8ef81be176f8014390dcc7ae Mon Sep 17 00:00:00 2001
From: Ryan Schweitzer <50628828+r-schweitzer@users.noreply.github.com>
Date: Tue, 18 Oct 2022 15:17:55 +0200
Subject: [PATCH 348/569] PBS Bid Adapter: alias Fix (#9100)

* Added adjustment for aliasing unregistered bidders for server-side

* removed import
---
 modules/prebidServerBidAdapter/index.js       |  2 +-
 .../modules/prebidServerBidAdapter_spec.js    | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 856b962e8a0..3a082b3199f 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -558,7 +558,7 @@ Object.assign(ORTB2.prototype, {
           const bidder = adapterManager.bidderRegistry[bid.bidder];
           // adding alias only if alias source bidder exists and alias isn't configured to be standalone
           // pbs adapter
-          if (bidder && !bidder.getSpec().skipPbsAliasing) {
+          if (!bidder || !bidder.getSpec().skipPbsAliasing) {
             aliases[bid.bidder] = adapterManager.aliasRegistry[bid.bidder];
           }
         }
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index b5209e5be12..4b9efa72e61 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -1466,6 +1466,30 @@ describe('S2S Adapter', function () {
       });
     });
 
+    it('unregistered bidder should alias', function () {
+      const adjustedConfig = utils.deepClone(CONFIG);
+      adjustedConfig.bidders = 'bidderD'
+      config.setConfig({ s2sConfig: adjustedConfig });
+
+      const aliasBidder = {
+        bidder: 'bidderD',
+        params: {
+          unit: '10433394',
+        }
+      };
+
+      $$PREBID_GLOBAL$$.aliasBidder('mockBidder', aliasBidder.bidder);
+
+      const request = utils.deepClone(REQUEST);
+      request.ad_units[0].bids = [aliasBidder];
+      request.s2sConfig = adjustedConfig;
+
+      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.ext.prebid.aliases).to.deep.equal({ bidderD: 'mockBidder' });
+    });
+
     it('adds dynamic aliases to request', function () {
       config.setConfig({ s2sConfig: CONFIG });
 

From f351c708e7501adeb493b039e957257374e4c6d9 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 18 Oct 2022 06:28:59 -0700
Subject: [PATCH 349/569] Grid & MGID bid adapters: set `spec.gvlid` (#9124)

---
 modules/gridBidAdapter.js | 1 +
 modules/mgidBidAdapter.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index e46d6e352fa..181ce0ebab2 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -39,6 +39,7 @@ let hasSynced = false;
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   aliases: ['playwire', 'adlivetech', { code: 'trustx', skipPbsAliasing: true }],
   supportedMediaTypes: [ BANNER, VIDEO ],
   /**
diff --git a/modules/mgidBidAdapter.js b/modules/mgidBidAdapter.js
index 2653f157196..bca9ae49892 100644
--- a/modules/mgidBidAdapter.js
+++ b/modules/mgidBidAdapter.js
@@ -66,6 +66,7 @@ _each(NATIVE_ASSETS, anAsset => { _NATIVE_ASSET_KEY_TO_ASSET_MAP[anAsset.KEY] =
 export const spec = {
   VERSION: '1.5',
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, NATIVE],
   reId: /^[1-9][0-9]*$/,
   NATIVE_ASSET_ID_TO_KEY_MAP: _NATIVE_ASSET_ID_TO_KEY_MAP,

From caf162e083541eaaad9be52aee33020954e1138f Mon Sep 17 00:00:00 2001
From: Rocco Barbini <46724608+rbarbini-ias@users.noreply.github.com>
Date: Tue, 18 Oct 2022 15:38:03 +0200
Subject: [PATCH 350/569] IAS RTD Module: custom adUnitPath mapping (#9058)

* maintainer updated

* getAdUnitPath extracted to manage the adUnitPath option

getAdUnitPath obtains the p parameter using the exact same technique used before. After obtaining it, it checks if there is an adUnitPath configuration parameter, and if it has a non-empty string mapped to a property named like the ad slot id. If and only if this is the case, it overwrites the p parameter with that string.

Since different adservers may have different conventions, no check is run on the formatting of the ad unit path proper.

* faster getAdUnitPath logic

Only check the map if a value was not retrieved "the usual way". Use utils functions instead of vanilla JavaScript.

* faster getAdUnitPath logic

Only check the map if a value was not retrieved "the usual way". Use utils functions instead of vanilla JavaScript.

* removed unnecessary comment

* updated the maintainer email
---
 modules/iasRtdProvider.js                | 27 ++++++++---
 modules/iasRtdProvider.md                |  2 +-
 test/spec/modules/iasRtdProvider_spec.js | 58 +++++++++++++++++++++++-
 3 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/modules/iasRtdProvider.js b/modules/iasRtdProvider.js
index 605fff8898e..994be7c0804 100644
--- a/modules/iasRtdProvider.js
+++ b/modules/iasRtdProvider.js
@@ -38,7 +38,7 @@ const IAS_KEY_MAPPINGS = {
 
 /**
  * Module init
- * @param {Object} provider
+ * @param {Object} config
  * @param {Object} userConsent
  * @return {boolean}
  */
@@ -71,12 +71,26 @@ function stringifySlotSizes(sizes) {
   return result;
 }
 
-function stringifySlot(bidRequest) {
+function getAdUnitPath(adSlot, bidRequest, adUnitPath) {
+  let p = bidRequest.code;
+  if (!utils.isEmpty(adSlot)) {
+    p = adSlot.gptSlot;
+  } else {
+    if (!utils.isEmpty(adUnitPath) && utils.hasOwn(adUnitPath, bidRequest.code)) {
+      if (utils.isStr(adUnitPath[bidRequest.code]) && !utils.isEmpty(adUnitPath[bidRequest.code])) {
+        p = adUnitPath[bidRequest.code];
+      }
+    }
+  }
+  return p;
+}
+
+function stringifySlot(bidRequest, adUnitPath) {
   const sizes = utils.getAdUnitSizes(bidRequest);
   const id = bidRequest.code;
   const ss = stringifySlotSizes(sizes);
   const adSlot = utils.getGptSlotInfoForAdUnitCode(bidRequest.code);
-  const p = utils.isEmpty(adSlot) ? bidRequest.code : adSlot.gptSlot;
+  const p = getAdUnitPath(adSlot, bidRequest, adUnitPath);
   const slot = { id, ss, p };
   const keyValues = utils.getKeys(slot).map(function (key) {
     return [key, slot[key]].join(':');
@@ -119,12 +133,12 @@ function formatTargetingData(adUnit) {
   return renameKeyValues(result);
 }
 
-function constructQueryString(anId, adUnits, pageUrl) {
+function constructQueryString(anId, adUnits, pageUrl, adUnitPath) {
   let queries = [];
   queries.push(['anId', anId]);
 
   queries = queries.concat(adUnits.reduce(function (acc, request) {
-    acc.push(['slot', stringifySlot(request)]);
+    acc.push(['slot', stringifySlot(request, adUnitPath)]);
     return acc;
   }, []));
 
@@ -191,10 +205,11 @@ function getBidRequestData(reqBidsConfigObj, callback, config, userConsent) {
   const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
   const { pubId } = config.params;
   let { pageUrl } = config.params;
+  const { adUnitPath } = config.params;
   if (!isValidHttpUrl(pageUrl)) {
     pageUrl = document.location.href;
   }
-  const queryString = constructQueryString(pubId, adUnits, pageUrl);
+  const queryString = constructQueryString(pubId, adUnits, pageUrl, adUnitPath);
   ajax(
     `${IAS_HOST}?${queryString}`,
     getApiCallback(),
diff --git a/modules/iasRtdProvider.md b/modules/iasRtdProvider.md
index d8c46ff2697..be47822eb58 100644
--- a/modules/iasRtdProvider.md
+++ b/modules/iasRtdProvider.md
@@ -2,7 +2,7 @@
 
 Module Name: Integral Ad Science(IAS) Rtd Provider
 Module Type: Rtd Provider
-Maintainer: raguilar@integralads.com
+Maintainer: punereporting@integralads.com
 
 # Description
 
diff --git a/test/spec/modules/iasRtdProvider_spec.js b/test/spec/modules/iasRtdProvider_spec.js
index feb4c1093a8..ec4d2bd437a 100644
--- a/test/spec/modules/iasRtdProvider_spec.js
+++ b/test/spec/modules/iasRtdProvider_spec.js
@@ -54,6 +54,59 @@ describe('iasRtdProvider is a RTD provider that', function () {
       const value = iasSubModule.init(config);
       expect(value).to.equal(true);
     });
+    it('returns true with the pubId, keyMappings and adUnitPath params', function () {
+      const config = {
+        name: 'ias',
+        waitForIt: true,
+        params: {
+          pubId: '123456',
+          keyMappings: {
+            'id': 'ias_id'
+          },
+          adUnitPath: {'one-div-id': '/012345/ad/unit/path'}
+        }
+      };
+      const value = iasSubModule.init(config);
+      expect(value).to.equal(true);
+    });
+    it('returns true with the pubId and adUnitPath params with multiple keys', function () {
+      const config = {
+        name: 'ias',
+        waitForIt: true,
+        params: {
+          pubId: '123456',
+          keyMappings: {
+            'id': 'ias_id'
+          },
+          adUnitPath: {
+            'one-div-id': '/012345/ad/unit/path',
+            'another-div-id': '/012345/ad/unit/path',
+            'third-div-id': '/012345/another/ad/unit/path'
+          }
+        }
+      };
+      const value = iasSubModule.init(config);
+      expect(value).to.equal(true);
+    });
+    it('returns true with the pubId and adUnitPath params with empty values', function () {
+      const config = {
+        name: 'ias',
+        waitForIt: true,
+        params: {
+          pubId: '123456',
+          keyMappings: {
+            'id': 'ias_id'
+          },
+          adUnitPath: {
+            'one-div-id': '/012345/ad/unit/path',
+            'another-div-id': '',
+            'third-div-id': ''
+          }
+        }
+      };
+      const value = iasSubModule.init(config);
+      expect(value).to.equal(true);
+    });
   });
   describe('has a method `getBidRequestData` that', function () {
     it('exists', function () {
@@ -138,7 +191,10 @@ const config = {
     keyMappings: {
       'id': 'ias_id'
     },
-    pageUrl: 'https://integralads.com/test'
+    pageUrl: 'https://integralads.com/test',
+    adUnitPath: {
+      'one-div-id': '/012345/ad/unit/path'
+    }
   }
 };
 

From e1aee0827ed5c7ba7bd402d649d84c941fdd5b26 Mon Sep 17 00:00:00 2001
From: Adish Rao <30475159+adish1997@users.noreply.github.com>
Date: Tue, 18 Oct 2022 20:44:54 +0530
Subject: [PATCH 351/569] Medianet Bid Adapter: added AAX bidder alias (#9095)

* added aax bidder alias

* added test for aax alias

Co-authored-by: adish <adish.r@media.net>
---
 modules/medianetBidAdapter.js                |  6 +-
 test/spec/modules/medianetBidAdapter_spec.js | 76 ++++++++++++++++++++
 2 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/modules/medianetBidAdapter.js b/modules/medianetBidAdapter.js
index d19862d2f64..01652a3fac0 100644
--- a/modules/medianetBidAdapter.js
+++ b/modules/medianetBidAdapter.js
@@ -47,6 +47,10 @@ mnData.urlData = {
   isTop: refererInfo.reachedTop
 };
 
+const aliases = [
+  { code: 'aax', gvlid: 720 },
+];
+
 $$PREBID_GLOBAL$$.medianetGlobals = $$PREBID_GLOBAL$$.medianetGlobals || {};
 
 function getTopWindowReferrer() {
@@ -418,7 +422,7 @@ export const spec = {
 
   code: BIDDER_CODE,
   gvlid: 142,
-
+  aliases,
   supportedMediaTypes: [BANNER, NATIVE, VIDEO],
 
   /**
diff --git a/test/spec/modules/medianetBidAdapter_spec.js b/test/spec/modules/medianetBidAdapter_spec.js
index 7333900eedf..9180bbad68c 100644
--- a/test/spec/modules/medianetBidAdapter_spec.js
+++ b/test/spec/modules/medianetBidAdapter_spec.js
@@ -856,25 +856,50 @@ let VALID_BID_REQUEST = [{
       cid: '8CUV090'
     }
   },
+  VALID_PARAMS_AAX = {
+    bidder: 'aax',
+    params: {
+      cid: 'AAXG123'
+    }
+  },
   PARAMS_MISSING = {
     bidder: 'medianet',
   },
+  PARAMS_MISSING_AAX = {
+    bidder: 'aax',
+  },
   PARAMS_WITHOUT_CID = {
     bidder: 'medianet',
     params: {}
   },
+  PARAMS_WITHOUT_CID_AAX = {
+    bidder: 'aax',
+    params: {}
+  },
   PARAMS_WITH_INTEGER_CID = {
     bidder: 'medianet',
     params: {
       cid: 8867587
     }
   },
+  PARAMS_WITH_INTEGER_CID_AAX = {
+    bidder: 'aax',
+    params: {
+      cid: 8867587
+    }
+  },
   PARAMS_WITH_EMPTY_CID = {
     bidder: 'medianet',
     params: {
       cid: ''
     }
   },
+  PARAMS_WITH_EMPTY_CID_AAX = {
+    bidder: 'aax',
+    params: {
+      cid: ''
+    }
+  },
   SYNC_OPTIONS_BOTH_ENABLED = {
     iframeEnabled: true,
     pixelEnabled: true,
@@ -1571,4 +1596,55 @@ describe('Media.net bid adapter', function () {
       expect(requestObj.imp[0].hasOwnProperty('bidfloors')).to.equal(true);
     });
   });
+
+  describe('isBidRequestValid aax', function () {
+    it('should accept valid bid params', function () {
+      let isValid = spec.isBidRequestValid(VALID_PARAMS_AAX);
+      expect(isValid).to.equal(true);
+    });
+
+    it('should reject bid if cid is not present', function () {
+      let isValid = spec.isBidRequestValid(PARAMS_WITHOUT_CID_AAX);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if cid is not a string', function () {
+      let isValid = spec.isBidRequestValid(PARAMS_WITH_INTEGER_CID_AAX);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if cid is a empty string', function () {
+      let isValid = spec.isBidRequestValid(PARAMS_WITH_EMPTY_CID_AAX);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should have missing params', function () {
+      let isValid = spec.isBidRequestValid(PARAMS_MISSING_AAX);
+      expect(isValid).to.equal(false);
+    });
+  });
+
+  describe('interpretResponse aax', function () {
+    it('should not push response if no-bid', function () {
+      let validBids = [];
+      let bids = spec.interpretResponse(SERVER_RESPONSE_NOBID, []);
+      expect(bids).to.deep.equal(validBids);
+    });
+
+    it('should have empty bid response', function() {
+      let bids = spec.interpretResponse(SERVER_RESPONSE_NOBODY, []);
+      expect(bids).to.deep.equal([]);
+    });
+
+    it('should have valid bids', function () {
+      let bids = spec.interpretResponse(SERVER_RESPONSE_VALID_BID, []);
+      expect(bids).to.deep.equal(SERVER_VALID_BIDS);
+    });
+
+    it('should have empty bid list', function() {
+      let validBids = [];
+      let bids = spec.interpretResponse(SERVER_RESPONSE_EMPTY_BIDLIST, []);
+      expect(bids).to.deep.equal(validBids);
+    });
+  });
 });

From f1131296d9ac6169d6bae602b19f8e59a7cacd23 Mon Sep 17 00:00:00 2001
From: Alexandru <prBigBrother@users.noreply.github.com>
Date: Tue, 18 Oct 2022 18:19:39 +0300
Subject: [PATCH 352/569] Brightcom Bid adapter: add support for uspConsent,
 coppa, schain, userIdAsEids, userId (#9063)

* Brightcom: add support for uspConsent, coppa, schain, userIdAsEids, userId

* Brightcom: tests for updates
---
 modules/brightcomBidAdapter.js                | 40 ++++++--
 test/spec/modules/brightcomBidAdapter_spec.js | 95 ++++++++++++++++++-
 2 files changed, 124 insertions(+), 11 deletions(-)

diff --git a/modules/brightcomBidAdapter.js b/modules/brightcomBidAdapter.js
index 64b3c3a9fc8..bbe0203772a 100644
--- a/modules/brightcomBidAdapter.js
+++ b/modules/brightcomBidAdapter.js
@@ -75,6 +75,26 @@ function buildRequests(bidReqs, bidderRequest) {
       deepSetValue(brightcomBidReq, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
     }
 
+    if (bidderRequest && bidderRequest.uspConsent) {
+      deepSetValue(brightcomBidReq, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    if (config.getConfig('coppa') === true) {
+      deepSetValue(brightcomBidReq, 'regs.coppa', 1);
+    }
+
+    if (bidReqs[0] && bidReqs[0].schain) {
+      deepSetValue(brightcomBidReq, 'source.ext.schain', bidReqs[0].schain)
+    }
+
+    if (bidReqs[0] && bidReqs[0].userIdAsEids) {
+      deepSetValue(brightcomBidReq, 'user.ext.eids', bidReqs[0].userIdAsEids || [])
+    }
+
+    if (bidReqs[0] && bidReqs[0].userId) {
+      deepSetValue(brightcomBidReq, 'user.ext.ids', bidReqs[0].userId || [])
+    }
+
     return {
       method: 'POST',
       url: URL,
@@ -103,7 +123,7 @@ function interpretResponse(serverResponse) {
     logWarn('Brightcom server returned empty/non-json response: ' + JSON.stringify(serverResponse.body));
     return [];
   }
-  const { body: {id, seatbid} } = serverResponse;
+  const {body: {id, seatbid}} = serverResponse;
   try {
     const brightcomBidResponses = [];
     if (id &&
@@ -164,9 +184,9 @@ function _isViewabilityMeasurable(element) {
   return !_isIframe() && element !== null;
 }
 
-function _getViewability(element, topWin, { w, h } = {}) {
+function _getViewability(element, topWin, {w, h} = {}) {
   return getWindowTop().document.visibilityState === 'visible'
-    ? _getPercentInView(element, topWin, { w, h })
+    ? _getPercentInView(element, topWin, {w, h})
     : 0;
 }
 
@@ -182,8 +202,8 @@ function _getMinSize(sizes) {
   return sizes.reduce((min, size) => size.h * size.w < min.h * min.w ? size : min);
 }
 
-function _getBoundingBox(element, { w, h } = {}) {
-  let { width, height, left, top, right, bottom } = element.getBoundingClientRect();
+function _getBoundingBox(element, {w, h} = {}) {
+  let {width, height, left, top, right, bottom} = element.getBoundingClientRect();
 
   if ((width === 0 || height === 0) && w && h) {
     width = w;
@@ -192,7 +212,7 @@ function _getBoundingBox(element, { w, h } = {}) {
     bottom = top + h;
   }
 
-  return { width, height, left, top, right, bottom };
+  return {width, height, left, top, right, bottom};
 }
 
 function _getIntersectionOfRects(rects) {
@@ -225,16 +245,16 @@ function _getIntersectionOfRects(rects) {
   return bbox;
 }
 
-function _getPercentInView(element, topWin, { w, h } = {}) {
-  const elementBoundingBox = _getBoundingBox(element, { w, h });
+function _getPercentInView(element, topWin, {w, h} = {}) {
+  const elementBoundingBox = _getBoundingBox(element, {w, h});
 
   // Obtain the intersection of the element and the viewport
-  const elementInViewBoundingBox = _getIntersectionOfRects([ {
+  const elementInViewBoundingBox = _getIntersectionOfRects([{
     left: 0,
     top: 0,
     right: topWin.innerWidth,
     bottom: topWin.innerHeight
-  }, elementBoundingBox ]);
+  }, elementBoundingBox]);
 
   let elementInViewArea, elementTotalArea;
 
diff --git a/test/spec/modules/brightcomBidAdapter_spec.js b/test/spec/modules/brightcomBidAdapter_spec.js
index 9354544ee5a..1ae73708d00 100644
--- a/test/spec/modules/brightcomBidAdapter_spec.js
+++ b/test/spec/modules/brightcomBidAdapter_spec.js
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import * as utils from 'src/utils.js';
 import { spec } from 'modules/brightcomBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import {config} from '../../../src/config';
 
 const URL = 'https://brightcombid.marphezis.com/hb';
 
@@ -52,7 +53,21 @@ describe('brightcomBidAdapter', function() {
       },
       'bidId': '5fb26ac22bde4',
       'bidderRequestId': '4bf93aeb730cb9',
-      'auctionId': 'ffe9a1f7-7b67-4bda-a8e0-9ee5dc9f442e'
+      'auctionId': 'ffe9a1f7-7b67-4bda-a8e0-9ee5dc9f442e',
+      'schain': {
+        'ver': '1.0',
+        'complete': 1,
+        'nodes': [
+          {
+            'asi': 'exchange1.com',
+            'sid': '1234',
+            'hp': 1,
+            'rid': 'bid-request-1',
+            'name': 'publisher',
+            'domain': 'publisher.com'
+          }
+        ]
+      },
     }];
 
     sandbox = sinon.sandbox.create();
@@ -167,6 +182,84 @@ describe('brightcomBidAdapter', function() {
       expect(data.user.ext.consent).to.equal(consentString);
     });
 
+    it('sends us_privacy', function () {
+      const bidderRequest = {
+        uspConsent: '1YYY'
+      };
+      const data = JSON.parse(spec.buildRequests(bidRequests, bidderRequest).data)
+
+      expect(data.regs).to.not.equal(null);
+      expect(data.regs.ext).to.not.equal(null);
+      expect(data.regs.ext.us_privacy).to.equal('1YYY');
+    });
+
+    it('sends coppa', function () {
+      sandbox.stub(config, 'getConfig').withArgs('coppa').returns(true);
+
+      const data = JSON.parse(spec.buildRequests(bidRequests).data)
+      expect(data.regs).to.not.be.undefined;
+      expect(data.regs.coppa).to.equal(1);
+    });
+
+    it('sends schain', function () {
+      const data = JSON.parse(spec.buildRequests(bidRequests).data);
+      expect(data).to.not.be.undefined;
+      expect(data.source).to.not.be.undefined;
+      expect(data.source.ext).to.not.be.undefined;
+      expect(data.source.ext.schain).to.not.be.undefined;
+      expect(data.source.ext.schain.complete).to.equal(1);
+      expect(data.source.ext.schain.ver).to.equal('1.0');
+      expect(data.source.ext.schain.nodes).to.not.be.undefined;
+      expect(data.source.ext.schain.nodes).to.lengthOf(1);
+      expect(data.source.ext.schain.nodes[0].asi).to.equal('exchange1.com');
+      expect(data.source.ext.schain.nodes[0].sid).to.equal('1234');
+      expect(data.source.ext.schain.nodes[0].hp).to.equal(1);
+      expect(data.source.ext.schain.nodes[0].rid).to.equal('bid-request-1');
+      expect(data.source.ext.schain.nodes[0].name).to.equal('publisher');
+      expect(data.source.ext.schain.nodes[0].domain).to.equal('publisher.com');
+    });
+
+    it('sends user eid parameters', function () {
+      bidRequests[0].userIdAsEids = [{
+        source: 'pubcid.org',
+        uids: [{
+          id: 'userid_pubcid'
+        }]
+      }, {
+        source: 'adserver.org',
+        uids: [{
+          id: 'userid_ttd',
+          ext: {
+            rtiPartner: 'TDID'
+          }
+        }]
+      }
+      ];
+
+      const data = JSON.parse(spec.buildRequests(bidRequests).data);
+
+      expect(data.user).to.not.be.undefined;
+      expect(data.user.ext).to.not.be.undefined;
+      expect(data.user.ext.eids).to.not.be.undefined;
+      expect(data.user.ext.eids).to.deep.equal(bidRequests[0].userIdAsEids);
+    });
+
+    it('sends user id parameters', function () {
+      const userId = {
+        sharedid: {
+          id: '01*******',
+          third: '01E*******'
+        }
+      };
+
+      bidRequests[0].userId = userId;
+
+      const data = JSON.parse(spec.buildRequests(bidRequests).data);
+      expect(data.user).to.not.be.undefined;
+      expect(data.user.ext).to.not.be.undefined;
+      expect(data.user.ext.ids).is.deep.equal(userId);
+    });
+
     context('when element is fully in view', function() {
       it('returns 100', function() {
         Object.assign(element, { width: 600, height: 400 });

From fcd1e3c01ef922d52ff3f221cbd1561033575107 Mon Sep 17 00:00:00 2001
From: Stephen Johnston <stephenj@launchpowered.com>
Date: Tue, 18 Oct 2022 13:43:36 -0400
Subject: [PATCH 353/569] PubWise Bid Adapter: clean up and updates to adUnit
 parsing (#9066)

* add pubwise bid adpater updates

* Update pubwiseBidAdapter_spec.js

* updates for feedback from review, adding imp.ext.tid and source.tid from appropriate locations
---
 modules/pubwiseBidAdapter.js                | 26 +++++++++++----------
 test/spec/modules/pubwiseBidAdapter_spec.js | 10 ++++----
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/modules/pubwiseBidAdapter.js b/modules/pubwiseBidAdapter.js
index 7721fe10459..5e381e74a18 100644
--- a/modules/pubwiseBidAdapter.js
+++ b/modules/pubwiseBidAdapter.js
@@ -2,8 +2,7 @@ import { _each, isStr, deepClone, isArray, deepSetValue, inIframe, logMessage, l
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, NATIVE } from '../src/mediaTypes.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
-const VERSION = '0.1.0';
+const VERSION = '0.2.0';
 const GVLID = 842;
 const NET_REVENUE = true;
 const UNDEFINED = undefined;
@@ -117,9 +116,6 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (validBidRequests, bidderRequest) {
-    // convert Native ORTB definition to old-style prebid native definition
-    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
-
     var refererInfo;
     if (bidderRequest && bidderRequest.refererInfo) {
       refererInfo = bidderRequest.refererInfo;
@@ -170,7 +166,7 @@ export const spec = {
     payload.user.geo.lon = _parseSlotParam('lon', conf.lon);
     payload.user.yob = _parseSlotParam('yob', conf.yob);
     payload.device.geo = payload.user.geo;
-    payload.site.page = payload.site.page.trim();
+    payload.site.page = payload.site?.page?.trim();
     payload.site.domain = _getDomainFromURL(payload.site.page);
 
     // add the content object from config in request
@@ -184,7 +180,7 @@ export const spec = {
     }
 
     // passing transactionId in source.tid
-    deepSetValue(payload, 'source.tid', conf.transactionId);
+    deepSetValue(payload, 'source.tid', bidderRequest?.auctionId);
 
     // schain
     if (validBidRequests[0].schain) {
@@ -440,7 +436,10 @@ function _createImpressionObject(bid, conf) {
     tagid: bid.params.adUnit || undefined,
     bidfloor: _parseSlotParam('bidFloor', bid.params.bidFloor), // capitalization dicated by 3.2.4 spec
     secure: 1,
-    bidfloorcur: bid.params.currency ? _parseSlotParam('currency', bid.params.currency) : DEFAULT_CURRENCY // capitalization dicated by 3.2.4 spec
+    bidfloorcur: bid.params.currency ? _parseSlotParam('currency', bid.params.currency) : DEFAULT_CURRENCY, // capitalization dicated by 3.2.4 spec
+    ext: {
+      tid: (bid.transactionId ? bid.transactionId : '')
+    }
   };
 
   if (bid.hasOwnProperty('mediaTypes')) {
@@ -494,7 +493,11 @@ function _parseSlotParam(paramName, paramValue) {
 
 function _parseAdSlot(bid) {
   _logInfo('parseAdSlot bid', bid)
-  bid.params.adUnit = '';
+  if (bid.adUnitCode) {
+    bid.params.adUnit = bid.adUnitCode;
+  } else {
+    bid.params.adUnit = '';
+  }
   bid.params.width = 0;
   bid.params.height = 0;
   bid.params.adSlot = _cleanSlotName(bid.params.adSlot);
@@ -532,9 +535,8 @@ function _cleanSlotName(slotName) {
 
 function _initConf(refererInfo) {
   return {
-    // TODO: do the fallbacks make sense here?
-    pageURL: refererInfo?.page || window.location.href,
-    refURL: refererInfo?.ref || window.document.referrer
+    pageURL: refererInfo?.page,
+    refURL: refererInfo?.ref
   };
 }
 
diff --git a/test/spec/modules/pubwiseBidAdapter_spec.js b/test/spec/modules/pubwiseBidAdapter_spec.js
index 1cf7a7dd280..d7b7a527485 100644
--- a/test/spec/modules/pubwiseBidAdapter_spec.js
+++ b/test/spec/modules/pubwiseBidAdapter_spec.js
@@ -238,7 +238,7 @@ const sampleBidderBannerRequest = {
     'bidFloor': '1.00',
     'currency': 'USD',
     'adSlot': '',
-    'adUnit': '',
+    'adUnit': 'div-gpt-ad-1460505748561-0',
     'bcat': [
       'IAB25-3',
       'IAB26-1',
@@ -535,13 +535,15 @@ describe('PubWiseAdapter', function () {
 
   describe('Handling Request Construction', function () {
     it('bid requests are not mutable', function() {
-      let sourceBidRequest = utils.deepClone(sampleValidBidRequests)
-      spec.buildRequests(sampleValidBidRequests, {auctinId: 'placeholder'});
+      let sourceBidRequest = utils.deepClone(sampleValidBidRequests);
+      spec.buildRequests(sampleValidBidRequests, {auctionId: 'placeholder'});
       expect(sampleValidBidRequests).to.deep.equal(sourceBidRequest, 'Should be unedited as they are used elsewhere');
     });
     it('should handle complex bidRequest', function() {
       let request = spec.buildRequests(sampleValidBidRequests, sampleBidderRequest);
-      expect(request.bidderRequest).to.equal(sampleBidderRequest);
+      expect(request.bidderRequest).to.equal(sampleBidderRequest, "Bid Request Doesn't Match Sample");
+      expect(request.data.source.tid).to.equal(sampleBidderRequest.auctionId, 'AuctionId -> source.tid Mismatch');
+      expect(request.data.imp[0].ext.tid).to.equal(sampleBidderRequest.bids[0].transactionId, 'TransactionId -> ext.tid Mismatch');
     });
     it('must conform to API for buildRequests', function() {
       let request = spec.buildRequests(sampleValidBidRequests);

From c5ffc77fef16f7e956631d3af716d0c5e72c49de Mon Sep 17 00:00:00 2001
From: Anand Venkatraman <avenkatraman@pulsepoint.com>
Date: Wed, 19 Oct 2022 06:44:08 -0400
Subject: [PATCH 354/569] PulsePoint Bid Adapter: First party data (#9114)

* ET-1691: Pulsepoint Analytics adapter for Prebid. (#1)

* ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter

* ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter

* ET-1691: cleanup

* ET-1691: minor

* ET-1691: revert package.json change

* Adding bidRequest to bidFactory.createBid method as per https://github.com/prebid/Prebid.js/issues/509

* ET-1765: Adding support for additional params in PulsePoint adapter (#2)

* ET-1850: Fixing https://github.com/prebid/Prebid.js/issues/866

* Minor fix

* Adding mandatory parameters to Bid

* PulsePoint: Firstparty data support
---
 modules/pulsepointBidAdapter.js               |  17 ++-
 .../spec/modules/pulsepointBidAdapter_spec.js | 123 ++++++++++++++++++
 2 files changed, 134 insertions(+), 6 deletions(-)

diff --git a/modules/pulsepointBidAdapter.js b/modules/pulsepointBidAdapter.js
index 52931be0078..25f82fb60d9 100644
--- a/modules/pulsepointBidAdapter.js
+++ b/modules/pulsepointBidAdapter.js
@@ -153,6 +153,8 @@ function bidResponseAvailable(request, response) {
  * Produces an OpenRTBImpression from a slot config.
  */
 function impression(slot) {
+  var firstPartyData = slot.ortb2Imp?.ext || {};
+  var ext = Object.assign({}, firstPartyData, slotUnknownParams(slot));
   return {
     id: slot.bidId,
     banner: banner(slot),
@@ -160,7 +162,7 @@ function impression(slot) {
     tagid: slot.params.ct.toString(),
     video: video(slot),
     bidfloor: bidFloor(slot),
-    ext: ext(slot),
+    ext: Object.keys(ext).length > 0 ? ext : null,
   };
 }
 
@@ -209,7 +211,7 @@ function video(slot) {
 /**
  * Unknown params are captured and sent on ext
  */
-function ext(slot) {
+function slotUnknownParams(slot) {
   const ext = {};
   const knownParamsMap = {};
   KNOWN_PARAMS.forEach(value => knownParamsMap[value] = 1);
@@ -330,14 +332,16 @@ function site(bidRequests, bidderRequest) {
   const pubId = bidRequests && bidRequests.length > 0 ? bidRequests[0].params.cp : '0';
   const appParams = bidRequests[0].params.app;
   if (!appParams) {
-    return {
+    // use the first party data if available, and override only publisher/ref/page properties
+    var firstPartyData = bidderRequest?.ortb2?.site || {};
+    return Object.assign({}, firstPartyData, {
       publisher: {
         id: pubId.toString(),
       },
       // TODO: does the fallback make sense here?
       ref: bidderRequest?.refererInfo?.ref || window.document.referrer,
       page: bidderRequest?.refererInfo?.page || ''
-    }
+    });
   }
   return null;
 }
@@ -406,7 +410,8 @@ function adSize(slot, sizes) {
  * an openrtb User object.
  */
 function user(bidRequest, bidderRequest) {
-  var ext = {};
+  var user = bidderRequest?.ortb2?.user || { ext: {} };
+  var ext = user.ext;
   if (bidderRequest) {
     if (bidderRequest.gdprConsent) {
       ext.consent = bidderRequest.gdprConsent.consentString;
@@ -418,7 +423,7 @@ function user(bidRequest, bidderRequest) {
       ext.eids = eids;
     }
   }
-  return { ext };
+  return user;
 }
 
 /**
diff --git a/test/spec/modules/pulsepointBidAdapter_spec.js b/test/spec/modules/pulsepointBidAdapter_spec.js
index 4426c91e1ec..825b3abf432 100644
--- a/test/spec/modules/pulsepointBidAdapter_spec.js
+++ b/test/spec/modules/pulsepointBidAdapter_spec.js
@@ -795,4 +795,127 @@ describe('PulsePoint Adapter Tests', function () {
     expect(ortbRequest.imp[0].video.minbitrate).to.equal(200);
     expect(ortbRequest.imp[0].video.protocols).to.eql([1, 2, 4]);
   });
+  it('Verify user level first party data', function () {
+    const bidderRequest = {
+      refererInfo: {
+        page: 'https://publisher.com/home',
+        ref: 'https://referrer'
+      },
+      gdprConsent: {
+        gdprApplies: true,
+        consentString: 'serialized_gpdr_data'
+      },
+      ortb2: {
+        user: {
+          yob: 1985,
+          gender: 'm',
+          ext: {
+            data: {
+              registered: true,
+              interests: ['cars']
+            }
+          }
+        }
+      }
+    };
+    let request = spec.buildRequests(slotConfigs, bidderRequest);
+    let ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.user).to.not.equal(null);
+    expect(ortbRequest.user).to.deep.equal({
+      yob: 1985,
+      gender: 'm',
+      ext: {
+        data: {
+          registered: true,
+          interests: ['cars']
+        },
+        consent: 'serialized_gpdr_data'
+      }
+    });
+  });
+  it('Verify site level first party data', function () {
+    const bidderRequest = {
+      refererInfo: {
+        page: 'https://publisher.com/home',
+        ref: 'https://referrer'
+      },
+      ortb2: {
+        site: {
+          content: {
+            data: [{
+              name: 'www.iris.com',
+              ext: {
+                segtax: 500,
+                cids: ['iris_c73g5jq96mwso4d8']
+              }
+            }]
+          },
+          page: 'http://pub.com/news',
+          ref: 'http://google.com'
+        }
+      }
+    };
+    let request = spec.buildRequests(slotConfigs, bidderRequest);
+    let ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.site).to.not.equal(null);
+    expect(ortbRequest.site).to.deep.equal({
+      content: {
+        data: [{
+          name: 'www.iris.com',
+          ext: {
+            segtax: 500,
+            cids: ['iris_c73g5jq96mwso4d8']
+          }
+        }]
+      },
+      page: 'https://publisher.com/home',
+      ref: 'https://referrer',
+      publisher: {
+        id: 'p10000'
+      }
+    });
+  });
+  it('Verify impression/slot level first party data', function () {
+    const bidderRequests = [{
+      placementCode: '/DfpAccount1/slot1',
+      mediaTypes: {
+        banner: {
+          sizes: [[1, 1]]
+        }
+      },
+      bidId: 'bid12345',
+      params: {
+        cp: 'p10000',
+        ct: 't10000',
+        extra_key1: 'extra_val1',
+        extra_key2: 12345
+      },
+      ortb2Imp: {
+        ext: {
+          data: {
+            pbadslot: 'homepage-top-rect',
+            adUnitSpecificAttribute: '123'
+          }
+        }
+      }
+    }];
+    let request = spec.buildRequests(bidderRequests, bidderRequest);
+    let ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.imp).to.not.equal(null);
+    expect(ortbRequest.imp).to.have.lengthOf(1);
+    expect(ortbRequest.imp[0].ext).to.not.equal(null);
+    expect(ortbRequest.imp[0].ext).to.deep.equal({
+      prebid: {
+        extra_key1: 'extra_val1',
+        extra_key2: 12345
+      },
+      data: {
+        pbadslot: 'homepage-top-rect',
+        adUnitSpecificAttribute: '123'
+      }
+    });
+  });
 });

From f90a8a11a304a78e7dc46b032ade5c407782d36f Mon Sep 17 00:00:00 2001
From: velichkin <alexander.velichkin@mgid.com>
Date: Wed, 19 Oct 2022 14:47:08 +0300
Subject: [PATCH 355/569] Mgid Bid Adapter: fix usage of ortb2 data (#9117)

* Fix Mgid Bid provider:
1. Use ortb2 data
2. Added gvlid to spec

* Fix Mgid Bid provider. Unit-tests
---
 modules/mgidBidAdapter.js                |  8 +++-
 test/spec/modules/mgidBidAdapter_spec.js | 50 ++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/modules/mgidBidAdapter.js b/modules/mgidBidAdapter.js
index bca9ae49892..036effecd88 100644
--- a/modules/mgidBidAdapter.js
+++ b/modules/mgidBidAdapter.js
@@ -178,6 +178,8 @@ export const spec = {
       return;
     }
 
+    const ortb2Data = bidderRequest?.ortb2 || {};
+
     let request = {
       id: deepAccess(bidderRequest, 'bidderRequestId'),
       site: {domain, page},
@@ -191,7 +193,11 @@ export const spec = {
         w: screen.width,
         language: getLanguage()
       },
-      ext: {mgid_ver: spec.VERSION, prebid_ver: '$prebid.version$'},
+      ext: {
+        mgid_ver: spec.VERSION,
+        prebid_ver: '$prebid.version$',
+        ...ortb2Data
+      },
       imp
     };
     if (bidderRequest && bidderRequest.gdprConsent) {
diff --git a/test/spec/modules/mgidBidAdapter_spec.js b/test/spec/modules/mgidBidAdapter_spec.js
index 34ad29b3e92..c79cad6245d 100644
--- a/test/spec/modules/mgidBidAdapter_spec.js
+++ b/test/spec/modules/mgidBidAdapter_spec.js
@@ -31,6 +31,10 @@ describe('Mgid bid adapter', function () {
   const mgid_ver = spec.VERSION;
   const utcOffset = (new Date()).getTimezoneOffset().toString();
 
+  it('should expose gvlid', function() {
+    expect(spec.gvlid).to.equal(358)
+  });
+
   describe('isBidRequestValid', function () {
     let bid = {
       'adUnitCode': 'div',
@@ -541,6 +545,52 @@ describe('Mgid bid adapter', function () {
         'data': '{"site":{"domain":"' + domain + '","page":"' + page + '"},"cur":["USD"],"geo":{"utcoffset":' + utcOffset + '},"device":{"ua":"' + ua + '","js":1,"dnt":' + dnt + ',"h":' + screenHeight + ',"w":' + screenWidth + ',"language":"' + lang + '"},"ext":{"mgid_ver":"' + mgid_ver + '","prebid_ver":"' + version + '"},"imp":[{"tagid":"2/div","secure":' + secure + ',"banner":{"w":300,"h":600,"format":[{"w":300,"h":600},{"w":300,"h":250}],"pos":1}}]}',
       });
     });
+    it('should proper handle ortb2 data', function () {
+      let bid = Object.assign({}, abid);
+      bid.mediaTypes = {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      };
+      let bidRequests = [bid];
+
+      let bidderRequest = {
+        ortb2: {
+          site: {
+            content: {
+              data: [{
+                name: 'mgid.com',
+                ext: {
+                  segtax: 1,
+                },
+                segment: [
+                  {id: '123'},
+                  {id: '456'},
+                ],
+              }]
+            }
+          },
+          user: {
+            data: [{
+              name: 'mgid.com',
+              ext: {
+                segtax: 2,
+              },
+              segment: [
+                {'id': '789'},
+                {'id': '987'},
+              ],
+            }]
+          }
+        }
+      };
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).deep.equal('https://prebid.mgid.com/prebid/1');
+      expect(request.method).deep.equal('POST');
+      const data = JSON.parse(request.data);
+      expect(data.ext).deep.include(bidderRequest.ortb2);
+    });
   });
 
   describe('interpretResponse', function () {

From b90ee9125fd332448453d1ba862d52fb5b2ce603 Mon Sep 17 00:00:00 2001
From: Jason Lydon <95770514+ftxmoJason@users.noreply.github.com>
Date: Wed, 19 Oct 2022 09:48:31 -0400
Subject: [PATCH 356/569] FTRACK USER ID MODULE: tweaking the createEidsArray()
 method to accept two schema patterns (#9123)

* JDB-563: tweaking the createEidsArray() method to accept two schema patterns

* JDB-563: further cleanup now that I understand the the decode method should be used to prepare the data

* JDB-563: adding shortcircuit back into decode method

Co-authored-by: Jason Lydon <jason.lydon@flashtalking.com>
---
 modules/ftrackIdSystem.js                |  37 ++-
 modules/userId/eids.js                   |  18 +-
 test/spec/modules/eids_spec.js           |  18 +-
 test/spec/modules/ftrackIdSystem_spec.js | 290 ++++++++++++++++-------
 4 files changed, 246 insertions(+), 117 deletions(-)

diff --git a/modules/ftrackIdSystem.js b/modules/ftrackIdSystem.js
index 55f04e6b1d3..244807a3164 100644
--- a/modules/ftrackIdSystem.js
+++ b/modules/ftrackIdSystem.js
@@ -48,20 +48,39 @@ export const ftrackIdSubmodule = {
    *   similar to the module name and ending in id or Id
    */
   decode (value, config) {
-    if (!value) { return }
-    const ext = {}
+    if (!value) {
+      return;
+    };
 
-    for (var key in value) {
-      /** unpack the strings from the arrays */
-      ext[key] = value[key][0]
+    const DECODE_RESPONSE = {
+      ftrackId: {
+        uid: '',
+        ext: {}
+      }
     }
 
-    return {
-      ftrackId: {
-        uid: value.DeviceID && value.DeviceID[0],
-        ext
+    // Loop over the value's properties:
+    // -- if string, assign value as is.
+    // -- if array, convert to string then assign value.
+    // -- If neither type, assign value as empty string
+    for (var key in value) {
+      let keyValue = value[key];
+      if (Array.isArray(keyValue)) {
+        keyValue = keyValue.join('|');
+      } else if (typeof value[key] !== 'string') {
+        // Unexpected value type, should be string or array
+        keyValue = '';
       }
+
+      DECODE_RESPONSE.ftrackId.ext[key] = keyValue;
     }
+
+    // If we have DeviceId value, assign it to the uid property
+    if (DECODE_RESPONSE.ftrackId.ext.hasOwnProperty('DeviceID')) {
+      DECODE_RESPONSE.ftrackId.uid = DECODE_RESPONSE.ftrackId.ext.DeviceID;
+    }
+
+    return DECODE_RESPONSE;
   },
 
   /**
diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index 23dc9809041..e0a076c313f 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -419,17 +419,12 @@ export function createEidsArray(bidRequestUserId) {
       if (subModuleKey === 'pubProvidedId') {
         eids = eids.concat(bidRequestUserId['pubProvidedId']);
       } else if (subModuleKey === 'ftrackId') {
-        // ftrack has multiple IDs so we add each one that exists
-        let eid = {
-          'atype': 1,
-          'id': (bidRequestUserId.ftrackId.DeviceID || []).join('|'),
-          'ext': {}
-        }
-        for (let id in bidRequestUserId.ftrackId) {
-          eid.ext[id] = (bidRequestUserId.ftrackId[id] || []).join('|');
-        }
-
-        eids.push(eid);
+        // Schema based on the return value of ftrack decode() method
+        eids.push({
+          atype: 1,
+          ext: bidRequestUserId.ftrackId.ext,
+          id: bidRequestUserId.ftrackId.uid
+        });
       } else if (Array.isArray(bidRequestUserId[subModuleKey])) {
         bidRequestUserId[subModuleKey].forEach((config, index, arr) => {
           const eid = createEidObject(config, subModuleKey);
@@ -446,6 +441,7 @@ export function createEidsArray(bidRequestUserId) {
       }
     }
   }
+
   return eids;
 }
 
diff --git a/test/spec/modules/eids_spec.js b/test/spec/modules/eids_spec.js
index 6872145710c..ba9210dcb71 100644
--- a/test/spec/modules/eids_spec.js
+++ b/test/spec/modules/eids_spec.js
@@ -444,11 +444,15 @@ describe('eids array generation for known sub-modules', function() {
 
   describe('ftrackId', () => {
     it('should return the correct EID schema', () => {
+      // This is the schema returned from the ftrack decode() method
       expect(createEidsArray({
         ftrackId: {
-          DeviceID: ['aaa', 'bbb'],
-          SingleDeviceID: ['ccc', 'ddd'],
-          HHID: ['eee', 'fff']
+          uid: 'test-device-id',
+          ext: {
+            DeviceID: 'test-device-id',
+            SingleDeviceID: 'test-single-device-id',
+            HHID: 'test-household-id'
+          }
         },
         foo: {
           bar: 'baz'
@@ -458,11 +462,11 @@ describe('eids array generation for known sub-modules', function() {
         }
       })).to.deep.equal([{
         atype: 1,
-        id: 'aaa|bbb',
+        id: 'test-device-id',
         ext: {
-          DeviceID: 'aaa|bbb',
-          SingleDeviceID: 'ccc|ddd',
-          HHID: 'eee|fff'
+          DeviceID: 'test-device-id',
+          SingleDeviceID: 'test-single-device-id',
+          HHID: 'test-household-id'
         }
       }]);
     });
diff --git a/test/spec/modules/ftrackIdSystem_spec.js b/test/spec/modules/ftrackIdSystem_spec.js
index 2c3f3f8576c..79a11845a0f 100644
--- a/test/spec/modules/ftrackIdSystem_spec.js
+++ b/test/spec/modules/ftrackIdSystem_spec.js
@@ -275,10 +275,55 @@ describe('FTRACK ID System', () => {
 
   describe(`decode() method`, () => {
     it(`should respond with an object with the key 'ftrackId'`, () => {
-      expect(ftrackIdSubmodule.decode('value', configMock)).to.deep.equal({
+      const MOCK_VALUE_STRINGS = {
+          HHID: 'household_test_id',
+          DeviceID: 'device_test_id',
+          SingleDeviceID: 'single_device_test_id'
+        },
+        MOCK_VALUE_ARRAYS = {
+          HHID: ['household_test_id', 'a', 'b'],
+          DeviceID: ['device_test_id', 'c', 'd'],
+          SingleDeviceID: ['single_device_test_id', 'e', 'f']
+        },
+        MOCK_VALUE_BOTH = {
+          foo: ['foo', 'a', 'b'],
+          bar: 'bar',
+          baz: ['baz', 'baz', 'baz']
+        };
+
+      // strings are just passed through
+      expect(ftrackIdSubmodule.decode(MOCK_VALUE_STRINGS, configMock)).to.deep.equal({
+        ftrackId: {
+          ext: {
+            HHID: 'household_test_id',
+            DeviceID: 'device_test_id',
+            SingleDeviceID: 'single_device_test_id'
+          },
+          uid: 'device_test_id',
+        },
+      });
+
+      // arrays are converted to strings
+      expect(ftrackIdSubmodule.decode(MOCK_VALUE_ARRAYS, configMock)).to.deep.equal({
         ftrackId: {
-          ext: { 0: 'v', 1: 'a', 2: 'l', 3: 'u', 4: 'e' },
-          uid: undefined,
+          ext: {
+            HHID: 'household_test_id|a|b',
+            DeviceID: 'device_test_id|c|d',
+            SingleDeviceID: 'single_device_test_id|e|f'
+          },
+          uid: 'device_test_id|c|d',
+        },
+      });
+
+      // mix of both but uid should be empty string because DeviceId is not defined
+      expect(ftrackIdSubmodule.decode(MOCK_VALUE_BOTH, configMock)).to.deep.equal({
+        ftrackId: {
+          ext: {
+            foo: 'foo|a|b',
+            bar: 'bar',
+            baz: 'baz|baz|baz'
+          },
+          uid: '',
         },
       });
     });
@@ -309,56 +354,40 @@ describe('FTRACK ID System', () => {
   });
 
   describe('pbjs "get id" methods', () => {
-    // The full set of ftrack IDs to test against
-    let expectedIds = {
-      HHID: ['household_test_id'],
-      DeviceID: ['device_test_id'],
-      SingleDeviceID: ['single_device_test_id']
-    };
-    // The full config mock
-    let userSyncConfigMock = {
-      userSync: {
-        auctionDelay: 10,
-        userIds: [{
-          name: 'ftrack',
-          value: {
-            ftrackId: expectedIds
-          }
-        }]
-      }
-    };
-    // The full eids response
-    let expectedEids = [{
-      id: 'device_test_id',
-      atype: 1,
-      ext: {
-        HHID: expectedIds.HHID.join('|'),
-        DeviceID: expectedIds.DeviceID.join('|'),
-        SingleDeviceID: expectedIds.SingleDeviceID.join('|')
-      }
-    }];
-
     beforeEach(() => {
       init(config);
       setSubmoduleRegistry([ftrackIdSubmodule]);
     });
 
-    afterEach(() => {
-      // Reset expectedIds to the default values because some tests overwrite them
-      expectedIds = {
-        HHID: ['household_test_id'],
-        DeviceID: ['device_test_id'],
-        SingleDeviceID: ['single_device_test_id']
-      };
-    });
-
     describe('pbjs.getUserIdsAsync()', () => {
-      it('should return the IDs in the correct schema', () => {
-        config.setConfig(userSyncConfigMock);
+      it('should return the IDs in the correct schema - flat schema', () => {
+        config.setConfig({
+          userSync: {
+            auctionDelay: 10,
+            userIds: [{
+              name: 'ftrack',
+              value: {
+                ftrackId: {
+                  uid: 'device_test_id',
+                  ext: {
+                    HHID: 'household_test_id',
+                    DeviceID: 'device_test_id',
+                    SingleDeviceID: 'single_device_test_id'
+                  }
+                }
+              }
+            }]
+          }
+        });
 
         getGlobal().getUserIdsAsync().then(ids => {
           expect(ids).to.deep.equal({
-            ftrackId: expectedIds
+            uid: 'device_test_id',
+            ftrackId: {
+              HHID: 'household_test_id',
+              DeviceID: 'device_test_id',
+              SingleDeviceID: 'single_device_test_id'
+            }
           });
         });
       });
@@ -366,73 +395,154 @@ describe('FTRACK ID System', () => {
 
     describe('pbjs.getUserIds()', () => {
       it('should return the IDs in the correct schema', () => {
-        config.setConfig(userSyncConfigMock);
+        config.setConfig({
+          userSync: {
+            auctionDelay: 10,
+            userIds: [{
+              name: 'ftrack',
+              value: {
+                ftrackId: {
+                  uid: 'device_test_id',
+                  ext: {
+                    HHID: 'household_test_id',
+                    DeviceID: 'device_test_id',
+                    SingleDeviceID: 'single_device_test_id'
+                  }
+                }
+              }
+            }]
+          }
+        });
 
         expect(getGlobal().getUserIds()).to.deep.equal({
-          'ftrackId': expectedIds
+          ftrackId: {
+            uid: 'device_test_id',
+            ext: {
+              HHID: 'household_test_id',
+              DeviceID: 'device_test_id',
+              SingleDeviceID: 'single_device_test_id'
+            }
+          }
         });
       });
     });
 
     describe('pbjs.getUserIdsAsEids()', () => {
-      it('should return the correct EIDs schema', () => {
-        let userSyncConfig = Object.assign({}, userSyncConfigMock);
-
-        config.setConfig(userSyncConfig);
+      it('should return the correct EIDs schema ', () => {
+        // Pass all three IDs
+        config.setConfig({
+          userSync: {
+            auctionDelay: 10,
+            userIds: [{
+              name: 'ftrack',
+              value: {
+                ftrackId: {
+                  uid: 'device_test_id',
+                  ext: {
+                    HHID: 'household_test_id',
+                    DeviceID: 'device_test_id',
+                    SingleDeviceID: 'single_device_test_id'
+                  }
+                }
+              }
+            }]
+          }
+        });
 
-        expect(getGlobal().getUserIdsAsEids()).to.deep.equal(expectedEids);
+        expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
+          id: 'device_test_id',
+          atype: 1,
+          ext: {
+            HHID: 'household_test_id',
+            DeviceID: 'device_test_id',
+            SingleDeviceID: 'single_device_test_id'
+          }
+        }]);
       });
 
       describe('by ID type:', () => {
         it('- DeviceID', () => {
-          let userSyncConfig = Object.assign({}, userSyncConfigMock);
-
-          userSyncConfig.userSync.userIds[0].value.ftrackId = {
-            DeviceID: ['device_test_id']
-          };
-
-          let expectedEidsClone = expectedEids.slice();
-          expectedEidsClone[0].ext = {
-            DeviceID: expectedIds.DeviceID.join('|')
-          };
-
-          config.setConfig(userSyncConfig);
+          // Pass DeviceID only
+          config.setConfig({
+            userSync: {
+              auctionDelay: 10,
+              userIds: [{
+                name: 'ftrack',
+                value: {
+                  ftrackId: {
+                    uid: 'device_test_id',
+                    ext: {
+                      DeviceID: 'device_test_id',
+                    }
+                  }
+                }
+              }]
+            }
+          });
 
-          expect(getGlobal().getUserIdsAsEids()).to.deep.equal(expectedEidsClone);
+          expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
+            id: 'device_test_id',
+            atype: 1,
+            ext: {
+              DeviceID: 'device_test_id'
+            }
+          }]);
         });
 
         it('- HHID', () => {
-          let userSyncConfig = Object.assign({}, userSyncConfigMock);
-          userSyncConfig.userSync.userIds[0].value.ftrackId = {
-            HHID: ['household_test_id']
-          };
-
-          let expectedEidsClone = expectedEids.slice();
-          expectedEidsClone[0].id = '';
-          expectedEidsClone[0].ext = {
-            HHID: expectedIds.HHID.join('|')
-          };
-
-          config.setConfig(userSyncConfig);
+          // Pass HHID only
+          config.setConfig({
+            userSync: {
+              auctionDelay: 10,
+              userIds: [{
+                name: 'ftrack',
+                value: {
+                  ftrackId: {
+                    uid: '',
+                    ext: {
+                      HHID: 'household_test_id'
+                    }
+                  }
+                }
+              }]
+            }
+          });
 
-          expect(getGlobal().getUserIdsAsEids()).to.deep.equal(expectedEidsClone);
+          expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
+            id: '',
+            atype: 1,
+            ext: {
+              HHID: 'household_test_id'
+            }
+          }]);
         });
 
         it('- SingleDeviceID', () => {
-          let userSyncConfig = Object.assign({}, userSyncConfigMock);
-          userSyncConfig.userSync.userIds[0].value.ftrackId = {
-            SingleDeviceID: ['single_device_test_id']
-          };
-
-          let expectedEidsClone = expectedEids.slice();
-          expectedEidsClone[0].id = '';
-          expectedEidsClone[0].ext = {
-            SingleDeviceID: expectedIds.SingleDeviceID.join('|')
-          };
-
-          config.setConfig(userSyncConfig);
+          // Pass SingleDeviceID only
+          config.setConfig({
+            userSync: {
+              auctionDelay: 10,
+              userIds: [{
+                name: 'ftrack',
+                value: {
+                  ftrackId: {
+                    uid: '',
+                    ext: {
+                      SingleDeviceID: 'single_device_test_id'
+                    }
+                  }
+                }
+              }]
+            }
+          });
 
-          expect(getGlobal().getUserIdsAsEids()).to.deep.equal(expectedEidsClone);
+          expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
+            id: '',
+            atype: 1,
+            ext: {
+              SingleDeviceID: 'single_device_test_id'
+            }
+          }]);
         });
       });
     });

From 2bf778470b28f19b2a3c0a32b59214e5256ddad6 Mon Sep 17 00:00:00 2001
From: Tiago Peczenyj <tiago.peczenyj@gmail.com>
Date: Wed, 19 Oct 2022 18:11:49 +0200
Subject: [PATCH 357/569] Weborama RTD Module: add support to asset ids on
 contextual api (#9086)

* format doc

* refacto configuration

* refactor module

* refactor code by change 3 constants to use one

* use single quote

* refactor profile validator

* refactor wrapping code

* improve type return

* update jsdoc, refactor some code

* refactor Object.keys

* update jsdoc

* refactor specific bidder code

* refactor jscode

* refactor jscode

* dont repeat yourself

* add more info in components

* convert to class

* move all code to private methods

* refactor into class with private methods

* remove global list of components

* update tests, refactor code

* finish refactor

* implement feature

* update doc

* fix doc

* update integration example

* add url parameter

* Update weboramaRtdProvider.md

Fix typo

* improve asset id handling

* adapt test to use webo_vctx when handle asset id

* fix observations from julien

* update fallback rules on contextual

* fix doc
---
 .../gpt/weboramaRtdProvider_example.html      |   61 +-
 modules/weboramaRtdProvider.js                | 1443 +++++++++--------
 modules/weboramaRtdProvider.md                |   32 +
 test/spec/modules/weboramaRtdProvider_spec.js |  382 +++++
 4 files changed, 1224 insertions(+), 694 deletions(-)

diff --git a/integrationExamples/gpt/weboramaRtdProvider_example.html b/integrationExamples/gpt/weboramaRtdProvider_example.html
index 73843c49914..7e75721103f 100644
--- a/integrationExamples/gpt/weboramaRtdProvider_example.html
+++ b/integrationExamples/gpt/weboramaRtdProvider_example.html
@@ -1,12 +1,9 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>weborama rtd submodule example</title>
-</head>
-
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>weborama rtd submodule example</title>
+    </head>
 <body>
 
     <script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
@@ -33,16 +30,19 @@
                             weboCtxConf: {
                                 token: "to-be-defined", // mandatory
                                 targetURL: "https://prebid.org", // default is document.URL
+                                assetID: "token:identifier", // new parameter, overrides url
                                 setPrebidTargeting: true, // override param.setPrebidTargeting or default true
                                 sendToBidders: true,      // override param.sendToBidders or default true
                                 defaultProfile: {         // optional
                                     webo_ctx: ["Rugby_Renault_c11495", "Sport_c11893"],
                                     webo_ds: ['bar']
                                 },
+                                baseURLProfileAPI: 'ctx-preprod.weborama.com',
                                 // enabled: false,
                                 //, onData: function (data,...) { ...}
                             },
                             weboUserDataConf: {
+                                enabled: false,
                                 accountId: 12345,         // recommended
                                 setPrebidTargeting: true, // override param.setPrebidTargeting or default true
                                 sendToBidders: ['smartadserver'], // specify the bidder to share data
@@ -55,7 +55,7 @@
                                 //, onData: function (data,...) { ...}
                             },
                             sfbxLiteDataConf: {
-                                enabled: true,
+                                enabled: false,
                                 defaultProfile: {           // optional
                                     lite_occupation: ['gérant', 'bénévole'],
                                     lite_hobbies: ['sport', 'cinéma'],
@@ -118,46 +118,6 @@
                         networkId: 456456,
                     },
                 }]
-            },
-            {
-                code: '/1056029/webo-wam-prebid',
-                mediaTypes: {
-                    banner: {
-                        sizes: div_2_sizes
-                    }
-                },
-                bids: [{
-                    bidder: 'smartadserver',
-                    params: {
-                        siteId: 1234,
-                        pageId: 1234,
-                        formatId: 1234,
-                    }
-                }, {
-                    bidder: 'pubmatic',
-                    params: {
-                        publisherId: '32572',
-                    }
-                }, {
-                    bidder: 'appnexus',
-                    params: {
-                        placementId: 234234,
-                    }
-                }, {
-                    bidder: 'rubicon',
-                    params: {
-                        accountId: '14062',
-                        siteId: '70608',
-                        zoneId: '335918',
-                        userId: '12346',
-                    }
-                }, {
-                    bidder: 'criteo',
-                    params: {
-                        zoneId: 234234,
-                        networkId: 456456,
-                    },
-                }]
             }
         ];
 
@@ -197,7 +157,6 @@
 
         googletag.cmd.push(function () {
             googletag.defineSlot('/1056029/webo-ctx-prebid', div_1_sizes, 'div-gpt-ad-1620653642627-0').addService(googletag.pubads());
-            googletag.defineSlot('/1056029/webo-wam-prebid', div_2_sizes, 'div-gpt-ad-1645023761875-0').addService(googletag.pubads());
             googletag.pubads().disableInitialLoad();
             googletag.enableServices();
         });
diff --git a/modules/weboramaRtdProvider.js b/modules/weboramaRtdProvider.js
index 533e669fcaa..12e8d4b23c8 100644
--- a/modules/weboramaRtdProvider.js
+++ b/modules/weboramaRtdProvider.js
@@ -7,83 +7,98 @@
  * @requires module:modules/realTimeData
  */
 
-/**
+/** profile metadata
  * @typedef dataCallbackMetadata
- * @property {Boolean} user if true it is user-centric data
- * @property {String} source describe the source of data, if "contextual" or "wam"
- * @property {Boolean} isDefault if true it the default profile defined in the configuration
+ * @property {boolean} user if true it is user-centric data
+ * @property {string} source describe the source of data, if 'contextual' or 'wam'
+ * @property {boolean} isDefault if true it the default profile defined in the configuration
+ */
+
+/** profile from contextual, wam or sfbx
+ * @typedef {Object.<string,string[]>} Profile
  */
 
 /** onData callback type
  * @callback dataCallback
- * @param {Object} data profile data
+ * @param {Profile} data profile data
  * @param {dataCallbackMetadata} meta metadata
  * @returns {void}
  */
 
 /** setPrebidTargeting callback type
  * @callback setPrebidTargetingCallback
- * @param {String} adUnitCode
- * @param {Object} data
+ * @param {string} adUnitCode
+ * @param {Profile} data
  * @param {dataCallbackMetadata} metadata
- * @returns {Boolean}
+ * @returns {boolean}
  */
 
 /** sendToBidders callback type
  * @callback sendToBiddersCallback
  * @param {Object} bid
- * @param {String} adUnitCode
- * @param {Object} data
+ * @param {string} adUnitCode
+ * @param {Profile} data
  * @param {dataCallbackMetadata} metadata
- * @returns {Boolean}
+ * @returns {boolean}
  */
 
 /**
  * @typedef {Object} ModuleParams
- * @property {?setPrebidTargetingCallback|?Boolean|?Object} setPrebidTargeting if true, will set the GAM targeting (default undefined)
- * @property {?sendToBiddersCallback|?Boolean|?Object} sendToBidders if true, will send the contextual profile to all bidders, else expects a list of allowed bidders (default undefined)
+ * @property {?setPrebidTargetingCallback|?boolean|?Object} setPrebidTargeting if true, will set the GAM targeting (default undefined)
+ * @property {?sendToBiddersCallback|?boolean|?Object} sendToBidders if true, will send the contextual profile to all bidders, else expects a list of allowed bidders (default undefined)
  * @property {?dataCallback} onData callback
  * @property {?WeboCtxConf} weboCtxConf site-centric contextual configuration
  * @property {?WeboUserDataConf} weboUserDataConf user-centric wam configuration
  * @property {?SfbxLiteDataConf} sfbxLiteDataConf site-centric lite configuration
  */
 
+/**
+ * @callback assetIDcallback
+ * @returns {string} should return asset identifier using the form datasource:docId
+ */
 /**
  * @typedef {Object} WeboCtxConf
  * @property {string} token required token to be used on bigsea contextual API requests
  * @property {?string} targetURL specify the target url instead use the referer
- * @property {?setPrebidTargetingCallback|?Boolean|?Object} setPrebidTargeting if true, will set the GAM targeting (default undefined)
- * @property {?sendToBiddersCallback|?Boolean|?Object} sendToBidders if true, will send the contextual profile to all bidders, else expects a list of allowed bidders (default undefined)
+ * @property {?assetIDcallback|?string} assetID specifies the assert identifier using the form datasource:docId or via callback
+ * @property {?setPrebidTargetingCallback|?boolean|?Object} setPrebidTargeting if true, will set the GAM targeting (default undefined)
+ * @property {?sendToBiddersCallback|?boolean|?Object} sendToBidders if true, will send the contextual profile to all bidders, else expects a list of allowed bidders (default undefined)
  * @property {?dataCallback} onData callback
- * @property {?object} defaultProfile to be used if the profile is not found
- * @property {?Boolean} enabled if false, will ignore this configuration
+ * @property {?Profile} defaultProfile to be used if the profile is not found
+ * @property {?boolean} enabled if false, will ignore this configuration
  * @property {?string} baseURLProfileAPI to be used to point to a different domain than ctx.weborama.com
  */
 
 /**
  * @typedef {Object} WeboUserDataConf
  * @property {?number} accountId wam account id
- * @property {?setPrebidTargetingCallback|?Boolean|?Object} setPrebidTargeting if true, will set the GAM targeting (default undefined)
- * @property {?sendToBiddersCallback|?Boolean|?Object} sendToBidders if true, will send the contextual profile to all bidders, else expects a list of allowed bidders (default undefined)
- * @property {?object} defaultProfile to be used if the profile is not found
+ * @property {?setPrebidTargetingCallback|?boolean|?Object} setPrebidTargeting if true, will set the GAM targeting (default undefined)
+ * @property {?sendToBiddersCallback|?boolean|?Object} sendToBidders if true, will send the contextual profile to all bidders, else expects a list of allowed bidders (default undefined)
+ * @property {?Profile} defaultProfile to be used if the profile is not found
  * @property {?dataCallback} onData callback
  * @property {?string} localStorageProfileKey can be used to customize the local storage key (default is 'webo_wam2gam_entry')
- * @property {?Boolean} enabled if false, will ignore this configuration
+ * @property {?boolean} enabled if false, will ignore this configuration
  */
 
 /**
  * @typedef {Object} SfbxLiteDataConf
- * @property {?setPrebidTargetingCallback|?Boolean|?Object} setPrebidTargeting if true, will set the GAM targeting (default undefined)
- * @property {?sendToBiddersCallback|?Boolean|?Object} sendToBidders if true, will send the contextual profile to all bidders, else expects a list of allowed bidders (default undefined)
- * @property {?object} defaultProfile to be used if the profile is not found
+ * @property {?setPrebidTargetingCallback|?boolean|?Object} setPrebidTargeting if true, will set the GAM targeting (default undefined)
+ * @property {?sendToBiddersCallback|?boolean|?Object} sendToBidders if true, will send the contextual profile to all bidders, else expects a list of allowed bidders (default undefined)
+ * @property {?Profile} defaultProfile to be used if the profile is not found
  * @property {?dataCallback} onData callback
  * @property {?string} localStorageProfileKey can be used to customize the local storage key (default is '_lite')
- * @property {?Boolean} enabled if false, will ignore this configuration
+ * @property {?boolean} enabled if false, will ignore this configuration
  */
+
+/** common configuration between contextual, wam and sfbx
+ * @typedef {WeboCtxConf|WeboUserDataConf|SfbxLiteDataConf} CommonConf
+ */
+
 import {
   getGlobal
 } from '../src/prebidGlobal.js';
 import {
+  deepClone,
   deepSetValue,
   isEmpty,
   isFn,
@@ -93,8 +108,9 @@ import {
   isStr,
   isBoolean,
   isPlainObject,
-  deepClone,
-  tryAppendQueryString, mergeDeep, logWarn
+  logWarn,
+  mergeDeep,
+  tryAppendQueryString
 } from '../src/utils.js';
 import {
   submodule
@@ -127,431 +143,869 @@ const WEBO_CTX_CONF_SECTION = 'weboCtxConf';
 const WEBO_USER_DATA_CONF_SECTION = 'weboUserDataConf';
 /** @type {string} */
 const SFBX_LITE_DATA_CONF_SECTION = 'sfbxLiteDataConf';
-
+/** @type {string} */
+const WEBO_CTX_SOURCE_LABEL = 'contextual';
+/** @type {string} */
+const WEBO_USER_DATA_SOURCE_LABEL = 'wam';
+/** @type {string} */
+const SFBX_LITE_DATA_SOURCE_LABEL = 'lite';
 /** @type {number} */
 const GVLID = 284;
-/** @type {?Object} */
+
 export const storage = getStorageManager({
   gvlid: GVLID,
   moduleName: SUBMODULE_NAME
 });
 
-/** @type {null|Object} */
-let _weboContextualProfile = null;
+/**
+ * @typedef {Object} Component
+ * @property {boolean} initialized
+ * @property {?Profile} data
+ * @property {boolean} user if true it is user-centric data
+ * @property {string} source describe the source of data, if 'contextual' or 'wam'
+ * @property {buildProfileHandlerCallbackBuilder} callbackBuilder
+ */
+
+/**
+ * @typedef {Object} Components
+ * @property {Component} WeboCtx
+ * @property {Component} WeboUserData
+ * @property {Component} SfbxLiteData
+ */
 
-/** @type {Boolean} */
-let _weboCtxInitialized = false;
+/**
+ * @classdesc Weborama Real Time Data Provider
+ * @class
+ */
+class WeboramaRtdProvider {
+  #components;
+  name = SUBMODULE_NAME;
+  /**
+   * @param  {Components} components
+   */
+  constructor(components) {
+    this.#components = components;
+  }
+  /** Initialize module
+   * @method
+   * @param {Object} moduleConfig
+   * @param {?ModuleParams} moduleConfig.params
+   * @return {boolean} true if module was initialized with success
+   */
+  init(moduleConfig) {
+    /** @type {Object} */
+    const globalDefaults = {
+      setPrebidTargeting: true,
+      sendToBidders: true,
+      onData: () => {
+        /* do nothing */
+      }
+    };
+    /** @type {ModuleParams} */
+    const moduleParams = Object.assign({}, globalDefaults, moduleConfig?.params || {});
 
-/** @type {?Object} */
-let _weboUserDataUserProfile = null;
+    // reset profiles
 
-/** @type {Boolean} */
-let _weboUserDataInitialized = false;
+    this.#components.WeboCtx.data = null;
+    this.#components.WeboUserData.data = null;
+    this.#components.SfbxLiteData.data = null;
 
-/** @type {?Object} */
-let _sfbxLiteDataProfile = null;
+    this.#components.WeboCtx.initialized = this.#initSubSection(moduleParams, WEBO_CTX_CONF_SECTION, 'token');
+    this.#components.WeboUserData.initialized = this.#initSubSection(moduleParams, WEBO_USER_DATA_CONF_SECTION);
+    this.#components.SfbxLiteData.initialized = this.#initSubSection(moduleParams, SFBX_LITE_DATA_CONF_SECTION);
 
-/** @type {Boolean} */
-let _sfbxLiteDataInitialized = false;
+    return Object.values(this.#components).some((c) => c.initialized);
+  }
 
-/** Initialize module
- * @param {object} moduleConfig
- * @return {Boolean} true if module was initialized with success
- */
-function init(moduleConfig) {
-  const moduleParams = moduleConfig?.params || {};
+  /** function that will allow RTD sub-modules to modify the AdUnit object for each auction
+   * @method
+   * @param {Object} reqBidsConfigObj
+   * @param {doneCallback} onDone
+   * @param {Object} moduleConfig
+   * @param {?ModuleParams} moduleConfig.params
+   * @returns {void}
+   */
+  getBidRequestData(reqBidsConfigObj, onDone, moduleConfig) {
+    /** @type {ModuleParams} */
+    const moduleParams = moduleConfig?.params || {};
+
+    if (!this.#components.WeboCtx.initialized) {
+      this.#handleBidRequestData(reqBidsConfigObj, moduleParams);
 
-  _weboContextualProfile = null;
-  _weboUserDataUserProfile = null;
-  _sfbxLiteDataProfile = null;
+      onDone();
 
-  _weboCtxInitialized = initSubSection(moduleParams, WEBO_CTX_CONF_SECTION, 'token');
-  _weboUserDataInitialized = initSubSection(moduleParams, WEBO_USER_DATA_CONF_SECTION);
-  _sfbxLiteDataInitialized = initSubSection(moduleParams, SFBX_LITE_DATA_CONF_SECTION);
+      return;
+    }
 
-  return _weboCtxInitialized || _weboUserDataInitialized || _sfbxLiteDataInitialized;
-}
+    /** @type {WeboCtxConf} */
+    const weboCtxConf = moduleParams.weboCtxConf || {};
 
-/** Initialize subsection module
- * @param {Object} moduleParams
- * @param {string} subSection subsection name to initialize
- * @param {[]string} requiredFields
- * @return {Boolean} true if module subsection was initialized with success
- */
-function initSubSection(moduleParams, subSection, ...requiredFields) {
-  const weboSectionConf = moduleParams[subSection] || {enabled: false};
+    this.#fetchContextualProfile(weboCtxConf, (data) => {
+      logMessage('fetchContextualProfile on getBidRequestData is done');
 
-  if (weboSectionConf.enabled === false) {
-    delete moduleParams[subSection];
+      this.#setWeboContextualProfile(data);
+    }, () => {
+      this.#handleBidRequestData(reqBidsConfigObj, moduleParams);
 
-    return false;
+      onDone();
+    });
   }
 
-  requiredFields ||= [];
+  /** function that provides ad server targeting data to RTD-core
+   * @method
+   * @param {string[]} adUnitsCodes
+   * @param {Object} moduleConfig
+   * @param {?ModuleParams} moduleConfig.params
+   * @returns {Object} target data
+   */
+  getTargetingData(adUnitsCodes, moduleConfig) {
+    /** @type {ModuleParams} */
+    const moduleParams = moduleConfig?.params || {};
+
+    const profileHandlers = this.#buildProfileHandlers(moduleParams);
+
+    if (isEmpty(profileHandlers)) {
+      logMessage('no data to set targeting');
+      return {};
+    }
 
-  try {
-    normalizeConf(moduleParams, weboSectionConf);
+    try {
+      return adUnitsCodes.reduce((data, adUnitCode) => {
+        data[adUnitCode] = profileHandlers.reduce((targeting, ph) => {
+          // logMessage(`check if should set targeting for adunit '${adUnitCode}'`);
+          const [data, metadata] = this.#copyDataAndMetadata(ph);
+          if (ph.setTargeting(adUnitCode, data, metadata)) {
+            // logMessage(`set targeting for adunit '${adUnitCode}', source '${metadata.source}'`);
+
+            mergeDeep(targeting, data);
+          }
 
-    requiredFields.forEach(field => {
-      if (!weboSectionConf[field]) {
-        throw `missing required field "{field}" on {section}`;
-      }
-    });
-  } catch (e) {
-    logError(`unable to initialize: error on ${subSection} configuration: ${e}`);
-    return false;
-  }
+          return targeting;
+        }, {});
 
-  logMessage(`weborama ${subSection} initialized with success`);
+        return data;
+      }, {});
+    } catch (e) {
+      logError(`unable to format weborama rtd targeting data:`, e);
 
-  return true;
-}
+      return {};
+    }
+  }
 
-/** @type {Object} */
-const globalDefaults = {
-  setPrebidTargeting: true,
-  sendToBidders: true,
-  onData: () => {
-    /* do nothing */ },
-};
+  /** Initialize subsection module
+   * @method
+   * @private
+   * @param {ModuleParams} moduleParams
+   * @param {string} subSection subsection name to initialize
+   * @param {string[]} requiredFields
+   * @return {boolean} true if module subsection was initialized with success
+   */
+  #initSubSection(moduleParams, subSection, ...requiredFields) {
+    /** @type {CommonConf} */
+    const weboSectionConf = moduleParams[subSection] || { enabled: false };
+
+    if (weboSectionConf.enabled === false) {
+      delete moduleParams[subSection];
 
-/** normalize submodule configuration
- * @param {ModuleParams} moduleParams
- * @param {WeboCtxConf|WeboUserDataConf|SfbxLiteDataConf} submoduleParams
- * @return {void}
- */
-function normalizeConf(moduleParams, submoduleParams) {
-  // handle defaults
-  Object.entries(globalDefaults).forEach(([propertyName, globalDefaultValue]) => {
-    if (!submoduleParams.hasOwnProperty(propertyName)) {
-      const hasModuleParam = moduleParams.hasOwnProperty(propertyName);
-      submoduleParams[propertyName] = (hasModuleParam) ? moduleParams[propertyName] : globalDefaultValue;
+      return false;
     }
-  })
 
-  // handle setPrebidTargeting
-  coerceSetPrebidTargeting(submoduleParams)
+    try {
+      this.#normalizeConf(moduleParams, weboSectionConf);
 
-  // handle sendToBidders
-  coerceSendToBidders(submoduleParams)
+      requiredFields.forEach(field => {
+        if (!(field in weboSectionConf)) {
+          throw `missing required field '${field}''`;
+        }
+      });
+    } catch (e) {
+      logError(`unable to initialize: error on ${subSection} configuration:`, e);
+      return false;
+    }
+
+    logMessage(`weborama ${subSection} initialized with success`);
 
-  if (!isFn(submoduleParams.onData)) {
-    throw 'onData parameter should be a callback';
+    return true;
   }
 
-  submoduleParams.defaultProfile = submoduleParams.defaultProfile || {};
+  /** normalize submodule configuration
+   * @method
+   * @private
+   * @param {ModuleParams} moduleParams
+   * @param {CommonConf} submoduleParams
+   * @return {void}
+   * @throws will throw an error in case of invalid configuration
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #normalizeConf(moduleParams, submoduleParams) {
+    submoduleParams.defaultProfile = submoduleParams.defaultProfile || {};
 
-  if (!isValidProfile(submoduleParams.defaultProfile)) {
-    throw 'defaultProfile is not valid';
-  }
-}
+    const { setPrebidTargeting, sendToBidders, onData } = moduleParams;
 
-/** coerce set prebid targeting to function
- * @param {WeboCtxConf|WeboUserDataConf|SfbxLiteDataConf} submoduleParams
- * @return {void}
- */
-function coerceSetPrebidTargeting(submoduleParams) {
-  const setPrebidTargeting = submoduleParams.setPrebidTargeting;
+    submoduleParams.setPrebidTargeting ??= setPrebidTargeting;
+    submoduleParams.sendToBidders ??= sendToBidders;
+    submoduleParams.onData ??= onData;
 
-  if (isFn(setPrebidTargeting)) {
-    return
-  }
+    // handle setPrebidTargeting
+    this.#coerceSetPrebidTargeting(submoduleParams);
 
-  if (isBoolean(setPrebidTargeting)) {
-    const shouldSetPrebidTargeting = setPrebidTargeting;
+    // handle sendToBidders
+    this.#coerceSendToBidders(submoduleParams);
 
-    submoduleParams.setPrebidTargeting = () => shouldSetPrebidTargeting;
+    if (!isFn(submoduleParams.onData)) {
+      throw 'onData parameter should be a callback';
+    }
 
-    return
+    if (!isValidProfile(submoduleParams.defaultProfile)) {
+      throw 'defaultProfile is not valid';
+    }
   }
 
-  if (isStr(setPrebidTargeting)) {
-    const allowedAdUnitCode = setPrebidTargeting;
+  /** coerce setPrebidTargeting to a callback
+   * @method
+   * @private
+   * @param {CommonConf} submoduleParams
+   * @return {void}
+   * @throws will throw an error in case of invalid configuration
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #coerceSetPrebidTargeting(submoduleParams) {
+    try {
+      submoduleParams.setPrebidTargeting = this.#wrapValidatorCallback(submoduleParams.setPrebidTargeting);
+    } catch (e) {
+      throw `invalid setPrebidTargeting: ${e}`;
+    }
+  }
 
-    submoduleParams.setPrebidTargeting = (adUnitCode) => allowedAdUnitCode == adUnitCode;
+  /** coerce sendToBidders to a callback
+   * @method
+   * @private
+   * @param {CommonConf} submoduleParams
+   * @return {void}
+   * @throws will throw an error in case of invalid configuration
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #coerceSendToBidders(submoduleParams) {
+    let sendToBidders = submoduleParams.sendToBidders;
+
+    if (isPlainObject(sendToBidders)) {
+      const sendToBiddersMap = Object.entries(sendToBidders).reduce((map, [key, value]) => {
+        map[key] = this.#wrapValidatorCallback(value);
+        return map;
+      }, {});
 
-    return
-  }
+      submoduleParams.sendToBidders = (bid, adUnitCode) => {
+        const bidder = bid.bidder;
+        if (!(bidder in sendToBiddersMap)) {
+          return false;
+        }
 
-  if (isArray(setPrebidTargeting)) {
-    const allowedAdUnitCodes = setPrebidTargeting;
+        const validatorCallback = sendToBiddersMap[bidder];
 
-    submoduleParams.setPrebidTargeting = (adUnitCode) => allowedAdUnitCodes.includes(adUnitCode);
+        try {
+          return validatorCallback(adUnitCode);
+        } catch (e) {
+          throw `invalid sendToBidders[${bidder}]: ${e}`;
+        }
+      };
 
-    return
+      return;
+    }
+
+    try {
+      submoduleParams.sendToBidders = this.#wrapValidatorCallback(submoduleParams.sendToBidders,
+        (bid) => bid.bidder);
+    } catch (e) {
+      throw `invalid sendToBidders: ${e}`;
+    }
   }
 
-  throw `unexpected format for setPrebidTargeting: ${typeof setPrebidTargeting}`;
-}
+  /**
+   * @typedef {Object} AdUnit
+   * @property {Object[]} bids
+   */
+  /** function that handles bid request data
+   * @method
+   * @private
+   * @param {Object} reqBidsConfigObj
+   * @param {AdUnit[]} reqBidsConfigObj.adUnits
+   * @param {Object} reqBidsConfigObj.ortb2Fragments
+   * @param {Object} reqBidsConfigObj.ortb2Fragments.bidder
+   * @param {ModuleParams} moduleParams
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handleBidRequestData(reqBidsConfigObj, moduleParams) {
+    const profileHandlers = this.#buildProfileHandlers(moduleParams);
+
+    if (isEmpty(profileHandlers)) {
+      logMessage('no data to send to bidders');
+      return;
+    }
 
-/** coerce send to bidders to function
- * @param {WeboCtxConf|WeboUserDataConf|SfbxLiteDataConf} submoduleParams
- * @return {void}
- */
-function coerceSendToBidders(submoduleParams) {
-  const sendToBidders = submoduleParams.sendToBidders;
+    const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
+
+    try {
+      adUnits.forEach(
+        adUnit => adUnit.bids?.forEach(
+          bid => profileHandlers.forEach(ph => {
+            // logMessage(`check if bidder '${bid.bidder}' and adunit '${adUnit.code} are share ${ph.metadata.source} data`);
+
+            const [data, metadata] = this.#copyDataAndMetadata(ph);
+            if (ph.sendToBidders(bid, adUnit.code, data, metadata)) {
+              // logMessage(`handling bidder '${bid.bidder}' with ${ph.metadata.source} data`);
+
+              this.#handleBid(reqBidsConfigObj, bid, data, ph.metadata);
+            }
+          })
+        )
+      );
+    } catch (e) {
+      logError('unable to send data to bidders:', e);
+    }
 
-  if (isFn(sendToBidders)) {
-    return
+    profileHandlers.forEach(ph => {
+      try {
+        const [data, metadata] = this.#copyDataAndMetadata(ph);
+        ph.onData(data, metadata);
+      } catch (e) {
+        logError(`error while execute onData callback with ${ph.metadata.source}-based data:`, e);
+      }
+    });
   }
 
-  if (isBoolean(sendToBidders)) {
-    const shouldSendToBidders = sendToBidders;
+  /** onSuccess callback type
+   * @callback successCallback
+   * @param {?Object} data
+   * @returns {void}
+   */
+
+  /** onDone callback type
+   * @callback doneCallback
+   * @returns {void}
+   */
+
+  /** Fetch Bigsea Contextual Profile
+   * @method
+   * @private
+   * @param {WeboCtxConf} weboCtxConf
+   * @param {successCallback} onSuccess callback
+   * @param {doneCallback} onDone callback
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #fetchContextualProfile(weboCtxConf, onSuccess, onDone) {
+    const token = weboCtxConf.token;
+    const baseURLProfileAPI = weboCtxConf.baseURLProfileAPI || BASE_URL_CONTEXTUAL_PROFILE_API;
+
+    let path = '/profile';
+    let queryString = '';
+    queryString = tryAppendQueryString(queryString, 'token', token);
+
+    if (weboCtxConf.assetID) {
+      path = '/document-profile';
+
+      let assetID = weboCtxConf.assetID;
+      if (isFn(assetID)) {
+        try {
+          assetID = weboCtxConf.assetID();
+        } catch (e) {
+          logError('unexpected error while fetching asset id from callback', e);
 
-    submoduleParams.sendToBidders = () => shouldSendToBidders;
+          onDone();
 
-    return
-  }
+          return;
+        }
+      }
 
-  if (isStr(sendToBidders)) {
-    const allowedBidder = sendToBidders;
+      if (!assetID) {
+        logError('missing asset id');
 
-    submoduleParams.sendToBidders = (bid) => allowedBidder == bid.bidder;
+        onDone();
 
-    return
-  }
+        return;
+      }
 
-  if (isArray(sendToBidders)) {
-    const allowedBidders = sendToBidders;
+      queryString = tryAppendQueryString(queryString, 'assetId', assetID);
+    }
 
-    submoduleParams.sendToBidders = (bid) => allowedBidders.includes(bid.bidder);
+    const targetURL = weboCtxConf.targetURL || document.URL;
+    queryString = tryAppendQueryString(queryString, 'url', targetURL);
 
-    return
-  }
+    const urlProfileAPI = `https://${baseURLProfileAPI}/api${path}?${queryString}`;
 
-  if (isPlainObject(sendToBidders)) {
-    const sendToBiddersMap = sendToBidders;
-    submoduleParams.sendToBidders = (bid, adUnitCode) => {
-      const bidder = bid.bidder;
-      if (!sendToBiddersMap.hasOwnProperty(bidder)) {
-        return false
+    const success = (response, req) => {
+      if (req.status === 200) {
+        const data = JSON.parse(response);
+        onSuccess(data);
+      } else {
+        throw `unexpected http status response ${req.status} with response ${response}`;
       }
 
-      const value = sendToBiddersMap[bidder];
+      onDone();
+    };
 
-      if (isBoolean(value)) {
-        return value
-      }
+    const error = (e, req) => {
+      logError(`unable to get weborama data`, e, req);
 
-      if (isStr(value)) {
-        return value == adUnitCode
-      }
+      onDone();
+    };
 
-      if (isArray(value)) {
-        return value.includes(adUnitCode)
-      }
+    const callback = {
+      success,
+      error,
+    };
 
-      throw `unexpected format for sendToBidders[${bidder}]: ${typeof value}`;
+    const options = {
+      method: 'GET',
+      withCredentials: false,
     };
 
-    return
+    ajax(urlProfileAPI, callback, null, options);
   }
 
-  throw `unexpected format for sendToBidders: ${typeof sendToBidders}`;
-}
-/**
- * check if profile is valid
- * @param {*} profile
- * @returns {Boolean}
- */
-function isValidProfile(profile) {
-  if (!isPlainObject(profile)) {
-    return false;
+  /** set bigsea contextual profile on module state
+   * @method
+   * @private
+   * @param {?Object} data
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #setWeboContextualProfile(data) {
+    if (data && isPlainObject(data) && isValidProfile(data) && !isEmpty(data)) {
+      this.#components.WeboCtx.data = data;
+    }
   }
 
-  const keys = Object.keys(profile);
+  /** function that provides data handlers based on the configuration
+   * @method
+   * @private
+   * @param {ModuleParams} moduleParams
+   * @returns {ProfileHandler[]}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #buildProfileHandlers(moduleParams) {
+    const steps = [{
+      component: this.#components.WeboCtx,
+      conf: moduleParams?.weboCtxConf,
+    }, {
+      component: this.#components.WeboUserData,
+      conf: moduleParams?.weboUserDataConf,
+    }, {
+      component: this.#components.SfbxLiteData,
+      conf: moduleParams?.sfbxLiteDataConf,
+    }];
+
+    return steps.filter(step => step.component.initialized).reduce((ph, { component, conf }) => {
+      const user = component.user;
+      const source = component.source;
+      const callback = component.callbackBuilder(component /* equivalent to this */);
+      const profileHandler = this.#buildProfileHandler(conf, callback, user, source);
+      if (profileHandler) {
+        ph.push(profileHandler);
+      } else {
+        logMessage(`skip ${source} profile: no data`);
+      }
 
-  for (var i in keys) {
-    const key = keys[i];
-    const value = profile[key];
-    if (!isArray(value)) {
-      return false;
+      return ph;
+    }, []);
+  }
+
+  /**
+   * @typedef {Object} ProfileHandler
+   * @property {Profile} data
+   * @property {dataCallbackMetadata} metadata
+   * @property {setPrebidTargetingCallback} setTargeting
+   * @property {sendToBiddersCallback} sendToBidders
+   * @property {dataCallback} onData
+   */
+
+  /**
+   * @callback buildProfileHandlerCallbackBuilder
+   * @param {Component} component
+   * @returns {buildProfileHandlerCallback}
+   */
+
+  /**
+   * @callback buildProfileHandlerCallback
+   * @param {CommonConf} dataConf
+   * @returns {[Profile,boolean]} profile + is default flag
+   */
+
+  /**
+   * return specific profile handler
+   * @method
+   * @private
+   * @param {CommonConf} dataConf
+   * @param {buildProfileHandlerCallback} callback
+   * @param {boolean} user
+   * @param {string} source
+   * @returns {ProfileHandler}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #buildProfileHandler(dataConf, callback, user, source) {
+    if (!dataConf) {
+      return;
     }
 
-    for (var j in value) {
-      const elem = value[j]
-      if (!isStr(elem)) {
-        return false;
-      }
+    const [data, isDefault] = callback(dataConf);
+    if (isEmpty(data)) {
+      return;
+    }
+
+    return {
+      data: data,
+      metadata: {
+        user: user,
+        source: source,
+        isDefault: !!isDefault,
+      },
+      setTargeting: dataConf.setPrebidTargeting,
+      sendToBidders: dataConf.sendToBidders,
+      onData: dataConf.onData,
+    };
+  }
+  /** handle individual bid
+   * @method
+   * @private
+   * @param {Object} reqBidsConfigObj
+   * @param {Object} reqBidsConfigObj.ortb2Fragments
+   * @param {Object} reqBidsConfigObj.ortb2Fragments.bidder
+   * @param {Object} bid
+   * @param {string} bid.bidder
+   * @param {Profile} profile
+   * @param {dataCallbackMetadata} metadata
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handleBid(reqBidsConfigObj, bid, profile, metadata) {
+    this.#handleBidViaORTB2(reqBidsConfigObj, bid.bidder, profile, metadata);
+
+    /** @type {Object.<string,string>} */
+    const bidderAliasRegistry = adapterManager.aliasRegistry || {};
+
+    /** @type {string} */
+    const bidder = bidderAliasRegistry[bid.bidder] || bid.bidder;
+
+    switch (bidder) {
+      case 'appnexus':
+        this.#handleAppnexusBid(bid, profile);
+        break;
+      case 'pubmatic':
+        this.#handlePubmaticBid(bid, profile);
+        break;
+      case 'smartadserver':
+        this.#handleSmartadserverBid(bid, profile);
+        break;
+      case 'rubicon':
+        this.#handleRubiconBid(bid, profile, metadata);
+        break;
     }
   }
 
-  return true;
-}
+  /** function that handles bid request data
+   * @method
+   * @private
+   * @param {ProfileHandler} ph profile handler
+   * @returns {[Profile,dataCallbackMetadata]} deeply copy data + metadata
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #copyDataAndMetadata(ph) {
+    return [deepClone(ph.data), deepClone(ph.metadata)];
+  }
 
-/** function that provides ad server targeting data to RTD-core
- * @param {Array} adUnitsCodes
- * @param {Object} moduleConfig
- * @returns {Object} target data
- */
-function getTargetingData(adUnitsCodes, moduleConfig) {
-  const moduleParams = moduleConfig?.params || {};
+  /** handle appnexus/xandr bid
+   * @method
+   * @private
+   * @param {Object} bid
+   * @param {Object} bid.params
+   * @param {Object} bid.params.keyword
+   * @param {Profile} profile
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handleAppnexusBid(bid, profile) {
+    const base = 'params.keywords';
+    this.#assignProfileToObject(bid, base, profile);
+  }
 
-  const profileHandlers = buildProfileHandlers(moduleParams);
+  /** handle pubmatic bid
+   * @method
+   * @private
+   * @param {Object} bid
+   * @param {Object} bid.params
+   * @param {string} bid.params.dctr
+   * @param {Profile} profile
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handlePubmaticBid(bid, profile) {
+    const sep = '|';
+    const subsep = ',';
+
+    bid.params ||= {};
+
+    const data = bid.params.dctr || '';
+    const target = new Set(data.split(sep).filter((x) => x.length > 0));
+
+    Object.entries(profile).forEach(([key, values]) => {
+      const value = values.join(subsep);
+      const keyword = `${key}=${value}`;
+      target.add(keyword);
+    });
 
-  if (isEmpty(profileHandlers)) {
-    logMessage('no data to set targeting');
-    return {};
+    bid.params.dctr = Array.from(target).join(sep);
   }
 
-  try {
-    const td = adUnitsCodes.reduce((data, adUnitCode) => {
-      data[adUnitCode] = profileHandlers.reduce((targeting, ph) => {
-        // logMessage(`check if should set targeting for adunit '${adUnitCode}'`);
-        const cph = copyProfileHandler(ph);
-        if (ph.setTargeting(adUnitCode, cph.data, cph.metadata)) {
-          // logMessage(`set targeting for adunit '${adUnitCode}', source '${ph.metadata.source}'`);
-
-          mergeDeep(targeting, cph.data);
-        }
-        return targeting;
-      }, {});
-      return data;
-    }, {});
+  /** handle smartadserver bid
+   * @method
+   * @private
+   * @param {Object} bid
+   * @param {Object} bid.params
+   * @param {string} bid.params.target
+   * @param {Profile} profile
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handleSmartadserverBid(bid, profile) {
+    const sep = ';';
+
+    bid.params ||= {};
+
+    const data = bid.params.target || '';
+    const target = new Set(data.split(sep).filter((x) => x.length > 0));
+
+    Object.entries(profile).forEach(([key, values]) => {
+      values.forEach(value => {
+        const keyword = `${key}=${value}`;
+        target.add(keyword);
+      })
+    });
 
-    return td;
-  } catch (e) {
-    logError('unable to format weborama rtd targeting data', e);
-    return {};
+    bid.params.target = Array.from(target).join(sep);
   }
-}
 
-/** function that provides data handlers based on the configuration
- * @param {ModuleParams} moduleParams
- * @returns {Array<Object>} handlers
- */
-function buildProfileHandlers(moduleParams) {
-  const profileHandlers = [];
-
-  if (_weboCtxInitialized && moduleParams?.weboCtxConf) {
-    const weboCtxConf = moduleParams.weboCtxConf;
-    const [data, isDefault] = getContextualProfile(weboCtxConf);
-    if (!isEmpty(data)) {
-      profileHandlers.push({
-        data: data,
-        metadata: {
-          user: false,
-          source: 'contextual',
-          isDefault: !!isDefault,
-        },
-        setTargeting: weboCtxConf.setPrebidTargeting,
-        sendToBidders: weboCtxConf.sendToBidders,
-        onData: weboCtxConf.onData,
-      })
+  /** handle rubicon bid
+   * @method
+   * @private
+   * @param {Object} bid
+   * @param {string} bid.bidder
+   * @param {Profile} profile
+   * @param {dataCallbackMetadata} metadata
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handleRubiconBid(bid, profile, metadata) {
+    if (isBoolean(metadata.user)) {
+      const section = metadata.user ? 'visitor' : 'inventory';
+      const base = `params.${section}`;
+      this.#assignProfileToObject(bid, base, profile);
     } else {
-      logMessage('skip contextual profile: no data');
+      logMessage(`SKIP bidder '${bid.bidder}', data from '${metadata.source}' is not defined as user or site-centric`);
     }
   }
 
-  if (_weboUserDataInitialized && moduleParams?.weboUserDataConf) {
-    const weboUserDataConf = moduleParams.weboUserDataConf;
-    const [data, isDefault] = getWeboUserDataProfile(weboUserDataConf);
-    if (!isEmpty(data)) {
-      profileHandlers.push({
-        data: data,
-        metadata: {
-          user: true,
-          source: 'wam',
-          isDefault: !!isDefault,
-        },
-        setTargeting: weboUserDataConf.setPrebidTargeting,
-        sendToBidders: weboUserDataConf.sendToBidders,
-        onData: weboUserDataConf.onData,
-      })
+  /** handle generic bid via ortb2 arbitrary data
+   * @method
+   * @private
+   * @param {Object} reqBidsConfigObj
+   * @param {Object} reqBidsConfigObj.ortb2Fragments
+   * @param {Object} reqBidsConfigObj.ortb2Fragments.bidder
+   * @param {string} bidder
+   * @param {Profile} profile
+   * @param {dataCallbackMetadata} metadata
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #handleBidViaORTB2(reqBidsConfigObj, bidder, profile, metadata) {
+    if (isBoolean(metadata.user)) {
+      logMessage(`bidder '${bidder}' is not directly supported, trying set data via bidder ortb2 fpd`);
+      const section = metadata.user ? 'user' : 'site';
+      const base = `${bidder}.${section}.ext.data`;
+
+      this.#assignProfileToObject(reqBidsConfigObj.ortb2Fragments?.bidder, base, profile);
     } else {
-      logMessage('skip wam profile: no data');
+      logMessage(`SKIP unsupported bidder '${bidder}', data from '${metadata.source}' is not defined as user or site-centric`);
     }
   }
 
-  if (_sfbxLiteDataInitialized && moduleParams?.sfbxLiteDataConf) {
-    const sfbxLiteDataConf = moduleParams.sfbxLiteDataConf;
-    const [data, isDefault] = getSfbxLiteDataProfile(sfbxLiteDataConf);
-    if (!isEmpty(data)) {
-      profileHandlers.push({
-        data: data,
-        metadata: {
-          user: false,
-          source: 'lite',
-          isDefault: !!isDefault,
-        },
-        setTargeting: sfbxLiteDataConf.setPrebidTargeting,
-        sendToBidders: sfbxLiteDataConf.sendToBidders,
-        onData: sfbxLiteDataConf.onData,
-      })
-    } else {
-      logMessage('skip sfbx lite profile: no data');
-    }
+  /**
+   * assign profile to object
+   * @method
+   * @private
+   * @param {Object} destination
+   * @param {string} base
+   * @param {Profile} profile
+   * @returns {void}
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #assignProfileToObject(destination, base, profile) {
+    Object.entries(profile).forEach(([key, values]) => {
+      const path = `${base}.${key}`;
+      deepSetValue(destination, path, values);
+    })
   }
 
-  return profileHandlers;
+  /**
+   * @callback validatorCallback
+   * @param {string} target
+   * @returns {boolean}
+   */
+
+  /**
+   * @callback coerceCallback
+   * @param {*} input
+   * @returns {*}
+   */
+
+  /**
+   * wrap value into validator
+   * @method
+   * @private
+   * @param {*} value
+   * @param {coerceCallback} coerce
+   * @returns {validatorCallback}
+   * @throws will throw an error in case of unsupported type
+   */
+  // eslint-disable-next-line no-dupe-class-members
+  #wrapValidatorCallback(value, coerce = (x) => x) {
+    if (isFn(value)) {
+      return value;
+    }
+
+    if (isBoolean(value)) {
+      return (_) => value;
+    }
+
+    if (isStr(value)) {
+      return (target) => {
+        return value == coerce(target);
+      };
+    }
+
+    if (isArray(value)) {
+      return (target) => {
+        return value.includes(coerce(target));
+      };
+    }
+
+    throw `unexpected format: ${typeof value} (expects function, boolean, string or array)`;
+  }
 }
 
-/** return contextual profile
- * @param {WeboCtxConf} weboCtxConf
- * @returns {Array} contextual profile + isDefault boolean flag
+/**
+ * check if profile is valid
+ * @param {*} profile
+ * @returns {boolean}
  */
-function getContextualProfile(weboCtxConf) {
-  if (_weboContextualProfile) {
-    return [_weboContextualProfile, false];
+export function isValidProfile(profile) {
+  if (!isPlainObject(profile)) {
+    return false;
   }
 
-  const defaultContextualProfile = weboCtxConf.defaultProfile || {};
+  return Object.values(profile).every((field) => isArray(field) && field.every(isStr));
+}
+
+/**
+ * bind callback with component
+ * @param {Component} component
+ * @returns {buildProfileHandlerCallback}
+ */
+function getContextualProfile(component /* equivalent to this */) {
+  /** return contextual profile
+   * @param {WeboCtxConf} weboCtxConf
+   * @returns {[Profile,boolean]} contextual profile + isDefault boolean flag
+   */
+  return function (weboCtxConf) {
+    if (component.data) {
+      return [component.data, false];
+    }
 
-  return [defaultContextualProfile, true];
+    const defaultContextualProfile = weboCtxConf.defaultProfile || {};
+
+    return [defaultContextualProfile, true];
+  }
 }
 
-/** return weboUserData profile
- * @param {WeboUserDataConf} weboUserDataConf
- * @returns {Array} weboUserData profile  + isDefault boolean flag
+/**
+ * bind callback with component
+ * @param {Component} component
+ * @returns {buildProfileHandlerCallback}
  */
-function getWeboUserDataProfile(weboUserDataConf) {
-  return getDataFromLocalStorage(weboUserDataConf,
-    () => _weboUserDataUserProfile,
-    (data) => _weboUserDataUserProfile = data,
-    DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY,
-    LOCAL_STORAGE_USER_TARGETING_SECTION,
-    'wam');
+function getWeboUserDataProfile(component /* equivalent to this */) {
+  /** return weboUserData profile
+   * @param {WeboUserDataConf} weboUserDataConf
+   * @returns {[Profile,boolean]} weboUserData profile  + isDefault boolean flag
+   */
+  return function (weboUserDataConf) {
+    return getDataFromLocalStorage(weboUserDataConf,
+      () => component.data,
+      (data) => component.data = data,
+      DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY,
+      LOCAL_STORAGE_USER_TARGETING_SECTION,
+      WEBO_USER_DATA_SOURCE_LABEL);
+  }
 }
 
-/** return weboUserData profile
- * @param {SfbxLiteDataConf} sfbxLiteDataConf
- * @returns {Array} sfbxLiteData profile + isDefault boolean flag
+/**
+ * bind callback with component
+ * @param {Component} component
+ * @returns {buildProfileHandlerCallback}
  */
-function getSfbxLiteDataProfile(sfbxLiteDataConf) {
-  return getDataFromLocalStorage(sfbxLiteDataConf,
-    () => _sfbxLiteDataProfile,
-    (data) => _sfbxLiteDataProfile = data,
-    DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY,
-    LOCAL_STORAGE_LITE_TARGETING_SECTION,
-    'lite');
+function getSfbxLiteDataProfile(component /* equivalent to this */) {
+  /** return weboUserData profile
+   * @param {SfbxLiteDataConf} sfbxLiteDataConf
+   * @returns {[Profile,boolean]} sfbxLiteData profile + isDefault boolean flag
+   */
+  return function getSfbxLiteDataProfile(sfbxLiteDataConf) {
+    return getDataFromLocalStorage(sfbxLiteDataConf,
+      () => component.data,
+      (data) => component.data = data,
+      DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY,
+      LOCAL_STORAGE_LITE_TARGETING_SECTION,
+      SFBX_LITE_DATA_SOURCE_LABEL);
+  }
 }
 
+/**
+ * @callback cacheGetCallback
+ * @returns {Profile}
+ */
+/**
+ * @callback cacheSetCallback
+ * @param {Profile} profile
+ * @returns {void}
+ */
+
 /** return generic webo data profile
  * @param {WeboUserDataConf|SfbxLiteDataConf} weboDataConf
  * @param {cacheGetCallback} cacheGet
  * @param {cacheSetCallback} cacheSet
- * @param {String} defaultLocalStorageProfileKey
- * @param {String} targetingSection
- * @param {String} source
- * @returns {Array} webo (user|lite) data profile + isDefault boolean flag
+ * @param {string} defaultLocalStorageProfileKey
+ * @param {string} targetingSection
+ * @param {string} source
+ * @returns {[Profile,boolean]} webo (user|lite) data profile + isDefault boolean flag
  */
 function getDataFromLocalStorage(weboDataConf, cacheGet, cacheSet, defaultLocalStorageProfileKey, targetingSection, source) {
   const defaultProfile = weboDataConf.defaultProfile || {};
 
-  if (storage.localStorageIsEnabled() && !cacheGet()) {
+  if (storage.hasLocalStorage() && storage.localStorageIsEnabled() && !cacheGet()) {
     const localStorageProfileKey = weboDataConf.localStorageProfileKey || defaultLocalStorageProfileKey;
 
     const entry = storage.getDataFromLocalStorage(localStorageProfileKey);
     if (entry) {
       const data = JSON.parse(entry);
-      if (data && isPlainObject(data) && data.hasOwnProperty(targetingSection)) {
+      if (data && isPlainObject(data) && targetingSection in data) {
+        /** @type {profile} */
         const profile = data[targetingSection];
         const valid = isValidProfile(profile);
         if (!valid) {
           logWarn(`found invalid ${source} profile on local storage key ${localStorageProfileKey}, section ${targetingSection}`);
+
+          return;
         }
 
-        if (valid && !isEmpty(data)) {
+        if (!isEmpty(data)) {
           cacheSet(profile);
         }
       }
@@ -566,328 +1020,31 @@ function getDataFromLocalStorage(weboDataConf, cacheGet, cacheSet, defaultLocalS
 
   return [defaultProfile, true];
 }
-
-/** function that will allow RTD sub-modules to modify the AdUnit object for each auction
- * @param {Object} reqBidsConfigObj
- * @param {doneCallback} onDone
- * @param {Object} moduleConfig
- * @returns {void}
- */
-export function getBidRequestData(reqBidsConfigObj, onDone, moduleConfig) {
-  const moduleParams = moduleConfig?.params || {};
-
-  if (!_weboCtxInitialized) {
-    handleBidRequestData(reqBidsConfigObj, moduleParams);
-
-    onDone();
-
-    return;
-  }
-
-  const weboCtxConf = moduleParams.weboCtxConf || {};
-
-  fetchContextualProfile(weboCtxConf, (data) => {
-    logMessage('fetchContextualProfile on getBidRequestData is done');
-
-    setWeboContextualProfile(data);
-  }, () => {
-    handleBidRequestData(reqBidsConfigObj, moduleParams);
-
-    onDone();
-  });
-}
-
-/** function that handles bid request data
- * @param {Object} reqBids
- * @param {ModuleParams} moduleParams
- * @returns {void}
- */
-function handleBidRequestData(reqBids, moduleParams) {
-  const profileHandlers = buildProfileHandlers(moduleParams);
-
-  if (isEmpty(profileHandlers)) {
-    logMessage('no data to send to bidders');
-    return;
-  }
-
-  const adUnits = reqBids.adUnits || getGlobal().adUnits;
-
-  try {
-    adUnits.filter(
-      adUnit => adUnit.hasOwnProperty('bids')
-    ).forEach(
-      adUnit => adUnit.bids.forEach(
-        bid => profileHandlers.forEach(ph => {
-          // logMessage(`check if bidder '${bid.bidder}' and adunit '${adUnit.code} are share ${ph.metadata.source} data`);
-
-          const cph = copyProfileHandler(ph);
-          if (ph.sendToBidders(bid, adUnit.code, cph.data, cph.metadata)) {
-            // logMessage(`handling bidder '${bid.bidder}' with ${ph.metadata.source} data`);
-
-            handleBid(reqBids, bid, cph.data, ph.metadata);
-          }
-        })
-      )
-    );
-  } catch (e) {
-    logError('unable to send data to bidders:', e);
-  }
-
-  profileHandlers.forEach(ph => {
-    try {
-      const cph = copyProfileHandler(ph);
-      ph.onData(cph.data, cph.metadata);
-    } catch (e) {
-      logError(`error while executure onData callback with ${ph.metadata.source}-based data:`, e);
-    }
-  });
-}
-/** function that handles bid request data
- * @param {Object} ph profile handler
- *@returns {Object} of deeply copy data and metadata
- */
-function copyProfileHandler(ph) {
-  return {
-    data: deepClone(ph.data),
-    metadata: deepClone(ph.metadata),
-  };
-}
-
-/** @type {string} */
-const APPNEXUS = 'appnexus';
-
-/** @type {string} */
-const PUBMATIC = 'pubmatic';
-
-/** @type {string} */
-const RUBICON = 'rubicon';
-
-/** @type {string} */
-const SMARTADSERVER = 'smartadserver';
-
-/** @type {Object} */
-const bidderAliasRegistry = adapterManager.aliasRegistry || {};
-
-/** handle individual bid
- * @param reqBids
- * @param {Object} bid
- * @param {Object} profile
- * @param {Object} metadata
- * @returns {void}
- */
-function handleBid(reqBids, bid, profile, metadata) {
-  const bidder = bidderAliasRegistry[bid.bidder] || bid.bidder;
-
-  switch (bidder) {
-    // TODO: these special cases should not be necessary - all adapters should look into FPD, not just their params
-    case APPNEXUS:
-      handleAppnexusBid(bid, profile);
-
-      break;
-
-    case PUBMATIC:
-      handlePubmaticBid(bid, profile);
-
-      break;
-
-    case SMARTADSERVER:
-      handleSmartadserverBid(bid, profile);
-
-      break;
-    case RUBICON:
-      handleRubiconBid(bid, profile, metadata);
-
-      break;
-    default:
-      handleBidViaORTB2(reqBids, bid, profile, metadata);
-  }
-}
-
-/** handle appnexus/xandr bid
- * @param {Object} bid
- * @param {Object} profile
- * @returns {void}
- */
-function handleAppnexusBid(bid, profile) {
-  const base = 'params.keywords';
-  assignProfileToObject(bid, base, profile);
-}
-
-/** handle pubmatic bid
- * @param {Object} bid
- * @param {Object} profile
- * @returns {void}
- */
-function handlePubmaticBid(bid, profile) {
-  const sep = '|';
-  const subsep = ',';
-  const target = [];
-
-  bid.params ||= {};
-
-  const data = bid.params.dctr;
-  if (data) {
-    data.split(sep).forEach(t => target.push(t));
-  }
-
-  Object.keys(profile).forEach(key => {
-    const value = profile[key].join(subsep);
-    const keyword = `${key}=${value}`;
-    if (target.indexOf(keyword) === -1) {
-      target.push(keyword);
-    }
-  });
-
-  bid.params.dctr = target.join(sep);
-}
-
-/** handle smartadserver bid
- * @param {Object} bid
- * @param {Object} profile
- * @returns {void}
- */
-function handleSmartadserverBid(bid, profile) {
-  const sep = ';';
-  const target = [];
-
-  bid.params ||= {};
-
-  const data = bid.params.target;
-  if (data) {
-    data.split(sep).forEach(t => target.push(t));
-  }
-
-  Object.keys(profile).forEach(key => {
-    profile[key].forEach(value => {
-      const keyword = `${key}=${value}`;
-      if (target.indexOf(keyword) === -1) {
-        target.push(keyword);
-      }
-    });
-  });
-
-  bid.params.target = target.join(sep);
-}
-
-/** handle rubicon bid
- * @param {Object} bid
- * @param {Object} profile
- * @param {Object} metadata
- * @returns {void}
- */
-function handleRubiconBid(bid, profile, metadata) {
-  if (isBoolean(metadata.user)) {
-    const section = (metadata.user) ? 'visitor' : 'inventory';
-    const base = `params.${section}`;
-    assignProfileToObject(bid, base, profile);
-  } else {
-    logMessage(`SKIP bidder '${bid.bidder}', data from '${metadata.source}' is not defined as user or site-centric`);
-  }
-}
-
-/** handle generic bid via ortb2 arbitrary data
- * @param reqBids
- * @param {Object} bid
- * @param {Object} profile
- * @param {Object} metadata
- * @returns {void}
- */
-function handleBidViaORTB2(reqBids, bid, profile, metadata) {
-  if (isBoolean(metadata.user)) {
-    logMessage(`bidder '${bid.bidder}' is not directly supported, trying set data via bidder ortb2 fpd`);
-    const section = ((metadata.user) ? 'user' : 'site');
-    const base = `${bid.bidder}.${section}.ext.data`;
-
-    assignProfileToObject(reqBids.ortb2Fragments?.bidder, base, profile);
-  } else {
-    logMessage(`SKIP unsupported bidder '${bid.bidder}', data from '${metadata.source}' is not defined as user or site-centric`);
-  }
-}
-
-/**
- * assign profile to object
- * @param {Object} destination
- * @param {string} base
- * @param {Object} profile
- * @returns {void}
- */
-function assignProfileToObject(destination, base, profile) {
-  Object.keys(profile).forEach(key => {
-    const path = `${base}.${key}`;
-    deepSetValue(destination, path, profile[key])
-  })
-}
-
-/** set bigsea contextual profile on module state
- * @param {null|Object} data
- * @returns {void}
- */
-export function setWeboContextualProfile(data) {
-  if (data && isPlainObject(data) && isValidProfile(data) && !isEmpty(data)) {
-    _weboContextualProfile = data;
-  }
-}
-
-/** onSuccess callback type
- * @callback successCallback
- * @param {null|Object} data
- * @returns {void}
- */
-
-/** onDone callback type
- * @callback doneCallback
- * @returns {void}
- */
-
-/** Fetch Bigsea Contextual Profile
- * @param {WeboCtxConf} weboCtxConf
- * @param {successCallback} onSuccess callback
- * @param {doneCallback} onDone callback
- * @returns {void}
- */
-function fetchContextualProfile(weboCtxConf, onSuccess, onDone) {
-  const targetURL = weboCtxConf.targetURL || document.URL;
-  const token = weboCtxConf.token;
-  const baseURLProfileAPI = weboCtxConf.baseURLProfileAPI || BASE_URL_CONTEXTUAL_PROFILE_API;
-
-  let queryString = '';
-  queryString = tryAppendQueryString(queryString, 'token', token);
-  queryString = tryAppendQueryString(queryString, 'url', targetURL);
-
-  const urlProfileAPI = `https://${baseURLProfileAPI}/api/profile?${queryString}`;
-
-  ajax(urlProfileAPI, {
-    success: (response, req) => {
-      if (req.status === 200) {
-        try {
-          const data = JSON.parse(response);
-          onSuccess(data);
-          onDone();
-        } catch (e) {
-          onDone();
-          logError('unable to parse weborama data', e);
-          throw e;
-        }
-      } else if (req.status === 204) {
-        onDone();
-      }
-    },
-    error: () => {
-      onDone();
-      logError('unable to get weborama data');
-    }
+/** @type {Components} */
+const components = {
+  WeboCtx: {
+    initialized: false,
+    data: null,
+    user: false,
+    source: WEBO_CTX_SOURCE_LABEL,
+    callbackBuilder: getContextualProfile,
+  },
+  WeboUserData: {
+    initialized: false,
+    data: null,
+    user: true,
+    source: WEBO_USER_DATA_SOURCE_LABEL,
+    callbackBuilder: getWeboUserDataProfile,
+  },
+  SfbxLiteData: {
+    initialized: false,
+    data: null,
+    user: false,
+    source: SFBX_LITE_DATA_SOURCE_LABEL,
+    callbackBuilder: getSfbxLiteDataProfile,
   },
-  null, {
-    method: 'GET',
-    withCredentials: false,
-  });
-}
-
-export const weboramaSubmodule = {
-  name: SUBMODULE_NAME,
-  init: init,
-  getTargetingData: getTargetingData,
-  getBidRequestData: getBidRequestData,
 };
 
+export const weboramaSubmodule = new WeboramaRtdProvider(components);
+
 submodule(MODULE_NAME, weboramaSubmodule);
diff --git a/modules/weboramaRtdProvider.md b/modules/weboramaRtdProvider.md
index 88ec907c9a1..f86351fe214 100644
--- a/modules/weboramaRtdProvider.md
+++ b/modules/weboramaRtdProvider.md
@@ -109,6 +109,7 @@ On this section we will explain the `params.weboCtxConf` subconfiguration:
 | :------------ | :------------ | :------------ |:------------ |
 | token | String | Security Token provided by Weborama, unique per client | Mandatory |
 | targetURL | String | Url to be profiled in the contextual api | Optional. Defaults to `document.URL` |
+| assetID | Function or String | if provided, we will call the document-profile api using this asset id. |Optional|
 | setPrebidTargeting|Various|If true, will use the contextual profile to set the prebid (GPT/GAM or AST) targeting of all adunits managed by prebid.js| Optional. Default is `params.setPrebidTargeting` (if any) or `true`.|
 | sendToBidders|Various|If true, will send the contextual profile to all bidders. If an array, will specify the bidders to send data| Optional. Default is `params.sendToBidders` (if any) or `true`.|
 | defaultProfile | Object | default value of the profile to be used when there are no response from contextual api (such as timeout)| Optional. Default is `{}` |
@@ -383,6 +384,37 @@ pbjs.que.push(function () {
 });
 ```
 
+An alternative version, using asset id instead of target url on contextual, can be found here:
+
+```javascript
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+pbjs.que.push(function () {
+    pbjs.setConfig({
+        debug: true,
+        realTimeData: {
+            auctionDelay: 1000,
+            dataProviders: [{
+                name: "weborama",
+                waitForIt: true,
+                params: {
+                    weboCtxConf: {
+                        token: "<<to-be-defined>>", // mandatory
+                        assetID: "datasource:docId", // can be a callback to be executed in runtime and returns the identifier
+                        setPrebidTargeting: true, // override param.setPrebidTargeting. default is true
+                        sendToBidders: true,      // override param.sendToBidders. default is true
+                        defaultProfile: {         // optional, used if nothing is found
+                            webo_ctx: [ ... ],    // contextual segments
+                            webo_ds: [ ...],      // data science segments
+                        },
+                        enabled: true,
+                    },
+                    ...
+    });
+});
+```
+
 Imagine we need to configure the following options using the previous example, we can write the configuration like the one below.
 
 ||contextual|wam|lite|
diff --git a/test/spec/modules/weboramaRtdProvider_spec.js b/test/spec/modules/weboramaRtdProvider_spec.js
index 523406dc492..bbc1c6d6f02 100644
--- a/test/spec/modules/weboramaRtdProvider_spec.js
+++ b/test/spec/modules/weboramaRtdProvider_spec.js
@@ -153,6 +153,289 @@ describe('weboramaRtdProvider', function() {
         });
       });
 
+      it('should use asset id when available and set gam targeting and send to bidders by default', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboCtxConf: {
+              token: 'foo',
+              assetID: 'datasource:docId',
+              targetURL: 'https://prebid.org',
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+        const data = {
+          webo_vctx: ['foo', 'bar'],
+        };
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        let request = server.requests[0];
+
+        expect(request.method).to.equal('GET');
+        expect(request.url).to.equal('https://ctx.weborama.com/api/document-profile?token=foo&assetId=datasource%3AdocId&url=https%3A%2F%2Fprebid.org&');
+        expect(request.withCredentials).to.be.false;
+
+        request.respond(200, responseHeader, JSON.stringify(data));
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': data,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('webo_vctx=foo;webo_vctx=bar');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('webo_vctx=foo,bar');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(data);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: data
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: data
+            },
+          }
+        });
+        expect(onDataResponse).to.deep.equal({
+          data: data,
+          meta: {
+            user: false,
+            source: 'contextual',
+            isDefault: false,
+          },
+        });
+      });
+
+      it('should use asset id as callback when available and set gam targeting and send to bidders by default', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboCtxConf: {
+              token: 'foo',
+              assetID: () => 'datasource:docId',
+              targetURL: 'https://prebid.org',
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+        const data = {
+          webo_vctx: ['foo', 'bar'],
+        };
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        let request = server.requests[0];
+
+        expect(request.method).to.equal('GET');
+        expect(request.url).to.equal('https://ctx.weborama.com/api/document-profile?token=foo&assetId=datasource%3AdocId&url=https%3A%2F%2Fprebid.org&');
+        expect(request.withCredentials).to.be.false;
+
+        request.respond(200, responseHeader, JSON.stringify(data));
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': data,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('webo_vctx=foo;webo_vctx=bar');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('webo_vctx=foo,bar');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(data);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: data
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: data
+            },
+          }
+        });
+        expect(onDataResponse).to.deep.equal({
+          data: data,
+          meta: {
+            user: false,
+            source: 'contextual',
+            isDefault: false,
+          },
+        });
+      });
+
+      it('should handle exception from asset id callback', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboCtxConf: {
+              token: 'foo',
+              assetID: () => {
+                throw new Error('ops');
+              },
+              targetURL: 'https://prebid.org',
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(server.requests.length).to.equal(0);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({});
+      });
+
+      it('should handle case when callback return falsy value', function() {
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            weboCtxConf: {
+              token: 'foo',
+              assetID: () => '',
+              targetURL: 'https://prebid.org',
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {}
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(server.requests.length).to.equal(0);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({});
+      });
+
       describe('should set gam targeting and send to one specific bidder and multiple adunits', function() {
         const testcases = {
           'single string': 'appnexus',
@@ -1090,6 +1373,7 @@ describe('weboramaRtdProvider', function() {
           targeting: data,
         };
 
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
         sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
         sandbox.stub(storage, 'getDataFromLocalStorage')
           .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
@@ -1199,6 +1483,7 @@ describe('weboramaRtdProvider', function() {
               targeting: data,
             };
 
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
             sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
             sandbox.stub(storage, 'getDataFromLocalStorage')
               .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
@@ -1311,6 +1596,7 @@ describe('weboramaRtdProvider', function() {
               targeting: data,
             };
 
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
             sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
             sandbox.stub(storage, 'getDataFromLocalStorage')
               .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
@@ -1418,6 +1704,7 @@ describe('weboramaRtdProvider', function() {
               targeting: data,
             };
 
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
             sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
             sandbox.stub(storage, 'getDataFromLocalStorage')
               .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
@@ -1560,6 +1847,7 @@ describe('weboramaRtdProvider', function() {
               targeting: data,
             };
 
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
             sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
             sandbox.stub(storage, 'getDataFromLocalStorage')
               .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
@@ -1700,6 +1988,7 @@ describe('weboramaRtdProvider', function() {
           targeting: data,
         };
 
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
         sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
         sandbox.stub(storage, 'getDataFromLocalStorage')
           .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
@@ -1760,6 +2049,7 @@ describe('weboramaRtdProvider', function() {
           targeting: data,
         };
 
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
         sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
         sandbox.stub(storage, 'getDataFromLocalStorage')
           .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
@@ -1859,6 +2149,7 @@ describe('weboramaRtdProvider', function() {
           }
         };
 
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
         sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
 
         const adUnitCode = 'adunit1';
@@ -1932,6 +2223,7 @@ describe('weboramaRtdProvider', function() {
           }
         };
 
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
         sandbox.stub(storage, 'localStorageIsEnabled').returns(false);
 
         const adUnitCode = 'adunit1';
@@ -2029,6 +2321,7 @@ describe('weboramaRtdProvider', function() {
           targeting: data,
         };
 
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
         sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
         sandbox.stub(storage, 'getDataFromLocalStorage')
           .withArgs(DEFAULT_LOCAL_STORAGE_USER_PROFILE_KEY)
@@ -2146,6 +2439,7 @@ describe('weboramaRtdProvider', function() {
           webo: data,
         };
 
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
         sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
         sandbox.stub(storage, 'getDataFromLocalStorage')
           .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
@@ -2254,6 +2548,7 @@ describe('weboramaRtdProvider', function() {
               webo: data,
             };
 
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
             sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
             sandbox.stub(storage, 'getDataFromLocalStorage')
               .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
@@ -2365,6 +2660,7 @@ describe('weboramaRtdProvider', function() {
               webo: data,
             };
 
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
             sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
             sandbox.stub(storage, 'getDataFromLocalStorage')
               .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
@@ -2471,6 +2767,7 @@ describe('weboramaRtdProvider', function() {
               webo: data,
             };
 
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
             sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
             sandbox.stub(storage, 'getDataFromLocalStorage')
               .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
@@ -2612,6 +2909,7 @@ describe('weboramaRtdProvider', function() {
               webo: data,
             };
 
+            sandbox.stub(storage, 'hasLocalStorage').returns(true);
             sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
             sandbox.stub(storage, 'getDataFromLocalStorage')
               .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
@@ -2751,6 +3049,7 @@ describe('weboramaRtdProvider', function() {
           webo: data,
         };
 
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
         sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
         sandbox.stub(storage, 'getDataFromLocalStorage')
           .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
@@ -2814,6 +3113,7 @@ describe('weboramaRtdProvider', function() {
           webo: data,
         };
 
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
         sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
         sandbox.stub(storage, 'getDataFromLocalStorage')
           .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)
@@ -2912,6 +3212,7 @@ describe('weboramaRtdProvider', function() {
           }
         };
 
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
         sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
 
         const adUnitCode = 'adunit1';
@@ -2984,6 +3285,7 @@ describe('weboramaRtdProvider', function() {
           }
         };
 
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
         sandbox.stub(storage, 'localStorageIsEnabled').returns(false);
 
         const adUnitCode = 'adunit1';
@@ -3044,6 +3346,85 @@ describe('weboramaRtdProvider', function() {
         });
       });
 
+      it('should use default profile if has no local storage', function() {
+        const defaultProfile = {
+          lite_hobbies: ['sport', 'cinéma'],
+        };
+        let onDataResponse = {};
+        const moduleConfig = {
+          params: {
+            sfbxLiteDataConf: {
+              setPrebidTargeting: true,
+              defaultProfile: defaultProfile,
+              onData: (data, meta) => {
+                onDataResponse = {
+                  data: data,
+                  meta: meta,
+                };
+              },
+            }
+          }
+        };
+
+        sandbox.stub(storage, 'hasLocalStorage').returns(false);
+
+        const adUnitCode = 'adunit1';
+        const reqBidsConfigObj = {
+          ortb2Fragments: {
+            global: {},
+            bidder: {},
+          },
+          adUnits: [{
+            code: adUnitCode,
+            bids: [{
+              bidder: 'smartadserver'
+            }, {
+              bidder: 'pubmatic'
+            }, {
+              bidder: 'appnexus'
+            }, {
+              bidder: 'rubicon'
+            }, {
+              bidder: 'other'
+            }]
+          }]
+        };
+        const onDoneSpy = sinon.spy();
+
+        expect(weboramaSubmodule.init(moduleConfig)).to.be.true;
+        weboramaSubmodule.getBidRequestData(reqBidsConfigObj, onDoneSpy, moduleConfig);
+
+        expect(onDoneSpy.calledOnce).to.be.true;
+
+        const targeting = weboramaSubmodule.getTargetingData([adUnitCode], moduleConfig);
+
+        expect(targeting).to.deep.equal({
+          'adunit1': defaultProfile,
+        });
+
+        expect(reqBidsConfigObj.adUnits[0].bids.length).to.equal(5);
+        expect(reqBidsConfigObj.adUnits[0].bids[0].params.target).to.equal('lite_hobbies=sport;lite_hobbies=cinéma');
+        expect(reqBidsConfigObj.adUnits[0].bids[1].params.dctr).to.equal('lite_hobbies=sport,cinéma');
+        expect(reqBidsConfigObj.adUnits[0].bids[2].params.keywords).to.deep.equal(defaultProfile);
+        expect(reqBidsConfigObj.adUnits[0].bids[3].params).to.deep.equal({
+          inventory: defaultProfile,
+        });
+        expect(reqBidsConfigObj.ortb2Fragments.bidder.other).to.deep.equal({
+          site: {
+            ext: {
+              data: defaultProfile,
+            },
+          },
+        });
+        expect(onDataResponse).to.deep.equal({
+          data: defaultProfile,
+          meta: {
+            user: false,
+            source: 'lite',
+            isDefault: true,
+          },
+        });
+      });
       it('should be possible update profile from callbacks for a given bidder/adUnitCode', function() {
         let onDataResponse = {};
         const moduleConfig = {
@@ -3080,6 +3461,7 @@ describe('weboramaRtdProvider', function() {
           webo: data,
         };
 
+        sandbox.stub(storage, 'hasLocalStorage').returns(true);
         sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
         sandbox.stub(storage, 'getDataFromLocalStorage')
           .withArgs(DEFAULT_LOCAL_STORAGE_LITE_PROFILE_KEY)

From 0377e56a2b0d77fa3784f557d54c40747b7fac9e Mon Sep 17 00:00:00 2001
From: shahinrahbariasl <56240400+shahinrahbariasl@users.noreply.github.com>
Date: Wed, 19 Oct 2022 12:13:11 -0400
Subject: [PATCH 358/569] IX Bid Adapter: send bid floor per size in format ext
 (#9084)

* feat: send bid floor per size in format ext [PB-1311]

* fix: remove typo [PB-1311]

Co-authored-by: shahin.rahbariasl <shahin.rahbariasl@indexexchange.com>
---
 modules/ixBidAdapter.js                | 13 +++++++++----
 test/spec/modules/ixBidAdapter_spec.js | 12 ++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 6913c98013c..fc387fac76a 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -809,10 +809,15 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
         },
       };
 
-      // We add sid in imp.ext.sid therefore, remove from banner.format[].ext
-      for (let bannerFormat of _bannerImpression.banner.format) {
-        if (bannerFormat.ext != null && bannerFormat.ext.sid != null) {
-          delete bannerFormat.ext.sid;
+      for (let i = 0; i < _bannerImpression.banner.format.length; i++) {
+        // We add sid in imp.ext.sid therefore, remove from banner.format[].ext
+        if (_bannerImpression.banner.format[i].ext != null && _bannerImpression.banner.format[i].ext.sid != null) {
+          delete _bannerImpression.banner.format[i].ext.sid;
+        }
+
+        // add floor per size
+        if ('bidfloor' in impressionObjects[i]) {
+          _bannerImpression.banner.format[i].ext.bidfloor = impressionObjects[i].bidfloor
         }
       }
 
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index b110c9a4872..a1b79358e8c 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -1870,6 +1870,18 @@ describe('IndexexchangeAdapter', function () {
         expect(impression.banner.format[0].ext.fl).to.equal('x');
       });
 
+      it('banner multi size impression should have bidFloor both in imp and format ext obejcts', function () {
+        const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+        bid.params.bidFloor = 50;
+        bid.params.bidFloorCur = 'USD';
+        const requestBidFloor = spec.buildRequests([bid], {})[0];
+        const impression = JSON.parse(requestBidFloor.data.r).imp[0];
+
+        expect(impression.bidfloor).to.equal(bid.params.bidFloor);
+        expect(impression.bidfloorcur).to.equal(bid.params.bidFloorCur);
+        expect(impression.banner.format[0].ext.bidfloor).to.equal(50);
+      });
+
       it('missing sizes impressions should contain floors from priceFloors module ', function () {
         const bid = utils.deepClone(ONE_BANNER[0]);
         bid.mediaTypes.banner.sizes.push([500, 400])

From 0f513e76ce26efb77092b4373b0280258429dd6e Mon Sep 17 00:00:00 2001
From: xwang202 <57196235+xwang202@users.noreply.github.com>
Date: Thu, 20 Oct 2022 00:13:48 +0800
Subject: [PATCH 359/569] Freewheel-SSP Bid Adapter: add alias, update local
 param, and other additions (#9093)

* freewheel add schain in the request

* FreewheelSSP-Update update the bidder name and advertiserDomain

* FreewheelSSP-Update code update

* Freewheel-SSP Bid Adapter: code update
---
 modules/freewheel-sspBidAdapter.js            | 55 ++++++++++++++++---
 modules/freewheel-sspBidAdapter.md            |  2 +-
 .../modules/freewheel-sspBidAdapter_spec.js   | 29 ++++++++--
 3 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/modules/freewheel-sspBidAdapter.js b/modules/freewheel-sspBidAdapter.js
index 38973f915b6..764e3d6e6c0 100644
--- a/modules/freewheel-sspBidAdapter.js
+++ b/modules/freewheel-sspBidAdapter.js
@@ -78,6 +78,39 @@ function getPricing(xmlNode) {
   return princingData;
 }
 
+/*
+* Read the StickyBrand extension with this format:
+* <Extension type='StickyBrand'>
+*   <Domain><![CDATA[minotaur.com]]></Domain>
+*   <Sector><![CDATA[BEAUTY & HYGIENE]]></Sector>
+*   <Advertiser><![CDATA[James Bond Trademarks]]></Advertiser>
+*   <Brand><![CDATA[007 Seven]]></Brand>
+* </Extension>
+* @return {object} pricing data in format: {currency: "EUR", price:"1.000"}
+*/
+function getAdvertiserDomain(xmlNode) {
+  var domain = [];
+  var brandExtNode;
+  var extensions = xmlNode.querySelectorAll('Extension');
+  // Nodelist.forEach is not supported in IE and Edge
+  // Workaround given here https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10638731/
+  Array.prototype.forEach.call(extensions, function(node) {
+    if (node.getAttribute('type') === 'StickyBrand') {
+      brandExtNode = node;
+    }
+  });
+
+  // Currently we only return one Domain
+  if (brandExtNode) {
+    var domainNode = brandExtNode.querySelector('Domain');
+    domain.push(domainNode.textContent || domainNode.innerText);
+  } else {
+    logWarn('PREBID - ' + BIDDER_CODE + ': No bid received or missing StickyBrand extension.');
+  }
+
+  return domain;
+}
+
 function hashcode(inputString) {
   var hash = 0;
   var char;
@@ -260,7 +293,7 @@ var getOutstreamScript = function(bid) {
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
-  aliases: ['stickyadstv'], //  former name for freewheel-ssp
+  aliases: ['stickyadstv', 'freewheelssp'], //  aliases for freewheel-ssp
   /**
   * Determines whether or not the given bid request is valid.
   *
@@ -326,7 +359,7 @@ export const spec = {
           }
         }
       }
-      // TODO: is 'page' the right value here?
+
       var location = bidderRequest?.refererInfo?.page;
       if (isValidUrl(location)) {
         requestParams.loc = location;
@@ -409,6 +442,8 @@ export const spec = {
     const campaignId = getCampaignId(xmlDoc);
     const bannerId = getBannerId(xmlDoc);
     const topWin = getTopMostWindow();
+    const advertiserDomains = getAdvertiserDomain(xmlDoc);
+
     if (!topWin.freewheelssp_cache) {
       topWin.freewheelssp_cache = {};
     }
@@ -426,7 +461,7 @@ export const spec = {
         currency: princingData.currency,
         netRevenue: true,
         ttl: 360,
-        meta: { advertiserDomains: princingData.adomain && isArray(princingData.adomain) ? princingData.adomain : [] },
+        meta: { advertiserDomains: advertiserDomains },
         dealId: dealId,
         campaignId: campaignId,
         bannerId: bannerId
@@ -454,14 +489,20 @@ export const spec = {
       }
     }
 
+    const syncs = [];
     if (syncOptions && syncOptions.pixelEnabled) {
-      return [{
+      syncs.push({
         type: 'image',
         url: USER_SYNC_URL + gdprParams
-      }];
-    } else {
-      return [];
+      });
+    } else if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: USER_SYNC_URL + gdprParams
+      });
     }
+
+    return syncs;
   },
 };
 
diff --git a/modules/freewheel-sspBidAdapter.md b/modules/freewheel-sspBidAdapter.md
index 0086aac6567..a445280f2b0 100644
--- a/modules/freewheel-sspBidAdapter.md
+++ b/modules/freewheel-sspBidAdapter.md
@@ -22,7 +22,7 @@ Module that connects to Freewheel ssp's demand sources
 
                bids: [
                    {
-                       bidder: "freewheel-ssp",
+                       bidder: "freewheelssp", // or use alias "freewheel-ssp"
                        params: {
                            zoneId : '277225'
                        }
diff --git a/test/spec/modules/freewheel-sspBidAdapter_spec.js b/test/spec/modules/freewheel-sspBidAdapter_spec.js
index 81f4ecec074..7ef576fc7ec 100644
--- a/test/spec/modules/freewheel-sspBidAdapter_spec.js
+++ b/test/spec/modules/freewheel-sspBidAdapter_spec.js
@@ -483,6 +483,23 @@ describe('freewheelSSP BidAdapter Test', () => {
         'bidId': '2',
         'bidderRequestId': '3',
         'auctionId': '4',
+      },
+      {
+        'bidder': 'freewheelssp',
+        'params': {
+          'zoneId': '277225',
+          'format': 'test'
+        },
+        'adUnitCode': 'adunit-code',
+        'mediaTypes': {
+          'video': {
+            'playerSize': [300, 600],
+          }
+        },
+        'sizes': [[300, 400]],
+        'bidId': '2',
+        'bidderRequestId': '3',
+        'auctionId': '4',
       }
     ];
 
@@ -510,7 +527,8 @@ describe('freewheelSSP BidAdapter Test', () => {
     '   </Creatives>' +
     '   <Extensions>' +
     '     <Extension type=\'StickyPricing\'><Price currency="EUR">0.2000</Price></Extension>' +
-    '    </Extensions>' +
+    '     <Extension type=\'StickyBrand\'><Domain><![CDATA[minotaur.com]]></Domain><Sector><![CDATA[BEAUTY & HYGIENE]]></Sector><Advertiser><![CDATA[James Bond Trademarks]]></Advertiser><Brand><![CDATA[007 Seven]]></Brand></Extension>' +
+    '   </Extensions>' +
     '  </InLine>' +
     ' </Ad>' +
     '</VAST>';
@@ -536,12 +554,15 @@ describe('freewheelSSP BidAdapter Test', () => {
           bannerId: '12345',
           vastXml: response,
           mediaType: 'video',
-          ad: ad
+          ad: ad,
+          meta: {
+            advertiserDomains: 'minotaur.com'
+          }
         }
       ];
 
       let result = spec.interpretResponse(response, request[0]);
-      expect(result[0].meta.advertiserDomains).to.deep.equal([]);
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['minotaur.com']);
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
       expect(result[0].campaignId).to.equal('SMF-WOW-55555');
       expect(result[0].bannerId).to.equal('12345');
@@ -570,7 +591,7 @@ describe('freewheelSSP BidAdapter Test', () => {
       ];
 
       let result = spec.interpretResponse(response, request[0]);
-      expect(result[0].meta.advertiserDomains).to.deep.equal([]);
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['minotaur.com']);
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
       expect(result[0].campaignId).to.equal('SMF-WOW-55555');
       expect(result[0].bannerId).to.equal('12345');

From c709f86d3f1ec3237ba6d37e9f95f99f3a7d2285 Mon Sep 17 00:00:00 2001
From: "Adserver.Online" <61009237+adserver-online@users.noreply.github.com>
Date: Wed, 19 Oct 2022 19:18:19 +0300
Subject: [PATCH 360/569] Aso Bid Adapter: support schain (#9108)

* SChain support

* manually kick off tests

* Inappropriate remove

* Typo fixed

* Example updated to avoid confusion

Co-authored-by: dev <dev@adsrv.org>
Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/asoBidAdapter.js                | 17 +++++++++++------
 modules/asoBidAdapter.md                | 11 +++++------
 test/spec/modules/asoBidAdapter_spec.js |  4 ++--
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/modules/asoBidAdapter.js b/modules/asoBidAdapter.js
index 9469bc6b00c..83b182e4ca5 100644
--- a/modules/asoBidAdapter.js
+++ b/modules/asoBidAdapter.js
@@ -4,6 +4,7 @@ import {
   deepSetValue,
   getDNT,
   inIframe,
+  isArray,
   isFn,
   logWarn,
   parseSizesInput,
@@ -19,6 +20,7 @@ const BIDDER_CODE = 'aso';
 const DEFAULT_SERVER_URL = 'https://srv.aso1.net';
 const DEFAULT_SERVER_PATH = '/prebid/bidder';
 const OUTSTREAM_RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+const VERSION = '$prebid.version$_1.1';
 const TTL = 300;
 
 export const spec = {
@@ -59,7 +61,7 @@ export const spec = {
 
       serverRequests.push({
         method: 'POST',
-        url: getEnpoint(bidRequest),
+        url: getEndpoint(bidRequest),
         data: payload,
         options: {
           withCredentials: true,
@@ -272,11 +274,9 @@ function createVideoImp(bidRequest, videoParams) {
   return imp;
 }
 
-function getEnpoint(bidRequest) {
-  const serverUrl = bidRequest.params.serverUrl || DEFAULT_SERVER_URL;
-  const serverPath = bidRequest.params.serverPath || DEFAULT_SERVER_PATH;
-
-  return serverUrl + serverPath + '?zid=' + bidRequest.params.zone + '&pbjs=$prebid.version$';
+function getEndpoint(bidRequest) {
+  const serverUrl = bidRequest.params.server || DEFAULT_SERVER_URL;
+  return serverUrl + DEFAULT_SERVER_PATH + '?zid=' + bidRequest.params.zone + '&pbjs=' + VERSION;
 }
 
 function getConsentsIds(gdprConsent) {
@@ -341,6 +341,11 @@ function createBasePayload(bidRequest, bidderRequest) {
     deepSetValue(payload, 'user.ext.eids', eids);
   }
 
+  const schainData = deepAccess(bidRequest, 'schain.nodes');
+  if (isArray(schainData) && schainData.length > 0) {
+    deepSetValue(payload, 'source.ext.schain', bidRequest.schain);
+  }
+
   return payload;
 }
 
diff --git a/modules/asoBidAdapter.md b/modules/asoBidAdapter.md
index 32f4ebf5cef..f187389c5b5 100644
--- a/modules/asoBidAdapter.md
+++ b/modules/asoBidAdapter.md
@@ -14,12 +14,11 @@ For more information, please visit [Adserver.Online](https://adserver.online).
 
 # Parameters
 
-| Name          | Scope    | Description             | Example   | Type      |
-|---------------|----------|-------------------------|-----------|-----------|
-| `zone`        | required | Zone ID                 | `73815`   | `Integer` |
-| `attr`        | optional | Custom targeting params | `{keywords: ["a", "b"]}` | `Object` |
-
-
+| Name      | Scope    | Description             | Example                | Type       |
+|-----------|----------|-------------------------|------------------------|------------|
+| `zone`    | required | Zone ID                 | `73815`                | `Integer`  |
+| `attr`    | optional | Custom targeting params | `{foo: ["a", "b"]}`    | `Object`   |
+| `server`  | optional | Custom bidder endpoint  | `https://endpoint.url` | `String`   |
 
 # Test parameters for banner
 ```js
diff --git a/test/spec/modules/asoBidAdapter_spec.js b/test/spec/modules/asoBidAdapter_spec.js
index 5ac44cb1db4..88016d1902c 100644
--- a/test/spec/modules/asoBidAdapter_spec.js
+++ b/test/spec/modules/asoBidAdapter_spec.js
@@ -125,7 +125,7 @@ describe('Adserver.Online bidding adapter', function () {
       expect(parsedRequestUrl.pathname).to.equal('/prebid/bidder');
 
       const query = parsedRequestUrl.search;
-      expect(query.pbjs).to.equal('$prebid.version$');
+      expect(query.pbjs).to.contain('$prebid.version$');
       expect(query.zid).to.equal('1');
 
       expect(request.data).to.exist;
@@ -162,7 +162,7 @@ describe('Adserver.Online bidding adapter', function () {
       expect(parsedRequestUrl.pathname).to.equal('/prebid/bidder');
 
       const query = parsedRequestUrl.search;
-      expect(query.pbjs).to.equal('$prebid.version$');
+      expect(query.pbjs).to.contain('$prebid.version$');
       expect(query.zid).to.equal('2');
 
       expect(request.data).to.not.be.empty;

From e459b91cc2deb83fe26f8f515dfb59157687fdc6 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Wed, 19 Oct 2022 09:19:13 -0700
Subject: [PATCH 361/569] Prebid core: restore bid-level `renderer` (#9128)

---
 src/auction.js                   |  6 ++--
 test/spec/auctionmanager_spec.js | 49 +++++++++++++++++++-------------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/auction.js b/src/auction.js
index 26561d87d71..89b8f21d571 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -690,7 +690,7 @@ function getPreparedBidForAuction(bid, {index = auctionManager.index} = {}) {
   events.emit(CONSTANTS.EVENTS.BID_ADJUSTMENT, bid);
 
   // a publisher-defined renderer can be used to render bids
-  const adUnitRenderer = index.getAdUnit(bid).renderer;
+  const bidRenderer = index.getBidRequest(bid)?.renderer || index.getAdUnit(bid).renderer;
 
   // a publisher can also define a renderer for a mediaType
   const bidObjectMediaType = bid.mediaType;
@@ -704,8 +704,8 @@ function getPreparedBidForAuction(bid, {index = auctionManager.index} = {}) {
   // the renderer for the mediaType takes precendence
   if (mediaTypeRenderer && mediaTypeRenderer.url && mediaTypeRenderer.render && !(mediaTypeRenderer.backupOnly === true && bid.renderer)) {
     renderer = mediaTypeRenderer;
-  } else if (adUnitRenderer && adUnitRenderer.url && adUnitRenderer.render && !(adUnitRenderer.backupOnly === true && bid.renderer)) {
-    renderer = adUnitRenderer;
+  } else if (bidRenderer && bidRenderer.url && bidRenderer.render && !(bidRenderer.backupOnly === true && bid.renderer)) {
+    renderer = bidRenderer;
   }
 
   if (renderer) {
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index 105401a62a4..e36b2ccbb07 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -736,6 +736,7 @@ describe('auctionmanager.js', function () {
     let auction;
     let ajaxStub;
     let bids;
+    let bidderRequests;
     let makeRequestsStub;
 
     before(function () {
@@ -759,7 +760,8 @@ describe('auctionmanager.js', function () {
         adUnitCodes = [ADUNIT_CODE];
         auction = auctionModule.newAuction({adUnits, adUnitCodes, callback: function() {}, cbTimeout: 3000});
         bids = TEST_BIDS.slice();
-        makeRequestsStub.returns(bids.map(b => mockBidRequest(b, {auctionId: auction.getAuctionId()})));
+        bidderRequests = bids.map(b => mockBidRequest(b, {auctionId: auction.getAuctionId()}));
+        makeRequestsStub.returns(bidderRequests);
         indexAuctions = [auction];
         createAuctionStub = sinon.stub(auctionModule, 'newAuction');
         createAuctionStub.returns(auction);
@@ -813,25 +815,32 @@ describe('auctionmanager.js', function () {
         assert.equal(registeredBid.adserverTargeting.extra, 'stuff');
       });
 
-      it('installs publisher-defined renderers on bids', function () {
-        let renderer = {
-          url: 'renderer.js',
-          render: (bid) => bid
-        };
-        Object.assign(adUnits[0], {renderer});
-
-        let bids1 = Object.assign({},
-          bids[0],
-          {
-            bidderCode: BIDDER_CODE,
-            mediaType: 'video-outstream',
-          }
-        );
-        spec.interpretResponse.returns(bids1);
-        auction.callBids();
-        const addedBid = auction.getBidsReceived().pop();
-        assert.equal(addedBid.renderer.url, 'renderer.js');
-      });
+      describe('install publisher-defined renderers', () => {
+        Object.entries({
+          'on adUnit': () => adUnits[0],
+          'on bid': () => bidderRequests[0].bids[0],
+        }).forEach(([t, getObj]) => {
+          it(t, () => {
+            let renderer = {
+              url: 'renderer.js',
+              render: (bid) => bid
+            };
+
+            let bids1 = Object.assign({},
+              bids[0],
+              {
+                bidderCode: BIDDER_CODE,
+                mediaType: 'video-outstream',
+              }
+            );
+            Object.assign(getObj(), {renderer});
+            spec.interpretResponse.returns(bids1);
+            auction.callBids();
+            const addedBid = auction.getBidsReceived().pop();
+            assert.equal(addedBid.renderer.url, 'renderer.js');
+          })
+        })
+      })
 
       it('installs publisher-defined backup renderers on bids', function () {
         let renderer = {

From 588568232bad7282be43729a6c8c2a8352c74204 Mon Sep 17 00:00:00 2001
From: el-chuck <be.pickenbrock@gmail.com>
Date: Wed, 19 Oct 2022 18:27:38 +0200
Subject: [PATCH 362/569] Smaato Bid Adapter: Native support (#9089)

* PREB-36	[Prebid.js] Native support

* PREB-36	[Prebid.js] Native support
- update to ortb native

Co-authored-by: Ruslan Sibgatullin <ruslan.sibgatullin@smaato.com>
Co-authored-by: Bernhard Pickenbrock <bernhard.pickenbrock@smaato.com>
---
 modules/smaatoBidAdapter.js                |  59 +++-
 modules/smaatoBidAdapter.md                |  78 +++++
 test/spec/modules/smaatoBidAdapter_spec.js | 343 ++++++++++++++++++---
 3 files changed, 439 insertions(+), 41 deletions(-)

diff --git a/modules/smaatoBidAdapter.js b/modules/smaatoBidAdapter.js
index c783f35d915..18ce56c7a80 100644
--- a/modules/smaatoBidAdapter.js
+++ b/modules/smaatoBidAdapter.js
@@ -1,11 +1,14 @@
-import { deepAccess, getDNT, deepSetValue, logInfo, logError, isEmpty, getAdUnitSizes, fill, chunk, getMaxValueFromArray, getMinValueFromArray } from '../src/utils.js';
+import { deepAccess, isNumber, getDNT, deepSetValue, logInfo, logError, isEmpty, getAdUnitSizes, fill, chunk, getMaxValueFromArray, getMinValueFromArray } from '../src/utils.js';
+import {find} from '../src/polyfill.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
-import {ADPOD, BANNER, VIDEO} from '../src/mediaTypes.js';
+import {ADPOD, BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
+import CONSTANTS from '../src/constants.json';
 
+const { NATIVE_IMAGE_TYPES } = CONSTANTS;
 const BIDDER_CODE = 'smaato';
 const SMAATO_ENDPOINT = 'https://prebid.ad.smaato.net/oapi/prebid';
-const SMAATO_CLIENT = 'prebid_js_$prebid.version$_1.6'
+const SMAATO_CLIENT = 'prebid_js_$prebid.version$_1.7'
 const CURRENCY = 'USD';
 
 const buildOpenRtbBidRequest = (bidRequest, bidderRequest) => {
@@ -91,6 +94,12 @@ const buildOpenRtbBidRequest = (bidRequest, bidderRequest) => {
     }
   }
 
+  const nativeOrtbRequest = bidRequest.nativeOrtbRequest;
+  if (nativeOrtbRequest) {
+    const nativeRequest = Object.assign({}, requestTemplate, createNativeImp(bidRequest, nativeOrtbRequest));
+    requests.push(nativeRequest);
+  }
+
   return requests;
 }
 
@@ -109,11 +118,11 @@ const buildServerRequest = (validBidRequest, data) => {
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, VIDEO],
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
   gvlid: 82,
 
   /**
-   * Determines whether or not the given bid request is valid.
+   * Determines whether the given bid request is valid.
    *
    * @param {BidRequest} bid The bid params to validate.
    * @return boolean True if this is a valid bid, and false otherwise.
@@ -171,6 +180,7 @@ export const spec = {
    * Unpack the response from the server into a list of bids.
    *
    * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {BidRequest} bidRequest
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
   interpretResponse: (serverResponse, bidRequest) => {
@@ -239,6 +249,11 @@ export const spec = {
               resultingBid.mediaType = VIDEO;
               bids.push(resultingBid);
               break;
+            case 'Native':
+              resultingBid.native = createNativeAd(bid.adm);
+              resultingBid.mediaType = NATIVE;
+              bids.push(resultingBid);
+              break;
             default:
               logInfo('[SMAATO] Invalid ad type:', smtAdType);
           }
@@ -297,6 +312,13 @@ const createRichmediaAd = (adm) => {
   return markup + '</div>';
 };
 
+const createNativeAd = (adm) => {
+  const nativeResponse = JSON.parse(adm).native;
+  return {
+    ortb: nativeResponse
+  }
+};
+
 function createBannerImp(bidRequest) {
   const adUnitSizes = getAdUnitSizes(bidRequest);
   const sizes = adUnitSizes.map((size) => ({w: size[0], h: size[1]}));
@@ -342,6 +364,33 @@ function createVideoImp(bidRequest, videoMediaType) {
   };
 }
 
+function createNativeImp(bidRequest, nativeRequest) {
+  return {
+    imp: [{
+      id: bidRequest.bidId,
+      tagid: deepAccess(bidRequest, 'params.adspaceId'),
+      bidfloor: getBidFloor(bidRequest, NATIVE, getNativeMainImageSize(nativeRequest)),
+      native: {
+        request: JSON.stringify(nativeRequest),
+        ver: '1.2'
+      }
+    }]
+  };
+}
+
+function getNativeMainImageSize(nativeRequest) {
+  const mainImage = find(nativeRequest.assets, asset => asset.hasOwnProperty('img') && asset.img.type === NATIVE_IMAGE_TYPES.MAIN)
+  if (mainImage) {
+    if (isNumber(mainImage.img.w) && isNumber(mainImage.img.h)) {
+      return [[mainImage.img.w, mainImage.img.h]]
+    }
+    if (isNumber(mainImage.img.wmin) && isNumber(mainImage.img.hmin)) {
+      return [[mainImage.img.wmin, mainImage.img.hmin]]
+    }
+  }
+  return []
+}
+
 function createAdPodImp(bidRequest, videoMediaType) {
   const tagid = deepAccess(bidRequest, 'params.adbreakId')
   const bce = config.getConfig('adpod.brandCategoryExclusion')
diff --git a/modules/smaatoBidAdapter.md b/modules/smaatoBidAdapter.md
index 41e1c952f2a..170880c3fc0 100644
--- a/modules/smaatoBidAdapter.md
+++ b/modules/smaatoBidAdapter.md
@@ -63,6 +63,84 @@ var adUnits = [{
 }];
 ```
 
+For native adunits:
+
+```
+var adUnits = [{
+    "code": "native unit",
+    "mediaTypes": {
+        native: {
+            ortb: {
+                ver: "1.2",
+                assets: [
+                    {
+                        id: 1,
+                        required: 1,
+                        img: {
+                            type: 3,
+                            w: 150,
+                            h: 50,
+                        }
+                    },
+                    {
+                        id: 2,
+                        required: 1,
+                        img: {
+                            type: 2,
+                            w: 50,
+                            h: 50
+                        }
+                    },
+                    {
+                        id: 3,
+                        required: 1,
+                        title: {
+                            len: 80
+                        }
+                    },
+                    {
+                        id: 4,
+                        required: 1,
+                        data: {
+                            type: 1
+                        }
+                    },
+                    {
+                        id: 5,
+                        required: 1,
+                        data: {
+                            type: 2
+                        }
+                    },
+                    {
+                        id: 6,
+                        required: 0,
+                        data: {
+                            type: 3
+                        }
+                    },
+                    {
+                        id: 7,
+                        required: 0,
+                        data: {
+                            type: 12
+                        }
+                    }
+                ]
+            },
+            sendTargetingKeys: false,
+        }
+    },
+    "bids": [{
+        "bidder": "smaato",
+        "params": {
+            "publisherId": "1100042525",
+            "adspaceId": "130563103"
+        }
+    }]
+}];
+```
+
 For adpod adunits:
 
 ```
diff --git a/test/spec/modules/smaatoBidAdapter_spec.js b/test/spec/modules/smaatoBidAdapter_spec.js
index 99592765845..c7dbf1363e7 100644
--- a/test/spec/modules/smaatoBidAdapter_spec.js
+++ b/test/spec/modules/smaatoBidAdapter_spec.js
@@ -6,6 +6,7 @@ import {createEidsArray} from 'modules/userId/eids.js';
 const ADTYPE_IMG = 'Img';
 const ADTYPE_RICHMEDIA = 'Richmedia';
 const ADTYPE_VIDEO = 'Video';
+const ADTYPE_NATIVE = 'Native';
 
 const REFERRER = 'http://example.com/page.html'
 const CONSENT_STRING = 'HFIDUYFIUYIUYWIPOI87392DSU'
@@ -421,7 +422,6 @@ describe('smaatoBidAdapterTest', () => {
         },
         adUnitCode: '/19968336/header-bid-tag-0',
         transactionId: 'transactionId',
-        sizes: [[300, 50]],
         bidId: 'bidId',
         bidderRequestId: 'bidderRequestId',
         src: 'client',
@@ -793,6 +793,168 @@ describe('smaatoBidAdapterTest', () => {
       });
     });
 
+    describe('buildRequests for native imps', () => {
+      const NATIVE_OPENRTB_REQUEST = {
+        ver: '1.2',
+        assets: [
+          {
+            id: 4,
+            required: 1,
+            img: {
+              type: 3,
+              w: 150,
+              h: 50,
+            }
+          },
+          {
+            id: 2,
+            required: 1,
+            img: {
+              type: 2,
+              w: 50,
+              h: 50
+            }
+          },
+          {
+            id: 0,
+            required: 1,
+            title: {
+              len: 80
+            }
+          },
+          {
+            id: 1,
+            required: 1,
+            data: {
+              type: 1
+            }
+          },
+          {
+            id: 3,
+            required: 1,
+            data: {
+              type: 2
+            }
+          },
+          {
+            id: 5,
+            required: 1,
+            data: {
+              type: 3
+            }
+          },
+          {
+            id: 6,
+            required: 1,
+            data: {
+              type: 4
+            }
+          },
+          {
+            id: 7,
+            required: 1,
+            data: {
+              type: 5
+            }
+          },
+          {
+            id: 8,
+            required: 1,
+            data: {
+              type: 6
+            }
+          },
+          {
+            id: 9,
+            required: 1,
+            data: {
+              type: 7
+            }
+          },
+          {
+            id: 10,
+            required: 0,
+            data: {
+              type: 8
+            }
+          },
+          {
+            id: 11,
+            required: 1,
+            data: {
+              type: 9
+            }
+          },
+          {
+            id: 12,
+            require: 0,
+            data: {
+              type: 10
+            }
+          },
+          {
+            id: 13,
+            required: 0,
+            data: {
+              type: 11
+            }
+          },
+          {
+            id: 14,
+            required: 1,
+            data: {
+              type: 12
+            }
+          }
+        ]
+      };
+
+      const singleNativeBidRequest = {
+        bidder: 'smaato',
+        params: {
+          publisherId: 'publisherId',
+          adspaceId: 'adspaceId'
+        },
+        nativeOrtbRequest: NATIVE_OPENRTB_REQUEST,
+        adUnitCode: '/19968336/header-bid-tag-0',
+        transactionId: 'transactionId',
+        bidId: 'bidId',
+        bidderRequestId: 'bidderRequestId',
+        src: 'client',
+        bidRequestsCount: 1,
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0
+      };
+
+      it('sends correct native imps', () => {
+        const reqs = spec.buildRequests([singleNativeBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].id).to.be.equal('bidId');
+        expect(req.imp[0].tagid).to.be.equal('adspaceId');
+        expect(req.imp[0].bidfloor).to.be.undefined;
+        expect(req.imp[0].native.request).to.deep.equal(JSON.stringify(NATIVE_OPENRTB_REQUEST));
+      });
+
+      it('sends bidfloor when configured', () => {
+        const singleNativeBidRequestWithFloor = Object.assign({}, singleNativeBidRequest);
+        singleNativeBidRequestWithFloor.getFloor = function(arg) {
+          if (arg.currency === 'USD' &&
+              arg.mediaType === 'native' &&
+              JSON.stringify(arg.size) === JSON.stringify([150, 50])) {
+            return {
+              currency: 'USD',
+              floor: 0.123
+            }
+          }
+        }
+        const reqs = spec.buildRequests([singleNativeBidRequestWithFloor], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp[0].bidfloor).to.be.equal(0.123);
+      });
+    });
+
     describe('in-app requests', () => {
       const LOCATION = {
         lat: 33.3,
@@ -932,50 +1094,131 @@ describe('smaatoBidAdapterTest', () => {
       }
     }
 
+    const NATIVE_RESPONSE = {
+      ver: '1.2',
+      link: {
+        url: 'https://link.url',
+        clicktrackers: [
+          'http://click.url/v1/click?e=prebid'
+        ]
+      },
+      assets: [
+        {
+          id: 0,
+          required: 1,
+          title: {
+            text: 'Title'
+          }
+        },
+        {
+          id: 2,
+          required: 1,
+          img: {
+            type: 1,
+            url: 'https://logo.png',
+            w: 40,
+            h: 40
+          }
+        },
+        {
+          id: 4,
+          required: 1,
+          img: {
+            type: 3,
+            url: 'https://main.png',
+            w: 480,
+            h: 320
+          }
+        },
+        {
+          id: 3,
+          required: 1,
+          data: {
+            type: 2,
+            value: 'Desc'
+          }
+        },
+        {
+          id: 14,
+          required: 1,
+          data: {
+            type: 12,
+            value: 'CTAText'
+          }
+        },
+        {
+          id: 5,
+          required: 0,
+          data: {
+            type: 3,
+            value: '2 stars'
+          }
+        }
+      ],
+      eventtrackers: [
+        {
+          event: 2,
+          method: 1,
+          url: 'https://js.url'
+        },
+        {
+          event: 1,
+          method: 1,
+          url: 'http://view.url/v1/view?e=prebid'
+        }
+      ],
+      privacy: 'https://privacy.com/'
+    }
+
     const buildOpenRtbBidResponse = (adType) => {
       let adm = '';
 
       switch (adType) {
         case ADTYPE_IMG:
-          adm = JSON.stringify({
-            image: {
-              img: {
-                url: 'https://prebid/static/ad.jpg',
-                w: 320,
-                h: 50,
-                ctaurl: 'https://prebid/track/ctaurl'
-              },
-              impressiontrackers: [
-                'https://prebid/track/imp/1',
-                'https://prebid/track/imp/2'
-              ],
-              clicktrackers: [
-                'https://prebid/track/click/1'
-              ]
-            }
-          });
+          adm = JSON.stringify(
+            {
+              image: {
+                img: {
+                  url: 'https://prebid/static/ad.jpg',
+                  w: 320,
+                  h: 50,
+                  ctaurl: 'https://prebid/track/ctaurl'
+                },
+                impressiontrackers: [
+                  'https://prebid/track/imp/1',
+                  'https://prebid/track/imp/2'
+                ],
+                clicktrackers: [
+                  'https://prebid/track/click/1'
+                ]
+              }
+            });
           break;
         case ADTYPE_RICHMEDIA:
-          adm = JSON.stringify({
-            richmedia: {
-              mediadata: {
-                content: '<div><h3>RICHMEDIA CONTENT</h3></div>',
-                w: 800,
-                h: 600
-              },
-              impressiontrackers: [
-                'https://prebid/track/imp/1',
-                'https://prebid/track/imp/2'
-              ],
-              clicktrackers: [
-                'https://prebid/track/click/1'
-              ]
-            }
-          });
+          adm = JSON.stringify(
+            {
+              richmedia: {
+                mediadata: {
+                  content: '<div><h3>RICHMEDIA CONTENT</h3></div>',
+                  w: 800,
+                  h: 600
+                },
+                impressiontrackers: [
+                  'https://prebid/track/imp/1',
+                  'https://prebid/track/imp/2'
+                ],
+                clicktrackers: [
+                  'https://prebid/track/click/1'
+                ]
+              }
+            });
           break;
         case ADTYPE_VIDEO:
           adm = '<VAST version="2.0"></VAST>';
           break;
+        case ADTYPE_NATIVE:
+          adm = JSON.stringify({ native: NATIVE_RESPONSE })
+          break;
         default:
           throw Error('Invalid AdType');
       }
@@ -1030,7 +1273,7 @@ describe('smaatoBidAdapterTest', () => {
     });
 
     describe('non ad pod', () => {
-      it('single image reponse', () => {
+      it('single image response', () => {
         const bids = spec.interpretResponse(buildOpenRtbBidResponse(ADTYPE_IMG), buildBidRequest());
 
         expect(bids).to.deep.equal([
@@ -1056,7 +1299,7 @@ describe('smaatoBidAdapterTest', () => {
         ]);
       });
 
-      it('single richmedia reponse', () => {
+      it('single richmedia response', () => {
         const bids = spec.interpretResponse(buildOpenRtbBidResponse(ADTYPE_RICHMEDIA), buildBidRequest());
 
         expect(bids).to.deep.equal([
@@ -1108,6 +1351,34 @@ describe('smaatoBidAdapterTest', () => {
         ]);
       });
 
+      it('single native response', () => {
+        const bids = spec.interpretResponse(buildOpenRtbBidResponse(ADTYPE_NATIVE), buildBidRequest());
+
+        expect(bids).to.deep.equal([
+          {
+            requestId: '226416e6e6bf41',
+            cpm: 0.01,
+            width: 350,
+            height: 50,
+            native: {
+              ortb: NATIVE_RESPONSE
+            },
+            ttl: 300,
+            creativeId: 'CR69381',
+            dealId: '12345',
+            netRevenue: true,
+            currency: 'USD',
+            mediaType: 'native',
+            meta: {
+              advertiserDomains: ['smaato.com'],
+              agencyId: 'CM6523',
+              networkName: 'smaato',
+              mediaType: 'native'
+            }
+          }
+        ]);
+      });
+
       it('ignores bid response with invalid ad type', () => {
         const serverResponse = buildOpenRtbBidResponse(ADTYPE_IMG);
         serverResponse.headers.get = (header) => {

From 6bce8fe5158c426fe38fa1da68fba5aa5f86860a Mon Sep 17 00:00:00 2001
From: Joel Meyer <joel.meyer@gmail.com>
Date: Wed, 19 Oct 2022 09:44:12 -0700
Subject: [PATCH 363/569] Betters docs for the fledgeForGpt module (#9127)

Enhance the documentation with directions for publishers and bidder adapter maintainers.
---
 modules/fledgeForGpt.md | 124 ++++++++++++++++++++++++++++++++--------
 1 file changed, 101 insertions(+), 23 deletions(-)

diff --git a/modules/fledgeForGpt.md b/modules/fledgeForGpt.md
index 5672ac04618..3bb86cd5946 100644
--- a/modules/fledgeForGpt.md
+++ b/modules/fledgeForGpt.md
@@ -1,34 +1,33 @@
-## Overview
+# Overview
+This module allows Prebid.js to support FLEDGE by integrating it with GPT's [experimental FLEDGE
+support](https://github.com/google/ads-privacy/tree/master/proposals/fledge-multiple-seller-testing).
 
-This module enables the handling of fledge auction by GPT.
-Bid adapters can now return component auction configs in addition to bids.
+To learn more about FLEDGE in general, go [here](https://github.com/WICG/turtledove/blob/main/FLEDGE.md).
 
-Those component auction configs will be registered to the GPT ad slot,
-and GPT will be responsible to run fledge auction and render the winning fledge ad.
+This document covers the steps necessary for publishers to enable FLEDGE on their inventory. It also describes
+the changes Bid Adapters need to implement in order to support FLEDGE.
 
-Find out more [here](https://github.com/WICG/turtledove/blob/main/FLEDGE.md).
-
-## Integration
-
-Build the fledge module into the Prebid.js package with:
+## Publisher Integration
+Publishers wishing to enable FLEDGE support must do two things. First, they must compile Prebid.js with support for this module.
+This is accomplished by adding the `fledgeForGpt` module to the list of modules they are already using:
 
 ```
 gulp build --modules=fledgeForGpt,...
 ```
 
-## Module Configuration Parameters
+Second, they must enable FLEDGE in their Prebid.js configuration. To provide a high degree of flexiblity for testing, FLEDGE
+settings exist at the module level, the bidder level, and the slot level.
+
+### Module Configuration
+This module exposes the following settings:
 
 |Name |Type |Description |Notes |
 | :------------ | :------------ | :------------ |:------------ |
 |enabled | Boolean |Enable/disable the module |Defaults to `false` |
 
-## Configuration
+As noted above, FLEDGE support is disabled by default. To enable it, set the `enabled` value to `true` for this module
+using the `setConfig` method of Prebid.js:
 
-Fledge support need to be enabled at 3 levels:
-- `fledgeForGpt` module
-- bidder
-- adunit
-### enabling the fledgeForGpt module
 ```js
 pbjs.que.push(function() {
   pbjs.setConfig({
@@ -39,7 +38,17 @@ pbjs.que.push(function() {
 });
 ```
 
-### enablingthe  bidder
+### Bidder Configuration
+This module adds the following setting for bidders:
+
+|Name |Type |Description |Notes |
+| :------------ | :------------ | :------------ |:------------ |
+| fledgeEnabled | Boolean | Enable/disable a bidder to participate in FLEDGE | Defaults to `false` |
+
+In addition to enabling FLEDGE at the module level, individual bidders must also be enabled. This allows publishers to
+selectively test with one or more bidders as they desire. To enable one or more bidders, use the `setBidderConfig` method
+of Prebid.js:
+
 ```js
 pbjs.setBidderConfig({
     bidders: ["openx"],
@@ -49,12 +58,81 @@ pbjs.setBidderConfig({
 });
 ```
 
-### enabling the adunit
-ortb2Imp.ext.ae on the adunit must be set 1
+### AdUnit Configuration
+Enabling an adunit for FLEDGE eligibility is accomplished by setting an attribute of the `ortb2Imp` object for that
+adunit.
+
+|Name |Type |Description |Notes |
+| :------------ | :------------ | :------------ |:------------ |
+| ortb2Imp.ext.ae | Integer | Auction Environment: 1 indicates FLEDGE eligible, 0 indicates it is not | Absence indicates this is not FLEDGE eligible |
+
+The `ae` field stands for Auction Environment and was chosen to be consistent with the field that GAM passes to bidders
+in their Open Bidding and Exchange Bidding APIs. More details on that can be found
+[here](https://github.com/google/ads-privacy/tree/master/proposals/fledge-rtb#bid-request-changes-indicating-interest-group-auction-support)
+In practice, this looks as follows:
+
 ```js
-ortb2Imp: {
-    ext: {
-        ae: 1
+pbjs.addAdUnits({
+    code: "my-adunit-div",
+    // other config here
+    ortb2Imp: {
+        ext: {
+            ae: 1
+        }
+    }
+});
+```
+
+## Bid Adapter Integration
+Chrome has enabled a two-tier auction in FLEDGE. This allows multiple sellers (frequently SSPs) to act on behalf of the publisher with
+a single entity serving as the final decision maker. In their [current approach](https://github.com/google/ads-privacy/tree/master/proposals/fledge-multiple-seller-testing),
+GPT has opted to run the final auction layer while allowing other SSPs/sellers to participate as
+[Component Auctions](https://github.com/WICG/turtledove/blob/main/FLEDGE.md#21-initiating-an-on-device-auction) which feed their
+bids to the final layer. To learn more about Component Auctions, go [here](https://github.com/WICG/turtledove/blob/main/FLEDGE.md#24-scoring-bids-in-component-auctions).
+
+The FLEDGE auction, including Component Auctions, are configured via an `AuctionConfig` object that defines the parameters of the auction for a given
+seller. This module enables FLEDGE support by allowing bid adaptors to return `AuctionConfig` objects in addition to bids. If a bid adaptor returns an
+`AuctionConfig` object, Prebid.js will register it with the appropriate GPT ad slot so the bidder can participate as a Component Auction in the overall
+FLEDGE auction for that slot. More details on the GPT API can be found [here](https://developers.google.com/publisher-tag/reference#googletag.config.componentauctionconfig).
+
+Modifying a bid adapter to support FLEDGE is a straightforward process and consists of the following steps:
+1. Detecting when a bid request is FLEDGE eligible
+2. Responding with AuctionConfig
+
+FLEDGE eligibility is made available to bid adapters through the `bidderRequest.fledgeEnabled` field.
+The [`bidderRequest`](https://docs.prebid.org/dev-docs/bidder-adaptor.html#bidderrequest-parameters) object is passed to
+the [`buildRequests`](https://docs.prebid.org/dev-docs/bidder-adaptor.html#building-the-request) method of an adapter. Bid adapters
+who wish to participate should read this flag and pass it to their server. FLEDGE eligibility depends on a number of parameters:
+
+1. Chrome enablement
+2. Publisher participatipon in the [Origin Trial](https://developer.chrome.com/docs/privacy-sandbox/unified-origin-trial/#configure)
+3. Publisher Prebid.js configuration (detailed above)
+
+When a bid request is FLEDGE enabled, a bid adapter can return a tuple consisting of bids and AuctionConfig objects rather than just a list of bids:
+
+```js
+function interpretResponse(resp, req) {
+    // Load the bids from the response - this is adapter specific
+    const bids = parseBids(resp);
+
+    // Load the auctionConfigs from the response - also adapter specific
+    const auctionConfigs = parseAuctionConfigs(resp);
+
+    if (auctionConfigs) {
+        // Return a tuple of bids and auctionConfigs. It is possible that bids could be null.
+        return {bids, auctionConfigs};
+    } else {
+        return bids;
     }
 }
 ```
+
+An AuctionConfig must be associated with an adunit and auction, and this is accomplished using the value in the `bidId` field from the objects in the
+`validBidRequests` array passed to the `buildRequests` function - see [here](https://docs.prebid.org/dev-docs/bidder-adaptor.html#ad-unit-params-in-the-validbidrequests-array)
+for more details. This means that the AuctionConfig objects returned from `interpretResponse` must contain a `bidId` field whose value corresponds to
+the request it should be associated with. This may raise the question: why isn't the AuctionConfig object returned as part of the bid? The
+answer is that it's possible to participate in the FLEDGE auction without returning a contextual bid.
+
+An example of this can be seen in the OpenX OpenRTB bid adapter [here](https://github.com/prebid/Prebid.js/blob/master/modules/openxOrtbBidAdapter.js#L327).
+
+Other than the addition of the `bidId` field, the AuctionConfig object should adhere to the requirements set forth in FLEDGE. The details of creating an   AuctionConfig object are beyond the scope of this document.

From 5f389fcce98e63a557bc81c5938520f3b59ecbf6 Mon Sep 17 00:00:00 2001
From: Adish Rao <30475159+adish1997@users.noreply.github.com>
Date: Thu, 20 Oct 2022 00:28:43 +0530
Subject: [PATCH 364/569] logging fix multi ra and request url (#9090)

Co-authored-by: adish <adish.r@media.net>
---
 modules/medianetAnalyticsAdapter.js           | 48 ++++++++-------
 .../modules/medianetAnalyticsAdapter_spec.js  | 58 ++++++++++++++++---
 2 files changed, 76 insertions(+), 30 deletions(-)

diff --git a/modules/medianetAnalyticsAdapter.js b/modules/medianetAnalyticsAdapter.js
index b7abe5f56cf..d2d3d2bf888 100644
--- a/modules/medianetAnalyticsAdapter.js
+++ b/modules/medianetAnalyticsAdapter.js
@@ -40,6 +40,7 @@ const MEDIANET_BIDDER_CODE = 'medianet';
 const PREBID_VERSION = $$PREBID_GLOBAL$$.version;
 const ERROR_CONFIG_JSON_PARSE = 'analytics_config_parse_fail';
 const ERROR_CONFIG_FETCH = 'analytics_config_ajax_fail';
+const ERROR_WINNING_BID_ABSENT = 'winning_bid_absent';
 const BID_SUCCESS = 1;
 const BID_NOBID = 2;
 const BID_TIMEOUT = 3;
@@ -51,7 +52,7 @@ const CONFIG_PASS = 1;
 const CONFIG_ERROR = 3;
 
 const VALID_URL_KEY = ['canonical_url', 'og_url', 'twitter_url'];
-const DEFAULT_URL_KEY = 'page';
+const DEFAULT_URL_KEY = 'topmostLocation';
 
 const LOG_TYPE = {
   APPR: 'APPR',
@@ -62,6 +63,7 @@ let auctions = {};
 let config;
 let pageDetails;
 let logsQueue = [];
+let errorQueue = [];
 
 class ErrorLogger {
   constructor(event, additionalData) {
@@ -78,6 +80,7 @@ class ErrorLogger {
 
   send() {
     let url = EVENT_PIXEL_URL + '?' + formatQS(this);
+    errorQueue.push(url);
     triggerPixel(url);
   }
 }
@@ -160,7 +163,7 @@ class Configure {
 
   init() {
     // Forces Logging % to 100%
-    let urlObj = URL.parseUrl(pageDetails.page);
+    let urlObj = URL.parseUrl(pageDetails.topmostLocation);
     if (deepAccess(urlObj, 'search.medianet_test') || urlObj.hostname === 'localhost') {
       this.loggingPercent = 100;
       this.ajaxState = CONFIG_PASS;
@@ -194,17 +197,10 @@ class PageDetail {
     this.canonical_url = refererInfo.canonicalUrl;
     this.og_url = ogUrl;
     this.twitter_url = twitterUrl;
+    this.topmostLocation = refererInfo.topmostLocation;
     this.screen = this._getWindowSize();
   }
 
-  _getTopWindowReferrer() {
-    try {
-      return window.top.document.referrer;
-    } catch (e) {
-      return document.referrer;
-    }
-  }
-
   _getWindowSize() {
     let w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth || -1;
     let h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight || -1;
@@ -235,7 +231,7 @@ class PageDetail {
 
   getLoggingData() {
     return {
-      requrl: this[config.urlToConsume] || this.page,
+      requrl: this[config.urlToConsume] || this.topmostLocation,
       dn: this.domain,
       ref: this.referrer,
       screen: this.screen
@@ -402,10 +398,6 @@ class Auction {
       .map((bid) => bid.getLoggingData());
   }
 
-  getWinnerAdslotBid(adslot) {
-    return this.getAdslotBids(adslot).filter((bid) => bid.winner);
-  }
-
   _mergeFieldsToLog(objParams) {
     let logParams = [];
     let value;
@@ -641,17 +633,22 @@ function setTargetingHandler(params) {
 }
 
 function bidWonHandler(bid) {
-  const { requestId, auctionId, adUnitCode } = bid;
+  const { auctionId, adUnitCode, adId } = bid;
   if (!(auctions[auctionId] instanceof Auction)) {
     return;
   }
-  let bidObj = auctions[auctionId].findBid('bidId', requestId);
+  let bidObj = auctions[auctionId].findBid('adId', adId);
   if (!(bidObj instanceof Bid)) {
+    new ErrorLogger(ERROR_WINNING_BID_ABSENT, {
+      adId: adId,
+      acid: auctionId,
+      adUnitCode,
+    }).send();
     return;
   }
   auctions[auctionId].bidWonTime = Date.now();
   bidObj.winner = 1;
-  sendEvent(auctionId, adUnitCode, LOG_TYPE.RA);
+  sendEvent(auctionId, adUnitCode, LOG_TYPE.RA, bidObj.adId);
 }
 
 function isSampled() {
@@ -662,12 +659,12 @@ function isValidAuctionAdSlot(acid, adtag) {
   return (auctions[acid] instanceof Auction) && (auctions[acid].adSlots[adtag] instanceof AdSlot);
 }
 
-function sendEvent(id, adunit, logType) {
+function sendEvent(id, adunit, logType, adId) {
   if (!isValidAuctionAdSlot(id, adunit)) {
     return;
   }
   if (logType === LOG_TYPE.RA) {
-    fireAuctionLog(id, adunit, logType);
+    fireAuctionLog(id, adunit, logType, adId);
   } else {
     fireApPrLog(id, adunit, logType)
   }
@@ -688,7 +685,7 @@ function getCommonLoggingData(acid, adtag) {
   return Object.assign(commonParams, adunitParams, auctionParams);
 }
 
-function fireAuctionLog(acid, adtag, logType) {
+function fireAuctionLog(acid, adtag, logType, adId) {
   let commonParams = getCommonLoggingData(acid, adtag);
   commonParams.lgtp = logType;
   let targeting = deepAccess(commonParams, 'targ');
@@ -699,7 +696,10 @@ function fireAuctionLog(acid, adtag, logType) {
   let bidParams;
 
   if (logType === LOG_TYPE.RA) {
-    bidParams = auctions[acid].getWinnerAdslotBid(adtag);
+    const winningBidObj = auctions[acid].findBid('adId', adId);
+    if (!winningBidObj) return;
+    const winLogData = winningBidObj.getLoggingData();
+    bidParams = [winLogData];
     commonParams.lper = 1;
   } else {
     bidParams = auctions[acid].getAdslotBids(adtag).map(({winner, ...restParams}) => restParams);
@@ -767,8 +767,12 @@ let medianetAnalytics = Object.assign(adapter({URL, analyticsType}), {
   getlogsQueue() {
     return logsQueue;
   },
+  getErrorQueue() {
+    return errorQueue;
+  },
   clearlogsQueue() {
     logsQueue = [];
+    errorQueue = [];
     auctions = {};
   },
   track({ eventType, args }) {
diff --git a/test/spec/modules/medianetAnalyticsAdapter_spec.js b/test/spec/modules/medianetAnalyticsAdapter_spec.js
index 0ce26ab4863..b75437f2ccd 100644
--- a/test/spec/modules/medianetAnalyticsAdapter_spec.js
+++ b/test/spec/modules/medianetAnalyticsAdapter_spec.js
@@ -8,6 +8,8 @@ const {
   EVENTS: { AUCTION_INIT, BID_REQUESTED, BID_RESPONSE, NO_BID, BID_TIMEOUT, AUCTION_END, SET_TARGETING, BID_WON }
 } = CONSTANTS;
 
+const ERROR_WINNING_BID_ABSENT = 'winning_bid_absent';
+
 const MOCK = {
   Ad_Units: [{'code': 'div-gpt-ad-1460505748561-0', 'mediaTypes': {'banner': {'sizes': [[300, 250]]}}, 'bids': [], 'ext': {'prop1': 'value1'}}],
   MULTI_FORMAT_TWIN_AD_UNITS: [{'code': 'div-gpt-ad-1460505748561-0', 'mediaTypes': {'banner': {'sizes': [[300, 250]]}, 'native': {'image': {'required': true, 'sizes': [150, 50]}}}, 'bids': [], 'ext': {'prop1': 'value1'}}, {'code': 'div-gpt-ad-1460505748561-0', 'mediaTypes': {'video': {'playerSize': [640, 480], 'context': 'instream'}}, 'bids': [], 'ext': {'prop1': 'value1'}}],
@@ -22,11 +24,15 @@ const MOCK = {
   SET_TARGETING: {'div-gpt-ad-1460505748561-0': {'prebid_test': '1', 'hb_format': 'banner', 'hb_source': 'client', 'hb_size': '300x250', 'hb_pb': '2.00', 'hb_adid': '3e6e4bce5c8fb3', 'hb_bidder': 'medianet', 'hb_format_medianet': 'banner', 'hb_source_medianet': 'client', 'hb_size_medianet': '300x250', 'hb_pb_medianet': '2.00', 'hb_adid_medianet': '3e6e4bce5c8fb3', 'hb_bidder_medianet': 'medianet'}},
   NO_BID_SET_TARGETING: {'div-gpt-ad-1460505748561-0': {}},
   BID_WON: {'bidderCode': 'medianet', 'width': 300, 'height': 250, 'statusMessage': 'Bid available', 'adId': '3e6e4bce5c8fb3', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]},
+  BID_WON_2: {'bidderCode': 'appnexus', 'width': 300, 'height': 250, 'statusMessage': 'Bid available', 'adId': '3e6e4bce5c8fb4', 'requestId': '28248b0e6aecd5', 'mediaType': 'banner', 'source': 'client', 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'appnexus', 'hb_adid': '3e6e4bce5c8fb4', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'publisherId': 'test123', 'placementId': '451466393'}]},
+  BID_WON_UNKNOWN: {'bidderCode': 'appnexus', 'width': 300, 'height': 250, 'statusMessage': 'Bid available', 'adId': '3e6e4bce5c8fkk', 'requestId': '28248b0e6aecd5', 'mediaType': 'banner', 'source': 'client', 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'appnexus', 'hb_adid': '3e6e4bce5c8fb4', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'publisherId': 'test123', 'placementId': '451466393'}]},
   NO_BID: {'bidder': 'medianet', 'params': {'cid': 'test123', 'crid': '451466393', 'site': {}}, 'mediaTypes': {'banner': {'sizes': [[300, 250]], 'ext': ['asdads']}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': '303fa0c6-682f-4aea-8e4a-dc68f0d5c7d5', 'sizes': [[300, 250], [300, 600]], 'bidId': '28248b0e6aece2', 'bidderRequestId': '13fccf3809fe43', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client'},
   BID_TIMEOUT: [{'bidId': '28248b0e6aece2', 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'params': [{'cid': 'test123', 'crid': '451466393', 'site': {}}, {'cid': '8CUX0H51P', 'crid': '451466393', 'site': {}}], 'timeout': 6}],
-  BIDS_SAME_REQ_DIFF_CPM: [{'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fgg', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.10, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]}, {'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb4', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 1.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.10, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 278, 'pbLg': '1.00', 'pbMg': '1.20', 'pbHg': '1.29', 'pbAg': '1.25', 'pbDg': '1.29', 'pbCg': '1.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '1.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]}],
-  BIDS_SAME_REQ_EQUAL_CPM: [{'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fgg', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.1, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]}, {'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb4', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.1, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 286, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]}]
-}
+  BIDS_SAME_REQ_DIFF_CPM: [{'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb3', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.10, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]}, {'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb4', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 1.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.10, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 278, 'pbLg': '1.00', 'pbMg': '1.20', 'pbHg': '1.29', 'pbAg': '1.25', 'pbDg': '1.29', 'pbCg': '1.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '1.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]}],
+  BIDS_SAME_REQ_EQUAL_CPM: [{'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb3', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.1, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]}, {'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb4', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.1, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 286, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]}],
+  BID_RESPONSES: [{'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb3', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.1, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'params': [{'cid': 'test123', 'crid': '451466393'}]}, {'bidderCode': 'appnexus', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb4', 'requestId': '28248b0e6aecd5', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 1.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.1, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 278, 'pbLg': '1.00', 'pbMg': '1.20', 'pbHg': '1.29', 'pbAg': '1.25', 'pbDg': '1.29', 'pbCg': '1.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'appnexus', 'hb_adid': '3e6e4bce5c8fb4', 'hb_pb': '1.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'params': [{'publisherId': 'test123', 'placementId': '451466393'}]}],
+  BID_REQUESTS: [{'bidderCode': 'medianet', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'bids': [{'bidder': 'medianet', 'params': {'cid': 'TEST_CID', 'crid': '451466393'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]], 'ext': ['asdads']}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'sizes': [[300, 250]], 'bidId': '28248b0e6aece2', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client'}], 'auctionStart': 1584563605739, 'timeout': 6000, 'uspConsent': '1YY', 'start': 1584563605743}, {'bidderCode': 'appnexus', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'bids': [{'bidder': 'appnexus', 'params': {'publisherId': 'TEST_CID', 'placementId': '451466393'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]], 'ext': ['asdads']}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'sizes': [[300, 250]], 'bidId': '28248b0e6aecd5', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client'}], 'auctionStart': 1584563605739, 'timeout': 6000, 'uspConsent': '1YY', 'start': 1584563605743}]
+};
 
 function performAuctionWithFloorConfig() {
   events.emit(AUCTION_INIT, Object.assign({}, MOCK.AUCTION_INIT_WITH_FLOOR, {adUnits: MOCK.Ad_Units}));
@@ -87,6 +93,14 @@ function performStandardAuctionMultiBidWithSameRequestId(bidRespArray) {
   events.emit(BID_WON, MOCK.BID_WON);
 }
 
+function performStandardAuctionMultiBidResponseNoWin() {
+  events.emit(AUCTION_INIT, Object.assign({}, MOCK.AUCTION_INIT, {adUnits: MOCK.Ad_Units}));
+  MOCK.BID_REQUESTS.forEach(bidReq => events.emit(BID_REQUESTED, bidReq));
+  MOCK.BID_RESPONSES.forEach(bidResp => events.emit(BID_RESPONSE, bidResp));
+  events.emit(AUCTION_END, MOCK.AUCTION_END);
+  events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+}
+
 function getQueryData(url, decode = false) {
   const queryArgs = url.split('?')[1].split('&');
   return queryArgs.reduce((data, arg) => {
@@ -113,7 +127,7 @@ describe('Media.net Analytics Adapter', function() {
     options: {
       cid: CUSTOMER_ID
     }
-  }
+  };
   beforeEach(function () {
     sandbox = sinon.sandbox.create();
   });
@@ -280,25 +294,53 @@ describe('Media.net Analytics Adapter', function() {
     it('should pick winning bid if multibids with same request id', function() {
       performStandardAuctionMultiBidWithSameRequestId(MOCK.BIDS_SAME_REQ_DIFF_CPM);
       let winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner)[0];
-      expect(winningBid.adid).equals('3e6e4bce5c8fgg');
+      expect(winningBid.adid).equals('3e6e4bce5c8fb3');
       medianetAnalytics.clearlogsQueue();
 
       const reversedResponseArray = [].concat(MOCK.BIDS_SAME_REQ_DIFF_CPM).reverse();
       performStandardAuctionMultiBidWithSameRequestId(reversedResponseArray);
       winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner)[0];
-      expect(winningBid.adid).equals('3e6e4bce5c8fgg');
+      expect(winningBid.adid).equals('3e6e4bce5c8fb3');
     });
 
     it('should pick winning bid if multibids with same request id and equal cpm', function() {
       performStandardAuctionMultiBidWithSameRequestId(MOCK.BIDS_SAME_REQ_EQUAL_CPM);
       let winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner)[0];
-      expect(winningBid.adid).equals('3e6e4bce5c8fgg');
+      expect(winningBid.adid).equals('3e6e4bce5c8fb3');
       medianetAnalytics.clearlogsQueue();
 
       const reversedResponseArray = [].concat(MOCK.BIDS_SAME_REQ_EQUAL_CPM).reverse();
       performStandardAuctionMultiBidWithSameRequestId(reversedResponseArray);
       winningBid = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log)).filter(log => log.winner)[0];
-      expect(winningBid.adid).equals('3e6e4bce5c8fgg');
+      expect(winningBid.adid).equals('3e6e4bce5c8fb3');
+    });
+
+    it('should pick single winning bid per bid won', function() {
+      performStandardAuctionMultiBidResponseNoWin();
+      const queue = medianetAnalytics.getlogsQueue();
+      queue.length = 0;
+
+      events.emit(BID_WON, MOCK.BID_WON);
+      let winningBids = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log));
+      expect(winningBids[0].adid).equals(MOCK.BID_WON.adId);
+      expect(winningBids.length).equals(1);
+      events.emit(BID_WON, MOCK.BID_WON_2);
+      winningBids = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log));
+      expect(winningBids[1].adid).equals(MOCK.BID_WON_2.adId);
+      expect(winningBids.length).equals(2);
+    });
+
+    it('should ignore unknown winning bid and log error', function() {
+      performStandardAuctionMultiBidResponseNoWin();
+      const queue = medianetAnalytics.getlogsQueue();
+      queue.length = 0;
+
+      events.emit(BID_WON, MOCK.BID_WON_UNKNOWN);
+      let winningBids = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log));
+      let errors = medianetAnalytics.getErrorQueue().map((log) => getQueryData(log));
+      expect(winningBids.length).equals(0);
+      expect(errors.length).equals(1);
+      expect(errors[0].event).equals(ERROR_WINNING_BID_ABSENT);
     });
   });
 });

From 459a2eed38b7fe9b6f7a4d631d55d94f1e41e1ba Mon Sep 17 00:00:00 2001
From: github-tom-kuhnen <101572885+github-tom-kuhnen@users.noreply.github.com>
Date: Thu, 20 Oct 2022 07:29:13 +0200
Subject: [PATCH 365/569] Teads adapter: use user id module and send user-agent
 client hints (#9130)

---
 modules/teadsBidAdapter.js                |  34 ++++--
 test/spec/modules/teadsBidAdapter_spec.js | 125 ++++++++++++++++++++--
 2 files changed, 145 insertions(+), 14 deletions(-)

diff --git a/modules/teadsBidAdapter.js b/modules/teadsBidAdapter.js
index 9ce00d2d3eb..56b21d0d4cf 100644
--- a/modules/teadsBidAdapter.js
+++ b/modules/teadsBidAdapter.js
@@ -55,11 +55,13 @@ export const spec = {
       deviceWidth: screen.width,
       hb_version: '$prebid.version$',
       ...getSharedViewerIdParameters(validBidRequests),
-      ...getFirstPartyTeadsIdParameter()
+      ...getFirstPartyTeadsIdParameter(validBidRequests)
     };
 
-    if (validBidRequests[0].schain) {
-      payload.schain = validBidRequests[0].schain;
+    const firstBidRequest = validBidRequests[0];
+
+    if (firstBidRequest.schain) {
+      payload.schain = firstBidRequest.schain;
     }
 
     let gdpr = bidderRequest.gdprConsent;
@@ -80,6 +82,11 @@ export const spec = {
       payload.us_privacy = bidderRequest.uspConsent;
     }
 
+    const userAgentClientHints = deepAccess(firstBidRequest, 'ortb2.device.sua');
+    if (userAgentClientHints) {
+      payload.userAgentClientHints = userAgentClientHints;
+    }
+
     const payloadString = JSON.stringify(payload);
     return {
       method: 'POST',
@@ -261,14 +268,25 @@ function _validateId(id) {
 
 /**
  * Get the first-party cookie Teads ID parameter to be sent in bid request.
+ * @param validBidRequests an array of bids
  * @returns `{} | {firstPartyCookieTeadsId: string}`
  */
-function getFirstPartyTeadsIdParameter() {
-  if (!storage.cookiesAreEnabled()) {
-    return {};
+function getFirstPartyTeadsIdParameter(validBidRequests) {
+  const firstPartyTeadsIdFromUserIdModule = deepAccess(validBidRequests, '0.userId.teadsId');
+
+  if (firstPartyTeadsIdFromUserIdModule) {
+    return {firstPartyCookieTeadsId: firstPartyTeadsIdFromUserIdModule};
   }
-  const firstPartyTeadsId = storage.getCookie(FP_TEADS_ID_COOKIE_NAME);
-  return firstPartyTeadsId ? { firstPartyCookieTeadsId: firstPartyTeadsId } : {};
+
+  if (storage.cookiesAreEnabled(null)) {
+    const firstPartyTeadsIdFromCookie = storage.getCookie(FP_TEADS_ID_COOKIE_NAME, null);
+
+    if (firstPartyTeadsIdFromCookie) {
+      return {firstPartyCookieTeadsId: firstPartyTeadsIdFromCookie};
+    }
+  }
+
+  return {};
 }
 
 registerBidder(spec);
diff --git a/test/spec/modules/teadsBidAdapter_spec.js b/test/spec/modules/teadsBidAdapter_spec.js
index 254f23d011e..e981d80c8ae 100644
--- a/test/spec/modules/teadsBidAdapter_spec.js
+++ b/test/spec/modules/teadsBidAdapter_spec.js
@@ -418,6 +418,74 @@ describe('teadsBidAdapter', () => {
       });
     });
 
+    it('should add userAgentClientHints info to payload if available', function () {
+      const bidRequest = Object.assign({}, bidRequests[0], {
+        ortb2: {
+          device: {
+            sua: {
+              source: 2,
+              platform: {
+                brand: 'macOS',
+                version: [ '12', '4', '0' ]
+              },
+              browsers: [
+                {
+                  brand: 'Chromium',
+                  version: [ '106', '0', '5249', '119' ]
+                },
+                {
+                  brand: 'Google Chrome',
+                  version: [ '106', '0', '5249', '119' ]
+                },
+                {
+                  brand: 'Not;A=Brand',
+                  version: [ '99', '0', '0', '0' ]
+                }
+              ],
+              mobile: 0,
+              model: '',
+              bitness: '64',
+              architecture: 'x86'
+            }
+          }
+        }
+      });
+
+      const requestWithUserAgentClientHints = spec.buildRequests([bidRequest], bidderResquestDefault);
+      const payload = JSON.parse(requestWithUserAgentClientHints.data);
+
+      expect(payload.userAgentClientHints).to.exist;
+      expect(payload.userAgentClientHints).to.deep.equal({
+        source: 2,
+        platform: {
+          brand: 'macOS',
+          version: [ '12', '4', '0' ]
+        },
+        browsers: [
+          {
+            brand: 'Chromium',
+            version: [ '106', '0', '5249', '119' ]
+          },
+          {
+            brand: 'Google Chrome',
+            version: [ '106', '0', '5249', '119' ]
+          },
+          {
+            brand: 'Not;A=Brand',
+            version: [ '99', '0', '0', '0' ]
+          }
+        ],
+        mobile: 0,
+        model: '',
+        bitness: '64',
+        architecture: 'x86'
+      }
+      );
+
+      const defaultRequest = spec.buildRequests(bidRequests, bidderResquestDefault);
+      expect(JSON.parse(defaultRequest.data).userAgentClientHints).to.not.exist;
+    });
+
     it('should use good mediaTypes video sizes', function() {
       const mediaTypesVideoSizes = {
         'mediaTypes': {
@@ -555,34 +623,79 @@ describe('teadsBidAdapter', () => {
       })
 
       describe('First-party cookie Teads ID', function () {
-        it('should not add firstPartyCookieTeadsId param to payload if cookies are not enabled', function () {
+        it('should not add firstPartyCookieTeadsId param to payload if cookies are not enabled' +
+            ' and teads user id not available', function () {
           cookiesAreEnabledStub.returns(false);
 
-          const request = spec.buildRequests([baseBidRequest], bidderResquestDefault);
+          const bidRequest = {
+            ...baseBidRequest,
+            userId: {
+              pubcid: 'publisherFirstPartyViewerId-id'
+            }
+          };
+
+          const request = spec.buildRequests([bidRequest], bidderResquestDefault);
           const payload = JSON.parse(request.data);
 
           expect(payload).not.to.have.property('firstPartyCookieTeadsId');
         });
 
-        it('should not add firstPartyCookieTeadsId param to payload if first-party cookie is not available', function () {
+        it('should not add firstPartyCookieTeadsId param to payload if cookies are enabled ' +
+            'but first-party cookie and teads user id are not available', function () {
           cookiesAreEnabledStub.returns(true);
           getCookieStub.withArgs('_tfpvi').returns(undefined);
 
-          const request = spec.buildRequests([baseBidRequest], bidderResquestDefault);
+          const bidRequest = {
+            ...baseBidRequest,
+            userId: {
+              pubcid: 'publisherFirstPartyViewerId-id'
+            }
+          };
+
+          const request = spec.buildRequests([bidRequest], bidderResquestDefault);
           const payload = JSON.parse(request.data);
 
           expect(payload).not.to.have.property('firstPartyCookieTeadsId');
         });
 
-        it('should add firstPartyCookieTeadsId param to payload if first-party cookie is available', function () {
+        it('should add firstPartyCookieTeadsId from cookie if it\'s available ' +
+            'and teads user id is not', function () {
           cookiesAreEnabledStub.returns(true);
           getCookieStub.withArgs('_tfpvi').returns('my-teads-id');
 
-          const request = spec.buildRequests([baseBidRequest], bidderResquestDefault);
+          const bidRequest = {
+            ...baseBidRequest,
+            userId: {
+              pubcid: 'publisherFirstPartyViewerId-id'
+            }
+          };
+
+          const request = spec.buildRequests([bidRequest], bidderResquestDefault);
+
           const payload = JSON.parse(request.data);
 
           expect(payload.firstPartyCookieTeadsId).to.equal('my-teads-id');
         });
+
+        it('should add firstPartyCookieTeadsId from user id module if it\'s available ' +
+            'even if cookie is available too', function () {
+          cookiesAreEnabledStub.returns(true);
+          getCookieStub.withArgs('_tfpvi').returns('my-teads-id');
+
+          const bidRequest = {
+            ...baseBidRequest,
+            userId: {
+              pubcid: 'publisherFirstPartyViewerId-id',
+              teadsId: 'teadsId-fake-id'
+            }
+          };
+
+          const request = spec.buildRequests([bidRequest], bidderResquestDefault);
+
+          const payload = JSON.parse(request.data);
+
+          expect(payload.firstPartyCookieTeadsId).to.equal('teadsId-fake-id');
+        });
       });
     });
 

From 9288657e6e48e518682332a0b386caa57a467b77 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 20 Oct 2022 22:36:39 +0000
Subject: [PATCH 366/569] Prebid 7.21.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2ae7f9f3931..feb8cbc85b7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.21.0-pre",
+  "version": "7.21.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index ed80a9c94a7..fc38cd99ea5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.21.0-pre",
+  "version": "7.21.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From c0260f2cf45f4eeb95dd72872b07d171b3ba99ba Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 20 Oct 2022 22:36:40 +0000
Subject: [PATCH 367/569] Increment version to 7.22.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index feb8cbc85b7..82675d5cc00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.21.0",
+  "version": "7.22.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index fc38cd99ea5..94f6b75b272 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.21.0",
+  "version": "7.22.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From df2418d740d6a70aedb3ba25ba1a5595703a33af Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Thu, 20 Oct 2022 19:03:01 -0700
Subject: [PATCH 368/569] Prebid core: do not enforce valid size in bid
 responses (#9138)

---
 src/adapters/bidderFactory.js             | 20 +++++++++++---------
 test/spec/unit/core/bidderFactory_spec.js |  4 ----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
index d0b716d656d..7e66b849783 100644
--- a/src/adapters/bidderFactory.js
+++ b/src/adapters/bidderFactory.js
@@ -545,22 +545,24 @@ export function getIabSubCategory(bidderCode, category) {
 
 // check that the bid has a width and height set
 function validBidSize(adUnitCode, bid, {index = auctionManager.index} = {}) {
-  const bidRequest = index.getBidRequest(bid);
-  const mediaTypes = index.getMediaTypes(bid);
-
-  const sizes = (bidRequest && bidRequest.sizes) || (mediaTypes && mediaTypes.banner && mediaTypes.banner.sizes);
-  const parsedSizes = parseSizesInput(sizes).map(sz => sz.split('x').map(n => parseInt(n, 10)));
-
   if ((bid.width || parseInt(bid.width, 10) === 0) && (bid.height || parseInt(bid.height, 10) === 0)) {
     bid.width = parseInt(bid.width, 10);
     bid.height = parseInt(bid.height, 10);
-    return parsedSizes.length === 0 || parsedSizes.some(([w, h]) => bid.width === w && bid.height === h);
+    return true;
   }
 
+  const bidRequest = index.getBidRequest(bid);
+  const mediaTypes = index.getMediaTypes(bid);
+
+  const sizes = (bidRequest && bidRequest.sizes) || (mediaTypes && mediaTypes.banner && mediaTypes.banner.sizes);
+  const parsedSizes = parseSizesInput(sizes);
+
   // if a banner impression has one valid size, we assign that size to any bid
   // response that does not explicitly set width or height
   if (parsedSizes.length === 1) {
-    ([bid.width, bid.height] = parsedSizes[0]);
+    const [ width, height ] = parsedSizes[0].split('x');
+    bid.width = parseInt(width, 10);
+    bid.height = parseInt(height, 10);
     return true;
   }
 
@@ -602,7 +604,7 @@ export function isValid(adUnitCode, bid, {index = auctionManager.index} = {}) {
     return false;
   }
   if (bid.mediaType === 'banner' && !validBidSize(adUnitCode, bid, {index})) {
-    logError(errorMessage(`Banner bids require a width and height that match one of the requested sizes`));
+    logError(errorMessage(`Banner bids require a width and height`));
     return false;
   }
 
diff --git a/test/spec/unit/core/bidderFactory_spec.js b/test/spec/unit/core/bidderFactory_spec.js
index fa6cf7e6bb5..1eecfac47a7 100644
--- a/test/spec/unit/core/bidderFactory_spec.js
+++ b/test/spec/unit/core/bidderFactory_spec.js
@@ -1434,9 +1434,5 @@ describe('bid response isValid', () => {
     it('should succeed when response has a size that was in request', () => {
       expect(checkValid(mkResponse(3, 4))).to.be.true;
     });
-
-    it('should fail when response has a size that was not in request', () => {
-      expect(checkValid(mkResponse(10, 11))).to.be.false;
-    });
   })
 });

From f4ca86ddb49f1a54a2ef8133bd6d7db902f3e72c Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Fri, 21 Oct 2022 02:21:33 +0000
Subject: [PATCH 369/569] Prebid 7.22.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 82675d5cc00..b6863634a1f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.22.0-pre",
+  "version": "7.22.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 94f6b75b272..48dd88a0d92 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.22.0-pre",
+  "version": "7.22.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 6183d235a137c7b8cd9a1fcca2de7c06ea5b24b6 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Fri, 21 Oct 2022 02:21:33 +0000
Subject: [PATCH 370/569] Increment version to 7.23.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b6863634a1f..ffc179f2914 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.22.0",
+  "version": "7.23.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 48dd88a0d92..a463546efa1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.22.0",
+  "version": "7.23.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 87e5b89987704dd47e4f15d87e0814ef9064af69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9onard=20Labat?= <le.labat@criteo.com>
Date: Fri, 21 Oct 2022 17:06:53 +0200
Subject: [PATCH 371/569] Criteo Bid Adapter: add support of static floors
 (#9140)

We want publishers that are not interested in using Prebid floor module to be able to send us floor/floorCur through bid params.
---
 modules/criteoBidAdapter.js                | 28 ++++++++++++++++++----
 test/spec/modules/criteoBidAdapter_spec.js | 28 ++++++++++++++++++++++
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index f3988a2fa4e..622c42c9cb7 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -644,26 +644,46 @@ for (var i = 0; i < 10; ++i) {
 </script>`;
 }
 
+function pickAvailableGetFloorFunc(bidRequest) {
+  if (bidRequest.getFloor) {
+    return bidRequest.getFloor;
+  }
+  if (bidRequest.params.bidFloor && bidRequest.params.bidFloorCur) {
+    try {
+      const floor = parseFloat(bidRequest.params.bidFloor);
+      return () => {
+        return {
+          currency: bidRequest.params.bidFloorCur,
+          floor: floor
+        };
+      };
+    } catch { }
+  }
+  return undefined;
+}
+
 function enrichSlotWithFloors(slot, bidRequest) {
   try {
     const slotFloors = {};
 
-    if (bidRequest.getFloor) {
+    const getFloor = pickAvailableGetFloorFunc(bidRequest);
+
+    if (getFloor) {
       if (bidRequest.mediaTypes?.banner) {
         slotFloors.banner = {};
         const bannerSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'))
-        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = bidRequest.getFloor({ size: bannerSize, mediaType: BANNER }));
+        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = getFloor({ size: bannerSize, mediaType: BANNER }));
       }
 
       if (bidRequest.mediaTypes?.video) {
         slotFloors.video = {};
         const videoSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'))
-        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = bidRequest.getFloor({ size: videoSize, mediaType: VIDEO }));
+        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = getFloor({ size: videoSize, mediaType: VIDEO }));
       }
 
       if (bidRequest.mediaTypes?.native) {
         slotFloors.native = {};
-        slotFloors.native['*'] = bidRequest.getFloor({ size: '*', mediaType: NATIVE });
+        slotFloors.native['*'] = getFloor({ size: '*', mediaType: NATIVE });
       }
 
       if (Object.keys(slotFloors).length > 0) {
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index 7af5f5d77a2..c54453bd7fc 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -1279,6 +1279,34 @@ describe('The Criteo bidding adapter', function () {
       });
     });
 
+    it('should properly build a request with static floors', function () {
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [728, 90]]
+            }
+          },
+          params: {
+            networkId: 456,
+            bidFloor: 1,
+            bidFloorCur: 'EUR'
+          },
+        },
+      ];
+      const bidderRequest = {};
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.slots[0].ext.floors).to.deep.equal({
+        'banner': {
+          '300x250': { 'currency': 'EUR', 'floor': 1 },
+          '728x90': { 'currency': 'EUR', 'floor': 1 }
+        }
+      });
+    });
+
     it('should properly build a video request with several player sizes with floors', function () {
       const bidRequests = [
         {

From 6c63c6f00267f396176e5b96629b6fc570e40805 Mon Sep 17 00:00:00 2001
From: chtdsp <109642171+chtdsp@users.noreply.github.com>
Date: Sat, 22 Oct 2022 01:15:32 +0800
Subject: [PATCH 372/569] CHTNW Adapter: initial release (#8987)

* add chtnw bid adapter

* fix chtnw bid adapter issues

* add meta advertiserDomain support
---
 modules/chtnwBidAdapter.js                | 110 ++++++++++++++++++++++
 modules/chtnwBidAdapter.md                |  31 ++++++
 test/spec/modules/chtnwBidAdapter_spec.js | 105 +++++++++++++++++++++
 3 files changed, 246 insertions(+)
 create mode 100644 modules/chtnwBidAdapter.js
 create mode 100644 modules/chtnwBidAdapter.md
 create mode 100644 test/spec/modules/chtnwBidAdapter_spec.js

diff --git a/modules/chtnwBidAdapter.js b/modules/chtnwBidAdapter.js
new file mode 100644
index 00000000000..5f77cec018a
--- /dev/null
+++ b/modules/chtnwBidAdapter.js
@@ -0,0 +1,110 @@
+import {
+  generateUUID,
+  getDNT,
+  _each,
+} from '../src/utils.js';
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { ajax } from '../src/ajax.js';
+import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
+const ENDPOINT_URL = 'https://prebid.cht.hinet.net/api/v1';
+const BIDDER_CODE = 'chtnw';
+const COOKIE_NAME = '__htid';
+const storage = getStorageManager({bidderCode: BIDDER_CODE});
+
+const { getConfig } = config;
+
+function _isMobile() {
+  return (/(ios|ipod|ipad|iphone|android)/i).test(navigator.userAgent);
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+  isBidRequestValid: function(bid = {}) {
+    return !!(bid && bid.params);
+  },
+  buildRequests: function(validBidRequests = [], bidderRequest = {}) {
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+    const chtnwId = (storage.getCookie(COOKIE_NAME) != undefined) ? storage.getCookie(COOKIE_NAME) : generateUUID();
+    if (storage.cookiesAreEnabled()) {
+      storage.setCookie(COOKIE_NAME, chtnwId);
+    }
+    const device = getConfig('device') || {};
+    device.w = device.w || window.innerWidth;
+    device.h = device.h || window.innerHeight;
+    device.ua = device.ua || navigator.userAgent;
+    device.dnt = getDNT() ? 1 : 0;
+    device.language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+    const bidParams = [];
+    _each(validBidRequests, function(bid) {
+      bidParams.push({
+        bidId: bid.bidId,
+        placement: bid.params.placementId,
+        sizes: bid.sizes,
+        adSlot: bid.adUnitCode
+      });
+    });
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL + '/request/prebid.json',
+      data: {
+        bids: bidParams,
+        uuid: chtnwId,
+        device: device,
+        version: {
+          prebid: '$prebid.version$',
+          adapter: '1.0.0',
+        },
+        site: {
+          numIframes: bidderRequest.refererInfo?.numIframes || 0,
+          isAmp: bidderRequest.refererInfo?.isAmp || false,
+          pageUrl: bidderRequest.refererInfo?.page || '',
+          ref: bidderRequest.refererInfo?.ref || '',
+        },
+      },
+      bids: validBidRequests
+    };
+  },
+  interpretResponse: function(serverResponse) {
+    const bidResponses = []
+    _each(serverResponse.body, function(response, i) {
+      bidResponses.push({
+        ...response
+      });
+    });
+    return bidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = [];
+    if (syncOptions.pixelEnabled) {
+      const chtnwId = generateUUID()
+      const uuid = chtnwId
+      const type = (_isMobile()) ? 'dot' : 'pixel';
+      syncs.push({
+        type: 'image',
+        url: `https://t.ssp.hinet.net/${type}?bd=${uuid}&t=chtnw`
+      })
+    }
+    return syncs
+  },
+  onTimeout: function(timeoutData) {
+    if (timeoutData === null) {
+      return;
+    }
+    ajax(ENDPOINT_URL + '/trace/timeout/bid', null, JSON.stringify(timeoutData), {
+      method: 'POST',
+      withCredentials: false
+    });
+  },
+  onBidWon: function(bid) {
+    if (bid.nurl) {
+      ajax(bid.nurl, null);
+    }
+  },
+  onSetTargeting: function(bid) {
+  },
+}
+registerBidder(spec);
diff --git a/modules/chtnwBidAdapter.md b/modules/chtnwBidAdapter.md
new file mode 100644
index 00000000000..08e634d577d
--- /dev/null
+++ b/modules/chtnwBidAdapter.md
@@ -0,0 +1,31 @@
+# Overview
+
+```
+Module Name: CHT Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: chtdsp@cht.com.tw
+```
+
+# Description
+
+Module that connects to CHT's demand sources
+
+# Test Parameters
+```
+var adUnits = [
+   {
+        code: 'adunit-code',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+        bids: [{
+            bidder: 'chtnw',
+            params: {
+                placementId: '38EL412LO82XR9O6'
+            }
+        }]
+   }
+];
+```
diff --git a/test/spec/modules/chtnwBidAdapter_spec.js b/test/spec/modules/chtnwBidAdapter_spec.js
new file mode 100644
index 00000000000..3875de6c4fa
--- /dev/null
+++ b/test/spec/modules/chtnwBidAdapter_spec.js
@@ -0,0 +1,105 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/chtnwBidAdapter.js';
+import * as utils from '../../../src/utils.js';
+
+describe('ChtnwAdapter', function () {
+  describe('isBidRequestValid', function () {
+    const bid = {
+      code: 'adunit-code',
+      bidder: 'chtnw',
+      params: {
+        placementId: '38EL412LO82XR9O6'
+      },
+      sizes: [
+        [300, 250]
+      ],
+    };
+
+    it('should return true when required params found', function () {
+      const bidRequest = utils.deepClone(bid);
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return false when required params are missing', function () {
+      const bidRequest = utils.deepClone(bid);
+      delete bidRequest.params;
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests = [{
+      code: 'adunit-code',
+      bidder: 'chtnw',
+      params: {
+        placementId: '38EL412LO82XR9O6'
+      },
+      sizes: [
+        [300, 250]
+      ],
+    }];
+
+    const request = spec.buildRequests(bidRequests);
+
+    it('Returns POST method', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('Returns general data valid', function () {
+      let data = request.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.property('bids');
+      expect(data).to.have.property('uuid');
+      expect(data).to.have.property('device');
+      expect(data).to.have.property('site');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let responseBody = [{
+      'requestId': 'test',
+      'cpm': 0.5,
+      'currency': 'USD',
+      'width': 300,
+      'height': 250,
+      'netRevenue': true,
+      'ttl': 60,
+      'creativeId': 'AD',
+      'ad': '<h1>AD<h1>',
+      'mediaType': 'banner',
+      'meta': {
+        'advertiserDomains': [
+          'www.example.com'
+        ]
+      }
+    }];
+
+    it('handles empty bid response', function () {
+      let response = {
+        body: responseBody
+      };
+      let result = spec.interpretResponse(response);
+      expect(result.length).to.not.equal(0);
+      expect(result[0].meta.advertiserDomains).to.be.an('array');
+    });
+
+    it('handles empty bid response', function () {
+      let response = {
+        body: []
+      };
+      let result = spec.interpretResponse(response);
+      expect(result.length).to.equal(0);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should register type is image', function () {
+      const syncOptions = {
+        'pixelEnabled': 'true'
+      }
+      let userSync = spec.getUserSyncs(syncOptions);
+      expect(userSync[0].type).to.equal('image');
+      expect(userSync[0].url).to.have.string('ssp');
+    });
+  });
+});

From 0c69238d05017b372e4d527d02ad71bbeb0aca71 Mon Sep 17 00:00:00 2001
From: Karim Mourra <karim@jwplayer.com>
Date: Fri, 21 Oct 2022 14:46:45 -0400
Subject: [PATCH 373/569] Video Module: Initial Release (#8858)

* registers as module

* adds vendor consts

* registers jwplayer submodule

* renames render ad

* checks config autostart

* moves private functions to a util obj

* introduces ad optimization

* tests state.js

* introduces submodule tests

* populates utils tests

* tests callback storage

* tests ad and time states

* introduces provider tests:

* tests init

* tests get ortb

* tests event listeners

* supports removing all event handlers when explicit

* splits clear all event listeners from early return

* removes hook

* shares directory

* prevents registering a same provider twice

* adds pb video

* adds video module to submodules list

* adds integration example

* implements ad unit enrichment

* moves submodule to parent dir

* removes comment

* implements event listener

* adds unit tests

* tests updating video config

* tests events surfacing

* nests the event trigger tests

* restores factory

* adds adServer

* shares base parent module logic

* register gam submodule

* tests submodule builder

* instantiates ad server

* tests parent module

* updates core video tests

* adds ad server tests

* obtains vast ad to render

* passes options

* tests ad tag obtention

* tests settings tags without ad server

* adds vast xml builder

* tests node makers

* implments vast xml build fn

* renames wrapper builder

* adds vast xml editor

* modifies vast xml

* moves logic to helper

* appends doc element

* copies node when required multiple times

* improves copy check

* adds tests for error node

* adds tests cases for different config

* pulls vast wrapper builders from xml editor

* adds tracking tests

* tests arguments

* removes obsolete path

* polls for duration when absent

* sets up video module

* prevents ad load if bidding is used

* triggers event before loading ad

* adds inline docs to shared modules

* adds inline docs

* documents providers

* adds inline docs for ortb

* adds missing ortb params

* obtains language code

* makes placement more precise

* adds notes

* updates todo

* early exit if not video media type

* loads ad server config

* filters for highest bids before rendering

* emits event even on loss

* registers video auction events

* updates events

* includes ad unit code in loss

* uses config fallback

* tracks bids sent for rendering

* adds video impression verification

* shares code

* triggers bid video events

* matches ad event to bid

* adds inline documentation

* allows URL import

* updates vast xml editor tests

* tests ad event processsing

* includes ad wrapper ids

* updates ad tag injection tests

* tests impression tracking

* updates for new find

* removes unused var

* uses find polyfill

* updates event import

* exposes addEvents

* checks for bid identifiers bfore accessing properties

* checks for bid identifiers bfore accessing properties

* exposes video bid events

* converts ortb params to insternal fields

* reads from video

* removes typo

* sets ortb video to media type video

* sets ortb2 obj

* gets impression url from fn

* tmg uses mediatype video

* configures provider to properly render ads

* sets up player in demo

* triggers load abort

* uses appnexys

* uses getGlobal

* protects against missing params

* breaks out shared and adserver from videoModule

* updates import

* resolves lgtm errors

* uses submodule pattern

* uses uuid generator util

* removes adServer module

* moves shared to video folder

* prefix events with video_

* adds auction end listener when no bids back handler

* fixes tests

* refactors render

* exposes rendering

* uses mergeDeep

* shares constants

* populates ortb content.data

* register events as prefixed

* adds test bidders

* moves videoModule to library

* Added draft for videojs  integration example

* Moved jwplayer integration example, added draft for videojs example

* Created integration example for a mocked videojs adapter

* Fixed call order for integration examples, moved imports up

* Finished init for videojs provider

* Setup videojs init unit tests

* Formatting to pass linter

* Removed comments/redundant tests, clarified some sections of code

* Added semicolon

* Videojs ortb params, added ortb constants

* Fixed integration examples, ortb adjustments

* Cleaned up code added comments

* Renamed test file

* Removed videojs mock in favor of videojs

* Changed video source, finished tests for ortb

* Cleaned up spacing added some comments

* Added ad position to ortb

* Cleaned up playback methods code

* Omitted skip variable per ortb spec

* Added unit tests for ima integration

* Added util function, and corresponding tests

* Added code for placement

* Linter pass through

* Added videojs-ima to integration example

* Removed duplicate tests

* Removed non bidding module tests

* Added clarifying comments

* Updated name mapping for videojs events

* Added callback factory, and presetup listeners

* Filled in initialization events

* Importing event constants

* Fixing setup failed event handler

* Fixed init behavior to work with setupCompleteCallback

* Added pre setup callback tests

* Setup presetupListeners/moved away from callbackStorage

* Added missing case for setup failure

* Basic event handling

* adds ortb constants

* removes trailing file

* uses hook.js

* marks winning bid as used

* gets adWrapper regardless of property name

* rename vars

* fixes init and loadAdTag

* renames videojs var

* supports media events

* addresses size events

* registers ad events

* implements get ad info

* generates ad pauload

* includes wrapper ids

* supports ad config

* populates ad config

* adds event listener at every manager change

* handles setupfailure

* renames video js example

* updates time

* supports loadstart

* supports multiple setup callbacks

* removes global ima for test

* removes obsolete IMA checks

* requests ad unit

* uses vendor config to setup

* listens for playlist events

* restors src tag

* resolves build fail

* splits library from module

* allows obtaining ortb obj

* uses safe getConfig

* adds metadata demo

* improves metadata util

* triggers playlist event at first load

* adds bid request scheduling demo

* obtains bid adId

* sets proper context

* combines all possible adServer configs

* configures ad tag

* adds demos

* adServerConfig getter is nullable

* adds demos

* triggers setup fail when ima is missing

* checks for player existence

* updates tests

* adds tests

* tests media parsers

* returns empty object when no config gound

* adds integrity

* removes library map

* prioritizes bidder params

* uses camel casing for event names

* support multiple setup successful callbacks

* supports multiple setup fail ballbacks

* moves early return to core

* registers one event at a time

* uses event handler builder

* uses name conversion util

* refactors event handling

* refactors ima listeners

* simplifies event logic

* checks for existence

* offevent singular

* adds fn desc

* splits ortb video from content

* checks for player existence

* enrichment rules

* only sets main content div when enabled

* sets ortb2 in the bidRequest

* tests re ortb

* refactor tests

* resolves instability

* removes auction end event listener

* rebuilds dependencies

* sets ortb site.content

* renames auctionRequest

* renames optimizeAds

* adds module docs

* adds event doc

Co-authored-by: karimJWP <karimJWP@github.com>
Co-authored-by: AnirudhRahul <anirudhrahul@anjurahul.com>
---
 .../videoModule/jwplayer/bidMarkedAsUsed.html |    98 +
 .../jwplayer/bidRequestScheduling.html        |    89 +
 .../videoModule/jwplayer/eventListeners.html  |   244 +
 .../jwplayer/gamAdServerMediation.html        |   122 +
 .../videoModule/jwplayer/mediaMetadata.html   |    80 +
 .../videoModule/jwplayer/playlist.html        |   122 +
 .../videoModule/videojs/bidMarkedAsUsed.html  |   126 +
 .../videojs/bidRequestScheduling.html         |   132 +
 .../videoModule/videojs/eventListeners.html   |   238 +
 .../videojs/gamAdServerMediation.html         |   138 +
 .../videoModule/videojs/mediaMetadata.html    |   103 +
 .../videoModule/videojs/playlist.html         |   151 +
 libraries/video/constants/enums.js            |     5 +
 libraries/video/constants/events.js           |    97 +
 libraries/video/constants/ortb.js             |   169 +
 libraries/video/constants/vendorCodes.js      |     6 +
 libraries/video/shared/eventHandler.js        |    18 +
 libraries/video/shared/parentModule.js        |    82 +
 libraries/video/shared/state.js               |    47 +
 libraries/video/shared/vastXmlBuilder.js      |    77 +
 libraries/video/shared/vastXmlEditor.js       |   115 +
 modules/.submodules.json                      |     6 +-
 modules/appnexusBidAdapter.js                 |    39 +-
 modules/gridNMBidAdapter.js                   |    24 +-
 modules/jwplayerVideoProvider.js              |   929 ++
 modules/jwplayerVideoProvider.md              |    25 +
 modules/spotxBidAdapter.js                    |    31 +-
 modules/synacormediaBidAdapter.js             |     2 +-
 modules/videoModule/addingSubmodule.md        |   521 +
 modules/videoModule/coreVideo.js              |   234 +
 modules/videoModule/gamAdServerSubmodule.js   |    27 +
 modules/videoModule/index.js                  |   244 +
 .../videoModule/videoImpressionVerifier.js    |   206 +
 modules/videojsVideoProvider.js               |   854 ++
 modules/videojsVideoProvider.md               |    17 +
 package-lock.json                             | 11927 +++++++++++++++-
 package.json                                  |     4 +
 src/events.js                                 |     6 +-
 src/prebid.js                                 |   169 +-
 .../modules/videoModule/coreVideo_spec.js     |    98 +
 test/spec/modules/videoModule/pbVideo_spec.js |   362 +
 .../videoModule/shared/parentModule_spec.js   |    73 +
 .../modules/videoModule/shared/state_spec.js  |    26 +
 .../videoModule/shared/vastXmlBuilder_spec.js |   103 +
 .../videoModule/shared/vastXmlEditor_spec.js  |   209 +
 .../submodules/jwplayerVideoProvider_spec.js  |   846 ++
 .../submodules/videojsVideoProvider_spec.js   |   391 +
 .../videoImpressionVerifier_spec.js           |   112 +
 test/spec/unit/pbjs_api_spec.js               |     2 +-
 49 files changed, 18938 insertions(+), 808 deletions(-)
 create mode 100644 integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html
 create mode 100644 integrationExamples/videoModule/jwplayer/bidRequestScheduling.html
 create mode 100644 integrationExamples/videoModule/jwplayer/eventListeners.html
 create mode 100644 integrationExamples/videoModule/jwplayer/gamAdServerMediation.html
 create mode 100644 integrationExamples/videoModule/jwplayer/mediaMetadata.html
 create mode 100644 integrationExamples/videoModule/jwplayer/playlist.html
 create mode 100644 integrationExamples/videoModule/videojs/bidMarkedAsUsed.html
 create mode 100644 integrationExamples/videoModule/videojs/bidRequestScheduling.html
 create mode 100644 integrationExamples/videoModule/videojs/eventListeners.html
 create mode 100644 integrationExamples/videoModule/videojs/gamAdServerMediation.html
 create mode 100644 integrationExamples/videoModule/videojs/mediaMetadata.html
 create mode 100644 integrationExamples/videoModule/videojs/playlist.html
 create mode 100644 libraries/video/constants/enums.js
 create mode 100644 libraries/video/constants/events.js
 create mode 100644 libraries/video/constants/ortb.js
 create mode 100644 libraries/video/constants/vendorCodes.js
 create mode 100644 libraries/video/shared/eventHandler.js
 create mode 100644 libraries/video/shared/parentModule.js
 create mode 100644 libraries/video/shared/state.js
 create mode 100644 libraries/video/shared/vastXmlBuilder.js
 create mode 100644 libraries/video/shared/vastXmlEditor.js
 create mode 100644 modules/jwplayerVideoProvider.js
 create mode 100644 modules/jwplayerVideoProvider.md
 create mode 100644 modules/videoModule/addingSubmodule.md
 create mode 100644 modules/videoModule/coreVideo.js
 create mode 100644 modules/videoModule/gamAdServerSubmodule.js
 create mode 100644 modules/videoModule/index.js
 create mode 100644 modules/videoModule/videoImpressionVerifier.js
 create mode 100644 modules/videojsVideoProvider.js
 create mode 100644 modules/videojsVideoProvider.md
 create mode 100644 test/spec/modules/videoModule/coreVideo_spec.js
 create mode 100644 test/spec/modules/videoModule/pbVideo_spec.js
 create mode 100644 test/spec/modules/videoModule/shared/parentModule_spec.js
 create mode 100644 test/spec/modules/videoModule/shared/state_spec.js
 create mode 100644 test/spec/modules/videoModule/shared/vastXmlBuilder_spec.js
 create mode 100644 test/spec/modules/videoModule/shared/vastXmlEditor_spec.js
 create mode 100644 test/spec/modules/videoModule/submodules/jwplayerVideoProvider_spec.js
 create mode 100644 test/spec/modules/videoModule/submodules/videojsVideoProvider_spec.js
 create mode 100644 test/spec/modules/videoModule/videoImpressionVerifier_spec.js

diff --git a/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html b/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html
new file mode 100644
index 00000000000..542cab4202e
--- /dev/null
+++ b/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html
@@ -0,0 +1,98 @@
+<html>
+
+<head>
+    <script src="https://cdn.jwplayer.com/libraries/l5MchIxB.js"></script>
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>JW Player with Bid Marked As Used</title>
+
+    <!--This demo listens to the Video events that are fired when an ad impression or ad error came from a bid. -->
+
+    <script>
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 1, // jwplayer vendorCode
+              playerConfig: {
+                licenseKey: 'IAjLREYRLylTWsfLN3FoN/O3iQLbs+AfgZLlkAoyH8gSf7TnNtmOLcR8CUY=',
+                params: {
+                  vendorConfig: {
+                    file: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+                    advertising: { client: 'vast' }
+                  }
+                }
+              },
+            },]
+          },
+          debugging: {
+            enabled: true,
+            intercept: [
+              {
+                when: {
+                  adUnitCode: 'div-gpt-ad-51545-0',
+                },
+                then: {
+                  cpm: 25,
+                  mediaType: "video",
+                  vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                  // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                  ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+                }
+              },
+            ]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', (e) => {
+          console.log('player setup complete: ', e);
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoPlaybackRequest', (e) => {
+          pbjs.requestBids(adUnits);
+        });
+
+        pbjs.onEvent('videoBidError', e => {
+          console.log('An Ad Error came from a Bid: ', e);
+        });
+
+        pbjs.onEvent('videoBidImpression', e => {
+          console.log('An Ad Impression came from a Bid: ', e);
+        });
+      });
+    </script>
+</head>
+
+<body>
+    <div id ="player"></div>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/jwplayer/bidRequestScheduling.html b/integrationExamples/videoModule/jwplayer/bidRequestScheduling.html
new file mode 100644
index 00000000000..620f891fa50
--- /dev/null
+++ b/integrationExamples/videoModule/jwplayer/bidRequestScheduling.html
@@ -0,0 +1,89 @@
+<html>
+
+<head>
+    <script src="https://cdn.jwplayer.com/libraries/l5MchIxB.js"></script>
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>JW Player with Bid Request Scheduling</title>
+
+    <!--This demo configures JW Player's Player Bidding product to handle ad scheduling-->
+
+    <script>
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 1, // JW Player vendorCode
+              playerConfig: {
+                licenseKey: 'IAjLREYRLylTWsfLN3FoN/O3iQLbs+AfgZLlkAoyH8gSf7TnNtmOLcR8CUY=',
+                params: {
+                  vendorConfig: {
+                    file: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+                    advertising: {
+                      client: "googima",
+                      schedule: {
+                        adBreak1: {
+                          tag: "//pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/137679306/HB_Dev_Center_Example&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&correlator=",
+                          offset: "pre"
+                        },
+                        adBreak2: {
+                          tag: "//pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/137679306/HB_Dev_Center_Example&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&correlator=",
+                          offset: "10"
+                        },
+                        adBreak3: {
+                          tag: "//pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/137679306/HB_Dev_Center_Example&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&correlator=",
+                          offset: "20"
+                        },
+                        adBreak4: {
+                          tag: "//pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/137679306/HB_Dev_Center_Example&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&correlator=",
+                          offset: "post"
+                        }
+                      },
+                      bids: {
+                        client: "bidding",
+                        settings: {
+                          mediationLayerAdServer: "dfp",
+                          bidTimeout: 2000
+                        },
+                        bidders: [
+                          {
+                            name: "ix",
+                            siteId: "300"
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+              }
+            },]
+          },
+        });
+
+        pbjs.onEvent('videoSetupComplete', e => {
+          console.log('player setup complete: ', e);
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoAdError', e => {
+          console.log('adError: ', e);
+        });
+      });
+    </script>
+</head>
+
+<body>
+    <h2>JW Player with Bid Request Scheduling</h2>
+    <h5>Div-1: Player placeholder div</h5>
+    <div id='player'></div>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/jwplayer/eventListeners.html b/integrationExamples/videoModule/jwplayer/eventListeners.html
new file mode 100644
index 00000000000..b4f5aaa5443
--- /dev/null
+++ b/integrationExamples/videoModule/jwplayer/eventListeners.html
@@ -0,0 +1,244 @@
+-<!--
+
+-->
+
+<html>
+
+<head>
+    <script async src="../../../build/dev/prebid.js"></script>
+    <script src="https://cdn.jwplayer.com/libraries/l5MchIxB.js"></script>
+
+    <script>
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player',
+        },
+
+        // Replace this object to test a new Adapter!
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+      
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 1, // vendorCode for jwplayer
+              playerConfig: {
+                licenseKey: 'IAjLREYRLylTWsfLN3FoN/O3iQLbs+AfgZLlkAoyH8gSf7TnNtmOLcR8CUY=',
+                params: {
+                  vendorConfig: {
+                    file: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+                    mediaid: 'd9J2zcaA',
+                    advertising: { client: 'vast' }
+                  }
+                }
+              },
+            }]
+          },
+          debugging: {
+            enabled: true,
+            intercept: [
+              {
+                when: {
+                  adUnitCode: 'div-gpt-ad-51545-0',
+                },
+                then: {
+                  cpm: 25,
+                  mediaType: "video",
+                  vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                  // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                  ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+                }
+              },
+            ]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', (e) => {
+          console.log('player setup complete: ', e);
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoDestroyed', e => {
+          console.log('player destroyed: ', e);
+        });
+
+        pbjs.onEvent('videoPlaylist', (e) => {
+          console.log('videos pb playlist: ', e);
+        });
+
+        pbjs.onEvent('videoPlaybackRequest', (e) => {
+          console.log('videos pb playbackRequest: ', e);
+          pbjs.requestBids(adUnits);
+        });
+
+        pbjs.onEvent('videoAutostartBlocked', (e) => {
+          console.log('videos pb autostartBlocked: ', e);
+        });
+
+        pbjs.onEvent('videoPlayAttemptFailed', (e) => {
+          console.log('videos pb playAttemptFailed: ', e);
+        });
+
+        pbjs.onEvent('videoContentLoaded', (e) => {
+          console.log('videos pb contentLoaded: ', e);
+        });
+
+        pbjs.onEvent('videoPlay', (e) => {
+          console.log('videos pb play: ', e);
+        });
+
+        pbjs.onEvent('videoPause', (e) => {
+          console.log('videos pb pause: ', e);
+        });
+
+        pbjs.onEvent('videoBuffer', (e) => {
+          console.log('videos pb buffer: ', e);
+        });
+
+        pbjs.onEvent('videoSeekStart', (e) => {
+          console.log('videos pb seekStart: ', e);
+        });
+
+        pbjs.onEvent('videoSeekEnd', (e) => {
+          console.log('videos pb seekEnd: ', e);
+        });
+
+        pbjs.onEvent('videoRenditionUpdate', (e) => {
+          console.log('videos pb renditionUpdate: ', e);
+        });
+
+        pbjs.onEvent('videoMute', (e) => {
+          console.log('videos pb mute: ', e);
+        });
+
+        pbjs.onEvent('videoVolume', (e) => {
+          console.log('videos pb volume: ', e);
+        });
+
+        // pbjs.onEvent('videoTime', (e) => {
+        //   console.log('videos pb time: ', e);
+        // });
+
+        pbjs.onEvent('videoComplete', (e) => {
+          console.log('videos pb complete: ', e);
+        });
+
+        pbjs.onEvent('videoPlaylistComplete', (e) => {
+          console.log('videos pb playlistComplete: ', e);
+        });
+
+        pbjs.onEvent('videoFullscreen', (e) => {
+          console.log('videos pb fullscreen: ', e);
+        });
+
+        pbjs.onEvent('videoPlayerResize', (e) => {
+          console.log('videos pb playerResize: ', e);
+        });
+
+        pbjs.onEvent('videoError', (e) => {
+          console.log('videos pb error: ', e);
+        });
+
+        pbjs.onEvent('videoViewable', (e) => {
+          console.log('videos pb viewable: ', e);
+        });
+
+        pbjs.onEvent('videoCast', (e) => {
+          console.log('videos pb cast: ', e);
+        });
+
+        pbjs.onEvent('videoAdBreakStart', e => {
+          console.log('videos pb ad break start: ', e);
+        });
+
+        pbjs.onEvent('videoAdRequest', (e) => {
+          console.log('videos pb ad request: ', e);
+        });
+
+        pbjs.onEvent('videoAdLoaded', e => {
+          console.log('videos pb ad load: ', e);
+        });
+
+        pbjs.onEvent('videoAdImpression', (e) => {
+          console.log('videos pb ad impression: ', e);
+        });
+
+        pbjs.onEvent('videoAdStarted', (e) => {
+          console.log('videos pb ad started: ', e);
+        });
+
+        pbjs.onEvent('videoAdPlay', (e) => {
+          console.log('videos pb ad play: ', e);
+        });
+
+        pbjs.onEvent('videoAdPause', (e) => {
+          console.log('videos pb ad pause: ', e);
+        });
+
+        // pbjs.onEvent('videoAdTime', (e) => {
+        //   console.log('videos pb ad time: ', e);
+        // });
+
+        pbjs.onEvent('videoAdComplete', (e) => {
+          console.log('videos pb ad complete: ', e);
+        });
+
+        pbjs.onEvent('videoAdSkipped', (e) => {
+          console.log('videos pb ad skipped: ', e);
+        });
+
+        pbjs.onEvent('videoAdClick', (e) => {
+          console.log('videos pb ad click: ', e);
+        });
+
+        pbjs.onEvent('videoAdError', (e) => {
+          console.log('videos pb ad error: ', e);
+        });
+
+        pbjs.onEvent('videoAdBreakStart', e => {
+          console.log('videos pb ad break start: ', e);
+        });
+
+        pbjs.onEvent('videoAuctionAdLoadAbort', (e) => {
+          console.log('videos pb auction ad load attempt: ', e);
+        });
+
+        pbjs.onEvent('videoAuctionAdLoadAttempt', event => {
+          console.log('The Video Module is attempting to load an ad into the player! \n', event);
+        });
+
+        pbjs.onEvent('videoBidImpression', event => {
+          console.log('The ad impression resulted from a bid! \n', event);
+        });
+
+        pbjs.onEvent('videoBidError', event => {
+          console.log('The ad error resulted from a bid! \n', event);
+        });
+      });
+    </script>
+</head>
+
+<body>
+    <div id ="player"></div>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html b/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html
new file mode 100644
index 00000000000..4612d03f336
--- /dev/null
+++ b/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html
@@ -0,0 +1,122 @@
+<html>
+
+<head>
+    <script src="https://cdn.jwplayer.com/libraries/l5MchIxB.js"></script>
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>JW Player with GAM Ad Server Mediation</title>
+
+    <!--This demo configures the video provider to use GAM Ad Server as mediation. Listens to Video events that are fired when an ad impression or ad error came from a bid. -->
+
+    <script>
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 1, // JW Player vendorCode
+              playerConfig: {
+                licenseKey: 'IAjLREYRLylTWsfLN3FoN/O3iQLbs+AfgZLlkAoyH8gSf7TnNtmOLcR8CUY=',
+                params: {
+                  vendorConfig: {
+                    file: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+                    advertising: { client: 'googima' }
+                  }
+                }
+              },
+              // Configure your Ad Server Integration
+              adServer: {
+                vendorCode: 'gam',
+                // params: {
+                //   iu: '/19968336/prebid_cache_video_adunit',
+                //   cust_params: {
+                //     section: 'blog',
+                //     anotherKey: 'anotherValue'
+                //   },
+                //   output: 'vast'
+                // },
+                baseAdTagUrl: 'https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_preroll_skippable&sz=640x480&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator='
+                //'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/137679306/HB_Dev_Center_Example&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&correlator=',
+              },
+            },]
+          },
+          cache: {
+            url: 'https://prebid.adnxs.com/pbc/v1/cache'
+          },
+          targetingControls: {
+            allowTargetingKeys: ['BIDDER', 'AD_ID', 'PRICE_BUCKET', 'SIZE', 'DEAL', 'SOURCE', 'FORMAT', 'UUID', 'CACHE_ID', 'CACHE_HOST', 'ADOMAIN']
+          },
+          debugging: {
+            enabled: true,
+            intercept: [
+              {
+                when: {
+                  adUnitCode: 'div-gpt-ad-51545-0',
+                },
+                then: {
+                  cpm: 35,
+                  mediaType: "video",
+                  vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                  ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+                }
+              },
+            ]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', (e) => {
+          console.log('player setup complete: ', e);
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoPlaybackRequest', (e) => {
+          pbjs.requestBids(adUnits);
+        });
+
+        pbjs.onEvent('videoAdRequest', (e) => {
+          console.log('videos pb ad request: ', e);
+        });
+
+        pbjs.onEvent('videoBidError', e => {
+          console.log('An Ad Error came from a Bid: ', e);
+        });
+
+        pbjs.onEvent('videoBidImpression', e => {
+          console.log('An Ad Impression came from a Bid: ', e);
+        });
+      });
+    </script>
+</head>
+
+<body>
+<h2>JW Player with GAM Ad Server Mediation</h2>
+<h5>Player placeholder div</h5>
+    <div id="player"></div>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/jwplayer/mediaMetadata.html b/integrationExamples/videoModule/jwplayer/mediaMetadata.html
new file mode 100644
index 00000000000..97e35c4de0d
--- /dev/null
+++ b/integrationExamples/videoModule/jwplayer/mediaMetadata.html
@@ -0,0 +1,80 @@
+<html>
+
+<head>
+    <script src="https://cdn.jwplayer.com/libraries/l5MchIxB.js"></script>
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>JW Player with Media Metadata</title>
+
+    <!-- This Demo loads media with metadata which is used to enrich the auction by populating the ortb site.content -->
+
+    <script>
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 1, // JW Player vendorCode
+              playerConfig: {
+                licenseKey: 'IAjLREYRLylTWsfLN3FoN/O3iQLbs+AfgZLlkAoyH8gSf7TnNtmOLcR8CUY=',
+                params: {
+                  vendorConfig: {
+                    mediaid: 'XYXYXYXY',
+                    file: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+                    title: 'Subaru Outback On Street And Dirt',
+                    description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+                    advertising: { client: 'googima' }
+                  }
+                }
+              }
+            },]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', e => {
+          console.log('player setup complete: ', e);
+          pbjs.requestBids(adUnits);
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoContentLoaded', (e) => {
+          console.log('videos pb contentLoaded: ', e);
+        });
+      });
+    </script>
+
+</head>
+
+<body>
+<h2>JW Player with Media Metadata</h2>
+
+<div id='player'></div>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/jwplayer/playlist.html b/integrationExamples/videoModule/jwplayer/playlist.html
new file mode 100644
index 00000000000..eb9a9b12700
--- /dev/null
+++ b/integrationExamples/videoModule/jwplayer/playlist.html
@@ -0,0 +1,122 @@
+<html>
+
+<head>
+  <script src="https://cdn.jwplayer.com/libraries/l5MchIxB.js"></script>
+  <script async src="../../../build/dev/prebid.js"></script>
+
+  <title>JW Player with Playlist</title>
+
+  <!-- This Demo sets up the JW Player instance with a playlist and requests a bid whenever a new media item is loaded -->
+
+  <script>
+    // Setup ad units
+    var adUnits = [{
+      code: 'div-gpt-ad-51545-0',
+      mediaTypes: {
+        video: {}
+      },
+      video: {
+        divId: 'player', // required to indicate which player is being used to render this ad unit.
+      },
+
+      bids: [{
+        bidder: 'ix',
+        params: {
+          siteId: '300',
+        }
+      }]
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function () {
+      pbjs.setConfig({
+        video: {
+          providers: [{
+            divId: 'player',
+            vendorCode: 1, // JW Player vendorCode
+            playerConfig: {
+              params: {
+                licenseKey: 'IAjLREYRLylTWsfLN3FoN/O3iQLbs+AfgZLlkAoyH8gSf7TnNtmOLcR8CUY=',
+                vendorConfig: {
+                  playlist: [{
+                    mediaid: 'XYXYXYXY',
+                    file: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+                    title: 'Subaru Outback On Street And Dirt',
+                    description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+                  }, {
+                    mediaid: 'ZAZAZAZA',
+                    file : "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
+                    title : "Big Buck Bunny",
+                    description : "Big Buck Bunny tells the story of a giant rabbit with a heart bigger than himself. When one sunny day three rodents rudely harass him, something snaps... and the rabbit ain't no bunny anymore! In the typical cartoon tradition he prepares the nasty rodents a comical revenge.\n\nLicensed under the Creative Commons Attribution license\nhttp://www.bigbuckbunny.org",
+                  }, {
+                    mediaid: 'WSWSWSWS',
+                    file: "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/Sintel.mp4",
+                    title : "Sintel",
+                    description: "Sintel is an independently produced short film, initiated by the Blender Foundation as a means to further improve and validate the free/open source 3D creation suite Blender. With initial funding provided by 1000s of donations via the internet community, it has again proven to be a viable development model for both open 3D technology as for independent animation film.\nThis 15 minute film has been realized in the studio of the Amsterdam Blender Institute, by an international team of artists and developers. In addition to that, several crucial technical and creative targets have been realized online, by developers and artists and teams all over the world.\nwww.sintel.org",
+                  }],
+                  advertising: { client: 'vast' }
+                }
+              }
+            }
+          },]
+        },
+        debugging: {
+          enabled: true,
+          intercept: [
+            {
+              when: {
+                adUnitCode: 'div-gpt-ad-51545-0',
+              },
+              then: {
+                cpm: 25,
+                mediaType: "video",
+                vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+              }
+            },
+          ]
+        }
+      });
+      pbjs.addAdUnits(adUnits);
+
+      pbjs.onEvent('videoSetupComplete', e => {
+        console.log('player setup complete: ', e);
+      });
+
+      pbjs.onEvent('videoSetupFailed', e => {
+        console.log('player setup failed: ', e);
+      });
+
+      pbjs.onEvent('videoPlaylist', (e) => {
+        console.log('videos pb playlist: ', e);
+      });
+
+      // request a bid when media is loaded
+      pbjs.onEvent('videoContentLoaded', (e) => {
+        console.log('videos pb contentLoaded: ', e);
+        pbjs.requestBids(adUnits);
+      });
+
+      pbjs.onEvent('videoComplete', (e) => {
+        console.log('videos pb complete: ', e);
+      });
+
+      pbjs.onEvent('videoPlaylistComplete', (e) => {
+        console.log('videos pb playlistComplete: ', e);
+      });
+    });
+  </script>
+
+</head>
+
+<body>
+<h2>JW Player with Playlist</h2>
+
+<h5>Div-1: Player placeholder div</h5>
+<div id='player'></div>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html b/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html
new file mode 100644
index 00000000000..3c21130e8f5
--- /dev/null
+++ b/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html
@@ -0,0 +1,126 @@
+<html>
+
+<head>
+    <link href="https://vjs.zencdn.net/7.20.2/video-js.css" rel="stylesheet" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.css"
+          integrity="sha512-0gIqgiX1dWTChdWUl8XGIBDFvLo7aTvmd6FAhJjzWx5bzYsCJTiPJLKqLF3q31IN4Kfrc0NbTO+EthoT6O0olQ=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.css"
+          integrity="sha512-vvsEsf+dZDp6wbommO1Jbb2bpFhVQjw6pIzfE5fUY5Fgkmsgn/16sQWegqrd236T69kK5F1SbGZ+yK46a9il5A=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <script src="https://vjs.zencdn.net/7.20.2/video.min.js"></script>
+    <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.js"
+            integrity="sha512-XjyyAijQGlXZET35toG8igvVs8HvfVgKXGnbfAs2EpZ0o8vjJoIrxL9RBBQbQjzAODIe0jvWelFfZOA3Z/vdWg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.js"
+            integrity="sha512-9ocW9fl8CKJhZp4cmDpLDGPuTQ93gvw1iIS6daMYc5Y0Xh1all8iwdoI+iNmZpiydpdDGyKMTriXDX0wfs2OEg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>VideoJS with Bid Marked As Used</title>
+
+    <!--This demo listens to the Video events that are fired when an ad impression or ad error came from a bid. -->
+
+    <script>
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 2, // videojs vendorCode
+              playerConfig: {
+                params: {
+                  adPluginConfig: {
+                    numRedirects: 10
+                  },
+                  vendorConfig: {
+                    controls: true,
+                    autoplay: false,
+                    preload: "auto",
+                  }
+                }
+              }
+            },]
+          },
+          debugging: {
+            enabled: true,
+            intercept: [
+              {
+                when: {
+                  adUnitCode: 'div-gpt-ad-51545-0',
+                },
+                then: {
+                  cpm: 25,
+                  mediaType: "video",
+                  vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                  // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                  ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+                }
+              },
+            ]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', e => {
+          // Load media with its Metadata when the video player is done instantiating.
+          videojs('player').loadMedia({
+            id: 'XYXYXYXY',
+            src: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+            title: 'Subaru Outback On Street And Dirt',
+            description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+            type: 'video/mp4'
+          });
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoContentLoaded', (e) => {
+          pbjs.requestBids(adUnits);
+        });
+
+        pbjs.onEvent('videoBidError', e => {
+          console.log('An Ad Error came from a Bid: ', e);
+        });
+
+        pbjs.onEvent('videoBidImpression', e => {
+          console.log('An Ad Impression came from a Bid: ', e);
+        });
+
+      });
+    </script>
+</head>
+
+<body>
+<h2>VideoJS with Bid Marked As Used</h2>
+<h5>Div-1: Player placeholder div</h5>
+<video-js id='player' class="vjs-big-play-centered"></video-js>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/videojs/bidRequestScheduling.html b/integrationExamples/videoModule/videojs/bidRequestScheduling.html
new file mode 100644
index 00000000000..48f8b8685e1
--- /dev/null
+++ b/integrationExamples/videoModule/videojs/bidRequestScheduling.html
@@ -0,0 +1,132 @@
+<html>
+
+<head>
+    <link href="https://vjs.zencdn.net/7.20.2/video-js.css" rel="stylesheet" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.css"
+          integrity="sha512-0gIqgiX1dWTChdWUl8XGIBDFvLo7aTvmd6FAhJjzWx5bzYsCJTiPJLKqLF3q31IN4Kfrc0NbTO+EthoT6O0olQ=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.css"
+          integrity="sha512-vvsEsf+dZDp6wbommO1Jbb2bpFhVQjw6pIzfE5fUY5Fgkmsgn/16sQWegqrd236T69kK5F1SbGZ+yK46a9il5A=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <script src="https://vjs.zencdn.net/7.20.2/video.min.js"></script>
+    <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.js"
+            integrity="sha512-XjyyAijQGlXZET35toG8igvVs8HvfVgKXGnbfAs2EpZ0o8vjJoIrxL9RBBQbQjzAODIe0jvWelFfZOA3Z/vdWg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.js"
+            integrity="sha512-9ocW9fl8CKJhZp4cmDpLDGPuTQ93gvw1iIS6daMYc5Y0Xh1all8iwdoI+iNmZpiydpdDGyKMTriXDX0wfs2OEg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>VideoJS with Bid Request Scheduling</title>
+
+    <!--This demo listens to the Video events to create an auction at every 10 seconds. -->
+
+    <script>
+      let midrollOffset = 0;
+
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 2, // videojs vendorCode
+              playerConfig: {
+                params: {
+                  adPluginConfig: {
+                    numRedirects: 10
+                  },
+                  vendorConfig: {
+                    controls: true,
+                    autoplay: false,
+                    preload: "auto",
+                  }
+                }
+              }
+            },]
+          },
+          debugging: {
+            enabled: true,
+            intercept: [
+              {
+                when: {
+                  adUnitCode: 'div-gpt-ad-51545-0',
+                },
+                then: {
+                  cpm: 25,
+                  mediaType: "video",
+                  vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                  // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                  ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+                }
+              },
+            ]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', e => {
+          // Load media with its Metadata when the video player is done instantiating.
+          videojs('player').loadMedia({
+            id: 'XYXYXYXY',
+            src: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+            title: 'Subaru Outback On Street And Dirt',
+            description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+            type: 'video/mp4'
+          });
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoContentLoaded', (e) => {
+          // reset the offset when media is loaded
+          midrollOffset = 0;
+        });
+
+        pbjs.onEvent('videoTime', (e) => {
+          // when the video reaches the midroll, request bids and update the offset.
+          if (e.position >= midrollOffset) {
+            pbjs.requestBids(adUnits);
+            midrollOffset += 10;
+          }
+        });
+
+        pbjs.onEvent('videoAdError', e => {
+          console.log('adError: ', e);
+        });
+      });
+    </script>
+</head>
+
+<body>
+    <h2>VideoJS with Bid Request Scheduling</h2>
+    <h5>Div-1: Player placeholder div</h5>
+    <video-js id='player' class="vjs-big-play-centered"></video-js>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/videojs/eventListeners.html b/integrationExamples/videoModule/videojs/eventListeners.html
new file mode 100644
index 00000000000..63de878715f
--- /dev/null
+++ b/integrationExamples/videoModule/videojs/eventListeners.html
@@ -0,0 +1,238 @@
+<html>
+
+<head>
+  <link href="https://vjs.zencdn.net/7.20.2/video-js.css" rel="stylesheet" />
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.css"
+    integrity="sha512-0gIqgiX1dWTChdWUl8XGIBDFvLo7aTvmd6FAhJjzWx5bzYsCJTiPJLKqLF3q31IN4Kfrc0NbTO+EthoT6O0olQ=="
+    crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.css"
+    integrity="sha512-vvsEsf+dZDp6wbommO1Jbb2bpFhVQjw6pIzfE5fUY5Fgkmsgn/16sQWegqrd236T69kK5F1SbGZ+yK46a9il5A=="
+    crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <script src="https://vjs.zencdn.net/7.20.2/video.min.js"></script>
+  <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.js"
+          integrity="sha512-XjyyAijQGlXZET35toG8igvVs8HvfVgKXGnbfAs2EpZ0o8vjJoIrxL9RBBQbQjzAODIe0jvWelFfZOA3Z/vdWg=="
+          crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.js"
+          integrity="sha512-9ocW9fl8CKJhZp4cmDpLDGPuTQ93gvw1iIS6daMYc5Y0Xh1all8iwdoI+iNmZpiydpdDGyKMTriXDX0wfs2OEg=="
+          crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+  <script async src="../../../build/dev/prebid.js"></script>
+
+  <title>VideoJS Event Listeners</title>
+
+  <!--  This demo listens to every video event and logs the event payload. -->
+
+  <script>
+    // setup ad units
+    var adUnits = [{
+      code: 'div-gpt-ad-51545-0',
+      mediaTypes: {
+        video: {}
+      },
+      video: {
+        divId: 'player', // required to indicate which player is being used to render this ad unit.
+      },
+
+      bids: [{
+        bidder: 'ix',
+        params: {
+          siteId: '300',
+        }
+      }]
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function () {
+      pbjs.setConfig({
+        video: {
+          providers: [{
+            divId: 'player',
+            vendorCode: 2, // videojs vendorCode
+            playerConfig: {
+              params: {
+                adPluginConfig: {
+                  numRedirects: 10
+                },
+                vendorConfig: {
+                  controls: true,
+                  autoplay: false,
+                  preload: "auto",
+                }
+              }
+            }
+          },]
+        },
+        debugging: {
+          enabled: true,
+          intercept: [
+            {
+              when: {
+                adUnitCode: 'div-gpt-ad-51545-0',
+              },
+              then: {
+                cpm: 25,
+                mediaType: "video",
+                vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+              }
+            },
+          ]
+        }
+      });
+      pbjs.addAdUnits(adUnits);
+
+      pbjs.onEvent('videoSetupComplete', e => {
+        console.log('player setup complete: ', e);
+        // Load media with its Metadata when the video player is done instantiating.
+        videojs('player').loadMedia({
+          id: 'XYXYXYXY',
+          src: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+          title: 'Subaru Outback On Street And Dirt',
+          description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+          type: 'video/mp4'
+        });
+      });
+
+      pbjs.onEvent('videoSetupFailed', e => {
+        console.log('player setup failed: ', e);
+      });
+
+      pbjs.onEvent('videoDestroyed', e => {
+        console.log('player destroyed: ', e);
+      });
+
+      pbjs.onEvent('videoPlaylist', (e) => {
+        console.log('videos pb playlist: ', e);
+      });
+
+      pbjs.onEvent('videoPlaybackRequest', (e) => {
+        console.log('videos pb playbackRequest: ', e);
+      });
+
+      pbjs.onEvent('videoContentLoaded', (e) => {
+        console.log('videos pb contentLoaded: ', e);
+      });
+
+      pbjs.onEvent('videoPlay', (e) => {
+        console.log('videos pb play: ', e);
+      });
+
+      pbjs.onEvent('videoPause', (e) => {
+        console.log('videos pb pause: ', e);
+      });
+
+      pbjs.onEvent('videoSeekStart', (e) => {
+        console.log('videos pb seekStart: ', e);
+      });
+
+      pbjs.onEvent('videoSeekEnd', (e) => {
+        console.log('videos pb seekEnd: ', e);
+      });
+
+      pbjs.onEvent('videoMute', (e) => {
+        console.log('videos pb mute: ', e);
+      });
+
+      pbjs.onEvent('videoVolume', (e) => {
+        console.log('videos pb volume: ', e);
+      });
+
+      // pbjs.onEvent('videoTime', (e) => {
+      //   console.log('videos pb time: ', e);
+      // });
+
+      pbjs.onEvent('videoComplete', (e) => {
+        console.log('videos pb complete: ', e);
+      });
+
+      pbjs.onEvent('videoFullscreen', (e) => {
+        console.log('videos pb fullscreen: ', e);
+      });
+
+      pbjs.onEvent('videoPlayerResize', (e) => {
+        console.log('videos pb playerResize: ', e);
+      });
+
+      pbjs.onEvent('videoError', (e) => {
+        console.log('videos pb error: ', e);
+      });
+
+      pbjs.onEvent('videoAdRequest', (e) => {
+        console.log('videos pb ad request: ', e);
+      });
+
+      pbjs.onEvent('videoAdLoaded', e => {
+        console.log('videos pb ad load: ', e);
+      });
+
+      pbjs.onEvent('videoAdImpression', (e) => {
+        console.log('videos pb ad impression: ', e);
+      });
+
+      pbjs.onEvent('videoAdStarted', (e) => {
+        console.log('videos pb ad started: ', e);
+      });
+
+      pbjs.onEvent('videoAdPlay', (e) => {
+        console.log('videos pb ad play: ', e);
+      });
+
+      pbjs.onEvent('videoAdPause', (e) => {
+        console.log('videos pb ad pause: ', e);
+      });
+
+      // pbjs.onEvent('videoAdTime', (e) => {
+      //   console.log('videos pb ad time: ', e);
+      // });
+
+      pbjs.onEvent('videoAdComplete', (e) => {
+        console.log('videos pb ad complete: ', e);
+      });
+
+      pbjs.onEvent('videoAdSkipped', (e) => {
+        console.log('videos pb ad skipped: ', e);
+      });
+
+      pbjs.onEvent('videoAdClick', (e) => {
+        console.log('videos pb ad click: ', e);
+      });
+
+      pbjs.onEvent('videoAdError', (e) => {
+        console.log('videos pb ad error: ', e);
+      });
+
+      pbjs.onEvent('videoAuctionAdLoadAttempt', (e) => {
+        console.log('videos pb auction ad load attempt: ', e);
+      });
+
+      pbjs.onEvent('videoAuctionAdLoadAbort', (e) => {
+        console.log('videos pb auction ad load attempt: ', e);
+      });
+
+      pbjs.onEvent('videoBidImpression', (e) => {
+        console.log('videos pb bid Impression: ', e);
+      });
+
+      pbjs.onEvent('videoBidError', (e) => {
+        console.log('videos pb bid Error: ', e);
+      });
+
+      pbjs.requestBids(adUnits);
+    });
+  </script>
+
+</head>
+
+<body>
+  <h2>VideoJS Event Listeners</h2>
+
+  <h5>Div-1: Player placeholder div</h5>
+  <video-js id='player' class="vjs-big-play-centered">
+  </video-js>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/videojs/gamAdServerMediation.html b/integrationExamples/videoModule/videojs/gamAdServerMediation.html
new file mode 100644
index 00000000000..72deba861bf
--- /dev/null
+++ b/integrationExamples/videoModule/videojs/gamAdServerMediation.html
@@ -0,0 +1,138 @@
+<html>
+
+<head>
+    <link href="https://vjs.zencdn.net/7.20.2/video-js.css" rel="stylesheet" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.css"
+          integrity="sha512-0gIqgiX1dWTChdWUl8XGIBDFvLo7aTvmd6FAhJjzWx5bzYsCJTiPJLKqLF3q31IN4Kfrc0NbTO+EthoT6O0olQ=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.css"
+          integrity="sha512-vvsEsf+dZDp6wbommO1Jbb2bpFhVQjw6pIzfE5fUY5Fgkmsgn/16sQWegqrd236T69kK5F1SbGZ+yK46a9il5A=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <script src="https://vjs.zencdn.net/7.20.2/video.min.js"></script>
+    <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.js"
+            integrity="sha512-XjyyAijQGlXZET35toG8igvVs8HvfVgKXGnbfAs2EpZ0o8vjJoIrxL9RBBQbQjzAODIe0jvWelFfZOA3Z/vdWg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.js"
+            integrity="sha512-9ocW9fl8CKJhZp4cmDpLDGPuTQ93gvw1iIS6daMYc5Y0Xh1all8iwdoI+iNmZpiydpdDGyKMTriXDX0wfs2OEg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>VideoJS with GAM Ad Server Mediation</title>
+
+    <!--This demo configures the video provider to use GAM Ad Server as mediation. Listens to Video events that are fired when an ad impression or ad error came from a bid. -->
+
+    <script>
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 2, // videojs vendorCode
+              playerConfig: {
+                params: {
+                  adPluginConfig: {
+                    numRedirects: 10
+                  },
+                  vendorConfig: {
+                    controls: true,
+                    autoplay: false,
+                    preload: "auto",
+                  }
+                }
+              },
+              // Configure your Ad Server Integration
+              adServer: {
+                vendorCode: 'gam',
+                baseAdTagUrl: 'https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_preroll_skippable&sz=640x480&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator='
+                //'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/137679306/HB_Dev_Center_Example&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&correlator=',
+              },
+            },]
+          },
+          cache: {
+            url: 'https://prebid.adnxs.com/pbc/v1/cache'
+          },
+          targetingControls: {
+            allowTargetingKeys: ['BIDDER', 'AD_ID', 'PRICE_BUCKET', 'SIZE', 'DEAL', 'SOURCE', 'FORMAT', 'UUID', 'CACHE_ID', 'CACHE_HOST', 'ADOMAIN']
+          },
+          debugging: {
+            enabled: true,
+            intercept: [
+              {
+                when: {
+                  adUnitCode: 'div-gpt-ad-51545-0',
+                },
+                then: {
+                  cpm: 35,
+                  mediaType: "video",
+                  vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                  ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+                }
+              },
+            ]
+          }
+        });
+
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.requestBids(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', e => {
+          // Load media with its Metadata when the video player is done instantiating.
+          videojs('player').loadMedia({
+            id: 'XYXYXYXY',
+            src: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+            title: 'Subaru Outback On Street And Dirt',
+            description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+            type: 'video/mp4'
+          });
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoAdRequest', (e) => {
+          console.log('videos pb ad request: ', e);
+        });
+
+        pbjs.onEvent('videoBidError', e => {
+          console.log('An Ad Error came from a Bid: ', e);
+        });
+
+        pbjs.onEvent('videoBidImpression', e => {
+          console.log('An Ad Impression came from a Bid: ', e);
+        });
+
+      });
+    </script>
+</head>
+
+<body>
+<h2>VideoJS with GAM Ad Server Mediation</h2>
+<h5>Div-1: Player placeholder div</h5>
+<video-js id='player' class="vjs-big-play-centered"></video-js>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/videojs/mediaMetadata.html b/integrationExamples/videoModule/videojs/mediaMetadata.html
new file mode 100644
index 00000000000..eef12b0e19d
--- /dev/null
+++ b/integrationExamples/videoModule/videojs/mediaMetadata.html
@@ -0,0 +1,103 @@
+<html>
+
+<head>
+    <link href="https://vjs.zencdn.net/7.20.2/video-js.css" rel="stylesheet" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.css"
+          integrity="sha512-0gIqgiX1dWTChdWUl8XGIBDFvLo7aTvmd6FAhJjzWx5bzYsCJTiPJLKqLF3q31IN4Kfrc0NbTO+EthoT6O0olQ=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.css"
+          integrity="sha512-vvsEsf+dZDp6wbommO1Jbb2bpFhVQjw6pIzfE5fUY5Fgkmsgn/16sQWegqrd236T69kK5F1SbGZ+yK46a9il5A=="
+          crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <script src="https://vjs.zencdn.net/7.20.2/video.min.js"></script>
+    <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.js"
+            integrity="sha512-XjyyAijQGlXZET35toG8igvVs8HvfVgKXGnbfAs2EpZ0o8vjJoIrxL9RBBQbQjzAODIe0jvWelFfZOA3Z/vdWg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/1.11.0/videojs.ima.js"
+            integrity="sha512-9ocW9fl8CKJhZp4cmDpLDGPuTQ93gvw1iIS6daMYc5Y0Xh1all8iwdoI+iNmZpiydpdDGyKMTriXDX0wfs2OEg=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+    <script async src="../../../build/dev/prebid.js"></script>
+
+    <title>VideoJS with Media Metadata</title>
+
+    <!-- This Demo loads media with metadata which is used to enrich the auction by populating the ortb site.content -->
+
+    <script>
+      // Setup ad units
+      var adUnits = [{
+        code: 'div-gpt-ad-51545-0',
+        mediaTypes: {
+          video: {}
+        },
+        video: {
+          divId: 'player', // required to indicate which player is being used to render this ad unit.
+        },
+
+        bids: [{
+          bidder: 'ix',
+          params: {
+            siteId: '300',
+          }
+        }]
+      }];
+
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+
+      pbjs.que.push(function () {
+        pbjs.setConfig({
+          video: {
+            providers: [{
+              divId: 'player',
+              vendorCode: 2, // videojs vendorCode
+              playerConfig: {
+                params: {
+                  adPluginConfig: {
+                    numRedirects: 10
+                  },
+                  vendorConfig: {
+                    controls: true,
+                    autoplay: false,
+                    preload: "auto",
+                  }
+                }
+              }
+            },]
+          }
+        });
+        pbjs.addAdUnits(adUnits);
+
+        pbjs.onEvent('videoSetupComplete', e => {
+          // Load media with its Metadata when the video player is done instantiating.
+          videojs('player').loadMedia({
+            id: 'XYXYXYXY',
+            src: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+            title: 'Subaru Outback On Street And Dirt',
+            description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+            type: 'video/mp4'
+          });
+        });
+
+        pbjs.onEvent('videoSetupFailed', e => {
+          console.log('player setup failed: ', e);
+        });
+
+        pbjs.onEvent('videoContentLoaded', (e) => {
+          console.log('videos pb contentLoaded: ', e);
+        });
+
+        pbjs.requestBids(adUnits);
+      });
+    </script>
+
+</head>
+
+<body>
+<h2>VideoJS with Media Metadata</h2>
+
+<h5>Div-1: Player placeholder div</h5>
+<video-js id='player' class="vjs-big-play-centered"></video-js>
+</body>
+
+</html>
diff --git a/integrationExamples/videoModule/videojs/playlist.html b/integrationExamples/videoModule/videojs/playlist.html
new file mode 100644
index 00000000000..a9354e06c83
--- /dev/null
+++ b/integrationExamples/videoModule/videojs/playlist.html
@@ -0,0 +1,151 @@
+<html>
+
+<head>
+  <link href="https://vjs.zencdn.net/7.20.2/video-js.css" rel="stylesheet" />
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.css"
+        integrity="sha512-0gIqgiX1dWTChdWUl8XGIBDFvLo7aTvmd6FAhJjzWx5bzYsCJTiPJLKqLF3q31IN4Kfrc0NbTO+EthoT6O0olQ=="
+        crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/2.1.0/videojs.ima.css"
+        integrity="sha512-vvsEsf+dZDp6wbommO1Jbb2bpFhVQjw6pIzfE5fUY5Fgkmsgn/16sQWegqrd236T69kK5F1SbGZ+yK46a9il5A=="
+        crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <script src="https://vjs.zencdn.net/7.20.2/video.js"></script>
+  <script src="https://imasdk.googleapis.com/js/sdkloader/ima3.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-contrib-ads/6.9.0/videojs-contrib-ads.js"
+          integrity="sha512-XjyyAijQGlXZET35toG8igvVs8HvfVgKXGnbfAs2EpZ0o8vjJoIrxL9RBBQbQjzAODIe0jvWelFfZOA3Z/vdWg=="
+          crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-ima/2.1.0/videojs.ima.js"
+          integrity="sha512-SCLZezhUawfgEVvtAuWp8OpRjZVa30okAsUoUe4+wPO6BEj4dWV1rDDruNwgOUrNdKpJL0GBf0KRrslSO7nqrw=="
+          crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="../../../node_modules/videojs-playlist/dist/videojs-playlist.js"></script>
+
+  <script async src="../../../build/dev/prebid.js"></script>
+
+  <title>VideoJS with Playlist</title>
+
+  <!-- This Demo sets up the videojs instance with a playlist and requests a bid whenever a new media item is loaded -->
+
+  <script>
+    // Setup ad units
+    var adUnits = [{
+      code: 'div-gpt-ad-51545-0',
+      mediaTypes: {
+        video: {}
+      },
+      video: {
+        divId: 'player', // required to indicate which player is being used to render this ad unit.
+      },
+
+      bids: [{
+        bidder: 'ix',
+        params: {
+          siteId: '300',
+        }
+      }]
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function () {
+      pbjs.setConfig({
+        video: {
+          providers: [{
+            divId: 'player',
+            vendorCode: 2, // videojs vendorCode
+            playerConfig: {
+              params: {
+                adPluginConfig: {
+                  numRedirects: 10
+                },
+                vendorConfig: {
+                  controls: true,
+                  autoplay: false,
+                  preload: "auto",
+                }
+              }
+            }
+          },]
+        },
+        debugging: {
+          enabled: true,
+          intercept: [
+            {
+              when: {
+                adUnitCode: 'div-gpt-ad-51545-0',
+              },
+              then: {
+                cpm: 25,
+                mediaType: "video",
+                vastUrl: "https://pubads.g.doubleclick.net/gampad/ads?iu=/21775744923/external/single_ad_samples&sz=640x480&cust_params=sample_ct%3Dlinear&ciu_szs=300x250%2C728x90&gdfp_req=1&output=vast&unviewed_position_start=1&env=vp&impl=s&correlator=",
+                // vastXml: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>",
+                ad: "<VAST version=\"3.0\"> <Ad id=\"123\"> <InLine> <AdSystem>PubMatic</AdSystem> <AdTitle>VAST 2.0 Instream Test</AdTitle> <Description>VAST 2.0 Instream Test</Description> <Error> <![CDATA[https://aktrack.pubmatic.com/er=[ERRORCODE]]]> </Error> <Impression> <![CDATA[https://aktrack.pubmatic.com?e=impression]]> </Impression> <Creatives> <Creative AdID=\"123\"> <Linear> <Duration>00:00:30</Duration> <TrackingEvents> <Tracking event=\"creativeView\"> <![CDATA[https://aktrack.pubmatic.com?e=creativeView]]> </Tracking> <Tracking event=\"start\"> <![CDATA[https://aktrack.pubmatic.com?e=start]]> </Tracking> <Tracking event=\"midpoint\"> <![CDATA[https://aktrack.pubmatic.com?e=midpoint]]> </Tracking> <Tracking event=\"firstQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=firstQuartile]]> </Tracking> <Tracking event=\"thirdQuartile\"> <![CDATA[https://aktrack.pubmatic.com?e=thirdQuartile]]> </Tracking> <Tracking event=\"complete\"> <![CDATA[https://aktrack.pubmatic.com?e=complete]]> </Tracking> </TrackingEvents> <VideoClicks> <ClickThrough> <![CDATA[https://www.pubmatic.com]]> </ClickThrough> </VideoClicks> <MediaFiles> <MediaFile delivery=\"progressive\" type=\"video/mp4\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.mp4]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/ogg\" bitrate=\"500\" width=\"480\" height=\"460\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/spinning-logo-480x360_video.ogg]]> </MediaFile> <MediaFile delivery=\"progressive\" type=\"video/x-flv\" bitrate=\"500\" width=\"400\" height=\"300\" scalable=\"true\" maintainAspectRatio=\"true\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_test_video.flv]]> </MediaFile> </MediaFiles> </Linear> </Creative> <Creative AdID=\"123\"> <NonLinearAds> <TrackingEvents></TrackingEvents> <NonLinear height=\"50\" width=\"300\" minSuggestedDuration=\"00:00:05\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_300x50.jpeg]]> </StaticResource> <NonLinearClickThrough> <![CDATA[https://www.pubmatic.com]]> </NonLinearClickThrough> </NonLinear> </NonLinearAds> </Creative> <Creative AdID=\"123\"> <CompanionAds> <Companion width=\"300\" height=\"250\"> <StaticResource creativeType=\"image/jpeg\"> <![CDATA[https://staging.pubmatic.com:8443/test/PubMatic_LetsBeClear_320x250.jpg]]> </StaticResource> <CompanionClickThrough> <![CDATA[https://www.pubmatic.com]]> </CompanionClickThrough> </Companion> </CompanionAds> </Creative> </Creatives> </InLine> </Ad> </VAST>"
+              }
+            },
+          ]
+        }
+      });
+      pbjs.addAdUnits(adUnits);
+
+      pbjs.onEvent('videoSetupComplete', e => {
+        const player = videojs('player');
+        // Load the playlist items with their metadata when the video player is done instantiating.
+        player.playlist([{
+          sources: [{
+            id: 'XYXYXYXY',
+            src: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/SubaruOutbackOnStreetAndDirt.mp4',
+            title: 'Subaru Outback On Street And Dirt',
+            description: 'Smoking Tire takes the all-new Subaru Outback to the highest point we can find in hopes our customer-appreciation Balloon Launch will get some free T-shirts into the hands of our viewers.',
+            type: 'video/mp4'
+          }]
+        }, {
+          sources: [{
+            id: 'ZAZAZAZA',
+            src : "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
+            title : "Big Buck Bunny",
+            description : "Big Buck Bunny tells the story of a giant rabbit with a heart bigger than himself. When one sunny day three rodents rudely harass him, something snaps... and the rabbit ain't no bunny anymore! In the typical cartoon tradition he prepares the nasty rodents a comical revenge.\n\nLicensed under the Creative Commons Attribution license\nhttp://www.bigbuckbunny.org",
+            type: 'video/mp4'
+          }]
+        }, {
+          sources: [{
+            id: 'WSWSWSWS',
+            src: "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/Sintel.mp4",
+            title : "Sintel",
+            description: "Sintel is an independently produced short film, initiated by the Blender Foundation as a means to further improve and validate the free/open source 3D creation suite Blender. With initial funding provided by 1000s of donations via the internet community, it has again proven to be a viable development model for both open 3D technology as for independent animation film.\nThis 15 minute film has been realized in the studio of the Amsterdam Blender Institute, by an international team of artists and developers. In addition to that, several crucial technical and creative targets have been realized online, by developers and artists and teams all over the world.\nwww.sintel.org",
+            type: 'video/mp4'
+          }]
+        }]);
+
+        player.playlist.autoadvance(0);
+      });
+
+      pbjs.onEvent('videoSetupFailed', e => {
+        console.log('player setup failed: ', e);
+      });
+
+      pbjs.onEvent('videoPlaylist', (e) => {
+        console.log('videos pb playlist: ', e);
+      });
+
+      // request a bid when media is loaded
+      pbjs.onEvent('videoContentLoaded', (e) => {
+        console.log('videos pb contentLoaded: ', e);
+        pbjs.requestBids(adUnits);
+      });
+
+      pbjs.onEvent('videoComplete', (e) => {
+        console.log('videos pb complete: ', e);
+      });
+    });
+  </script>
+
+</head>
+
+<body>
+<h2>VideoJS with Playlist</h2>
+
+<h5>Div-1: Player placeholder div</h5>
+<video-js id='player' class="vjs-big-play-centered">
+</video-js>
+</body>
+
+</html>
diff --git a/libraries/video/constants/enums.js b/libraries/video/constants/enums.js
new file mode 100644
index 00000000000..b0755020580
--- /dev/null
+++ b/libraries/video/constants/enums.js
@@ -0,0 +1,5 @@
+export const PLAYBACK_MODE = {
+  VOD: 0,
+  LIVE: 1,
+  DVR: 2
+};
diff --git a/libraries/video/constants/events.js b/libraries/video/constants/events.js
new file mode 100644
index 00000000000..5be594b1b48
--- /dev/null
+++ b/libraries/video/constants/events.js
@@ -0,0 +1,97 @@
+// Life Cycle
+export const SETUP_COMPLETE = 'setupComplete';
+export const SETUP_FAILED = 'setupFailed';
+export const DESTROYED = 'destroyed';
+
+// Ads
+export const AD_REQUEST = 'adRequest';
+export const AD_BREAK_START = 'adBreakStart';
+export const AD_LOADED = 'adLoaded';
+export const AD_STARTED = 'adStarted';
+export const AD_IMPRESSION = 'adImpression';
+export const AD_PLAY = 'adPlay';
+export const AD_TIME = 'adTime';
+export const AD_PAUSE = 'adPause';
+export const AD_CLICK = 'adClick';
+export const AD_SKIPPED = 'adSkipped';
+export const AD_ERROR = 'adError';
+export const AD_COMPLETE = 'adComplete';
+export const AD_BREAK_END = 'adBreakEnd';
+
+// Media
+export const PLAYLIST = 'playlist';
+export const PLAYBACK_REQUEST = 'playbackRequest';
+export const AUTOSTART_BLOCKED = 'autostartBlocked';
+export const PLAY_ATTEMPT_FAILED = 'playAttemptFailed';
+export const CONTENT_LOADED = 'contentLoaded';
+export const PLAY = 'play';
+export const PAUSE = 'pause';
+export const BUFFER = 'buffer';
+export const TIME = 'time';
+export const SEEK_START = 'seekStart';
+export const SEEK_END = 'seekEnd';
+export const MUTE = 'mute';
+export const VOLUME = 'volume';
+export const RENDITION_UPDATE = 'renditionUpdate';
+export const ERROR = 'error';
+export const COMPLETE = 'complete';
+export const PLAYLIST_COMPLETE = 'playlistComplete';
+
+// Layout
+export const FULLSCREEN = 'fullscreen';
+export const PLAYER_RESIZE = 'playerResize';
+export const VIEWABLE = 'viewable';
+export const CAST = 'cast';
+
+export const allVideoEvents = [
+  SETUP_COMPLETE, SETUP_FAILED, DESTROYED, AD_REQUEST, AD_BREAK_START, AD_LOADED, AD_STARTED,
+  AD_IMPRESSION, AD_PLAY, AD_TIME, AD_PAUSE, AD_CLICK, AD_SKIPPED, AD_ERROR, AD_COMPLETE, AD_BREAK_END, PLAYLIST,
+  PLAYBACK_REQUEST, AUTOSTART_BLOCKED, PLAY_ATTEMPT_FAILED, CONTENT_LOADED, PLAY, PAUSE, BUFFER, TIME, SEEK_START,
+  SEEK_END, MUTE, VOLUME, RENDITION_UPDATE, ERROR, COMPLETE, PLAYLIST_COMPLETE, FULLSCREEN, PLAYER_RESIZE, VIEWABLE,
+  CAST
+];
+
+export const AUCTION_AD_LOAD_ATTEMPT = 'auctionAdLoadAttempt';
+export const AUCTION_AD_LOAD_ABORT = 'auctionAdLoadAbort';
+export const BID_IMPRESSION = 'bidImpression';
+export const BID_ERROR = 'bidError';
+
+export const videoEvents = {
+  SETUP_COMPLETE,
+  SETUP_FAILED,
+  DESTROYED,
+  AD_REQUEST,
+  AD_BREAK_START,
+  AD_LOADED,
+  AD_STARTED,
+  AD_IMPRESSION,
+  AD_PLAY,
+  AD_TIME,
+  AD_PAUSE,
+  AD_CLICK,
+  AD_SKIPPED,
+  AD_ERROR,
+  AD_COMPLETE,
+  AD_BREAK_END,
+  PLAYLIST,
+  PLAYBACK_REQUEST,
+  AUTOSTART_BLOCKED,
+  PLAY_ATTEMPT_FAILED,
+  CONTENT_LOADED,
+  PLAY,
+  PAUSE,
+  BUFFER,
+  TIME,
+  SEEK_START,
+  SEEK_END,
+  MUTE,
+  VOLUME,
+  RENDITION_UPDATE,
+  ERROR,
+  COMPLETE,
+  PLAYLIST_COMPLETE,
+  FULLSCREEN,
+  PLAYER_RESIZE,
+  VIEWABLE,
+  CAST,
+};
diff --git a/libraries/video/constants/ortb.js b/libraries/video/constants/ortb.js
new file mode 100644
index 00000000000..d67c8a5f393
--- /dev/null
+++ b/libraries/video/constants/ortb.js
@@ -0,0 +1,169 @@
+/**
+ * @typedef {Object} OrtbParams
+ * @property {OrtbVideoParamst} video
+ * @property {OrtbContentParams} content
+ */
+
+/**
+ * @typedef OrtbVideoParams
+ * @property {[string]} mimes - Content MIME types supported (e.g., “video/x-ms-wmv”, “video/mp4”).
+ * @property {number|undefined} minduration - Minimum video ad duration in seconds.
+ * @property {number|undefined} maxduration - Maximum video ad duration in seconds.
+ * @property {[number]} protocols - Supported video protocols. At least one supported protocol must be specified.
+ * @property {number} w - Width of the video player in device independent pixels (DIPS).
+ * @property {number} h - Height of the video player in device independent pixels (DIPS).
+ * @property {number|undefined} startdelay - Indicates the offset of the ad placement.
+ * @property {number|undefined} placement - Placement type for the impression.
+ * @property {number|undefined} linearity - Indicates if the impression must be linear, nonlinear, etc. If omitted, assume all are allowed.
+ * @property {number} skip - Indicates if the player can allow the video to be skipped, where 0 is no, 1 is yes.
+ * @property {number|undefined} skipmin - Only ad creatives with a duration greater than this value can be skippable; only applicable if the ad is skippable.
+ * @property {number|undefined} skipafter - Number of seconds a video must play before skipping is enabled; only applicable if the ad is skippable.
+ * @property {number|undefined} sequence - If multiple ad impressions are offered in the same bid request, the sequence number will allow for the coordinated delivery of multiple creatives.
+ * @property {[number]|undefined} battr - Blocked creative attributes. Use this to indicate which creatives the player does not support.
+ * @property {number|undefined} maxextended - Maximum extended ad duration if extension is allowed.
+ * @property {number|undefined} minbitrate - Minimum bit rate in Kbps supported by the player.
+ * @property {number|undefined} maxbitrate - Maximum bit rate in Kbps supported by the player.
+ * @property {number|undefined} boxingallowed - Indicates if letter-boxing of 4:3 content into a 16:9 window is allowed. 0 is no, 1 is yes.
+ * @property {[number]|undefined} playbackmethod - Playback methods that may be in use.
+ * @property {number|undefined} playbackend - The scenario that causes playback to end.
+ * @property {[number]|undefined} delivery - Supported delivery methods (e.g., streaming, progressive).
+ * @property {number|undefined} pos - Ad position on screen.
+ * @property {[Object]|undefined} companionad - list of companion ads. Refer to Section 3.2.6 of the oRTB v2.5 spec for the interface of the companion ad object.
+ * @property {[number]|undefined} api - List of supported API frameworks for this impression.
+ * @property {[number]|undefined} companiontype - Supported VAST companion ad types. Refer to List 5.14 of the oRTB v2.5 spec for the interface.
+ * @property {Object|undefined} ext - Placeholder for exchange-specific extensions to OpenRTB.
+ */
+
+/**
+ * @typedef OrtbContentParams
+ * @property {string} id - ID uniquely identifying the content.
+ * @property {string} url - URL of the content, for buy-side contextualization or review.
+ * @property {number|undefined} episode - Episode number.
+ * @property {string|undefined} title - Content title.
+ * @property {string|undefined} series - Content series i.e. “The Office” (television), “Star Wars” (movie).
+ * @property {string|undefined} season - Content season (e.g., “Season 3”).
+ * @property {string|undefined} artist - Artist credited with the content.
+ * @property {string|undefined} genre - Genre that best describes the content (e.g., rock, pop, etc).
+ * @property {string|undefined} album - Album to which the content belongs. Typically for audio.
+ * @property {string|undefined} isrc - International Standard Recording Code conforming to ISO3901.
+ * @property {Object|undefined} producer - Details about the content Producer. For Producer interface visit Section 3.2.17 of the oRTB v2.5 spec.
+ * @property {[string]|undefined} cat - List of IAB content categories that describe the content. Refer to List 5.1. of the oRTB v2.5 spec for the complete list.
+ * @property {number|undefined} prodq - Production quality. Refer to List 5.13 of the oRTB v2.5 spec.
+ * @property {number|undefined} context - Type of content (game, video, text, etc.). Refer to List 5.18 of the oRTB v2.5 spec.
+ * @property {string|undefined} contentrating - Content rating (e.g., MPAA).
+ * @property {string|undefined} userrating - User rating of the content (e.g., number of stars, likes, etc.).
+ * @property {number|undefined} qagmediarating - Media rating per IQG guidelines. Refer to List 5.19 of the oRTB v2.5 spec.
+ * @property {string|undefined} keywords - Comma separated list of keywords describing the content.
+ * @property {number|undefined} livestream - Whether the stream is live or not. 0 means not live (VOD), 1 means content is live streaming.
+ * @property {number|undefined} sourcerelationship - 0 means indirect, 1 means direct.
+ * @property {number} len - Duration of content in seconds.
+ * @property {string|undefined} language - Content language using ISO-639-1-alpha-2.
+ * @property {number|undefined} embeddable - Indicator of whether or not the content is embeddable (e.g., an embeddable video player). 0 means no, 1 means yes.
+ * @property {[Object]|undefined} data - Additional content data. Each Data object represents a different data source. See Section 3.2.21 of the oRTB v2.5 spec.
+ * @property {Object|undefined} ext - Placeholder for exchange-specific extensions to OpenRTB.
+ */
+
+const VIDEO_PREFIX = 'video/';
+const APPLICATION_PREFIX = 'application/';
+
+/**
+ * ORTB 2.5 section 3.2.7 - Video.mimes
+ * @enum OrtbVideoParams.mimes
+ */
+export const VIDEO_MIME_TYPE = {
+  MP4: VIDEO_PREFIX + 'mp4',
+  MPEG: VIDEO_PREFIX + 'mpeg',
+  OGG: VIDEO_PREFIX + 'ogg',
+  WEBM: VIDEO_PREFIX + 'webm',
+  AAC: VIDEO_PREFIX + 'aac',
+  HLS: APPLICATION_PREFIX + 'vnd.apple.mpegurl'
+};
+
+export const JS_APP_MIME_TYPE = APPLICATION_PREFIX + 'javascript';
+export const VPAID_MIME_TYPE = JS_APP_MIME_TYPE;
+
+/**
+ * ORTB 2.5 section 5.9 - Video Placement Types
+ * @enum OrtbVideoParams.placement
+ */
+export const PLACEMENT = {
+  INSTREAM: 1,
+  BANNER: 2,
+  ARTICLE: 3,
+  FEED: 4,
+  INTERSTITIAL: 5,
+  SLIDER: 5,
+  FLOATING: 5,
+  INTERSTITIAL_SLIDER_FLOATING: 5
+};
+
+/**
+ * ORTB 2.5 section 5.4 - Ad Position
+ * @enum OrtbVideoParams.pos
+ */
+export const AD_POSITION = {
+  UNKNOWN: 0,
+  ABOVE_THE_FOLD: 1,
+  BELOW_THE_FOLD: 3,
+  HEADER: 4,
+  FOOTER: 5,
+  SIDEBAR: 6,
+  FULL_SCREEN: 7
+}
+
+/**
+ * ORTB 2.5 section 5.11 - Playback Cessation Modes
+ * @enum OrtbVideoParams.playbackend
+ */
+export const PLAYBACK_END = {
+  VIDEO_COMPLETION: 1,
+  VIEWPORT_LEAVE: 2,
+  FLOATING: 3
+}
+
+/**
+ * ORTB 2.5 section 5.10 - Playback Methods
+ * @enum OrtbVideoParams.playbackmethod
+ */
+export const PLAYBACK_METHODS = {
+  AUTOPLAY: 1,
+  AUTOPLAY_MUTED: 2,
+  CLICK_TO_PLAY: 3,
+  CLICK_TO_PLAY_MUTED: 4,
+  VIEWABLE: 5,
+  VIEWABLE_MUTED: 6
+};
+
+/**
+ * ORTB 2.5 section 5.8 - Protocols
+ * @enum OrtbVideoParams.protocols
+ */
+export const PROTOCOLS = {
+  // VAST_1_0: 1,
+  VAST_2_0: 2,
+  VAST_3_0: 3,
+  // VAST_1_O_WRAPPER: 4,
+  VAST_2_0_WRAPPER: 5,
+  VAST_3_0_WRAPPER: 6,
+  VAST_4_0: 7,
+  VAST_4_0_WRAPPER: 8
+};
+
+/**
+ * ORTB 2.5 section 5.6 - API Frameworks
+ * @enum OrtbVideoParams.api
+ */
+export const API_FRAMEWORKS = {
+  VPAID_1_0: 1,
+  VPAID_2_0: 2,
+  OMID_1_0: 7
+};
+
+/**
+ * ORTB 2.5 section 5.18 - Content Context
+ * @enum OrtbContentParams.context
+ */
+export const CONTEXT = {
+  VIDEO: 1,
+  AUDIO: 3
+};
diff --git a/libraries/video/constants/vendorCodes.js b/libraries/video/constants/vendorCodes.js
new file mode 100644
index 00000000000..370c151b997
--- /dev/null
+++ b/libraries/video/constants/vendorCodes.js
@@ -0,0 +1,6 @@
+// Video Vendors
+export const JWPLAYER_VENDOR = 1;
+export const VIDEO_JS_VENDOR = 2;
+
+// Ad Server Vendors
+export const GAM_VENDOR = 'gam';
diff --git a/libraries/video/shared/eventHandler.js b/libraries/video/shared/eventHandler.js
new file mode 100644
index 00000000000..ee0d6b2cbfb
--- /dev/null
+++ b/libraries/video/shared/eventHandler.js
@@ -0,0 +1,18 @@
+/**
+ * Builds a standard event handler
+ * @param {String} type Event name
+ * @param {(function(String, Object): Object)} callback Callback defined by publisher to be executed when the event occurs
+ * @param {Object} payload Base payload defined when the event is registered
+ * @param {(function(*): Object)|null|undefined} getExtraPayload Parses the player's event payload to return a normalized payload
+ * @returns {(function(*): void)|*} event handler
+ */
+export function getEventHandler(type, callback, payload, getExtraPayload) {
+  return event => {
+    if (getExtraPayload) {
+      const extraPayload = getExtraPayload(event);
+      Object.assign(payload, extraPayload);
+    }
+
+    callback(type, payload);
+  };
+}
diff --git a/libraries/video/shared/parentModule.js b/libraries/video/shared/parentModule.js
new file mode 100644
index 00000000000..e96113fd894
--- /dev/null
+++ b/libraries/video/shared/parentModule.js
@@ -0,0 +1,82 @@
+/**
+ * @typedef {Object} ParentModule
+ * @summary abstraction for any module to store and reference its submodules
+ * @param {SubmoduleBuilder} submoduleBuilder_
+ * @returns {ParentModule}
+ * @constructor
+ */
+export function ParentModule(submoduleBuilder_) {
+  const submoduleBuilder = submoduleBuilder_;
+  const submodules = {};
+
+  /**
+   * @function ParentModule#registerSubmodule
+   * @summary Stores a submodule
+   * @param {String} id - unique identifier of the submodule instance
+   * @param {String} vendorCode - identifier to the submodule type that must be built
+   * @param {Object} config - additional information necessary to instantiate the submodule
+   */
+  function registerSubmodule(id, vendorCode, config) {
+    if (submodules[id]) {
+      return;
+    }
+
+    let submodule;
+    try {
+      submodule = submoduleBuilder.build(vendorCode, config);
+    } catch (e) {
+      throw e;
+    }
+    submodules[id] = submodule;
+  }
+
+  /**
+   * @function ParentModule#getSubmodule
+   * @summary Stores a submodule
+   * @param {String} id - unique identifier of the submodule instance
+   * @returns {Object} - a submodule instance
+   */
+  function getSubmodule(id) {
+    return submodules[id];
+  }
+
+  return {
+    registerSubmodule,
+    getSubmodule
+  }
+}
+
+/**
+ * @typedef {Object} SubmoduleBuilder
+ * @summary Instantiates submodules
+ * @param {vendorSubmoduleDirectory} submoduleDirectory_
+ * @param {Object|null|undefined} sharedUtils_
+ * @returns {SubmoduleBuilder}
+ * @constructor
+ */
+export function SubmoduleBuilder(submoduleDirectory_, sharedUtils_) {
+  const submoduleDirectory = submoduleDirectory_;
+  const sharedUtils = sharedUtils_;
+
+  /**
+   * @function SubmoduleBuilder#build
+   * @param vendorCode - identifier to the submodule type that must be instantiated
+   * @param config - additional information necessary to instantiate the submodule
+   * @throws
+   * @returns {{init}|*} - a submodule instance
+   */
+  function build(vendorCode, config) {
+    const submoduleFactory = submoduleDirectory[vendorCode];
+    if (!submoduleFactory) {
+      throw new Error('Unrecognized submodule vendor code: ' + vendorCode);
+    }
+
+    const submodule = submoduleFactory(config, sharedUtils);
+    submodule && submodule.init && submodule.init();
+    return submodule;
+  }
+
+  return {
+    build
+  };
+}
diff --git a/libraries/video/shared/state.js b/libraries/video/shared/state.js
new file mode 100644
index 00000000000..b84cff8f997
--- /dev/null
+++ b/libraries/video/shared/state.js
@@ -0,0 +1,47 @@
+/**
+ * @typedef {Object} State
+ * @summary simple state object. Can be subclassed
+ * @function updateState
+ * @function getState
+ * @function clearState
+ */
+
+/**
+ * @summary factory to create a simple state object
+ * @returns {State}
+ */
+export default function stateFactory() {
+  let state = {};
+
+  /**
+   * @function State#updateState
+   * @summary updates the state
+   * @param {Object} stateUpdate
+   */
+  function updateState(stateUpdate) {
+    Object.assign(state, stateUpdate);
+  }
+
+  /**
+   * @function State#getState
+   * @summary provides the current state
+   * @returns {Object} the current state
+   */
+  function getState() {
+    return state;
+  }
+
+  /**
+   * @function State#clearState
+   * @summary erases the current state
+   */
+  function clearState() {
+    state = {};
+  }
+
+  return {
+    updateState,
+    getState,
+    clearState
+  };
+}
diff --git a/libraries/video/shared/vastXmlBuilder.js b/libraries/video/shared/vastXmlBuilder.js
new file mode 100644
index 00000000000..35547acc479
--- /dev/null
+++ b/libraries/video/shared/vastXmlBuilder.js
@@ -0,0 +1,77 @@
+import { getGlobal } from '../../../src/prebidGlobal.js';
+
+export function buildVastWrapper(adId, adTagUrl, impressionUrl, impressionId, errorUrl) {
+  let wrapperBody = getAdSystemNode('Prebid org', getGlobal().version);
+
+  if (adTagUrl) {
+    wrapperBody += getAdTagUriNode(adTagUrl);
+  }
+
+  if (impressionUrl) {
+    wrapperBody += getImpressionNode(impressionUrl, impressionId);
+  }
+
+  if (errorUrl) {
+    wrapperBody += getErrorNode(errorUrl);
+  }
+
+  return getVastNode(getAdNode(getWrapperNode(wrapperBody), adId), '4.2');
+}
+
+export function getVastNode(body, vastVersion) {
+  return getNode('VAST', body, { version: vastVersion });
+}
+
+export function getAdNode(body, adId) {
+  return getNode('Ad', body, { id: adId });
+}
+
+export function getWrapperNode(body) {
+  return getNode('Wrapper', body);
+}
+
+export function getAdSystemNode(system, version) {
+  return getNode('AdSystem', system, { version });
+}
+
+export function getAdTagUriNode(adTagUrl) {
+  return getUrlNode('VASTAdTagURI', adTagUrl);
+}
+
+export function getImpressionNode(pingUrl, id) {
+  return getUrlNode('Impression', pingUrl, { id });
+}
+
+export function getErrorNode(pingUrl) {
+  return getUrlNode('Error', pingUrl);
+}
+
+// Helpers
+
+function getUrlNode(labelName, url, attributes) {
+  const body = `<![CDATA[${url}]]>`;
+  return getNode(labelName, body, attributes);
+}
+
+function getNode(labelName, body, attributes) {
+  const openingLabel = getOpeningLabel(labelName, attributes);
+  return `<${openingLabel}>${body}</${labelName}>`;
+}
+
+/*
+attributes is a KVP Object.
+ */
+function getOpeningLabel(name, attributes) {
+  if (!attributes) {
+    return name;
+  }
+
+  return Object.keys(attributes).reduce((label, key) => {
+    const value = attributes[key];
+    if (!value) {
+      return label;
+    }
+
+    return label + ` ${key}="${value}"`;
+  }, name);
+}
diff --git a/libraries/video/shared/vastXmlEditor.js b/libraries/video/shared/vastXmlEditor.js
new file mode 100644
index 00000000000..b586e5b4c29
--- /dev/null
+++ b/libraries/video/shared/vastXmlEditor.js
@@ -0,0 +1,115 @@
+import { getErrorNode, getImpressionNode, buildVastWrapper } from './vastXmlBuilder.js';
+
+export const XML_MIME_TYPE = 'application/xml';
+
+export function VastXmlEditor(xmlUtil_) {
+  const xmlUtil = xmlUtil_;
+
+  function getVastXmlWithTracking(vastXml, adId, impressionUrl, impressionId, errorUrl) {
+    const impressionDoc = getImpressionDoc(impressionUrl, impressionId);
+    const errorDoc = getErrorDoc(errorUrl);
+    if (!adId && !impressionDoc && !errorDoc) {
+      return vastXml;
+    }
+
+    const vastXmlDoc = xmlUtil.parse(vastXml);
+    appendTrackingNodes(vastXmlDoc, impressionDoc, errorDoc);
+    replaceAdId(vastXmlDoc, adId);
+    return xmlUtil.serialize(vastXmlDoc);
+  }
+
+  function appendTrackingNodes(vastXmlDoc, impressionDoc, errorDoc) {
+    const nodes = vastXmlDoc.querySelectorAll('InLine,Wrapper');
+    const nodeCount = nodes.length;
+    for (let i = 0; i < nodeCount; i++) {
+      const node = nodes[i];
+      // A copy of the child is required until we reach the last node.
+      const requiresCopy = i < nodeCount - 1;
+      appendChild(node, impressionDoc, requiresCopy);
+      appendChild(node, errorDoc, requiresCopy);
+    }
+  }
+
+  function replaceAdId(vastXmlDoc, adId) {
+    if (!adId) {
+      return;
+    }
+
+    const adNode = vastXmlDoc.querySelector('Ad');
+    if (!adNode) {
+      return;
+    }
+
+    adNode.id = adId;
+  }
+
+  return {
+    getVastXmlWithTracking,
+    buildVastWrapper
+  }
+
+  function getImpressionDoc(impressionUrl, impressionId) {
+    if (!impressionUrl) {
+      return;
+    }
+
+    const impressionNode = getImpressionNode(impressionUrl, impressionId);
+    return xmlUtil.parse(impressionNode);
+  }
+
+  function getErrorDoc(errorUrl) {
+    if (!errorUrl) {
+      return;
+    }
+
+    const errorNode = getErrorNode(errorUrl);
+    return xmlUtil.parse(errorNode);
+  }
+
+  function appendChild(node, child, copy) {
+    if (!child) {
+      return;
+    }
+
+    const doc = copy ? child.cloneNode(true) : child;
+    node.appendChild(doc.documentElement);
+  }
+}
+
+function XMLUtil() {
+  let parser;
+  let serializer;
+
+  function getParser() {
+    if (!parser) {
+      // DOMParser instantiation is costly; instantiate only once throughout Prebid lifecycle.
+      parser = new DOMParser();
+    }
+    return parser;
+  }
+
+  function getSerializer() {
+    if (!serializer) {
+      // XMLSerializer instantiation is costly; instantiate only once throughout Prebid lifecycle.
+      serializer = new XMLSerializer();
+    }
+    return serializer;
+  }
+
+  function parse(xmlString) {
+    return getParser().parseFromString(xmlString, XML_MIME_TYPE);
+  }
+
+  function serialize(xmlDoc) {
+    return getSerializer().serializeToString(xmlDoc);
+  }
+
+  return {
+    parse,
+    serialize
+  };
+}
+
+export function vastXmlEditorFactory() {
+  return VastXmlEditor(XMLUtil());
+}
diff --git a/modules/.submodules.json b/modules/.submodules.json
index bd00333a1d9..e4678a86b71 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -75,6 +75,10 @@
       "enrichmentFpdModule",
       "validationFpdModule",
       "topicsFpdModule"
+    ],
+    "videoModule": [
+      "jwplayerVideoProvider",
+      "videojsVideoProvider"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index cabbb448960..77ffe0f6b94 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -43,7 +43,7 @@ const URL = 'https://ib.adnxs.com/ut/v3/prebid';
 const URL_SIMPLE = 'https://ib.adnxs-simple.com/ut/v3/prebid';
 const VIDEO_TARGETING = ['id', 'minduration', 'maxduration',
   'skippable', 'playback_method', 'frameworks', 'context', 'skipoffset'];
-const VIDEO_RTB_TARGETING = ['minduration', 'maxduration', 'skip', 'skipafter', 'playbackmethod', 'api'];
+const VIDEO_RTB_TARGETING = ['minduration', 'maxduration', 'skip', 'skipafter', 'playbackmethod', 'api', 'startdelay'];
 const USER_PARAMS = ['age', 'externalUid', 'segments', 'gender', 'dnt', 'language'];
 const APP_DEVICE_PARAMS = ['geo', 'device_id']; // appid is collected separately
 const DEBUG_PARAMS = ['enabled', 'dongle', 'member_id', 'debug_timeout'];
@@ -920,6 +920,17 @@ function bidToTag(bid) {
               tag['video_frameworks'] = apiTmp;
             }
             break;
+
+          case 'startdelay':
+          case 'placement':
+            const contextKey = 'context';
+            if (typeof tag.video[contextKey] !== 'number') {
+              const placement = videoMediaType['placement'];
+              const startdelay = videoMediaType['startdelay'];
+              const context = getContextFromPlacement(placement) || getContextFromStartDelay(startdelay);
+              tag.video[contextKey] = VIDEO_MAPPING[contextKey][context];
+            }
+            break;
         }
       });
   }
@@ -967,6 +978,32 @@ function transformSizes(requestSizes) {
   return sizes;
 }
 
+function getContextFromPlacement(ortbPlacement) {
+  if (!ortbPlacement) {
+    return;
+  }
+
+  if (ortbPlacement === 2) {
+    return 'in-banner';
+  } else if (ortbPlacement > 2) {
+    return 'outstream';
+  }
+}
+
+function getContextFromStartDelay(ortbStartDelay) {
+  if (!ortbStartDelay) {
+    return;
+  }
+
+  if (ortbStartDelay === 0) {
+    return 'pre_roll';
+  } else if (ortbStartDelay === -1) {
+    return 'mid_roll';
+  } else if (ortbStartDelay === -2) {
+    return 'post_roll';
+  }
+}
+
 function hasUserInfo(bid) {
   return !!bid.params.user;
 }
diff --git a/modules/gridNMBidAdapter.js b/modules/gridNMBidAdapter.js
index bfe5f3952bc..6f8eaba43d3 100644
--- a/modules/gridNMBidAdapter.js
+++ b/modules/gridNMBidAdapter.js
@@ -34,8 +34,6 @@ const LOG_ERROR_MESS = {
   hasNoArrayOfBids: 'Seatbid from response has no array of bid objects - '
 };
 
-const VIDEO_KEYS = ['mimes', 'protocols', 'startdelay', 'placement', 'linearity', 'skip', 'skipmin', 'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate', 'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend', 'delivery', 'pos', 'companionad', 'api', 'companiontype'];
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [ VIDEO ],
@@ -105,7 +103,7 @@ export const spec = {
       const impObj = {
         id: bidId.toString(),
         tagid: secid.toString(),
-        video: createVideoForImp(video, sizes, mediaTypes && mediaTypes.video),
+        video: createVideoForImp(mergeDeep({}, video, mediaTypes && mediaTypes.video), sizes),
         ext: {
           divid: adUnitCode.toString()
         }
@@ -386,13 +384,7 @@ function createRenderer (bid, rendererParams) {
   return renderer;
 }
 
-function createVideoForImp({ mind, maxd, size, ...paramsVideo }, bidSizes, bidVideo = {}) {
-  VIDEO_KEYS.forEach((key) => {
-    if (!(key in paramsVideo) && key in bidVideo) {
-      paramsVideo[key] = bidVideo[key];
-    }
-  });
-
+function createVideoForImp({ mind, maxd, size, ...paramsVideo }, bidSizes) {
   if (size && isStr(size)) {
     const sizeArray = size.split('x');
     if (sizeArray.length === 2 && parseInt(sizeArray[0]) && parseInt(sizeArray[1])) {
@@ -402,7 +394,7 @@ function createVideoForImp({ mind, maxd, size, ...paramsVideo }, bidSizes, bidVi
   }
 
   if (!paramsVideo.w || !paramsVideo.h) {
-    const playerSizes = bidVideo.playerSize && bidVideo.playerSize.length === 2 ? bidVideo.playerSize : bidSizes;
+    const playerSizes = paramsVideo.playerSize && paramsVideo.playerSize.length === 2 ? paramsVideo.playerSize : bidSizes;
     if (playerSizes) {
       const playerSize = playerSizes[0];
       if (playerSize) {
@@ -411,9 +403,13 @@ function createVideoForImp({ mind, maxd, size, ...paramsVideo }, bidSizes, bidVi
     }
   }
 
-  const durationRangeSec = bidVideo.durationRangeSec || [];
-  const minDur = mind || durationRangeSec[0] || bidVideo.minduration;
-  const maxDur = maxd || durationRangeSec[1] || bidVideo.maxduration;
+  if (paramsVideo.playerSize) {
+    delete paramsVideo.playerSize;
+  }
+
+  const durationRangeSec = paramsVideo.durationRangeSec || [];
+  const minDur = mind || durationRangeSec[0] || paramsVideo.minduration;
+  const maxDur = maxd || durationRangeSec[1] || paramsVideo.maxduration;
 
   if (minDur) {
     paramsVideo.minduration = minDur;
diff --git a/modules/jwplayerVideoProvider.js b/modules/jwplayerVideoProvider.js
new file mode 100644
index 00000000000..d606e8121a7
--- /dev/null
+++ b/modules/jwplayerVideoProvider.js
@@ -0,0 +1,929 @@
+import {
+  PROTOCOLS, API_FRAMEWORKS, VIDEO_MIME_TYPE, PLAYBACK_METHODS, PLACEMENT, VPAID_MIME_TYPE, AD_POSITION
+} from '../libraries/video/constants/ortb.js';
+import {
+  SETUP_COMPLETE, SETUP_FAILED, DESTROYED, AD_REQUEST, AD_BREAK_START, AD_LOADED, AD_STARTED, AD_IMPRESSION, AD_PLAY,
+  AD_TIME, AD_PAUSE, AD_CLICK, AD_SKIPPED, AD_ERROR, AD_COMPLETE, AD_BREAK_END, PLAYLIST, PLAYBACK_REQUEST,
+  AUTOSTART_BLOCKED, PLAY_ATTEMPT_FAILED, CONTENT_LOADED, PLAY, PAUSE, BUFFER, TIME, SEEK_START, SEEK_END, MUTE, VOLUME,
+  RENDITION_UPDATE, ERROR, COMPLETE, PLAYLIST_COMPLETE, FULLSCREEN, PLAYER_RESIZE, VIEWABLE, CAST
+} from '../libraries/video/constants/events.js';
+import { PLAYBACK_MODE } from '../libraries/video/constants/enums.js';
+import stateFactory from '../libraries/video/shared/state.js';
+import { JWPLAYER_VENDOR } from '../libraries/video/constants/vendorCodes.js';
+import { getEventHandler } from '../libraries/video/shared/eventHandler.js';
+import { submodule } from '../src/hook.js';
+
+/**
+ * @constructor
+ * @param {videoProviderConfig} config
+ * @param {Object} jwplayer_ - JW Player global factory
+ * @param {State} adState_
+ * @param {State} timeState_
+ * @param {CallbackStorage} callbackStorage_
+ * @param {Object} utils
+ * @returns {VideoProvider}
+ */
+export function JWPlayerProvider(config, jwplayer_, adState_, timeState_, callbackStorage_, utils, sharedUtils) {
+  const jwplayer = jwplayer_;
+  let player = null;
+  let playerVersion = null;
+  const playerConfig = config.playerConfig;
+  const divId = config.divId;
+  let adState = adState_;
+  let timeState = timeState_;
+  let callbackStorage = callbackStorage_;
+  let pendingSeek = {};
+  let supportedMediaTypes = null;
+  let minimumSupportedPlayerVersion = '8.20.1';
+  let setupCompleteCallbacks = [];
+  let setupFailedCallbacks = [];
+  const MEDIA_TYPES = [
+    VIDEO_MIME_TYPE.MP4,
+    VIDEO_MIME_TYPE.OGG,
+    VIDEO_MIME_TYPE.WEBM,
+    VIDEO_MIME_TYPE.AAC,
+    VIDEO_MIME_TYPE.HLS
+  ];
+
+  function init() {
+    if (!jwplayer) {
+      triggerSetupFailure(-1); // TODO: come up with code for player absent
+      return;
+    }
+
+    playerVersion = jwplayer.version;
+
+    if (playerVersion < minimumSupportedPlayerVersion) {
+      triggerSetupFailure(-2); // TODO: come up with code for version not supported
+      return;
+    }
+
+    player = jwplayer(divId);
+    if (player.getState() === undefined) {
+      setupPlayer(playerConfig);
+    } else {
+      const payload = getSetupCompletePayload();
+      setupCompleteCallbacks.forEach(callback => callback(SETUP_COMPLETE, payload));
+      setupCompleteCallbacks = [];
+    }
+  }
+
+  function getId() {
+    return divId;
+  }
+
+  function getOrtbVideo() {
+    if (!player) {
+      return;
+    }
+
+    const config = player.getConfig() || {};
+    const adConfig = config.advertising || {};
+    supportedMediaTypes = supportedMediaTypes || utils.getSupportedMediaTypes(MEDIA_TYPES);
+
+    const video = {
+      mimes: supportedMediaTypes,
+      protocols: [
+        PROTOCOLS.VAST_2_0,
+        PROTOCOLS.VAST_3_0,
+        PROTOCOLS.VAST_4_0,
+        PROTOCOLS.VAST_2_0_WRAPPER,
+        PROTOCOLS.VAST_3_0_WRAPPER,
+        PROTOCOLS.VAST_4_0_WRAPPER
+      ],
+      h: player.getHeight(), // TODO does player call need optimization ?
+      w: player.getWidth(), // TODO does player call need optimization ?
+      startdelay: utils.getStartDelay(),
+      placement: utils.getPlacement(adConfig, player),
+      // linearity is omitted because both forms are supported.
+      // sequence - TODO not yet supported
+      battr: adConfig.battr,
+      maxextended: -1, // extension is allowed, and there is no time limit imposed.
+      boxingallowed: 1,
+      playbackmethod: [ utils.getPlaybackMethod(config) ],
+      playbackend: 1, // TODO: need to account for floating player - https://developer.jwplayer.com/jwplayer/docs/jw8-embed-an-outstream-player , https://developer.jwplayer.com/jwplayer/docs/jw8-player-configuration-reference#section-float-on-scroll
+      // companionad - TODO add in future version
+      // companiontype - TODO add in future version
+      // minbitrate - TODO add in future version
+      // maxbitrate - TODO add in future version
+      // delivery - omitted because all are supported.
+      // minduration - Is there value to specifying ?
+      // maxduration - Is there value to specifying ?
+      api: [
+        API_FRAMEWORKS.VPAID_2_0
+      ],
+    };
+
+    if (utils.isOmidSupported(adConfig.adClient)) {
+      video.api.push(API_FRAMEWORKS.OMID_1_0);
+    }
+
+    Object.assign(video, utils.getSkipParams(adConfig));
+
+    if (player.getFullscreen()) { // TODO does player call need optimization ?
+      // only specify ad position when in Fullscreen since computational cost is low
+      // ad position options are listed in oRTB 2.5 section 5.4
+      // https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf
+      video.pos = AD_POSITION.FULL_SCREEN; // TODO make constant in oRTB
+    }
+
+    return video;
+  }
+
+  function getOrtbContent() {
+    if (!player) {
+      return;
+    }
+
+    const item = player.getPlaylistItem() || {}; // TODO does player call need optimization ?
+    let { duration, playbackMode } = timeState.getState();
+    if (duration === undefined) {
+      duration = player.getDuration();
+    }
+
+    const content = {
+      url: item.file,
+      title: item.title,
+      cat: item.iabCategories,
+      keywords: item.tags,
+      len: duration,
+      embeddable: 1
+    };
+
+    if (playbackMode !== undefined) {
+      content.livestream = Math.min(playbackMode, 1);
+    }
+
+    const mediaId = item.mediaid;
+    if (mediaId) {
+      content.id = 'jw_' + mediaId;
+    }
+
+    const jwpseg = item.jwpseg;
+    const dataSegment = utils.getSegments(jwpseg);
+    const contentDatum = utils.getContentDatum(mediaId, dataSegment);
+    if (contentDatum) {
+      content.data = [contentDatum];
+    }
+
+    const isoLanguageCode = utils.getIsoLanguageCode(player);
+    if (isoLanguageCode) {
+      content.language = isoLanguageCode;
+    }
+
+    return content;
+  }
+
+  function setAdTagUrl(adTagUrl, options) {
+    if (!player) {
+      return;
+    }
+
+    player.playAd(adTagUrl || options.adXml, options);
+  }
+
+  function onEvent(externalEventName, callback, basePayload) {
+    if (externalEventName === SETUP_COMPLETE) {
+      setupCompleteCallbacks.push(callback);
+    } else if (externalEventName === SETUP_FAILED) {
+      setupFailedCallbacks.push(callback);
+    }
+
+    if (!player) {
+      return;
+    }
+
+    let getEventPayload;
+
+    switch (externalEventName) {
+      case SETUP_COMPLETE:
+        getEventPayload = () => {
+          setupCompleteCallbacks = [];
+          return getSetupCompletePayload();
+        };
+        break;
+
+      case SETUP_FAILED:
+        getEventPayload = e => {
+          setupFailedCallbacks = [];
+          return {
+            playerVersion,
+            errorCode: e.code,
+            errorMessage: e.message,
+            sourceError: e.sourceError
+          };
+        };
+        break;
+
+      case AD_REQUEST:
+      case AD_PLAY:
+      case AD_PAUSE:
+        getEventPayload = e => ({ adTagUrl: e.tag });
+        break;
+
+      case AD_BREAK_START:
+        getEventPayload = e => {
+          timeState.clearState();
+          return { offset: e.adPosition };
+        };
+        break;
+
+      case AD_LOADED:
+        getEventPayload = e => {
+          adState.updateForEvent(e);
+          const adConfig = player.getConfig().advertising;
+          adState.updateState(utils.getSkipParams(adConfig));
+          return adState.getState();
+        };
+        break;
+
+      case AD_STARTED:
+        // JW Player adImpression fires when the ad starts, regardless of viewability.
+        getEventPayload = () => adState.getState();
+        break;
+
+      case AD_IMPRESSION:
+      case AD_CLICK:
+        getEventPayload = () => Object.assign({}, adState.getState(), timeState.getState());
+        break;
+
+      case AD_TIME:
+        getEventPayload = e => {
+          timeState.updateForEvent(e);
+          return {
+            adTagUrl: e.tag,
+            time: e.position,
+            duration: e.duration,
+          };
+        };
+        break;
+
+      case AD_SKIPPED:
+        getEventPayload = e => {
+          adState.clearState();
+          return {
+            time: e.position,
+            duration: e.duration,
+          };
+        };
+        break;
+
+      case AD_ERROR:
+        getEventPayload = e => {
+          const extraPayload = Object.assign({
+            playerErrorCode: e.adErrorCode,
+            vastErrorCode: e.code,
+            errorMessage: e.message,
+            sourceError: e.sourceError
+            // timeout
+          }, adState.getState(), timeState.getState());
+          adState.clearState();
+          return extraPayload;
+        };
+        break;
+
+      case AD_COMPLETE:
+        getEventPayload = e => {
+          adState.clearState();
+          return { adTagUrl: e.tag };
+        };
+        break;
+
+      case AD_BREAK_END:
+        getEventPayload = e => ({ offset: e.adPosition });
+        break;
+
+      case PLAYLIST:
+        getEventPayload = e => {
+          const playlistItemCount = e.playlist.length;
+          return {
+            playlistItemCount,
+            autostart: player.getConfig().autostart
+          };
+        };
+        break;
+
+      case PLAYBACK_REQUEST:
+        getEventPayload = e => ({ playReason: e.playReason });
+        break;
+
+      case AUTOSTART_BLOCKED:
+        getEventPayload = e => ({
+          sourceError: e.error,
+          errorCode: e.code,
+          errorMessage: e.message
+        });
+        break;
+
+      case PLAY_ATTEMPT_FAILED:
+        getEventPayload = e => ({
+          playReason: e.playReason,
+          sourceError: e.sourceError,
+          errorCode: e.code,
+          errorMessage: e.message
+        });
+        break;
+
+      case CONTENT_LOADED:
+        getEventPayload = e => {
+          const { item, index } = e;
+          return {
+            contentId: item.mediaid,
+            contentUrl: item.file, // cover other sources ? util ?
+            title: item.title,
+            description: item.description,
+            playlistIndex: index,
+            contentTags: item.tags
+          };
+        };
+        break;
+
+      case BUFFER:
+        getEventPayload = () => timeState.getState();
+        break;
+
+      case TIME:
+        getEventPayload = e => {
+          timeState.updateForEvent(e);
+          return {
+            position: e.position,
+            duration: e.duration
+          };
+        };
+        break;
+
+      case SEEK_START:
+        getEventPayload = e => {
+          const duration = e.duration;
+          const offset = e.offset;
+          pendingSeek = {
+            duration,
+            offset
+          };
+          return {
+            position: e.position,
+            destination: offset,
+            duration: duration
+          };
+        }
+        break;
+
+      case SEEK_END:
+        getEventPayload = () => {
+          const extraPayload = {
+            position: pendingSeek.offset,
+            duration: pendingSeek.duration
+          };
+          pendingSeek = {};
+          return extraPayload;
+        };
+        break;
+
+      case MUTE:
+        getEventPayload = e => ({ mute: e.mute });
+        break;
+
+      case VOLUME:
+        getEventPayload = e => ({ volumePercentage: e.volume });
+        break;
+
+      case RENDITION_UPDATE:
+        getEventPayload = e => {
+          const bitrate = e.bitrate;
+          const level = e.level;
+          return {
+            videoReportedBitrate: bitrate,
+            audioReportedBitrate: bitrate,
+            encodedVideoWidth: level.width,
+            encodedVideoHeight: level.height,
+            videoFramerate: e.frameRate
+          };
+        };
+        break;
+
+      case ERROR:
+        getEventPayload = e => ({
+          sourceError: e.sourceError,
+          errorCode: e.code,
+          errorMessage: e.message,
+        });
+        break;
+
+      case COMPLETE:
+        getEventPayload = e => timeState.clearState();
+        break;
+
+      case FULLSCREEN:
+        getEventPayload = e => ({ fullscreen: e.fullscreen });
+        break;
+
+      case PLAYER_RESIZE:
+        getEventPayload = e => ({
+          height: e.height,
+          width: e.width,
+        });
+        break;
+
+      case VIEWABLE:
+        getEventPayload = e => ({
+          viewable: e.viewable,
+          viewabilityPercentage: player.getPercentViewable() * 100,
+        });
+        break;
+
+      case CAST:
+        getEventPayload = e => ({ casting: e.active });
+        break;
+
+      case PLAY:
+      case PAUSE:
+      case PLAYLIST_COMPLETE:
+      case DESTROYED:
+        break;
+
+      default:
+        return;
+    }
+
+    const jwEventName = utils.getJwEvent(externalEventName);
+    const eventHandler = getEventHandler(externalEventName, callback, basePayload, getEventPayload)
+    player.on(jwEventName, eventHandler);
+    callbackStorage.storeCallback(externalEventName, eventHandler, callback);
+  }
+
+  function offEvent(event, callback) {
+    const jwEvent = utils.getJwEvent(event);
+    if (!callback) {
+      player.off(jwEvent);
+      return;
+    }
+
+    const eventHandler = callbackStorage.getCallback(event, callback);
+    if (!eventHandler) {
+      return;
+    }
+
+    player.off(jwEvent, eventHandler);
+  }
+
+  function destroy() {
+    if (!player) {
+      return;
+    }
+    player.remove();
+    player = null;
+  }
+
+  return {
+    init,
+    getId,
+    getOrtbVideo,
+    getOrtbContent,
+    setAdTagUrl,
+    onEvent,
+    offEvent,
+    destroy
+  };
+
+  function setupPlayer(config) {
+    if (!config) {
+      return;
+    }
+    player.setup(utils.getJwConfig(config));
+  }
+
+  function getSetupCompletePayload() {
+    return {
+      divId,
+      playerVersion,
+      type: SETUP_COMPLETE,
+      viewable: player.getViewable(),
+      viewabilityPercentage: player.getPercentViewable() * 100,
+      mute: player.getMute(),
+      volumePercentage: player.getVolume()
+    };
+  }
+
+  function triggerSetupFailure(errorCode) {
+    if (!setupFailedCallbacks.length) {
+      return;
+    }
+
+    const payload = {
+      divId,
+      playerVersion,
+      type: SETUP_FAILED,
+      errorCode,
+      errorMessage: '',
+      sourceError: null
+    };
+
+    setupFailedCallbacks.forEach(callback => callback(SETUP_FAILED, payload));
+    setupFailedCallbacks = [];
+  }
+}
+
+/**
+ * @param {videoProviderConfig} config
+ * @param {sharedUtils} sharedUtils
+ * @returns {VideoProvider}
+ */
+const jwplayerSubmoduleFactory = function (config, sharedUtils) {
+  const adState = adStateFactory();
+  const timeState = timeStateFactory();
+  const callbackStorage = callbackStorageFactory();
+  return JWPlayerProvider(config, window.jwplayer, adState, timeState, callbackStorage, utils, sharedUtils);
+}
+
+jwplayerSubmoduleFactory.vendorCode = JWPLAYER_VENDOR;
+submodule('video', jwplayerSubmoduleFactory);
+export default jwplayerSubmoduleFactory;
+
+// HELPERS
+
+export const utils = {
+  getJwConfig: function(config) {
+    if (!config) {
+      return;
+    }
+
+    const params = config.params || {};
+    const jwConfig = params.vendorConfig || {};
+    if (jwConfig.autostart === undefined && config.autoStart !== undefined) {
+      jwConfig.autostart = config.autoStart;
+    }
+
+    if (jwConfig.mute === undefined && config.mute !== undefined) {
+      jwConfig.mute = config.mute;
+    }
+
+    if (!jwConfig.key && config.licenseKey !== undefined) {
+      jwConfig.key = config.licenseKey;
+    }
+
+    if (config.setupAds === false) {
+      return jwConfig;
+    }
+
+    const advertising = jwConfig.advertising || { client: 'vast' };
+    if (!jwConfig.file && !jwConfig.playlist && !jwConfig.source) {
+      // TODO verify accuracy
+      advertising.outstream = true;
+    }
+
+    const bids = advertising.bids || {};
+    bids.prebid = true;
+    advertising.bids = bids;
+
+    jwConfig.advertising = advertising;
+    return jwConfig;
+  },
+
+  getJwEvent: function(eventName) {
+    switch (eventName) {
+      case SETUP_COMPLETE:
+        return 'ready';
+
+      case SETUP_FAILED:
+        return 'setupError';
+
+      case DESTROYED:
+        return 'remove';
+
+      case AD_STARTED:
+        return AD_IMPRESSION;
+
+      case AD_IMPRESSION:
+        return 'adViewableImpression';
+
+      case PLAYBACK_REQUEST:
+        return 'playAttempt';
+
+      case AUTOSTART_BLOCKED:
+        return 'autostartNotAllowed';
+
+      case CONTENT_LOADED:
+        return 'playlistItem';
+
+      case SEEK_START:
+        return 'seek';
+
+      case SEEK_END:
+        return 'seeked';
+
+      case RENDITION_UPDATE:
+        return 'visualQuality';
+
+      case PLAYER_RESIZE:
+        return 'resize';
+
+      default:
+        return eventName;
+    }
+  },
+
+  getSkipParams: function(adConfig) {
+    const skipParams = {};
+    const skipoffset = adConfig.skipoffset;
+    if (skipoffset !== undefined) {
+      const skippable = skipoffset >= 0;
+      skipParams.skip = skippable ? 1 : 0;
+      if (skippable) {
+        skipParams.skipmin = skipoffset + 2;
+        skipParams.skipafter = skipoffset;
+      }
+    }
+    return skipParams;
+  },
+
+  getSupportedMediaTypes: function(mediaTypes = []) {
+    const el = document.createElement('video');
+    return mediaTypes
+      .filter(mediaType => el.canPlayType(mediaType))
+      .concat(VPAID_MIME_TYPE); // Always allow VPAIDs.
+  },
+
+  getStartDelay: function() {
+    // todo calculate
+    // need to know which ad we are bidding on
+    // Might have to implement and set in Pb-video ; would required ad unit as param.
+  },
+
+  /**
+   * Determine the ad placement
+   * @param {Object} adConfig
+   * @param {Object} player
+   * @return {PLACEMENT|OrtbVideoParams.placement|undefined}
+   */
+  getPlacement: function(adConfig, player) {
+    if (!adConfig.outstream) {
+      // https://developer.jwplayer.com/jwplayer/docs/jw8-embed-an-outstream-player for more info on outstream
+      return PLACEMENT.INSTREAM;
+    }
+
+    if (player.getFloating()) {
+      return PLACEMENT.FLOATING;
+    }
+
+    const placement = adConfig.placement;
+    if (!placement) {
+      return;
+    }
+
+    return PLACEMENT[placement.toUpperCase()];
+  },
+
+  getPlaybackMethod: function({ autoplay, mute, autoplayAdsMuted }) {
+    if (autoplay) {
+      // Determine whether player is going to start muted.
+      const isMuted = mute || autoplayAdsMuted; // todo autoplayAdsMuted only applies to preRoll
+      return isMuted ? PLAYBACK_METHODS.AUTOPLAY_MUTED : PLAYBACK_METHODS.AUTOPLAY;
+    }
+    /*
+     TODO
+      could support the following with float player:
+      5 Initiates on Entering Viewport with Sound On
+      6 Initiates on Entering Viewport with Sound Off by Default
+     */
+    return PLAYBACK_METHODS.CLICK_TO_PLAY;
+  },
+
+  /**
+   * Indicates if Omid is supported
+   *
+   * @param {string} adClient - The identifier of the ad plugin requesting the bid
+   * @returns {boolean} - support of omid
+   */
+  isOmidSupported: function(adClient) {
+    const omidIsLoaded = window.OmidSessionClient !== undefined;
+    return omidIsLoaded && adClient === 'vast';
+  },
+
+  /**
+   * Gets ISO 639 language code of current audio track.
+   * @param {Object} player
+   * @returns {string|undefined} ISO 639 language code.
+   */
+  getIsoLanguageCode: function(player) {
+    const audioTracks = player.getAudioTracks();
+    if (!audioTracks || !audioTracks.length) {
+      return;
+    }
+
+    const currentTrackIndex = Math.max(player.getCurrentAudioTrack() || 0, 0); // returns -1 when there are no alternative tracks.
+    const audioTrack = audioTracks[currentTrackIndex];
+    return audioTrack && audioTrack.language;
+  },
+
+  /**
+   * Converts an array of jwpsegs into an array of data segments compliant with the oRTB content.data[index].segment
+   * @param {[String]} jwpsegs - jwplayer contextual targeting segments
+   * @return {[Object]|undefined} list of data segments compliant with the oRTB content.data[index].segment spec
+   */
+  getSegments: function (jwpsegs) {
+    if (!jwpsegs || !jwpsegs.length) {
+      return;
+    }
+
+    const formattedSegments = jwpsegs.reduce((convertedSegments, rawSegment) => {
+      convertedSegments.push({
+        id: rawSegment,
+        value: rawSegment
+      });
+      return convertedSegments;
+    }, []);
+
+    return formattedSegments;
+  },
+
+  /**
+   * Creates an object compliant with the oRTB content.data[index] spec.
+   * @param {String} mediaId - content identifier
+   * @param {[Object]} segments - list of data segments compliant with the oRTB content.data[index].segment spec
+   * @return {Object} - Object compliant with the oRTB content.data[index] spec.
+   */
+  getContentDatum: function (mediaId, segments) {
+    if (!mediaId && !segments) {
+      return;
+    }
+
+    const contentData = {
+      name: 'jwplayer.com',
+      ext: {}
+    };
+
+    if (mediaId) {
+      contentData.ext.cids = [mediaId];
+    }
+
+    if (segments) {
+      contentData.segment = segments;
+      contentData.ext.segtax = 502;
+    }
+
+    return contentData;
+  }
+}
+
+/**
+ * Tracks which functions are attached to events
+ * @typedef CallbackStorage
+ * @function storeCallback
+ * @function getCallback
+ * @function clearStorage
+ */
+
+/**
+ * @returns {CallbackStorage}
+ */
+export function callbackStorageFactory() {
+  let storage = {};
+
+  function storeCallback(eventType, eventHandler, callback) {
+    let eventHandlers = storage[eventType];
+    if (!eventHandlers) {
+      eventHandlers = storage[eventType] = {};
+    }
+
+    eventHandlers[callback] = eventHandler;
+  }
+
+  function getCallback(eventType, callback) {
+    let eventHandlers = storage[eventType];
+    if (!eventHandlers) {
+      return;
+    }
+
+    const eventHandler = eventHandlers[callback];
+    delete eventHandlers[callback];
+    return eventHandler;
+  }
+
+  function clearStorage() {
+    storage = {};
+  }
+
+  return {
+    storeCallback,
+    getCallback,
+    clearStorage
+  }
+}
+
+// STATE
+
+/**
+ * @returns {State}
+ */
+export function adStateFactory() {
+  const adState = Object.assign({}, stateFactory());
+
+  function updateForEvent(event) {
+    const updates = {
+      adTagUrl: event.tag,
+      offset: event.adPosition,
+      loadTime: event.timeLoading,
+      vastAdId: event.id, // TODO: delete from spec!! seems JW Player specific
+      adDescription: event.description,
+      adServer: event.adsystem,
+      adTitle: event.adtitle,
+      advertiserId: event.advertiserId,
+      advertiserName: event.advertiser,
+      dealId: event.dealId,
+      // adCategories
+      linear: event.linear,
+      vastVersion: event.vastversion,
+      // campaignId:
+      creativeUrl: event.mediaFile, // TODO: per AP, mediafile might be object w/ file property. verify
+      adId: event.adId,
+      universalAdId: event.universalAdId,
+      creativeId: event.creativeAdId,
+      creativeType: event.creativetype,
+      redirectUrl: event.clickThroughUrl,
+      adPlacementType: convertPlacementToOrtbCode(event.placement),
+      waterfallIndex: event.witem,
+      waterfallCount: event.wcount,
+      adPodCount: event.podcount,
+      adPodIndex: event.sequence,
+      wrapperAdIds: event.wrapperAdIds
+    };
+
+    if (event.client === 'googima' && !updates.wrapperAdIds) {
+      updates.wrapperAdIds = parseImaAdWrapperIds(event);
+    }
+
+    this.updateState(updates);
+  }
+
+  adState.updateForEvent = updateForEvent;
+
+  function convertPlacementToOrtbCode(placement) {
+    switch (placement) {
+      case 'instream':
+        return PLACEMENT.INSTREAM;
+
+      case 'banner':
+        return PLACEMENT.BANNER;
+
+      case 'article':
+        return PLACEMENT.ARTICLE;
+
+      case 'feed':
+        return PLACEMENT.FEED;
+
+      case 'interstitial':
+      case 'slider':
+      case 'floating':
+        return PLACEMENT.INTERSTITIAL_SLIDER_FLOATING;
+    }
+  }
+
+  function parseImaAdWrapperIds(adEvent) {
+    const ima = adEvent.ima;
+    const ad = ima && ima.ad;
+    if (!ad) {
+      return;
+    }
+
+    const adProperties = Object.keys(ad);
+    adProperties.forEach(property => {
+      const value = ad[property];
+      const wrapperIds = value.adWrapperIds;
+      if (wrapperIds) {
+        return wrapperIds;
+      }
+    });
+  }
+
+  return adState;
+}
+
+/**
+ * @returns {State}
+ */
+export function timeStateFactory() {
+  const timeState = Object.assign({}, stateFactory());
+
+  function updateForEvent(event) {
+    const { position, duration } = event;
+    this.updateState({
+      time: position,
+      duration,
+      playbackMode: getPlaybackMode(duration)
+    });
+  }
+
+  timeState.updateForEvent = updateForEvent;
+
+  function getPlaybackMode(duration) {
+    if (duration > 0) {
+      return PLAYBACK_MODE.VOD;
+    } else if (duration < 0) {
+      return PLAYBACK_MODE.DVR;
+    }
+
+    return PLAYBACK_MODE.LIVE;
+  }
+
+  return timeState;
+}
diff --git a/modules/jwplayerVideoProvider.md b/modules/jwplayerVideoProvider.md
new file mode 100644
index 00000000000..54a9c1fb84d
--- /dev/null
+++ b/modules/jwplayerVideoProvider.md
@@ -0,0 +1,25 @@
+# Overview
+
+Module Name: JW Player Video Provider
+Module Type: Video Submodule
+Video Player: JW player
+Player website: https://www.jwplayer.com/html5-video-player/
+Maintainer: karim@jwplayer.com
+
+# Description
+
+Video provider to connect the Prebid Video Module to JW Player.
+
+# Requirements
+
+Your page must embed a build of JW Player. 
+i.e.
+```html
+<head> 
+    <script  src="https://cdn.jwplayer.com/players/UVQWMA4o-kGWxh33Q.js"></script>
+</head>
+```
+
+[Additional embed instructions](https://docs.jwplayer.com/platform/docs/players-get-started)
+
+[Obtaining a license](https://info.jwplayer.com/contact-us/) 
diff --git a/modules/spotxBidAdapter.js b/modules/spotxBidAdapter.js
index 5059341baaa..874207adcf8 100644
--- a/modules/spotxBidAdapter.js
+++ b/modules/spotxBidAdapter.js
@@ -149,7 +149,7 @@ export const spec = {
         }
       }
 
-      const mimes = getBidIdParameter('mimes', bid.params) || ['application/javascript', 'video/mp4', 'video/webm'];
+      const mimes = getBidIdParameter('mimes', bid.params) || deepAccess(bid, 'mediaTypes.video.mimes') || ['application/javascript', 'video/mp4', 'video/webm'];
 
       const spotxReq = {
         id: bid.bidId,
@@ -176,28 +176,29 @@ export const spec = {
         spotxReq.bidfloor = getBidIdParameter('price_floor', bid.params);
       }
 
-      if (getBidIdParameter('start_delay', bid.params) != '') {
-        spotxReq.video.startdelay = 0 + Boolean(getBidIdParameter('start_delay', bid.params));
+      const startdelay = getBidIdParameter('start_delay', bid.params) || deepAccess(bid, 'mediaTypes.video.startdelay');
+      if (startdelay) {
+        spotxReq.video.startdelay = 0 + Boolean(startdelay);
       }
 
-      if (getBidIdParameter('min_duration', bid.params) != '') {
-        spotxReq.video.minduration = getBidIdParameter('min_duration', bid.params);
+      const minduration = getBidIdParameter('min_duration', bid.params) || deepAccess(bid, 'mediaTypes.video.minduration');
+      if (minduration) {
+        spotxReq.video.minduration = minduration;
       }
 
-      if (getBidIdParameter('max_duration', bid.params) != '') {
-        spotxReq.video.maxduration = getBidIdParameter('max_duration', bid.params);
+      const maxduration = getBidIdParameter('max_duration', bid.params) || deepAccess(bid, 'mediaTypes.video.maxduration');
+      if (maxduration) {
+        spotxReq.video.maxduration = maxduration;
       }
 
-      if (getBidIdParameter('placement_type', bid.params) != '') {
-        spotxReq.video.ext.placement = getBidIdParameter('placement_type', bid.params);
+      const placement = getBidIdParameter('placement_type', bid.params) || deepAccess(bid, 'mediaTypes.video.placement');
+      if (placement) {
+        spotxReq.video.ext.placement = placement;
       }
 
-      if (getBidIdParameter('position', bid.params) != '') {
-        spotxReq.video.ext.pos = getBidIdParameter('position', bid.params);
-      } else {
-        if (deepAccess(bid, 'mediaTypes.video.pos')) {
-          spotxReq.video.ext.pos = deepAccess(bid, 'mediaTypes.video.pos');
-        }
+      const position = getBidIdParameter('position', bid.params) || deepAccess(bid, 'mediaTypes.video.pos');
+      if (position) {
+        spotxReq.video.ext.pos = position;
       }
 
       if (bid.crumbs && bid.crumbs.pubcid) {
diff --git a/modules/synacormediaBidAdapter.js b/modules/synacormediaBidAdapter.js
index 845d6b4b5fb..4ebed12cb05 100644
--- a/modules/synacormediaBidAdapter.js
+++ b/modules/synacormediaBidAdapter.js
@@ -71,7 +71,7 @@ export const spec = {
         seatId = bid.params.seatId;
       }
       const tagIdOrPlacementId = bid.params.tagId || bid.params.placementId;
-      let pos = parseInt(bid.params.pos, 10);
+      let pos = parseInt(bid.params.pos || deepAccess(bid.mediaTypes, 'video.pos'), 10);
       if (isNaN(pos)) {
         logWarn(`Synacormedia: there is an invalid POS: ${bid.params.pos}`);
         pos = 0;
diff --git a/modules/videoModule/addingSubmodule.md b/modules/videoModule/addingSubmodule.md
new file mode 100644
index 00000000000..874718be1a7
--- /dev/null
+++ b/modules/videoModule/addingSubmodule.md
@@ -0,0 +1,521 @@
+# How to Add a Video Submodule
+
+Video submodules interact with the Video Module to integrate Prebid with Video Players, allowing Prebid to automatically:
+- render bids in the desired video player
+- mark used bids as won
+- trigger player and media events
+- populate the oRTB Video Impression and Content params in the bid request
+
+## Overview
+
+The Prebid Video Module simplifies the way Prebid integrates with video players by acting as a single point of contact for everything video.
+In order for the Video Module to connect to a video player, a submodule must be implemented. The submodule acts as a bridge between the Video Module and the video player.
+The Video Module will route commands and tasks to the appropriate submodule instance.
+A submodule is expected to work for a specific video player. i.e. the JW Player submodule is used to integrate Prebid with JW Player. The video.js submdule connects to video.js.
+Publishers who use players from different vendors on the same page can use multiple video submodules.
+
+## Requirements
+
+The Video Module only supports integration with Video Players that meet the following requirements:
+- Must support parsing and reproduction of VAST ads
+    - Input can be an ad tag URL or the actual Vast XML.
+- Must expose an API that allows the procurement of [Open RTB params](https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf) for Video (section 3.2.7) and Content (section 3.2.16).
+- Must emit javascript events for Ads and Media
+    - see [Event Registration](#event-registration)
+
+## Creating a Submodule
+
+### Step 1: Add a markdown file describing the submodule
+
+Create a markdown file under `modules` with the name of the module suffixed with 'VideoProvider', i.e. `exampleVideoProvider.md`.
+
+Example markdown file:
+```markdown
+# Overview
+
+Module Name: Example Video Provider
+Module Type: Video Submodule
+Video Player: Example player
+Player website: example-player.com
+Maintainer: someone@example.com
+
+# Description
+
+Video provider for Example Player. Contact someone@example.com for information.
+
+# Requirements
+
+Your page must link the Example Player build from our CDN. Alternatively yu can use npm to load the build.
+```
+
+### Step 2: Add a Vendor Code
+
+Vendor codes are required to indicate which submodule type to instantiate. Add your vendor code constant to an export const in `vendorCodes.js` in Prebid.js under `libraries/video/constants/vendorCodes.js`.
+i.e. in `vendorCodes.js`:
+
+```javascript
+export const EXAMPLE_PLAYER_VENDOR = 3;
+```
+
+### Step 2: Build the Module
+
+Now create a javascript file under `modules` with the name of the module suffixed with 'VideoProvider', e.g., `exampleVideoProvider.js`.
+
+#### The Submodule factory
+
+The Video Module will need a submodule instance for every player instance registered with Prebid. You will therefore need to implement a submodule factory which is called with a `videoProviderConfig` argument and returns a Video Provider instance.
+Your submodule should import your vendor code constant and set it to a `vendorCode` property on your submodule factory.
+Your submodule should also import the `submodule` function from `src/hook.js` and should use it to register as a submodule of `'video'`.
+
+**Code Example**
+
+```javascript
+import { submodule } from '../src/hook.js';
+
+function exampleSubmoduleFactory(videoProviderConfig) {
+    const videoProvider = {
+      // implementation
+    };
+
+  return videoProvider;
+}
+
+exampleSubmoduleFactory.vendorCode = EXAMPLE_VENDOR;
+submodule('video', exampleSubmoduleFactory);
+```
+
+#### The Submodule object
+
+The submodule object must adhere to the `VideoProvider` interface defined in the `coreVideo.js` inline documentation.
+
+#### Event registration
+
+Submodules must support attaching and detaching event listeners on the video player. The list of events are defined in the Events file in the Video Library: `libraries/video/constants/events.js`.
+All events and their params must be supported.
+
+##### Event params
+
+All Video Module events include a `divId` and `type` param in the payload by default.
+The `divId` is the div id string of the player emitting the event; it can be used as an identifier. The `type` is the string name of the event.
+The remaining Payload params are listed in the following:
+
+###### SETUP_COMPLETE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| playerVersion | string | The version of the player on the page |
+| viewable | boolean | Is the player currently viewable? |
+| viewabilityPercentage | number | The percentage of the video that is currently viewable on the user's screen. |
+| mute | boolean | Whether or not the player is currently muted. |
+| volumePercentage | number | The volume of the player, as a percentage |
+
+###### SETUP_FAILED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| playerVersion | string | The version of the player on the page |
+| errorCode | number | The identifier of the error preventing the media from rendering |
+| errorMessage | string | Developer friendly description of the reason the error occurred. |
+| sourceError | object | The underlying root Error which prevented the playback. |
+
+###### DESTROYED
+No additional params.
+
+###### AD_REQUEST
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+
+###### AD_BREAK_START
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+
+###### AD_LOADED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+| loadTime | number | Time the ad took to load in milliseconds |
+| vastAdId | string | The ID given to the ad within the ad tag's XML. Nullable when absent from the VAST xml. |
+| adDescription | string | Description of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| adServer | string | Ad server used (e.g. dart or mediamind) from the vast tag. Nullable when absent from the VAST xml. |
+| adTitle | string | Title of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| advertiserId | string | Optional identifier for the advertiser, provided by the ad server. Nullable when absent from the VAST xml. |
+| advertiserName | string | Name of the advertiser as defined by the ad serving party, from the vast XML. Nullable when absent from the VAST xml. |
+| dealId | string | The ID of the Ads deal. Generally relates to Direct Sold Ad Campaigns. Nullable when absent from the VAST xml. |
+| linear | boolean | Is the ad linear or not? |
+| vastVersion | string | Version of VAST being reported from the tag |
+| creativeUrl | string | The URL representing the VPAID or MP4 ad that is run |
+| adId | string | Unique Ad ID - refers to the 'attribute' of the <Ad> node within the VAST. Nullable when absent from the VAST xml. |
+| universalAdId | string | Unique identifier for an ad in VAST4. Nullable when absent from the VAST xml. |
+| creativeId | string | Ad server's unique ID for the creative pulled from the ad tag's XML. Should be used to specify the ad server’s unique identifier as opposed to  the Universal Ad Id which is used for maintaining a creative id for the ad across multiple systems. Nullable when absent from the VAST xml. |
+| creativeType | string | The MIME type of the ad creative currently being displayed |
+| redirectUrl | string | the url to which the viewer is being redirected after clicking the ad. Nullable when absent from the VAST xml. |
+| adPlacementType | number | The video placements per IAB guidelines. Enum list: In-Stream: 1, In-Banner: 2, In-Article: 3, In-Feed: 4, Interstitial/Slider/Floating: 5 |
+| waterfallIndex | number | Index of the current item in the ad waterfall |
+| waterfallCount | number |  The count of items in a given ad waterfall |
+| adPodCount | number | the total number of ads in the pod |
+| adPodIndex | number | The index of the currently playing ad within an ad pod |
+| wrapperAdIds | array[string] | Ad IDs of the VAST Wrappers that were loaded while loading the Ad tag. The list returned starts at the inline ad (innermost) and traverses to the outermost wrapper ad. An empty array is returned if there are no wrapper ads. |
+
+###### AD_STARTED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+| loadTime | number | Time the ad took to load in milliseconds |
+| vastAdId | string | The ID given to the ad within the ad tag's XML. Nullable when absent from the VAST xml. |
+| adDescription | string | Description of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| adServer | string | Ad server used (e.g. dart or mediamind) from the vast tag. Nullable when absent from the VAST xml. |
+| adTitle | string | Title of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| advertiserId | string | Optional identifier for the advertiser, provided by the ad server. Nullable when absent from the VAST xml. |
+| advertiserName | string | Name of the advertiser as defined by the ad serving party, from the vast XML. Nullable when absent from the VAST xml. |
+| dealId | string | The ID of the Ads deal. Generally relates to Direct Sold Ad Campaigns. Nullable when absent from the VAST xml. |
+| linear | boolean | Is the ad linear or not? |
+| vastVersion | string | Version of VAST being reported from the tag |
+| creativeUrl | string | The URL representing the VPAID or MP4 ad that is run |
+| adId | string | Unique Ad ID - refers to the 'attribute' of the <Ad> node within the VAST. Nullable when absent from the VAST xml. |
+| universalAdId | string | Unique identifier for an ad in VAST4. Nullable when absent from the VAST xml. |
+| creativeId | string | Ad server's unique ID for the creative pulled from the ad tag's XML. Should be used to specify the ad server’s unique identifier as opposed to  the Universal Ad Id which is used for maintaining a creative id for the ad across multiple systems. Nullable when absent from the VAST xml. |
+| creativeType | string | The MIME type of the ad creative currently being displayed |
+| redirectUrl | string | the url to which the viewer is being redirected after clicking the ad. Nullable when absent from the VAST xml. |
+| adPlacementType | number | The video placements per IAB guidelines. Enum list: In-Stream: 1, In-Banner: 2, In-Article: 3, In-Feed: 4, Interstitial/Slider/Floating: 5 |
+| waterfallIndex | number | Index of the current item in the ad waterfall |
+| waterfallCount | number |  The count of items in a given ad waterfall |
+| adPodCount | number | the total number of ads in the pod |
+| adPodIndex | number | The index of the currently playing ad within an ad pod |
+| wrapperAdIds | array[string] | Ad IDs of the VAST Wrappers that were loaded while loading the Ad tag. The list returned starts at the inline ad (innermost) and traverses to the outermost wrapper ad. An empty array is returned if there are no wrapper ads. |
+
+<a name="ad-impression-params" />
+
+###### AD_IMPRESSION
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+| loadTime | number | Time the ad took to load in milliseconds |
+| vastAdId | string | The ID given to the ad within the ad tag's XML. Nullable when absent from the VAST xml. |
+| adDescription | string | Description of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| adServer | string | Ad server used (e.g. dart or mediamind) from the vast tag. Nullable when absent from the VAST xml. |
+| adTitle | string | Title of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| advertiserId | string | Optional identifier for the advertiser, provided by the ad server. Nullable when absent from the VAST xml. |
+| advertiserName | string | Name of the advertiser as defined by the ad serving party, from the vast XML. Nullable when absent from the VAST xml. |
+| dealId | string | The ID of the Ads deal. Generally relates to Direct Sold Ad Campaigns. Nullable when absent from the VAST xml. |
+| linear | boolean | Is the ad linear or not? |
+| vastVersion | string | Version of VAST being reported from the tag |
+| creativeUrl | string | The URL representing the VPAID or MP4 ad that is run |
+| adId | string | Unique Ad ID - refers to the 'attribute' of the <Ad> node within the VAST. Nullable when absent from the VAST xml. |
+| universalAdId | string | Unique identifier for an ad in VAST4. Nullable when absent from the VAST xml. |
+| creativeId | string | Ad server's unique ID for the creative pulled from the ad tag's XML. Should be used to specify the ad server’s unique identifier as opposed to  the Universal Ad Id which is used for maintaining a creative id for the ad across multiple systems. Nullable when absent from the VAST xml. |
+| creativeType | string | The MIME type of the ad creative currently being displayed |
+| redirectUrl | string | the url to which the viewer is being redirected after clicking the ad. Nullable when absent from the VAST xml. |
+| adPlacementType | number | The video placements per IAB guidelines. Enum list: In-Stream: 1, In-Banner: 2, In-Article: 3, In-Feed: 4, Interstitial/Slider/Floating: 5 |
+| waterfallIndex | number | Index of the current item in the ad waterfall |
+| waterfallCount | number |  The count of items in a given ad waterfall |
+| adPodCount | number | the total number of ads in the pod |
+| adPodIndex | number | The index of the currently playing ad within an ad pod |
+| wrapperAdIds | array[string] | Ad IDs of the VAST Wrappers that were loaded while loading the Ad tag. The list returned starts at the inline ad (innermost) and traverses to the outermost wrapper ad. An empty array is returned if there are no wrapper ads. |
+| time | number | The playback time in the ad when the event occurs, in seconds. |
+| duration | number | Total duration of an ad in seconds |
+
+###### AD_PLAY
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+
+###### AD_TIME
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| time | number | The current poisition in the ad timeline |
+| duration | number | Total duration of an ad in seconds |
+
+###### AD_PAUSE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+
+###### AD_CLICK
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+| loadTime | number | Time the ad took to load in milliseconds |
+| vastAdId | string | The ID given to the ad within the ad tag's XML. Nullable when absent from the VAST xml. |
+| adDescription | string | Description of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| adServer | string | Ad server used (e.g. dart or mediamind) from the vast tag. Nullable when absent from the VAST xml. |
+| adTitle | string | Title of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| advertiserId | string | Optional identifier for the advertiser, provided by the ad server. Nullable when absent from the VAST xml. |
+| advertiserName | string | Name of the advertiser as defined by the ad serving party, from the vast XML. Nullable when absent from the VAST xml. |
+| dealId | string | The ID of the Ads deal. Generally relates to Direct Sold Ad Campaigns. Nullable when absent from the VAST xml. |
+| linear | boolean | Is the ad linear or not? |
+| vastVersion | string | Version of VAST being reported from the tag |
+| creativeUrl | string | The URL representing the VPAID or MP4 ad that is run |
+| adId | string | Unique Ad ID - refers to the 'attribute' of the <Ad> node within the VAST. Nullable when absent from the VAST xml. |
+| universalAdId | string | Unique identifier for an ad in VAST4. Nullable when absent from the VAST xml. |
+| creativeId | string | Ad server's unique ID for the creative pulled from the ad tag's XML. Should be used to specify the ad server’s unique identifier as opposed to  the Universal Ad Id which is used for maintaining a creative id for the ad across multiple systems. Nullable when absent from the VAST xml. |
+| creativeType | string | The MIME type of the ad creative currently being displayed |
+| redirectUrl | string | the url to which the viewer is being redirected after clicking the ad. Nullable when absent from the VAST xml. |
+| adPlacementType | number | The video placements per IAB guidelines. Enum list: In-Stream: 1, In-Banner: 2, In-Article: 3, In-Feed: 4, Interstitial/Slider/Floating: 5 |
+| waterfallIndex | number | Index of the current item in the ad waterfall |
+| waterfallCount | number |  The count of items in a given ad waterfall |
+| adPodCount | number | the total number of ads in the pod |
+| adPodIndex | number | The index of the currently playing ad within an ad pod |
+| wrapperAdIds | array[string] | Ad IDs of the VAST Wrappers that were loaded while loading the Ad tag. The list returned starts at the inline ad (innermost) and traverses to the outermost wrapper ad. An empty array is returned if there are no wrapper ads. |
+| time | number | The playback time in the ad when the event occurs, in seconds. |
+| duration | number | Total duration of an ad in seconds |
+
+###### AD_SKIPPED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| time | number | The playback time in the ad when the event occurs, in seconds. |
+| duration | number | Total duration of an ad in seconds |
+
+<a name="ad-error-params" />
+
+###### AD_ERROR
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| playerErrorCode | number | The ad error code from the Player’s internal spec. |
+| vastErrorCode | number | The error code for the VAST response that is returned from the request, as defined in the VAST spec. |
+| errorMessage | string | Developer friendly description of the reason the error occurred. |
+| sourceError | object | The underlying root Error which prevented the playback. |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+| loadTime | number | Time the ad took to load in milliseconds |
+| vastAdId | string | The ID given to the ad within the ad tag's XML. Nullable when absent from the VAST xml. |
+| adDescription | string | Description of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| adServer | string | Ad server used (e.g. dart or mediamind) from the vast tag. Nullable when absent from the VAST xml. |
+| adTitle | string | Title of the ad pulled from the ad tag's XML. Nullable when absent from the VAST xml. |
+| advertiserId | string | Optional identifier for the advertiser, provided by the ad server. Nullable when absent from the VAST xml. |
+| advertiserName | string | Name of the advertiser as defined by the ad serving party, from the vast XML. Nullable when absent from the VAST xml. |
+| dealId | string | The ID of the Ads deal. Generally relates to Direct Sold Ad Campaigns. Nullable when absent from the VAST xml. |
+| linear | boolean | Is the ad linear or not? |
+| vastVersion | string | Version of VAST being reported from the tag |
+| creativeUrl | string | The URL representing the VPAID or MP4 ad that is run |
+| adId | string | Unique Ad ID - refers to the 'attribute' of the <Ad> node within the VAST. Nullable when absent from the VAST xml. |
+| universalAdId | string | Unique identifier for an ad in VAST4. Nullable when absent from the VAST xml. |
+| creativeId | string | Ad server's unique ID for the creative pulled from the ad tag's XML. Should be used to specify the ad server’s unique identifier as opposed to  the Universal Ad Id which is used for maintaining a creative id for the ad across multiple systems. Nullable when absent from the VAST xml. |
+| creativeType | string | The MIME type of the ad creative currently being displayed |
+| redirectUrl | string | the url to which the viewer is being redirected after clicking the ad. Nullable when absent from the VAST xml. |
+| adPlacementType | number | The video placements per IAB guidelines. Enum list: In-Stream: 1, In-Banner: 2, In-Article: 3, In-Feed: 4, Interstitial/Slider/Floating: 5 |
+| waterfallIndex | number | Index of the current item in the ad waterfall |
+| waterfallCount | number |  The count of items in a given ad waterfall |
+| adPodCount | number | the total number of ads in the pod |
+| adPodIndex | number | The index of the currently playing ad within an ad pod |
+| wrapperAdIds | array[string] | Ad IDs of the VAST Wrappers that were loaded while loading the Ad tag. The list returned starts at the inline ad (innermost) and traverses to the outermost wrapper ad. An empty array is returned if there are no wrapper ads. |
+| time | number | The playback time in the ad when the event occurs, in seconds. |
+| duration | number | Total duration of an ad in seconds |
+
+###### AD_COMPLETE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+
+###### AD_BREAK_END
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| offset | string | Scheduled position in the video for the ad to play. For mid-rolls, will be the position in seconds as string. Other options: 'pre' (pre-roll), 'post' (post-roll), 'api' (ad was not scheduled) |
+
+###### PLAYLIST
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| playlistItemCount | number | The number of items in the current playlist |
+| autostart | boolean | Whether or not the player is set to begin playing automatically. |
+
+###### PLAYBACK_REQUEST
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| playReason | string | wWy the play attempt originated. Options: ‘Unknown’ (Unknown reason:we cannot tell), ‘Interaction’ (A viewer interacts with the UI), ‘Auto’ (Autoplay based on the configuration of the player - autoStart), ‘autoOnViewable’ (autoStart when viewable), ‘autoRepeat’ (media automatically restarted after completion, without any user interaction), ‘Api’ (caused by a call on the player’s API), ‘Internal’ (started because of an internal mechanism i.e. playlist progressed to a recommended item) |
+
+###### AUTOSTART_BLOCKED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| errorCode | number | The identifier of error preventing the media from rendering |
+| errorMessage | string | Developer friendly description of the reason the error occurred. |
+| sourceError | object | The underlying root Error which prevented the playback. |
+
+###### PLAY_ATTEMPT_FAILED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| playReason | string | Why the play attempt originated. Options: ‘Unknown’ (Unknown reason:we cannot tell), ‘Interaction’ (A viewer interacts with the UI), ‘Auto’ (Autoplay based on the configuration of the player - autoStart), ‘autoOnViewable’ (autoStart when viewable), ‘autoRepeat’ (media automatically restarted after completion, without any user interaction), ‘Api’ (caused by a call on the player’s API), ‘Internal’ (started because of an internal mechanism i.e. playlist progressed to a recommended item) |
+| errorCode | number | The identifier of error preventing the media from rendering |
+| errorMessage | string | Developer friendly description of the reason the error occurred. |
+| sourceError | object | The underlying root Error which prevented the playback. |
+
+###### CONTENT_LOADED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| contentId | string | The unique identifier of the media item being rendered by the video player. Nullable when not provided by Publisher, or unknown. |
+| contentUrl | string | The URL of the media source of the playlist item |
+| title | string | The title of the content; not meant to be used as a unique identifier. Nullable when not provided by Publisher, or unknown. |
+| description | string | The description of the content. Nullable when not provided by Publisher, or unknown. |
+| playlistIndex | number | The currently playing media item's index in the playlist. |
+| contentTags | array[string] | Customer media level tags describing the content. Nullable when not provided by Publisher, or unknown. |
+
+###### PLAY
+
+No additional params.
+
+###### PAUSE
+
+No additional params.
+
+###### BUFFER
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| time | number | Playback position of the media in seconds |
+| duration | number | Current media’s length in seconds |
+| playbackMode | number | The current playback mode used by a given player. Enum list: vod: 0, live: 1, dvr: 2 |
+
+###### TIME
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| position | number | Playback position of the media in seconds |
+| duration | number | Current media’s length in seconds |
+
+###### SEEK_START
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| position | number | Playback position of the media in seconds, when the seek begins |
+| destination | number | Desired playback position of a seek action, in seconds |
+| duration | number | Current media’s length in seconds |
+
+###### SEEK_END
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| position | number | Playback position of the media in seconds, when the seek has ended |
+| duration | number | Current media’s length in seconds |
+
+###### MUTE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| mute | boolean | Whether or not the player is currently muted. |
+
+###### VOLUME
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| volumePercentage | number | The volume of the player, as a percentage |
+
+###### RENDITION_UPDATE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| videoReportedBitrate | number | The bitrate of the currently playing video in kbps as reported by the Adaptive Manifest. |
+| audioReportedBitrate | number | The bitrate of the currently playing audio in kbps as reported by the Adaptive Manifest. |
+| encodedVideoWidth | number | The encoded width in pixels of the currently playing video rendition. |
+| encodedVideoHeight | number | The encoded height in pixels of the currently playing video rendition. |
+| videoFramerate | number | The current rate of playback. For a video that is playing twice as fast as the default playback, the playbackRate value should be 2.00 |
+
+###### ERROR
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| errorCode | number | The identifier of the error preventing the media from rendering |
+| errorMessage | string | Developer friendly description of the reason the error occurred. |
+| sourceError | object | The underlying root Error which prevented the playback. |
+
+###### COMPLETE
+
+No additional params.
+
+###### PLAYLIST_COMPLETE
+
+No additional params.
+
+###### FULLSCREEN
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| fullscreen | boolean | Whether or not the player is currently in fullscreen |
+
+###### PLAYER_RESIZE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| height | number | The height of the player in pixels |
+| width | number | The width of the player in pixels |
+
+###### VIEWABLE
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| viewable | boolean | Is the player currently viewable? |
+| viewabilityPercentage | number | The percentage of the video that is currently viewable on the user's screen. |
+
+###### CAST
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| casting | boolean | Whether or not the current user is casting to a device |
+
+###### AUCTION_AD_LOAD_ATTEMPT
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| adUnitCode | string | Unique identifier that was used when creating the ad unit. |
+
+###### AUCTION_AD_LOAD_ABORT
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adUnitCode | string | Unique identifier that was used when creating the ad unit. |
+
+###### BID_IMPRESSION
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| bid | object |  Information about the Bid which resulted in the Ad Impression |
+| adEvent | object | Event payload from the [Ad Impression](#ad-impression-params) |
+
+###### BID_ERROR
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| bid | object | Information about the Bid which resulted in the Ad Error |
+| adEvent | object | Event payload from the [Ad Error](#ad-error-params) |
+
+#### Update .submodules.json
+
+In prebid.js, add your new submodule to `.submodules.json` under the `videoModule` as such:
+{% highlight text %}
+```
+{
+  "parentModules": {
+    "videoModule": [
+      "exampleVideoProvider"
+    ]
+  }
+}
+```
+
+### Shared resources for developers
+
+A video library containing reusable code and constants has been added to Prebid.js for your convenience. We encourage you to import from this library.
+Constants such as event names can be found in the `libraries/video/constants/` folder.
diff --git a/modules/videoModule/coreVideo.js b/modules/videoModule/coreVideo.js
new file mode 100644
index 00000000000..c06482b0b36
--- /dev/null
+++ b/modules/videoModule/coreVideo.js
@@ -0,0 +1,234 @@
+import { module } from '../../src/hook.js';
+import { ParentModule, SubmoduleBuilder } from '../../libraries/video/shared/parentModule.js';
+
+// define, ortb object,  events
+
+/**
+ * Video Provider Submodule interface. All submodules of the Core Video module must adhere to this.
+ * @description attached to a video player instance.
+ * @typedef {Object} VideoProvider
+ * @function init - Instantiates the Video Provider and the video player, if not already instantiated.
+ * @function getId - retrieves the div id (unique identifier) of the attached player instance.
+ * @function getOrtbVideo - retrieves the oRTB Video params for a player's current video session.
+ * @function getOrtbContent - retrieves the oRTB Content params for a player's current video session.
+ * @function setAdTagUrl - Requests that a player render the ad in the provided ad tag url.
+ * @function onEvent - attaches an event listener to the player instance.
+ * @function offEvent - removes event listener to the player instance.
+ * @function destroy - deallocates the player instance
+ */
+
+/**
+ * @function VideoProvider#init
+ */
+
+/**
+ * @function VideoProvider#getId
+ * @returns {string}
+ */
+
+/**
+ * @function VideoProvider#getOrtbVideo
+ * @returns {Object}
+ */
+
+/**
+ * @function VideoProvider#getOrtbContent
+ * @returns {Object}
+ */
+
+/**
+ * @function VideoProvider#setAdTagUrl
+ * @param {string} adTagUrl - URL to a VAST ad tag
+ * @param {Object} options - Optional params
+ */
+
+/**
+ * @function VideoProvider#onEvent
+ * @param {string} event - name of event for which the listener should be added
+ * @param {function} callback - function that will get called when the event is triggered
+ * @param {Object} basePayload - Base payload for every event; includes common parameters such as divId and type. Event payload should be built on top of this.
+ */
+
+/**
+ * @function VideoProvider#offEvent
+ * @param {string} event - name of event for which the attached listener should be removed
+ * @param {function} callback - function that was assigned as a callback when the listener was added
+ */
+
+/**
+ * @function VideoProvider#destroy
+ */
+
+/**
+ * @typedef {Object} videoProviderConfig
+ * @name videoProviderConfig
+ * @summary contains data indicating which submodule to create and which player instance to attach it to
+ * @property {string} divId - unique identifier of the player instance
+ * @property {number} vendorCode - numeric identifier of the Video Provider type i.e. video.js or jwplayer
+ * @property {playerConfig} playerConfig
+ */
+
+/**
+ * @typedef {Object} playerConfig
+ * @name playerConfig
+ * @summary contains data indicating the behavior the player instance should have
+ * @property {boolean} autoStart - determines if the player should start automatically when instantiated
+ * @property {boolean} mute - determines if the player should be muted when instantiated
+ * @property {string} licenseKey - authentication key required for commercial players. Optional for free players.
+ * @property {playerVendorParams} params
+ */
+
+/**
+ * @typedef playerVendorParams
+ * @name playerVendorParams
+ * @summary configuration options specific to a Video Vendor's Provider
+ * @property {Object} vendorConfig - the settings object which can be used as an argument when instantiating a player. Specific to the video player's API.
+ */
+
+/**
+ * @typedef videoEvent
+ *
+ */
+
+/**
+ * Routes commands to the appropriate video submodule.
+ * @typedef {Object} VideoCore
+ * @class
+ * @function registerProvider
+ * @function getOrtbVideo
+ * @function getOrtbContent
+ * @function setAdTagUrl
+ * @function onEvents
+ * @function offEvents
+ */
+
+/**
+ * @summary Maps a Video Provider factory to the video player's vendor code.
+ * @type {vendorSubmoduleDirectory}
+ */
+const videoVendorDirectory = {};
+
+/**
+ * @constructor
+ * @param {ParentModule} parentModule_
+ * @returns {VideoCore}
+ */
+export function VideoCore(parentModule_) {
+  const parentModule = parentModule_;
+
+  /**
+   * requests that a submodule be instantiated for the specific player instance described by the @providerConfig
+   * @name VideoCore#registerProvider
+   * @param {videoProviderConfig} providerConfig
+   */
+  function registerProvider(providerConfig) {
+    try {
+      parentModule.registerSubmodule(providerConfig.divId, providerConfig.vendorCode, providerConfig);
+    } catch (e) {}
+  }
+
+  /**
+   * @name VideoCore#getOrtbVideo
+   * @summary Obtains the oRTB Video params for a player's current video session.
+   * @param {string} divId - unique identifier of the player instance
+   * @returns {Object} oRTB Video params
+   */
+  function getOrtbVideo(divId) {
+    const submodule = parentModule.getSubmodule(divId);
+    return submodule && submodule.getOrtbVideo();
+  }
+
+  /**
+   * @name VideoCore#getOrtbContent
+   * @summary Obtains the oRTB Content params for a player's current video session.
+   * @param {string} divId - unique identifier of the player instance
+   * @returns {Object} oRTB Content params
+   */
+  function getOrtbContent(divId) {
+    const submodule = parentModule.getSubmodule(divId);
+    return submodule && submodule.getOrtbContent();
+  }
+
+  /**
+   * @name VideoCore#setAdTagUrl
+   * @summary Requests that a player render the ad in the provided ad tag
+   * @param {string} adTagUrl - URL to a VAST ad tag
+   * @param {string} divId - unique identifier of the player instance
+   * @param {Object} options - additional params
+   */
+  function setAdTagUrl(adTagUrl, divId, options) {
+    const submodule = parentModule.getSubmodule(divId);
+    submodule && submodule.setAdTagUrl(adTagUrl, options);
+  }
+
+  /**
+   * @name VideoCore#onEvents
+   * @summary attaches event listeners
+   * @param {[string]} events - List of event names for which the listener should be added
+   * @param {function} callback - function that will get called when one of the events is triggered
+   * @param {string} divId - unique identifier of the player instance
+   */
+  function onEvents(events, callback, divId) {
+    if (!callback) {
+      return;
+    }
+
+    const submodule = parentModule.getSubmodule(divId);
+    if (!submodule) {
+      return;
+    }
+
+    for (let i = 0; i < events.length; i++) {
+      const type = events[i];
+      const basePayload = {
+        divId,
+        type
+      };
+      submodule.onEvent(type, callback, basePayload);
+    }
+  }
+
+  /**
+   * @name VideoCore#offEvents
+   * @summary removes event listeners
+   * @param {[string]} events - List of event names for which the listener should be removed
+   * @param {function} callback - function that was assigned as a callback when the listener was added
+   * @param {string} divId - unique identifier of the player instance
+   */
+  function offEvents(events, callback, divId) {
+    const submodule = parentModule.getSubmodule(divId);
+    if (!submodule) {
+      return;
+    }
+
+    events.forEach(event => {
+      submodule.offEvent(event, callback);
+    });
+  }
+
+  return {
+    registerProvider,
+    getOrtbVideo,
+    getOrtbContent,
+    setAdTagUrl,
+    onEvents,
+    offEvents
+  };
+}
+
+/**
+ * @function videoCoreFactory
+ * @summary Factory to create a Video Core instance
+ * @returns {VideoCore}
+ */
+export function videoCoreFactory() {
+  const videoSubmoduleBuilder = SubmoduleBuilder(videoVendorDirectory);
+  const parentModule = ParentModule(videoSubmoduleBuilder);
+  return VideoCore(parentModule);
+}
+
+function attachVideoProvider(submoduleFactory) {
+  videoVendorDirectory[submoduleFactory.vendorCode] = submoduleFactory;
+}
+
+module('video', attachVideoProvider);
diff --git a/modules/videoModule/gamAdServerSubmodule.js b/modules/videoModule/gamAdServerSubmodule.js
new file mode 100644
index 00000000000..87db71ae38b
--- /dev/null
+++ b/modules/videoModule/gamAdServerSubmodule.js
@@ -0,0 +1,27 @@
+import { GAM_VENDOR } from '../../libraries/video/constants/vendorCodes.js';
+import { getGlobal } from '../../src/prebidGlobal.js';
+
+/**
+ * @constructor
+ * @param {Object} dfpModule_ - the DFP ad server module
+ * @returns {AdServerProvider}
+ */
+function GamAdServerProvider(dfpModule_) {
+  const dfp = dfpModule_;
+
+  function getAdTagUrl(adUnit, baseAdTag, params) {
+    return dfp.buildVideoUrl({ adUnit: adUnit, url: baseAdTag, params });
+  }
+
+  return {
+    getAdTagUrl
+  }
+}
+
+export function gamSubmoduleFactory() {
+  const dfp = getGlobal().adServers.dfp;
+  const gamProvider = GamAdServerProvider(dfp);
+  return gamProvider;
+}
+
+gamSubmoduleFactory.vendorCode = GAM_VENDOR;
diff --git a/modules/videoModule/index.js b/modules/videoModule/index.js
new file mode 100644
index 00000000000..33ce3248d91
--- /dev/null
+++ b/modules/videoModule/index.js
@@ -0,0 +1,244 @@
+import { config } from '../../src/config.js';
+import { find } from '../../src/polyfill.js';
+import * as events from '../../src/events.js';
+import { mergeDeep } from '../../src/utils.js';
+import { getGlobal } from '../../src/prebidGlobal.js';
+import CONSTANTS from '../../src/constants.json';
+import {
+  videoEvents, AUCTION_AD_LOAD_ATTEMPT, AD_IMPRESSION, AD_ERROR, BID_IMPRESSION, BID_ERROR, AUCTION_AD_LOAD_ABORT
+} from '../../libraries/video/constants/events.js'
+import { PLACEMENT } from '../../libraries/video/constants/ortb.js';
+import { videoCoreFactory } from './coreVideo.js';
+import { gamSubmoduleFactory } from './gamAdServerSubmodule.js';
+import { videoImpressionVerifierFactory } from './videoImpressionVerifier.js';
+
+const videoKey = 'video';
+
+const allVideoEvents = Object.keys(videoEvents).map(eventKey => videoEvents[eventKey]);
+events.addEvents(allVideoEvents.concat([AUCTION_AD_LOAD_ATTEMPT, AUCTION_AD_LOAD_ABORT, BID_IMPRESSION, BID_ERROR]).map(getExternalVideoEventName));
+
+/**
+ * This module adds User Video support to prebid.js
+ * @module modules/videoModule
+ */
+export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvents_, gamAdServerFactory_, videoImpressionVerifierFactory_) {
+  const videoCore = videoCore_;
+  const getConfig = getConfig_;
+  const pbGlobal = pbGlobal_;
+  const requestBids = pbGlobal.requestBids;
+  const pbEvents = pbEvents_;
+  const videoEvents = videoEvents_;
+  const gamAdServerFactory = gamAdServerFactory_;
+  let gamSubmodule;
+  let mainContentDivId;
+  let contentEnrichmentEnabled = true;
+  const videoImpressionVerifierFactory = videoImpressionVerifierFactory_;
+  let videoImpressionVerifier;
+
+  function init() {
+    const cache = getConfig('cache');
+    videoImpressionVerifier = videoImpressionVerifierFactory(!!cache);
+    getConfig(videoKey, ({ video }) => {
+      video.providers.forEach(provider => {
+        videoCore.registerProvider(provider);
+        videoCore.onEvents(videoEvents, (type, payload) => {
+          pbEvents.emit(getExternalVideoEventName(type), payload);
+        }, provider.divId);
+
+        const adServerConfig = provider.adServer;
+        if (!gamSubmodule && adServerConfig) {
+          gamSubmodule = gamAdServerFactory();
+        }
+      });
+      contentEnrichmentEnabled = video.contentEnrichmentEnabled !== false;
+      mainContentDivId = contentEnrichmentEnabled ? video.mainContentDivId : null;
+    });
+
+    requestBids.before(beforeBidsRequested, 40);
+
+    pbEvents.on(CONSTANTS.EVENTS.BID_ADJUSTMENT, function (bid) {
+      videoImpressionVerifier.trackBid(bid);
+    });
+
+    pbEvents.on(getExternalVideoEventName(AD_IMPRESSION), function (payload) {
+      triggerVideoBidEvent(BID_IMPRESSION, payload);
+    });
+
+    pbEvents.on(getExternalVideoEventName(AD_ERROR), function (payload) {
+      triggerVideoBidEvent(BID_ERROR, payload);
+    });
+  }
+
+  function renderBid(divId, bid, options = {}) {
+    const adUrl = bid.vastUrl;
+    options.adXml = bid.vastXml;
+    options.winner = bid.bidder;
+    loadAdTag(adUrl, divId, options);
+  }
+
+  function getOrtbVideo(divId) {
+    return videoCore.getOrtbVideo(divId);
+  }
+
+  function getOrtbContent(divId) {
+    return videoCore.getOrtbContent(divId);
+  }
+
+  return { init, renderBid, getOrtbVideo, getOrtbContent };
+
+  function beforeBidsRequested(nextFn, bidderRequest) {
+    enrichAuction(bidderRequest);
+
+    const bidsBackHandler = bidderRequest.bidsBackHandler;
+    if (!bidsBackHandler || typeof bidsBackHandler !== 'function') {
+      pbEvents.on(CONSTANTS.EVENTS.AUCTION_END, auctionEnd);
+    }
+
+    return nextFn.call(this, bidderRequest);
+  }
+
+  function enrichAuction(bidderRequest) {
+    if (mainContentDivId) {
+      enrichOrtb2(mainContentDivId, bidderRequest);
+    }
+
+    const adUnits = bidderRequest.adUnits || pbGlobal.adUnits || [];
+    adUnits.forEach(adUnit => {
+      const divId = getDivId(adUnit);
+      enrichAdUnit(adUnit, divId);
+      if (contentEnrichmentEnabled && !mainContentDivId) {
+        enrichOrtb2(divId, bidderRequest);
+      }
+    });
+  }
+
+  function getDivId(adUnit) {
+    const videoConfig = adUnit.video;
+    if (!adUnit.mediaTypes.video || !videoConfig) {
+      return;
+    }
+
+    return videoConfig.divId;
+  }
+
+  function enrichAdUnit(adUnit, videoDivId) {
+    const ortbVideo = getOrtbVideo(videoDivId);
+    if (!ortbVideo) {
+      return;
+    }
+
+    const video = Object.assign({}, adUnit.mediaTypes.video, ortbVideo);
+
+    video.context = ortbVideo.placement === PLACEMENT.INSTREAM ? 'instream' : 'outstream';
+
+    const width = ortbVideo.w;
+    const height = ortbVideo.h;
+    if (width && height) {
+      video.playerSize = [width, height];
+    }
+
+    adUnit.mediaTypes.video = video;
+  }
+
+  function enrichOrtb2(divId, bidderRequest) {
+    const ortbContent = getOrtbContent(divId);
+    if (!ortbContent) {
+      return;
+    }
+    bidderRequest.ortb2 = mergeDeep({}, bidderRequest.ortb2, { site: { content: ortbContent } });
+  }
+
+  function auctionEnd(auctionResult) {
+    auctionResult.adUnits.forEach(adUnit => {
+      if (adUnit.video) {
+        renderWinningBid(adUnit);
+      }
+    });
+    pbEvents.off(CONSTANTS.EVENTS.AUCTION_END, auctionEnd);
+  }
+
+  function getAdServerConfig(adUnitVideoConfig) {
+    const globalVideoConfig = getConfig(videoKey);
+    const globalProviderConfig = globalVideoConfig.providers.find(provider => provider.divId === adUnitVideoConfig.divId) || {};
+    if (!globalVideoConfig.adServer && !globalProviderConfig.adServer && !adUnitVideoConfig.adServer) {
+      return;
+    }
+    return mergeDeep({}, globalVideoConfig.adServer, globalProviderConfig.adServer, adUnitVideoConfig.adServer);
+  }
+
+  function renderWinningBid(adUnit) {
+    const adUnitCode = adUnit.code;
+    const options = { adUnitCode };
+
+    const videoConfig = adUnit.video;
+    const divId = videoConfig.divId;
+    const adServerConfig = getAdServerConfig(videoConfig);
+    let adUrl;
+    if (adServerConfig) {
+      adUrl = gamSubmodule.getAdTagUrl(adUnit, adServerConfig.baseAdTagUrl, adServerConfig.params);
+    }
+
+    if (adUrl) {
+      loadAdTag(adUrl, divId, options);
+      return;
+    }
+
+    const highestCpmBids = pbGlobal.getHighestCpmBids(adUnitCode);
+    if (!highestCpmBids.length) {
+      pbEvents.emit(getExternalVideoEventName(AUCTION_AD_LOAD_ABORT), options);
+      return;
+    }
+
+    const highestBid = highestCpmBids.shift();
+    if (!highestBid) {
+      return;
+    }
+
+    renderBid(divId, highestBid, options);
+  }
+
+  // options: adXml, winner, adUnitCode,
+  function loadAdTag(adTagUrl, divId, options) {
+    const payload = Object.assign({ adTagUrl }, options);
+    pbEvents.emit(getExternalVideoEventName(AUCTION_AD_LOAD_ATTEMPT), payload);
+    videoCore.setAdTagUrl(adTagUrl, divId, options);
+  }
+
+  function triggerVideoBidEvent(eventName, adEventPayload) {
+    const bid = getBid(adEventPayload);
+    if (!bid) {
+      return;
+    }
+
+    pbGlobal.markWinningBidAsUsed(bid);
+    pbEvents.emit(getExternalVideoEventName(eventName), { bid, adEvent: adEventPayload });
+  }
+
+  function getBid(adPayload) {
+    const { adId, adTagUrl, wrapperAdIds } = adPayload;
+    const bidIdentifiers = videoImpressionVerifier.getBidIdentifiers(adId, adTagUrl, wrapperAdIds);
+    if (!bidIdentifiers) {
+      return;
+    }
+
+    const { adUnitCode, requestId, auctionId } = bidIdentifiers;
+    const bidAdId = bidIdentifiers.adId;
+    const { bids } = pbGlobal.getBidResponsesForAdUnitCode(adUnitCode);
+    return find(bids, bid => bid.adId === bidAdId && bid.requestId === requestId && bid.auctionId === auctionId);
+  }
+}
+
+export function pbVideoFactory() {
+  const videoCore = videoCoreFactory();
+  const pbGlobal = getGlobal();
+  const pbVideo = PbVideo(videoCore, config.getConfig, pbGlobal, events, allVideoEvents, gamSubmoduleFactory, videoImpressionVerifierFactory);
+  pbVideo.init();
+  pbGlobal.videoModule = pbVideo;
+  return pbVideo;
+}
+
+function getExternalVideoEventName(eventName) {
+  return videoKey + eventName.replace(/^./, eventName[0].toUpperCase());
+}
+
+pbVideoFactory();
diff --git a/modules/videoModule/videoImpressionVerifier.js b/modules/videoModule/videoImpressionVerifier.js
new file mode 100644
index 00000000000..60717c0f855
--- /dev/null
+++ b/modules/videoModule/videoImpressionVerifier.js
@@ -0,0 +1,206 @@
+import { find } from '../../src/polyfill.js';
+import { vastXmlEditorFactory } from '../../libraries/video/shared/vastXmlEditor.js';
+import { generateUUID } from '../../src/utils.js';
+
+export const PB_PREFIX = 'pb_';
+export const UUID_MARKER = PB_PREFIX + 'uuid';
+
+/**
+ * Video Impression Verifier interface. All implementations of a Video Impression Verifier must comply with this interface.
+ * @description adds tracking markers to an ad and extracts the bid identifiers from ad event information.
+ * @typedef {Object} VideoImpressionVerifier
+ * @function trackBid - requests that a bid's ad be tracked for impression verification.
+ * @function getBidIdentifiers - requests information from the ad event data that can be used to match the ad to a tracked bid.
+ */
+
+/**
+ * @function VideoImpressionVerifier#trackBid
+ * @param {Object} bid - Bid that should be tracked.
+ * @return {String} - Identifier for the bid being tracked.
+ */
+
+/**
+ * @function VideoImpressionVerifier#getBidIdentifiers
+ * @param {String} adId - In the VAST tag, this value is present in the Ad element's id property.
+ * @param {String} adTagUrl - The ad tag url that was loaded into the player.
+ * @param {[String]} adWrapperIds - List of ad id's that were obtained from the different wrappers. Each redirect points to an ad wrapper.
+ * @return {bidIdentifier} - Object allowing the bid matching the ad event to be identified.
+ */
+
+/**
+ * @typedef {Object} bidIdentifier
+ * @property {String} adId - Bid identifier.
+ * @property {String} adUnitCode - Identifier for the Ad Unit for which the bid was made.
+ * @property {String} auctionId - Id of the auction in which the bid was made.
+ * @property {String} requestId - Id of the bid request which resulted in the bid.
+ */
+
+/**
+ * Factory function for obtaining a Video Impression Verifier.
+ * @param {Boolean} isCacheUsed - wether Prebid is configured to use a cache.
+ * @return {VideoImpressionVerifier}
+ */
+export function videoImpressionVerifierFactory(isCacheUsed) {
+  const vastXmlEditor = vastXmlEditorFactory();
+  const bidTracker = tracker();
+  if (isCacheUsed) {
+    return cachedVideoImpressionVerifier(vastXmlEditor, bidTracker);
+  }
+
+  return videoImpressionVerifier(vastXmlEditor, bidTracker);
+}
+
+export function videoImpressionVerifier(vastXmlEditor_, bidTracker_) {
+  const verifier = baseImpressionVerifier(bidTracker_);
+  const superTrackBid = verifier.trackBid;
+  const vastXmlEditor = vastXmlEditor_;
+
+  verifier.trackBid = function(bid) {
+    let { vastXml, vastUrl } = bid;
+    if (!vastXml && !vastUrl) {
+      return;
+    }
+
+    const uuid = superTrackBid(bid);
+
+    if (vastUrl) {
+      const url = new URL(vastUrl);
+      url.searchParams.append(UUID_MARKER, uuid);
+      bid.vastUrl = url.toString();
+    } else if (vastXml) {
+      bid.vastXml = vastXmlEditor.getVastXmlWithTracking(vastXml, uuid);
+    }
+
+    return uuid;
+  }
+
+  return verifier;
+}
+
+export function cachedVideoImpressionVerifier(vastXmlEditor_, bidTracker_) {
+  const verifier = baseImpressionVerifier(bidTracker_);
+  const superTrackBid = verifier.trackBid;
+  const superGetBidIdentifiers = verifier.getBidIdentifiers;
+  const vastXmlEditor = vastXmlEditor_;
+
+  verifier.trackBid = function (bid, globalAdUnits) {
+    const adIdOverride = superTrackBid(bid);
+    let { vastXml, vastUrl, adId, adUnitCode } = bid;
+    const adUnit = find(globalAdUnits, adUnit => adUnitCode === adUnit.code);
+    const videoConfig = adUnit && adUnit.video;
+    const adServerConfig = videoConfig && videoConfig.adServer;
+    const trackingConfig = adServerConfig && adServerConfig.tracking;
+    let impressionUrl;
+    let impressionId;
+    let errorUrl;
+    const impressionTracking = trackingConfig.impression;
+    const errorTracking = trackingConfig.error;
+
+    if (impressionTracking) {
+      impressionUrl = getTrackingUrl(impressionTracking.getUrl, bid);
+      impressionId = impressionTracking.id || adId + '-impression';
+    }
+
+    if (errorTracking) {
+      errorUrl = getTrackingUrl(errorTracking.getUrl, bid);
+    }
+
+    if (vastXml) {
+      vastXml = vastXmlEditor.getVastXmlWithTracking(vastXml, adIdOverride, impressionUrl, impressionId, errorUrl);
+    } else if (vastUrl) {
+      vastXml = vastXmlEditor.buildVastWrapper(adIdOverride, vastUrl, impressionUrl, impressionId, errorUrl);
+    }
+
+    bid.vastXml = vastXml;
+    return adIdOverride;
+  }
+
+  verifier.getBidIdentifiers = function (adId, adTagUrl, adWrapperIds) {
+    // When the video is cached, the ad tag loaded into the player is a parent wrapper of the cache url.
+    // As a result, the ad tag Url cannot include identifiers.
+    return superGetBidIdentifiers(adId, null, adWrapperIds);
+  }
+
+  return verifier;
+
+  function getTrackingUrl(getUrl, bid) {
+    if (!getUrl || typeof getUrl !== 'function') {
+      return;
+    }
+
+    return getUrl(bid);
+  }
+}
+
+export function baseImpressionVerifier(bidTracker_) {
+  const bidTracker = bidTracker_;
+
+  function trackBid(bid) {
+    let { adId, adUnitCode, requestId, auctionId } = bid;
+    const trackingId = PB_PREFIX + generateUUID(10 ** 13);
+    bidTracker.store(trackingId, { adId, adUnitCode, requestId, auctionId });
+    return trackingId;
+  }
+
+  function getBidIdentifiers(adId, adTagUrl, adWrapperIds) {
+    return bidTracker.remove(adId) || getBidForAdTagUrl(adTagUrl) || getBidForAdWrappers(adWrapperIds);
+  }
+
+  return {
+    trackBid,
+    getBidIdentifiers
+  };
+
+  function getBidForAdTagUrl(adTagUrl) {
+    if (!adTagUrl) {
+      return;
+    }
+
+    let url;
+    try {
+      url = new URL(adTagUrl);
+    } catch (e) {
+      return;
+    }
+
+    const queryParams = url.searchParams;
+    let uuid = queryParams.get(UUID_MARKER);
+    return uuid && bidTracker.remove(uuid);
+  }
+
+  function getBidForAdWrappers(adWrapperIds) {
+    if (!adWrapperIds || !adWrapperIds.length) {
+      return;
+    }
+
+    for (const wrapperId in adWrapperIds) {
+      const bidInfo = bidTracker.remove(wrapperId);
+      if (bidInfo) {
+        return bidInfo;
+      }
+    }
+  }
+}
+
+export function tracker() {
+  const model = {};
+
+  function store(key, value) {
+    model[key] = value;
+  }
+
+  function remove(key) {
+    const value = model[key];
+    if (!value) {
+      return;
+    }
+
+    delete model[key];
+    return value;
+  }
+
+  return {
+    store,
+    remove
+  }
+}
diff --git a/modules/videojsVideoProvider.js b/modules/videojsVideoProvider.js
new file mode 100644
index 00000000000..a142e0fbb84
--- /dev/null
+++ b/modules/videojsVideoProvider.js
@@ -0,0 +1,854 @@
+import {
+  SETUP_COMPLETE, SETUP_FAILED, DESTROYED,
+  PLAYLIST, PLAYBACK_REQUEST, CONTENT_LOADED, PLAY, PAUSE, TIME, SEEK_START, SEEK_END, MUTE, VOLUME, ERROR, COMPLETE,
+  FULLSCREEN, PLAYER_RESIZE,
+  AD_REQUEST, AD_IMPRESSION, AD_TIME, AD_COMPLETE, AD_SKIPPED, AD_CLICK, AD_STARTED, AD_ERROR, AD_LOADED, AD_PLAY, AD_PAUSE
+} from '../libraries/video/constants/events.js';
+// missing events: , AD_BREAK_START, , AD_BREAK_END, VIEWABLE, BUFFER, CAST, PLAYLIST_COMPLETE, RENDITION_UPDATE, PLAY_ATTEMPT_FAILED, AUTOSTART_BLOCKED
+import {
+  PROTOCOLS, API_FRAMEWORKS, VIDEO_MIME_TYPE, PLAYBACK_METHODS, PLACEMENT, VPAID_MIME_TYPE, AD_POSITION, PLAYBACK_END
+} from '../libraries/video/constants/ortb.js';
+import { VIDEO_JS_VENDOR } from '../libraries/video/constants/vendorCodes.js';
+import { submodule } from '../src/hook.js';
+import stateFactory from '../libraries/video/shared/state.js';
+import { PLAYBACK_MODE } from '../libraries/video/constants/enums.js';
+import { getEventHandler } from '../libraries/video/shared/eventHandler.js';
+
+/*
+Plugins of interest:
+https://www.npmjs.com/package/videojs-chromecast
+https://www.npmjs.com/package/@silvermine/videojs-airplay
+https://www.npmjs.com/package/videojs-airplay
+https://www.npmjs.com/package/@silvermine/videojs-chromecast
+https://www.npmjs.com/package/videojs-ima
+https://github.com/googleads/videojs-ima
+https://github.com/videojs/videojs-playlist
+https://github.com/videojs/videojs-contrib-ads
+https://github.com/videojs/videojs-errors
+https://github.com/videojs/videojs-overlay
+https://github.com/videojs/videojs-playlist-ui
+
+inspiration:
+https://github.com/Conviva/conviva-js-videojs/blob/master/conviva-videojs-module.js
+ */
+
+const setupFailMessage = 'Failed to instantiate the player';
+const AD_MANAGER_EVENTS = [AD_LOADED, AD_STARTED, AD_IMPRESSION, AD_PLAY, AD_PAUSE, AD_TIME, AD_COMPLETE, AD_SKIPPED];
+
+export function VideojsProvider(config, vjs_, adState_, timeState_, callbackStorage_, utils) {
+  let vjs = vjs_;
+  // Supplied callbacks are typically wrapped by handlers
+  // we use this dict to keep track of these pairings
+  const callbackToHandler = {};
+
+  const adState = adState_;
+  const timeState = timeState_;
+  let player = null;
+  let playerVersion = null;
+  let playerIsSetup = false;
+  const {playerConfig, divId} = config;
+  let isMuted;
+  let previousLastTimePosition = 0;
+  let lastTimePosition = 0;
+
+  let setupCompleteCallbacks = [];
+  let setupFailedCallbacks = [];
+  let setupFailedEventHandlers = [];
+
+  // TODO: test with older videojs versions
+  let minimumSupportedPlayerVersion = '7.17.0';
+
+  function init() {
+    if (!vjs) {
+      triggerSetupFailure(-1, setupFailMessage + ': Videojs not present')
+      return;
+    }
+
+    playerVersion = vjs.VERSION;
+    if (playerVersion < minimumSupportedPlayerVersion) {
+      triggerSetupFailure(-2, setupFailMessage + ': Videojs version not supported');
+      return;
+    }
+
+    if (!document.getElementById(divId)) {
+      triggerSetupFailure(-3, setupFailMessage + ': No div found with id ' + divId);
+      return;
+    }
+
+    const instantiatedPlayers = vjs.players;
+    if (instantiatedPlayers && instantiatedPlayers[divId]) {
+      // already instantiated
+      player = instantiatedPlayers[divId];
+      onReady();
+      return;
+    }
+
+    setupPlayer(playerConfig);
+
+    if (!player) {
+      triggerSetupFailure(-4, setupFailMessage);
+    }
+  }
+
+  function getId() {
+    return divId;
+  }
+
+  function getOrtbVideo() {
+    if (!player) {
+      return;
+    }
+
+    let playBackMethod = PLAYBACK_METHODS.CLICK_TO_PLAY;
+    // returns a boolean or a string with the autoplay strategy
+    const autoplay = player.autoplay();
+    const muted = player.muted() || autoplay === 'muted';
+    // check if autoplay is truthy since it may be a bool or string
+    if (autoplay) {
+      playBackMethod = muted ? PLAYBACK_METHODS.AUTOPLAY_MUTED : PLAYBACK_METHODS.AUTOPLAY;
+    }
+    const supportedMediaTypes = Object.values(VIDEO_MIME_TYPE).filter(
+      // Follows w3 spec https://www.w3.org/TR/2011/WD-html5-20110113/video.html#dom-navigator-canplaytype
+      type => player.canPlayType(type) !== ''
+    )
+
+    // IMA supports vpaid unless its expliclty turned off
+    // TODO: needs a reference to the imaOptions used at setup to determine if vpaid can be used
+    // if (imaOptions && imaOptions.vpaidMode !== 0) {
+    supportedMediaTypes.push(VPAID_MIME_TYPE);
+    // }
+
+    const video = {
+      mimes: supportedMediaTypes,
+      // Based on the protocol support provided by the videojs-ima plugin
+      // https://developers.google.com/interactive-media-ads/docs/sdks/html5/client-side/compatibility
+      // Need to check for the plugins
+      protocols: [
+        PROTOCOLS.VAST_2_0,
+      ],
+      api: [
+        API_FRAMEWORKS.VPAID_2_0 // TODO: needs a reference to the imaOptions used at setup to determine if vpaid can be used
+      ],
+      // TODO: Make sure this returns dimensions in DIPS
+      h: player.currentHeight(),
+      w: player.currentWidth(),
+      // TODO: implement startdelay since its reccomend param
+      // both linearity forms are supported so the param is excluded
+      // sequence - TODO not yet supported
+      maxextended: -1,
+      boxingallowed: 1,
+      playbackmethod: [ playBackMethod ],
+      playbackend: PLAYBACK_END.VIDEO_COMPLETION,
+      // Per ortb 7.4 skip is omitted since neither the player nor ima plugin imposes a skip button, or a skipmin/max
+    };
+
+    // TODO: Determine placement may not be in stream if videojs is only used to serve ad content
+    // ~ Sort of resolved check if the player has a source to tell if the placement is instream
+    // Still cannot reliably check what type of placement the player is if its outstream
+    // i.e. we can't tell if its interstitial, in article, etc.
+    if (player.src()) {
+      video.placement = PLACEMENT.INSTREAM;
+    }
+
+    // Placement according to IQG Guidelines 4.2.8
+    // https://cdn2.hubspot.net/hubfs/2848641/TrustworthyAccountabilityGroup_May2017/Docs/TAG-Inventory-Quality-Guidelines-v2_2-10-18-2016.pdf?t=1509469105938
+    const findPosition = vjs.dom.findPosition;
+    if (player.isFullscreen()) {
+      video.pos = AD_POSITION.FULL_SCREEN;
+    } else if (findPosition) {
+      video.pos = utils.getPositionCode(findPosition(player.el()));
+    }
+
+    return video;
+  }
+
+  function getOrtbContent() {
+    if (!player) {
+      return;
+    }
+
+    const content = {
+      // id:, TODO: find a suitable id for videojs sources
+      url: player.currentSrc()
+    };
+    // Only include length if player is ready
+    // player.readyState() returns a level of readiness from 0 to 4
+    // https://docs.videojs.com/player#readyState
+    if (player.readyState()) {
+      content.len = Math.round(player.duration());
+    }
+
+    const mediaItem = utils.getMedia(player);
+    if (mediaItem) {
+      for (let param of ['id', 'title', 'description', 'album', 'artist']) {
+        if (mediaItem[param]) {
+          content[param] = mediaItem[param];
+        }
+      }
+    }
+
+    const contentUrl = utils.getValidMediaUrl(mediaItem && mediaItem.src, player.src)
+    if (contentUrl) {
+      content.url = contentUrl;
+    }
+
+    return content;
+  }
+
+  // Plugins to integrate: https://github.com/googleads/videojs-ima
+  function setAdTagUrl(adTagUrl, options) {
+    if (!player.ima || !adTagUrl) {
+      return;
+    }
+
+    player.ima.changeAdTag(adTagUrl);
+    player.ima.requestAds();
+  }
+
+  function onEvent(type, callback, payload) {
+    registerSetupListeners(type, callback, payload);
+
+    if (!player) {
+      return;
+    }
+
+    player.ready(() => {
+      registerListeners(type, callback, payload);
+    });
+  }
+
+  function registerSetupListeners(externalEventName, callback, basePayload) {
+    // no point in registering for setup failures if already setup.
+    if (playerIsSetup) {
+      return;
+    }
+
+    if (externalEventName === SETUP_COMPLETE) {
+      setupCompleteCallbacks.push(callback);
+    } else if (externalEventName === SETUP_FAILED) {
+      setupFailedCallbacks.push(callback);
+      registerSetupErrorListener()
+    }
+  }
+
+  function registerSetupErrorListener() {
+    if (!player) {
+      return
+    }
+
+    const eventHandler = () => {
+      /*
+      Videojs has no specific setup error handler
+      so we imitate it by hooking to the general error
+      handler and checking to see if the player has been setup
+       */
+      if (playerIsSetup) {
+        return;
+      }
+
+      const error = player.error();
+      triggerSetupFailure(error.code, error.message, error);
+    };
+
+    player.on(ERROR, eventHandler);
+    setupFailedEventHandlers.push(eventHandler)
+  }
+
+  function registerListeners(externalEventName, callback, basePayload) {
+    if (externalEventName === MUTE) {
+      const eventHandler = () => {
+        if (isMuted !== player.muted()) {
+          basePayload.mute = isMuted = !isMuted;
+          callback(externalEventName, basePayload);
+        }
+      };
+      player.on(utils.getVideojsEventName(VOLUME), eventHandler);
+      return;
+    }
+
+    let getEventPayload;
+
+    switch (externalEventName) {
+      case PLAY:
+      case PAUSE:
+      case DESTROYED:
+        break;
+
+      case PLAYBACK_REQUEST:
+        getEventPayload = e => ({ playReason: 'unknown' });
+        break;
+
+      case AD_REQUEST:
+        getEventPayload = e => {
+          const adTagUrl = e.AdsRequest.adTagUrl;
+          adState.updateState({ adTagUrl });
+          return { adTagUrl };
+        };
+        break
+
+      case AD_LOADED:
+        getEventPayload = (e) => {
+          const imaAd = e.getAdData && e.getAdData();
+          adState.updateForEvent(imaAd);
+          timeState.clearState();
+          return adState.getState();
+        };
+        break
+
+      case AD_STARTED:
+      case AD_PLAY:
+      case AD_PAUSE:
+        getEventPayload = () => adState.getState();
+        break
+
+      case AD_IMPRESSION:
+      case AD_CLICK:
+        getEventPayload = () => Object.assign({}, adState.getState(), timeState.getState());
+        break
+
+      case AD_TIME:
+        getEventPayload = (e) => {
+          const adTimeEvent = e && e.getAdData && e.getAdData();
+          timeState.updateForTimeEvent(adTimeEvent);
+          return Object.assign({}, adState.getState(), timeState.getState());
+        };
+        break
+
+      case AD_COMPLETE:
+        getEventPayload = () => {
+          const currentState = adState.getState();
+          adState.clearState();
+          return currentState;
+        };
+        break
+
+      case AD_SKIPPED:
+        getEventPayload = () => {
+          const currentState = Object.assign({}, adState.getState(), timeState.getState());
+          adState.clearState();
+          return currentState;
+        };
+        break
+
+      case AD_ERROR:
+        getEventPayload = e => {
+          const imaAdError = e.data && e.data.AdError;
+          const extraPayload = Object.assign({
+            playerErrorCode: imaAdError.getErrorCode(),
+            vastErrorCode: imaAdError.getVastErrorCode(),
+            errorMessage: imaAdError.getMessage(),
+            sourceError: imaAdError.getInnerError()
+            // timeout
+          }, adState.getState(), timeState.getState());
+          adState.clearState();
+          return extraPayload;
+        };
+        break
+
+      case PLAYLIST:
+        getEventPayload = e => ({
+          playlistItemCount: utils.getPlaylistCount(player),
+          autostart: player.autoplay()
+        });
+        break
+
+      case CONTENT_LOADED:
+        getEventPayload = e => {
+          const media = utils.getMedia(player);
+          const contentUrl = utils.getValidMediaUrl(media && media.src, player.src, e && e.target && e.target.currentSrc)
+          return {
+            contentId: media && media.id,
+            contentUrl,
+            title: media && media.title,
+            description: media && media.description,
+            playlistIndex: utils.getCurrentPlaylistIndex(player),
+            contentTags: media && media.contentTags
+          };
+        };
+        break;
+
+      case TIME:
+        // TODO: might want to check seeking() and/or scrubbing()
+        getEventPayload = e => {
+          previousLastTimePosition = lastTimePosition;
+          const currentTime = player.currentTime();
+          const duration = player.duration();
+          timeState.updateForTimeEvent({ currentTime, duration });
+          lastTimePosition = currentTime;
+          return {
+            position: lastTimePosition,
+            duration
+          };
+        };
+        break;
+
+      case SEEK_START:
+        getEventPayload = e => {
+          return {
+            position: previousLastTimePosition,
+            destination: player.currentTime(),
+            duration: player.duration()
+          };
+        }
+        break;
+
+      case SEEK_END:
+        getEventPayload = () => ({
+          position: player.currentTime(),
+          duration: player.duration()
+        });
+        break;
+
+      case VOLUME:
+        getEventPayload = e => ({ volumePercentage: player.volume() * 100 });
+        break;
+
+      case ERROR:
+        getEventPayload = e => {
+          const error = player.error();
+          return {
+            sourceError: error,
+            errorCode: error.code,
+            errorMessage: error.message,
+          };
+        };
+        break;
+
+      case COMPLETE:
+        getEventPayload = e => {
+          previousLastTimePosition = lastTimePosition = 0;
+          timeState.clearState();
+        };
+        break;
+
+      case FULLSCREEN:
+        getEventPayload = e => ({ fullscreen: player.isFullscreen() });
+        break;
+
+      case PLAYER_RESIZE:
+        getEventPayload = e => ({
+          height: player.currentHeight(),
+          width: player.currentWidth(),
+        });
+        break;
+
+      default:
+        return;
+    }
+
+    const eventHandler = getEventHandler(externalEventName, callback, basePayload, getEventPayload);
+
+    if (externalEventName === PLAYLIST) {
+      registerPlaylistEventListener(eventHandler);
+      return;
+    }
+
+    const videojsEventName = utils.getVideojsEventName(externalEventName);
+
+    if (AD_MANAGER_EVENTS.includes(externalEventName)) {
+      player.on('ads-manager', () => player.ima.addEventListener(videojsEventName, eventHandler));
+    } else {
+      player.on(videojsEventName, eventHandler);
+    }
+  }
+
+  function registerPlaylistEventListener(eventHandler) {
+    if (player.playlist) {
+      // force a playlist event on first item load
+      player.one('loadstart', eventHandler);
+      player.on('playlistchange', eventHandler);
+    } else {
+      // When playlist plugin is not used, treat each media item as a single item playlist
+      player.on('loadstart', eventHandler);
+    }
+  }
+
+  function offEvent(event, callback) {
+    const videojsEvent = utils.getVideojsEventName(event)
+    if (!callback) {
+      player.off(videojsEvent);
+      return;
+    }
+
+    const eventHandler = callbackToHandler[event];// callbackStorage.getCallback(event, callback);
+    if (eventHandler) {
+      player.off(videojsEvent, eventHandler);
+    }
+  }
+
+  function destroy() {
+    if (!player) {
+      return;
+    }
+    player.remove();
+    player = null;
+  }
+
+  return {
+    init,
+    getId,
+    getOrtbVideo,
+    getOrtbContent,
+    setAdTagUrl,
+    onEvent,
+    offEvent,
+    destroy
+  };
+
+  function setupPlayer(config) {
+    const setupConfig = utils.getSetupConfig(config);
+    player = vjs(divId, setupConfig, onReady);
+  }
+
+  function onReady() {
+    try {
+      setupAds();
+    } catch (e) {
+      triggerSetupFailure(-5, e.message);
+      return;
+    }
+    triggerSetupComplete();
+  }
+
+  // TODO: consider supporting https://www.npmjs.com/package/videojs-vast-vpaid as well
+  function setupAds() {
+    if (!player.ima) {
+      throw new Error(setupFailMessage + ': ima plugin is missing');
+    }
+
+    if (typeof player.ima !== 'function') {
+      // when player.ima is already instantiated, it is an object. Early abort if already instantiated.
+      return;
+    }
+
+    const adConfig = utils.getAdConfig(config);
+    player.ima(adConfig);
+  }
+
+  function triggerSetupFailure(errorCode, msg, sourceError) {
+    const payload = {
+      divId,
+      playerVersion,
+      type: SETUP_FAILED,
+      errorCode,
+      errorMessage: msg,
+      sourceError: sourceError
+    };
+    setupFailedCallbacks.forEach(setupFailedCallback => setupFailedCallback(SETUP_FAILED, payload));
+    setupFailedCallbacks = [];
+  }
+
+  function triggerSetupComplete() {
+    playerIsSetup = true;
+    const payload = {
+      divId,
+      playerVersion,
+      type: SETUP_COMPLETE,
+    };
+
+    setupCompleteCallbacks.forEach(callback => callback(SETUP_COMPLETE, payload));
+    setupCompleteCallbacks = [];
+
+    isMuted = player.muted();
+
+    setupFailedEventHandlers.forEach(eventHandler => player.off('error', eventHandler));
+    setupFailedEventHandlers = [];
+  }
+}
+
+export const utils = {
+  getSetupConfig: function (config) {
+    if (!config) {
+      return;
+    }
+
+    const params = config.params || {};
+    const videojsConfig = params.vendorConfig || {};
+
+    if (videojsConfig.autostart === undefined && config.autostart !== undefined) {
+      videojsConfig.autostart = config.autostart
+    }
+
+    if (videojsConfig.muted === undefined && config.mute !== undefined) {
+      videojsConfig.muted = config.mute;
+    }
+
+    return videojsConfig;
+  },
+
+  getAdConfig: function (config) {
+    const params = config && config.params;
+    if (!params) {
+      return {};
+    }
+
+    return params.adPluginConfig || {}; // TODO: add adPluginConfig to spec
+  },
+
+  getPositionCode: function({left, top, width, height}) {
+    const bottom = window.innerHeight - top - height;
+    const right = window.innerWidth - left - width;
+
+    if (left < 0 || right < 0 || top < 0) {
+      return AD_POSITION.UNKNOWN;
+    }
+
+    return bottom >= 0 ? AD_POSITION.ABOVE_THE_FOLD : AD_POSITION.BELOW_THE_FOLD;
+  },
+
+  getVideojsEventName: function(eventName) {
+    switch (eventName) {
+      case SETUP_COMPLETE:
+        return 'ready';
+      case SETUP_FAILED:
+        return 'error';
+      case DESTROYED:
+        return 'dispose';
+      case AD_REQUEST:
+        return 'ads-request';
+      case AD_LOADED:
+        return 'loaded'
+      case AD_STARTED:
+        return 'start';
+      case AD_IMPRESSION:
+        return 'impression';
+      case AD_PLAY:
+        return 'resume'
+      case AD_PAUSE:
+        return PAUSE;
+      case AD_TIME:
+        return 'adProgress';
+      case AD_CLICK:
+        return 'click';
+      case AD_COMPLETE:
+        return COMPLETE;
+      case AD_SKIPPED:
+        return 'skip';
+      case AD_ERROR:
+        return 'adserror';
+      case CONTENT_LOADED:
+        return 'loadstart';
+      case PLAY:
+        return PLAY + 'ing';
+      case PLAYBACK_REQUEST:
+        return PLAY;
+      case SEEK_START:
+        return 'seeking';
+      case SEEK_END:
+        return 'seeked';
+      case TIME:
+        return TIME + 'update';
+      case VOLUME:
+        return VOLUME + 'change';
+      case MUTE:
+        return MUTE + 'change';
+      case PLAYER_RESIZE:
+        return 'playerresize';
+      case FULLSCREEN:
+        return FULLSCREEN + 'change';
+      case COMPLETE:
+        return 'ended';
+      default:
+        return eventName;
+    }
+    /*
+    The following video.js events might map to an event in our spec
+    'loadstart',
+      'progress', buffer load ?
+      'suspend',
+      'abort',
+      'error',
+      'emptied',
+      'stalled',
+      'loadedmetadata', meta
+      'loadeddata', meta
+      'canplay',
+      'canplaythrough',
+      'waiting', buffer?
+      'durationchange', meta-duration
+      'ratechange',
+     */
+  },
+
+  getMedia: function(player) {
+    const playlistItem = this.getCurrentPlaylistItem(player);
+    if (playlistItem) {
+      return playlistItem.sources[0];
+    }
+
+    return player.getMedia();
+  },
+
+  getValidMediaUrl: function(mediaSrc, playerSrc, eventTargetSrc) {
+    return this.getMediaUrl(mediaSrc) || this.getMediaUrl(playerSrc) || this.getMediaUrl(eventTargetSrc);
+  },
+
+  getMediaUrl: function(source) {
+    if (!source) {
+      return;
+    }
+
+    if (Array.isArray(source) && source.length) {
+      return this.parseSource(source[0]);
+    }
+
+    return this.parseSource(source)
+  },
+
+  parseSource: function (source) {
+    const type = typeof source;
+    if (type === 'string') {
+      return source;
+    } else if (type === 'object') {
+      return source.src;
+    }
+  },
+
+  getPlaylistCount: function (player) {
+    const playlist = player.playlist; // has playlist plugin
+    if (!playlist) {
+      return 1;
+    }
+    return playlist.lastIndex && playlist.lastIndex() + 1;
+  },
+
+  getCurrentPlaylistIndex: function (player) {
+    const playlist = player.playlist; // has playlist plugin
+    if (!playlist) {
+      return 0;
+    }
+    return playlist.currentIndex && playlist.currentIndex();
+  },
+
+  getCurrentPlaylistItem: function(player) {
+    const playlist = player.playlist; // has playlist plugin
+    if (!playlist) {
+      return;
+    }
+
+    const currentIndex = this.getCurrentPlaylistIndex(player);
+    if (!currentIndex) {
+      return
+    }
+
+    const item = playlist()[currentIndex];
+    return item;
+  }
+};
+
+const videojsSubmoduleFactory = function (config) {
+  const adState = adStateFactory();
+  const timeState = timeStateFactory();
+  const callbackStorage = null;
+  // videojs factory is stored to window by default
+  const vjs = window.videojs;
+  return VideojsProvider(config, vjs, adState, timeState, callbackStorage, utils);
+}
+
+videojsSubmoduleFactory.vendorCode = VIDEO_JS_VENDOR;
+submodule('video', videojsSubmoduleFactory);
+export default videojsSubmoduleFactory;
+
+// STATE
+
+/**
+ * @returns {State}
+ */
+export function adStateFactory() {
+  const adState = Object.assign({}, stateFactory());
+
+  function updateForEvent(event) {
+    if (!event) {
+      return;
+    }
+
+    const skippable = event.skippable;
+    // TODO: possibly can check traffickingParameters to determine if winning bid is passed
+    const updates = {
+      adId: event.adId,
+      adServer: event.adSystem,
+      advertiserName: event.advertiserName,
+      redirectUrl: event.clickThroughUrl,
+      creativeId: event.creativeId || event.creativeAdId,
+      dealId: event.dealId,
+      adDescription: event.description,
+      linear: event.linear,
+      creativeUrl: event.mediaUrl,
+      adTitle: event.title,
+      universalAdId: event.universalAdIdValue,
+      creativeType: event.contentType,
+      wrapperAdIds: event.adWrapperIds,
+      skip: skippable ? 1 : 0,
+      // missing fields:
+      // loadTime
+      // advertiserId - TODO: does this even exist ? If not, remove from spec
+      // vastVersion
+      // adCategories
+      // campaignId
+      // waterfallIndex
+      // waterfallCount
+      // skipmin
+      // adTagUrl - for now, only has request ad tag
+      // adPlacementType
+    };
+
+    const adPodInfo = event.adPodInfo;
+    if (adPodInfo && adPodInfo.podIndex > -1) {
+      updates.adPodCount = adPodInfo.totalAds;
+      updates.adPodIndex = adPodInfo.adPosition - 1; // Per IMA docs, adPosition is 1 based.
+    }
+
+    if (adPodInfo && adPodInfo.timeOffset) {
+      switch (adPodInfo.timeOffset) {
+        case -1:
+          updates.offset = 'post';
+          break
+
+        case 0:
+          // TODO: Defaults to 0 if this ad is not part of a pod, or the pod is not part of an ad playlist. - need to check if loaded dynamically and pass last content time update
+          updates.offset = 'pre';
+          break
+
+        default:
+          updates.offset = '' + adPodInfo.timeOffset;
+      }
+    }
+
+    if (skippable) {
+      updates.skipafter = event.skipTimeOffset;
+    }
+
+    this.updateState(updates);
+  }
+
+  adState.updateForEvent = updateForEvent;
+
+  return adState;
+}
+
+export function timeStateFactory() {
+  const timeState = Object.assign({}, stateFactory());
+
+  function updateForTimeEvent(event) {
+    const { currentTime, duration } = event;
+    this.updateState({
+      time: currentTime,
+      duration,
+      playbackMode: getPlaybackMode(duration)
+    });
+  }
+
+  timeState.updateForTimeEvent = updateForTimeEvent;
+
+  function getPlaybackMode(duration) {
+    if (duration > 0) {
+      return PLAYBACK_MODE.VOD;
+    } else if (duration < 0) {
+      return PLAYBACK_MODE.DVR;
+    }
+
+    return PLAYBACK_MODE.LIVE;
+  }
+
+  return timeState;
+}
diff --git a/modules/videojsVideoProvider.md b/modules/videojsVideoProvider.md
new file mode 100644
index 00000000000..70f4daa64e1
--- /dev/null
+++ b/modules/videojsVideoProvider.md
@@ -0,0 +1,17 @@
+# Overview
+
+Module Name: Video.js Video Provider
+Module Type: Video Submodule
+Video Player: video.js
+Player website: https://videojs.com/
+Maintainer: Prebid Video Task Force
+
+# Description
+
+Video provider to connect the Prebid Video Module to video.js.
+
+# Requirements
+
+- Your page must include a build of video.js. For instructions see https://videojs.com/getting-started .
+- Your video.js instance must include the Google IMA plugin. 
+  - The Google IMA plugin must be accessible publicly in order for the Video.js Video Provider to reference it.
diff --git a/package-lock.json b/package-lock.json
index ffc179f2914..daa59e6ad12 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "7.21.0-pre",
+      "version": "7.23.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
@@ -96,6 +96,10 @@
         "through2": "^4.0.2",
         "url": "^0.11.0",
         "url-parse": "^1.0.5",
+        "video.js": "^7.17.0",
+        "videojs-contrib-ads": "^6.9.0",
+        "videojs-ima": "^1.11.0",
+        "videojs-playlist": "^5.0.0",
         "webdriverio": "^7.6.1",
         "webpack": "^5.70.0",
         "webpack-bundle-analyzer": "^4.5.0",
@@ -1673,6 +1677,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -1790,6 +1806,33 @@
         "xtend": "~4.0.1"
       }
     },
+    "node_modules/@hapi/boom": {
+      "version": "9.1.4",
+      "resolved": "https://registry.npmjs.org/@hapi/boom/-/boom-9.1.4.tgz",
+      "integrity": "sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==",
+      "dev": true,
+      "dependencies": {
+        "@hapi/hoek": "9.x.x"
+      }
+    },
+    "node_modules/@hapi/cryptiles": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/cryptiles/-/cryptiles-5.1.0.tgz",
+      "integrity": "sha512-fo9+d1Ba5/FIoMySfMqPBR/7Pa29J2RsiPrl7bkwo5W5o+AN1dAYQRi4SPrPwwVxVGKjgLOEWrsvt1BonJSfLA==",
+      "dev": true,
+      "dependencies": {
+        "@hapi/boom": "9.x.x"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@hapi/hoek": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
+      "dev": true
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
@@ -2301,6 +2344,12 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/linkify-it": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
+      "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
+      "dev": true
+    },
     "node_modules/@types/lodash": {
       "version": "4.14.179",
       "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz",
@@ -2334,6 +2383,16 @@
         "@types/lodash": "*"
       }
     },
+    "node_modules/@types/markdown-it": {
+      "version": "12.2.3",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
+      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/linkify-it": "*",
+        "@types/mdurl": "*"
+      }
+    },
     "node_modules/@types/mdast": {
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
@@ -2501,6 +2560,55 @@
       "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
       "dev": true
     },
+    "node_modules/@videojs/http-streaming": {
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.14.2.tgz",
+      "integrity": "sha512-K1raSfO/pq5r8iUas3OSYni0kXOj91n8ealIpV02khghzGv9LQ6O3YUqYd/eAhJ1HIrmZWOnrYpK/P+mhUExXQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "3.0.5",
+        "aes-decrypter": "3.1.3",
+        "global": "^4.4.0",
+        "m3u8-parser": "4.7.1",
+        "mpd-parser": "0.21.1",
+        "mux.js": "6.0.1",
+        "video.js": "^6 || ^7"
+      },
+      "engines": {
+        "node": ">=8",
+        "npm": ">=5"
+      },
+      "peerDependencies": {
+        "video.js": "^6 || ^7"
+      }
+    },
+    "node_modules/@videojs/vhs-utils": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz",
+      "integrity": "sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "global": "^4.4.0",
+        "url-toolkit": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8",
+        "npm": ">=5"
+      }
+    },
+    "node_modules/@videojs/xhr": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@videojs/xhr/-/xhr-2.6.0.tgz",
+      "integrity": "sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "global": "~4.4.0",
+        "is-function": "^1.0.1"
+      }
+    },
     "node_modules/@vue/compiler-core": {
       "version": "3.2.38",
       "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.38.tgz",
@@ -3195,6 +3303,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/@wdio/mocha-framework/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@wdio/mocha-framework/node_modules/yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -3606,6 +3726,15 @@
         "@xtuc/long": "4.2.2"
       }
     },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz",
+      "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -3657,6 +3786,47 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/acorn-node": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
+      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.0.0",
+        "acorn-walk": "^7.0.0",
+        "xtend": "^4.0.2"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/adm-zip": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz",
+      "integrity": "sha512-J2LiZpRxcLsJm2IwoekNa6COwzEZnMwCJ3vxz0UCw2NYUH2WFi7svuDrVccq5KpBGmzGUgFa0L0FwEmKmu/rzQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.0"
+      }
+    },
+    "node_modules/aes-decrypter": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.3.tgz",
+      "integrity": "sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "^3.0.5",
+        "global": "^4.4.0",
+        "pkcs7": "^1.0.4"
+      }
+    },
     "node_modules/agent-base": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
@@ -3687,7 +3857,6 @@
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true,
-      "optional": true,
       "engines": {
         "node": ">=0.4.2"
       }
@@ -3958,6 +4127,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -4089,6 +4267,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
+      "dev": true
+    },
     "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -4098,6 +4282,24 @@
         "safer-buffer": "~2.1.0"
       }
     },
+    "node_modules/asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/asn1.js/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
     "node_modules/assert": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
@@ -4146,6 +4348,27 @@
         "node": ">=8"
       }
     },
+    "node_modules/astw": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz",
+      "integrity": "sha512-E/4z//dvN0lfr8zAx8hXeQ8o3nRoQaL/wqI7fAALEvh/40mnyUxfFB9MwyDHYKVDtS3cp3Pow5s96djZR5lkWw==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^4.0.3"
+      }
+    },
+    "node_modules/astw/node_modules/acorn": {
+      "version": "4.0.13",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+      "integrity": "sha512-fu2ygVGuMmlzG8ZeRJ0bvR41nsAkxxhbyk8bZ1SS521Z7vmgJFTQQlfz/Mp/nJexGBz+v8sC9bM6+lNgskt4Ug==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/async": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
@@ -4760,6 +4983,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/Base64": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz",
+      "integrity": "sha512-reGEWshDmTDQDsCec/HduOO9Wyj6yMOupMfhIf3ugN1TDlK2NQW4DDJSqNNtp380SNcvRfXtO8HSCQot0d0SMw==",
+      "dev": true
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -4816,6 +5045,69 @@
         "tweetnacl": "^0.14.3"
       }
     },
+    "node_modules/beefy": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/beefy/-/beefy-1.1.0.tgz",
+      "integrity": "sha512-olZqTbw6gnofdbG98uAKvG6O/AjV6WGuPsKpYF41VQK39sUYvulm86RssD1K/iVNkkSJ8cuYeheJ8Nk2gz16wA==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": "0.8.1",
+        "colors": "~0.6.0-1",
+        "ignorepatterns": "1.0.1",
+        "mime": "~1.2.9",
+        "nopt": "~2.1.1",
+        "open": "0.0.3",
+        "portfinder": "~0.2.1",
+        "response-stream": "0.0.0",
+        "script-injector": "~0.1.0",
+        "sse-stream": "0.0.4",
+        "through": "~2.2.0"
+      },
+      "bin": {
+        "beefy": "bin/beefy"
+      }
+    },
+    "node_modules/beefy/node_modules/chokidar": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-0.8.1.tgz",
+      "integrity": "sha512-Bl/CteHnM5g3eKGPMkraZQW7Yzk2Gu87eE3jdaMfCNJP79sVa54M5KHStr3WtJl4vVoVSndVDws6IFLTmMa3Lw==",
+      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
+      "dev": true,
+      "hasInstallScript": true
+    },
+    "node_modules/beefy/node_modules/colors": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+      "integrity": "sha512-OsSVtHK8Ir8r3+Fxw/b4jS1ZLPXkV6ZxDRJQzeD7qo0SqMXWrHDM71DgYzPMHY8SFJ0Ao+nNU2p1MmwdzKqPrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/beefy/node_modules/mime": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+      "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
+      "dev": true
+    },
+    "node_modules/beefy/node_modules/nopt": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
+      "integrity": "sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      }
+    },
+    "node_modules/beefy/node_modules/through": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
+      "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
+      "dev": true
+    },
     "node_modules/beeper": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
@@ -4918,6 +5210,12 @@
       "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
       "dev": true
     },
+    "node_modules/bn.js": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+      "dev": true
+    },
     "node_modules/body": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
@@ -4988,6 +5286,20 @@
       "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
       "dev": true
     },
+    "node_modules/boom": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+      "integrity": "sha512-OvfN8y1oAxxphzkl2SnCS+ztV/uVKTATtgLjWYg/7KwcNyf3rzpHxNQJZCKtsZd4+MteKczhWbSjtEX4bGgU9g==",
+      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "hoek": "0.9.x"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -5010,12 +5322,581 @@
         "node": ">=8"
       }
     },
+    "node_modules/brfs": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/brfs/-/brfs-0.0.9.tgz",
+      "integrity": "sha512-5bjo0XG6pPGTFJsS4rtvP1vvwLp3UstdF062l10RKcfG60+izXak0DFcfQwMtBQNGlFm588mM2WvD02hJErVYg==",
+      "dev": true,
+      "dependencies": {
+        "escodegen": "0.0.17",
+        "falafel": "~0.1.6",
+        "through": "~2.2.0"
+      },
+      "bin": {
+        "brfs": "bin/cmd.js"
+      }
+    },
+    "node_modules/brfs/node_modules/escodegen": {
+      "version": "0.0.17",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-0.0.17.tgz",
+      "integrity": "sha512-muX87X0L2dvVJ4ZPKAJLQlcyg2qhl6ps8Ow8vOAcuoFIrZLtXNMGfjnD19LSTrZ1SBHQsI+tvD8YlsJqHhfXrw==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "~1.0.2",
+        "estraverse": "~0.0.4"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      },
+      "optionalDependencies": {
+        "source-map": ">= 0.1.2"
+      }
+    },
+    "node_modules/brfs/node_modules/esprima": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+      "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/brfs/node_modules/estraverse": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz",
+      "integrity": "sha512-21DfBCsFJGb3HZr0vEBH1Wk1tGSbbzA8I/xtSSoy/pRtupHv0OgBmObcNGXM3ec6/pOXTOOUYY9/5bfluzz0sw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/brfs/node_modules/through": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
+      "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
+      "dev": true
+    },
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
+      "dev": true
+    },
+    "node_modules/browser-pack": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz",
+      "integrity": "sha512-BHla5EbbxjNyLMFUMamVjeTY+q1QwHbrYNXlWOkw71QcBqAQF7maJyNh3OI/V0d5YyNdMYD6tiPhJB9ukBo99Q==",
+      "dev": true,
+      "dependencies": {
+        "combine-source-map": "~0.3.0",
+        "concat-stream": "~1.4.1",
+        "defined": "~0.0.0",
+        "JSONStream": "~0.8.4",
+        "through2": "~0.5.1",
+        "umd": "^2.1.0"
+      },
+      "bin": {
+        "browser-pack": "bin/cmd.js"
+      }
+    },
+    "node_modules/browser-pack/node_modules/concat-stream": {
+      "version": "1.4.11",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
+      "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "~1.1.9",
+        "typedarray": "~0.0.5"
+      }
+    },
+    "node_modules/browser-pack/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/browser-pack/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/browser-pack/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/browser-pack/node_modules/through2": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+      "integrity": "sha512-zexCrAOTbjkBCXGyozn7hhS3aEaqdrc59mAD2E3dKYzV1vFuEGQ1hEDJN2oQMQFwy4he2zyLqPZV+AlfS8ZWJA==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.0.17",
+        "xtend": "~3.0.0"
+      }
+    },
+    "node_modules/browser-pack/node_modules/through2/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/browser-pack/node_modules/xtend": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+      "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/browser-resolve": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "1.1.7"
+      }
+    },
+    "node_modules/browser-resolve/node_modules/resolve": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+      "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
+      "dev": true
+    },
     "node_modules/browser-stdout": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
       "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
       "dev": true
     },
+    "node_modules/browserify": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/browserify/-/browserify-8.1.3.tgz",
+      "integrity": "sha512-0KKOkCQXCvP64qm73CtESE92pVnB5MkjA2W/Tmf+S4uPHVY4/SeCwO7wdr4mkke5ySoVyMqsOcMa5zo6uh9c9A==",
+      "dev": true,
+      "dependencies": {
+        "assert": "~1.3.0",
+        "browser-pack": "^3.2.0",
+        "browser-resolve": "^1.3.0",
+        "browserify-zlib": "~0.1.2",
+        "buffer": "^3.0.0",
+        "builtins": "~0.0.3",
+        "commondir": "0.0.1",
+        "concat-stream": "~1.4.1",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "~0.0.1",
+        "crypto-browserify": "^3.0.0",
+        "deep-equal": "~0.2.1",
+        "defined": "~0.0.0",
+        "deps-sort": "^1.3.5",
+        "domain-browser": "~1.1.0",
+        "duplexer2": "~0.0.2",
+        "events": "~1.0.0",
+        "glob": "^4.0.5",
+        "http-browserify": "^1.4.0",
+        "https-browserify": "~0.0.0",
+        "inherits": "~2.0.1",
+        "insert-module-globals": "^6.2.0",
+        "isarray": "0.0.1",
+        "JSONStream": "~0.8.3",
+        "labeled-stream-splicer": "^1.0.0",
+        "module-deps": "^3.6.3",
+        "os-browserify": "~0.1.1",
+        "parents": "^1.0.1",
+        "path-browserify": "~0.0.0",
+        "process": "^0.10.0",
+        "punycode": "~1.2.3",
+        "querystring-es3": "~0.2.0",
+        "readable-stream": "^1.0.33-1",
+        "resolve": "~0.7.1",
+        "shallow-copy": "0.0.1",
+        "shasum": "^1.0.0",
+        "shell-quote": "~0.0.1",
+        "stream-browserify": "^1.0.0",
+        "string_decoder": "~0.10.0",
+        "subarg": "^1.0.0",
+        "syntax-error": "^1.1.1",
+        "through2": "^1.0.0",
+        "timers-browserify": "^1.0.1",
+        "tty-browserify": "~0.0.0",
+        "umd": "~2.1.0",
+        "url": "~0.10.1",
+        "util": "~0.10.1",
+        "vm-browserify": "~0.0.1",
+        "xtend": "^3.0.0"
+      },
+      "bin": {
+        "browserify": "bin/cmd.js"
+      }
+    },
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/browserify-sign": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+      "integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==",
+      "dev": true,
+      "dependencies": {
+        "pako": "~0.2.0"
+      }
+    },
+    "node_modules/browserify/node_modules/assert": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz",
+      "integrity": "sha512-5aKcpD+XnHpZ7EGxsuo6uoILNh0rvm0Ypa17GlkrF2CNSPhvdgi3ft9XsL2ajdVOI2I3xuGZnHvlXAeqTZYvXg==",
+      "dev": true,
+      "dependencies": {
+        "util": "0.10.3"
+      }
+    },
+    "node_modules/browserify/node_modules/assert/node_modules/inherits": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
+      "dev": true
+    },
+    "node_modules/browserify/node_modules/assert/node_modules/util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.1"
+      }
+    },
+    "node_modules/browserify/node_modules/base64-js": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+      "integrity": "sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/browserify/node_modules/buffer": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.2.tgz",
+      "integrity": "sha512-c3M77NkHJxS0zx/ErxXhDLr1v3y2MDXPeTJPvLNOaIYJ4ymHBUFQ9EXzt9HYuqAJllMoNb/EZ8hIiulnQFAUuQ==",
+      "dev": true,
+      "dependencies": {
+        "base64-js": "0.0.8",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "node_modules/browserify/node_modules/buffer/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/browserify/node_modules/commondir": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz",
+      "integrity": "sha512-Ghe1LmLv3G3c0XJYu+c88MCRIPqWQ67qaqKY1KvuN4uPAjfUj+y4hvcpZ2kCPrjpRNyklW4dpAZZ8a7vOh50tg==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/browserify/node_modules/concat-stream": {
+      "version": "1.4.11",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
+      "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "~1.1.9",
+        "typedarray": "~0.0.5"
+      }
+    },
+    "node_modules/browserify/node_modules/deep-equal": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
+      "integrity": "sha512-FXgye2Jr6oEk01S7gmSrHrPEQ1ontR7wwl+nYiZ8h4SXlHVm0DYda74BIPcHz2s2qPz4+375IcAz1vsWLwddgQ==",
+      "dev": true
+    },
+    "node_modules/browserify/node_modules/duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "node_modules/browserify/node_modules/events": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz",
+      "integrity": "sha512-XK19KwlDJo8XsceooxNDK1pObtcT44+Xte6V/jQc4a+fHq1qEouThyyX2ePmS0hS8RcCulmRxzg+T8jiLKAFFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/browserify/node_modules/glob": {
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+      "integrity": "sha512-I0rTWUKSZKxPSIAIaqhSXTM/DiII6wame+rEC3cFA5Lqmr9YmdL7z6Hj9+bdWtTvoY1Su4/OiMLmb37Y7JzvJQ==",
+      "dev": true,
+      "dependencies": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^2.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/browserify/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
+    },
+    "node_modules/browserify/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/browserify/node_modules/minimatch": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+      "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
+      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/browserify/node_modules/process": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.10.1.tgz",
+      "integrity": "sha512-dyIett8dgGIZ/TXKUzeYExt7WA6ldDzys9vTDU/cCA9L17Ypme+KzS+NjQCjpn9xsvi/shbMC+yP/BcFMBz0NA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/browserify/node_modules/punycode": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz",
+      "integrity": "sha512-h/vscxLPvI2l7k/0dFUKZ5I5TgMCJ/Pl+J6rw77PDuQM6UApf/GaRVkjv/YSm2k+fbp7Yw8dxsoe29DolT7h7w==",
+      "dev": true,
+      "engines": [
+        "node",
+        "rhino"
+      ]
+    },
+    "node_modules/browserify/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/browserify/node_modules/resolve": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
+      "integrity": "sha512-zxmAcifDjKxmUbk7chQdKhDSn8ml08g+MYyU37xhEXBp+N81cfbYsm4e0Gn9jtLbAvbR8w8Ox09xqUZtPuCoeA==",
+      "dev": true
+    },
+    "node_modules/browserify/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/browserify/node_modules/through2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.1.13-1 <1.2.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/browserify/node_modules/through2/node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/browserify/node_modules/url": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+      "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "node_modules/browserify/node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
+      "dev": true
+    },
+    "node_modules/browserify/node_modules/util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/browserify/node_modules/xtend": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+      "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
     "node_modules/browserslist": {
       "version": "4.21.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
@@ -5202,6 +6083,12 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
+      "dev": true
+    },
     "node_modules/buffers": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
@@ -5211,6 +6098,12 @@
         "node": ">=0.2.0"
       }
     },
+    "node_modules/builtins": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz",
+      "integrity": "sha512-T8uCGKc0/2aLVt6omt8JxDRBoWEMkku+wFesxnhxnt4NygVZG99zqxo7ciK8eebszceKamGoUiLdkXCgGQyrQw==",
+      "dev": true
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -5315,43 +6208,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/cac/node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/cac/node_modules/path-exists": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
@@ -5364,29 +6220,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/cac/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/cac/node_modules/read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -5426,18 +6259,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/cac/node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/cac/node_modules/supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -5521,6 +6342,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/callsite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+      "integrity": "sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -5539,6 +6369,34 @@
         "node": ">=6"
       }
     },
+    "node_modules/camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/camelcase-keys/node_modules/camelcase": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+      "integrity": "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/can-autoplay": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/can-autoplay/-/can-autoplay-3.0.2.tgz",
+      "integrity": "sha512-Ih6wc7yJB4TylS/mLyAW0Dj5Nh3Gftq/g966TcxgvpNCOzlbqTs85srAq7mwIspo4w8gnLCVVGroyCHfh6l9aA==",
+      "dev": true
+    },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001390",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz",
@@ -5560,6 +6418,18 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
       "dev": true
     },
+    "node_modules/catharsis": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
+      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.15"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/ccount": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
@@ -5749,6 +6619,16 @@
         "node": ">=6.0"
       }
     },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "node_modules/class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -5999,6 +6879,35 @@
         "node": ">=0.1.90"
       }
     },
+    "node_modules/combine-source-map": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
+      "integrity": "sha512-HRKa6g9SC1xd6ifto8ay6SxvyHaaQ50/8NO1ZONXx2hsIF9t/52qXa7Eeivaf5KFOSowK7Nm8TkIL/VC4khdBA==",
+      "dev": true,
+      "dependencies": {
+        "convert-source-map": "~0.3.0",
+        "inline-source-map": "~0.3.0",
+        "source-map": "~0.1.31"
+      }
+    },
+    "node_modules/combine-source-map/node_modules/convert-source-map": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
+      "integrity": "sha512-+4nRk0k3oEpwUB7/CalD7xE2z4VmtEnnq0GO2IPTkrooTrAhEsWvuLF5iWP1dXrwluki/azwXV1ve7gtYuPldg==",
+      "dev": true
+    },
+    "node_modules/combine-source-map/node_modules/source-map": {
+      "version": "0.1.43",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+      "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
+      "dev": true,
+      "dependencies": {
+        "amdefine": ">=0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -6021,6 +6930,15 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/commander": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz",
+      "integrity": "sha512-qebjpyeaA/nJ4w3EO2cV2++/zEkccPnjWogzA2rff+Lk8ILI75vULeTmyd4wPxWdKwtP3J+G39IXVZadh0UHyw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.x"
+      }
+    },
     "node_modules/commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -6101,6 +7019,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/config-chain": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+      "dev": true,
+      "dependencies": {
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
+      }
+    },
     "node_modules/connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
@@ -6140,6 +7068,18 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
+    "node_modules/console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
+    },
+    "node_modules/constants-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz",
+      "integrity": "sha512-FL+diDS9AKR5BAA2M+GNk8lnH64tRE3zepTG9hucxc7o04LgCRhkQZhF7u/OKHZT8LLRT+sZEi9qFzXUchq9pA==",
+      "dev": true
+    },
     "node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -6348,6 +7288,49 @@
         "node": ">= 6"
       }
     },
+    "node_modules/create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      }
+    },
+    "node_modules/create-ecdh/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
     "node_modules/criteo-direct-rsa-validate": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/criteo-direct-rsa-validate/-/criteo-direct-rsa-validate-1.1.0.tgz",
@@ -6376,6 +7359,42 @@
         "node": ">= 8"
       }
     },
+    "node_modules/cryptiles": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+      "integrity": "sha512-gvWSbgqP+569DdslUiCelxIv3IYK5Lgmq1UrRnk+s1WxQOQ16j3GPDcjdtgL5Au65DU/xQi6q3xPtf5Kta+3IQ==",
+      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "boom": "0.4.x"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/crypto-js": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
@@ -6413,6 +7432,37 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/cssauron": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
+      "integrity": "sha512-Ht70DcFBh+/ekjVrYS2PlDMdSQEl3OFNmjK6lcn49HptBgilXf/Zwg4uFh9Xn0pX3Q8YOkSjIFOfK2osvdqpBw==",
+      "dev": true,
+      "dependencies": {
+        "through": "X.X.X"
+      }
+    },
+    "node_modules/ctype": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+      "integrity": "sha512-T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==",
+      "dev": true,
+      "dependencies": {
+        "array-find-index": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -6502,6 +7552,15 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/debuglog": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
+      "integrity": "sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
@@ -6685,6 +7744,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/defined": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz",
+      "integrity": "sha512-zpqiCT8bODLu3QSmLLic8xJnYWBFjOSu/fBCm189oAiTtPq/PSanNACKZDS7kgSyCJY7P+IcODzlIogBK/9RBg==",
+      "dev": true
+    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -6702,6 +7767,80 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/deps-sort": {
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz",
+      "integrity": "sha512-aEnmQuu/Hf5h8akL8QshYWzk9MVBg/JYMyNq/Lz68i69nR17tunjP6o/AC6Tn48c8ayzG6aeKs6OoFOtVCtvrQ==",
+      "dev": true,
+      "dependencies": {
+        "JSONStream": "^1.0.3",
+        "shasum": "^1.0.0",
+        "subarg": "^1.0.0",
+        "through2": "^1.0.0"
+      },
+      "bin": {
+        "deps-sort": "bin/cmd.js"
+      }
+    },
+    "node_modules/deps-sort/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/deps-sort/node_modules/jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+      "dev": true,
+      "engines": [
+        "node >= 0.2.0"
+      ]
+    },
+    "node_modules/deps-sort/node_modules/JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "dependencies": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/deps-sort/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/deps-sort/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/deps-sort/node_modules/through2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.1.13-1 <1.2.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
     "node_modules/dequal": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
@@ -6711,6 +7850,16 @@
         "node": ">=6"
       }
     },
+    "node_modules/des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
     "node_modules/destroy": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
@@ -6746,6 +7895,37 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/detective": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
+      "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^5.2.1",
+        "defined": "^1.0.0"
+      }
+    },
+    "node_modules/detective/node_modules/acorn": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/detective/node_modules/defined": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+      "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/devtools": {
       "version": "7.16.16",
       "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
@@ -6804,6 +7984,16 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/dezalgo": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
+      "dev": true,
+      "dependencies": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
     "node_modules/di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -6828,6 +8018,23 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/diffie-hellman/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
     "node_modules/dlv": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
@@ -7042,6 +8249,22 @@
         "void-elements": "^2.0.0"
       }
     },
+    "node_modules/dom-walk": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
+      "dev": true
+    },
+    "node_modules/domain-browser": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
+      "integrity": "sha512-fJ5MoHxe69h3E4/lJtFRhcWwLb04bhIBSfvCEMS1YDH+/9yEZTqBHTSTgch8nCP5tE5k2gdQEjodUqJzy7qJ9Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4",
+        "npm": ">=1.2"
+      }
+    },
     "node_modules/dset": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
@@ -7176,6 +8399,27 @@
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.243.tgz",
       "integrity": "sha512-BgLD2gBX43OSXwlT01oYRRD5NIB4n3okTRxkzEAC6G0SZG4TTlyrWMjbOo0fajCwqwpRtMHXQNMjtRN6qpNtfw=="
     },
+    "node_modules/elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
@@ -7272,6 +8516,15 @@
       "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
       "dev": true
     },
+    "node_modules/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "node_modules/errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -7379,9 +8632,9 @@
       }
     },
     "node_modules/es5-ext": {
-      "version": "0.10.57",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.57.tgz",
-      "integrity": "sha512-L7cCNoPwTkAp7IBHxrKLsh7NKiVFkcdxlP9vbVw9QUvb7gF0Mz9bEBN0WY9xqdTjGF907EMT/iG013vnbqwu1Q==",
+      "version": "0.10.62",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
+      "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -7413,6 +8666,20 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "node_modules/es6-map": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+      "integrity": "sha512-mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A==",
+      "dev": true,
+      "dependencies": {
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-set": "~0.1.5",
+        "es6-symbol": "~3.1.1",
+        "event-emitter": "~0.3.5"
+      }
+    },
     "node_modules/es6-object-assign": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
@@ -7434,6 +8701,29 @@
         "es6-promise": "^4.0.3"
       }
     },
+    "node_modules/es6-set": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz",
+      "integrity": "sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==",
+      "dev": true,
+      "dependencies": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.62",
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "^3.1.3",
+        "event-emitter": "^0.3.5",
+        "type": "^2.7.2"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/es6-set/node_modules/type": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+      "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
+      "dev": true
+    },
     "node_modules/es6-symbol": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
@@ -7572,6 +8862,21 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/escope": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+      "integrity": "sha512-75IUQsusDdalQEW/G/2esa87J7raqdJF+Ca0/Xm5C3Q58Nr4yVYjZGp/P1+2xiEVgXRrA39dpRb8LcshajbqDQ==",
+      "dev": true,
+      "dependencies": {
+        "es6-map": "^0.1.3",
+        "es6-weak-map": "^2.0.1",
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/eslint": {
       "version": "7.32.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
@@ -7972,6 +9277,18 @@
         "node": ">=10"
       }
     },
+    "node_modules/eslint/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eslint/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -8032,6 +9349,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/esprima-fb": {
+      "version": "10001.1.0-dev-harmony-fb",
+      "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-10001.1.0-dev-harmony-fb.tgz",
+      "integrity": "sha512-z2dx3A/ZGNamsDjJS4FZPXnpoRCEkQXqouKBCOaJifyx4HkEVoSQ3YWFX18Scut1Aq9gnctzLWcWJgKkL0xNQw==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/esquery": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
@@ -8083,6 +9413,15 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/estraverse-fb": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/estraverse-fb/-/estraverse-fb-1.3.2.tgz",
+      "integrity": "sha512-wp3lfRrWy5EQD9TqesuYM1SKVP4ERT0cUatb4e8Vznf4K5IOpREhuyXZxGj3a9s9mvX5vGZKNHA4R9D4kp9Q9A==",
+      "dev": true,
+      "peerDependencies": {
+        "estraverse": "*"
+      }
+    },
     "node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
@@ -8152,6 +9491,16 @@
         "node": ">=0.8.x"
       }
     },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "node_modules/execa": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
@@ -8651,6 +10000,31 @@
       "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==",
       "dev": true
     },
+    "node_modules/falafel": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/falafel/-/falafel-0.1.6.tgz",
+      "integrity": "sha512-r1s3VwKzm6PB35MZmnfZoF6NTgSKRxf8How2lBsrDq81OsYXb/2fR8ysfURHCTlFpqJDQVA88iB70wFrFRYDsA==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/falafel/node_modules/esprima": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+      "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/fancy-log": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
@@ -8782,6 +10156,58 @@
         "node": ">=10"
       }
     },
+    "node_modules/fileset": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz",
+      "integrity": "sha512-aK3PFyHSwWsBJCarRxMRIXSGamfroi9ehG8f4e5A2n5nSlEVHe8y44jNTIN4+HdZSpK3FNV0EdihH1iDWTdnGg==",
+      "dev": true,
+      "dependencies": {
+        "glob": "5.x",
+        "minimatch": "2.x"
+      }
+    },
+    "node_modules/fileset/node_modules/glob": {
+      "version": "5.0.15",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+      "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
+      "dev": true,
+      "dependencies": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "2 || 3",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/fileset/node_modules/minimatch": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+      "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
+      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/fill-keys": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
+      "integrity": "sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA==",
+      "dev": true,
+      "dependencies": {
+        "is-object": "~1.0.1",
+        "merge-descriptors": "~1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -9025,6 +10451,23 @@
         "node": ">= 0.12"
       }
     },
+    "node_modules/formatio": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
+      "integrity": "sha512-cPh7is6k3d8tIUh+pnXXuAbD/uhSXGgqLPw0UrYpv5lfdJ+MMMSjx40JNpqP7Top9Nt25YomWEiRmkHbOvkCaA==",
+      "deprecated": "This package is unmaintained. Use @sinonjs/formatio instead",
+      "dev": true,
+      "dependencies": {
+        "samsam": "~1.1"
+      }
+    },
+    "node_modules/formatio/node_modules/samsam": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.3.tgz",
+      "integrity": "sha512-t9rCPskf50hZ53eH8Z+cSWD4LfJBac+8vSSuzi1Y2HzygyXxtAl0BaR3hr6iI6A+nFQbkmJNC/brQLNEeVnrmg==",
+      "deprecated": "This package has been deprecated in favour of @sinonjs/samsam",
+      "dev": true
+    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -9239,6 +10682,24 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/generate-function": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
+      "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
+      "dev": true,
+      "dependencies": {
+        "is-property": "^1.0.2"
+      }
+    },
+    "node_modules/generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "integrity": "sha512-TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ==",
+      "dev": true,
+      "dependencies": {
+        "is-property": "^1.0.0"
+      }
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -9299,6 +10760,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -9345,6 +10815,79 @@
         "assert-plus": "^1.0.0"
       }
     },
+    "node_modules/gh-got": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/gh-got/-/gh-got-1.1.0.tgz",
+      "integrity": "sha512-jo4rP5ugI6fZGjS0vmvHlM8P7EBA39p8to4r2i+LqYXxeg4M8qnPXiKaetDfH0YLXkO9Hfsa2mKIjMsGJwcdGQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^3.2.0",
+        "object-assign": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gh-got/node_modules/duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/gh-got/node_modules/got": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-3.3.1.tgz",
+      "integrity": "sha512-7chPlc0pWHjvq7B6dEEXz4GphoDupOvBSSl6AwRsAJX7GPTZ+bturaZiIigX4Dp6KrAP67nvzuKkNc0SLA0DKg==",
+      "dev": true,
+      "dependencies": {
+        "duplexify": "^3.2.0",
+        "infinity-agent": "^2.0.0",
+        "is-redirect": "^1.0.0",
+        "is-stream": "^1.0.0",
+        "lowercase-keys": "^1.0.0",
+        "nested-error-stacks": "^1.0.0",
+        "object-assign": "^3.0.0",
+        "prepend-http": "^1.0.0",
+        "read-all-stream": "^3.0.0",
+        "timed-out": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gh-got/node_modules/got/node_modules/object-assign": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+      "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gh-got/node_modules/lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gh-got/node_modules/object-assign": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+      "integrity": "sha512-CdsOUYIh5wIiozhJ3rLQgmUTgcyzFwZZrqhkKhODMoGtPKM+wt0h0CNIoauJWMsS9822EdzPsF/6mb4nLvPN5g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/git-up": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/git-up/-/git-up-6.0.0.tgz",
@@ -9370,6 +10913,18 @@
       "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==",
       "dev": true
     },
+    "node_modules/github-url-from-git": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz",
+      "integrity": "sha512-WWOec4aRI7YAykQ9+BHmzjyNlkfJFG8QLXnDTsLz/kZefq7qkzdfo4p6fkYYMIq1aj+gZcQs/1HQhQh3DPPxlQ==",
+      "dev": true
+    },
+    "node_modules/github-url-from-username-repo": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz",
+      "integrity": "sha512-Tj8CQqRoFVTglGdQ8FQmfq8gOOoOYZX7tnOKP8jq8Hdz2OTDhxvtlkLAbrqMYZ7X/YdaYQoUG1IBWxISBfqZ+Q==",
+      "dev": true
+    },
     "node_modules/glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -9660,6 +11215,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/global": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+      "dev": true,
+      "dependencies": {
+        "min-document": "^2.19.0",
+        "process": "^0.11.10"
+      }
+    },
     "node_modules/global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
@@ -10048,34 +11613,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-cli/node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/gulp-cli/node_modules/path-exists": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
@@ -10088,29 +11625,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-cli/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/gulp-cli/node_modules/read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -10170,18 +11684,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-cli/node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/gulp-cli/node_modules/which-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
@@ -10433,6 +11935,9 @@
         "semver": "^5.5.0",
         "shebang-command": "^1.2.0",
         "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
       }
     },
     "node_modules/gulp-eslint/node_modules/cross-spawn/node_modules/semver": {
@@ -10806,6 +12311,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/gulp-eslint/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -11228,17 +12745,6 @@
         "lodash._root": "^3.0.0"
       }
     },
-    "node_modules/gulp-util/node_modules/lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "dev": true,
-      "dependencies": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
     "node_modules/gulp-util/node_modules/lodash.template": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
@@ -11457,6 +12963,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-color": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
+      "integrity": "sha512-kaNz5OTAYYmt646Hkqw50/qyxP2vFnTVu5AQ1Zmk22Kk5+4Qx6BpO8+u7IKsML5fOsFk0ZT0AcCJNYwcvaLBvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -11549,6 +13064,64 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash-base/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/hash-base/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
     "node_modules/hast-util-is-element": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-2.1.2.tgz",
@@ -11608,6 +13181,23 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/hawk": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+      "integrity": "sha512-am8sVA2bCJIw8fuuVcKvmmNnGFUGW8spTkVtj2fXTEZVkfN42bwFZFtDem57eFi+NSxurJB8EQ7Jd3uCHLn8Vw==",
+      "deprecated": "This module moved to @hapi/hawk. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "boom": "0.4.x",
+        "cryptiles": "0.2.x",
+        "hoek": "0.9.x",
+        "sntp": "0.2.x"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -11626,6 +13216,28 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+      "dev": true,
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/hoek": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+      "integrity": "sha512-ZZ6eGyzGjyMTmpSPYVECXy9uNfqBR7x5CavhUaLOeD6W0vWK1mp/b7O3f86XE0Mtfo9rZ6Bh3fnuw9Xr8MF9zA==",
+      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/home-or-tmp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
@@ -11663,6 +13275,147 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
+    "node_modules/html-select": {
+      "version": "2.3.24",
+      "resolved": "https://registry.npmjs.org/html-select/-/html-select-2.3.24.tgz",
+      "integrity": "sha512-kQ+YZoVQ8Aux6bUqMVc0iufcZOv03+xYZ4J5v2beT5wkNrW/e2roZ8pnU4LunVOVBGFkbodFKR0TvuMkTdyrJQ==",
+      "dev": true,
+      "dependencies": {
+        "cssauron": "^1.1.0",
+        "duplexer2": "~0.0.2",
+        "inherits": "^2.0.1",
+        "minimist": "~0.0.8",
+        "readable-stream": "^1.0.27-1",
+        "split": "~0.3.0",
+        "stream-splicer": "^1.2.0",
+        "through2": "^1.0.0"
+      },
+      "bin": {
+        "html-select": "bin/cmd.js"
+      }
+    },
+    "node_modules/html-select/node_modules/duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "node_modules/html-select/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/html-select/node_modules/minimist": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+      "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+      "dev": true
+    },
+    "node_modules/html-select/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/html-select/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/html-select/node_modules/through2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.1.13-1 <1.2.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/html-tokenize": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/html-tokenize/-/html-tokenize-1.2.5.tgz",
+      "integrity": "sha512-7sCme3w9Hiv/kfL6sO6ePTGAV5fY6P7WDZyOs0zfXXU8vsS1ps1CQfGe0J1yuAdcCnOJ9h66RLYX/e9Cife8yw==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "minimist": "~0.0.8",
+        "readable-stream": "~1.0.27-1",
+        "through2": "~0.4.1"
+      },
+      "bin": {
+        "html-tokenize": "bin/cmd.js"
+      }
+    },
+    "node_modules/html-tokenize/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/html-tokenize/node_modules/minimist": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+      "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+      "dev": true
+    },
+    "node_modules/html-tokenize/node_modules/object-keys": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
+      "integrity": "sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==",
+      "dev": true
+    },
+    "node_modules/html-tokenize/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/html-tokenize/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/html-tokenize/node_modules/through2": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
+      "integrity": "sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.0.17",
+        "xtend": "~2.1.1"
+      }
+    },
+    "node_modules/html-tokenize/node_modules/xtend": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+      "integrity": "sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "~0.4.0"
+      },
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
     "node_modules/html-void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-2.0.1.tgz",
@@ -11673,6 +13426,16 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/http-browserify": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
+      "integrity": "sha512-Irf/LJXmE3cBzU1eaR4+NEX6bmVLqt1wkmDiA7kBwH7zmb0D8kBAXsDmQ88hhj/qv9iEZKlyGx/hrMcFi8sOHw==",
+      "dev": true,
+      "dependencies": {
+        "Base64": "~0.2.0",
+        "inherits": "~2.0.1"
+      }
+    },
     "node_modules/http-cache-semantics": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
@@ -11742,6 +13505,12 @@
         "node": ">=10.19.0"
       }
     },
+    "node_modules/https-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
+      "integrity": "sha512-EjDQFbgJr1vDD/175UJeSX3ncQ3+RUnCL5NkthQGHvF4VNHlzTy8ifJfTqz47qiPRqaFH58+CbuG3x51WuB1XQ==",
+      "dev": true
+    },
     "node_modules/https-proxy-agent": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
@@ -11795,6 +13564,15 @@
         "node": ">= 4"
       }
     },
+    "node_modules/ignorepatterns": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ignorepatterns/-/ignorepatterns-1.0.1.tgz",
+      "integrity": "sha512-9bm+Wivwyocr88go3y04hpX3qdFs6EgsxrjjpcI9C2GAqxcWYVMJaS9h9KL8ftJk1xP/8NzPxfHk6K1X7p0CRQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
     "node_modules/import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -11829,6 +13607,36 @@
         "node": ">=0.8.19"
       }
     },
+    "node_modules/indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==",
+      "dev": true,
+      "dependencies": {
+        "repeating": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==",
+      "dev": true
+    },
+    "node_modules/individual": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
+      "integrity": "sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g==",
+      "dev": true
+    },
+    "node_modules/infinity-agent": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz",
+      "integrity": "sha512-CnfUJe5o2S9aAQWXGMhDZI4UL39MAJV3guOTfHHIdos4tuVHkl1j/J+1XLQn+CLIvqcpgQR/p+xXYXzcrhCe5w==",
+      "dev": true
+    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -11850,6 +13658,27 @@
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true
     },
+    "node_modules/inline-source-map": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
+      "integrity": "sha512-RNlldBXZ7BBcVm3HjXIXiwKxih1lnuKbzeLBRDSB/qaqk8/g4JEZBjxpBQMhqEthQyGv7ycu8r/8PKGgBdIqrA==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "~0.3.0"
+      }
+    },
+    "node_modules/inline-source-map/node_modules/source-map": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
+      "integrity": "sha512-jz8leTIGS8+qJywWiO9mKza0hJxexdeIYXhDHw9avTQcXSNAGk3hiiRMpmI2Qf9dOrZDrDpgH9VNefzuacWC9A==",
+      "dev": true,
+      "dependencies": {
+        "amdefine": ">=0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/inquirer": {
       "version": "8.1.5",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.5.tgz",
@@ -11936,6 +13765,143 @@
         "node": ">=8"
       }
     },
+    "node_modules/insert-module-globals": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz",
+      "integrity": "sha512-ryk8hTKUZCc300SPOOwx30WhE5oRUssPDVlIoO8vtoMNBy5HGeesVRl3HF7ra4ll42T0IdnwD9XR9svh6+RRhg==",
+      "dev": true,
+      "dependencies": {
+        "combine-source-map": "~0.6.1",
+        "concat-stream": "~1.4.1",
+        "is-buffer": "^1.1.0",
+        "JSONStream": "^1.0.3",
+        "lexical-scope": "^1.2.0",
+        "process": "~0.11.0",
+        "through2": "^1.0.0",
+        "xtend": "^4.0.0"
+      },
+      "bin": {
+        "insert-module-globals": "bin/cmd.js"
+      }
+    },
+    "node_modules/insert-module-globals/node_modules/combine-source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
+      "integrity": "sha512-XKRNtuZRlVDTuSGKsfZpXYz80y0XDbYS4a+FzafTgmYHy/ckruFBx7Nd6WaQnFHVI3O6IseWVdXUvZutMpjSkQ==",
+      "dev": true,
+      "dependencies": {
+        "convert-source-map": "~1.1.0",
+        "inline-source-map": "~0.5.0",
+        "lodash.memoize": "~3.0.3",
+        "source-map": "~0.4.2"
+      }
+    },
+    "node_modules/insert-module-globals/node_modules/concat-stream": {
+      "version": "1.4.11",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
+      "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "~1.1.9",
+        "typedarray": "~0.0.5"
+      }
+    },
+    "node_modules/insert-module-globals/node_modules/convert-source-map": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
+      "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==",
+      "dev": true
+    },
+    "node_modules/insert-module-globals/node_modules/inline-source-map": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz",
+      "integrity": "sha512-2WtHG0qX9OH9TVcxsLVfq3Tzr+qtL6PtWgoh0XAAKe4KkdA/57Q+OGJuRJHA4mZ2OZnkJ/ZAaXf9krLB12/nIg==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "~0.4.0"
+      }
+    },
+    "node_modules/insert-module-globals/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/insert-module-globals/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/insert-module-globals/node_modules/jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+      "dev": true,
+      "engines": [
+        "node >= 0.2.0"
+      ]
+    },
+    "node_modules/insert-module-globals/node_modules/JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "dependencies": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/insert-module-globals/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/insert-module-globals/node_modules/source-map": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+      "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
+      "dev": true,
+      "dependencies": {
+        "amdefine": ">=0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/insert-module-globals/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/insert-module-globals/node_modules/through2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.1.13-1 <1.2.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
     "node_modules/internal-slot": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
@@ -12255,6 +14221,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
+      "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==",
+      "dev": true
+    },
     "node_modules/is-generator-function": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
@@ -12300,6 +14272,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-my-ip-valid": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.1.tgz",
+      "integrity": "sha512-jxc8cBcOWbNK2i2aTkCZP6i7wkHF1bqKFrwEHuN5Jtg5BSaZHUZQ/JTOJwoV41YvHnOaRyWWh72T/KvfNz9DJg==",
+      "dev": true
+    },
+    "node_modules/is-my-json-valid": {
+      "version": "2.20.6",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.6.tgz",
+      "integrity": "sha512-1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw==",
+      "dev": true,
+      "dependencies": {
+        "generate-function": "^2.0.0",
+        "generate-object-property": "^1.1.0",
+        "is-my-ip-valid": "^1.0.0",
+        "jsonpointer": "^5.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
     "node_modules/is-nan": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
@@ -12382,6 +14373,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
+      "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-plain-obj": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
@@ -12409,6 +14409,21 @@
       "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
       "dev": true
     },
+    "node_modules/is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==",
+      "dev": true
+    },
+    "node_modules/is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
@@ -12847,6 +14862,39 @@
         "url": "https://bevry.me/fund"
       }
     },
+    "node_modules/jade": {
+      "version": "0.26.3",
+      "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
+      "integrity": "sha512-mkk3vzUHFjzKjpCXeu+IjXeZD+QOTjUUdubgmHtHTDwvAO2ZTkMTTVrapts5CWz3JvJryh/4KWZpjeZrCepZ3A==",
+      "deprecated": "Jade has been renamed to pug, please install the latest version of pug instead of jade",
+      "dev": true,
+      "dependencies": {
+        "commander": "0.6.1",
+        "mkdirp": "0.3.0"
+      },
+      "bin": {
+        "jade": "bin/jade"
+      }
+    },
+    "node_modules/jade/node_modules/commander": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
+      "integrity": "sha512-0fLycpl1UMTGX257hRsu/arL/cUbcvQM4zMKwvLvzXtfdezIV4yotPS2dYtknF+NmEfWSoCEF6+hj9XLm/6hEw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.x"
+      }
+    },
+    "node_modules/jade/node_modules/mkdirp": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
+      "integrity": "sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==",
+      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/jake": {
       "version": "10.8.5",
       "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
@@ -13201,6 +15249,12 @@
         "node": ">= 10.13.0"
       }
     },
+    "node_modules/jju": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+      "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==",
+      "dev": true
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -13232,12 +15286,77 @@
         "node": ">=4"
       }
     },
+    "node_modules/js2xmlparser": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
+      "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
+      "dev": true,
+      "dependencies": {
+        "xmlcreate": "^2.0.4"
+      }
+    },
     "node_modules/jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
       "dev": true
     },
+    "node_modules/jsdoc": {
+      "version": "3.6.11",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.11.tgz",
+      "integrity": "sha512-8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.9.4",
+        "@types/markdown-it": "^12.2.3",
+        "bluebird": "^3.7.2",
+        "catharsis": "^0.9.0",
+        "escape-string-regexp": "^2.0.0",
+        "js2xmlparser": "^4.0.2",
+        "klaw": "^3.0.0",
+        "markdown-it": "^12.3.2",
+        "markdown-it-anchor": "^8.4.1",
+        "marked": "^4.0.10",
+        "mkdirp": "^1.0.4",
+        "requizzle": "^0.2.3",
+        "strip-json-comments": "^3.1.0",
+        "taffydb": "2.6.2",
+        "underscore": "~1.13.2"
+      },
+      "bin": {
+        "jsdoc": "jsdoc.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/jsdoc/node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "node_modules/jsdoc/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jsdoc/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -13267,6 +15386,15 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
+    "node_modules/json-parse-helpfulerror": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+      "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==",
+      "dev": true,
+      "dependencies": {
+        "jju": "^1.1.0"
+      }
+    },
     "node_modules/json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
@@ -13279,6 +15407,15 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "node_modules/json-stable-stringify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+      "integrity": "sha512-nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==",
+      "dev": true,
+      "dependencies": {
+        "jsonify": "~0.0.0"
+      }
+    },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -13314,6 +15451,65 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/jsonify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+      "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/jsonlint": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz",
+      "integrity": "sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==",
+      "dev": true,
+      "dependencies": {
+        "JSV": "^4.0.x",
+        "nomnom": "^1.5.x"
+      },
+      "bin": {
+        "jsonlint": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/jsonparse": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
+      "integrity": "sha512-fw7Q/8gFR8iSekUi9I+HqWIap6mywuoe7hQIg3buTVjuZgALKj4HAmm0X6f+TaL4c9NJbvyFQdaI2ppr5p6dnQ==",
+      "dev": true,
+      "engines": [
+        "node >= 0.2.0"
+      ]
+    },
+    "node_modules/jsonpointer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
+      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/JSONStream": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+      "integrity": "sha512-l0NN3IcqrZfZBJp7JWDJIHsnPV7yzJWqsYxQzL8Fwdx1BmEMjLuvtYkv+P9pbvpyfP75/f4MeDZhWNU4is32uA==",
+      "dev": true,
+      "dependencies": {
+        "jsonparse": "0.0.5",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "index.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
@@ -13329,6 +15525,15 @@
         "node": ">=0.6.0"
       }
     },
+    "node_modules/JSV": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
+      "integrity": "sha512-ZJ6wx9xaKJ3yFUhq5/sk82PJMuUyLk277I8mQeyDgCTjGdjWJIvPfaU5LIXaMuaN2UO1X3kZH4+lgphublZUHw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/just-clone": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-1.0.2.tgz",
@@ -13768,6 +15973,18 @@
         "node": ">=10"
       }
     },
+    "node_modules/kew": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz",
+      "integrity": "sha512-TQRJfHoVm4f2exuRqjcpURhzGcC4GEIPyiLquo4mBfz0JgsVg19VeyTmKp6RKSOIhHQ6F4SgEhsnUlBduGV9Yw==",
+      "dev": true
+    },
+    "node_modules/keycode": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
+      "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==",
+      "dev": true
+    },
     "node_modules/keyv": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz",
@@ -13786,6 +16003,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/klaw": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
+      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
     "node_modules/kleur": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
@@ -13817,6 +16043,23 @@
         "url": "https://github.com/sindresorhus/ky?sponsor=1"
       }
     },
+    "node_modules/labeled-stream-splicer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
+      "integrity": "sha512-3KBjPRnXrYC5h2jEf/d6hO7Lcl+38QzRVTOyHA2sFzZVMYwsUFuejlrOMwAjmz13hVBr9ruDS1RwE4YEz8P58w==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "isarray": "~0.0.1",
+        "stream-splicer": "^1.1.0"
+      }
+    },
+    "node_modules/labeled-stream-splicer/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
     "node_modules/last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -13888,6 +16131,15 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/lexical-scope": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
+      "integrity": "sha512-ntJ8IcBCuKwudML7vAuT/L0aIMU0+9vO25K4CjLPYgzf1NZ0bAhJJBZrvkO+oUGgKcbdkH8UZdRsaEg+wULLRw==",
+      "dev": true,
+      "dependencies": {
+        "astw": "^2.0.0"
+      }
+    },
     "node_modules/liftoff": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
@@ -13950,6 +16202,15 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
+    "node_modules/linkify-it": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "dev": true,
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
     "node_modules/listenercount": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
@@ -13973,6 +16234,55 @@
       "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
       "dev": true
     },
+    "node_modules/load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
+      "dev": true,
+      "dependencies": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/loader-runner": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
@@ -14001,12 +16311,87 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
+    "node_modules/lodash._arraycopy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz",
+      "integrity": "sha512-RHShTDnPKP7aWxlvXKiDT6IX2jCs6YZLCtNhOru/OX2Q/tzX295vVBK5oX1ECtN+2r86S0Ogy8ykP1sgCZAN0A==",
+      "dev": true
+    },
+    "node_modules/lodash._arrayeach": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz",
+      "integrity": "sha512-Mn7HidOVcl3mkQtbPsuKR0Fj0N6Q6DQB77CtYncZcJc0bx5qv2q4Gl6a0LC1AN+GSxpnBDNnK3CKEm9XNA4zqQ==",
+      "dev": true
+    },
+    "node_modules/lodash._arraymap": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._arraymap/-/lodash._arraymap-3.0.0.tgz",
+      "integrity": "sha512-IhRssF2bzQoFQ2Q5H1O52HuJY+OtcHDZekEhaMJ6RkUF+gpLlAsizSRsKp3Ho555ANRk69DFp5b4LOlym4S0bw==",
+      "dev": true
+    },
+    "node_modules/lodash._baseassign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+      "integrity": "sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._baseclone": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz",
+      "integrity": "sha512-1K0dntf2dFQ5my0WoGKkduewR6+pTNaqX03kvs45y7G5bzl4B3kTR4hDfJIc2aCQDeLyQHhS280tc814m1QC1Q==",
+      "dev": true,
+      "dependencies": {
+        "lodash._arraycopy": "^3.0.0",
+        "lodash._arrayeach": "^3.0.0",
+        "lodash._baseassign": "^3.0.0",
+        "lodash._basefor": "^3.0.0",
+        "lodash.isarray": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
     "node_modules/lodash._basecopy": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
       "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
       "dev": true
     },
+    "node_modules/lodash._basedifference": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-3.0.3.tgz",
+      "integrity": "sha512-4BcJlOv36b3v+kHdJWcgsDi96ns8neNLuDtbzzjW3+eh3XhFVmFPH2tu6GJK2e5eRYMQ8izHU35iAyNjRyDtCQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._baseindexof": "^3.0.0",
+        "lodash._cacheindexof": "^3.0.0",
+        "lodash._createcache": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._baseflatten": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz",
+      "integrity": "sha512-fESngZd+X4k+GbTxdMutf8ohQa0s3sJEHIcwtu4/LsIQ2JTDzdRxDCMQjW+ezzwRitLmHnacVVmosCbxifefbw==",
+      "dev": true,
+      "dependencies": {
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._basefor": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz",
+      "integrity": "sha512-6bc3b8grkpMgDcVJv9JYZAk/mHgcqMljzm7OsbmcE2FGUMmmLQTPHlh/dFqR8LA0GQ7z4K67JSotVKu5058v1A==",
+      "dev": true
+    },
+    "node_modules/lodash._baseindexof": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz",
+      "integrity": "sha512-bSYo8Pc/f0qAkr8fPJydpJjtrHiSynYfYBjtANIgXv5xEf1WlTC63dIDlgu0s9dmTvzRu1+JJTxcIAHe+sH0FQ==",
+      "dev": true
+    },
     "node_modules/lodash._basetostring": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
@@ -14019,6 +16404,38 @@
       "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
       "dev": true
     },
+    "node_modules/lodash._bindcallback": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
+      "integrity": "sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==",
+      "dev": true
+    },
+    "node_modules/lodash._cacheindexof": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz",
+      "integrity": "sha512-S8dUjWr7SUT/X6TBIQ/OYoCHo1Stu1ZRy6uMUSKqzFnZp5G5RyQizSm6kvxD2Ewyy6AVfMg4AToeZzKfF99T5w==",
+      "dev": true
+    },
+    "node_modules/lodash._createassigner": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
+      "integrity": "sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw==",
+      "dev": true,
+      "dependencies": {
+        "lodash._bindcallback": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash.restparam": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._createcache": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz",
+      "integrity": "sha512-ev5SP+iFpZOugyab/DEUQxUeZP5qyciVTlgQ1f4Vlw7VUcCD8fVnyIqVUEIaoFH9zjAqdgi69KiofzvVmda/ZQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._getnative": "^3.0.0"
+      }
+    },
     "node_modules/lodash._getnative": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
@@ -14031,6 +16448,22 @@
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
       "dev": true
     },
+    "node_modules/lodash._pickbyarray": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/lodash._pickbyarray/-/lodash._pickbyarray-3.0.2.tgz",
+      "integrity": "sha512-tHzBIfgugzI7HV0y8MJS1z/ryWDh8NyD6AV+so9vlplRnhD4qBuwoyDt7g241ad3F43YDFghCN+R3iaFd4Azvw==",
+      "dev": true
+    },
+    "node_modules/lodash._pickbycallback": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._pickbycallback/-/lodash._pickbycallback-3.0.0.tgz",
+      "integrity": "sha512-DVP27YmN0lB+j/Tgd/+gtxfmW/XihgWpQpHptBuwyp2fD9zEBRwwcnw6Qej16LUV8LRFuTqyoc0i6ON97d/C5w==",
+      "dev": true,
+      "dependencies": {
+        "lodash._basefor": "^3.0.0",
+        "lodash.keysin": "^3.0.0"
+      }
+    },
     "node_modules/lodash._reescape": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
@@ -14126,12 +16559,61 @@
       "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
       "dev": true
     },
+    "node_modules/lodash.istypedarray": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz",
+      "integrity": "sha512-lGWJ6N8AA3KSv+ZZxlTdn4f6A7kMfpJboeyvbFdE7IU9YAgweODqmOgdUHOA+c6lVWeVLysdaxciFXi+foVsWw==",
+      "dev": true
+    },
+    "node_modules/lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.keysin": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-3.0.8.tgz",
+      "integrity": "sha512-YDB/5xkL3fBKFMDaC+cfGV00pbiJ6XoJIfRmBhv7aR6wWtbCW6IzkiWnTfkiHTF6ALD7ff83dAtB3OEaSoyQPg==",
+      "dev": true,
+      "dependencies": {
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.memoize": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
+      "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==",
+      "dev": true
+    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
+    "node_modules/lodash.omit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-3.1.0.tgz",
+      "integrity": "sha512-vC3fSzZDmPlwk+kCGYMQyUpPeRBgmOK/WrhmjlWVUjEch35gQR3iRbCV9rL7KgMHVeVhnq7A+TRrPvzvg67y9w==",
+      "dev": true,
+      "dependencies": {
+        "lodash._arraymap": "^3.0.0",
+        "lodash._basedifference": "^3.0.0",
+        "lodash._baseflatten": "^3.0.0",
+        "lodash._bindcallback": "^3.0.0",
+        "lodash._pickbyarray": "^3.0.0",
+        "lodash._pickbycallback": "^3.0.0",
+        "lodash.keysin": "^3.0.0",
+        "lodash.restparam": "^3.0.0"
+      }
+    },
     "node_modules/lodash.pickby": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
@@ -14169,6 +16651,16 @@
         "lodash._reinterpolate": "^3.0.0"
       }
     },
+    "node_modules/lodash.toplainobject": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz",
+      "integrity": "sha512-wMI0Ju1bvSmnBS3EcRRH/3zDnZOPpDtMtNDzbbNMKuTrEpALsf+sPyMeogmv63Y11qZQO7H1xFzohIEGRMjPYA==",
+      "dev": true,
+      "dependencies": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash.keysin": "^3.0.0"
+      }
+    },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -14271,6 +16763,19 @@
         "loose-envify": "cli.js"
       }
     },
+    "node_modules/loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==",
+      "dev": true,
+      "dependencies": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/loupe": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
@@ -14310,6 +16815,17 @@
         "es5-ext": "~0.10.2"
       }
     },
+    "node_modules/m3u8-parser": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.1.tgz",
+      "integrity": "sha512-pbrQwiMiq+MmI9bl7UjtPT3AK603PV9bogNlr83uC+X9IoxqL5E4k7kU7fMQ0dpRgxgeSMygqUa0IMLQNXLBNA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "^3.0.5",
+        "global": "^4.4.0"
+      }
+    },
     "node_modules/magic-string": {
       "version": "0.25.9",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
@@ -14365,6 +16881,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/map-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
@@ -14383,6 +16908,38 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/markdown-it": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
+    "node_modules/markdown-it-anchor": {
+      "version": "8.6.5",
+      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.5.tgz",
+      "integrity": "sha512-PI1qEHHkTNWT+X6Ip9w+paonfIQ+QZP9sCeMYi47oqhH+EsW8CrJ8J7CzV19QVOj6il8ATGbK2nTECj22ZHGvQ==",
+      "dev": true,
+      "peerDependencies": {
+        "@types/markdown-it": "*",
+        "markdown-it": "*"
+      }
+    },
+    "node_modules/markdown-it/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
     "node_modules/markdown-table": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.2.tgz",
@@ -14393,6 +16950,58 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/markdownlint": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.0.6.tgz",
+      "integrity": "sha512-2jxomIcTY+HWnrMWv7Q/T93d7yp4RXNGkoQXWq5II1TgyQj5pFDoB7HZSCX57ATk9zZTb1++jwXR3uHn6AKmew==",
+      "dev": true,
+      "dependencies": {
+        "markdown-it": "^4.2.2"
+      }
+    },
+    "node_modules/markdownlint/node_modules/entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
+    },
+    "node_modules/markdownlint/node_modules/linkify-it": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
+      "integrity": "sha512-eGHwtlABkp1NOJSiKUNqBf3SYAS5jPHtvRXPAgNaQwTqmkTahjtiLH9NtxdR5IOPhNvwNMN/diswSfZKzUkhGg==",
+      "dev": true,
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "node_modules/markdownlint/node_modules/markdown-it": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz",
+      "integrity": "sha512-Rl8dHHeLuAh3E72OPY0tY7CLvlxgHiLhlshIYswAAabAg4YDBLa6e/LTgNkkxBO2K61ESzoquPQFMw/iMrT1PA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "~1.0.2",
+        "entities": "~1.1.1",
+        "linkify-it": "~1.2.0",
+        "mdurl": "~1.0.0",
+        "uc.micro": "^1.0.0"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
+    "node_modules/marked": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.1.1.tgz",
+      "integrity": "sha512-0cNMnTcUJPxbA6uWmCmjWz4NJRe/0Xfk2NhXCUHjew9qJzFN20krFnsUe7QynwqOwa5m1fZ4UDg0ycKFVC0ccw==",
+      "dev": true,
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/marky": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.4.tgz",
@@ -14441,6 +17050,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
     "node_modules/mdast-util-definitions": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz",
@@ -14783,6 +17403,79 @@
         "node": ">=4.3.0 <5.0.0 || >=5.10"
       }
     },
+    "node_modules/meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
+      "dev": true,
+      "dependencies": {
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/meow/node_modules/find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
+      "dev": true,
+      "dependencies": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/meow/node_modules/path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+      "dev": true,
+      "dependencies": {
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/meow/node_modules/read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/meow/node_modules/read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -15482,6 +18175,25 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
     "node_modules/mime": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
@@ -15531,6 +18243,27 @@
         "node": ">=4"
       }
     },
+    "node_modules/min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+      "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==",
+      "dev": true,
+      "dependencies": {
+        "dom-walk": "^0.1.0"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
+      "dev": true
+    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -15581,12 +18314,11 @@
       "dev": true
     },
     "node_modules/mocha": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz",
-      "integrity": "sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
+      "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
       "dev": true,
       "dependencies": {
-        "@ungap/promise-all-settled": "1.1.2",
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
         "chokidar": "3.5.3",
@@ -15621,6 +18353,111 @@
         "url": "https://opencollective.com/mochajs"
       }
     },
+    "node_modules/mocha-phantomjs": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.6.0.tgz",
+      "integrity": "sha512-siI6m2uw3Xyjruz9eEP8JTVHOtnOxdmnEqXM0IrOt3Nbw4oPJw6u8Q6MG6hqnbH9fJ3i60F3bYlmSEbgwuNsQw==",
+      "dev": true,
+      "dependencies": {
+        "commander": "~2.0.0",
+        "mocha": "~1.20.1"
+      },
+      "bin": {
+        "mocha-phantomjs": "bin/mocha-phantomjs"
+      },
+      "peerDependencies": {
+        "phantomjs": "1.9.1 - 1.9.7-15"
+      }
+    },
+    "node_modules/mocha-phantomjs/node_modules/diff": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz",
+      "integrity": "sha512-0bTLzyr1S59cPsgAD/lR+ivvHTbgPb+k/mUR6WGqma1J6QDU+kUegI8uQFuH/cMUNK7JGN3Tk1Y5Jf2MO85WrA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/mocha-phantomjs/node_modules/glob": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz",
+      "integrity": "sha512-WPaLsMHD1lYEqAmIQI6VOJSPwuBdGShDWnj1yUo0vQqEO809R8W3LM9OVU13CnnDhyv/EiNwOtxEW74SmrzS6w==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "~2.0.0",
+        "inherits": "2",
+        "minimatch": "~0.2.11"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/mocha-phantomjs/node_modules/graceful-fs": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+      "integrity": "sha512-hcj/NTUWv+C3MbqrVb9F+aH6lvTwEHJdx2foBxlrVq5h6zE8Bfu4pv4CAAqbDcZrw/9Ak5lsRXlY9Ao8/F0Tuw==",
+      "deprecated": "please upgrade to graceful-fs 4 for compatibility with current and future versions of Node.js",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/mocha-phantomjs/node_modules/growl": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz",
+      "integrity": "sha512-VWv7s1EI41AG2LiCr7uAuxWikLDN1SQOuEUc37d/P34NAIIYgkvWYngNw0d9d9iCrDFL0SYCE9UQpxhIjjtuLg==",
+      "dev": true
+    },
+    "node_modules/mocha-phantomjs/node_modules/lru-cache": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+      "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==",
+      "dev": true
+    },
+    "node_modules/mocha-phantomjs/node_modules/minimatch": {
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+      "integrity": "sha512-zZ+Jy8lVWlvqqeM8iZB7w7KmQkoJn8djM585z88rywrEbzoqawVa9FR5p2hwD+y74nfuKOjmNvi9gtWJNLqHvA==",
+      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "2",
+        "sigmund": "~1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/mocha-phantomjs/node_modules/mkdirp": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+      "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
+      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+      "dev": true
+    },
+    "node_modules/mocha-phantomjs/node_modules/mocha": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz",
+      "integrity": "sha512-25Nq3BuIYCy80uEix+hBlZcr/gnLzpcYqfsaPAxZm2qbMFmed8I3nP8N05KagK4BTkGYUvsRJ47istvRqFO8fw==",
+      "deprecated": "Mocha v1.x is no longer supported.",
+      "dev": true,
+      "dependencies": {
+        "commander": "2.0.0",
+        "debug": "*",
+        "diff": "1.0.7",
+        "glob": "3.2.3",
+        "growl": "1.7.x",
+        "jade": "0.26.3",
+        "mkdirp": "0.3.5"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha"
+      },
+      "engines": {
+        "node": ">= 0.4.x"
+      }
+    },
     "node_modules/mocha/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -15860,6 +18697,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/mocha/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/mocha/node_modules/workerpool": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
@@ -15893,6 +18742,131 @@
         "node": ">=10"
       }
     },
+    "node_modules/module-deps": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
+      "integrity": "sha512-EbWWlSGaCVidEsLsSzkY6l/jm0IcGDSQ8tGwtjM8joTrxqxP0om02Px9Np8D7FMZ/vZFdsOGbio+WqkKQxYuTA==",
+      "dev": true,
+      "dependencies": {
+        "browser-resolve": "^1.7.0",
+        "concat-stream": "~1.4.5",
+        "defined": "^1.0.0",
+        "detective": "^4.0.0",
+        "duplexer2": "0.0.2",
+        "inherits": "^2.0.1",
+        "JSONStream": "^1.0.3",
+        "parents": "^1.0.0",
+        "readable-stream": "^1.1.13",
+        "resolve": "^1.1.3",
+        "stream-combiner2": "~1.0.0",
+        "subarg": "^1.0.0",
+        "through2": "^1.0.0",
+        "xtend": "^4.0.0"
+      },
+      "bin": {
+        "module-deps": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/module-deps/node_modules/concat-stream": {
+      "version": "1.4.11",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
+      "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "~1.1.9",
+        "typedarray": "~0.0.5"
+      }
+    },
+    "node_modules/module-deps/node_modules/defined": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+      "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/module-deps/node_modules/duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "node_modules/module-deps/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/module-deps/node_modules/jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+      "dev": true,
+      "engines": [
+        "node >= 0.2.0"
+      ]
+    },
+    "node_modules/module-deps/node_modules/JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "dependencies": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/module-deps/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/module-deps/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/module-deps/node_modules/through2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.1.13-1 <1.2.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/module-not-found-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
+      "integrity": "sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==",
+      "dev": true
+    },
     "node_modules/morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
@@ -15933,6 +18907,21 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
+    "node_modules/mpd-parser": {
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.21.1.tgz",
+      "integrity": "sha512-BxlSXWbKE1n7eyEPBnTEkrzhS3PdmkkKdM1pgKbPnPOH0WFZIc0sPOWi7m0Uo3Wd2a4Or8Qf4ZbS7+ASqQ49fw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "^3.0.5",
+        "@xmldom/xmldom": "^0.7.2",
+        "global": "^4.4.0"
+      },
+      "bin": {
+        "mpd-to-m3u8-json": "bin/parse.js"
+      }
+    },
     "node_modules/mri": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
@@ -16013,6 +19002,23 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
+    "node_modules/mux.js": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.0.1.tgz",
+      "integrity": "sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.11.2",
+        "global": "^4.4.0"
+      },
+      "bin": {
+        "muxjs-transmux": "bin/transmux.js"
+      },
+      "engines": {
+        "node": ">=8",
+        "npm": ">=5"
+      }
+    },
     "node_modules/nan": {
       "version": "2.15.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
@@ -16064,6 +19070,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/natives": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz",
+      "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==",
+      "deprecated": "This module relies on Node.js's internals and will break at some point. Do not use it, and update to graceful-fs@4.x.",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -16093,6 +19107,15 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
+    "node_modules/nested-error-stacks": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz",
+      "integrity": "sha512-o32anp9JA7oezPOFSfG2BBXSdHepOm5FpJvwxHWDtfJ3Bg3xdi68S6ijPlEOfUg6quxZWyvJM+8fHk1yMDKspA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.1"
+      }
+    },
     "node_modules/next-tick": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
@@ -16177,6 +19200,68 @@
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
       "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
     },
+    "node_modules/node-uuid": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+      "integrity": "sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA==",
+      "deprecated": "Use uuid module instead",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/nomnom": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
+      "integrity": "sha512-5s0JxqhDx9/rksG2BTMVN1enjWSvPidpoSgViZU4ZXULyTe+7jxcCRLB6f42Z0l1xYJpleCBtSyY6Lwg3uu5CQ==",
+      "deprecated": "Package no longer supported. Contact support@npmjs.com for more info.",
+      "dev": true,
+      "dependencies": {
+        "chalk": "~0.4.0",
+        "underscore": "~1.6.0"
+      }
+    },
+    "node_modules/nomnom/node_modules/ansi-styles": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
+      "integrity": "sha512-3iF4FIKdxaVYT3JqQuY3Wat/T2t7TRbbQ94Fu50ZUCbLy4TFbTzr90NOHQodQkNqmeEGCw8WbeP78WNi6SKYUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/nomnom/node_modules/chalk": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
+      "integrity": "sha512-sQfYDlfv2DGVtjdoQqxS0cEZDroyG8h6TamA6rvxwlrU5BaSLDx9xhatBYl2pxZ7gmpNaPFVwBtdGdu5rQ+tYQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "~1.0.0",
+        "has-color": "~0.1.0",
+        "strip-ansi": "~0.1.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/nomnom/node_modules/strip-ansi": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
+      "integrity": "sha512-behete+3uqxecWlDAm5lmskaSaISA+ThQ4oNNBDTBJt0x2ppR6IPqfZNuj6BLaLJ/Sji4TPZlcRyOis8wXQTLg==",
+      "dev": true,
+      "bin": {
+        "strip-ansi": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/nomnom/node_modules/underscore": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+      "integrity": "sha512-z4o1fvKUojIWh9XuaVLUDdf86RQiq13AC1dmHbTpoyuu+bquHms76v16CjycCbec87J7z0k//SiQVk0sMdFmpQ==",
+      "dev": true
+    },
     "node_modules/nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -16189,6 +19274,12 @@
         "nopt": "bin/nopt.js"
       }
     },
+    "node_modules/nopt-usage": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/nopt-usage/-/nopt-usage-0.1.0.tgz",
+      "integrity": "sha512-Tg2sISrWBbSsCRqpEMmdxn3KZfacrd0N2NYpZQIq0MHxGHMjwzYlxeB9pVIom/g7CBK28atDUQsTlOfG0wOsNA==",
+      "dev": true
+    },
     "node_modules/normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -16243,6 +19334,43 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/npm-license": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/npm-license/-/npm-license-0.2.3.tgz",
+      "integrity": "sha512-Sm6zqTVReBGe1C5A3Vr7pqYFmawM3oF/MKhhk0LRAOZPEOygr96KkiJ5P0ZQMDP3F7HRW6zyy7gxIIos+6foww==",
+      "dev": true,
+      "dependencies": {
+        "mkdirp": "~0.5.0",
+        "nopt": "~3.0.1",
+        "nopt-usage": "^0.1.0",
+        "package-license": "~0.1.1",
+        "pkginfo": "^0.3.0",
+        "read-installed": "~3.1.3",
+        "treeify": "~1.0.1",
+        "underscore": "~1.4.4"
+      },
+      "bin": {
+        "npm-license": "bin/npm-license"
+      }
+    },
+    "node_modules/npm-license/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/npm-license/node_modules/underscore": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
+      "integrity": "sha512-ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ==",
+      "dev": true
+    },
     "node_modules/npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -16264,6 +19392,73 @@
         "node": ">=4"
       }
     },
+    "node_modules/npmconf": {
+      "version": "0.0.24",
+      "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz",
+      "integrity": "sha512-LX0bX+RmuBuEITg26i7+dx+d9cfYU+giB7eOiSkT5IwvuAzzIx02u4GXwSC3jsQMDMb/kXC57R8tybRSVYfbWw==",
+      "deprecated": "this package has been reintegrated into npm and is now out of date with respect to npm",
+      "dev": true,
+      "dependencies": {
+        "config-chain": "~1.1.1",
+        "inherits": "~1.0.0",
+        "ini": "~1.1.0",
+        "mkdirp": "~0.3.3",
+        "nopt": "2",
+        "once": "~1.1.1",
+        "osenv": "0.0.3",
+        "semver": "~1.1.0"
+      }
+    },
+    "node_modules/npmconf/node_modules/inherits": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
+      "integrity": "sha512-Al67oatbRSo3RV5hRqIoln6Y5yMVbJSIn4jEJNL7VCImzq/kLr7vvb6sFRJXqr8rpHc/2kJOM+y0sPKN47VdzA==",
+      "dev": true
+    },
+    "node_modules/npmconf/node_modules/ini": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz",
+      "integrity": "sha512-B6L/jfyFRcG2dqKiHggWnfby52Iy07iabE4F6srQAr/OmVKBRE5uU+B5MQ+nQ7NiYnjz93gENh1GhqHzpDgHgA==",
+      "deprecated": "Please update to ini >=1.3.6 to avoid a prototype pollution issue",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/npmconf/node_modules/mkdirp": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+      "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
+      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+      "dev": true
+    },
+    "node_modules/npmconf/node_modules/nopt": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
+      "integrity": "sha512-gIOTA/uJuhPwFqp+spY7VQ1satbnGlD+iQVZxI18K6hs8Evq4sX81Ml7BB5byP/LsbR2yBVtmvdEmhi7evJ6Aw==",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      }
+    },
+    "node_modules/npmconf/node_modules/once": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz",
+      "integrity": "sha512-frdJr++QKEg4+JylTX+NNLgSoO6M2pDNYOOXe4WGIYKKBADBI9nU3oa06y4D4FpAJ3obAsjExeBOnscYJB9Blw==",
+      "dev": true
+    },
+    "node_modules/npmconf/node_modules/semver": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz",
+      "integrity": "sha512-9causpLEkYDrfTz7cprleLz9dnlb0oKsKRHl33K92wJmXLhVc2dGlrQGJT/sjtLOAyuoQZl+ClI77+lnvzPSKg==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -16558,6 +19753,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/open": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/open/-/open-0.0.3.tgz",
+      "integrity": "sha512-Vm6nsJHcKV8kdOtHESAFAymOOf1VlKrttpwTqtLxvxRDIh8PSw4lWq5qk88QkAvNwnkv/1dNi2lvedhmam/ggw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/opener": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
@@ -16588,6 +19792,24 @@
         "node": ">=4"
       }
     },
+    "node_modules/optimist": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+      "integrity": "sha512-TCx0dXQzVtSCg2OgY/bO9hjM9cV4XYx09TVK+s3+FhkjT6LovsLe+pPMzpWf+6yXK/hUizs2gUoTw3jHM0VaTQ==",
+      "dev": true,
+      "dependencies": {
+        "wordwrap": "~0.0.2"
+      }
+    },
+    "node_modules/optimist/node_modules/wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -16714,6 +19936,12 @@
         "readable-stream": "^2.0.1"
       }
     },
+    "node_modules/os-browserify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
+      "integrity": "sha512-aZicJZccvxWOZ0Bja2eAch2L8RIJWBuRYmM8Gwl/JjNtRltH0Itcz4eH/ESyuIWfse8cc93ZCf0XrzhXK2HEDA==",
+      "dev": true
+    },
     "node_modules/os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
@@ -16744,6 +19972,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/osenv": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz",
+      "integrity": "sha512-VBk1bfdaO4gh3OWO8LBuDY2alp0buL8YzQ6t13xyc8PQPrnUg5AgQvINQx3UkS4dom8UGCL597q4Y2+M4TPvmw==",
+      "dev": true
+    },
     "node_modules/p-cancelable": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
@@ -16804,6 +20038,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/package-license": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/package-license/-/package-license-0.1.2.tgz",
+      "integrity": "sha512-Q5zmx+M9ZJneMpYS6MlYL77gqeMYWuyErXMnQ/83WCztmYQD7Z0U9XGLvX9OKFFXwRj2NzdzlM0y9Jzcww2O1Q==",
+      "dev": true
+    },
+    "node_modules/pako": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+      "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
+      "dev": true
+    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -16816,6 +20062,28 @@
         "node": ">=6"
       }
     },
+    "node_modules/parents": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+      "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==",
+      "dev": true,
+      "dependencies": {
+        "path-platform": "~0.11.15"
+      }
+    },
+    "node_modules/parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "dependencies": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "node_modules/parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -16913,6 +20181,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
     "node_modules/path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
@@ -16937,6 +20211,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
+      "dev": true
+    },
     "node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -16951,6 +20231,15 @@
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
+    "node_modules/path-platform": {
+      "version": "0.11.15",
+      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
+      "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/path-root": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
@@ -16977,6 +20266,29 @@
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
       "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
     },
+    "node_modules/path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-type/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/pathval": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
@@ -16995,6 +20307,22 @@
         "through": "~2.3"
       }
     },
+    "node_modules/pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dev": true,
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -17007,6 +20335,239 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
+    "node_modules/phantomjs": {
+      "version": "1.9.7-15",
+      "resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-15.tgz",
+      "integrity": "sha512-s4PSN1L0iVwgv9ZkrSKcfojyPAtwGWhXxjn2p1P/ljuw3cx+FW3hKP00x247mIYbKeKSMylOd4euDQOMpUIAsg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "adm-zip": "0.2.1",
+        "kew": "~0.1.7",
+        "mkdirp": "0.3.5",
+        "ncp": "0.4.2",
+        "npmconf": "0.0.24",
+        "progress": "^1.1.5",
+        "request": "2.36.0",
+        "request-progress": "^0.3.1",
+        "rimraf": "~2.2.2",
+        "which": "~1.0.5"
+      },
+      "bin": {
+        "phantomjs": "bin/phantomjs"
+      }
+    },
+    "node_modules/phantomjs/node_modules/asn1": {
+      "version": "0.1.11",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+      "integrity": "sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.4.9"
+      }
+    },
+    "node_modules/phantomjs/node_modules/assert-plus": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+      "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/phantomjs/node_modules/async": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+      "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/phantomjs/node_modules/aws-sign2": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+      "integrity": "sha512-oqUX0DM5j7aPWPCnpWebiyNIj2wiNI87ZxnOMoGv0aE4TGlBy2N+5iWc6dQ/NOKZaBD2W6PVz8jtOGkWzSC5EA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/phantomjs/node_modules/combined-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+      "integrity": "sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "delayed-stream": "0.0.5"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/phantomjs/node_modules/delayed-stream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+      "integrity": "sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/phantomjs/node_modules/forever-agent": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+      "integrity": "sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/phantomjs/node_modules/form-data": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "integrity": "sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "async": "~0.9.0",
+        "combined-stream": "~0.0.4",
+        "mime": "~1.2.11"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/phantomjs/node_modules/hawk": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
+      "integrity": "sha512-Sg+VzrI7TjUomO0rjD6UXawsj50ykn5sB/xKNW/IenxzRVyw/wt9A2FLzYpGL/r0QG5hyXY8nLx/2m8UutoDcg==",
+      "deprecated": "This module moved to @hapi/hawk. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "boom": "0.4.x",
+        "cryptiles": "0.2.x",
+        "hoek": "0.9.x",
+        "sntp": "0.2.x"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/phantomjs/node_modules/http-signature": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+      "integrity": "sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "asn1": "0.1.11",
+        "assert-plus": "^0.1.5",
+        "ctype": "0.5.3"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/phantomjs/node_modules/mime": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+      "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
+      "dev": true
+    },
+    "node_modules/phantomjs/node_modules/mkdirp": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+      "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
+      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+      "dev": true
+    },
+    "node_modules/phantomjs/node_modules/oauth-sign": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
+      "integrity": "sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/phantomjs/node_modules/progress": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+      "integrity": "sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/phantomjs/node_modules/qs": {
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz",
+      "integrity": "sha512-kN+yNdAf29Jgp+AYHUmC7X4QdJPR8czuMWLNLc0aRxkQ7tB3vJQEONKKT9ou/rW7EbqVec11srC9q9BiVbcnHA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/phantomjs/node_modules/request": {
+      "version": "2.36.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
+      "integrity": "sha512-iVii/ruMH9i8k++HYYPqi+nb1Pbgz7UOTGbFEiyhl7uDN8PhyFV2lGJa8XLIUS5tyt5scERcLkwqvCNF84Vv2Q==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+      "dev": true,
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "dependencies": {
+        "forever-agent": "~0.5.0",
+        "json-stringify-safe": "~5.0.0",
+        "mime": "~1.2.9",
+        "node-uuid": "~1.4.0",
+        "qs": "~0.6.0"
+      },
+      "optionalDependencies": {
+        "aws-sign2": "~0.5.0",
+        "form-data": "~0.1.0",
+        "hawk": "~1.0.0",
+        "http-signature": "~0.10.0",
+        "oauth-sign": "~0.3.0",
+        "tough-cookie": ">=0.12.0",
+        "tunnel-agent": "~0.4.0"
+      }
+    },
+    "node_modules/phantomjs/node_modules/rimraf": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+      "integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
+      "dev": true,
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/phantomjs/node_modules/tunnel-agent": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+      "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/phantomjs/node_modules/which": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz",
+      "integrity": "sha512-E87fdQ/eRJr9W1X4wTPejNy9zTW3FI2vpCZSJ/HAY+TkjKVC0TUm1jk6vn2Z7qay0DQy0+RBGdXxj+RmmiGZKQ==",
+      "dev": true,
+      "bin": {
+        "which": "bin/which"
+      }
+    },
     "node_modules/picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -17057,6 +20618,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/pkcs7": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.4.tgz",
+      "integrity": "sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.5.5"
+      },
+      "bin": {
+        "pkcs7": "bin/cli.js"
+      }
+    },
     "node_modules/pkg-dir": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -17139,6 +20712,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/pkginfo": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+      "integrity": "sha512-yO5feByMzAp96LtP58wvPKSbaKAi/1C4kV9XpTctr6EepnP6F33RBNOiVrdz9BrPA98U2BMFsTNHo44TWcbQ2A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/plugin-error": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
@@ -17166,6 +20748,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/portfinder": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-0.2.1.tgz",
+      "integrity": "sha512-U7dHe7mfMMP5cIwbqBHh/likunxAEiBsQLiThUWjyeRK6/C3um2uk+VGiekUW8q3h+s793gdNfagCM3aaXMeOg==",
+      "dev": true,
+      "dependencies": {
+        "mkdirp": "0.0.x"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/portfinder/node_modules/mkdirp": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz",
+      "integrity": "sha512-r4Ml2CH2Kl4B0+Lwq1SVru0vjMxdtR+UEb938WTQcsnU+EJz8dUV/HY0LTZh466nUSljia9cvqW3LZLWs3l8LQ==",
+      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -17209,6 +20813,15 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/pretty-format": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
@@ -17280,6 +20893,15 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -17305,6 +20927,12 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+      "dev": true
+    },
     "node_modules/protocols": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz",
@@ -17329,6 +20957,23 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "dev": true
     },
+    "node_modules/proxyquire": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz",
+      "integrity": "sha512-mZZq4F50qaBkngvlf9paNfaSb5gtJ0mFPnBjda4NxCpXpMAaVfSLguRr9y2KXF6koOSBf4AanD2inuEQw3aCcA==",
+      "dev": true,
+      "dependencies": {
+        "fill-keys": "^1.0.2",
+        "module-not-found-error": "^1.0.0",
+        "resolve": "~1.1.7"
+      }
+    },
+    "node_modules/proxyquire/node_modules/resolve": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+      "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
+      "dev": true
+    },
     "node_modules/prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -17362,6 +21007,26 @@
       "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
+    "node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/public-encrypt/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
     "node_modules/pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -17535,6 +21200,15 @@
         "node": ">=0.4.x"
       }
     },
+    "node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -17562,6 +21236,16 @@
         "safe-buffer": "^5.1.0"
       }
     },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
     "node_modules/range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -17590,6 +21274,121 @@
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
+    "node_modules/read-all-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
+      "integrity": "sha512-DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w==",
+      "dev": true,
+      "dependencies": {
+        "pinkie-promise": "^2.0.0",
+        "readable-stream": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-installed": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-3.1.5.tgz",
+      "integrity": "sha512-XxD5VDz32T6rLCFfYElTif8/lkqcs9y51Gs2r30rAfT7LUGzJWaXLrwvn6fXkDsTzGcPr7Pj8CggOxwTxl/ozQ==",
+      "dev": true,
+      "dependencies": {
+        "debuglog": "^1.0.1",
+        "read-package-json": "1",
+        "readdir-scoped-modules": "^1.0.0",
+        "semver": "2 || 3 || 4",
+        "slide": "~1.1.3",
+        "util-extend": "^1.0.1"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "2 || 3"
+      }
+    },
+    "node_modules/read-installed/node_modules/graceful-fs": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
+      "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "natives": "^1.1.3"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/read-installed/node_modules/semver": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+      "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/read-package-json": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-1.3.3.tgz",
+      "integrity": "sha512-9bayCl9cbXy3AL0qXhLQ0vliEgpzUVeLegSOrde3ujTHy2W18UsJiMUXEWkjbBB4ZnJzZPVuo2vAW62j4gY7gg==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^5.0.3",
+        "json-parse-helpfulerror": "^1.0.2",
+        "normalize-package-data": "^1.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "2 || 3"
+      }
+    },
+    "node_modules/read-package-json/node_modules/glob": {
+      "version": "5.0.15",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+      "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
+      "dev": true,
+      "dependencies": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "2 || 3",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/read-package-json/node_modules/graceful-fs": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
+      "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "natives": "^1.1.3"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/read-package-json/node_modules/normalize-package-data": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz",
+      "integrity": "sha512-pyPVJAzFiaioifPIsJBEoKJ9YcPHz7UhckZ7wqhBztLLCu6NozkIDrN+frzrCwjXtfunXfaMWIDtcDhnbO8fWA==",
+      "dev": true,
+      "dependencies": {
+        "github-url-from-git": "^1.3.0",
+        "github-url-from-username-repo": "^1.0.0",
+        "semver": "2 || 3 || 4"
+      }
+    },
+    "node_modules/read-package-json/node_modules/semver": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+      "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/read-pkg": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
@@ -17794,6 +21593,39 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
       "dev": true
     },
+    "node_modules/readable-wrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz",
+      "integrity": "sha512-/8n0Mr10S+HGKFygQ42Z40JIXwafPH3A72pwmlNClThgsImV5LJJiCue5Je1asxwY082sYxq/+kTxH6nTn0w3g==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^1.1.13-1"
+      }
+    },
+    "node_modules/readable-wrap/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/readable-wrap/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/readable-wrap/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
     "node_modules/readdir-glob": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.1.tgz",
@@ -17803,6 +21635,18 @@
         "minimatch": "^3.0.4"
       }
     },
+    "node_modules/readdir-scoped-modules": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
+      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
+      "dev": true,
+      "dependencies": {
+        "debuglog": "^1.0.1",
+        "dezalgo": "^1.0.0",
+        "graceful-fs": "^4.1.2",
+        "once": "^1.3.0"
+      }
+    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -17815,6 +21659,46 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/readline2": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz",
+      "integrity": "sha512-qs8GGG+hLGMaDOGjd+mDglDoYcHDkjIY7z5RU0/ApsGT0qypyrWskNeemUqD+UxIXiZoMYT5aLwGp4ehoyZhIg==",
+      "dev": true,
+      "dependencies": {
+        "mute-stream": "0.0.4",
+        "strip-ansi": "^2.0.1"
+      }
+    },
+    "node_modules/readline2/node_modules/ansi-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+      "integrity": "sha512-q5i8bFLg2wDfsuR56c1NzlJFPzVD+9mxhDrhqOGigEFa87OZHlF+9dWeGWzVTP/0ECiA/JUGzfzRr2t3eYORRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readline2/node_modules/mute-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
+      "integrity": "sha512-amvrY4m/7oZamehMoFi1tbwU/kXbVvRTGM2S7F+PZi3n51Jx+9AcSQ3EQsag3tR+hS2higfgOP/Kl8kri/X52A==",
+      "dev": true
+    },
+    "node_modules/readline2/node_modules/strip-ansi": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+      "integrity": "sha512-2h8q2CP3EeOhDJ+jd932PRMpa3/pOJFGoF22J1U/DNbEK2gSW2DqeF46VjCXsSQXhC+k/l8/gaaRBQKL6hUPfQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^1.0.0"
+      },
+      "bin": {
+        "strip-ansi": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/rechoir": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -17851,6 +21735,19 @@
         "node": "*"
       }
     },
+    "node_modules/redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==",
+      "dev": true,
+      "dependencies": {
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -18216,6 +22113,15 @@
         "node": ">= 6"
       }
     },
+    "node_modules/request-progress": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
+      "integrity": "sha512-+IAgzH8yWAEgHjOOQzYEqRm0BpNlE6xFgsziGMiTxxMhrkBcCOe9bNWH7bDR+XtHToUMgCZlDgLqjk6cAP/+Ig==",
+      "dev": true,
+      "dependencies": {
+        "throttleit": "~0.0.2"
+      }
+    },
     "node_modules/request/node_modules/qs": {
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
@@ -18249,6 +22155,15 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
+    "node_modules/requizzle": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz",
+      "integrity": "sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.14"
+      }
+    },
     "node_modules/resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -18312,6 +22227,12 @@
       "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
+    "node_modules/response-stream": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/response-stream/-/response-stream-0.0.0.tgz",
+      "integrity": "sha512-tWH3QWqkXv7AgYRXidIhPKO1SqPix2E0gM3x/vxf60LHQHWNS8AVrB3RnYexPAoo5dOc0bGzDlUgtsBvV3CWLA==",
+      "dev": true
+    },
     "node_modules/responselike": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
@@ -18358,12 +22279,34 @@
         "node": ">=0.12"
       }
     },
+    "node_modules/rewire": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/rewire/-/rewire-2.5.2.tgz",
+      "integrity": "sha512-9wOlgRHTOzUv5dQO2XD2qWob+7yi/QXh7SSwLJW5wMAkAdkYuaCtcPuLAXUTllK0MjSvtpxUqAWMuSrrdt9VNw==",
+      "dev": true
+    },
     "node_modules/rfdc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
       "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
       "dev": true
     },
+    "node_modules/rfile": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz",
+      "integrity": "sha512-aNeTpY8g6DYmqPvakau22B0SipQTskO8FtYXzn8qg4X4bN9ExIH8VAhq/L9w7N8HvESYeSSwk3e4GmW+rLLAxQ==",
+      "dev": true,
+      "dependencies": {
+        "callsite": "~1.0.0",
+        "resolve": "~0.3.0"
+      }
+    },
+    "node_modules/rfile/node_modules/resolve": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz",
+      "integrity": "sha512-mxx/I/wLjxtryDBtrrb0ZNzaYERVWaHpJ0W0Arm8N4l8b+jiX/U5yKcsj0zQpF9UuKN1uz80EUTOudON6OPuaQ==",
+      "dev": true
+    },
     "node_modules/rgb2hex": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.2.5.tgz",
@@ -18385,6 +22328,54 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/ruglify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz",
+      "integrity": "sha512-XfRj1YJdm/gnZNvmpQ5L+2YGRHglDGMPgJRbitgCxC3GzKVQF/t+ij1aNcNg2AnEXGtLHJDwoSWrAq3TUm0EVg==",
+      "dev": true,
+      "dependencies": {
+        "rfile": "~1.0",
+        "uglify-js": "~2.2"
+      }
+    },
+    "node_modules/ruglify/node_modules/source-map": {
+      "version": "0.1.43",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+      "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
+      "dev": true,
+      "dependencies": {
+        "amdefine": ">=0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/ruglify/node_modules/uglify-js": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz",
+      "integrity": "sha512-viLk+/8G0zm2aKt1JJAVcz5J/5ytdiNaIsKgrre3yvSUjwVG6ZUujGH7E2TiPigZUwLYCe7eaIUEP2Zka2VJPA==",
+      "dev": true,
+      "dependencies": {
+        "optimist": "~0.3.5",
+        "source-map": "~0.1.7"
+      },
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/run-async": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
@@ -18394,6 +22385,21 @@
         "node": ">=0.12.0"
       }
     },
+    "node_modules/rust-result": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rust-result/-/rust-result-1.0.0.tgz",
+      "integrity": "sha512-6cJzSBU+J/RJCF063onnQf0cDUOHs9uZI1oroSGnHOph+CQTIJ5Pp2hK5kEQq1+7yE/EEWfulSNXAQ2jikPthA==",
+      "dev": true,
+      "dependencies": {
+        "individual": "^2.0.0"
+      }
+    },
+    "node_modules/rx": {
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz",
+      "integrity": "sha512-u5qvfulb7NXoY/+OE28920WEgFi6aiDjf5iF9rA2f9tBXejLgTLd0WxkclvIQWjFFHfNJlb7pSTsrjgiDh+Uug==",
+      "dev": true
+    },
     "node_modules/rxjs": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
@@ -18496,6 +22502,17 @@
         "ajv": "^6.9.1"
       }
     },
+    "node_modules/script-injector": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/script-injector/-/script-injector-0.1.7.tgz",
+      "integrity": "sha512-0iW1D9UKsOPNUVBHvR76KePNS5TamEBN38bT5k7BqsXItsyV5oJTZbVsvOF3YS2xJ7GB7pszmgfDFJbIgHmrDQ==",
+      "dev": true,
+      "dependencies": {
+        "duplexer": "~0.1.1",
+        "through": "~2.3.4",
+        "trumpet": "~1.6.3"
+      }
+    },
     "node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -18743,6 +22760,35 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/shallow-copy": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
+      "integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw==",
+      "dev": true
+    },
+    "node_modules/shasum": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
+      "integrity": "sha512-UTzHm/+AzKfO9RgPgRpDIuMSNie1ubXRaljjlhFMNGYoG7z+rm9AHLPMf70R7887xboDH9Q+5YQbWKObFHEAtw==",
+      "dev": true,
+      "dependencies": {
+        "json-stable-stringify": "~0.0.0",
+        "sha.js": "~2.4.4"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -18764,6 +22810,48 @@
         "node": ">=8"
       }
     },
+    "node_modules/shell-quote": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz",
+      "integrity": "sha512-uEWz7wa9vnCi9w4mvKZMgbHFk3DCKjLQlZcy0tJxUH4NwZjRrPPHXAYIEt2TmJs600Dcgj0Z3fZLZKVPVdGNbQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/shelljs": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
+      "integrity": "sha512-Ny0KN4dyT8ZSCE0frtcbAJGoM/HTArpyPkeli1/00aYfm0sbD/Gk/4x7N2DP9QKGpBsiQH7n6rpm1L79RtviEQ==",
+      "dev": true,
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/shelljs-nodecli": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shelljs-nodecli/-/shelljs-nodecli-0.1.1.tgz",
+      "integrity": "sha512-/e+APCWKKW9A8YMHKgDzhWQ21zPuDLjn6ATBczxbp6uUeiCSwvw95ynKAjMsRd1yrd5dlCkMKJoc/Lpwrt2w+A==",
+      "dev": true,
+      "dependencies": {
+        "shelljs": "~0.2"
+      }
+    },
+    "node_modules/shelljs-nodecli/node_modules/shelljs": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+      "integrity": "sha512-LQiM15qPbSyzHDFfI4v7EVhjBXG5PUAKWVBnVMBXwdlQSHZtzKYeKGzDHBIqpenPrCsPWqBSOF5o7oSvSfX+CA==",
+      "dev": true,
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -18778,6 +22866,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==",
+      "dev": true
+    },
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -18903,6 +22997,15 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/slide": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
+      "integrity": "sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -19108,6 +23211,20 @@
         "urix": "^0.1.0"
       }
     },
+    "node_modules/sntp": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+      "integrity": "sha512-bDLrKa/ywz65gCl+LmOiIhteP1bhEsAAzhfMedPoiHP3dyYnAevlaJshdqb9Yu0sRifyP/fRqSt8t+5qGIWlGQ==",
+      "deprecated": "This module moved to @hapi/sntp. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "hoek": "0.9.x"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/socket.io": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
@@ -19304,6 +23421,21 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "node_modules/sse-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/sse-stream/-/sse-stream-0.0.4.tgz",
+      "integrity": "sha512-rnDUubW7a4CZAB5D0r2OtFU/zvY05MoNGHMX6deAYK0wWaizrNcHzimf+Nk5y0sqntGAPpWEnIopWrrAf2TBVg==",
+      "dev": true,
+      "dependencies": {
+        "through": "~2.2.7"
+      }
+    },
+    "node_modules/sse-stream/node_modules/through": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
+      "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
+      "dev": true
+    },
     "node_modules/sshpk": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
@@ -19460,6 +23592,40 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/stream-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz",
+      "integrity": "sha512-e+V5xc4LlkOiRr64kZTUdb11exsbpSnwb9uwmXaHeDXCpfHg7vaefMJOxi21Pe74ZOqjZ87blBcqqpNAM4Ku0g==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^1.0.27-1"
+      }
+    },
+    "node_modules/stream-browserify/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/stream-browserify/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/stream-browserify/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
     "node_modules/stream-buffers": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
@@ -19478,6 +23644,80 @@
         "duplexer": "~0.1.1"
       }
     },
+    "node_modules/stream-combiner2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
+      "integrity": "sha512-7DO1SfBVnyIyo9ytUjSyVojT5bp1ZY6h3pj7HUs6PwcRSd/r8mBOHbRwYC7nbHRakKzMKyNp5HWJRv4GgVherA==",
+      "dev": true,
+      "dependencies": {
+        "duplexer2": "~0.0.2",
+        "through2": "~0.5.1"
+      }
+    },
+    "node_modules/stream-combiner2/node_modules/duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "node_modules/stream-combiner2/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/stream-combiner2/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/stream-combiner2/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/stream-combiner2/node_modules/through2": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+      "integrity": "sha512-zexCrAOTbjkBCXGyozn7hhS3aEaqdrc59mAD2E3dKYzV1vFuEGQ1hEDJN2oQMQFwy4he2zyLqPZV+AlfS8ZWJA==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.0.17",
+        "xtend": "~3.0.0"
+      }
+    },
+    "node_modules/stream-combiner2/node_modules/through2/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/stream-combiner2/node_modules/xtend": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+      "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
     "node_modules/stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
@@ -19490,6 +23730,54 @@
       "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
       "dev": true
     },
+    "node_modules/stream-splicer": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz",
+      "integrity": "sha512-nmUMEbdm/sZYqe9dZs7mqJvTYpunsDbIWI5FiBCMc/hMVd6vwzy+ITmo7C3gcLYqrn+uQ1w+EJwooWvJ997JAA==",
+      "dev": true,
+      "dependencies": {
+        "indexof": "0.0.1",
+        "inherits": "^2.0.1",
+        "isarray": "~0.0.1",
+        "readable-stream": "^1.1.13-1",
+        "readable-wrap": "^1.0.0",
+        "through2": "^1.0.0"
+      }
+    },
+    "node_modules/stream-splicer/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/stream-splicer/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/stream-splicer/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/stream-splicer/node_modules/through2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.1.13-1 <1.2.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
     "node_modules/streamroller": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.4.tgz",
@@ -19579,6 +23867,13 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/stringstream": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
+      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -19618,16 +23913,40 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+    "node_modules/strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==",
       "dev": true,
+      "dependencies": {
+        "get-stdin": "^4.0.1"
+      },
+      "bin": {
+        "strip-indent": "cli.js"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
+      "integrity": "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg==",
+      "dev": true,
+      "bin": {
+        "strip-json-comments": "cli.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/subarg": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+      "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.1.0"
       }
     },
     "node_modules/suffix": {
@@ -19675,6 +23994,15 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "node_modules/syntax-error": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
+      "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
+      "dev": true,
+      "dependencies": {
+        "acorn-node": "^1.2.0"
+      }
+    },
     "node_modules/table": {
       "version": "6.8.0",
       "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
@@ -19713,6 +24041,12 @@
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true
     },
+    "node_modules/taffydb": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
+      "integrity": "sha512-y3JaeRSplks6NYQuCOj3ZFMO3j60rTwbuKCvZxsAraGYH2epusatvZ0baZYA01WsGqJBq/Dl6vOrMUJqyMj8kA==",
+      "dev": true
+    },
     "node_modules/tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -19964,6 +24298,12 @@
         "url": "https://bevry.me/fund"
       }
     },
+    "node_modules/throttleit": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
+      "integrity": "sha512-HtlTFeyYs1elDM2txiIGsdXHaq8kffVaZH/QEBRbo95zQqzlsBx5ELKhkPOZVad9OK9oxzwx6UrQN8Vfh/+yag==",
+      "dev": true
+    },
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -20022,6 +24362,27 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/timed-out": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz",
+      "integrity": "sha512-pqqJOi1rF5zNs/ps4vmbE4SFCrM4iR7LW+GHAsHqO/EumqbIWceioevYLM5xZRgQSH6gFgL9J/uB7EcJhQ9niQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/timers-browserify": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
+      "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==",
+      "dev": true,
+      "dependencies": {
+        "process": "~0.11.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
     "node_modules/timers-ext": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
@@ -20093,6 +24454,13 @@
         "node": ">=4"
       }
     },
+    "node_modules/to-iso-string": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz",
+      "integrity": "sha512-oeHLgfWA7d0CPQa6h0+i5DAJZISz5un0d5SHPkw+Untclcvzv9T+AC3CvGXlZJdOlIbxbTfyyzlqCXc5hjpXYg==",
+      "deprecated": "to-iso-string has been deprecated, use @segment/to-iso-string instead.",
+      "dev": true
+    },
     "node_modules/to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -20226,6 +24594,15 @@
         "node": "*"
       }
     },
+    "node_modules/treeify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.0.1.tgz",
+      "integrity": "sha512-i3MKN4nGEOuVAcd7s5MtAc2+QBExwcaRT/6/CzUSYVYwzM58bJ3H3wwCPu2PEAGjVPHjfIC/MPaXsxPGUk07cg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
     "node_modules/trim-lines": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
@@ -20236,6 +24613,15 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
@@ -20255,6 +24641,63 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/trumpet": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/trumpet/-/trumpet-1.6.6.tgz",
+      "integrity": "sha512-A4cn/zuq0AsxS5M8cD+7GUoIhOoK2qkcpFUwlpHnNOsTPzCq7FITZV9lg95ydupJcQRi/kFQzGIn7oN3kNp10w==",
+      "dev": true,
+      "dependencies": {
+        "duplexer2": "~0.0.2",
+        "html-select": "^2.3.5",
+        "html-tokenize": "^1.1.1",
+        "inherits": "^2.0.0",
+        "readable-stream": "^1.0.27-1",
+        "through2": "^1.0.0"
+      }
+    },
+    "node_modules/trumpet/node_modules/duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "node_modules/trumpet/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/trumpet/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/trumpet/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/trumpet/node_modules/through2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.1.13-1 <1.2.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
     "node_modules/tsconfig-paths": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.13.0.tgz",
@@ -20285,6 +24728,12 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
+    "node_modules/tty-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+      "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
+      "dev": true
+    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -20360,20 +24809,6 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "node_modules/typescript": {
-      "version": "4.8.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
-      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
-      "dev": true,
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
     "node_modules/typescript-compare": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
@@ -20414,6 +24849,12 @@
         "node": "*"
       }
     },
+    "node_modules/uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "dev": true
+    },
     "node_modules/uglify-js": {
       "version": "3.15.2",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz",
@@ -20427,6 +24868,93 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
+      "dev": true
+    },
+    "node_modules/umd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/umd/-/umd-2.1.0.tgz",
+      "integrity": "sha512-mEAJeceExHnblcAwN3BQtDPYOrTy4ALeBh6nQ9KW0cUCd0UU714jAfil2jvq09b67IizwJIiTVFOjE+/52Dyvw==",
+      "dev": true,
+      "dependencies": {
+        "rfile": "~1.0.0",
+        "ruglify": "~1.0.0",
+        "through": "~2.3.4",
+        "uglify-js": "~2.4.0"
+      },
+      "bin": {
+        "umd": "bin/cli.js"
+      }
+    },
+    "node_modules/umd/node_modules/async": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+      "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
+      "dev": true
+    },
+    "node_modules/umd/node_modules/camelcase": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+      "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/umd/node_modules/source-map": {
+      "version": "0.1.34",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+      "integrity": "sha512-yfCwDj0vR9RTwt3pEzglgb3ZgmcXHt6DjG3bjJvzPwTL+5zDQ2MhmSzAcTy0GTiQuCiriSWXvWM1/NhKdXuoQA==",
+      "dev": true,
+      "dependencies": {
+        "amdefine": ">=0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/umd/node_modules/uglify-js": {
+      "version": "2.4.24",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz",
+      "integrity": "sha512-tktIjwackfZLd893KGJmXc1hrRHH1vH9Po3xFh1XBjjeGAnN02xJ3SuoA+n1L29/ZaCA18KzCFlckS+vfPugiA==",
+      "dev": true,
+      "dependencies": {
+        "async": "~0.2.6",
+        "source-map": "0.1.34",
+        "uglify-to-browserify": "~1.0.0",
+        "yargs": "~3.5.4"
+      },
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/umd/node_modules/wordwrap": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+      "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/umd/node_modules/yargs": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
+      "integrity": "sha512-5j382E4xQSs71p/xZQsU1PtRA2HXPAjX0E0DkoGLxwNASMOKX6A9doV1NrZmj85u2Pjquz402qonBzz/yLPbPA==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^1.0.2",
+        "decamelize": "^1.0.0",
+        "window-size": "0.1.0",
+        "wordwrap": "0.0.2"
+      }
+    },
     "node_modules/unbox-primitive": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
@@ -20461,6 +24989,21 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/underscore": {
+      "version": "1.13.6",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
+      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
+      "dev": true
+    },
+    "node_modules/underscore.string": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz",
+      "integrity": "sha512-yxkabuCaIBnzfIvX3kBxQqCs0ar/bfJwDnFEHJUm/ZrRVhT3IItdRF5cZjARLzEnyQYtIUhsZ2LG2j3HidFOFQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/undertaker": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
@@ -20833,6 +25376,12 @@
         "requires-port": "^1.0.0"
       }
     },
+    "node_modules/url-toolkit": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.5.tgz",
+      "integrity": "sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==",
+      "dev": true
+    },
     "node_modules/url/node_modules/punycode": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
@@ -20848,6 +25397,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/user-home": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+      "integrity": "sha512-aggiKfEEubv3UwRNqTzLInZpAOmKzwdHqEBmW/hBA/mt99eg+b4VrX6i+IRLxU8+WJYfa33rGwRseg4eElUgsQ==",
+      "dev": true,
+      "bin": {
+        "user-home": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/util": {
       "version": "0.12.4",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
@@ -20868,6 +25429,12 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
+    "node_modules/util-extend": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz",
+      "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==",
+      "dev": true
+    },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -21099,6 +25666,98 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/video.js": {
+      "version": "7.20.2",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.20.2.tgz",
+      "integrity": "sha512-hdvAHKAyaL6bCDkeu0pPtFYKi1EDaOUovm7FN1xqBDolUxgH8FKy1WIgTS+Ouuaw7R54SCTcSeXjZEizhy9ouQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/http-streaming": "2.14.2",
+        "@videojs/vhs-utils": "^3.0.4",
+        "@videojs/xhr": "2.6.0",
+        "aes-decrypter": "3.1.3",
+        "global": "^4.4.0",
+        "keycode": "^2.2.0",
+        "m3u8-parser": "4.7.1",
+        "mpd-parser": "0.21.1",
+        "mux.js": "6.0.1",
+        "safe-json-parse": "4.0.0",
+        "videojs-font": "3.2.0",
+        "videojs-vtt.js": "^0.15.3"
+      }
+    },
+    "node_modules/video.js/node_modules/safe-json-parse": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-4.0.0.tgz",
+      "integrity": "sha512-RjZPPHugjK0TOzFrLZ8inw44s9bKox99/0AZW9o/BEQVrJfhI+fIHMErnPyRa89/yRXUUr93q+tiN6zhoVV4wQ==",
+      "dev": true,
+      "dependencies": {
+        "rust-result": "^1.0.0"
+      }
+    },
+    "node_modules/videojs-contrib-ads": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/videojs-contrib-ads/-/videojs-contrib-ads-6.9.0.tgz",
+      "integrity": "sha512-nzKz+jhCGMTYffSNVYrmp9p70s05v6jUMOY3Z7DpVk3iFrWK4Zi/BIkokDWrMoHpKjdmCdKzfJVBT+CrUj6Spw==",
+      "dev": true,
+      "dependencies": {
+        "global": "^4.3.2",
+        "video.js": "^6 || ^7"
+      },
+      "engines": {
+        "node": ">=8",
+        "npm": ">=5"
+      }
+    },
+    "node_modules/videojs-font": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz",
+      "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==",
+      "dev": true
+    },
+    "node_modules/videojs-ima": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/videojs-ima/-/videojs-ima-1.11.0.tgz",
+      "integrity": "sha512-ZRoWuGyJ75zamwZgpr0i/gZ6q7Evda/Q6R46gpW88WN7u0ORU7apw/lM1MSG4c3YDXW8LDENgzMAvMZUdifWhg==",
+      "dev": true,
+      "dependencies": {
+        "@hapi/cryptiles": "^5.1.0",
+        "can-autoplay": "^3.0.0",
+        "extend": ">=3.0.2",
+        "lodash": ">=4.17.19",
+        "lodash.template": ">=4.5.0",
+        "videojs-contrib-ads": "^6.6.5"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      },
+      "peerDependencies": {
+        "video.js": "^5.19.2 || ^6 || ^7"
+      }
+    },
+    "node_modules/videojs-playlist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/videojs-playlist/-/videojs-playlist-5.0.0.tgz",
+      "integrity": "sha512-TM9bytwKqkE05wdWPEKDpkwMGhS/VgMCIsEuNxmX1J1JO9zaTIl4Wm3egf5j1dhIw19oWrqGUV/nK0YNIelCpA==",
+      "dev": true,
+      "dependencies": {
+        "global": "^4.3.2",
+        "video.js": "^6 || ^7"
+      },
+      "engines": {
+        "node": ">=4.4.0"
+      }
+    },
+    "node_modules/videojs-vtt.js": {
+      "version": "0.15.4",
+      "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz",
+      "integrity": "sha512-r6IhM325fcLb1D6pgsMkTQT1PpFdUdYZa1iqk7wJEu+QlibBwATPfPc9Bg8Jiym0GE5yP1AG2rMLu+QMVWkYtA==",
+      "dev": true,
+      "dependencies": {
+        "global": "^4.3.1"
+      }
+    },
     "node_modules/vinyl": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
@@ -21202,6 +25861,15 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha512-NyZNR3WDah+NPkjh/YmhuWSsT4a0mF0BJYgUmvrJ70zxjTXh5Y2Asobxlh0Nfs0PCFB5FVpRJft7NozAWFMwLQ==",
+      "dev": true,
+      "dependencies": {
+        "indexof": "0.0.1"
+      }
+    },
     "node_modules/void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
@@ -21762,6 +26430,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -21884,6 +26561,18 @@
         }
       }
     },
+    "node_modules/xml-escape": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.0.0.tgz",
+      "integrity": "sha512-gCT82WbwOT9SBI/94j5i0tqHpjHIP/0kP11BS8s2wcBtdcFsDNLS9sLvA+C55fD3hpGhgnE/r7hfeBFkiMATjw==",
+      "dev": true
+    },
+    "node_modules/xmlcreate": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
+      "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
+      "dev": true
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -22143,269 +26832,1262 @@
       }
     },
     "plugins/eslint": {
-      "name": "eslint-plugin-prebid",
       "version": "1.0.0",
+      "integrity": "sha512-DH8lk8H4D+XCWtPm7C27IzzD4lkBHv49YTqOHeS/1mYCp4rn1j3NNNA1gl2q+CNYaAPSZDaS5DwRL/ErDP6O4Q==",
       "dev": true,
-      "license": "Apache-2.0"
-    }
-  },
-  "dependencies": {
-    "@ampproject/remapping": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
-      "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
-      "requires": {
-        "@jridgewell/trace-mapping": "^0.3.0"
+      "dependencies": {
+        "chalk": "^1.0.0",
+        "concat-stream": "^1.4.6",
+        "debug": "^2.1.1",
+        "doctrine": "^0.6.2",
+        "escape-string-regexp": "^1.0.2",
+        "escope": "^3.2.0",
+        "espree": "^2.2.0",
+        "estraverse": "^4.1.0",
+        "estraverse-fb": "^1.3.1",
+        "globals": "^8.2.0",
+        "inquirer": "^0.8.2",
+        "is-my-json-valid": "^2.10.0",
+        "js-yaml": "^3.2.5",
+        "lodash.clonedeep": "^3.0.1",
+        "lodash.merge": "^3.3.2",
+        "lodash.omit": "^3.1.0",
+        "minimatch": "^2.0.1",
+        "mkdirp": "^0.5.0",
+        "object-assign": "^2.0.0",
+        "optionator": "^0.5.0",
+        "path-is-absolute": "^1.0.0",
+        "path-is-inside": "^1.0.1",
+        "strip-json-comments": "~1.0.1",
+        "text-table": "~0.2.0",
+        "user-home": "^1.0.0",
+        "xml-escape": "~1.0.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "devDependencies": {
+        "beefy": "^1.0.0",
+        "brfs": "0.0.9",
+        "browserify": "^8.1.3",
+        "chai": "^1.9.1",
+        "coveralls": "2.11.2",
+        "dateformat": "^1.0.8",
+        "esprima": "^2.4.1",
+        "esprima-fb": "^10001.1.0-dev-harmony-fb",
+        "gh-got": "^1.0.3",
+        "istanbul": "^0.3.5",
+        "jsdoc": "^3.3.0-beta1",
+        "jsonlint": "^1.6.2",
+        "markdownlint": "^0.0.6",
+        "mocha": "^2.1.0",
+        "mocha-phantomjs": "3.6.0",
+        "npm-license": "^0.2.3",
+        "phantomjs": "1.9.7-15",
+        "proxyquire": "^1.0.0",
+        "rewire": "^2.3.4",
+        "semver": "^4.1.0",
+        "shelljs": "^0.3.0",
+        "shelljs-nodecli": "~0.1.0",
+        "sinon": "1.14.1",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
-      "requires": {
-        "@babel/highlight": "^7.18.6"
+    "plugins/eslint/node_modules/ansi-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+      "integrity": "sha512-q5i8bFLg2wDfsuR56c1NzlJFPzVD+9mxhDrhqOGigEFa87OZHlF+9dWeGWzVTP/0ECiA/JUGzfzRr2t3eYORRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@babel/compat-data": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.0.tgz",
-      "integrity": "sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw=="
-    },
-    "@babel/core": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.0.tgz",
-      "integrity": "sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ==",
-      "requires": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.0",
-        "@babel/helper-compilation-targets": "^7.19.0",
-        "@babel/helper-module-transforms": "^7.19.0",
-        "@babel/helpers": "^7.19.0",
-        "@babel/parser": "^7.19.0",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
+    "plugins/eslint/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@babel/eslint-parser": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
-      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
+    "plugins/eslint/node_modules/argparse": {
+      "version": "0.1.16",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
+      "integrity": "sha512-LjmC2dNpdn2L4UzyoaIr11ELYoLn37ZFy9zObrQFHsSuOepeUEMKnM8w5KL4Tnrp2gy88rRuQt6Ky8Bjml+Baw==",
       "dev": true,
-      "requires": {
-        "eslint-scope": "^5.1.1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
+      "dependencies": {
+        "underscore": "~1.7.0",
+        "underscore.string": "~2.4.0"
       }
     },
-    "@babel/generator": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
-      "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
-      "requires": {
-        "@babel/types": "^7.19.0",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "jsesc": "^2.5.1"
+    "plugins/eslint/node_modules/asn1": {
+      "version": "0.1.11",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+      "integrity": "sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.4.9"
       }
     },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-      "requires": {
-        "@babel/types": "^7.16.7"
+    "plugins/eslint/node_modules/assert-plus": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+      "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
       }
     },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
-      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
-      "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.16.7",
-        "@babel/types": "^7.16.7"
+    "plugins/eslint/node_modules/assertion-error": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz",
+      "integrity": "sha512-g/gZV+G476cnmtYI+Ko9d5khxSoCSoom/EaNmmCfwpOvBXEJ18qwFrxfP1/CsIqk2no1sAKKwxndV0tP7ROOFQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
       }
     },
-    "@babel/helper-compilation-targets": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz",
-      "integrity": "sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA==",
-      "requires": {
-        "@babel/compat-data": "^7.19.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.20.2",
-        "semver": "^6.3.0"
+    "plugins/eslint/node_modules/aws-sign2": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+      "integrity": "sha512-oqUX0DM5j7aPWPCnpWebiyNIj2wiNI87ZxnOMoGv0aE4TGlBy2N+5iWc6dQ/NOKZaBD2W6PVz8jtOGkWzSC5EA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "*"
       }
     },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.17.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz",
-      "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-member-expression-to-functions": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7"
+    "plugins/eslint/node_modules/chai": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-1.10.0.tgz",
+      "integrity": "sha512-E3L9M2SeQU1XagJkE9KJyTAXXHKJkJ1EsKkFp0Rl53lYa3mro2PVgYHNiCb2YRa2nUeyg7aqmI1EIcSBayNd5w==",
+      "dev": true,
+      "dependencies": {
+        "assertion-error": "1.0.0",
+        "deep-eql": "0.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
       }
     },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz",
-      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "regexpu-core": "^5.0.1"
+    "plugins/eslint/node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
-      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      }
+    "plugins/eslint/node_modules/cli-width": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz",
+      "integrity": "sha512-eMU2akIeEIkCxGXUNmDnJq1KzOIiPnJ+rKqRe6hcxE3vIOPvpMrBYOn/Bl7zNlYJj/zQxXquAnozHUCf9Whnsg==",
+      "dev": true
     },
-    "@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="
+    "plugins/eslint/node_modules/combined-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+      "integrity": "sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "delayed-stream": "0.0.5"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
-      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
-      "requires": {
-        "@babel/types": "^7.16.7"
+    "plugins/eslint/node_modules/commander": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
+      "integrity": "sha512-CD452fnk0jQyk3NfnK+KkR/hUPoHt5pVaKHogtyyv3N0U4QfAal9W0/rXLOg/vVZgQKa7jdtXypKs1YAip11uQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.x"
       }
     },
-    "@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
-      "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
+    "plugins/eslint/node_modules/coveralls": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz",
+      "integrity": "sha512-+OK2imSCDXSYaOyAxGVUmzDfDtCYLW+gtdDVpjvq99R5Dyry4Puj3EQ/4YnsxNc6RHsuhx3wIkHSBIRaJZY5YQ==",
+      "dev": true,
+      "dependencies": {
+        "js-yaml": "3.0.1",
+        "lcov-parse": "0.0.6",
+        "log-driver": "1.2.4",
+        "request": "2.40.0"
+      },
+      "bin": {
+        "coveralls": "bin/coveralls.js"
+      },
+      "engines": {
+        "node": ">=0.8.6"
       }
     },
-    "@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
-      "requires": {
-        "@babel/types": "^7.18.6"
+    "plugins/eslint/node_modules/coveralls/node_modules/esprima": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+      "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
       }
     },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz",
-      "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==",
-      "requires": {
-        "@babel/types": "^7.16.7"
+    "plugins/eslint/node_modules/coveralls/node_modules/js-yaml": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz",
+      "integrity": "sha512-dgxgLzZS9qLWAQd/wrVG8tOiRSBJq1Ss9gbd7+fdBhcia3efHjLLpPkcUhKOyVACxTEAgnao3RT1kj1otiW42g==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "~ 0.1.11",
+        "esprima": "~ 1.0.2"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      },
+      "engines": {
+        "node": ">= 0.6.0"
       }
     },
-    "@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
-      "requires": {
-        "@babel/types": "^7.18.6"
+    "plugins/eslint/node_modules/dateformat": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
+      "integrity": "sha512-5sFRfAAmbHdIts+eKjR9kYJoF0ViCMVX9yqLu5A7S/v+nd077KgCITOMiirmyCBiZpKLDXbBOkYm6tu7rX/TKg==",
+      "dev": true,
+      "dependencies": {
+        "get-stdin": "^4.0.1",
+        "meow": "^3.3.0"
+      },
+      "bin": {
+        "dateformat": "bin/cli.js"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "@babel/helper-module-transforms": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
-      "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+    "plugins/eslint/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
       }
     },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
-      "requires": {
-        "@babel/types": "^7.16.7"
+    "plugins/eslint/node_modules/deep-eql": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
+      "integrity": "sha512-6sEotTRGBFiNcqVoeHwnfopbSpi5NbH1VWJmYCVkmxMmaVTT0bUTrNaGyBwhgP4MZL012W/mkzIn3Da+iDYweg==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "0.1.1"
+      },
+      "engines": {
+        "node": "*"
       }
     },
-    "@babel/helper-plugin-utils": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz",
-      "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="
+    "plugins/eslint/node_modules/delayed-stream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+      "integrity": "sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
     },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-wrap-function": "^7.16.8",
-        "@babel/types": "^7.16.8"
+    "plugins/eslint/node_modules/diff": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
+      "integrity": "sha512-VzVc42hMZbYU9Sx/ltb7KYuQ6pqAw+cbFWVy4XKdkuEL2CFaRLGEnISPs7YdzaUGpi+CpIqvRmu7hPQ4T7EQ5w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
       }
     },
-    "@babel/helper-replace-supers": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
-      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-member-expression-to-functions": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
+    "plugins/eslint/node_modules/doctrine": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.6.4.tgz",
+      "integrity": "sha512-FSGvDB23RFdm/Z2hEINXN1AcBW5I4YBqpGD/lScJV34vuOwrPFyLHN9bwCzLa6lUmqS6ipdp5XlVJRQ6yJ5iSA==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^1.1.6",
+        "isarray": "0.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@babel/helper-simple-access": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
-      "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
-      "requires": {
-        "@babel/types": "^7.18.6"
+    "plugins/eslint/node_modules/escodegen": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.7.1.tgz",
+      "integrity": "sha512-2cd7+JUtUEmZVpGmfF9r+uRYXswJAkf85Ce8GvdBa7hSvdjY8hGo+rwC5syAgYzqHpfxNJzLntFjw6879yPbgQ==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^1.2.2",
+        "estraverse": "^1.9.1",
+        "esutils": "^2.0.2",
+        "optionator": "^0.5.0"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.2.0"
       }
     },
-    "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
-      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
-      "requires": {
-        "@babel/types": "^7.16.0"
+    "plugins/eslint/node_modules/escodegen/node_modules/esprima": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz",
+      "integrity": "sha512-S9VbPDU0adFErpDai3qDkjq8+G05ONtKzcyNrPKg/ZKa+tf879nX2KexNU95b31UoTJjRLInNBHHHjFPoCd7lQ==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
       }
     },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
-      "requires": {
-        "@babel/types": "^7.18.6"
+    "plugins/eslint/node_modules/escodegen/node_modules/estraverse": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+      "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "@babel/helper-string-parser": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
-      "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="
+    "plugins/eslint/node_modules/escodegen/node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "@babel/helper-validator-identifier": {
+    "plugins/eslint/node_modules/espree": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz",
+      "integrity": "sha512-HWJpgkL44cbjWiOTC9Pm34RZE57H1g9V4Ln9U14TUtiywFTLMMpMCtmQK5rkjbGBXigQT8bS3r45+Dt5+m0SZg==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "plugins/eslint/node_modules/esprima": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.5.0.tgz",
+      "integrity": "sha512-uM6hfS0/8ybNIj8SGRMdidPJy5uhWqWN/GIkyqnMAbCSL44yfFGLuBpRRCgOpBXBZt2OymQuM+IfahkqJq3DWw==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "plugins/eslint/node_modules/esutils": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz",
+      "integrity": "sha512-RG1ZkUT7iFJG9LSHr7KDuuMSlujfeTtMNIcInURxKAxhMtwQhI3NrQhz26gZQYlsYZQKzsnwtpKrFKj9K9Qu1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "plugins/eslint/node_modules/fast-levenshtein": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz",
+      "integrity": "sha512-hYsfI0s4lfQ2rHVFKXwAr/L/ZSbq9TZwgXtZqW7ANcn9o9GKvcbWxOnxx7jykXf/Ezv1V8TvaBEKcGK7DWKX5A==",
+      "dev": true
+    },
+    "plugins/eslint/node_modules/figures": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+      "integrity": "sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5",
+        "object-assign": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "plugins/eslint/node_modules/figures/node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "plugins/eslint/node_modules/forever-agent": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+      "integrity": "sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "plugins/eslint/node_modules/form-data": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+      "integrity": "sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "async": "~0.9.0",
+        "combined-stream": "~0.0.4",
+        "mime": "~1.2.11"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "plugins/eslint/node_modules/form-data/node_modules/async": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+      "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
+      "dev": true,
+      "optional": true
+    },
+    "plugins/eslint/node_modules/glob": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+      "integrity": "sha512-hVb0zwEZwC1FXSKRPFTeOtN7AArJcJlI6ULGLtrstaswKNlrTJqAA+1lYlSUop4vjA423xlBzqfVS3iWGlqJ+g==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2",
+        "minimatch": "0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "plugins/eslint/node_modules/glob/node_modules/minimatch": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+      "integrity": "sha512-WFX1jI1AaxNTZVOHLBVazwTWKaQjoykSzCBNXB72vDTCzopQGtyP91tKdFK5cv1+qMwPyiTu1HqUriqplI8pcA==",
+      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "2",
+        "sigmund": "~1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "plugins/eslint/node_modules/globals": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-8.18.0.tgz",
+      "integrity": "sha512-IHCTKEGo42ICEkTZBADyl4HX06hVdFF4qdJdqOgaBe5X8RE1/MrvubetsEtGTcwjs46djFq0Gc3+5RgTsc3UoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "plugins/eslint/node_modules/growl": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
+      "integrity": "sha512-RTBwDHhNuOx4F0hqzItc/siXCasGfC4DeWcBamclWd+6jWtBaeB/SGbMkGf0eiQoW7ib8JpvOgnUsmgMHI3Mfw==",
+      "dev": true
+    },
+    "plugins/eslint/node_modules/has-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+      "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "plugins/eslint/node_modules/http-signature": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+      "integrity": "sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "asn1": "0.1.11",
+        "assert-plus": "^0.1.5",
+        "ctype": "0.5.3"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "plugins/eslint/node_modules/inquirer": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz",
+      "integrity": "sha512-+rksrtdqQ8do7yOsmP5YIgbSdbZYuCIrnfH5vjFYGAr1XgJpMksb3rFZMJ3jiKuUyDVEA4MVDYbkA3ribJn3Tg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^1.1.1",
+        "chalk": "^1.0.0",
+        "cli-width": "^1.0.1",
+        "figures": "^1.3.5",
+        "lodash": "^3.3.1",
+        "readline2": "^0.1.1",
+        "rx": "^2.4.3",
+        "through": "^2.3.6"
+      }
+    },
+    "plugins/eslint/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "plugins/eslint/node_modules/istanbul": {
+      "version": "0.3.22",
+      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.22.tgz",
+      "integrity": "sha512-8H/jxiee2UqX/mviKkPoKQYMxU2t995FC5PwO4zjWeDPOozjoeKqxEyN62l9o5+UgzvYQbrKgQjjxhGON8FcMg==",
+      "deprecated": "This module is no longer maintained, try this instead:\n  npm i nyc\nVisit https://istanbul.js.org/integrations for other alternatives.",
+      "dev": true,
+      "dependencies": {
+        "abbrev": "1.0.x",
+        "async": "1.x",
+        "escodegen": "1.7.x",
+        "esprima": "2.5.x",
+        "fileset": "0.2.x",
+        "handlebars": "^4.0.1",
+        "js-yaml": "3.x",
+        "mkdirp": "0.5.x",
+        "nopt": "3.x",
+        "once": "1.x",
+        "resolve": "1.1.x",
+        "supports-color": "^3.1.0",
+        "which": "^1.1.1",
+        "wordwrap": "^1.0.0"
+      },
+      "bin": {
+        "istanbul": "lib/cli.js"
+      }
+    },
+    "plugins/eslint/node_modules/istanbul/node_modules/supports-color": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+      "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "plugins/eslint/node_modules/lcov-parse": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz",
+      "integrity": "sha512-chuBQJZiBq28YUM6Yr3tf3h5Lxhb+DvhbxxSNpsHURSXiZXOzp49phiWG2pKHboOehJDujivwNQGRP8mAErMvQ==",
+      "dev": true
+    },
+    "plugins/eslint/node_modules/levn": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz",
+      "integrity": "sha512-mvp+NO++YH0B+e8cC/SvJxk6k5Z9Ngd3iXuz7tmT8vZCyQZj/5SI1GkFOiZGGPkm5wWGI9SUrqiAfPq7BJH+0w==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.0",
+        "type-check": "~0.3.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "plugins/eslint/node_modules/lodash": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+      "integrity": "sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==",
+      "dev": true
+    },
+    "plugins/eslint/node_modules/lodash.clonedeep": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz",
+      "integrity": "sha512-I8MpGh5z+6OixDAAb21teLSZDmqVPjlq02Q7ZFrbn2xnQHYYuJf6on/94SWpF/p0s3p/cEv/53ro4AhDOfCR0g==",
+      "dev": true,
+      "dependencies": {
+        "lodash._baseclone": "^3.0.0",
+        "lodash._bindcallback": "^3.0.0"
+      }
+    },
+    "plugins/eslint/node_modules/lodash.isplainobject": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz",
+      "integrity": "sha512-P4wZnho5curNqeEq/x292Pb57e1v+woR7DJ84DURelKB46lby8aDEGVobSaYtzHdQBWQrJSdxcCwjlGOvvdIyg==",
+      "dev": true,
+      "dependencies": {
+        "lodash._basefor": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.keysin": "^3.0.0"
+      }
+    },
+    "plugins/eslint/node_modules/lodash.merge": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-3.3.2.tgz",
+      "integrity": "sha512-ZgGZpRhWLjivGUbjtApZR4HyLv/UAyoYqESVYkK4aLBJVHRrbFpG+GNnE9JPijliME4LkKM0SFI/WyOiBiv1+w==",
+      "dev": true,
+      "dependencies": {
+        "lodash._arraycopy": "^3.0.0",
+        "lodash._arrayeach": "^3.0.0",
+        "lodash._createassigner": "^3.0.0",
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0",
+        "lodash.isplainobject": "^3.0.0",
+        "lodash.istypedarray": "^3.0.0",
+        "lodash.keys": "^3.0.0",
+        "lodash.keysin": "^3.0.0",
+        "lodash.toplainobject": "^3.0.0"
+      }
+    },
+    "plugins/eslint/node_modules/log-driver": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz",
+      "integrity": "sha512-QmyGbAcBbHk8ysCGtT6FQ+LZML6+EeT0NdotCJGu72kNhknXtdso1G/NI0r7j45whFYNTU15XMW+JGOvGX07QQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.6"
+      }
+    },
+    "plugins/eslint/node_modules/lolex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz",
+      "integrity": "sha512-wGZrF3AlAWxG2j+6NyyttZ/UVxW8o/F+q01IUGuf2PiEIAUG9av/vpBS5TQHTQtzPmPJB4CZWjwyGR4C4aX83w==",
+      "dev": true
+    },
+    "plugins/eslint/node_modules/lru-cache": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+      "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==",
+      "dev": true
+    },
+    "plugins/eslint/node_modules/mime": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+      "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
+      "dev": true,
+      "optional": true
+    },
+    "plugins/eslint/node_modules/mime-types": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+      "integrity": "sha512-echfutj/t5SoTL4WZpqjA1DCud1XO0WQF3/GJ48YBmc4ZMhCK77QA6Z/w6VTQERLKuJ4drze3kw2TUT8xZXVNw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "plugins/eslint/node_modules/minimatch": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+      "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
+      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "plugins/eslint/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "plugins/eslint/node_modules/mocha": {
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
+      "integrity": "sha512-jNt2iEk9FPmZLzL+sm4FNyOIDYXf2wUU6L4Cc8OIKK/kzgMHKPi4YhTZqG4bW4kQVdIv6wutDybRhXfdnujA1Q==",
+      "dev": true,
+      "dependencies": {
+        "commander": "2.3.0",
+        "debug": "2.2.0",
+        "diff": "1.4.0",
+        "escape-string-regexp": "1.0.2",
+        "glob": "3.2.11",
+        "growl": "1.9.2",
+        "jade": "0.26.3",
+        "mkdirp": "0.5.1",
+        "supports-color": "1.2.0",
+        "to-iso-string": "0.0.2"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha"
+      },
+      "engines": {
+        "node": ">= 0.8.x"
+      }
+    },
+    "plugins/eslint/node_modules/mocha/node_modules/debug": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+      "integrity": "sha512-X0rGvJcskG1c3TgSCPqHJ0XJgwlcvOC7elJ5Y0hYuKBZoVqWpAMfLOeIh2UI/DCQ5ruodIjvsugZtjUYUw2pUw==",
+      "dev": true,
+      "dependencies": {
+        "ms": "0.7.1"
+      }
+    },
+    "plugins/eslint/node_modules/mocha/node_modules/escape-string-regexp": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
+      "integrity": "sha512-cQpUid7bdTUnFin8S7BnNdOk+/eDqQmKgCANSyd/jAhrKEvxUvr9VQ8XZzXiOtest8NLfk3FSBZzwvemZNQ6Vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "plugins/eslint/node_modules/mocha/node_modules/minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
+      "dev": true
+    },
+    "plugins/eslint/node_modules/mocha/node_modules/mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
+      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+      "dev": true,
+      "dependencies": {
+        "minimist": "0.0.8"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "plugins/eslint/node_modules/mocha/node_modules/ms": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+      "integrity": "sha512-lRLiIR9fSNpnP6TC4v8+4OU7oStC01esuNowdQ34L+Gk8e5Puoc88IqJ+XAY/B3Mn2ZKis8l8HX90oU8ivzUHg==",
+      "dev": true
+    },
+    "plugins/eslint/node_modules/mocha/node_modules/supports-color": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
+      "integrity": "sha512-mS5xsnjTh5b7f2DM6bch6lR582UCOTphzINlZnDsfpIRrwI6r58rb6YSSGsdexkm8qw2bBVO2ID2fnJOTuLiPA==",
+      "dev": true,
+      "bin": {
+        "supports-color": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "plugins/eslint/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "plugins/eslint/node_modules/oauth-sign": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
+      "integrity": "sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "plugins/eslint/node_modules/object-assign": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+      "integrity": "sha512-CdsOUYIh5wIiozhJ3rLQgmUTgcyzFwZZrqhkKhODMoGtPKM+wt0h0CNIoauJWMsS9822EdzPsF/6mb4nLvPN5g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "plugins/eslint/node_modules/optionator": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz",
+      "integrity": "sha512-jUr7aBk/kCInAEsl+qxuw4ORpe458atDKXNLhyvPUD4NfnsJsbAViX1b9nb/0rS62lO8cIFd1VoiaXLQ+MybOw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.2",
+        "fast-levenshtein": "~1.0.0",
+        "levn": "~0.2.5",
+        "prelude-ls": "~1.1.1",
+        "type-check": "~0.3.1",
+        "wordwrap": "~0.0.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "plugins/eslint/node_modules/optionator/node_modules/wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "plugins/eslint/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "plugins/eslint/node_modules/qs": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz",
+      "integrity": "sha512-tHuOP9TN/1VmDM/ylApGK1QF3PSIP8I6bHDEfoKNQeViREQ/sfu1bAUrA1hoDun8p8Tpm7jcsz47g+3PiGoYdg==",
+      "dev": true
+    },
+    "plugins/eslint/node_modules/request": {
+      "version": "2.40.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
+      "integrity": "sha512-waNoGB4Z7bPn+lgqPk7l7hhze4Vd68jKccnwLeS7vr9GMxz0iWQbYTbBNWzfIk87Urx7V44pu29qjF/omej+Fw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+      "dev": true,
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "dependencies": {
+        "forever-agent": "~0.5.0",
+        "json-stringify-safe": "~5.0.0",
+        "mime-types": "~1.0.1",
+        "node-uuid": "~1.4.0",
+        "qs": "~1.0.0"
+      },
+      "optionalDependencies": {
+        "aws-sign2": "~0.5.0",
+        "form-data": "~0.1.0",
+        "hawk": "1.1.1",
+        "http-signature": "~0.10.0",
+        "oauth-sign": "~0.3.0",
+        "stringstream": "~0.0.4",
+        "tough-cookie": ">=0.12.0",
+        "tunnel-agent": "~0.4.0"
+      }
+    },
+    "plugins/eslint/node_modules/resolve": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+      "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
+      "dev": true
+    },
+    "plugins/eslint/node_modules/semver": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+      "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "plugins/eslint/node_modules/sinon": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.14.1.tgz",
+      "integrity": "sha512-cysrMyrriLwSn5Ye82xTCAVVS6Q6XLxlZE3jtPb4IFng2npN3lQWQ5Uyaud6cRpzztbEy2sbJkrDSbIl6OKUCA==",
+      "dev": true,
+      "dependencies": {
+        "formatio": "1.1.1",
+        "lolex": "1.1.0",
+        "util": ">=0.10.3 <1"
+      },
+      "engines": {
+        "node": ">=0.1.103"
+      }
+    },
+    "plugins/eslint/node_modules/source-map": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
+      "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "amdefine": ">=0.0.4"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "plugins/eslint/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "plugins/eslint/node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "plugins/eslint/node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "plugins/eslint/node_modules/tunnel-agent": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+      "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "plugins/eslint/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "plugins/eslint/node_modules/type-detect": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
+      "integrity": "sha512-5rqszGVwYgBoDkIm2oUtvkfZMQ0vk29iDMU0W2qCa3rG0vPDNczCMT4hV/bLBgLg8k8ri6+u3Zbt+S/14eMzlA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "plugins/eslint/node_modules/underscore": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+      "integrity": "sha512-cp0oQQyZhUM1kpJDLdGO1jPZHgS/MpzoWYfe9+CM2h/QGDZlqwT2T3YGukuBdaNJ/CAPoeyAZRRHz8JFo176vA==",
+      "dev": true
+    },
+    "plugins/eslint/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    }
+  },
+  "dependencies": {
+    "@ampproject/remapping": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
+      "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
+      "requires": {
+        "@jridgewell/trace-mapping": "^0.3.0"
+      }
+    },
+    "@babel/code-frame": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "requires": {
+        "@babel/highlight": "^7.18.6"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.0.tgz",
+      "integrity": "sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw=="
+    },
+    "@babel/core": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.0.tgz",
+      "integrity": "sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ==",
+      "requires": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.19.0",
+        "@babel/helper-compilation-targets": "^7.19.0",
+        "@babel/helper-module-transforms": "^7.19.0",
+        "@babel/helpers": "^7.19.0",
+        "@babel/parser": "^7.19.0",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
+      }
+    },
+    "@babel/eslint-parser": {
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
+      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
+      "dev": true,
+      "requires": {
+        "eslint-scope": "^5.1.1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.0"
+      }
+    },
+    "@babel/generator": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
+      "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
+      "requires": {
+        "@babel/types": "^7.19.0",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "jsesc": "^2.5.1"
+      }
+    },
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+      "requires": {
+        "@babel/types": "^7.16.7"
+      }
+    },
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
+      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz",
+      "integrity": "sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA==",
+      "requires": {
+        "@babel/compat-data": "^7.19.0",
+        "@babel/helper-validator-option": "^7.18.6",
+        "browserslist": "^4.20.2",
+        "semver": "^6.3.0"
+      }
+    },
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.17.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz",
+      "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7"
+      }
+    },
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz",
+      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "regexpu-core": "^5.0.1"
+      }
+    },
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
+      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      }
+    },
+    "@babel/helper-environment-visitor": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="
+    },
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
+      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
+      "requires": {
+        "@babel/types": "^7.16.7"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "requires": {
+        "@babel/template": "^7.18.10",
+        "@babel/types": "^7.19.0"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz",
+      "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==",
+      "requires": {
+        "@babel/types": "^7.16.7"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
+      "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-simple-access": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
+      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
+      "requires": {
+        "@babel/types": "^7.16.7"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz",
+      "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
+      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-wrap-function": "^7.16.8",
+        "@babel/types": "^7.16.8"
+      }
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
+      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/traverse": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
+      "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
+    },
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
+      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
+      "requires": {
+        "@babel/types": "^7.16.0"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "requires": {
+        "@babel/types": "^7.18.6"
+      }
+    },
+    "@babel/helper-string-parser": {
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
+      "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="
+    },
+    "@babel/helper-validator-identifier": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
       "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
@@ -23208,6 +28890,12 @@
             "type-fest": "^0.20.2"
           }
         },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -23300,6 +28988,30 @@
         }
       }
     },
+    "@hapi/boom": {
+      "version": "9.1.4",
+      "resolved": "https://registry.npmjs.org/@hapi/boom/-/boom-9.1.4.tgz",
+      "integrity": "sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw==",
+      "dev": true,
+      "requires": {
+        "@hapi/hoek": "9.x.x"
+      }
+    },
+    "@hapi/cryptiles": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/cryptiles/-/cryptiles-5.1.0.tgz",
+      "integrity": "sha512-fo9+d1Ba5/FIoMySfMqPBR/7Pa29J2RsiPrl7bkwo5W5o+AN1dAYQRi4SPrPwwVxVGKjgLOEWrsvt1BonJSfLA==",
+      "dev": true,
+      "requires": {
+        "@hapi/boom": "9.x.x"
+      }
+    },
+    "@hapi/hoek": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
+      "dev": true
+    },
     "@humanwhocodes/config-array": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
@@ -23743,6 +29455,12 @@
         "@types/node": "*"
       }
     },
+    "@types/linkify-it": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
+      "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
+      "dev": true
+    },
     "@types/lodash": {
       "version": "4.14.179",
       "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz",
@@ -23776,6 +29494,16 @@
         "@types/lodash": "*"
       }
     },
+    "@types/markdown-it": {
+      "version": "12.2.3",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
+      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "dev": true,
+      "requires": {
+        "@types/linkify-it": "*",
+        "@types/mdurl": "*"
+      }
+    },
     "@types/mdast": {
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
@@ -23943,6 +29671,44 @@
       "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
       "dev": true
     },
+    "@videojs/http-streaming": {
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.14.2.tgz",
+      "integrity": "sha512-K1raSfO/pq5r8iUas3OSYni0kXOj91n8ealIpV02khghzGv9LQ6O3YUqYd/eAhJ1HIrmZWOnrYpK/P+mhUExXQ==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "3.0.5",
+        "aes-decrypter": "3.1.3",
+        "global": "^4.4.0",
+        "m3u8-parser": "4.7.1",
+        "mpd-parser": "0.21.1",
+        "mux.js": "6.0.1",
+        "video.js": "^6 || ^7"
+      }
+    },
+    "@videojs/vhs-utils": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz",
+      "integrity": "sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "global": "^4.4.0",
+        "url-toolkit": "^2.2.1"
+      }
+    },
+    "@videojs/xhr": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@videojs/xhr/-/xhr-2.6.0.tgz",
+      "integrity": "sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "global": "~4.4.0",
+        "is-function": "^1.0.1"
+      }
+    },
     "@vue/compiler-core": {
       "version": "3.2.38",
       "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.38.tgz",
@@ -24473,6 +30239,12 @@
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
         "yargs": {
           "version": "16.2.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -24824,6 +30596,12 @@
         "@xtuc/long": "4.2.2"
       }
     },
+    "@xmldom/xmldom": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz",
+      "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==",
+      "dev": true
+    },
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -24864,6 +30642,41 @@
       "dev": true,
       "requires": {}
     },
+    "acorn-node": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
+      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
+      "dev": true,
+      "requires": {
+        "acorn": "^7.0.0",
+        "acorn-walk": "^7.0.0",
+        "xtend": "^4.0.2"
+      }
+    },
+    "acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true
+    },
+    "adm-zip": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz",
+      "integrity": "sha512-J2LiZpRxcLsJm2IwoekNa6COwzEZnMwCJ3vxz0UCw2NYUH2WFi7svuDrVccq5KpBGmzGUgFa0L0FwEmKmu/rzQ==",
+      "dev": true
+    },
+    "aes-decrypter": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.3.tgz",
+      "integrity": "sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "^3.0.5",
+        "global": "^4.4.0",
+        "pkcs7": "^1.0.4"
+      }
+    },
     "agent-base": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
@@ -24886,8 +30699,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "ansi-colors": {
       "version": "4.1.1",
@@ -25091,6 +30903,12 @@
       "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
       "dev": true
     },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==",
+      "dev": true
+    },
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -25190,6 +31008,12 @@
         "es-abstract": "^1.19.0"
       }
     },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
+      "dev": true
+    },
     "asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -25199,6 +31023,26 @@
         "safer-buffer": "~2.1.0"
       }
     },
+    "asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
     "assert": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
@@ -25235,6 +31079,23 @@
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true
     },
+    "astw": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz",
+      "integrity": "sha512-E/4z//dvN0lfr8zAx8hXeQ8o3nRoQaL/wqI7fAALEvh/40mnyUxfFB9MwyDHYKVDtS3cp3Pow5s96djZR5lkWw==",
+      "dev": true,
+      "requires": {
+        "acorn": "^4.0.3"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "4.0.13",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+          "integrity": "sha512-fu2ygVGuMmlzG8ZeRJ0bvR41nsAkxxhbyk8bZ1SS521Z7vmgJFTQQlfz/Mp/nJexGBz+v8sC9bM6+lNgskt4Ug==",
+          "dev": true
+        }
+      }
+    },
     "async": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
@@ -25761,6 +31622,12 @@
         }
       }
     },
+    "Base64": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz",
+      "integrity": "sha512-reGEWshDmTDQDsCec/HduOO9Wyj6yMOupMfhIf3ugN1TDlK2NQW4DDJSqNNtp380SNcvRfXtO8HSCQot0d0SMw==",
+      "dev": true
+    },
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -25797,6 +31664,60 @@
         "tweetnacl": "^0.14.3"
       }
     },
+    "beefy": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/beefy/-/beefy-1.1.0.tgz",
+      "integrity": "sha512-olZqTbw6gnofdbG98uAKvG6O/AjV6WGuPsKpYF41VQK39sUYvulm86RssD1K/iVNkkSJ8cuYeheJ8Nk2gz16wA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "0.8.1",
+        "colors": "~0.6.0-1",
+        "ignorepatterns": "1.0.1",
+        "mime": "~1.2.9",
+        "nopt": "~2.1.1",
+        "open": "0.0.3",
+        "portfinder": "~0.2.1",
+        "response-stream": "0.0.0",
+        "script-injector": "~0.1.0",
+        "sse-stream": "0.0.4",
+        "through": "~2.2.0"
+      },
+      "dependencies": {
+        "chokidar": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-0.8.1.tgz",
+          "integrity": "sha512-Bl/CteHnM5g3eKGPMkraZQW7Yzk2Gu87eE3jdaMfCNJP79sVa54M5KHStr3WtJl4vVoVSndVDws6IFLTmMa3Lw==",
+          "dev": true
+        },
+        "colors": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+          "integrity": "sha512-OsSVtHK8Ir8r3+Fxw/b4jS1ZLPXkV6ZxDRJQzeD7qo0SqMXWrHDM71DgYzPMHY8SFJ0Ao+nNU2p1MmwdzKqPrw==",
+          "dev": true
+        },
+        "mime": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
+          "dev": true
+        },
+        "nopt": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
+          "integrity": "sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==",
+          "dev": true,
+          "requires": {
+            "abbrev": "1"
+          }
+        },
+        "through": {
+          "version": "2.2.7",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
+          "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
+          "dev": true
+        }
+      }
+    },
     "beeper": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
@@ -25877,6 +31798,12 @@
       "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
       "dev": true
     },
+    "bn.js": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+      "dev": true
+    },
     "body": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
@@ -25945,6 +31872,16 @@
         }
       }
     },
+    "boom": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+      "integrity": "sha512-OvfN8y1oAxxphzkl2SnCS+ztV/uVKTATtgLjWYg/7KwcNyf3rzpHxNQJZCKtsZd4+MteKczhWbSjtEX4bGgU9g==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "hoek": "0.9.x"
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -25964,12 +31901,518 @@
         "fill-range": "^7.0.1"
       }
     },
+    "brfs": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/brfs/-/brfs-0.0.9.tgz",
+      "integrity": "sha512-5bjo0XG6pPGTFJsS4rtvP1vvwLp3UstdF062l10RKcfG60+izXak0DFcfQwMtBQNGlFm588mM2WvD02hJErVYg==",
+      "dev": true,
+      "requires": {
+        "escodegen": "0.0.17",
+        "falafel": "~0.1.6",
+        "through": "~2.2.0"
+      },
+      "dependencies": {
+        "escodegen": {
+          "version": "0.0.17",
+          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-0.0.17.tgz",
+          "integrity": "sha512-muX87X0L2dvVJ4ZPKAJLQlcyg2qhl6ps8Ow8vOAcuoFIrZLtXNMGfjnD19LSTrZ1SBHQsI+tvD8YlsJqHhfXrw==",
+          "dev": true,
+          "requires": {
+            "esprima": "~1.0.2",
+            "estraverse": "~0.0.4",
+            "source-map": ">= 0.1.2"
+          }
+        },
+        "esprima": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+          "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
+          "dev": true
+        },
+        "estraverse": {
+          "version": "0.0.4",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz",
+          "integrity": "sha512-21DfBCsFJGb3HZr0vEBH1Wk1tGSbbzA8I/xtSSoy/pRtupHv0OgBmObcNGXM3ec6/pOXTOOUYY9/5bfluzz0sw==",
+          "dev": true
+        },
+        "through": {
+          "version": "2.2.7",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
+          "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
+          "dev": true
+        }
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
+      "dev": true
+    },
+    "browser-pack": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz",
+      "integrity": "sha512-BHla5EbbxjNyLMFUMamVjeTY+q1QwHbrYNXlWOkw71QcBqAQF7maJyNh3OI/V0d5YyNdMYD6tiPhJB9ukBo99Q==",
+      "dev": true,
+      "requires": {
+        "combine-source-map": "~0.3.0",
+        "concat-stream": "~1.4.1",
+        "defined": "~0.0.0",
+        "JSONStream": "~0.8.4",
+        "through2": "~0.5.1",
+        "umd": "^2.1.0"
+      },
+      "dependencies": {
+        "concat-stream": {
+          "version": "1.4.11",
+          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
+          "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
+          "dev": true,
+          "requires": {
+            "inherits": "~2.0.1",
+            "readable-stream": "~1.1.9",
+            "typedarray": "~0.0.5"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        },
+        "through2": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+          "integrity": "sha512-zexCrAOTbjkBCXGyozn7hhS3aEaqdrc59mAD2E3dKYzV1vFuEGQ1hEDJN2oQMQFwy4he2zyLqPZV+AlfS8ZWJA==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~1.0.17",
+            "xtend": "~3.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.34",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.1",
+                "isarray": "0.0.1",
+                "string_decoder": "~0.10.x"
+              }
+            }
+          }
+        },
+        "xtend": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+          "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
+          "dev": true
+        }
+      }
+    },
+    "browser-resolve": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
+      "dev": true,
+      "requires": {
+        "resolve": "1.1.7"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
+          "dev": true
+        }
+      }
+    },
     "browser-stdout": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
       "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
       "dev": true
     },
+    "browserify": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/browserify/-/browserify-8.1.3.tgz",
+      "integrity": "sha512-0KKOkCQXCvP64qm73CtESE92pVnB5MkjA2W/Tmf+S4uPHVY4/SeCwO7wdr4mkke5ySoVyMqsOcMa5zo6uh9c9A==",
+      "dev": true,
+      "requires": {
+        "assert": "~1.3.0",
+        "browser-pack": "^3.2.0",
+        "browser-resolve": "^1.3.0",
+        "browserify-zlib": "~0.1.2",
+        "buffer": "^3.0.0",
+        "builtins": "~0.0.3",
+        "commondir": "0.0.1",
+        "concat-stream": "~1.4.1",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "~0.0.1",
+        "crypto-browserify": "^3.0.0",
+        "deep-equal": "~0.2.1",
+        "defined": "~0.0.0",
+        "deps-sort": "^1.3.5",
+        "domain-browser": "~1.1.0",
+        "duplexer2": "~0.0.2",
+        "events": "~1.0.0",
+        "glob": "^4.0.5",
+        "http-browserify": "^1.4.0",
+        "https-browserify": "~0.0.0",
+        "inherits": "~2.0.1",
+        "insert-module-globals": "^6.2.0",
+        "isarray": "0.0.1",
+        "JSONStream": "~0.8.3",
+        "labeled-stream-splicer": "^1.0.0",
+        "module-deps": "^3.6.3",
+        "os-browserify": "~0.1.1",
+        "parents": "^1.0.1",
+        "path-browserify": "~0.0.0",
+        "process": "^0.10.0",
+        "punycode": "~1.2.3",
+        "querystring-es3": "~0.2.0",
+        "readable-stream": "^1.0.33-1",
+        "resolve": "~0.7.1",
+        "shallow-copy": "0.0.1",
+        "shasum": "^1.0.0",
+        "shell-quote": "~0.0.1",
+        "stream-browserify": "^1.0.0",
+        "string_decoder": "~0.10.0",
+        "subarg": "^1.0.0",
+        "syntax-error": "^1.1.1",
+        "through2": "^1.0.0",
+        "timers-browserify": "^1.0.1",
+        "tty-browserify": "~0.0.0",
+        "umd": "~2.1.0",
+        "url": "~0.10.1",
+        "util": "~0.10.1",
+        "vm-browserify": "~0.0.1",
+        "xtend": "^3.0.0"
+      },
+      "dependencies": {
+        "assert": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz",
+          "integrity": "sha512-5aKcpD+XnHpZ7EGxsuo6uoILNh0rvm0Ypa17GlkrF2CNSPhvdgi3ft9XsL2ajdVOI2I3xuGZnHvlXAeqTZYvXg==",
+          "dev": true,
+          "requires": {
+            "util": "0.10.3"
+          },
+          "dependencies": {
+            "inherits": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+              "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
+              "dev": true
+            },
+            "util": {
+              "version": "0.10.3",
+              "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+              "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
+              "dev": true,
+              "requires": {
+                "inherits": "2.0.1"
+              }
+            }
+          }
+        },
+        "base64-js": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+          "integrity": "sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==",
+          "dev": true
+        },
+        "buffer": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.2.tgz",
+          "integrity": "sha512-c3M77NkHJxS0zx/ErxXhDLr1v3y2MDXPeTJPvLNOaIYJ4ymHBUFQ9EXzt9HYuqAJllMoNb/EZ8hIiulnQFAUuQ==",
+          "dev": true,
+          "requires": {
+            "base64-js": "0.0.8",
+            "ieee754": "^1.1.4",
+            "isarray": "^1.0.0"
+          },
+          "dependencies": {
+            "isarray": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+              "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+              "dev": true
+            }
+          }
+        },
+        "commondir": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz",
+          "integrity": "sha512-Ghe1LmLv3G3c0XJYu+c88MCRIPqWQ67qaqKY1KvuN4uPAjfUj+y4hvcpZ2kCPrjpRNyklW4dpAZZ8a7vOh50tg==",
+          "dev": true
+        },
+        "concat-stream": {
+          "version": "1.4.11",
+          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
+          "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
+          "dev": true,
+          "requires": {
+            "inherits": "~2.0.1",
+            "readable-stream": "~1.1.9",
+            "typedarray": "~0.0.5"
+          }
+        },
+        "deep-equal": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
+          "integrity": "sha512-FXgye2Jr6oEk01S7gmSrHrPEQ1ontR7wwl+nYiZ8h4SXlHVm0DYda74BIPcHz2s2qPz4+375IcAz1vsWLwddgQ==",
+          "dev": true
+        },
+        "duplexer2": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+          "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~1.1.9"
+          }
+        },
+        "events": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz",
+          "integrity": "sha512-XK19KwlDJo8XsceooxNDK1pObtcT44+Xte6V/jQc4a+fHq1qEouThyyX2ePmS0hS8RcCulmRxzg+T8jiLKAFFQ==",
+          "dev": true
+        },
+        "glob": {
+          "version": "4.5.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+          "integrity": "sha512-I0rTWUKSZKxPSIAIaqhSXTM/DiII6wame+rEC3cFA5Lqmr9YmdL7z6Hj9+bdWtTvoY1Su4/OiMLmb37Y7JzvJQ==",
+          "dev": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^2.0.1",
+            "once": "^1.3.0"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+          "dev": true
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+          "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.0.0"
+          }
+        },
+        "process": {
+          "version": "0.10.1",
+          "resolved": "https://registry.npmjs.org/process/-/process-0.10.1.tgz",
+          "integrity": "sha512-dyIett8dgGIZ/TXKUzeYExt7WA6ldDzys9vTDU/cCA9L17Ypme+KzS+NjQCjpn9xsvi/shbMC+yP/BcFMBz0NA==",
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz",
+          "integrity": "sha512-h/vscxLPvI2l7k/0dFUKZ5I5TgMCJ/Pl+J6rw77PDuQM6UApf/GaRVkjv/YSm2k+fbp7Yw8dxsoe29DolT7h7w==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "resolve": {
+          "version": "0.7.4",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
+          "integrity": "sha512-zxmAcifDjKxmUbk7chQdKhDSn8ml08g+MYyU37xhEXBp+N81cfbYsm4e0Gn9jtLbAvbR8w8Ox09xqUZtPuCoeA==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        },
+        "through2": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": ">=1.1.13-1 <1.2.0-0",
+            "xtend": ">=4.0.0 <4.1.0-0"
+          },
+          "dependencies": {
+            "xtend": {
+              "version": "4.0.2",
+              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+              "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+              "dev": true
+            }
+          }
+        },
+        "url": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+          "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==",
+          "dev": true,
+          "requires": {
+            "punycode": "1.3.2",
+            "querystring": "0.2.0"
+          },
+          "dependencies": {
+            "punycode": {
+              "version": "1.3.2",
+              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+              "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
+              "dev": true
+            }
+          }
+        },
+        "util": {
+          "version": "0.10.4",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "xtend": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+          "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
+          "dev": true
+        }
+      }
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+      "integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==",
+      "dev": true,
+      "requires": {
+        "pako": "~0.2.0"
+      }
+    },
     "browserslist": {
       "version": "4.21.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
@@ -26106,12 +32549,24 @@
       "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
       "dev": true
     },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
+      "dev": true
+    },
     "buffers": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
       "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
       "dev": true
     },
+    "builtins": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz",
+      "integrity": "sha512-T8uCGKc0/2aLVt6omt8JxDRBoWEMkku+wFesxnhxnt4NygVZG99zqxo7ciK8eebszceKamGoUiLdkXCgGQyrQw==",
+      "dev": true
+    },
     "bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -26189,34 +32644,6 @@
           "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
           "dev": true
         },
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
-        "map-obj": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-          "dev": true
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
         "path-exists": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
@@ -26226,23 +32653,6 @@
             "pinkie-promise": "^2.0.0"
           }
         },
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
         "read-pkg": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -26273,15 +32683,6 @@
             "ansi-regex": "^2.0.0"
           }
         },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
-        },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -26348,6 +32749,12 @@
         "get-intrinsic": "^1.0.2"
       }
     },
+    "callsite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+      "integrity": "sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==",
+      "dev": true
+    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -26360,6 +32767,30 @@
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==",
+          "dev": true
+        }
+      }
+    },
+    "can-autoplay": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/can-autoplay/-/can-autoplay-3.0.2.tgz",
+      "integrity": "sha512-Ih6wc7yJB4TylS/mLyAW0Dj5Nh3Gftq/g966TcxgvpNCOzlbqTs85srAq7mwIspo4w8gnLCVVGroyCHfh6l9aA==",
+      "dev": true
+    },
     "caniuse-lite": {
       "version": "1.0.30001390",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz",
@@ -26371,6 +32802,15 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
       "dev": true
     },
+    "catharsis": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
+      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.15"
+      }
+    },
     "ccount": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
@@ -26504,6 +32944,16 @@
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "dev": true
     },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -26706,6 +33156,34 @@
       "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
       "dev": true
     },
+    "combine-source-map": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
+      "integrity": "sha512-HRKa6g9SC1xd6ifto8ay6SxvyHaaQ50/8NO1ZONXx2hsIF9t/52qXa7Eeivaf5KFOSowK7Nm8TkIL/VC4khdBA==",
+      "dev": true,
+      "requires": {
+        "convert-source-map": "~0.3.0",
+        "inline-source-map": "~0.3.0",
+        "source-map": "~0.1.31"
+      },
+      "dependencies": {
+        "convert-source-map": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
+          "integrity": "sha512-+4nRk0k3oEpwUB7/CalD7xE2z4VmtEnnq0GO2IPTkrooTrAhEsWvuLF5iWP1dXrwluki/azwXV1ve7gtYuPldg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -26721,6 +33199,12 @@
       "integrity": "sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==",
       "dev": true
     },
+    "commander": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz",
+      "integrity": "sha512-qebjpyeaA/nJ4w3EO2cV2++/zEkccPnjWogzA2rff+Lk8ILI75vULeTmyd4wPxWdKwtP3J+G39IXVZadh0UHyw==",
+      "dev": true
+    },
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -26793,6 +33277,16 @@
         }
       }
     },
+    "config-chain": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+      "dev": true,
+      "requires": {
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
+      }
+    },
     "connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
@@ -26828,6 +33322,18 @@
       "integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g==",
       "dev": true
     },
+    "console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
+    },
+    "constants-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz",
+      "integrity": "sha512-FL+diDS9AKR5BAA2M+GNk8lnH64tRE3zepTG9hucxc7o04LgCRhkQZhF7u/OKHZT8LLRT+sZEi9qFzXUchq9pA==",
+      "dev": true
+    },
     "content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -26976,6 +33482,51 @@
         }
       }
     },
+    "create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
     "criteo-direct-rsa-validate": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/criteo-direct-rsa-validate/-/criteo-direct-rsa-validate-1.1.0.tgz",
@@ -27001,6 +33552,35 @@
         "which": "^2.0.1"
       }
     },
+    "cryptiles": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+      "integrity": "sha512-gvWSbgqP+569DdslUiCelxIv3IYK5Lgmq1UrRnk+s1WxQOQ16j3GPDcjdtgL5Au65DU/xQi6q3xPtf5Kta+3IQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "boom": "0.4.x"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
     "crypto-js": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
@@ -27037,6 +33617,31 @@
       "integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
       "dev": true
     },
+    "cssauron": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
+      "integrity": "sha512-Ht70DcFBh+/ekjVrYS2PlDMdSQEl3OFNmjK6lcn49HptBgilXf/Zwg4uFh9Xn0pX3Q8YOkSjIFOfK2osvdqpBw==",
+      "dev": true,
+      "requires": {
+        "through": "X.X.X"
+      }
+    },
+    "ctype": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+      "integrity": "sha512-T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg==",
+      "dev": true,
+      "optional": true
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==",
+      "dev": true,
+      "requires": {
+        "array-find-index": "^1.0.1"
+      }
+    },
     "custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -27111,6 +33716,12 @@
         }
       }
     },
+    "debuglog": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
+      "integrity": "sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==",
+      "dev": true
+    },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
@@ -27249,23 +33860,103 @@
         "isobject": "^3.0.1"
       }
     },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-    },
+    "defined": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz",
+      "integrity": "sha512-zpqiCT8bODLu3QSmLLic8xJnYWBFjOSu/fBCm189oAiTtPq/PSanNACKZDS7kgSyCJY7P+IcODzlIogBK/9RBg==",
+      "dev": true
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
+    "deps-sort": {
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz",
+      "integrity": "sha512-aEnmQuu/Hf5h8akL8QshYWzk9MVBg/JYMyNq/Lz68i69nR17tunjP6o/AC6Tn48c8ayzG6aeKs6OoFOtVCtvrQ==",
+      "dev": true,
+      "requires": {
+        "JSONStream": "^1.0.3",
+        "shasum": "^1.0.0",
+        "subarg": "^1.0.0",
+        "through2": "^1.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "jsonparse": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+          "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+          "dev": true
+        },
+        "JSONStream": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+          "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+          "dev": true,
+          "requires": {
+            "jsonparse": "^1.2.0",
+            "through": ">=2.2.7 <3"
+          }
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        },
+        "through2": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": ">=1.1.13-1 <1.2.0-0",
+            "xtend": ">=4.0.0 <4.1.0-0"
+          }
+        }
+      }
+    },
     "dequal": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
       "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
       "dev": true
     },
+    "des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
     "destroy": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
@@ -27289,6 +33980,30 @@
       "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
       "dev": true
     },
+    "detective": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
+      "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
+      "dev": true,
+      "requires": {
+        "acorn": "^5.2.1",
+        "defined": "^1.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.7.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+          "dev": true
+        },
+        "defined": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+          "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
+          "dev": true
+        }
+      }
+    },
     "devtools": {
       "version": "7.16.16",
       "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
@@ -27330,6 +34045,16 @@
       "integrity": "sha512-myh3hSFp0YWa2GED11PmbLhV4dv9RdO7YUz27XJrbQLnP5bMbZL6dfOOILTHO57yH0kX5GfuOZBsg/4NamfPvQ==",
       "dev": true
     },
+    "dezalgo": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
+      "dev": true,
+      "requires": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
     "di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -27348,6 +34073,25 @@
       "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
       "dev": true
     },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
     "dlv": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
@@ -27517,6 +34261,18 @@
         "void-elements": "^2.0.0"
       }
     },
+    "dom-walk": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
+      "dev": true
+    },
+    "domain-browser": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
+      "integrity": "sha512-fJ5MoHxe69h3E4/lJtFRhcWwLb04bhIBSfvCEMS1YDH+/9yEZTqBHTSTgch8nCP5tE5k2gdQEjodUqJzy7qJ9Q==",
+      "dev": true
+    },
     "dset": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
@@ -27638,6 +34394,29 @@
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.243.tgz",
       "integrity": "sha512-BgLD2gBX43OSXwlT01oYRRD5NIB4n3okTRxkzEAC6G0SZG4TTlyrWMjbOo0fajCwqwpRtMHXQNMjtRN6qpNtfw=="
     },
+    "elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
     "emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
@@ -27716,6 +34495,12 @@
       "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
       "dev": true
     },
+    "entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "dev": true
+    },
     "errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -27805,9 +34590,9 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.57",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.57.tgz",
-      "integrity": "sha512-L7cCNoPwTkAp7IBHxrKLsh7NKiVFkcdxlP9vbVw9QUvb7gF0Mz9bEBN0WY9xqdTjGF907EMT/iG013vnbqwu1Q==",
+      "version": "0.10.62",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
+      "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
       "dev": true,
       "requires": {
         "es6-iterator": "^2.0.3",
@@ -27832,6 +34617,20 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "es6-map": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+      "integrity": "sha512-mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A==",
+      "dev": true,
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-set": "~0.1.5",
+        "es6-symbol": "~3.1.1",
+        "event-emitter": "~0.3.5"
+      }
+    },
     "es6-object-assign": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
@@ -27853,6 +34652,28 @@
         "es6-promise": "^4.0.3"
       }
     },
+    "es6-set": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz",
+      "integrity": "sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==",
+      "dev": true,
+      "requires": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.62",
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "^3.1.3",
+        "event-emitter": "^0.3.5",
+        "type": "^2.7.2"
+      },
+      "dependencies": {
+        "type": {
+          "version": "2.7.2",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+          "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
+          "dev": true
+        }
+      }
+    },
     "es6-symbol": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
@@ -27960,6 +34781,18 @@
         }
       }
     },
+    "escope": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+      "integrity": "sha512-75IUQsusDdalQEW/G/2esa87J7raqdJF+Ca0/Xm5C3Q58Nr4yVYjZGp/P1+2xiEVgXRrA39dpRb8LcshajbqDQ==",
+      "dev": true,
+      "requires": {
+        "es6-map": "^0.1.3",
+        "es6-weak-map": "^2.0.1",
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
     "eslint": {
       "version": "7.32.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
@@ -28017,224 +34850,1008 @@
             "@babel/highlight": "^7.10.4"
           }
         },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "globals": {
+          "version": "13.12.1",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz",
+          "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-config-standard": {
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
+      "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=",
+      "dev": true,
+      "requires": {}
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
+      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7",
+        "find-up": "^2.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-plugin-es": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
+      "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
+      "dev": true,
+      "requires": {
+        "eslint-utils": "^2.0.0",
+        "regexpp": "^3.0.0"
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.25.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz",
+      "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.2",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.0.4",
+        "object.values": "^1.1.5",
+        "resolve": "^1.20.0",
+        "tsconfig-paths": "^3.12.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-node": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
+      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
+      "dev": true,
+      "requires": {
+        "eslint-plugin-es": "^3.0.0",
+        "eslint-utils": "^2.0.0",
+        "ignore": "^5.1.1",
+        "minimatch": "^3.0.4",
+        "resolve": "^1.10.1",
+        "semver": "^6.1.0"
+      },
+      "dependencies": {
+        "ignore": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-prebid": {
+      "version": "file:plugins/eslint",
+      "requires": {
+        "beefy": "^1.0.0",
+        "brfs": "0.0.9",
+        "browserify": "^8.1.3",
+        "chai": "^1.9.1",
+        "chalk": "^1.0.0",
+        "concat-stream": "^1.4.6",
+        "coveralls": "2.11.2",
+        "dateformat": "^1.0.8",
+        "debug": "^2.1.1",
+        "doctrine": "^0.6.2",
+        "escape-string-regexp": "^1.0.2",
+        "escope": "^3.2.0",
+        "espree": "^2.2.0",
+        "esprima": "^2.4.1",
+        "esprima-fb": "^10001.1.0-dev-harmony-fb",
+        "estraverse": "^4.1.0",
+        "estraverse-fb": "^1.3.1",
+        "gh-got": "^1.0.3",
+        "globals": "^8.2.0",
+        "inquirer": "^0.8.2",
+        "is-my-json-valid": "^2.10.0",
+        "istanbul": "^0.3.5",
+        "js-yaml": "^3.2.5",
+        "jsdoc": "^3.3.0-beta1",
+        "jsonlint": "^1.6.2",
+        "lodash.clonedeep": "^3.0.1",
+        "lodash.merge": "^3.3.2",
+        "lodash.omit": "^3.1.0",
+        "markdownlint": "^0.0.6",
+        "minimatch": "^2.0.1",
+        "mkdirp": "^0.5.0",
+        "mocha": "^2.1.0",
+        "mocha-phantomjs": "3.6.0",
+        "npm-license": "^0.2.3",
+        "object-assign": "^2.0.0",
+        "optionator": "^0.5.0",
+        "path-is-absolute": "^1.0.0",
+        "path-is-inside": "^1.0.1",
+        "phantomjs": "1.9.7-15",
+        "proxyquire": "^1.0.0",
+        "rewire": "^2.3.4",
+        "semver": "^4.1.0",
+        "shelljs": "^0.3.0",
+        "shelljs-nodecli": "~0.1.0",
+        "sinon": "1.14.1",
+        "strip-json-comments": "~1.0.1",
+        "text-table": "~0.2.0",
+        "through": "^2.3.6",
+        "user-home": "^1.0.0",
+        "xml-escape": "~1.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+          "integrity": "sha512-q5i8bFLg2wDfsuR56c1NzlJFPzVD+9mxhDrhqOGigEFa87OZHlF+9dWeGWzVTP/0ECiA/JUGzfzRr2t3eYORRw==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+          "dev": true
+        },
+        "argparse": {
+          "version": "0.1.16",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
+          "integrity": "sha512-LjmC2dNpdn2L4UzyoaIr11ELYoLn37ZFy9zObrQFHsSuOepeUEMKnM8w5KL4Tnrp2gy88rRuQt6Ky8Bjml+Baw==",
+          "dev": true,
+          "requires": {
+            "underscore": "~1.7.0",
+            "underscore.string": "~2.4.0"
+          }
+        },
+        "asn1": {
+          "version": "0.1.11",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+          "integrity": "sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA==",
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+          "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
+          "dev": true,
+          "optional": true
+        },
+        "assertion-error": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz",
+          "integrity": "sha512-g/gZV+G476cnmtYI+Ko9d5khxSoCSoom/EaNmmCfwpOvBXEJ18qwFrxfP1/CsIqk2no1sAKKwxndV0tP7ROOFQ==",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+          "integrity": "sha512-oqUX0DM5j7aPWPCnpWebiyNIj2wiNI87ZxnOMoGv0aE4TGlBy2N+5iWc6dQ/NOKZaBD2W6PVz8jtOGkWzSC5EA==",
+          "dev": true,
+          "optional": true
+        },
+        "chai": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/chai/-/chai-1.10.0.tgz",
+          "integrity": "sha512-E3L9M2SeQU1XagJkE9KJyTAXXHKJkJ1EsKkFp0Rl53lYa3mro2PVgYHNiCb2YRa2nUeyg7aqmI1EIcSBayNd5w==",
+          "dev": true,
+          "requires": {
+            "assertion-error": "1.0.0",
+            "deep-eql": "0.1.3"
+          }
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "cli-width": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz",
+          "integrity": "sha512-eMU2akIeEIkCxGXUNmDnJq1KzOIiPnJ+rKqRe6hcxE3vIOPvpMrBYOn/Bl7zNlYJj/zQxXquAnozHUCf9Whnsg==",
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "integrity": "sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delayed-stream": "0.0.5"
+          }
+        },
+        "commander": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
+          "integrity": "sha512-CD452fnk0jQyk3NfnK+KkR/hUPoHt5pVaKHogtyyv3N0U4QfAal9W0/rXLOg/vVZgQKa7jdtXypKs1YAip11uQ==",
+          "dev": true
+        },
+        "coveralls": {
+          "version": "2.11.2",
+          "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz",
+          "integrity": "sha512-+OK2imSCDXSYaOyAxGVUmzDfDtCYLW+gtdDVpjvq99R5Dyry4Puj3EQ/4YnsxNc6RHsuhx3wIkHSBIRaJZY5YQ==",
+          "dev": true,
+          "requires": {
+            "js-yaml": "3.0.1",
+            "lcov-parse": "0.0.6",
+            "log-driver": "1.2.4",
+            "request": "2.40.0"
+          },
+          "dependencies": {
+            "esprima": {
+              "version": "1.0.4",
+              "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+              "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
+              "dev": true
+            },
+            "js-yaml": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz",
+              "integrity": "sha512-dgxgLzZS9qLWAQd/wrVG8tOiRSBJq1Ss9gbd7+fdBhcia3efHjLLpPkcUhKOyVACxTEAgnao3RT1kj1otiW42g==",
+              "dev": true,
+              "requires": {
+                "argparse": "~ 0.1.11",
+                "esprima": "~ 1.0.2"
+              }
+            }
+          }
+        },
+        "dateformat": {
+          "version": "1.0.12",
+          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
+          "integrity": "sha512-5sFRfAAmbHdIts+eKjR9kYJoF0ViCMVX9yqLu5A7S/v+nd077KgCITOMiirmyCBiZpKLDXbBOkYm6tu7rX/TKg==",
+          "dev": true,
+          "requires": {
+            "get-stdin": "^4.0.1",
+            "meow": "^3.3.0"
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-eql": {
+          "version": "0.1.3",
+          "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
+          "integrity": "sha512-6sEotTRGBFiNcqVoeHwnfopbSpi5NbH1VWJmYCVkmxMmaVTT0bUTrNaGyBwhgP4MZL012W/mkzIn3Da+iDYweg==",
+          "dev": true,
+          "requires": {
+            "type-detect": "0.1.1"
+          }
+        },
+        "delayed-stream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+          "integrity": "sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA==",
+          "dev": true,
+          "optional": true
+        },
+        "diff": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
+          "integrity": "sha512-VzVc42hMZbYU9Sx/ltb7KYuQ6pqAw+cbFWVy4XKdkuEL2CFaRLGEnISPs7YdzaUGpi+CpIqvRmu7hPQ4T7EQ5w==",
+          "dev": true
+        },
+        "doctrine": {
+          "version": "0.6.4",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.6.4.tgz",
+          "integrity": "sha512-FSGvDB23RFdm/Z2hEINXN1AcBW5I4YBqpGD/lScJV34vuOwrPFyLHN9bwCzLa6lUmqS6ipdp5XlVJRQ6yJ5iSA==",
+          "dev": true,
+          "requires": {
+            "esutils": "^1.1.6",
+            "isarray": "0.0.1"
+          }
+        },
+        "escodegen": {
+          "version": "1.7.1",
+          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.7.1.tgz",
+          "integrity": "sha512-2cd7+JUtUEmZVpGmfF9r+uRYXswJAkf85Ce8GvdBa7hSvdjY8hGo+rwC5syAgYzqHpfxNJzLntFjw6879yPbgQ==",
+          "dev": true,
+          "requires": {
+            "esprima": "^1.2.2",
+            "estraverse": "^1.9.1",
+            "esutils": "^2.0.2",
+            "optionator": "^0.5.0",
+            "source-map": "~0.2.0"
+          },
+          "dependencies": {
+            "esprima": {
+              "version": "1.2.5",
+              "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz",
+              "integrity": "sha512-S9VbPDU0adFErpDai3qDkjq8+G05ONtKzcyNrPKg/ZKa+tf879nX2KexNU95b31UoTJjRLInNBHHHjFPoCd7lQ==",
+              "dev": true
+            },
+            "estraverse": {
+              "version": "1.9.3",
+              "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+              "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==",
+              "dev": true
+            },
+            "esutils": {
+              "version": "2.0.3",
+              "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+              "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+              "dev": true
+            }
+          }
+        },
+        "espree": {
+          "version": "2.2.5",
+          "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz",
+          "integrity": "sha512-HWJpgkL44cbjWiOTC9Pm34RZE57H1g9V4Ln9U14TUtiywFTLMMpMCtmQK5rkjbGBXigQT8bS3r45+Dt5+m0SZg==",
+          "dev": true
+        },
+        "esprima": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.5.0.tgz",
+          "integrity": "sha512-uM6hfS0/8ybNIj8SGRMdidPJy5uhWqWN/GIkyqnMAbCSL44yfFGLuBpRRCgOpBXBZt2OymQuM+IfahkqJq3DWw==",
+          "dev": true
+        },
+        "esutils": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz",
+          "integrity": "sha512-RG1ZkUT7iFJG9LSHr7KDuuMSlujfeTtMNIcInURxKAxhMtwQhI3NrQhz26gZQYlsYZQKzsnwtpKrFKj9K9Qu1A==",
+          "dev": true
+        },
+        "fast-levenshtein": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz",
+          "integrity": "sha512-hYsfI0s4lfQ2rHVFKXwAr/L/ZSbq9TZwgXtZqW7ANcn9o9GKvcbWxOnxx7jykXf/Ezv1V8TvaBEKcGK7DWKX5A==",
+          "dev": true
+        },
+        "figures": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+          "integrity": "sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5",
+            "object-assign": "^4.1.0"
+          },
+          "dependencies": {
+            "object-assign": {
+              "version": "4.1.1",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+              "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+              "dev": true
+            }
+          }
+        },
+        "forever-agent": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+          "integrity": "sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A==",
+          "dev": true
+        },
+        "form-data": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+          "integrity": "sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "async": "~0.9.0",
+            "combined-stream": "~0.0.4",
+            "mime": "~1.2.11"
+          },
+          "dependencies": {
+            "async": {
+              "version": "0.9.2",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+              "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "3.2.11",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+          "integrity": "sha512-hVb0zwEZwC1FXSKRPFTeOtN7AArJcJlI6ULGLtrstaswKNlrTJqAA+1lYlSUop4vjA423xlBzqfVS3iWGlqJ+g==",
+          "dev": true,
+          "requires": {
+            "inherits": "2",
+            "minimatch": "0.3"
+          },
+          "dependencies": {
+            "minimatch": {
+              "version": "0.3.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+              "integrity": "sha512-WFX1jI1AaxNTZVOHLBVazwTWKaQjoykSzCBNXB72vDTCzopQGtyP91tKdFK5cv1+qMwPyiTu1HqUriqplI8pcA==",
+              "dev": true,
+              "requires": {
+                "lru-cache": "2",
+                "sigmund": "~1.0.0"
+              }
+            }
+          }
+        },
+        "globals": {
+          "version": "8.18.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-8.18.0.tgz",
+          "integrity": "sha512-IHCTKEGo42ICEkTZBADyl4HX06hVdFF4qdJdqOgaBe5X8RE1/MrvubetsEtGTcwjs46djFq0Gc3+5RgTsc3UoQ==",
+          "dev": true
+        },
+        "growl": {
+          "version": "1.9.2",
+          "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
+          "integrity": "sha512-RTBwDHhNuOx4F0hqzItc/siXCasGfC4DeWcBamclWd+6jWtBaeB/SGbMkGf0eiQoW7ib8JpvOgnUsmgMHI3Mfw==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
+          "dev": true
+        },
+        "http-signature": {
+          "version": "0.10.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "integrity": "sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.1.11",
+            "assert-plus": "^0.1.5",
+            "ctype": "0.5.3"
+          }
+        },
+        "inquirer": {
+          "version": "0.8.5",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz",
+          "integrity": "sha512-+rksrtdqQ8do7yOsmP5YIgbSdbZYuCIrnfH5vjFYGAr1XgJpMksb3rFZMJ3jiKuUyDVEA4MVDYbkA3ribJn3Tg==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^1.1.1",
+            "chalk": "^1.0.0",
+            "cli-width": "^1.0.1",
+            "figures": "^1.3.5",
+            "lodash": "^3.3.1",
+            "readline2": "^0.1.1",
+            "rx": "^2.4.3",
+            "through": "^2.3.6"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "istanbul": {
+          "version": "0.3.22",
+          "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.22.tgz",
+          "integrity": "sha512-8H/jxiee2UqX/mviKkPoKQYMxU2t995FC5PwO4zjWeDPOozjoeKqxEyN62l9o5+UgzvYQbrKgQjjxhGON8FcMg==",
+          "dev": true,
+          "requires": {
+            "abbrev": "1.0.x",
+            "async": "1.x",
+            "escodegen": "1.7.x",
+            "esprima": "2.5.x",
+            "fileset": "0.2.x",
+            "handlebars": "^4.0.1",
+            "js-yaml": "3.x",
+            "mkdirp": "0.5.x",
+            "nopt": "3.x",
+            "once": "1.x",
+            "resolve": "1.1.x",
+            "supports-color": "^3.1.0",
+            "which": "^1.1.1",
+            "wordwrap": "^1.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "3.2.3",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+              "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^1.0.0"
+              }
+            }
+          }
+        },
+        "lcov-parse": {
+          "version": "0.0.6",
+          "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz",
+          "integrity": "sha512-chuBQJZiBq28YUM6Yr3tf3h5Lxhb+DvhbxxSNpsHURSXiZXOzp49phiWG2pKHboOehJDujivwNQGRP8mAErMvQ==",
+          "dev": true
+        },
+        "levn": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz",
+          "integrity": "sha512-mvp+NO++YH0B+e8cC/SvJxk6k5Z9Ngd3iXuz7tmT8vZCyQZj/5SI1GkFOiZGGPkm5wWGI9SUrqiAfPq7BJH+0w==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "prelude-ls": "~1.1.0",
+            "type-check": "~0.3.1"
           }
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==",
+          "dev": true
+        },
+        "lodash.clonedeep": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz",
+          "integrity": "sha512-I8MpGh5z+6OixDAAb21teLSZDmqVPjlq02Q7ZFrbn2xnQHYYuJf6on/94SWpF/p0s3p/cEv/53ro4AhDOfCR0g==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "lodash._baseclone": "^3.0.0",
+            "lodash._bindcallback": "^3.0.0"
           }
         },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+        "lodash.isplainobject": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz",
+          "integrity": "sha512-P4wZnho5curNqeEq/x292Pb57e1v+woR7DJ84DURelKB46lby8aDEGVobSaYtzHdQBWQrJSdxcCwjlGOvvdIyg==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "lodash._basefor": "^3.0.0",
+            "lodash.isarguments": "^3.0.0",
+            "lodash.keysin": "^3.0.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "lodash.merge": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-3.3.2.tgz",
+          "integrity": "sha512-ZgGZpRhWLjivGUbjtApZR4HyLv/UAyoYqESVYkK4aLBJVHRrbFpG+GNnE9JPijliME4LkKM0SFI/WyOiBiv1+w==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "lodash._arraycopy": "^3.0.0",
+            "lodash._arrayeach": "^3.0.0",
+            "lodash._createassigner": "^3.0.0",
+            "lodash._getnative": "^3.0.0",
+            "lodash.isarguments": "^3.0.0",
+            "lodash.isarray": "^3.0.0",
+            "lodash.isplainobject": "^3.0.0",
+            "lodash.istypedarray": "^3.0.0",
+            "lodash.keys": "^3.0.0",
+            "lodash.keysin": "^3.0.0",
+            "lodash.toplainobject": "^3.0.0"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+        "log-driver": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz",
+          "integrity": "sha512-QmyGbAcBbHk8ysCGtT6FQ+LZML6+EeT0NdotCJGu72kNhknXtdso1G/NI0r7j45whFYNTU15XMW+JGOvGX07QQ==",
           "dev": true
         },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+        "lolex": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz",
+          "integrity": "sha512-wGZrF3AlAWxG2j+6NyyttZ/UVxW8o/F+q01IUGuf2PiEIAUG9av/vpBS5TQHTQtzPmPJB4CZWjwyGR4C4aX83w==",
           "dev": true
         },
-        "globals": {
-          "version": "13.12.1",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz",
-          "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+        "lru-cache": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+          "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==",
+          "dev": true
+        },
+        "mime": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
+          "dev": true,
+          "optional": true
+        },
+        "mime-types": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+          "integrity": "sha512-echfutj/t5SoTL4WZpqjA1DCud1XO0WQF3/GJ48YBmc4ZMhCK77QA6Z/w6VTQERLKuJ4drze3kw2TUT8xZXVNw==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+          "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
           "dev": true,
           "requires": {
-            "type-fest": "^0.20.2"
+            "brace-expansion": "^1.0.0"
           }
         },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+        "mkdirp": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
           "dev": true,
           "requires": {
-            "lru-cache": "^6.0.0"
+            "minimist": "^1.2.6"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "mocha": {
+          "version": "2.5.3",
+          "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
+          "integrity": "sha512-jNt2iEk9FPmZLzL+sm4FNyOIDYXf2wUU6L4Cc8OIKK/kzgMHKPi4YhTZqG4bW4kQVdIv6wutDybRhXfdnujA1Q==",
+          "dev": true,
+          "requires": {
+            "commander": "2.3.0",
+            "debug": "2.2.0",
+            "diff": "1.4.0",
+            "escape-string-regexp": "1.0.2",
+            "glob": "3.2.11",
+            "growl": "1.9.2",
+            "jade": "0.26.3",
+            "mkdirp": "0.5.1",
+            "supports-color": "1.2.0",
+            "to-iso-string": "0.0.2"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.2.0",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+              "integrity": "sha512-X0rGvJcskG1c3TgSCPqHJ0XJgwlcvOC7elJ5Y0hYuKBZoVqWpAMfLOeIh2UI/DCQ5ruodIjvsugZtjUYUw2pUw==",
+              "dev": true,
+              "requires": {
+                "ms": "0.7.1"
+              }
+            },
+            "escape-string-regexp": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
+              "integrity": "sha512-cQpUid7bdTUnFin8S7BnNdOk+/eDqQmKgCANSyd/jAhrKEvxUvr9VQ8XZzXiOtest8NLfk3FSBZzwvemZNQ6Vg==",
+              "dev": true
+            },
+            "minimist": {
+              "version": "0.0.8",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
+              "dev": true
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
+              "dev": true,
+              "requires": {
+                "minimist": "0.0.8"
+              }
+            },
+            "ms": {
+              "version": "0.7.1",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+              "integrity": "sha512-lRLiIR9fSNpnP6TC4v8+4OU7oStC01esuNowdQ34L+Gk8e5Puoc88IqJ+XAY/B3Mn2ZKis8l8HX90oU8ivzUHg==",
+              "dev": true
+            },
+            "supports-color": {
+              "version": "1.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
+              "integrity": "sha512-mS5xsnjTh5b7f2DM6bch6lR582UCOTphzINlZnDsfpIRrwI6r58rb6YSSGsdexkm8qw2bBVO2ID2fnJOTuLiPA==",
+              "dev": true
+            }
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
+          "integrity": "sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ==",
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+          "integrity": "sha512-CdsOUYIh5wIiozhJ3rLQgmUTgcyzFwZZrqhkKhODMoGtPKM+wt0h0CNIoauJWMsS9822EdzPsF/6mb4nLvPN5g==",
+          "dev": true
+        },
+        "optionator": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz",
+          "integrity": "sha512-jUr7aBk/kCInAEsl+qxuw4ORpe458atDKXNLhyvPUD4NfnsJsbAViX1b9nb/0rS62lO8cIFd1VoiaXLQ+MybOw==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "deep-is": "~0.1.2",
+            "fast-levenshtein": "~1.0.0",
+            "levn": "~0.2.5",
+            "prelude-ls": "~1.1.1",
+            "type-check": "~0.3.1",
+            "wordwrap": "~0.0.2"
+          },
+          "dependencies": {
+            "wordwrap": {
+              "version": "0.0.3",
+              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+              "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+              "dev": true
+            }
           }
         },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+        "prelude-ls": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+          "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
           "dev": true
-        }
-      }
-    },
-    "eslint-config-standard": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
-      "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+        },
+        "qs": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz",
+          "integrity": "sha512-tHuOP9TN/1VmDM/ylApGK1QF3PSIP8I6bHDEfoKNQeViREQ/sfu1bAUrA1hoDun8p8Tpm7jcsz47g+3PiGoYdg==",
+          "dev": true
+        },
+        "request": {
+          "version": "2.40.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
+          "integrity": "sha512-waNoGB4Z7bPn+lgqPk7l7hhze4Vd68jKccnwLeS7vr9GMxz0iWQbYTbBNWzfIk87Urx7V44pu29qjF/omej+Fw==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "aws-sign2": "~0.5.0",
+            "forever-agent": "~0.5.0",
+            "form-data": "~0.1.0",
+            "hawk": "1.1.1",
+            "http-signature": "~0.10.0",
+            "json-stringify-safe": "~5.0.0",
+            "mime-types": "~1.0.1",
+            "node-uuid": "~1.4.0",
+            "oauth-sign": "~0.3.0",
+            "qs": "~1.0.0",
+            "stringstream": "~0.0.4",
+            "tough-cookie": ">=0.12.0",
+            "tunnel-agent": "~0.4.0"
           }
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+        },
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
+          "dev": true
+        },
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
+          "dev": true
+        },
+        "sinon": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.14.1.tgz",
+          "integrity": "sha512-cysrMyrriLwSn5Ye82xTCAVVS6Q6XLxlZE3jtPb4IFng2npN3lQWQ5Uyaud6cRpzztbEy2sbJkrDSbIl6OKUCA==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "formatio": "1.1.1",
+            "lolex": "1.1.0",
+            "util": ">=0.10.3 <1"
           }
-        }
-      }
-    },
-    "eslint-plugin-es": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
-      "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
-      "dev": true,
-      "requires": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.25.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz",
-      "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.2",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.5",
-        "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.12.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+        },
+        "source-map": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
+          "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "ms": "2.0.0"
+            "amdefine": ">=0.0.4"
           }
         },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
           "dev": true,
           "requires": {
-            "esutils": "^2.0.2"
+            "ansi-regex": "^2.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+              "dev": true
+            }
           }
         },
-        "ms": {
+        "supports-color": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
           "dev": true
-        }
-      }
-    },
-    "eslint-plugin-node": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
-      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
-      "dev": true,
-      "requires": {
-        "eslint-plugin-es": "^3.0.0",
-        "eslint-utils": "^2.0.0",
-        "ignore": "^5.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.1.0"
-      },
-      "dependencies": {
-        "ignore": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
+          "dev": true,
+          "optional": true
+        },
+        "type-check": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+          "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "~1.1.2"
+          }
+        },
+        "type-detect": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
+          "integrity": "sha512-5rqszGVwYgBoDkIm2oUtvkfZMQ0vk29iDMU0W2qCa3rG0vPDNczCMT4hV/bLBgLg8k8ri6+u3Zbt+S/14eMzlA==",
+          "dev": true
+        },
+        "underscore": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+          "integrity": "sha512-cp0oQQyZhUM1kpJDLdGO1jPZHgS/MpzoWYfe9+CM2h/QGDZlqwT2T3YGukuBdaNJ/CAPoeyAZRRHz8JFo176vA==",
           "dev": true
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
         }
       }
     },
-    "eslint-plugin-prebid": {
-      "version": "file:plugins/eslint"
-    },
     "eslint-plugin-promise": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz",
@@ -28307,6 +35924,12 @@
       "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
       "dev": true
     },
+    "esprima-fb": {
+      "version": "10001.1.0-dev-harmony-fb",
+      "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-10001.1.0-dev-harmony-fb.tgz",
+      "integrity": "sha512-z2dx3A/ZGNamsDjJS4FZPXnpoRCEkQXqouKBCOaJifyx4HkEVoSQ3YWFX18Scut1Aq9gnctzLWcWJgKkL0xNQw==",
+      "dev": true
+    },
     "esquery": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
@@ -28347,6 +35970,13 @@
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true
     },
+    "estraverse-fb": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/estraverse-fb/-/estraverse-fb-1.3.2.tgz",
+      "integrity": "sha512-wp3lfRrWy5EQD9TqesuYM1SKVP4ERT0cUatb4e8Vznf4K5IOpREhuyXZxGj3a9s9mvX5vGZKNHA4R9D4kp9Q9A==",
+      "dev": true,
+      "requires": {}
+    },
     "estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
@@ -28409,6 +36039,16 @@
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true
     },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "execa": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
@@ -28814,6 +36454,23 @@
       "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==",
       "dev": true
     },
+    "falafel": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/falafel/-/falafel-0.1.6.tgz",
+      "integrity": "sha512-r1s3VwKzm6PB35MZmnfZoF6NTgSKRxf8How2lBsrDq81OsYXb/2fR8ysfURHCTlFpqJDQVA88iB70wFrFRYDsA==",
+      "dev": true,
+      "requires": {
+        "esprima": "~1.0.2"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+          "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
+          "dev": true
+        }
+      }
+    },
     "fancy-log": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
@@ -28925,6 +36582,50 @@
         }
       }
     },
+    "fileset": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz",
+      "integrity": "sha512-aK3PFyHSwWsBJCarRxMRIXSGamfroi9ehG8f4e5A2n5nSlEVHe8y44jNTIN4+HdZSpK3FNV0EdihH1iDWTdnGg==",
+      "dev": true,
+      "requires": {
+        "glob": "5.x",
+        "minimatch": "2.x"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
+          "dev": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+          "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.0.0"
+          }
+        }
+      }
+    },
+    "fill-keys": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
+      "integrity": "sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA==",
+      "dev": true,
+      "requires": {
+        "is-object": "~1.0.1",
+        "merge-descriptors": "~1.0.0"
+      }
+    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -29113,6 +36814,23 @@
         "mime-types": "^2.1.12"
       }
     },
+    "formatio": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
+      "integrity": "sha512-cPh7is6k3d8tIUh+pnXXuAbD/uhSXGgqLPw0UrYpv5lfdJ+MMMSjx40JNpqP7Top9Nt25YomWEiRmkHbOvkCaA==",
+      "dev": true,
+      "requires": {
+        "samsam": "~1.1"
+      },
+      "dependencies": {
+        "samsam": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.3.tgz",
+          "integrity": "sha512-t9rCPskf50hZ53eH8Z+cSWD4LfJBac+8vSSuzi1Y2HzygyXxtAl0BaR3hr6iI6A+nFQbkmJNC/brQLNEeVnrmg==",
+          "dev": true
+        }
+      }
+    },
     "forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -29292,6 +37010,24 @@
         "globule": "^1.0.0"
       }
     },
+    "generate-function": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
+      "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
+      "dev": true,
+      "requires": {
+        "is-property": "^1.0.2"
+      }
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "integrity": "sha512-TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ==",
+      "dev": true,
+      "requires": {
+        "is-property": "^1.0.0"
+      }
+    },
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -29331,6 +37067,12 @@
       "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
       "dev": true
     },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
+      "dev": true
+    },
     "get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -29365,6 +37107,68 @@
         "assert-plus": "^1.0.0"
       }
     },
+    "gh-got": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/gh-got/-/gh-got-1.1.0.tgz",
+      "integrity": "sha512-jo4rP5ugI6fZGjS0vmvHlM8P7EBA39p8to4r2i+LqYXxeg4M8qnPXiKaetDfH0YLXkO9Hfsa2mKIjMsGJwcdGQ==",
+      "dev": true,
+      "requires": {
+        "got": "^3.2.0",
+        "object-assign": "^2.0.0"
+      },
+      "dependencies": {
+        "duplexify": {
+          "version": "3.7.1",
+          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+          "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.0.0",
+            "inherits": "^2.0.1",
+            "readable-stream": "^2.0.0",
+            "stream-shift": "^1.0.0"
+          }
+        },
+        "got": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/got/-/got-3.3.1.tgz",
+          "integrity": "sha512-7chPlc0pWHjvq7B6dEEXz4GphoDupOvBSSl6AwRsAJX7GPTZ+bturaZiIigX4Dp6KrAP67nvzuKkNc0SLA0DKg==",
+          "dev": true,
+          "requires": {
+            "duplexify": "^3.2.0",
+            "infinity-agent": "^2.0.0",
+            "is-redirect": "^1.0.0",
+            "is-stream": "^1.0.0",
+            "lowercase-keys": "^1.0.0",
+            "nested-error-stacks": "^1.0.0",
+            "object-assign": "^3.0.0",
+            "prepend-http": "^1.0.0",
+            "read-all-stream": "^3.0.0",
+            "timed-out": "^2.0.0"
+          },
+          "dependencies": {
+            "object-assign": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+              "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
+              "dev": true
+            }
+          }
+        },
+        "lowercase-keys": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+          "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+          "dev": true
+        },
+        "object-assign": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+          "integrity": "sha512-CdsOUYIh5wIiozhJ3rLQgmUTgcyzFwZZrqhkKhODMoGtPKM+wt0h0CNIoauJWMsS9822EdzPsF/6mb4nLvPN5g==",
+          "dev": true
+        }
+      }
+    },
     "git-up": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/git-up/-/git-up-6.0.0.tgz",
@@ -29390,6 +37194,18 @@
       "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==",
       "dev": true
     },
+    "github-url-from-git": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz",
+      "integrity": "sha512-WWOec4aRI7YAykQ9+BHmzjyNlkfJFG8QLXnDTsLz/kZefq7qkzdfo4p6fkYYMIq1aj+gZcQs/1HQhQh3DPPxlQ==",
+      "dev": true
+    },
+    "github-url-from-username-repo": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz",
+      "integrity": "sha512-Tj8CQqRoFVTglGdQ8FQmfq8gOOoOYZX7tnOKP8jq8Hdz2OTDhxvtlkLAbrqMYZ7X/YdaYQoUG1IBWxISBfqZ+Q==",
+      "dev": true
+    },
     "glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -29629,6 +37445,16 @@
         }
       }
     },
+    "global": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+      "dev": true,
+      "requires": {
+        "min-document": "^2.19.0",
+        "process": "^0.11.10"
+      }
+    },
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
@@ -29936,28 +37762,6 @@
             "number-is-nan": "^1.0.0"
           }
         },
-        "load-json-file": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0",
-            "strip-bom": "^2.0.0"
-          }
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
         "path-exists": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
@@ -29967,23 +37771,6 @@
             "pinkie-promise": "^2.0.0"
           }
         },
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
         "read-pkg": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -30031,15 +37818,6 @@
             "ansi-regex": "^2.0.0"
           }
         },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
-        },
         "which-module": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
@@ -30552,6 +38330,12 @@
             "is-fullwidth-code-point": "^2.0.0"
           }
         },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -30915,17 +38699,6 @@
             "lodash._root": "^3.0.0"
           }
         },
-        "lodash.keys": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-          "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-          "dev": true,
-          "requires": {
-            "lodash._getnative": "^3.0.0",
-            "lodash.isarguments": "^3.0.0",
-            "lodash.isarray": "^3.0.0"
-          }
-        },
         "lodash.template": {
           "version": "3.6.2",
           "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
@@ -31097,6 +38870,12 @@
       "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
       "dev": true
     },
+    "has-color": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
+      "integrity": "sha512-kaNz5OTAYYmt646Hkqw50/qyxP2vFnTVu5AQ1Zmk22Kk5+4Qx6BpO8+u7IKsML5fOsFk0ZT0AcCJNYwcvaLBvw==",
+      "dev": true
+    },
     "has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -31164,6 +38943,46 @@
         }
       }
     },
+    "hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
     "hast-util-is-element": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-2.1.2.tgz",
@@ -31207,6 +39026,19 @@
       "integrity": "sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg==",
       "dev": true
     },
+    "hawk": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+      "integrity": "sha512-am8sVA2bCJIw8fuuVcKvmmNnGFUGW8spTkVtj2fXTEZVkfN42bwFZFtDem57eFi+NSxurJB8EQ7Jd3uCHLn8Vw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "boom": "0.4.x",
+        "cryptiles": "0.2.x",
+        "hoek": "0.9.x",
+        "sntp": "0.2.x"
+      }
+    },
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -31219,6 +39051,24 @@
       "integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==",
       "dev": true
     },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "hoek": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+      "integrity": "sha512-ZZ6eGyzGjyMTmpSPYVECXy9uNfqBR7x5CavhUaLOeD6W0vWK1mp/b7O3f86XE0Mtfo9rZ6Bh3fnuw9Xr8MF9zA==",
+      "dev": true,
+      "optional": true
+    },
     "home-or-tmp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
@@ -31250,12 +39100,158 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
+    "html-select": {
+      "version": "2.3.24",
+      "resolved": "https://registry.npmjs.org/html-select/-/html-select-2.3.24.tgz",
+      "integrity": "sha512-kQ+YZoVQ8Aux6bUqMVc0iufcZOv03+xYZ4J5v2beT5wkNrW/e2roZ8pnU4LunVOVBGFkbodFKR0TvuMkTdyrJQ==",
+      "dev": true,
+      "requires": {
+        "cssauron": "^1.1.0",
+        "duplexer2": "~0.0.2",
+        "inherits": "^2.0.1",
+        "minimist": "~0.0.8",
+        "readable-stream": "^1.0.27-1",
+        "split": "~0.3.0",
+        "stream-splicer": "^1.2.0",
+        "through2": "^1.0.0"
+      },
+      "dependencies": {
+        "duplexer2": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+          "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~1.1.9"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        },
+        "through2": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": ">=1.1.13-1 <1.2.0-0",
+            "xtend": ">=4.0.0 <4.1.0-0"
+          }
+        }
+      }
+    },
+    "html-tokenize": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/html-tokenize/-/html-tokenize-1.2.5.tgz",
+      "integrity": "sha512-7sCme3w9Hiv/kfL6sO6ePTGAV5fY6P7WDZyOs0zfXXU8vsS1ps1CQfGe0J1yuAdcCnOJ9h66RLYX/e9Cife8yw==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "minimist": "~0.0.8",
+        "readable-stream": "~1.0.27-1",
+        "through2": "~0.4.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+          "dev": true
+        },
+        "object-keys": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
+          "integrity": "sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        },
+        "through2": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
+          "integrity": "sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~1.0.17",
+            "xtend": "~2.1.1"
+          }
+        },
+        "xtend": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+          "integrity": "sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==",
+          "dev": true,
+          "requires": {
+            "object-keys": "~0.4.0"
+          }
+        }
+      }
+    },
     "html-void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-2.0.1.tgz",
       "integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==",
       "dev": true
     },
+    "http-browserify": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
+      "integrity": "sha512-Irf/LJXmE3cBzU1eaR4+NEX6bmVLqt1wkmDiA7kBwH7zmb0D8kBAXsDmQ88hhj/qv9iEZKlyGx/hrMcFi8sOHw==",
+      "dev": true,
+      "requires": {
+        "Base64": "~0.2.0",
+        "inherits": "~2.0.1"
+      }
+    },
     "http-cache-semantics": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
@@ -31312,6 +39308,12 @@
         "resolve-alpn": "^1.0.0"
       }
     },
+    "https-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
+      "integrity": "sha512-EjDQFbgJr1vDD/175UJeSX3ncQ3+RUnCL5NkthQGHvF4VNHlzTy8ifJfTqz47qiPRqaFH58+CbuG3x51WuB1XQ==",
+      "dev": true
+    },
     "https-proxy-agent": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
@@ -31342,6 +39344,12 @@
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true
     },
+    "ignorepatterns": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ignorepatterns/-/ignorepatterns-1.0.1.tgz",
+      "integrity": "sha512-9bm+Wivwyocr88go3y04hpX3qdFs6EgsxrjjpcI9C2GAqxcWYVMJaS9h9KL8ftJk1xP/8NzPxfHk6K1X7p0CRQ==",
+      "dev": true
+    },
     "import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -31366,6 +39374,33 @@
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==",
+      "dev": true,
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==",
+      "dev": true
+    },
+    "individual": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
+      "integrity": "sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g==",
+      "dev": true
+    },
+    "infinity-agent": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz",
+      "integrity": "sha512-CnfUJe5o2S9aAQWXGMhDZI4UL39MAJV3guOTfHHIdos4tuVHkl1j/J+1XLQn+CLIvqcpgQR/p+xXYXzcrhCe5w==",
+      "dev": true
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -31387,6 +39422,26 @@
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true
     },
+    "inline-source-map": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
+      "integrity": "sha512-RNlldBXZ7BBcVm3HjXIXiwKxih1lnuKbzeLBRDSB/qaqk8/g4JEZBjxpBQMhqEthQyGv7ycu8r/8PKGgBdIqrA==",
+      "dev": true,
+      "requires": {
+        "source-map": "~0.3.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
+          "integrity": "sha512-jz8leTIGS8+qJywWiO9mKza0hJxexdeIYXhDHw9avTQcXSNAGk3hiiRMpmI2Qf9dOrZDrDpgH9VNefzuacWC9A==",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
     "inquirer": {
       "version": "8.1.5",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.5.tgz",
@@ -31454,6 +39509,127 @@
         }
       }
     },
+    "insert-module-globals": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz",
+      "integrity": "sha512-ryk8hTKUZCc300SPOOwx30WhE5oRUssPDVlIoO8vtoMNBy5HGeesVRl3HF7ra4ll42T0IdnwD9XR9svh6+RRhg==",
+      "dev": true,
+      "requires": {
+        "combine-source-map": "~0.6.1",
+        "concat-stream": "~1.4.1",
+        "is-buffer": "^1.1.0",
+        "JSONStream": "^1.0.3",
+        "lexical-scope": "^1.2.0",
+        "process": "~0.11.0",
+        "through2": "^1.0.0",
+        "xtend": "^4.0.0"
+      },
+      "dependencies": {
+        "combine-source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
+          "integrity": "sha512-XKRNtuZRlVDTuSGKsfZpXYz80y0XDbYS4a+FzafTgmYHy/ckruFBx7Nd6WaQnFHVI3O6IseWVdXUvZutMpjSkQ==",
+          "dev": true,
+          "requires": {
+            "convert-source-map": "~1.1.0",
+            "inline-source-map": "~0.5.0",
+            "lodash.memoize": "~3.0.3",
+            "source-map": "~0.4.2"
+          }
+        },
+        "concat-stream": {
+          "version": "1.4.11",
+          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
+          "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
+          "dev": true,
+          "requires": {
+            "inherits": "~2.0.1",
+            "readable-stream": "~1.1.9",
+            "typedarray": "~0.0.5"
+          }
+        },
+        "convert-source-map": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
+          "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==",
+          "dev": true
+        },
+        "inline-source-map": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz",
+          "integrity": "sha512-2WtHG0qX9OH9TVcxsLVfq3Tzr+qtL6PtWgoh0XAAKe4KkdA/57Q+OGJuRJHA4mZ2OZnkJ/ZAaXf9krLB12/nIg==",
+          "dev": true,
+          "requires": {
+            "source-map": "~0.4.0"
+          }
+        },
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "jsonparse": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+          "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+          "dev": true
+        },
+        "JSONStream": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+          "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+          "dev": true,
+          "requires": {
+            "jsonparse": "^1.2.0",
+            "through": ">=2.2.7 <3"
+          }
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        },
+        "through2": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": ">=1.1.13-1 <1.2.0-0",
+            "xtend": ">=4.0.0 <4.1.0-0"
+          }
+        }
+      }
+    },
     "internal-slot": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
@@ -31671,6 +39847,12 @@
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true
     },
+    "is-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
+      "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==",
+      "dev": true
+    },
     "is-generator-function": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
@@ -31701,6 +39883,25 @@
       "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
       "dev": true
     },
+    "is-my-ip-valid": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.1.tgz",
+      "integrity": "sha512-jxc8cBcOWbNK2i2aTkCZP6i7wkHF1bqKFrwEHuN5Jtg5BSaZHUZQ/JTOJwoV41YvHnOaRyWWh72T/KvfNz9DJg==",
+      "dev": true
+    },
+    "is-my-json-valid": {
+      "version": "2.20.6",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.6.tgz",
+      "integrity": "sha512-1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw==",
+      "dev": true,
+      "requires": {
+        "generate-function": "^2.0.0",
+        "generate-object-property": "^1.1.0",
+        "is-my-ip-valid": "^1.0.0",
+        "jsonpointer": "^5.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
     "is-nan": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
@@ -31758,6 +39959,12 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
+      "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
+      "dev": true
+    },
     "is-plain-obj": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
@@ -31776,6 +39983,18 @@
       "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
       "dev": true
     },
+    "is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==",
+      "dev": true
+    },
+    "is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==",
+      "dev": true
+    },
     "is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
@@ -32105,6 +40324,30 @@
         "textextensions": "^3.2.0"
       }
     },
+    "jade": {
+      "version": "0.26.3",
+      "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
+      "integrity": "sha512-mkk3vzUHFjzKjpCXeu+IjXeZD+QOTjUUdubgmHtHTDwvAO2ZTkMTTVrapts5CWz3JvJryh/4KWZpjeZrCepZ3A==",
+      "dev": true,
+      "requires": {
+        "commander": "0.6.1",
+        "mkdirp": "0.3.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
+          "integrity": "sha512-0fLycpl1UMTGX257hRsu/arL/cUbcvQM4zMKwvLvzXtfdezIV4yotPS2dYtknF+NmEfWSoCEF6+hj9XLm/6hEw==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
+          "integrity": "sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==",
+          "dev": true
+        }
+      }
+    },
     "jake": {
       "version": "10.8.5",
       "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
@@ -32371,6 +40614,12 @@
         "supports-color": "^8.0.0"
       }
     },
+    "jju": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+      "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==",
+      "dev": true
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -32394,12 +40643,64 @@
         }
       }
     },
+    "js2xmlparser": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
+      "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
+      "dev": true,
+      "requires": {
+        "xmlcreate": "^2.0.4"
+      }
+    },
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
       "dev": true
     },
+    "jsdoc": {
+      "version": "3.6.11",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.11.tgz",
+      "integrity": "sha512-8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.9.4",
+        "@types/markdown-it": "^12.2.3",
+        "bluebird": "^3.7.2",
+        "catharsis": "^0.9.0",
+        "escape-string-regexp": "^2.0.0",
+        "js2xmlparser": "^4.0.2",
+        "klaw": "^3.0.0",
+        "markdown-it": "^12.3.2",
+        "markdown-it-anchor": "^8.4.1",
+        "marked": "^4.0.10",
+        "mkdirp": "^1.0.4",
+        "requizzle": "^0.2.3",
+        "strip-json-comments": "^3.1.0",
+        "taffydb": "2.6.2",
+        "underscore": "~1.13.2"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.7.2",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+          "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+          "dev": true
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        }
+      }
+    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -32423,6 +40724,15 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
+    "json-parse-helpfulerror": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
+      "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==",
+      "dev": true,
+      "requires": {
+        "jju": "^1.1.0"
+      }
+    },
     "json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
@@ -32435,6 +40745,15 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "json-stable-stringify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+      "integrity": "sha512-nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==",
+      "dev": true,
+      "requires": {
+        "jsonify": "~0.0.0"
+      }
+    },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -32462,6 +40781,44 @@
         "universalify": "^2.0.0"
       }
     },
+    "jsonify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+      "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+      "dev": true
+    },
+    "jsonlint": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz",
+      "integrity": "sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==",
+      "dev": true,
+      "requires": {
+        "JSV": "^4.0.x",
+        "nomnom": "^1.5.x"
+      }
+    },
+    "jsonparse": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
+      "integrity": "sha512-fw7Q/8gFR8iSekUi9I+HqWIap6mywuoe7hQIg3buTVjuZgALKj4HAmm0X6f+TaL4c9NJbvyFQdaI2ppr5p6dnQ==",
+      "dev": true
+    },
+    "jsonpointer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
+      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
+      "dev": true
+    },
+    "JSONStream": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
+      "integrity": "sha512-l0NN3IcqrZfZBJp7JWDJIHsnPV7yzJWqsYxQzL8Fwdx1BmEMjLuvtYkv+P9pbvpyfP75/f4MeDZhWNU4is32uA==",
+      "dev": true,
+      "requires": {
+        "jsonparse": "0.0.5",
+        "through": ">=2.2.7 <3"
+      }
+    },
     "jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
@@ -32474,6 +40831,12 @@
         "verror": "1.10.0"
       }
     },
+    "JSV": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
+      "integrity": "sha512-ZJ6wx9xaKJ3yFUhq5/sk82PJMuUyLk277I8mQeyDgCTjGdjWJIvPfaU5LIXaMuaN2UO1X3kZH4+lgphublZUHw==",
+      "dev": true
+    },
     "just-clone": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-1.0.2.tgz",
@@ -32830,6 +41193,18 @@
         "webpack-merge": "^4.1.5"
       }
     },
+    "kew": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz",
+      "integrity": "sha512-TQRJfHoVm4f2exuRqjcpURhzGcC4GEIPyiLquo4mBfz0JgsVg19VeyTmKp6RKSOIhHQ6F4SgEhsnUlBduGV9Yw==",
+      "dev": true
+    },
+    "keycode": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
+      "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==",
+      "dev": true
+    },
     "keyv": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz",
@@ -32845,6 +41220,15 @@
       "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true
     },
+    "klaw": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
+      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
     "kleur": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
@@ -32867,6 +41251,25 @@
       "integrity": "sha512-01TBSOqlHmLfcQhHseugGHLxPtU03OyZWaLDWt5MfzCkijG6xWFvAQPhKVn0cR2MMjYvBP9keQ8A3+rQEhLO5g==",
       "dev": true
     },
+    "labeled-stream-splicer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
+      "integrity": "sha512-3KBjPRnXrYC5h2jEf/d6hO7Lcl+38QzRVTOyHA2sFzZVMYwsUFuejlrOMwAjmz13hVBr9ruDS1RwE4YEz8P58w==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "isarray": "~0.0.1",
+        "stream-splicer": "^1.1.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        }
+      }
+    },
     "last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -32920,6 +41323,15 @@
         "type-check": "~0.4.0"
       }
     },
+    "lexical-scope": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
+      "integrity": "sha512-ntJ8IcBCuKwudML7vAuT/L0aIMU0+9vO25K4CjLPYgzf1NZ0bAhJJBZrvkO+oUGgKcbdkH8UZdRsaEg+wULLRw==",
+      "dev": true,
+      "requires": {
+        "astw": "^2.0.0"
+      }
+    },
     "liftoff": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
@@ -32980,6 +41392,15 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
+    "linkify-it": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "dev": true,
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
     "listenercount": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
@@ -33000,6 +41421,45 @@
       "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
       "dev": true
     },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "dependencies": {
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.2.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+          "dev": true
+        },
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
+          "dev": true,
+          "requires": {
+            "is-utf8": "^0.2.0"
+          }
+        }
+      }
+    },
     "loader-runner": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
@@ -33022,12 +41482,87 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
+    "lodash._arraycopy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz",
+      "integrity": "sha512-RHShTDnPKP7aWxlvXKiDT6IX2jCs6YZLCtNhOru/OX2Q/tzX295vVBK5oX1ECtN+2r86S0Ogy8ykP1sgCZAN0A==",
+      "dev": true
+    },
+    "lodash._arrayeach": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz",
+      "integrity": "sha512-Mn7HidOVcl3mkQtbPsuKR0Fj0N6Q6DQB77CtYncZcJc0bx5qv2q4Gl6a0LC1AN+GSxpnBDNnK3CKEm9XNA4zqQ==",
+      "dev": true
+    },
+    "lodash._arraymap": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._arraymap/-/lodash._arraymap-3.0.0.tgz",
+      "integrity": "sha512-IhRssF2bzQoFQ2Q5H1O52HuJY+OtcHDZekEhaMJ6RkUF+gpLlAsizSRsKp3Ho555ANRk69DFp5b4LOlym4S0bw==",
+      "dev": true
+    },
+    "lodash._baseassign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+      "integrity": "sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==",
+      "dev": true,
+      "requires": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
+    "lodash._baseclone": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz",
+      "integrity": "sha512-1K0dntf2dFQ5my0WoGKkduewR6+pTNaqX03kvs45y7G5bzl4B3kTR4hDfJIc2aCQDeLyQHhS280tc814m1QC1Q==",
+      "dev": true,
+      "requires": {
+        "lodash._arraycopy": "^3.0.0",
+        "lodash._arrayeach": "^3.0.0",
+        "lodash._baseassign": "^3.0.0",
+        "lodash._basefor": "^3.0.0",
+        "lodash.isarray": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
     "lodash._basecopy": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
       "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
       "dev": true
     },
+    "lodash._basedifference": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-3.0.3.tgz",
+      "integrity": "sha512-4BcJlOv36b3v+kHdJWcgsDi96ns8neNLuDtbzzjW3+eh3XhFVmFPH2tu6GJK2e5eRYMQ8izHU35iAyNjRyDtCQ==",
+      "dev": true,
+      "requires": {
+        "lodash._baseindexof": "^3.0.0",
+        "lodash._cacheindexof": "^3.0.0",
+        "lodash._createcache": "^3.0.0"
+      }
+    },
+    "lodash._baseflatten": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz",
+      "integrity": "sha512-fESngZd+X4k+GbTxdMutf8ohQa0s3sJEHIcwtu4/LsIQ2JTDzdRxDCMQjW+ezzwRitLmHnacVVmosCbxifefbw==",
+      "dev": true,
+      "requires": {
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "lodash._basefor": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz",
+      "integrity": "sha512-6bc3b8grkpMgDcVJv9JYZAk/mHgcqMljzm7OsbmcE2FGUMmmLQTPHlh/dFqR8LA0GQ7z4K67JSotVKu5058v1A==",
+      "dev": true
+    },
+    "lodash._baseindexof": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz",
+      "integrity": "sha512-bSYo8Pc/f0qAkr8fPJydpJjtrHiSynYfYBjtANIgXv5xEf1WlTC63dIDlgu0s9dmTvzRu1+JJTxcIAHe+sH0FQ==",
+      "dev": true
+    },
     "lodash._basetostring": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
@@ -33040,6 +41575,38 @@
       "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
       "dev": true
     },
+    "lodash._bindcallback": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
+      "integrity": "sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==",
+      "dev": true
+    },
+    "lodash._cacheindexof": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz",
+      "integrity": "sha512-S8dUjWr7SUT/X6TBIQ/OYoCHo1Stu1ZRy6uMUSKqzFnZp5G5RyQizSm6kvxD2Ewyy6AVfMg4AToeZzKfF99T5w==",
+      "dev": true
+    },
+    "lodash._createassigner": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
+      "integrity": "sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw==",
+      "dev": true,
+      "requires": {
+        "lodash._bindcallback": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash.restparam": "^3.0.0"
+      }
+    },
+    "lodash._createcache": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz",
+      "integrity": "sha512-ev5SP+iFpZOugyab/DEUQxUeZP5qyciVTlgQ1f4Vlw7VUcCD8fVnyIqVUEIaoFH9zjAqdgi69KiofzvVmda/ZQ==",
+      "dev": true,
+      "requires": {
+        "lodash._getnative": "^3.0.0"
+      }
+    },
     "lodash._getnative": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
@@ -33052,6 +41619,22 @@
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
       "dev": true
     },
+    "lodash._pickbyarray": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/lodash._pickbyarray/-/lodash._pickbyarray-3.0.2.tgz",
+      "integrity": "sha512-tHzBIfgugzI7HV0y8MJS1z/ryWDh8NyD6AV+so9vlplRnhD4qBuwoyDt7g241ad3F43YDFghCN+R3iaFd4Azvw==",
+      "dev": true
+    },
+    "lodash._pickbycallback": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._pickbycallback/-/lodash._pickbycallback-3.0.0.tgz",
+      "integrity": "sha512-DVP27YmN0lB+j/Tgd/+gtxfmW/XihgWpQpHptBuwyp2fD9zEBRwwcnw6Qej16LUV8LRFuTqyoc0i6ON97d/C5w==",
+      "dev": true,
+      "requires": {
+        "lodash._basefor": "^3.0.0",
+        "lodash.keysin": "^3.0.0"
+      }
+    },
     "lodash._reescape": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
@@ -33147,12 +41730,61 @@
       "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
       "dev": true
     },
+    "lodash.istypedarray": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz",
+      "integrity": "sha512-lGWJ6N8AA3KSv+ZZxlTdn4f6A7kMfpJboeyvbFdE7IU9YAgweODqmOgdUHOA+c6lVWeVLysdaxciFXi+foVsWw==",
+      "dev": true
+    },
+    "lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
+      "dev": true,
+      "requires": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "lodash.keysin": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-3.0.8.tgz",
+      "integrity": "sha512-YDB/5xkL3fBKFMDaC+cfGV00pbiJ6XoJIfRmBhv7aR6wWtbCW6IzkiWnTfkiHTF6ALD7ff83dAtB3OEaSoyQPg==",
+      "dev": true,
+      "requires": {
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "lodash.memoize": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
+      "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==",
+      "dev": true
+    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
+    "lodash.omit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-3.1.0.tgz",
+      "integrity": "sha512-vC3fSzZDmPlwk+kCGYMQyUpPeRBgmOK/WrhmjlWVUjEch35gQR3iRbCV9rL7KgMHVeVhnq7A+TRrPvzvg67y9w==",
+      "dev": true,
+      "requires": {
+        "lodash._arraymap": "^3.0.0",
+        "lodash._basedifference": "^3.0.0",
+        "lodash._baseflatten": "^3.0.0",
+        "lodash._bindcallback": "^3.0.0",
+        "lodash._pickbyarray": "^3.0.0",
+        "lodash._pickbycallback": "^3.0.0",
+        "lodash.keysin": "^3.0.0",
+        "lodash.restparam": "^3.0.0"
+      }
+    },
     "lodash.pickby": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
@@ -33190,6 +41822,16 @@
         "lodash._reinterpolate": "^3.0.0"
       }
     },
+    "lodash.toplainobject": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz",
+      "integrity": "sha512-wMI0Ju1bvSmnBS3EcRRH/3zDnZOPpDtMtNDzbbNMKuTrEpALsf+sPyMeogmv63Y11qZQO7H1xFzohIEGRMjPYA==",
+      "dev": true,
+      "requires": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash.keysin": "^3.0.0"
+      }
+    },
     "lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -33269,6 +41911,16 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
+      }
+    },
     "loupe": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
@@ -33302,6 +41954,17 @@
         "es5-ext": "~0.10.2"
       }
     },
+    "m3u8-parser": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.1.tgz",
+      "integrity": "sha512-pbrQwiMiq+MmI9bl7UjtPT3AK603PV9bogNlr83uC+X9IoxqL5E4k7kU7fMQ0dpRgxgeSMygqUa0IMLQNXLBNA==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "^3.0.5",
+        "global": "^4.4.0"
+      }
+    },
     "magic-string": {
       "version": "0.25.9",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
@@ -33344,6 +42007,12 @@
       "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
       "dev": true
     },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+      "dev": true
+    },
     "map-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
@@ -33359,12 +42028,85 @@
         "object-visit": "^1.0.0"
       }
     },
+    "markdown-it": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "dev": true,
+      "requires": {
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        }
+      }
+    },
+    "markdown-it-anchor": {
+      "version": "8.6.5",
+      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.5.tgz",
+      "integrity": "sha512-PI1qEHHkTNWT+X6Ip9w+paonfIQ+QZP9sCeMYi47oqhH+EsW8CrJ8J7CzV19QVOj6il8ATGbK2nTECj22ZHGvQ==",
+      "dev": true,
+      "requires": {}
+    },
     "markdown-table": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.2.tgz",
       "integrity": "sha512-y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA==",
       "dev": true
     },
+    "markdownlint": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.0.6.tgz",
+      "integrity": "sha512-2jxomIcTY+HWnrMWv7Q/T93d7yp4RXNGkoQXWq5II1TgyQj5pFDoB7HZSCX57ATk9zZTb1++jwXR3uHn6AKmew==",
+      "dev": true,
+      "requires": {
+        "markdown-it": "^4.2.2"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+          "dev": true
+        },
+        "linkify-it": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
+          "integrity": "sha512-eGHwtlABkp1NOJSiKUNqBf3SYAS5jPHtvRXPAgNaQwTqmkTahjtiLH9NtxdR5IOPhNvwNMN/diswSfZKzUkhGg==",
+          "dev": true,
+          "requires": {
+            "uc.micro": "^1.0.1"
+          }
+        },
+        "markdown-it": {
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz",
+          "integrity": "sha512-Rl8dHHeLuAh3E72OPY0tY7CLvlxgHiLhlshIYswAAabAg4YDBLa6e/LTgNkkxBO2K61ESzoquPQFMw/iMrT1PA==",
+          "dev": true,
+          "requires": {
+            "argparse": "~1.0.2",
+            "entities": "~1.1.1",
+            "linkify-it": "~1.2.0",
+            "mdurl": "~1.0.0",
+            "uc.micro": "^1.0.0"
+          }
+        }
+      }
+    },
+    "marked": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.1.1.tgz",
+      "integrity": "sha512-0cNMnTcUJPxbA6uWmCmjWz4NJRe/0Xfk2NhXCUHjew9qJzFN20krFnsUe7QynwqOwa5m1fZ4UDg0ycKFVC0ccw==",
+      "dev": true
+    },
     "marky": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.4.tgz",
@@ -33406,6 +42148,17 @@
         }
       }
     },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
     "mdast-util-definitions": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz",
@@ -33672,6 +42425,66 @@
         "readable-stream": "^2.0.1"
       }
     },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
+      "dev": true,
+      "requires": {
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
+          "dev": true,
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "read-pkg": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+          "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^1.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^1.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+          "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
+          "dev": true,
+          "requires": {
+            "find-up": "^1.0.0",
+            "read-pkg": "^1.0.0"
+          }
+        }
+      }
+    },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -34112,6 +42925,24 @@
         }
       }
     },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
     "mime": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
@@ -34143,6 +42974,27 @@
       "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
       "dev": true
     },
+    "min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+      "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==",
+      "dev": true,
+      "requires": {
+        "dom-walk": "^0.1.0"
+      }
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
+      "dev": true
+    },
     "minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -34181,12 +43033,11 @@
       "dev": true
     },
     "mocha": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz",
-      "integrity": "sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
+      "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
       "dev": true,
       "requires": {
-        "@ungap/promise-all-settled": "1.1.2",
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
         "chokidar": "3.5.3",
@@ -34376,6 +43227,12 @@
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
         "workerpool": {
           "version": "6.2.1",
           "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
@@ -34405,6 +43262,190 @@
         }
       }
     },
+    "mocha-phantomjs": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.6.0.tgz",
+      "integrity": "sha512-siI6m2uw3Xyjruz9eEP8JTVHOtnOxdmnEqXM0IrOt3Nbw4oPJw6u8Q6MG6hqnbH9fJ3i60F3bYlmSEbgwuNsQw==",
+      "dev": true,
+      "requires": {
+        "commander": "~2.0.0",
+        "mocha": "~1.20.1"
+      },
+      "dependencies": {
+        "diff": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz",
+          "integrity": "sha512-0bTLzyr1S59cPsgAD/lR+ivvHTbgPb+k/mUR6WGqma1J6QDU+kUegI8uQFuH/cMUNK7JGN3Tk1Y5Jf2MO85WrA==",
+          "dev": true
+        },
+        "glob": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz",
+          "integrity": "sha512-WPaLsMHD1lYEqAmIQI6VOJSPwuBdGShDWnj1yUo0vQqEO809R8W3LM9OVU13CnnDhyv/EiNwOtxEW74SmrzS6w==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "~2.0.0",
+            "inherits": "2",
+            "minimatch": "~0.2.11"
+          }
+        },
+        "graceful-fs": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+          "integrity": "sha512-hcj/NTUWv+C3MbqrVb9F+aH6lvTwEHJdx2foBxlrVq5h6zE8Bfu4pv4CAAqbDcZrw/9Ak5lsRXlY9Ao8/F0Tuw==",
+          "dev": true
+        },
+        "growl": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz",
+          "integrity": "sha512-VWv7s1EI41AG2LiCr7uAuxWikLDN1SQOuEUc37d/P34NAIIYgkvWYngNw0d9d9iCrDFL0SYCE9UQpxhIjjtuLg==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+          "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "0.2.14",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+          "integrity": "sha512-zZ+Jy8lVWlvqqeM8iZB7w7KmQkoJn8djM585z88rywrEbzoqawVa9FR5p2hwD+y74nfuKOjmNvi9gtWJNLqHvA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "2",
+            "sigmund": "~1.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
+          "dev": true
+        },
+        "mocha": {
+          "version": "1.20.1",
+          "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz",
+          "integrity": "sha512-25Nq3BuIYCy80uEix+hBlZcr/gnLzpcYqfsaPAxZm2qbMFmed8I3nP8N05KagK4BTkGYUvsRJ47istvRqFO8fw==",
+          "dev": true,
+          "requires": {
+            "commander": "2.0.0",
+            "debug": "*",
+            "diff": "1.0.7",
+            "glob": "3.2.3",
+            "growl": "1.7.x",
+            "jade": "0.26.3",
+            "mkdirp": "0.3.5"
+          }
+        }
+      }
+    },
+    "module-deps": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
+      "integrity": "sha512-EbWWlSGaCVidEsLsSzkY6l/jm0IcGDSQ8tGwtjM8joTrxqxP0om02Px9Np8D7FMZ/vZFdsOGbio+WqkKQxYuTA==",
+      "dev": true,
+      "requires": {
+        "browser-resolve": "^1.7.0",
+        "concat-stream": "~1.4.5",
+        "defined": "^1.0.0",
+        "detective": "^4.0.0",
+        "duplexer2": "0.0.2",
+        "inherits": "^2.0.1",
+        "JSONStream": "^1.0.3",
+        "parents": "^1.0.0",
+        "readable-stream": "^1.1.13",
+        "resolve": "^1.1.3",
+        "stream-combiner2": "~1.0.0",
+        "subarg": "^1.0.0",
+        "through2": "^1.0.0",
+        "xtend": "^4.0.0"
+      },
+      "dependencies": {
+        "concat-stream": {
+          "version": "1.4.11",
+          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
+          "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
+          "dev": true,
+          "requires": {
+            "inherits": "~2.0.1",
+            "readable-stream": "~1.1.9",
+            "typedarray": "~0.0.5"
+          }
+        },
+        "defined": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+          "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
+          "dev": true
+        },
+        "duplexer2": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+          "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~1.1.9"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "jsonparse": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+          "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+          "dev": true
+        },
+        "JSONStream": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+          "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+          "dev": true,
+          "requires": {
+            "jsonparse": "^1.2.0",
+            "through": ">=2.2.7 <3"
+          }
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        },
+        "through2": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": ">=1.1.13-1 <1.2.0-0",
+            "xtend": ">=4.0.0 <4.1.0-0"
+          }
+        }
+      }
+    },
+    "module-not-found-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
+      "integrity": "sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==",
+      "dev": true
+    },
     "morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
@@ -34441,6 +43482,18 @@
         }
       }
     },
+    "mpd-parser": {
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.21.1.tgz",
+      "integrity": "sha512-BxlSXWbKE1n7eyEPBnTEkrzhS3PdmkkKdM1pgKbPnPOH0WFZIc0sPOWi7m0Uo3Wd2a4Or8Qf4ZbS7+ASqQ49fw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/vhs-utils": "^3.0.5",
+        "@xmldom/xmldom": "^0.7.2",
+        "global": "^4.4.0"
+      }
+    },
     "mri": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
@@ -34514,6 +43567,16 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
+    "mux.js": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.0.1.tgz",
+      "integrity": "sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.11.2",
+        "global": "^4.4.0"
+      }
+    },
     "nan": {
       "version": "2.15.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
@@ -34555,6 +43618,13 @@
         }
       }
     },
+    "natives": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz",
+      "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==",
+      "dev": true,
+      "optional": true
+    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -34578,6 +43648,15 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
+    "nested-error-stacks": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz",
+      "integrity": "sha512-o32anp9JA7oezPOFSfG2BBXSdHepOm5FpJvwxHWDtfJ3Bg3xdi68S6ijPlEOfUg6quxZWyvJM+8fHk1yMDKspA==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1"
+      }
+    },
     "next-tick": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
@@ -34653,6 +43732,53 @@
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
       "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
     },
+    "node-uuid": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+      "integrity": "sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA==",
+      "dev": true
+    },
+    "nomnom": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
+      "integrity": "sha512-5s0JxqhDx9/rksG2BTMVN1enjWSvPidpoSgViZU4ZXULyTe+7jxcCRLB6f42Z0l1xYJpleCBtSyY6Lwg3uu5CQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "~0.4.0",
+        "underscore": "~1.6.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
+          "integrity": "sha512-3iF4FIKdxaVYT3JqQuY3Wat/T2t7TRbbQ94Fu50ZUCbLy4TFbTzr90NOHQodQkNqmeEGCw8WbeP78WNi6SKYUA==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
+          "integrity": "sha512-sQfYDlfv2DGVtjdoQqxS0cEZDroyG8h6TamA6rvxwlrU5BaSLDx9xhatBYl2pxZ7gmpNaPFVwBtdGdu5rQ+tYQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "~1.0.0",
+            "has-color": "~0.1.0",
+            "strip-ansi": "~0.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
+          "integrity": "sha512-behete+3uqxecWlDAm5lmskaSaISA+ThQ4oNNBDTBJt0x2ppR6IPqfZNuj6BLaLJ/Sji4TPZlcRyOis8wXQTLg==",
+          "dev": true
+        },
+        "underscore": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+          "integrity": "sha512-z4o1fvKUojIWh9XuaVLUDdf86RQiq13AC1dmHbTpoyuu+bquHms76v16CjycCbec87J7z0k//SiQVk0sMdFmpQ==",
+          "dev": true
+        }
+      }
+    },
     "nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -34662,6 +43788,12 @@
         "abbrev": "1"
       }
     },
+    "nopt-usage": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/nopt-usage/-/nopt-usage-0.1.0.tgz",
+      "integrity": "sha512-Tg2sISrWBbSsCRqpEMmdxn3KZfacrd0N2NYpZQIq0MHxGHMjwzYlxeB9pVIom/g7CBK28atDUQsTlOfG0wOsNA==",
+      "dev": true
+    },
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -34703,6 +43835,39 @@
         "once": "^1.3.2"
       }
     },
+    "npm-license": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/npm-license/-/npm-license-0.2.3.tgz",
+      "integrity": "sha512-Sm6zqTVReBGe1C5A3Vr7pqYFmawM3oF/MKhhk0LRAOZPEOygr96KkiJ5P0ZQMDP3F7HRW6zyy7gxIIos+6foww==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "~0.5.0",
+        "nopt": "~3.0.1",
+        "nopt-usage": "^0.1.0",
+        "package-license": "~0.1.1",
+        "pkginfo": "^0.3.0",
+        "read-installed": "~3.1.3",
+        "treeify": "~1.0.1",
+        "underscore": "~1.4.4"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.6"
+          }
+        },
+        "underscore": {
+          "version": "1.4.4",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
+          "integrity": "sha512-ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ==",
+          "dev": true
+        }
+      }
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -34720,6 +43885,63 @@
         }
       }
     },
+    "npmconf": {
+      "version": "0.0.24",
+      "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz",
+      "integrity": "sha512-LX0bX+RmuBuEITg26i7+dx+d9cfYU+giB7eOiSkT5IwvuAzzIx02u4GXwSC3jsQMDMb/kXC57R8tybRSVYfbWw==",
+      "dev": true,
+      "requires": {
+        "config-chain": "~1.1.1",
+        "inherits": "~1.0.0",
+        "ini": "~1.1.0",
+        "mkdirp": "~0.3.3",
+        "nopt": "2",
+        "once": "~1.1.1",
+        "osenv": "0.0.3",
+        "semver": "~1.1.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
+          "integrity": "sha512-Al67oatbRSo3RV5hRqIoln6Y5yMVbJSIn4jEJNL7VCImzq/kLr7vvb6sFRJXqr8rpHc/2kJOM+y0sPKN47VdzA==",
+          "dev": true
+        },
+        "ini": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz",
+          "integrity": "sha512-B6L/jfyFRcG2dqKiHggWnfby52Iy07iabE4F6srQAr/OmVKBRE5uU+B5MQ+nQ7NiYnjz93gENh1GhqHzpDgHgA==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
+          "dev": true
+        },
+        "nopt": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
+          "integrity": "sha512-gIOTA/uJuhPwFqp+spY7VQ1satbnGlD+iQVZxI18K6hs8Evq4sX81Ml7BB5byP/LsbR2yBVtmvdEmhi7evJ6Aw==",
+          "dev": true,
+          "requires": {
+            "abbrev": "1"
+          }
+        },
+        "once": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz",
+          "integrity": "sha512-frdJr++QKEg4+JylTX+NNLgSoO6M2pDNYOOXe4WGIYKKBADBI9nU3oa06y4D4FpAJ3obAsjExeBOnscYJB9Blw==",
+          "dev": true
+        },
+        "semver": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz",
+          "integrity": "sha512-9causpLEkYDrfTz7cprleLz9dnlb0oKsKRHl33K92wJmXLhVc2dGlrQGJT/sjtLOAyuoQZl+ClI77+lnvzPSKg==",
+          "dev": true
+        }
+      }
+    },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -34937,6 +44159,12 @@
         "mimic-fn": "^2.1.0"
       }
     },
+    "open": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/open/-/open-0.0.3.tgz",
+      "integrity": "sha512-Vm6nsJHcKV8kdOtHESAFAymOOf1VlKrttpwTqtLxvxRDIh8PSw4lWq5qk88QkAvNwnkv/1dNi2lvedhmam/ggw==",
+      "dev": true
+    },
     "opener": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
@@ -34960,6 +44188,23 @@
         }
       }
     },
+    "optimist": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+      "integrity": "sha512-TCx0dXQzVtSCg2OgY/bO9hjM9cV4XYx09TVK+s3+FhkjT6LovsLe+pPMzpWf+6yXK/hUizs2gUoTw3jHM0VaTQ==",
+      "dev": true,
+      "requires": {
+        "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
+          "dev": true
+        }
+      }
+    },
     "optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -35055,6 +44300,12 @@
         "readable-stream": "^2.0.1"
       }
     },
+    "os-browserify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
+      "integrity": "sha512-aZicJZccvxWOZ0Bja2eAch2L8RIJWBuRYmM8Gwl/JjNtRltH0Itcz4eH/ESyuIWfse8cc93ZCf0XrzhXK2HEDA==",
+      "dev": true
+    },
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
@@ -35076,6 +44327,12 @@
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
+    "osenv": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz",
+      "integrity": "sha512-VBk1bfdaO4gh3OWO8LBuDY2alp0buL8YzQ6t13xyc8PQPrnUg5AgQvINQx3UkS4dom8UGCL597q4Y2+M4TPvmw==",
+      "dev": true
+    },
     "p-cancelable": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
@@ -35118,6 +44375,18 @@
       "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
       "dev": true
     },
+    "package-license": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/package-license/-/package-license-0.1.2.tgz",
+      "integrity": "sha512-Q5zmx+M9ZJneMpYS6MlYL77gqeMYWuyErXMnQ/83WCztmYQD7Z0U9XGLvX9OKFFXwRj2NzdzlM0y9Jzcww2O1Q==",
+      "dev": true
+    },
+    "pako": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+      "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
+      "dev": true
+    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -35127,6 +44396,28 @@
         "callsites": "^3.0.0"
       }
     },
+    "parents": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+      "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==",
+      "dev": true,
+      "requires": {
+        "path-platform": "~0.11.15"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "requires": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -35200,6 +44491,12 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
@@ -35218,6 +44515,12 @@
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
+      "dev": true
+    },
     "path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -35229,6 +44532,12 @@
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
+    "path-platform": {
+      "version": "0.11.15",
+      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
+      "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==",
+      "dev": true
+    },
     "path-root": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
@@ -35249,6 +44558,25 @@
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
       "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
     },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+          "dev": true
+        }
+      }
+    },
     "pathval": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
@@ -35264,6 +44592,19 @@
         "through": "~2.3"
       }
     },
+    "pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dev": true,
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -35276,6 +44617,184 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
+    "phantomjs": {
+      "version": "1.9.7-15",
+      "resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-15.tgz",
+      "integrity": "sha512-s4PSN1L0iVwgv9ZkrSKcfojyPAtwGWhXxjn2p1P/ljuw3cx+FW3hKP00x247mIYbKeKSMylOd4euDQOMpUIAsg==",
+      "dev": true,
+      "requires": {
+        "adm-zip": "0.2.1",
+        "kew": "~0.1.7",
+        "mkdirp": "0.3.5",
+        "ncp": "0.4.2",
+        "npmconf": "0.0.24",
+        "progress": "^1.1.5",
+        "request": "2.36.0",
+        "request-progress": "^0.3.1",
+        "rimraf": "~2.2.2",
+        "which": "~1.0.5"
+      },
+      "dependencies": {
+        "asn1": {
+          "version": "0.1.11",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+          "integrity": "sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA==",
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+          "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
+          "dev": true,
+          "optional": true
+        },
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+          "integrity": "sha512-oqUX0DM5j7aPWPCnpWebiyNIj2wiNI87ZxnOMoGv0aE4TGlBy2N+5iWc6dQ/NOKZaBD2W6PVz8jtOGkWzSC5EA==",
+          "dev": true,
+          "optional": true
+        },
+        "combined-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "integrity": "sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delayed-stream": "0.0.5"
+          }
+        },
+        "delayed-stream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+          "integrity": "sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA==",
+          "dev": true,
+          "optional": true
+        },
+        "forever-agent": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+          "integrity": "sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A==",
+          "dev": true
+        },
+        "form-data": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+          "integrity": "sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "async": "~0.9.0",
+            "combined-stream": "~0.0.4",
+            "mime": "~1.2.11"
+          }
+        },
+        "hawk": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
+          "integrity": "sha512-Sg+VzrI7TjUomO0rjD6UXawsj50ykn5sB/xKNW/IenxzRVyw/wt9A2FLzYpGL/r0QG5hyXY8nLx/2m8UutoDcg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "0.4.x",
+            "cryptiles": "0.2.x",
+            "hoek": "0.9.x",
+            "sntp": "0.2.x"
+          }
+        },
+        "http-signature": {
+          "version": "0.10.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "integrity": "sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.1.11",
+            "assert-plus": "^0.1.5",
+            "ctype": "0.5.3"
+          }
+        },
+        "mime": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
+          "integrity": "sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ==",
+          "dev": true,
+          "optional": true
+        },
+        "progress": {
+          "version": "1.1.8",
+          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+          "integrity": "sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw==",
+          "dev": true
+        },
+        "qs": {
+          "version": "0.6.6",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz",
+          "integrity": "sha512-kN+yNdAf29Jgp+AYHUmC7X4QdJPR8czuMWLNLc0aRxkQ7tB3vJQEONKKT9ou/rW7EbqVec11srC9q9BiVbcnHA==",
+          "dev": true
+        },
+        "request": {
+          "version": "2.36.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
+          "integrity": "sha512-iVii/ruMH9i8k++HYYPqi+nb1Pbgz7UOTGbFEiyhl7uDN8PhyFV2lGJa8XLIUS5tyt5scERcLkwqvCNF84Vv2Q==",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "~0.5.0",
+            "forever-agent": "~0.5.0",
+            "form-data": "~0.1.0",
+            "hawk": "~1.0.0",
+            "http-signature": "~0.10.0",
+            "json-stringify-safe": "~5.0.0",
+            "mime": "~1.2.9",
+            "node-uuid": "~1.4.0",
+            "oauth-sign": "~0.3.0",
+            "qs": "~0.6.0",
+            "tough-cookie": ">=0.12.0",
+            "tunnel-agent": "~0.4.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.2.8",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
+          "dev": true
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
+          "dev": true,
+          "optional": true
+        },
+        "which": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz",
+          "integrity": "sha512-E87fdQ/eRJr9W1X4wTPejNy9zTW3FI2vpCZSJ/HAY+TkjKVC0TUm1jk6vn2Z7qay0DQy0+RBGdXxj+RmmiGZKQ==",
+          "dev": true
+        }
+      }
+    },
     "picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -35308,6 +44827,15 @@
         "pinkie": "^2.0.0"
       }
     },
+    "pkcs7": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.4.tgz",
+      "integrity": "sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
     "pkg-dir": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -35368,6 +44896,12 @@
         }
       }
     },
+    "pkginfo": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+      "integrity": "sha512-yO5feByMzAp96LtP58wvPKSbaKAi/1C4kV9XpTctr6EepnP6F33RBNOiVrdz9BrPA98U2BMFsTNHo44TWcbQ2A==",
+      "dev": true
+    },
     "plugin-error": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
@@ -35391,6 +44925,23 @@
         }
       }
     },
+    "portfinder": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-0.2.1.tgz",
+      "integrity": "sha512-U7dHe7mfMMP5cIwbqBHh/likunxAEiBsQLiThUWjyeRK6/C3um2uk+VGiekUW8q3h+s793gdNfagCM3aaXMeOg==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "0.0.x"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz",
+          "integrity": "sha512-r4Ml2CH2Kl4B0+Lwq1SVru0vjMxdtR+UEb938WTQcsnU+EJz8dUV/HY0LTZh466nUSljia9cvqW3LZLWs3l8LQ==",
+          "dev": true
+        }
+      }
+    },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -35415,6 +44966,12 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==",
+      "dev": true
+    },
     "pretty-format": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
@@ -35461,6 +45018,12 @@
       "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
       "dev": true
     },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true
+    },
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -35479,6 +45042,12 @@
       "integrity": "sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==",
       "dev": true
     },
+    "proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+      "dev": true
+    },
     "protocols": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz",
@@ -35500,6 +45069,25 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "dev": true
     },
+    "proxyquire": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz",
+      "integrity": "sha512-mZZq4F50qaBkngvlf9paNfaSb5gtJ0mFPnBjda4NxCpXpMAaVfSLguRr9y2KXF6koOSBf4AanD2inuEQw3aCcA==",
+      "dev": true,
+      "requires": {
+        "fill-keys": "^1.0.2",
+        "module-not-found-error": "^1.0.0",
+        "resolve": "~1.1.7"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
+          "dev": true
+        }
+      }
+    },
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -35527,6 +45115,28 @@
       "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
     "pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -35661,6 +45271,12 @@
       "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
       "dev": true
     },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
+      "dev": true
+    },
     "querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -35682,6 +45298,16 @@
         "safe-buffer": "^5.1.0"
       }
     },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
     "range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -35704,6 +45330,103 @@
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
+    "read-all-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
+      "integrity": "sha512-DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w==",
+      "dev": true,
+      "requires": {
+        "pinkie-promise": "^2.0.0",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "read-installed": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-3.1.5.tgz",
+      "integrity": "sha512-XxD5VDz32T6rLCFfYElTif8/lkqcs9y51Gs2r30rAfT7LUGzJWaXLrwvn6fXkDsTzGcPr7Pj8CggOxwTxl/ozQ==",
+      "dev": true,
+      "requires": {
+        "debuglog": "^1.0.1",
+        "graceful-fs": "2 || 3",
+        "read-package-json": "1",
+        "readdir-scoped-modules": "^1.0.0",
+        "semver": "2 || 3 || 4",
+        "slide": "~1.1.3",
+        "util-extend": "^1.0.1"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "3.0.12",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
+          "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "natives": "^1.1.3"
+          }
+        },
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
+          "dev": true
+        }
+      }
+    },
+    "read-package-json": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-1.3.3.tgz",
+      "integrity": "sha512-9bayCl9cbXy3AL0qXhLQ0vliEgpzUVeLegSOrde3ujTHy2W18UsJiMUXEWkjbBB4ZnJzZPVuo2vAW62j4gY7gg==",
+      "dev": true,
+      "requires": {
+        "glob": "^5.0.3",
+        "graceful-fs": "2 || 3",
+        "json-parse-helpfulerror": "^1.0.2",
+        "normalize-package-data": "^1.0.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
+          "dev": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "graceful-fs": {
+          "version": "3.0.12",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
+          "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "natives": "^1.1.3"
+          }
+        },
+        "normalize-package-data": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz",
+          "integrity": "sha512-pyPVJAzFiaioifPIsJBEoKJ9YcPHz7UhckZ7wqhBztLLCu6NozkIDrN+frzrCwjXtfunXfaMWIDtcDhnbO8fWA==",
+          "dev": true,
+          "requires": {
+            "github-url-from-git": "^1.3.0",
+            "github-url-from-username-repo": "^1.0.0",
+            "semver": "2 || 3 || 4"
+          }
+        },
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
+          "dev": true
+        }
+      }
+    },
     "read-pkg": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
@@ -35845,6 +45568,41 @@
         }
       }
     },
+    "readable-wrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz",
+      "integrity": "sha512-/8n0Mr10S+HGKFygQ42Z40JIXwafPH3A72pwmlNClThgsImV5LJJiCue5Je1asxwY082sYxq/+kTxH6nTn0w3g==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^1.1.13-1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        }
+      }
+    },
     "readdir-glob": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.1.tgz",
@@ -35854,6 +45612,18 @@
         "minimatch": "^3.0.4"
       }
     },
+    "readdir-scoped-modules": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
+      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
+      "dev": true,
+      "requires": {
+        "debuglog": "^1.0.1",
+        "dezalgo": "^1.0.0",
+        "graceful-fs": "^4.1.2",
+        "once": "^1.3.0"
+      }
+    },
     "readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -35863,6 +45633,39 @@
         "picomatch": "^2.2.1"
       }
     },
+    "readline2": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz",
+      "integrity": "sha512-qs8GGG+hLGMaDOGjd+mDglDoYcHDkjIY7z5RU0/ApsGT0qypyrWskNeemUqD+UxIXiZoMYT5aLwGp4ehoyZhIg==",
+      "dev": true,
+      "requires": {
+        "mute-stream": "0.0.4",
+        "strip-ansi": "^2.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+          "integrity": "sha512-q5i8bFLg2wDfsuR56c1NzlJFPzVD+9mxhDrhqOGigEFa87OZHlF+9dWeGWzVTP/0ECiA/JUGzfzRr2t3eYORRw==",
+          "dev": true
+        },
+        "mute-stream": {
+          "version": "0.0.4",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
+          "integrity": "sha512-amvrY4m/7oZamehMoFi1tbwU/kXbVvRTGM2S7F+PZi3n51Jx+9AcSQ3EQsag3tR+hS2higfgOP/Kl8kri/X52A==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+          "integrity": "sha512-2h8q2CP3EeOhDJ+jd932PRMpa3/pOJFGoF22J1U/DNbEK2gSW2DqeF46VjCXsSQXhC+k/l8/gaaRBQKL6hUPfQ==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^1.0.0"
+          }
+        }
+      }
+    },
     "rechoir": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -35892,6 +45695,16 @@
         }
       }
     },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==",
+      "dev": true,
+      "requires": {
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
+      }
+    },
     "regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -36191,6 +46004,15 @@
         }
       }
     },
+    "request-progress": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
+      "integrity": "sha512-+IAgzH8yWAEgHjOOQzYEqRm0BpNlE6xFgsziGMiTxxMhrkBcCOe9bNWH7bDR+XtHToUMgCZlDgLqjk6cAP/+Ig==",
+      "dev": true,
+      "requires": {
+        "throttleit": "~0.0.2"
+      }
+    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -36209,6 +46031,15 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
+    "requizzle": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz",
+      "integrity": "sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
     "resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -36256,6 +46087,12 @@
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
+    "response-stream": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/response-stream/-/response-stream-0.0.0.tgz",
+      "integrity": "sha512-tWH3QWqkXv7AgYRXidIhPKO1SqPix2E0gM3x/vxf60LHQHWNS8AVrB3RnYexPAoo5dOc0bGzDlUgtsBvV3CWLA==",
+      "dev": true
+    },
     "responselike": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
@@ -36298,12 +46135,36 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
+    "rewire": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/rewire/-/rewire-2.5.2.tgz",
+      "integrity": "sha512-9wOlgRHTOzUv5dQO2XD2qWob+7yi/QXh7SSwLJW5wMAkAdkYuaCtcPuLAXUTllK0MjSvtpxUqAWMuSrrdt9VNw==",
+      "dev": true
+    },
     "rfdc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
       "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
       "dev": true
     },
+    "rfile": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz",
+      "integrity": "sha512-aNeTpY8g6DYmqPvakau22B0SipQTskO8FtYXzn8qg4X4bN9ExIH8VAhq/L9w7N8HvESYeSSwk3e4GmW+rLLAxQ==",
+      "dev": true,
+      "requires": {
+        "callsite": "~1.0.0",
+        "resolve": "~0.3.0"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz",
+          "integrity": "sha512-mxx/I/wLjxtryDBtrrb0ZNzaYERVWaHpJ0W0Arm8N4l8b+jiX/U5yKcsj0zQpF9UuKN1uz80EUTOudON6OPuaQ==",
+          "dev": true
+        }
+      }
+    },
     "rgb2hex": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.2.5.tgz",
@@ -36319,12 +46180,68 @@
         "glob": "^7.1.3"
       }
     },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "ruglify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz",
+      "integrity": "sha512-XfRj1YJdm/gnZNvmpQ5L+2YGRHglDGMPgJRbitgCxC3GzKVQF/t+ij1aNcNg2AnEXGtLHJDwoSWrAq3TUm0EVg==",
+      "dev": true,
+      "requires": {
+        "rfile": "~1.0",
+        "uglify-js": "~2.2"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        },
+        "uglify-js": {
+          "version": "2.2.5",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz",
+          "integrity": "sha512-viLk+/8G0zm2aKt1JJAVcz5J/5ytdiNaIsKgrre3yvSUjwVG6ZUujGH7E2TiPigZUwLYCe7eaIUEP2Zka2VJPA==",
+          "dev": true,
+          "requires": {
+            "optimist": "~0.3.5",
+            "source-map": "~0.1.7"
+          }
+        }
+      }
+    },
     "run-async": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
       "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
       "dev": true
     },
+    "rust-result": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rust-result/-/rust-result-1.0.0.tgz",
+      "integrity": "sha512-6cJzSBU+J/RJCF063onnQf0cDUOHs9uZI1oroSGnHOph+CQTIJ5Pp2hK5kEQq1+7yE/EEWfulSNXAQ2jikPthA==",
+      "dev": true,
+      "requires": {
+        "individual": "^2.0.0"
+      }
+    },
+    "rx": {
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz",
+      "integrity": "sha512-u5qvfulb7NXoY/+OE28920WEgFi6aiDjf5iF9rA2f9tBXejLgTLd0WxkclvIQWjFFHfNJlb7pSTsrjgiDh+Uug==",
+      "dev": true
+    },
     "rxjs": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
@@ -36414,6 +46331,17 @@
         }
       }
     },
+    "script-injector": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/script-injector/-/script-injector-0.1.7.tgz",
+      "integrity": "sha512-0iW1D9UKsOPNUVBHvR76KePNS5TamEBN38bT5k7BqsXItsyV5oJTZbVsvOF3YS2xJ7GB7pszmgfDFJbIgHmrDQ==",
+      "dev": true,
+      "requires": {
+        "duplexer": "~0.1.1",
+        "through": "~2.3.4",
+        "trumpet": "~1.6.3"
+      }
+    },
     "semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -36623,6 +46551,32 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shallow-copy": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
+      "integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw==",
+      "dev": true
+    },
+    "shasum": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
+      "integrity": "sha512-UTzHm/+AzKfO9RgPgRpDIuMSNie1ubXRaljjlhFMNGYoG7z+rm9AHLPMf70R7887xboDH9Q+5YQbWKObFHEAtw==",
+      "dev": true,
+      "requires": {
+        "json-stable-stringify": "~0.0.0",
+        "sha.js": "~2.4.4"
+      }
+    },
     "shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -36638,6 +46592,35 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
+    "shell-quote": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz",
+      "integrity": "sha512-uEWz7wa9vnCi9w4mvKZMgbHFk3DCKjLQlZcy0tJxUH4NwZjRrPPHXAYIEt2TmJs600Dcgj0Z3fZLZKVPVdGNbQ==",
+      "dev": true
+    },
+    "shelljs": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
+      "integrity": "sha512-Ny0KN4dyT8ZSCE0frtcbAJGoM/HTArpyPkeli1/00aYfm0sbD/Gk/4x7N2DP9QKGpBsiQH7n6rpm1L79RtviEQ==",
+      "dev": true
+    },
+    "shelljs-nodecli": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shelljs-nodecli/-/shelljs-nodecli-0.1.1.tgz",
+      "integrity": "sha512-/e+APCWKKW9A8YMHKgDzhWQ21zPuDLjn6ATBczxbp6uUeiCSwvw95ynKAjMsRd1yrd5dlCkMKJoc/Lpwrt2w+A==",
+      "dev": true,
+      "requires": {
+        "shelljs": "~0.2"
+      },
+      "dependencies": {
+        "shelljs": {
+          "version": "0.2.6",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
+          "integrity": "sha512-LQiM15qPbSyzHDFfI4v7EVhjBXG5PUAKWVBnVMBXwdlQSHZtzKYeKGzDHBIqpenPrCsPWqBSOF5o7oSvSfX+CA==",
+          "dev": true
+        }
+      }
+    },
     "side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -36649,6 +46632,12 @@
         "object-inspect": "^1.9.0"
       }
     },
+    "sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==",
+      "dev": true
+    },
     "signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -36747,6 +46736,12 @@
         }
       }
     },
+    "slide": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
+      "integrity": "sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==",
+      "dev": true
+    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -36922,6 +46917,16 @@
         }
       }
     },
+    "sntp": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+      "integrity": "sha512-bDLrKa/ywz65gCl+LmOiIhteP1bhEsAAzhfMedPoiHP3dyYnAevlaJshdqb9Yu0sRifyP/fRqSt8t+5qGIWlGQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "hoek": "0.9.x"
+      }
+    },
     "socket.io": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
@@ -37087,6 +47092,23 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "sse-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/sse-stream/-/sse-stream-0.0.4.tgz",
+      "integrity": "sha512-rnDUubW7a4CZAB5D0r2OtFU/zvY05MoNGHMX6deAYK0wWaizrNcHzimf+Nk5y0sqntGAPpWEnIopWrrAf2TBVg==",
+      "dev": true,
+      "requires": {
+        "through": "~2.2.7"
+      },
+      "dependencies": {
+        "through": {
+          "version": "2.2.7",
+          "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
+          "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
+          "dev": true
+        }
+      }
+    },
     "sshpk": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
@@ -37210,6 +47232,42 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
     },
+    "stream-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz",
+      "integrity": "sha512-e+V5xc4LlkOiRr64kZTUdb11exsbpSnwb9uwmXaHeDXCpfHg7vaefMJOxi21Pe74ZOqjZ87blBcqqpNAM4Ku0g==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^1.0.27-1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        }
+      }
+    },
     "stream-buffers": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
@@ -37225,6 +47283,81 @@
         "duplexer": "~0.1.1"
       }
     },
+    "stream-combiner2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
+      "integrity": "sha512-7DO1SfBVnyIyo9ytUjSyVojT5bp1ZY6h3pj7HUs6PwcRSd/r8mBOHbRwYC7nbHRakKzMKyNp5HWJRv4GgVherA==",
+      "dev": true,
+      "requires": {
+        "duplexer2": "~0.0.2",
+        "through2": "~0.5.1"
+      },
+      "dependencies": {
+        "duplexer2": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+          "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~1.1.9"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        },
+        "through2": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+          "integrity": "sha512-zexCrAOTbjkBCXGyozn7hhS3aEaqdrc59mAD2E3dKYzV1vFuEGQ1hEDJN2oQMQFwy4he2zyLqPZV+AlfS8ZWJA==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~1.0.17",
+            "xtend": "~3.0.0"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.34",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+              "dev": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.1",
+                "isarray": "0.0.1",
+                "string_decoder": "~0.10.x"
+              }
+            }
+          }
+        },
+        "xtend": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+          "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
+          "dev": true
+        }
+      }
+    },
     "stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
@@ -37237,6 +47370,56 @@
       "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
       "dev": true
     },
+    "stream-splicer": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz",
+      "integrity": "sha512-nmUMEbdm/sZYqe9dZs7mqJvTYpunsDbIWI5FiBCMc/hMVd6vwzy+ITmo7C3gcLYqrn+uQ1w+EJwooWvJ997JAA==",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1",
+        "inherits": "^2.0.1",
+        "isarray": "~0.0.1",
+        "readable-stream": "^1.1.13-1",
+        "readable-wrap": "^1.0.0",
+        "through2": "^1.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        },
+        "through2": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": ">=1.1.13-1 <1.2.0-0",
+            "xtend": ">=4.0.0 <4.1.0-0"
+          }
+        }
+      }
+    },
     "streamroller": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.4.tgz",
@@ -37312,6 +47495,13 @@
         "character-entities-legacy": "^3.0.0"
       }
     },
+    "stringstream": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
+      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
+      "dev": true,
+      "optional": true
+    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -37339,12 +47529,30 @@
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==",
+      "dev": true,
+      "requires": {
+        "get-stdin": "^4.0.1"
+      }
+    },
     "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
+      "integrity": "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg==",
       "dev": true
     },
+    "subarg": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+      "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.1.0"
+      }
+    },
     "suffix": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
@@ -37375,6 +47583,15 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "syntax-error": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
+      "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
+      "dev": true,
+      "requires": {
+        "acorn-node": "^1.2.0"
+      }
+    },
     "table": {
       "version": "6.8.0",
       "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
@@ -37408,6 +47625,12 @@
         }
       }
     },
+    "taffydb": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
+      "integrity": "sha512-y3JaeRSplks6NYQuCOj3ZFMO3j60rTwbuKCvZxsAraGYH2epusatvZ0baZYA01WsGqJBq/Dl6vOrMUJqyMj8kA==",
+      "dev": true
+    },
     "tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -37596,6 +47819,12 @@
       "integrity": "sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==",
       "dev": true
     },
+    "throttleit": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
+      "integrity": "sha512-HtlTFeyYs1elDM2txiIGsdXHaq8kffVaZH/QEBRbo95zQqzlsBx5ELKhkPOZVad9OK9oxzwx6UrQN8Vfh/+yag==",
+      "dev": true
+    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -37652,6 +47881,21 @@
       "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
       "dev": true
     },
+    "timed-out": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz",
+      "integrity": "sha512-pqqJOi1rF5zNs/ps4vmbE4SFCrM4iR7LW+GHAsHqO/EumqbIWceioevYLM5xZRgQSH6gFgL9J/uB7EcJhQ9niQ==",
+      "dev": true
+    },
+    "timers-browserify": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
+      "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==",
+      "dev": true,
+      "requires": {
+        "process": "~0.11.0"
+      }
+    },
     "timers-ext": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
@@ -37716,6 +47960,12 @@
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
     },
+    "to-iso-string": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz",
+      "integrity": "sha512-oeHLgfWA7d0CPQa6h0+i5DAJZISz5un0d5SHPkw+Untclcvzv9T+AC3CvGXlZJdOlIbxbTfyyzlqCXc5hjpXYg==",
+      "dev": true
+    },
     "to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -37825,12 +48075,24 @@
       "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
       "dev": true
     },
+    "treeify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.0.1.tgz",
+      "integrity": "sha512-i3MKN4nGEOuVAcd7s5MtAc2+QBExwcaRT/6/CzUSYVYwzM58bJ3H3wwCPu2PEAGjVPHjfIC/MPaXsxPGUk07cg==",
+      "dev": true
+    },
     "trim-lines": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
       "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
       "dev": true
     },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
+      "dev": true
+    },
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
@@ -37843,6 +48105,65 @@
       "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
       "dev": true
     },
+    "trumpet": {
+      "version": "1.6.6",
+      "resolved": "https://registry.npmjs.org/trumpet/-/trumpet-1.6.6.tgz",
+      "integrity": "sha512-A4cn/zuq0AsxS5M8cD+7GUoIhOoK2qkcpFUwlpHnNOsTPzCq7FITZV9lg95ydupJcQRi/kFQzGIn7oN3kNp10w==",
+      "dev": true,
+      "requires": {
+        "duplexer2": "~0.0.2",
+        "html-select": "^2.3.5",
+        "html-tokenize": "^1.1.1",
+        "inherits": "^2.0.0",
+        "readable-stream": "^1.0.27-1",
+        "through2": "^1.0.0"
+      },
+      "dependencies": {
+        "duplexer2": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+          "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~1.1.9"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        },
+        "through2": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": ">=1.1.13-1 <1.2.0-0",
+            "xtend": ">=4.0.0 <4.1.0-0"
+          }
+        }
+      }
+    },
     "tsconfig-paths": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.13.0.tgz",
@@ -37872,6 +48193,12 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
+    "tty-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+      "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
+      "dev": true
+    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -37929,13 +48256,6 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "typescript": {
-      "version": "4.8.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
-      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
-      "dev": true,
-      "peer": true
-    },
     "typescript-compare": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
@@ -37963,6 +48283,12 @@
       "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==",
       "dev": true
     },
+    "uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "dev": true
+    },
     "uglify-js": {
       "version": "3.15.2",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz",
@@ -37970,6 +48296,77 @@
       "dev": true,
       "optional": true
     },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
+      "dev": true
+    },
+    "umd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/umd/-/umd-2.1.0.tgz",
+      "integrity": "sha512-mEAJeceExHnblcAwN3BQtDPYOrTy4ALeBh6nQ9KW0cUCd0UU714jAfil2jvq09b67IizwJIiTVFOjE+/52Dyvw==",
+      "dev": true,
+      "requires": {
+        "rfile": "~1.0.0",
+        "ruglify": "~1.0.0",
+        "through": "~2.3.4",
+        "uglify-js": "~2.4.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.2.10",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+          "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.1.34",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+          "integrity": "sha512-yfCwDj0vR9RTwt3pEzglgb3ZgmcXHt6DjG3bjJvzPwTL+5zDQ2MhmSzAcTy0GTiQuCiriSWXvWM1/NhKdXuoQA==",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        },
+        "uglify-js": {
+          "version": "2.4.24",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz",
+          "integrity": "sha512-tktIjwackfZLd893KGJmXc1hrRHH1vH9Po3xFh1XBjjeGAnN02xJ3SuoA+n1L29/ZaCA18KzCFlckS+vfPugiA==",
+          "dev": true,
+          "requires": {
+            "async": "~0.2.6",
+            "source-map": "0.1.34",
+            "uglify-to-browserify": "~1.0.0",
+            "yargs": "~3.5.4"
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "3.5.4",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
+          "integrity": "sha512-5j382E4xQSs71p/xZQsU1PtRA2HXPAjX0E0DkoGLxwNASMOKX6A9doV1NrZmj85u2Pjquz402qonBzz/yLPbPA==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^1.0.2",
+            "decamelize": "^1.0.0",
+            "window-size": "0.1.0",
+            "wordwrap": "0.0.2"
+          }
+        }
+      }
+    },
     "unbox-primitive": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
@@ -37998,6 +48395,18 @@
       "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
       "dev": true
     },
+    "underscore": {
+      "version": "1.13.6",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
+      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
+      "dev": true
+    },
+    "underscore.string": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz",
+      "integrity": "sha512-yxkabuCaIBnzfIvX3kBxQqCs0ar/bfJwDnFEHJUm/ZrRVhT3IItdRF5cZjARLzEnyQYtIUhsZ2LG2j3HidFOFQ==",
+      "dev": true
+    },
     "undertaker": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
@@ -38291,12 +48700,24 @@
         "requires-port": "^1.0.0"
       }
     },
+    "url-toolkit": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.5.tgz",
+      "integrity": "sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==",
+      "dev": true
+    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
+    "user-home": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+      "integrity": "sha512-aggiKfEEubv3UwRNqTzLInZpAOmKzwdHqEBmW/hBA/mt99eg+b4VrX6i+IRLxU8+WJYfa33rGwRseg4eElUgsQ==",
+      "dev": true
+    },
     "util": {
       "version": "0.12.4",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
@@ -38317,6 +48738,12 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
+    "util-extend": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz",
+      "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==",
+      "dev": true
+    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -38483,6 +48910,87 @@
         "vfile-message": "^3.0.0"
       }
     },
+    "video.js": {
+      "version": "7.20.2",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.20.2.tgz",
+      "integrity": "sha512-hdvAHKAyaL6bCDkeu0pPtFYKi1EDaOUovm7FN1xqBDolUxgH8FKy1WIgTS+Ouuaw7R54SCTcSeXjZEizhy9ouQ==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@videojs/http-streaming": "2.14.2",
+        "@videojs/vhs-utils": "^3.0.4",
+        "@videojs/xhr": "2.6.0",
+        "aes-decrypter": "3.1.3",
+        "global": "^4.4.0",
+        "keycode": "^2.2.0",
+        "m3u8-parser": "4.7.1",
+        "mpd-parser": "0.21.1",
+        "mux.js": "6.0.1",
+        "safe-json-parse": "4.0.0",
+        "videojs-font": "3.2.0",
+        "videojs-vtt.js": "^0.15.3"
+      },
+      "dependencies": {
+        "safe-json-parse": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-4.0.0.tgz",
+          "integrity": "sha512-RjZPPHugjK0TOzFrLZ8inw44s9bKox99/0AZW9o/BEQVrJfhI+fIHMErnPyRa89/yRXUUr93q+tiN6zhoVV4wQ==",
+          "dev": true,
+          "requires": {
+            "rust-result": "^1.0.0"
+          }
+        }
+      }
+    },
+    "videojs-contrib-ads": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/videojs-contrib-ads/-/videojs-contrib-ads-6.9.0.tgz",
+      "integrity": "sha512-nzKz+jhCGMTYffSNVYrmp9p70s05v6jUMOY3Z7DpVk3iFrWK4Zi/BIkokDWrMoHpKjdmCdKzfJVBT+CrUj6Spw==",
+      "dev": true,
+      "requires": {
+        "global": "^4.3.2",
+        "video.js": "^6 || ^7"
+      }
+    },
+    "videojs-font": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz",
+      "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==",
+      "dev": true
+    },
+    "videojs-ima": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/videojs-ima/-/videojs-ima-1.11.0.tgz",
+      "integrity": "sha512-ZRoWuGyJ75zamwZgpr0i/gZ6q7Evda/Q6R46gpW88WN7u0ORU7apw/lM1MSG4c3YDXW8LDENgzMAvMZUdifWhg==",
+      "dev": true,
+      "requires": {
+        "@hapi/cryptiles": "^5.1.0",
+        "can-autoplay": "^3.0.0",
+        "extend": ">=3.0.2",
+        "lodash": ">=4.17.19",
+        "lodash.template": ">=4.5.0",
+        "videojs-contrib-ads": "^6.6.5"
+      }
+    },
+    "videojs-playlist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/videojs-playlist/-/videojs-playlist-5.0.0.tgz",
+      "integrity": "sha512-TM9bytwKqkE05wdWPEKDpkwMGhS/VgMCIsEuNxmX1J1JO9zaTIl4Wm3egf5j1dhIw19oWrqGUV/nK0YNIelCpA==",
+      "dev": true,
+      "requires": {
+        "global": "^4.3.2",
+        "video.js": "^6 || ^7"
+      }
+    },
+    "videojs-vtt.js": {
+      "version": "0.15.4",
+      "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz",
+      "integrity": "sha512-r6IhM325fcLb1D6pgsMkTQT1PpFdUdYZa1iqk7wJEu+QlibBwATPfPc9Bg8Jiym0GE5yP1AG2rMLu+QMVWkYtA==",
+      "dev": true,
+      "requires": {
+        "global": "^4.3.1"
+      }
+    },
     "vinyl": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
@@ -38577,6 +49085,15 @@
         "source-map": "^0.5.1"
       }
     },
+    "vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha512-NyZNR3WDah+NPkjh/YmhuWSsT4a0mF0BJYgUmvrJ70zxjTXh5Y2Asobxlh0Nfs0PCFB5FVpRJft7NozAWFMwLQ==",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1"
+      }
+    },
     "void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
@@ -38999,6 +49516,12 @@
         "is-typed-array": "^1.1.7"
       }
     },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
+      "dev": true
+    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -39087,6 +49610,18 @@
       "dev": true,
       "requires": {}
     },
+    "xml-escape": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.0.0.tgz",
+      "integrity": "sha512-gCT82WbwOT9SBI/94j5i0tqHpjHIP/0kP11BS8s2wcBtdcFsDNLS9sLvA+C55fD3hpGhgnE/r7hfeBFkiMATjw==",
+      "dev": true
+    },
+    "xmlcreate": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
+      "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
+      "dev": true
+    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
diff --git a/package.json b/package.json
index a463546efa1..c5f1b1861a0 100644
--- a/package.json
+++ b/package.json
@@ -105,6 +105,10 @@
     "through2": "^4.0.2",
     "url": "^0.11.0",
     "url-parse": "^1.0.5",
+    "video.js": "^7.17.0",
+    "videojs-contrib-ads": "^6.9.0",
+    "videojs-ima": "^1.11.0",
+    "videojs-playlist": "^5.0.0",
     "webdriverio": "^7.6.1",
     "webpack": "^5.70.0",
     "webpack-bundle-analyzer": "^4.5.0",
diff --git a/src/events.js b/src/events.js
index e675ffef7a9..8e6117c3abf 100644
--- a/src/events.js
+++ b/src/events.js
@@ -133,6 +133,10 @@ const _public = (function () {
     return _handlers;
   };
 
+  _public.addEvents = function (events) {
+    allEvents = allEvents.concat(events);
+  }
+
   /**
    * This method can return a copy of all the events fired
    * @return {Array} array of events fired
@@ -152,4 +156,4 @@ const _public = (function () {
 
 utils._setEventEmitter(_public.emit.bind(_public));
 
-export const {on, off, get, getEvents, emit} = _public;
+export const {on, off, get, getEvents, emit, addEvents} = _public;
diff --git a/src/prebid.js b/src/prebid.js
index a0981cd387a..0378f8c27ed 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -485,86 +485,99 @@ $$PREBID_GLOBAL$$.renderAd = hook('async', function (doc, id, options) {
   logInfo('Invoking $$PREBID_GLOBAL$$.renderAd', arguments);
   logMessage('Calling renderAd with adId :' + id);
 
-  if (doc && id) {
-    try {
-      // lookup ad by ad Id
-      const bid = auctionManager.findBidByAdId(id);
-
-      if (bid) {
-        let shouldRender = true;
-        if (bid && bid.status === CONSTANTS.BID_STATUS.RENDERED) {
-          logWarn(`Ad id ${bid.adId} has been rendered before`);
-          events.emit(STALE_RENDER, bid);
-          if (deepAccess(config.getConfig('auctionOptions'), 'suppressStaleRender')) {
-            shouldRender = false;
-          }
-        }
-
-        if (shouldRender) {
-          // replace macros according to openRTB with price paid = bid.cpm
-          bid.ad = replaceAuctionPrice(bid.ad, bid.originalCpm || bid.cpm);
-          bid.adUrl = replaceAuctionPrice(bid.adUrl, bid.originalCpm || bid.cpm);
-          // replacing clickthrough if submitted
-          if (options && options.clickThrough) {
-            const {clickThrough} = options;
-            bid.ad = replaceClickThrough(bid.ad, clickThrough);
-            bid.adUrl = replaceClickThrough(bid.adUrl, clickThrough);
-          }
-
-          // save winning bids
-          auctionManager.addWinningBid(bid);
-
-          // emit 'bid won' event here
-          events.emit(BID_WON, bid);
-
-          const {height, width, ad, mediaType, adUrl, renderer} = bid;
-
-          const creativeComment = document.createComment(`Creative ${bid.creativeId} served by ${bid.bidder} Prebid.js Header Bidding`);
-          insertElement(creativeComment, doc, 'html');
-
-          if (isRendererRequired(renderer)) {
-            executeRenderer(renderer, bid, doc);
-            reinjectNodeIfRemoved(creativeComment, doc, 'html');
-            emitAdRenderSucceeded({ doc, bid, id });
-          } else if ((doc === document && !inIframe()) || mediaType === 'video') {
-            const message = `Error trying to write ad. Ad render call ad id ${id} was prevented from writing to the main document.`;
-            emitAdRenderFail({reason: PREVENT_WRITING_ON_MAIN_DOCUMENT, message, bid, id});
-          } else if (ad) {
-            doc.write(ad);
-            doc.close();
-            setRenderSize(doc, width, height);
-            reinjectNodeIfRemoved(creativeComment, doc, 'html');
-            callBurl(bid);
-            emitAdRenderSucceeded({ doc, bid, id });
-          } else if (adUrl) {
-            const iframe = createInvisibleIframe();
-            iframe.height = height;
-            iframe.width = width;
-            iframe.style.display = 'inline';
-            iframe.style.overflow = 'hidden';
-            iframe.src = adUrl;
-
-            insertElement(iframe, doc, 'body');
-            setRenderSize(doc, width, height);
-            reinjectNodeIfRemoved(creativeComment, doc, 'html');
-            callBurl(bid);
-            emitAdRenderSucceeded({ doc, bid, id });
-          } else {
-            const message = `Error trying to write ad. No ad for bid response id: ${id}`;
-            emitAdRenderFail({reason: NO_AD, message, bid, id});
-          }
-        }
-      } else {
-        const message = `Error trying to write ad. Cannot find ad by given id : ${id}`;
-        emitAdRenderFail({ reason: CANNOT_FIND_AD, message, id });
+  if (!id) {
+    const message = `Error trying to write ad Id :${id} to the page. Missing adId`;
+    emitAdRenderFail({ reason: MISSING_DOC_OR_ADID, message, id });
+    return;
+  }
+
+  try {
+    // lookup ad by ad Id
+    const bid = auctionManager.findBidByAdId(id);
+    if (!bid) {
+      const message = `Error trying to write ad. Cannot find ad by given id : ${id}`;
+      emitAdRenderFail({ reason: CANNOT_FIND_AD, message, id });
+      return;
+    }
+
+    if (bid.status === CONSTANTS.BID_STATUS.RENDERED) {
+      logWarn(`Ad id ${bid.adId} has been rendered before`);
+      events.emit(STALE_RENDER, bid);
+      if (deepAccess(config.getConfig('auctionOptions'), 'suppressStaleRender')) {
+        return;
       }
-    } catch (e) {
-      const message = `Error trying to write ad Id :${id} to the page:${e.message}`;
-      emitAdRenderFail({ reason: EXCEPTION, message, id });
     }
-  } else {
-    const message = `Error trying to write ad Id :${id} to the page. Missing document or adId`;
-    emitAdRenderFail({ reason: MISSING_DOC_OR_ADID, message, id });
+
+    // replace macros according to openRTB with price paid = bid.cpm
+    bid.ad = replaceAuctionPrice(bid.ad, bid.originalCpm || bid.cpm);
+    bid.adUrl = replaceAuctionPrice(bid.adUrl, bid.originalCpm || bid.cpm);
+    // replacing clickthrough if submitted
+    if (options && options.clickThrough) {
+      const {clickThrough} = options;
+      bid.ad = replaceClickThrough(bid.ad, clickThrough);
+      bid.adUrl = replaceClickThrough(bid.adUrl, clickThrough);
+    }
+
+    // save winning bids
+    auctionManager.addWinningBid(bid);
+
+    // emit 'bid won' event here
+    events.emit(BID_WON, bid);
+
+    const {height, width, ad, mediaType, adUrl, renderer} = bid;
+
+    // video module
+    const adUnitCode = bid.adUnitCode;
+    const adUnit = $$PREBID_GLOBAL$$.adUnits.filter(adUnit => adUnit.code === adUnitCode);
+    const videoModule = $$PREBID_GLOBAL$$.videoModule;
+    if (adUnit.video && videoModule) {
+      videoModule.renderBid(adUnit.video.divId, bid);
+      return;
+    }
+
+    if (!doc) {
+      const message = `Error trying to write ad Id :${id} to the page. Missing document`;
+      emitAdRenderFail({ reason: MISSING_DOC_OR_ADID, message, id });
+      return;
+    }
+
+    const creativeComment = document.createComment(`Creative ${bid.creativeId} served by ${bid.bidder} Prebid.js Header Bidding`);
+    insertElement(creativeComment, doc, 'html');
+
+    if (isRendererRequired(renderer)) {
+      executeRenderer(renderer, bid, doc);
+      reinjectNodeIfRemoved(creativeComment, doc, 'html');
+      emitAdRenderSucceeded({ doc, bid, id });
+    } else if ((doc === document && !inIframe()) || mediaType === 'video') {
+      const message = `Error trying to write ad. Ad render call ad id ${id} was prevented from writing to the main document.`;
+      emitAdRenderFail({reason: PREVENT_WRITING_ON_MAIN_DOCUMENT, message, bid, id});
+    } else if (ad) {
+      doc.write(ad);
+      doc.close();
+      setRenderSize(doc, width, height);
+      reinjectNodeIfRemoved(creativeComment, doc, 'html');
+      callBurl(bid);
+      emitAdRenderSucceeded({ doc, bid, id });
+    } else if (adUrl) {
+      const iframe = createInvisibleIframe();
+      iframe.height = height;
+      iframe.width = width;
+      iframe.style.display = 'inline';
+      iframe.style.overflow = 'hidden';
+      iframe.src = adUrl;
+
+      insertElement(iframe, doc, 'body');
+      setRenderSize(doc, width, height);
+      reinjectNodeIfRemoved(creativeComment, doc, 'html');
+      callBurl(bid);
+      emitAdRenderSucceeded({ doc, bid, id });
+    } else {
+      const message = `Error trying to write ad. No ad for bid response id: ${id}`;
+      emitAdRenderFail({reason: NO_AD, message, bid, id});
+    }
+  } catch (e) {
+    const message = `Error trying to write ad Id :${id} to the page:${e.message}`;
+    emitAdRenderFail({ reason: EXCEPTION, message, id });
   }
 });
 
diff --git a/test/spec/modules/videoModule/coreVideo_spec.js b/test/spec/modules/videoModule/coreVideo_spec.js
new file mode 100644
index 00000000000..17c6e3811e0
--- /dev/null
+++ b/test/spec/modules/videoModule/coreVideo_spec.js
@@ -0,0 +1,98 @@
+import { expect } from 'chai';
+import { VideoCore } from 'modules/videoModule/coreVideo.js';
+
+describe('Video Core', function () {
+  const mockSubmodule = {
+    getOrtbVideo: sinon.spy(),
+    getOrtbContent: sinon.spy(),
+    setAdTagUrl: sinon.spy(),
+    onEvent: sinon.spy(),
+    offEvent: sinon.spy(),
+  };
+
+  const otherSubmodule = {
+    getOrtbVideo: () => {},
+    getOrtbContent: () => {},
+    setAdTagUrl: () => {},
+    onEvent: () => {},
+    offEvent: () => {},
+  };
+
+  const testId = 'test_id';
+  const testVendorCode = 0;
+  const otherId = 'other_id';
+  const otherVendorCode = 1;
+
+  const parentModuleMock = {
+    registerSubmodule: sinon.spy(),
+    getSubmodule: sinon.spy(id => {
+      if (id === testId) {
+        return mockSubmodule;
+      } else if (id === otherId) {
+        return otherSubmodule;
+      }
+    })
+  };
+
+  const videoCore = VideoCore(parentModuleMock);
+
+  videoCore.registerProvider({
+    vendorCode: testVendorCode,
+    divId: testId
+  });
+
+  videoCore.registerProvider({
+    vendorCode: otherVendorCode,
+    divId: otherId
+  });
+
+  describe('registerProvider', function () {
+    it('should delegate the registration to the Parent Module', function () {
+      expect(parentModuleMock.registerSubmodule.calledTwice).to.be.true;
+      expect(parentModuleMock.registerSubmodule.args[0][0]).to.be.equal(testId);
+      expect(parentModuleMock.registerSubmodule.args[1][0]).to.be.equal(otherId);
+      expect(parentModuleMock.registerSubmodule.args[0][1]).to.be.equal(testVendorCode);
+      expect(parentModuleMock.registerSubmodule.args[1][1]).to.be.equal(otherVendorCode);
+    });
+  });
+
+  describe('getOrtbVideo', function () {
+    it('delegates to the submodule of the right divId', function () {
+      videoCore.getOrtbVideo(testId);
+      videoCore.getOrtbVideo(otherId);
+      expect(mockSubmodule.getOrtbVideo.calledOnce).to.be.true;
+    });
+  });
+
+  describe('getOrtbContent', function () {
+    it('delegates to the submodule of the right divId', function () {
+      videoCore.getOrtbContent(testId);
+      videoCore.getOrtbContent(otherId);
+      expect(mockSubmodule.getOrtbContent.calledOnce).to.be.true;
+    });
+  });
+
+  describe('setAdTagUrl', function () {
+    it('delegates to the submodule of the right divId', function () {
+      videoCore.setAdTagUrl('', testId);
+      videoCore.setAdTagUrl('', otherId);
+      expect(mockSubmodule.setAdTagUrl.calledOnce).to.be.true;
+    });
+  });
+
+  describe('onEvents', function () {
+    it('delegates to the submodule of the right divId', function () {
+      videoCore.onEvents(['event'], () => {}, testId);
+      videoCore.onEvents(['event'], () => {}, otherId);
+      expect(mockSubmodule.onEvent.calledOnce).to.be.true;
+    });
+  });
+
+  describe('offEvents', function () {
+    it('delegates to the submodule of the right divId', function () {
+      videoCore.offEvents(['event'], () => {}, testId);
+      videoCore.offEvents(['event'], () => {}, otherId);
+      expect(mockSubmodule.offEvent.calledOnce).to.be.true;
+    });
+  });
+});
diff --git a/test/spec/modules/videoModule/pbVideo_spec.js b/test/spec/modules/videoModule/pbVideo_spec.js
new file mode 100644
index 00000000000..cfd34ebd706
--- /dev/null
+++ b/test/spec/modules/videoModule/pbVideo_spec.js
@@ -0,0 +1,362 @@
+import { expect } from 'chai';
+import { PbVideo } from 'modules/videoModule';
+import CONSTANTS from 'src/constants.json';
+
+let ortbVideoMock;
+let ortbContentMock;
+let videoCoreMock;
+let getConfigMock;
+let requestBidsMock;
+let pbGlobalMock;
+let pbEventsMock;
+let videoEventsMock;
+let gamSubmoduleMock;
+let gamSubmoduleFactoryMock;
+let videoImpressionVerifierFactoryMock;
+let videoImpressionVerifierMock;
+
+function resetTestVars() {
+  ortbVideoMock = {};
+  ortbContentMock = {};
+  videoCoreMock = {
+    registerProvider: sinon.spy(),
+    onEvents: sinon.spy(),
+    getOrtbVideo: () => ortbVideoMock,
+    getOrtbContent: () => ortbContentMock,
+    setAdTagUrl: sinon.spy()
+  };
+  getConfigMock = () => {};
+  requestBidsMock = {
+    before: sinon.spy()
+  };
+  pbGlobalMock = {
+    requestBids: requestBidsMock,
+    getHighestCpmBids: sinon.spy(),
+    getBidResponsesForAdUnitCode: sinon.spy(),
+    setConfig: sinon.spy(),
+    getConfig: () => ({}),
+    markWinningBidAsUsed: sinon.spy()
+  };
+  pbEventsMock = {
+    emit: sinon.spy(),
+    on: sinon.spy()
+  };
+  videoEventsMock = [];
+  gamSubmoduleMock = {
+    getAdTagUrl: sinon.spy()
+  };
+
+  gamSubmoduleFactoryMock = sinon.spy(() => gamSubmoduleMock);
+
+  videoImpressionVerifierMock = {
+    trackBid: sinon.spy(),
+    getBidIdentifiers: sinon.spy()
+  };
+
+  videoImpressionVerifierFactoryMock = () => videoImpressionVerifierMock;
+}
+
+let pbVideoFactory = (videoCore, getConfig, pbGlobal, pbEvents, videoEvents, gamSubmoduleFactory, videoImpressionVerifierFactory) => {
+  const pbVideo = PbVideo(
+    videoCore || videoCoreMock,
+    getConfig || getConfigMock,
+    pbGlobal || pbGlobalMock,
+    pbEvents || pbEventsMock,
+    videoEvents || videoEventsMock,
+    gamSubmoduleFactory || gamSubmoduleFactoryMock,
+    videoImpressionVerifierFactory || videoImpressionVerifierFactoryMock
+  );
+  pbVideo.init();
+  return pbVideo;
+}
+
+describe('Prebid Video', function () {
+  beforeEach(() => resetTestVars());
+
+  describe('Setting video to config', function () {
+    let providers = [{ divId: 'div1' }, { divId: 'div2' }];
+    let getConfigCallback;
+    let getConfig = (propertyName, callback) => {
+      if (propertyName === 'video') {
+        getConfigCallback = callback;
+      }
+    };
+
+    beforeEach(() => {
+      pbVideoFactory(null, getConfig);
+      getConfigCallback({ video: { providers } });
+    });
+
+    it('Should register providers', function () {
+      expect(videoCoreMock.registerProvider.calledTwice).to.be.true;
+    });
+
+    it('Should register events', function () {
+      expect(videoCoreMock.onEvents.calledTwice).to.be.true;
+      const onEventsSpy = videoCoreMock.onEvents;
+      expect(onEventsSpy.getCall(0).args[2]).to.be.equal('div1');
+      expect(onEventsSpy.getCall(1).args[2]).to.be.equal('div2');
+    });
+
+    describe('Event triggering', function () {
+      it('Should emit events off of Prebid\'s Events', function () {
+        let eventHandler;
+        const videoCore = Object.assign({}, videoCoreMock, {
+          onEvents: (events, eventHandler_) => eventHandler = eventHandler_
+        });
+        pbVideoFactory(videoCore, getConfig);
+        getConfigCallback({ video: { providers } });
+        const expectedType = 'test_event';
+        const expectedPayload = {'test': 'data'};
+        eventHandler(expectedType, expectedPayload);
+        expect(pbEventsMock.emit.calledOnce).to.be.true;
+        expect(pbEventsMock.emit.getCall(0).args[0]).to.be.equal('video' + expectedType.replace(/^./, expectedType[0].toUpperCase()));
+        expect(pbEventsMock.emit.getCall(0).args[1]).to.be.equal(expectedPayload);
+      });
+    });
+
+    describe('Ad Server configuration', function() {
+      const test_vendor_code = 5;
+      const test_params = { test: 'params' };
+      providers[0].adServer = { vendorCode: test_vendor_code, params: test_params };
+
+      it('should instantiate the GAM Submodule', function () {
+        expect(gamSubmoduleFactoryMock.calledOnce).to.be.true;
+      });
+    });
+  });
+
+  describe('Ad unit Enrichment', function () {
+    it('registers before:bidRequest hook', function () {
+      pbVideoFactory();
+      expect(requestBidsMock.before.calledOnce).to.be.true;
+    });
+
+    it('requests oRtb params and writes them to ad unit and config', function() {
+      const getOrtbVideoSpy = videoCoreMock.getOrtbVideo = sinon.spy(() => ({
+        test: 'videoTestValue'
+      }));
+      const getOrtbContentSpy = videoCoreMock.getOrtbContent = sinon.spy(() => ({
+        test: 'contentTestValue'
+      }));
+
+      let beforeBidRequestCallback;
+      const requestBids = {
+        before: callback_ => beforeBidRequestCallback = callback_
+      };
+
+      pbVideoFactory(null, null, Object.assign({}, pbGlobalMock, { requestBids }));
+      expect(beforeBidRequestCallback).to.not.be.undefined;
+      const nextFn = sinon.spy();
+      const adUnits = [{
+        code: 'ad1',
+        mediaTypes: {
+          video: {}
+        },
+        video: { divId: 'divId' }
+      }];
+      beforeBidRequestCallback(nextFn, { adUnits });
+      expect(getOrtbVideoSpy.calledOnce).to.be.true;
+      expect(getOrtbContentSpy.calledOnce).to.be.true;
+      const adUnit = adUnits[0];
+      expect(adUnit.mediaTypes.video).to.have.property('test', 'videoTestValue');
+      expect(nextFn.calledOnce).to.be.true;
+      expect(nextFn.getCall(0).args[0].ortb2).to.be.deep.equal({ site: { content: { test: 'contentTestValue' } } });
+    });
+  });
+
+  describe('Ad tag injection', function () {
+    let auctionEndCallback;
+    let providers = [{ divId: 'div1', adServer: {} }, { divId: 'div2' }];
+    let getConfig = (propertyName, callbackFn) => {
+      if (propertyName === 'video') {
+        if (callbackFn) {
+          callbackFn({ video: { providers } });
+        } else {
+          return { providers };
+        }
+      }
+    };
+
+    const pbEvents = {
+      emit: () => {},
+      on: (event, callback) => {
+        if (event === CONSTANTS.EVENTS.AUCTION_END) {
+          auctionEndCallback = callback
+        }
+      },
+      off: () => {}
+    };
+
+    const expectedVendorCode = 5;
+    const expectedAdTag = 'test_tag';
+    const expectedAdUnitCode = 'expectedAdUnitcode';
+    const expectedDivId = 'expectedDivId';
+    const expectedAdUnit = {
+      code: expectedAdUnitCode,
+      video: {
+        divId: expectedDivId,
+        adServer: {
+          vendorCode: expectedVendorCode,
+          baseAdTagUrl: expectedAdTag
+        }
+      }
+    };
+    const auctionResults = { adUnits: [ expectedAdUnit, {} ] };
+
+    beforeEach(() => {
+      gamSubmoduleMock.getAdTagUrl.resetHistory();
+      videoCoreMock.setAdTagUrl.resetHistory();
+    });
+
+    let beforeBidRequestCallback;
+    const requestBids = {
+      before: callback_ => beforeBidRequestCallback = callback_
+    };
+
+    it('should request ad tag url from adServer when configured to use adServer', function () {
+      const expectedVastUrl = 'expectedVastUrl';
+      const expectedVastXml = 'expectedVastXml';
+      const pbGlobal = Object.assign({}, pbGlobalMock, {
+        requestBids,
+        getHighestCpmBids: () => [{
+          vastUrl: expectedVastUrl,
+          vastXml: expectedVastXml
+        }, {}, {}, {}]
+      });
+      pbVideoFactory(null, getConfig, pbGlobal, pbEvents);
+
+      beforeBidRequestCallback(() => {}, {});
+      auctionEndCallback(auctionResults);
+      expect(gamSubmoduleMock.getAdTagUrl.calledOnce).to.be.true;
+      expect(gamSubmoduleMock.getAdTagUrl.getCall(0).args[0]).is.equal(expectedAdUnit);
+      expect(gamSubmoduleMock.getAdTagUrl.getCall(0).args[1]).is.equal(expectedAdTag);
+    });
+
+    it('should load ad tag when ad server returns ad tag', function () {
+      const expectedAdTag = 'resulting ad tag';
+      const gamSubmoduleFactory = () => ({
+        getAdTagUrl: () => expectedAdTag
+      });
+      const expectedVastUrl = 'expectedVastUrl';
+      const expectedVastXml = 'expectedVastXml';
+      const pbGlobal = Object.assign({}, pbGlobalMock, {
+        requestBids,
+        getHighestCpmBids: () => [{
+          vastUrl: expectedVastUrl,
+          vastXml: expectedVastXml
+        }, {}, {}, {}]
+      });
+      pbVideoFactory(null, getConfig, pbGlobal, pbEvents, null, gamSubmoduleFactory);
+      beforeBidRequestCallback(() => {}, {});
+      auctionEndCallback(auctionResults);
+      expect(videoCoreMock.setAdTagUrl.calledOnce).to.be.true;
+      expect(videoCoreMock.setAdTagUrl.args[0][0]).to.be.equal(expectedAdTag);
+      expect(videoCoreMock.setAdTagUrl.args[0][1]).to.be.equal(expectedDivId);
+      expect(videoCoreMock.setAdTagUrl.args[0][2]).to.have.property('adUnitCode', expectedAdUnitCode);
+    });
+
+    it('should load ad tag from highest bid when ad server is not configured', function () {
+      const expectedVastUrl = 'expectedVastUrl';
+      const expectedVastXml = 'expectedVastXml';
+      const pbGlobal = Object.assign({}, pbGlobalMock, {
+        requestBids,
+        getHighestCpmBids: () => [{
+          vastUrl: expectedVastUrl,
+          vastXml: expectedVastXml
+        }, {}, {}, {}]
+      });
+      const expectedAdUnit = {
+        code: expectedAdUnitCode,
+        video: { divId: expectedDivId }
+      };
+      const auctionResults = { adUnits: [ expectedAdUnit, {} ] };
+
+      pbVideoFactory(null, () => ({ providers: [] }), pbGlobal, pbEvents);
+      beforeBidRequestCallback(() => {}, {});
+      auctionEndCallback(auctionResults);
+      expect(videoCoreMock.setAdTagUrl.calledOnce).to.be.true;
+      expect(videoCoreMock.setAdTagUrl.args[0][0]).to.be.equal(expectedVastUrl);
+      expect(videoCoreMock.setAdTagUrl.args[0][1]).to.be.equal(expectedDivId);
+      expect(videoCoreMock.setAdTagUrl.args[0][2]).to.have.property('adUnitCode', expectedAdUnitCode);
+      expect(videoCoreMock.setAdTagUrl.args[0][2]).to.have.property('adXml', expectedVastXml);
+    });
+  });
+
+  describe('Ad tracking', function () {
+    const expectedAdEventPayload = { adEventPayloadMarker: 'marker' };
+    const expectedBid = { bidMarker: 'marker' };
+    let bidAdjustmentCb;
+    let adImpressionCb;
+    let adErrorCb;
+
+    const pbEvents = {
+      on: (event, callback) => {
+        if (event === CONSTANTS.EVENTS.BID_ADJUSTMENT) {
+          bidAdjustmentCb = callback;
+        } else if (event === 'videoAdImpression') {
+          adImpressionCb = callback;
+        } else if (event === 'videoAdError') {
+          adErrorCb = callback;
+        }
+      },
+      emit: sinon.spy()
+    };
+
+    it('should ask Impression Verifier to track bid on Bid Adjustment', function () {
+      pbVideoFactory(null, null, null, pbEvents);
+      bidAdjustmentCb();
+      expect(videoImpressionVerifierMock.trackBid.calledOnce).to.be.true;
+    });
+
+    it('should trigger video bid impression when the bid matched', function () {
+      pbEvents.emit.resetHistory();
+      const pbGlobal = Object.assign({}, pbGlobalMock, { getBidResponsesForAdUnitCode: () => ({ bids: [expectedBid] }) });
+      const videoImpressionVerifier = Object.assign({}, videoImpressionVerifierMock, { getBidIdentifiers: () => ({}) });
+      pbVideoFactory(null, null, pbGlobal, pbEvents, null, null, () => videoImpressionVerifier);
+      adImpressionCb(expectedAdEventPayload);
+
+      expect(pbEvents.emit.calledOnce).to.be.true;
+      expect(pbEvents.emit.getCall(0).args[0]).to.be.equal('videoBidImpression');
+      const payload = pbEvents.emit.getCall(0).args[1];
+      expect(payload.bid).to.be.equal(expectedBid);
+      expect(payload.adEvent).to.be.equal(expectedAdEventPayload);
+      expect(pbGlobal.markWinningBidAsUsed.calledOnce).to.be.true;
+    });
+
+    it('should trigger video bid error when the bid matched', function () {
+      pbEvents.emit.resetHistory();
+      const pbGlobal = Object.assign({}, pbGlobalMock, { getBidResponsesForAdUnitCode: () => ({ bids: [expectedBid] }) });
+      const videoImpressionVerifier = Object.assign({}, videoImpressionVerifierMock, { getBidIdentifiers: () => ({}) });
+      pbVideoFactory(null, null, pbGlobal, pbEvents, null, null, () => videoImpressionVerifier);
+      adErrorCb(expectedAdEventPayload);
+
+      expect(pbEvents.emit.calledOnce).to.be.true;
+      expect(pbEvents.emit.getCall(0).args[0]).to.be.equal('videoBidError');
+      const payload = pbEvents.emit.getCall(0).args[1];
+      expect(payload.bid).to.be.equal(expectedBid);
+      expect(payload.adEvent).to.be.equal(expectedAdEventPayload);
+      expect(pbGlobal.markWinningBidAsUsed.calledOnce).to.be.true;
+    });
+
+    it('should not trigger a bid impression when the bid did not match', function () {
+      pbEvents.emit.resetHistory();
+      const pbGlobal = Object.assign({}, pbGlobalMock, { getBidResponsesForAdUnitCode: () => ({ bids: [expectedBid] }) });
+      const videoImpressionVerifier = Object.assign({}, videoImpressionVerifierMock, { getBidIdentifiers: () => ({ auctionId: 'id' }) });
+      pbVideoFactory(null, null, pbGlobal, pbEvents, null, null, () => videoImpressionVerifier);
+      adImpressionCb(expectedAdEventPayload);
+
+      expect(pbEvents.emit.called).to.be.false;
+    });
+
+    it('should not trigger a bid error when the bid did not match', function () {
+      pbEvents.emit.resetHistory();
+      const pbGlobal = Object.assign({}, pbGlobalMock, { getBidResponsesForAdUnitCode: () => ({ bids: [expectedBid] }) });
+      const videoImpressionVerifier = Object.assign({}, videoImpressionVerifierMock, { getBidIdentifiers: () => ({ auctionId: 'id' }) });
+      pbVideoFactory(null, null, pbGlobal, pbEvents, null, null, () => videoImpressionVerifier);
+      adErrorCb(expectedAdEventPayload);
+
+      expect(pbEvents.emit.called).to.be.false;
+    });
+  });
+});
diff --git a/test/spec/modules/videoModule/shared/parentModule_spec.js b/test/spec/modules/videoModule/shared/parentModule_spec.js
new file mode 100644
index 00000000000..1e8e7fda380
--- /dev/null
+++ b/test/spec/modules/videoModule/shared/parentModule_spec.js
@@ -0,0 +1,73 @@
+import { SubmoduleBuilder, ParentModule } from 'libraries/video/shared/parentModule.js';
+import { expect } from 'chai';
+
+describe('Parent Module', function() {
+  const idForMock = 0;
+  const vendorCodeForMock = 'a';
+  const unrecognizedId = 999;
+  const unrecognizedVendorCode = 'zzz';
+  const mockSubmodule = { test: 'test' };
+  const mockSubmoduleBuilder = {
+    build: vendorCode => {
+      if (vendorCode === vendorCodeForMock) {
+        return mockSubmodule;
+      } else {
+        throw new Error('flawed');
+      }
+    }
+  };
+  const parentModule = ParentModule(mockSubmoduleBuilder);
+
+  describe('Register Submodule', function () {
+    it('should throw when the builder fails to build', function () {
+      expect(() => parentModule.registerSubmodule(unrecognizedId, unrecognizedVendorCode)).to.throw('flawed');
+    });
+  });
+
+  describe('Get Submodule', function () {
+    it('should return registered submodules', function () {
+      parentModule.registerSubmodule(idForMock, vendorCodeForMock);
+      const submodule = parentModule.getSubmodule(idForMock);
+      expect(submodule).to.be.equal(mockSubmodule);
+    });
+
+    it('should return undefined when submodule is not registered', function () {
+      const submodule = parentModule.getSubmodule(unrecognizedId);
+      expect(submodule).to.be.undefined;
+    });
+  })
+});
+
+describe('Submodule Builder', function () {
+  const vendorCode1 = 1;
+  const vendorCode2 = 2;
+  const submodule1 = {};
+  const initSpy = sinon.spy();
+  const submodule2 = { init: initSpy };
+  const submoduleFactory1 = () => submodule1;
+  const submoduleFactory2 = () => submodule2;
+  const submoduleFactory1Spy = sinon.spy(submoduleFactory1);
+
+  const vendorDirectory = {};
+  vendorDirectory[vendorCode1] = submoduleFactory1Spy;
+  vendorDirectory[vendorCode2] = submoduleFactory2;
+
+  const submoduleBuilder = SubmoduleBuilder(vendorDirectory);
+
+  it('should call submodule factory when vendor code is supported', function () {
+    const submodule = submoduleBuilder.build(vendorCode1);
+    expect(submoduleFactory1Spy.calledOnce).to.be.true;
+    expect(submodule).to.be.equal(submodule1);
+  });
+
+  it('should instantiate the submodule, when supported', function () {
+    const submodule = submoduleBuilder.build(vendorCode2);
+    expect(initSpy.calledOnce).to.be.true;
+    expect(submodule).to.be.equal(submodule2);
+  });
+
+  it('should throw when vendor code is not recognized', function () {
+    const unrecognizedVendorCode = 999;
+    expect(() => submoduleBuilder.build(unrecognizedVendorCode)).to.throw('Unrecognized submodule vendor code: ' + unrecognizedVendorCode);
+  });
+});
diff --git a/test/spec/modules/videoModule/shared/state_spec.js b/test/spec/modules/videoModule/shared/state_spec.js
new file mode 100644
index 00000000000..94f3cb73411
--- /dev/null
+++ b/test/spec/modules/videoModule/shared/state_spec.js
@@ -0,0 +1,26 @@
+import stateFactory from 'libraries/video/shared/state.js';
+import { expect } from 'chai';
+
+describe('State', function () {
+  let state = stateFactory();
+  beforeEach(() => {
+    state.clearState();
+  });
+
+  it('should update state', function () {
+    state.updateState({ 'test': 'a' });
+    expect(state.getState()).to.have.property('test', 'a');
+    state.updateState({ 'test': 'b' });
+    expect(state.getState()).to.have.property('test', 'b');
+    state.updateState({ 'test_2': 'c' });
+    expect(state.getState()).to.have.property('test', 'b');
+    expect(state.getState()).to.have.property('test_2', 'c');
+  });
+
+  it('should clear state', function () {
+    state.updateState({ 'test': 'a' });
+    state.clearState();
+    expect(state.getState()).to.not.have.property('test', 'a');
+    expect(state.getState()).to.be.empty;
+  });
+});
diff --git a/test/spec/modules/videoModule/shared/vastXmlBuilder_spec.js b/test/spec/modules/videoModule/shared/vastXmlBuilder_spec.js
new file mode 100644
index 00000000000..2c67b898a53
--- /dev/null
+++ b/test/spec/modules/videoModule/shared/vastXmlBuilder_spec.js
@@ -0,0 +1,103 @@
+import { buildVastWrapper, getVastNode, getAdNode, getWrapperNode, getAdSystemNode,
+  getAdTagUriNode, getErrorNode, getImpressionNode } from 'libraries/video/shared/vastXmlBuilder.js';
+import { expect } from 'chai';
+
+describe('buildVastWrapper', function () {
+  it('should include impression and error nodes when requested', function () {
+    const vastXml = buildVastWrapper(
+      'adId123',
+      'http://wwww.testUrl.com/redirectUrl.xml',
+      'http://wwww.testUrl.com/impression.jpg',
+      'impressionId123',
+      'http://wwww.testUrl.com/error.jpg'
+    );
+    expect(vastXml).to.be.equal(`<VAST version="4.2"><Ad id="adId123"><Wrapper><AdSystem version="${$$PREBID_GLOBAL$$.version}">Prebid org</AdSystem><VASTAdTagURI><![CDATA[http://wwww.testUrl.com/redirectUrl.xml]]></VASTAdTagURI><Impression id="impressionId123"><![CDATA[http://wwww.testUrl.com/impression.jpg]]></Impression><Error><![CDATA[http://wwww.testUrl.com/error.jpg]]></Error></Wrapper></Ad></VAST>`);
+  });
+
+  it('should omit error nodes when excluded', function () {
+    const vastXml = buildVastWrapper(
+      'adId123',
+      'http://wwww.testUrl.com/redirectUrl.xml',
+      'http://wwww.testUrl.com/impression.jpg',
+      'impressionId123',
+    );
+    expect(vastXml).to.be.equal(`<VAST version="4.2"><Ad id="adId123"><Wrapper><AdSystem version="${$$PREBID_GLOBAL$$.version}">Prebid org</AdSystem><VASTAdTagURI><![CDATA[http://wwww.testUrl.com/redirectUrl.xml]]></VASTAdTagURI><Impression id="impressionId123"><![CDATA[http://wwww.testUrl.com/impression.jpg]]></Impression></Wrapper></Ad></VAST>`);
+  });
+
+  it('should omit impression nodes when excluded', function () {
+    const vastXml = buildVastWrapper(
+      'adId123',
+      'http://wwww.testUrl.com/redirectUrl.xml',
+    );
+    expect(vastXml).to.be.equal(`<VAST version="4.2"><Ad id="adId123"><Wrapper><AdSystem version="${$$PREBID_GLOBAL$$.version}">Prebid org</AdSystem><VASTAdTagURI><![CDATA[http://wwww.testUrl.com/redirectUrl.xml]]></VASTAdTagURI></Wrapper></Ad></VAST>`);
+  });
+});
+
+describe('getVastNode', function () {
+  it('should return well formed Vast node', function () {
+    const vastNode = getVastNode('body', '4.0');
+    expect(vastNode).to.be.equal('<VAST version=\"4.0\">body</VAST>');
+  });
+
+  it('should omit version when missing', function() {
+    const vastNode = getVastNode('body');
+    expect(vastNode).to.be.equal('<VAST>body</VAST>');
+  });
+});
+
+describe('getAdNode', function () {
+  it('should return well formed Ad node', function () {
+    const adNode = getAdNode('body', 'adId123');
+    expect(adNode).to.be.equal('<Ad id=\"adId123\">body</Ad>');
+  });
+
+  it('should omit id when missing', function() {
+    const adNode = getAdNode('body');
+    expect(adNode).to.be.equal('<Ad>body</Ad>');
+  });
+});
+
+describe('getWrapperNode', function () {
+  it('should return well formed Wrapper node', function () {
+    const wrapperNode = getWrapperNode('body');
+    expect(wrapperNode).to.be.equal('<Wrapper>body</Wrapper>');
+  });
+});
+
+describe('getAdSystemNode', function () {
+  it('should return well formed AdSystem node', function () {
+    const adSystemNode = getAdSystemNode('testSysName', '5.0');
+    expect(adSystemNode).to.be.equal('<AdSystem version=\"5.0\">testSysName</AdSystem>');
+  });
+
+  it('should omit version when missing', function() {
+    const adSystemNode = getAdSystemNode('testSysName');
+    expect(adSystemNode).to.be.equal('<AdSystem>testSysName</AdSystem>');
+  });
+});
+
+describe('getAdTagUriNode', function () {
+  it('should return well formed ad tag URI node', function () {
+    const adTagNode = getAdTagUriNode('http://wwww.testUrl.com/ad.xml');
+    expect(adTagNode).to.be.equal('<VASTAdTagURI><![CDATA[http://wwww.testUrl.com/ad.xml]]></VASTAdTagURI>');
+  });
+});
+
+describe('getImpressionNode', function () {
+  it('should return well formed Impression node', function () {
+    const impressionNode = getImpressionNode('http://wwww.testUrl.com/adImpression.jpg', 'impresionId123');
+    expect(impressionNode).to.be.equal('<Impression id=\"impresionId123\"><![CDATA[http://wwww.testUrl.com/adImpression.jpg]]></Impression>');
+  });
+
+  it('should omit id when missing', function() {
+    const impressionNode = getImpressionNode('http://wwww.testUrl.com/adImpression.jpg');
+    expect(impressionNode).to.be.equal('<Impression><![CDATA[http://wwww.testUrl.com/adImpression.jpg]]></Impression>');
+  });
+});
+
+describe('getErrorNode', function () {
+  it('should return well formed Error node', function () {
+    const errorNode = getErrorNode('http://wwww.testUrl.com/adError.jpg');
+    expect(errorNode).to.be.equal('<Error><![CDATA[http://wwww.testUrl.com/adError.jpg]]></Error>');
+  });
+});
diff --git a/test/spec/modules/videoModule/shared/vastXmlEditor_spec.js b/test/spec/modules/videoModule/shared/vastXmlEditor_spec.js
new file mode 100644
index 00000000000..2304b2f2833
--- /dev/null
+++ b/test/spec/modules/videoModule/shared/vastXmlEditor_spec.js
@@ -0,0 +1,209 @@
+import { vastXmlEditorFactory } from 'libraries/video/shared/vastXmlEditor.js';
+import { expect } from 'chai';
+
+describe('Vast XML Editor', function () {
+  const adWrapperXml = `
+<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        </Wrapper>
+    </Ad>
+</VAST>
+`;
+
+  const inlineXml = `
+<VAST version="4.0">
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        </InLine>
+    </Ad>
+</VAST>
+`;
+
+  const inLineWithWrapper = `
+<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        </Wrapper>
+    </Ad>
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        </InLine>
+    </Ad>
+</VAST>
+`;
+
+  const vastXmlEditor = vastXmlEditorFactory();
+  const expectedImpressionUrl = 'https://test.impression.com/ping.gif';
+  const expectedImpressionId = 'test-impression-id';
+  const expectedErrorUrl = 'https://test.error.com/ping.gif';
+
+  it('should add Impression Nodes to the Ad Wrapper', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(adWrapperXml, null, expectedImpressionUrl, expectedImpressionId);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression></Wrapper>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Impression Nodes to the InLine', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inlineXml, null, expectedImpressionUrl, expectedImpressionId);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression></InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Impression Nodes to the Ad Wrapper and Inline', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inLineWithWrapper, null, expectedImpressionUrl, expectedImpressionId);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression></Wrapper>
+    </Ad>
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression></InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Error Nodes to the Ad Wrapper', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(adWrapperXml, null, null, null, expectedErrorUrl);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        <Error><![CDATA[${expectedErrorUrl}]]></Error></Wrapper>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Error Nodes to the InLine', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inlineXml, null, null, null, expectedErrorUrl);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        <Error><![CDATA[${expectedErrorUrl}]]></Error></InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Error Nodes to the Ad Wrapper and Inline', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inLineWithWrapper, null, null, null, expectedErrorUrl);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        <Error><![CDATA[${expectedErrorUrl}]]></Error></Wrapper>
+    </Ad>
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        <Error><![CDATA[${expectedErrorUrl}]]></Error></InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Impression Nodes and Error Nodes to the Ad Wrapper', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(adWrapperXml, null, expectedImpressionUrl, expectedImpressionId, expectedErrorUrl);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression><Error><![CDATA[${expectedErrorUrl}]]></Error></Wrapper>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Impression Nodes and Error Nodes to the InLine', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inlineXml, null, expectedImpressionUrl, expectedImpressionId, expectedErrorUrl);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression><Error><![CDATA[${expectedErrorUrl}]]></Error></InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should add Impression Nodes and Error Nodes to the Ad Wrapper and Inline', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inLineWithWrapper, null, expectedImpressionUrl, expectedImpressionId, expectedErrorUrl);
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="123">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression><Error><![CDATA[${expectedErrorUrl}]]></Error></Wrapper>
+    </Ad>
+    <Ad id="abc">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        <Impression id="${expectedImpressionId}"><![CDATA[${expectedImpressionUrl}]]></Impression><Error><![CDATA[${expectedErrorUrl}]]></Error></InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should override the ad id in inline', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(inlineXml, 'adIdOverride');
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="adIdOverride">
+        <InLine>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <AdTitle>Random Title</AdTitle>
+        </InLine>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+
+  it('should override the ad id in the Ad Wrapper', function () {
+    const vastXml = vastXmlEditor.getVastXmlWithTracking(adWrapperXml, 'adIdOverride');
+    const expectedXml = `<VAST version="4.0">
+    <Ad id="adIdOverride">
+        <Wrapper>
+            <AdSystem version="6">Prebid org</AdSystem>
+            <VASTAdTagURI><![CDATA[https://random.adTag.com]]></VASTAdTagURI>
+        </Wrapper>
+    </Ad>
+</VAST>`;
+    expect(vastXml).to.equal(expectedXml);
+  });
+});
diff --git a/test/spec/modules/videoModule/submodules/jwplayerVideoProvider_spec.js b/test/spec/modules/videoModule/submodules/jwplayerVideoProvider_spec.js
new file mode 100644
index 00000000000..399c115b820
--- /dev/null
+++ b/test/spec/modules/videoModule/submodules/jwplayerVideoProvider_spec.js
@@ -0,0 +1,846 @@
+import {
+  JWPlayerProvider,
+  adStateFactory,
+  timeStateFactory,
+  callbackStorageFactory,
+  utils
+} from 'modules/jwplayerVideoProvider';
+
+import {
+  PROTOCOLS, API_FRAMEWORKS, VIDEO_MIME_TYPE, PLAYBACK_METHODS, PLACEMENT, VPAID_MIME_TYPE
+} from 'libraries/video/constants/ortb.js';
+
+import {
+  SETUP_COMPLETE, SETUP_FAILED, PLAY, AD_IMPRESSION, videoEvents
+} from 'libraries/video/constants/events.js';
+
+import { PLAYBACK_MODE } from 'libraries/video/constants/enums.js';
+
+function getPlayerMock() {
+  return makePlayerFactoryMock({
+    getState: function () {},
+    setup: function () {},
+    getViewable: function () {},
+    getPercentViewable: function () {},
+    getMute: function () {},
+    getVolume: function () {},
+    getConfig: function () {},
+    getHeight: function () {},
+    getWidth: function () {},
+    getFullscreen: function () {},
+    getPlaylistItem: function () {},
+    playAd: function () {},
+    on: function () {},
+    off: function () {},
+    remove: function () {},
+    getAudioTracks: function () {},
+    getCurrentAudioTrack: function () {},
+    getPlugin: function () {},
+    getFloating: function () {}
+  })();
+}
+
+function makePlayerFactoryMock(playerMock_) {
+  const playerFactory = function () {
+    return playerMock_;
+  }
+  playerFactory.version = '8.21.0';
+  return playerFactory;
+}
+
+function getUtilsMock() {
+  return {
+    getJwConfig: function () {},
+    getSupportedMediaTypes: function () {},
+    getStartDelay: function () {},
+    getPlacement: function () {},
+    getPlaybackMethod: function () {},
+    isOmidSupported: function () {},
+    getSkipParams: function () {},
+    getJwEvent: event => event,
+    getIsoLanguageCode: function () {},
+    getSegments: function () {},
+    getContentDatum: function () {}
+  };
+}
+
+const sharedUtils = { videoEvents };
+
+describe('JWPlayerProvider', function () {
+  describe('init', function () {
+    let config;
+    let adState;
+    let timeState;
+    let callbackStorage;
+    let utilsMock;
+
+    beforeEach(() => {
+      config = {};
+      adState = adStateFactory();
+      timeState = timeStateFactory();
+      callbackStorage = callbackStorageFactory();
+      utilsMock = getUtilsMock();
+    });
+
+    it('should trigger failure when jwplayer is missing', function () {
+      const provider = JWPlayerProvider(config, null, adState, timeState, callbackStorage, utilsMock, sharedUtils);
+      const setupFailed = sinon.spy();
+      provider.onEvent(SETUP_FAILED, setupFailed, {});
+      provider.init();
+      expect(setupFailed.calledOnce).to.be.true;
+      const payload = setupFailed.args[0][1];
+      expect(payload.errorCode).to.be.equal(-1);
+    });
+
+    it('should trigger failure when jwplayer version is under min supported version', function () {
+      let jwplayerMock = () => {};
+      jwplayerMock.version = '8.20.0';
+      const provider = JWPlayerProvider(config, jwplayerMock, adState, timeState, callbackStorage, utilsMock, sharedUtils);
+      const setupFailed = sinon.spy();
+      provider.onEvent(SETUP_FAILED, setupFailed, {});
+      provider.init();
+      expect(setupFailed.calledOnce).to.be.true;
+      const payload = setupFailed.args[0][1];
+      expect(payload.errorCode).to.be.equal(-2);
+    });
+
+    it('should instantiate the player when uninstantied', function () {
+      const player = getPlayerMock();
+      config.playerConfig = {};
+      const setupSpy = player.setup = sinon.spy();
+      const provider = JWPlayerProvider(config, makePlayerFactoryMock(player), adState, timeState, callbackStorage, utilsMock, sharedUtils);
+      provider.init();
+      expect(setupSpy.calledOnce).to.be.true;
+    });
+
+    it('should trigger setup complete when player is already instantied', function () {
+      const player = getPlayerMock();
+      player.getState = () => 'idle';
+      const provider = JWPlayerProvider(config, makePlayerFactoryMock(player), adState, timeState, callbackStorage, utilsMock, sharedUtils);
+      const setupComplete = sinon.spy();
+      provider.onEvent(SETUP_COMPLETE, setupComplete, {});
+      provider.init();
+      expect(setupComplete.calledOnce).to.be.true;
+    });
+
+    it('should not reinstantiate player', function () {
+      const player = getPlayerMock();
+      player.getState = () => 'idle';
+      const setupSpy = player.setup = sinon.spy();
+      const provider = JWPlayerProvider(config, makePlayerFactoryMock(player), adState, timeState, callbackStorage, utilsMock, sharedUtils);
+      provider.init();
+      expect(setupSpy.called).to.be.false;
+    });
+  });
+
+  describe('getId', function () {
+    it('should return configured div id', function () {
+      const provider = JWPlayerProvider({ divId: 'test_id' }, undefined, undefined, undefined, undefined, undefined, sharedUtils);
+      expect(provider.getId()).to.be.equal('test_id');
+    });
+  });
+
+  describe('getOrtbVideo', function () {
+    it('should populate oRTB Video params', function () {
+      const test_media_type = VIDEO_MIME_TYPE.MP4;
+      const test_height = 100;
+      const test_width = 200;
+      const test_start_delay = 5;
+      const test_placement = PLACEMENT.ARTICLE;
+      const test_battr = 'battr';
+      const test_playback_method = PLAYBACK_METHODS.CLICK_TO_PLAY;
+      const test_skip = 0;
+
+      const config = {};
+      const player = getPlayerMock();
+      const utils = getUtilsMock();
+
+      player.getConfig = () => ({
+        advertising: {
+          battr: test_battr
+        }
+      });
+      player.getHeight = () => test_height;
+      player.getWidth = () => test_width;
+      player.getFullscreen = () => true; //
+
+      utils.getSupportedMediaTypes = () => [test_media_type];
+      utils.getStartDelay = () => test_start_delay;
+      utils.getPlacement = () => test_placement;
+      utils.getPlaybackMethod = () => test_playback_method;
+      utils.isOmidSupported = () => true; //
+      utils.getSkipParams = () => ({ skip: test_skip });
+
+      const provider = JWPlayerProvider(config, makePlayerFactoryMock(player), adStateFactory(), {}, {}, utils, sharedUtils);
+      provider.init();
+      let video = provider.getOrtbVideo();
+
+      expect(video.mimes).to.include(VIDEO_MIME_TYPE.MP4);
+      expect(video.protocols).to.include.members([
+        PROTOCOLS.VAST_2_0,
+        PROTOCOLS.VAST_3_0,
+        PROTOCOLS.VAST_4_0,
+        PROTOCOLS.VAST_2_0_WRAPPER,
+        PROTOCOLS.VAST_3_0_WRAPPER,
+        PROTOCOLS.VAST_4_0_WRAPPER
+      ]);
+      expect(video.h).to.equal(test_height);
+      expect(video.w).to.equal(test_width);
+      expect(video.startdelay).to.equal(test_start_delay);
+      expect(video.placement).to.equal(test_placement);
+      expect(video.battr).to.equal(test_battr);
+      expect(video.maxextended).to.equal(-1);
+      expect(video.boxingallowed).to.equal(1);
+      expect(video.playbackmethod).to.include(test_playback_method);
+      expect(video.playbackend).to.equal(1);
+      expect(video.api).to.have.length(2);
+      expect(video.api).to.include.members([API_FRAMEWORKS.VPAID_2_0, API_FRAMEWORKS.OMID_1_0]); //
+      expect(video.skip).to.equal(test_skip);
+      expect(video.pos).to.equal(7); //
+
+      player.getFullscreen = () => false;
+      utils.isOmidSupported = () => false;
+
+      video = provider.getOrtbVideo();
+      expect(video).to.not.have.property('pos');
+      expect(video.api).to.have.length(1);
+      expect(video.api).to.include(API_FRAMEWORKS.VPAID_2_0);
+      expect(video.api).to.not.include(API_FRAMEWORKS.OMID_1_0);
+    });
+  });
+
+  describe('getOrtbContent', function () {
+    it('should populate oRTB Content params', function () {
+      const test_item = {
+        mediaid: 'id',
+        file: 'file',
+        title: 'title',
+        iabCategories: 'iabCategories',
+        tags: 'keywords',
+      };
+      const test_duration = 30;
+      let test_playback_mode = PLAYBACK_MODE.VOD;//
+
+      const player = getPlayerMock();
+      player.getPlaylistItem = () => test_item;
+      const utils = getUtilsMock();
+
+      const timeState = {
+        getState: () => ({
+          duration: test_duration,
+          playbackMode: test_playback_mode
+        })
+      }
+
+      const provider = JWPlayerProvider({}, makePlayerFactoryMock(player), adStateFactory(), timeState, {}, utils, sharedUtils);
+      provider.init();
+
+      let content = provider.getOrtbContent();
+      expect(content.id).to.be.equal('jw_' + test_item.mediaid);
+      expect(content.url).to.be.equal(test_item.file);
+      expect(content.title).to.be.equal(test_item.title);
+      expect(content.cat).to.be.equal(test_item.iabCategories);
+      expect(content.keywords).to.be.equal(test_item.tags);
+      expect(content.len).to.be.equal(test_duration);
+      expect(content.livestream).to.be.equal(0);//
+
+      test_playback_mode = PLAYBACK_MODE.LIVE;
+
+      content = provider.getOrtbContent();
+      expect(content.livestream).to.be.equal(1);
+
+      test_playback_mode = PLAYBACK_MODE.DVR;
+
+      content = provider.getOrtbContent();
+      expect(content.livestream).to.be.equal(1);
+    });
+  });
+
+  describe('setAdTagUrl', function () {
+    it('should call playAd', function () {
+      const player = getPlayerMock();
+      const playAdSpy = player.playAd = sinon.spy();
+      const provider = JWPlayerProvider({}, makePlayerFactoryMock(player), {}, {}, {}, {}, sharedUtils);
+      provider.init();
+      provider.setAdTagUrl('tag');
+      expect(playAdSpy.called).to.be.true;
+      const argument = playAdSpy.args[0][0];
+      expect(argument).to.be.equal('tag');
+    });
+  });
+
+  describe('events', function () {
+    it('should register event listener on player', function () {
+      const player = getPlayerMock();
+      const onSpy = player.on = sinon.spy();
+      const provider = JWPlayerProvider({}, makePlayerFactoryMock(player), adStateFactory(), timeStateFactory(), callbackStorageFactory(), getUtilsMock(), sharedUtils);
+      provider.init();
+      const callback = () => {};
+      provider.onEvent(PLAY, callback, {});
+      expect(onSpy.calledOnce).to.be.true;
+      const eventName = onSpy.args[0][0];
+      expect(eventName).to.be.equal('play');
+    });
+
+    it('should remove event listener on player', function () {
+      const player = getPlayerMock();
+      const offSpy = player.off = sinon.spy();
+      const provider = JWPlayerProvider({}, makePlayerFactoryMock(player), adStateFactory(), timeStateFactory(), callbackStorageFactory(), utils, sharedUtils);
+      provider.init();
+      const callback = () => {};
+      provider.onEvent(AD_IMPRESSION, callback, {});
+      provider.offEvent(AD_IMPRESSION, callback);
+      expect(offSpy.calledOnce).to.be.true;
+      const eventName = offSpy.args[0][0];
+      expect(eventName).to.be.equal('adViewableImpression');
+    });
+  });
+
+  describe('destroy', function () {
+    it('should remove and null the player', function () {
+      const player = getPlayerMock();
+      const removeSpy = player.remove = sinon.spy();
+      player.remove = removeSpy;
+      const provider = JWPlayerProvider({}, makePlayerFactoryMock(player), adStateFactory(), timeStateFactory(), callbackStorageFactory(), getUtilsMock(), sharedUtils);
+      provider.init();
+      provider.destroy();
+      provider.destroy();
+      expect(removeSpy.calledOnce).to.be.true;
+    });
+  });
+});
+
+describe('adStateFactory', function () {
+  let adState = adStateFactory();
+
+  beforeEach(() => {
+    adState.clearState();
+  });
+
+  it('should update state for ad events', function () {
+    const tag = 'tag';
+    const adPosition = 'adPosition';
+    const timeLoading = 'timeLoading';
+    const id = 'id';
+    const description = 'description';
+    const adsystem = 'adsystem';
+    const adtitle = 'adtitle';
+    const advertiserId = 'advertiserId';
+    const advertiser = 'advertiser';
+    const dealId = 'dealId';
+    const linear = 'linear';
+    const vastversion = 'vastversion';
+    const mediaFile = 'mediaFile';
+    const adId = 'adId';
+    const universalAdId = 'universalAdId';
+    const creativeAdId = 'creativeAdId';
+    const creativetype = 'creativetype';
+    const clickThroughUrl = 'clickThroughUrl';
+    const witem = 'witem';
+    const wcount = 'wcount';
+    const podcount = 'podcount';
+    const sequence = 'sequence';
+
+    adState.updateForEvent({
+      tag,
+      adPosition,
+      timeLoading,
+      id,
+      description,
+      adsystem,
+      adtitle,
+      advertiserId,
+      advertiser,
+      dealId,
+      linear,
+      vastversion,
+      mediaFile,
+      adId,
+      universalAdId,
+      creativeAdId,
+      creativetype,
+      clickThroughUrl,
+      witem,
+      wcount,
+      podcount,
+      sequence
+    });
+
+    const state = adState.getState();
+    expect(state.adTagUrl).to.equal(tag);
+    expect(state.offset).to.equal(adPosition);
+    expect(state.loadTime).to.equal(timeLoading);
+    expect(state.vastAdId).to.equal(id);
+    expect(state.adDescription).to.equal(description);
+    expect(state.adServer).to.equal(adsystem);
+    expect(state.adTitle).to.equal(adtitle);
+    expect(state.advertiserId).to.equal(advertiserId);
+    expect(state.dealId).to.equal(dealId);
+    expect(state.linear).to.equal(linear);
+    expect(state.vastVersion).to.equal(vastversion);
+    expect(state.creativeUrl).to.equal(mediaFile);
+    expect(state.adId).to.equal(adId);
+    expect(state.universalAdId).to.equal(universalAdId);
+    expect(state.creativeId).to.equal(creativeAdId);
+    expect(state.creativeType).to.equal(creativetype);
+    expect(state.redirectUrl).to.equal(clickThroughUrl);
+    expect(state).to.have.property('adPlacementType');
+    expect(state.adPlacementType).to.be.undefined;
+    expect(state.waterfallIndex).to.equal(witem);
+    expect(state.waterfallCount).to.equal(wcount);
+    expect(state.adPodCount).to.equal(podcount);
+    expect(state.adPodIndex).to.equal(sequence);
+  });
+
+  it('should convert placement to oRTB value', function () {
+    adState.updateForEvent({
+      placement: 'instream'
+    });
+
+    let state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.INSTREAM);
+
+    adState.updateForEvent({
+      placement: 'banner'
+    });
+
+    state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.BANNER);
+
+    adState.updateForEvent({
+      placement: 'article'
+    });
+
+    state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.ARTICLE);
+
+    adState.updateForEvent({
+      placement: 'feed'
+    });
+
+    state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.FEED);
+
+    adState.updateForEvent({
+      placement: 'interstitial'
+    });
+
+    state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.INTERSTITIAL);
+
+    adState.updateForEvent({
+      placement: 'slider'
+    });
+
+    state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.SLIDER);
+
+    adState.updateForEvent({
+      placement: 'floating'
+    });
+
+    state = adState.getState();
+    expect(state.adPlacementType).to.be.equal(PLACEMENT.FLOATING);
+  });
+});
+
+describe('timeStateFactory', function () {
+  let timeState = timeStateFactory();
+
+  beforeEach(() => {
+    timeState.clearState();
+  });
+
+  it('should update state for VOD time event', function() {
+    const position = 5;
+    const test_duration = 30;
+
+    timeState.updateForEvent({
+      position,
+      duration: test_duration
+    });
+
+    const { time, duration, playbackMode } = timeState.getState();
+    expect(time).to.be.equal(position);
+    expect(duration).to.be.equal(test_duration);
+    expect(playbackMode).to.be.equal(PLAYBACK_MODE.VOD);
+  });
+
+  it('should update state for LIVE time events', function() {
+    const position = 0;
+    const test_duration = 0;
+
+    timeState.updateForEvent({
+      position,
+      duration: test_duration
+    });
+
+    const { time, duration, playbackMode } = timeState.getState();
+    expect(time).to.be.equal(position);
+    expect(duration).to.be.equal(test_duration);
+    expect(playbackMode).to.be.equal(PLAYBACK_MODE.LIVE);
+  });
+
+  it('should update state for DVR time events', function() {
+    const position = -5;
+    const test_duration = -30;
+
+    timeState.updateForEvent({
+      position,
+      duration: test_duration
+    });
+
+    const { time, duration, playbackMode } = timeState.getState();
+    expect(time).to.be.equal(position);
+    expect(duration).to.be.equal(test_duration);
+    expect(playbackMode).to.be.equal(PLAYBACK_MODE.DVR);
+  });
+});
+
+describe('callbackStorageFactory', function () {
+  let callbackStorage = callbackStorageFactory();
+
+  beforeEach(() => {
+    callbackStorage.clearStorage();
+  });
+
+  it('should store callbacks', function () {
+    const callback1 = () => 'callback1';
+    const eventHandler1 = () => 'eventHandler1';
+    callbackStorage.storeCallback('event', eventHandler1, callback1);
+
+    const callback2 = () => 'callback2';
+    const eventHandler2 = () => 'eventHandler2';
+    callbackStorage.storeCallback('event', eventHandler2, callback2);
+
+    const callback3 = () => 'callback3';
+
+    expect(callbackStorage.getCallback('event', callback1)).to.be.equal(eventHandler1);
+    expect(callbackStorage.getCallback('event', callback2)).to.be.equal(eventHandler2);
+    expect(callbackStorage.getCallback('event', callback3)).to.be.undefined;
+  });
+
+  it('should remove callbacks after retrieval', function () {
+    const callback1 = () => 'callback1';
+    const eventHandler1 = () => 'eventHandler1';
+    callbackStorage.storeCallback('event', eventHandler1, callback1);
+
+    expect(callbackStorage.getCallback('event', callback1)).to.be.equal(eventHandler1);
+    expect(callbackStorage.getCallback('event', callback1)).to.be.undefined;
+  });
+
+  it('should clear callbacks', function () {
+    const callback1 = () => 'callback1';
+    const eventHandler1 = () => 'eventHandler1';
+    callbackStorage.storeCallback('event', eventHandler1, callback1);
+
+    callbackStorage.clearStorage();
+    expect(callbackStorage.getCallback('event', callback1)).to.be.undefined;
+  });
+});
+
+describe('utils', function () {
+  describe('getJwConfig', function () {
+    const getJwConfig = utils.getJwConfig;
+    it('should return undefined when no config is provided', function () {
+      let jwConfig = getJwConfig();
+      expect(jwConfig).to.be.undefined;
+
+      jwConfig = getJwConfig(null);
+      expect(jwConfig).to.be.undefined;
+    });
+
+    it('should set vendor config params to top level', function () {
+      let jwConfig = getJwConfig({
+        params: {
+          vendorConfig: {
+            'test': 'a',
+            'test_2': 'b'
+          }
+        }
+      });
+      expect(jwConfig.test).to.be.equal('a');
+      expect(jwConfig.test_2).to.be.equal('b');
+    });
+
+    it('should convert video module params', function () {
+      let jwConfig = getJwConfig({
+        mute: true,
+        autoStart: true,
+        licenseKey: 'key'
+      });
+
+      expect(jwConfig.mute).to.be.true;
+      expect(jwConfig.autostart).to.be.true;
+      expect(jwConfig.key).to.be.equal('key');
+    });
+
+    it('should apply video module params only when absent from vendor config', function () {
+      let jwConfig = getJwConfig({
+        mute: true,
+        autoStart: true,
+        licenseKey: 'key',
+        params: {
+          vendorConfig: {
+            mute: false,
+            autostart: false,
+            key: 'other_key'
+          }
+        }
+      });
+
+      expect(jwConfig.mute).to.be.false;
+      expect(jwConfig.autostart).to.be.false;
+      expect(jwConfig.key).to.be.equal('other_key');
+    });
+
+    it('should not convert undefined properties', function () {
+      let jwConfig = getJwConfig({
+        params: {
+          vendorConfig: {
+            test: 'a'
+          }
+        }
+      });
+
+      expect(jwConfig).to.not.have.property('mute');
+      expect(jwConfig).to.not.have.property('autostart');
+      expect(jwConfig).to.not.have.property('key');
+    });
+
+    it('should exclude fallback ad block when setupAds is explicitly disabled', function () {
+      let jwConfig = getJwConfig({
+        setupAds: false,
+        params: {
+
+          vendorConfig: {}
+        }
+      });
+
+      expect(jwConfig).to.not.have.property('advertising');
+    });
+
+    it('should set advertising block when setupAds is allowed', function () {
+      let jwConfig = getJwConfig({
+        params: {
+          vendorConfig: {
+            advertising: {
+              tag: 'test_tag'
+            }
+          }
+        }
+      });
+
+      expect(jwConfig).to.have.property('advertising');
+      expect(jwConfig.advertising).to.have.property('tag', 'test_tag');
+    });
+
+    it('should fallback to vast plugin', function () {
+      let jwConfig = getJwConfig({});
+
+      expect(jwConfig).to.have.property('advertising');
+      expect(jwConfig.advertising).to.have.property('client', 'vast');
+    });
+  });
+  describe('getSkipParams', function () {
+    const getSkipParams = utils.getSkipParams;
+
+    it('should return an empty object when skip is not configured', function () {
+      let skipParams = getSkipParams({});
+      expect(skipParams).to.be.empty;
+    });
+
+    it('should set skip to false when explicitly configured', function () {
+      let skipParams = getSkipParams({
+        skipoffset: -1
+      });
+      expect(skipParams.skip).to.be.equal(0);
+      expect(skipParams.skipmin).to.be.undefined;
+      expect(skipParams.skipafter).to.be.undefined;
+    });
+
+    it('should be skippable when skip offset is set', function () {
+      const skipOffset = 3;
+      let skipParams = getSkipParams({
+        skipoffset: skipOffset
+      });
+      expect(skipParams.skip).to.be.equal(1);
+      expect(skipParams.skipmin).to.be.equal(skipOffset + 2);
+      expect(skipParams.skipafter).to.be.equal(skipOffset);
+    });
+  });
+
+  describe('getSupportedMediaTypes', function () {
+    const getSupportedMediaTypes = utils.getSupportedMediaTypes;
+
+    it('should always support VPAID', function () {
+      let supportedMediaTypes = getSupportedMediaTypes([]);
+      expect(supportedMediaTypes).to.include(VPAID_MIME_TYPE);
+
+      supportedMediaTypes = getSupportedMediaTypes([VIDEO_MIME_TYPE.MP4]);
+      expect(supportedMediaTypes).to.include(VPAID_MIME_TYPE);
+    });
+  });
+
+  describe('getPlacement', function () {
+    const getPlacement = utils.getPlacement;
+
+    it('should be INSTREAM when not configured for outstream', function () {
+      let adConfig = {};
+      let placement = getPlacement(adConfig);
+      expect(placement).to.be.equal(PLACEMENT.INSTREAM);
+
+      adConfig = { outstream: false };
+      placement = getPlacement(adConfig);
+      expect(placement).to.be.equal(PLACEMENT.INSTREAM);
+    });
+
+    it('should be FLOATING when player is floating', function () {
+      const player = getPlayerMock();
+      player.getFloating = () => true;
+      const placement = getPlacement({outstream: true}, player);
+      expect(placement).to.be.equal(PLACEMENT.FLOATING);
+    });
+
+    it('should be the value  defined in the ad config', function () {
+      const player = getPlayerMock();
+      player.getFloating = () => false;
+
+      let placement = getPlacement({placement: 'banner', outstream: true}, player);
+      expect(placement).to.be.equal(PLACEMENT.BANNER);
+
+      placement = getPlacement({placement: 'article', outstream: true}, player);
+      expect(placement).to.be.equal(PLACEMENT.ARTICLE);
+
+      placement = getPlacement({placement: 'feed', outstream: true}, player);
+      expect(placement).to.be.equal(PLACEMENT.FEED);
+
+      placement = getPlacement({placement: 'interstitial', outstream: true}, player);
+      expect(placement).to.be.equal(PLACEMENT.INTERSTITIAL);
+
+      placement = getPlacement({placement: 'slider', outstream: true}, player);
+      expect(placement).to.be.equal(PLACEMENT.SLIDER);
+    });
+
+    it('should be undefined when undetermined', function () {
+      const placement = getPlacement({ outstream: true }, getPlayerMock());
+      expect(placement).to.be.undefined;
+    });
+  });
+
+  describe('getPlaybackMethod', function() {
+    const getPlaybackMethod = utils.getPlaybackMethod;
+
+    it('should return autoplay with sound', function() {
+      const playbackMethod = getPlaybackMethod({
+        autoplay: true,
+        mute: false
+      });
+      expect(playbackMethod).to.equal(PLAYBACK_METHODS.AUTOPLAY);
+    });
+
+    it('should return autoplay muted', function() {
+      const playbackMethod = getPlaybackMethod({
+        autoplay: true,
+        mute: true
+      });
+      expect(playbackMethod).to.equal(PLAYBACK_METHODS.AUTOPLAY_MUTED);
+    });
+
+    it('should treat autoplayAdsMuted as mute', function () {
+      const playbackMethod = getPlaybackMethod({
+        autoplay: true,
+        autoplayAdsMuted: true
+      });
+      expect(playbackMethod).to.equal(PLAYBACK_METHODS.AUTOPLAY_MUTED);
+    });
+
+    it('should return click to play', function() {
+      let playbackMethod = getPlaybackMethod({ autoplay: false });
+      expect(playbackMethod).to.equal(PLAYBACK_METHODS.CLICK_TO_PLAY);
+
+      playbackMethod = getPlaybackMethod({
+        autoplay: false,
+        autoplayAdsMuted: true
+      });
+      expect(playbackMethod).to.equal(PLAYBACK_METHODS.CLICK_TO_PLAY);
+
+      playbackMethod = getPlaybackMethod({
+        autoplay: false,
+        mute: true
+      });
+      expect(playbackMethod).to.equal(PLAYBACK_METHODS.CLICK_TO_PLAY);
+    });
+  });
+
+  describe('isOmidSupported', function () {
+    const isOmidSupported = utils.isOmidSupported;
+    const initialOmidSessionClient = window.OmidSessionClient;
+    afterEach(() => {
+      window.OmidSessionClient = initialOmidSessionClient;
+    });
+
+    it('should be true when Omid is loaded and client is VAST', function () {
+      window.OmidSessionClient = {};
+      expect(isOmidSupported('vast')).to.be.true;
+    });
+
+    it('should be false when Omid is not present', function () {
+      expect(isOmidSupported('vast')).to.be.false;
+    });
+
+    it('should be false when client is not Vast', function () {
+      window.OmidSessionClient = {};
+      expect(isOmidSupported('googima')).to.be.false;
+      expect(isOmidSupported('freewheel')).to.be.false;
+      expect(isOmidSupported('googimadai')).to.be.false;
+      expect(isOmidSupported('')).to.be.false;
+      expect(isOmidSupported(null)).to.be.false;
+      expect(isOmidSupported()).to.be.false;
+    });
+  });
+
+  describe('getIsoLanguageCode', function () {
+    const sampleAudioTracks = [{language: 'ht'}, {language: 'fr'}, {language: 'es'}, {language: 'pt'}];
+
+    it('should return undefined when audio tracks are unavailable', function () {
+      const player = getPlayerMock();
+      let languageCode = utils.getIsoLanguageCode(player);
+      expect(languageCode).to.be.undefined;
+      player.getAudioTracks = () => [];
+      languageCode = utils.getIsoLanguageCode(player);
+      expect(languageCode).to.be.undefined;
+    });
+
+    it('should return the first audio track language code if the getCurrentAudioTrack returns undefined', function () {
+      const player = getPlayerMock();
+      player.getAudioTracks = () => sampleAudioTracks;
+      let languageCode = utils.getIsoLanguageCode(player);
+      expect(languageCode).to.be.equal('ht');
+    });
+
+    it('should return the first audio track  language code if the getCurrentAudioTrack returns null', function () {
+      const player = getPlayerMock();
+      player.getAudioTracks = () => sampleAudioTracks;
+      player.getCurrentAudioTrack = () => null;
+      let languageCode = utils.getIsoLanguageCode(player);
+      expect(languageCode).to.be.equal('ht');
+    });
+
+    it('should return the first audio track language code if the getCurrentAudioTrack returns -1', function () {
+      const player = getPlayerMock();
+      player.getAudioTracks = () => sampleAudioTracks;
+      player.getCurrentAudioTrack = () => -1;
+      const languageCode = utils.getIsoLanguageCode(player);
+      expect(languageCode).to.be.equal('ht');
+    });
+
+    it('should return the right audio track language code', function () {
+      const player = getPlayerMock();
+      player.getAudioTracks = () => sampleAudioTracks;
+      player.getCurrentAudioTrack = () => 2;
+      const languageCode = utils.getIsoLanguageCode(player);
+      expect(languageCode).to.be.equal('es');
+    });
+  });
+});
diff --git a/test/spec/modules/videoModule/submodules/videojsVideoProvider_spec.js b/test/spec/modules/videoModule/submodules/videojsVideoProvider_spec.js
new file mode 100644
index 00000000000..a7379ccbab2
--- /dev/null
+++ b/test/spec/modules/videoModule/submodules/videojsVideoProvider_spec.js
@@ -0,0 +1,391 @@
+// Using require style imports for fine grained control of import time
+import {
+  SETUP_COMPLETE, SETUP_FAILED
+} from 'libraries/video/constants/events.js';
+
+const {VideojsProvider, utils} = require('modules/videojsVideoProvider');
+
+const {
+  PROTOCOLS, API_FRAMEWORKS, VIDEO_MIME_TYPE, PLAYBACK_METHODS, PLACEMENT, VPAID_MIME_TYPE, AD_POSITION
+} = require('libraries/video/constants/ortb.js');
+
+const videojs = require('video.js').default;
+require('videojs-playlist').default;
+require('videojs-ima').default;
+require('videojs-contrib-ads').default;
+
+describe('videojsProvider', function () {
+  let config;
+  let adState;
+  let timeState;
+  let callbackStorage;
+
+  describe('init', function () {
+    beforeEach(() => {
+      config = {};
+      document.body.innerHTML = '';
+    });
+
+    it('should trigger failure when videojs is missing', function () {
+      const provider = VideojsProvider(config, null, adState, timeState, callbackStorage, utils);
+      const setupFailed = sinon.spy();
+      provider.onEvent(SETUP_FAILED, setupFailed, {});
+      provider.init();
+      expect(setupFailed.calledOnce).to.be.true;
+      const payload = setupFailed.args[0][1];
+      expect(payload.errorCode).to.be.equal(-1);
+    });
+
+    it('should trigger failure when videojs version is under min supported version', function () {
+      const provider = VideojsProvider(config, {...videojs, VERSION: '0.0.0'}, adState, timeState, callbackStorage, utils);
+      const setupFailed = sinon.spy();
+      provider.onEvent(SETUP_FAILED, setupFailed, {});
+      provider.init();
+      expect(setupFailed.calledOnce).to.be.true;
+      const payload = setupFailed.args[0][1];
+      expect(payload.errorCode).to.be.equal(-2);
+    });
+
+    it('should trigger failure when the div is not found', function () {
+      config.divId = 'fake-div'
+      const provider = VideojsProvider(config, videojs, adState, timeState, callbackStorage, utils);
+      const setupFailed = sinon.spy();
+      provider.onEvent(SETUP_FAILED, setupFailed, {});
+      provider.init();
+      expect(setupFailed.calledOnce).to.be.true;
+      const payload = setupFailed.args[0][1];
+      expect(payload.errorCode).to.be.equal(-3);
+    });
+
+    it('should instantiate the player when uninstantied', function () {
+      config.playerConfig = {testAttr: true};
+      config.divId = 'test-div'
+      const div = document.createElement('div');
+      div.setAttribute('id', 'test-div');
+      document.body.appendChild(div);
+
+      const mockVideojs = sinon.spy();
+      const provider = VideojsProvider(config, mockVideojs, adState, timeState, callbackStorage, utils);
+      provider.init();
+      expect(mockVideojs.calledOnce).to.be.true
+    });
+
+    it('should not reinstantiate the player', function () {
+      const div = document.createElement('div');
+      div.setAttribute('id', 'test-div');
+      document.body.appendChild(div);
+      const player = videojs(div, {})
+      config.playerConfig = {};
+      config.divId = 'test-div'
+      const provider = VideojsProvider(config, videojs, adState, timeState, callbackStorage, utils);
+      provider.init();
+      expect(videojs.getPlayer('test-div')).to.be.equal(player)
+      videojs.getPlayer('test-div').dispose()
+    });
+
+    it('should trigger setup complete when player is already insantiated', function () {
+      const div = document.createElement('div');
+      div.setAttribute('id', 'test-div');
+      document.body.appendChild(div);
+      videojs(div, {})
+      config.playerConfig = {};
+      config.divId = 'test-div'
+      const provider = VideojsProvider(config, videojs, adState, timeState, callbackStorage, utils);
+      const setupComplete = sinon.spy();
+      provider.onEvent(SETUP_COMPLETE, setupComplete, {});
+      provider.init();
+      expect(setupComplete.called).to.be.true;
+      videojs.getPlayer('test-div').dispose()
+    });
+  });
+
+  describe('getId', function () {
+    it('should return configured div id', function () {
+      const provider = VideojsProvider({ divId: 'test_id' });
+      expect(provider.getId()).to.be.equal('test_id');
+    });
+  });
+
+  describe('getOrtbParams', function () {
+    beforeEach(() => {
+      config = {divId: 'test'};
+      // initialize videojs element
+      document.body.innerHTML = `
+      <video preload id='test' width="${200}" height="${100}">
+      <source src="http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4" type="video/mp4">
+      </video>`;
+    });
+
+    afterEach(() => {
+      const testPlayer = videojs('test');
+      if (testPlayer && !testPlayer.isDisposed()) {
+        testPlayer.dispose();
+      }
+    });
+
+    it('should populate oRTB Video and Content', function () {
+      const provider = VideojsProvider(config, videojs, adState, timeState, callbackStorage, utils);
+      provider.init();
+
+      const video = provider.getOrtbVideo();
+
+      expect(video.mimes).to.include(VIDEO_MIME_TYPE.MP4);
+      expect(video.protocols).to.deep.equal([2]);
+      expect(video.h).to.equal(100);
+      expect(video.w).to.equal(200);
+
+      expect(video.maxextended).to.equal(-1);
+      expect(video.boxingallowed).to.equal(1);
+      expect(video.playbackmethod).to.include(PLAYBACK_METHODS.CLICK_TO_PLAY);
+      expect(video.playbackend).to.equal(1);
+      expect(video.api).to.deep.equal([2]);
+      expect(video.placement).to.be.equal(PLACEMENT.INSTREAM);
+    });
+
+    it('should populate oRTB Content', function () {
+      const provider = VideojsProvider(config, videojs, adState, timeState, callbackStorage, utils);
+      provider.init();
+
+      const content = provider.getOrtbContent();
+      expect(content.url).to.be.equal('http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4');
+      expect(content).to.not.have.property('len');
+    });
+
+    it('should change populated oRTB params when ima present', function () {
+      require('videojs-contrib-ads');
+      require('videojs-ima');
+      config.playerConfig = {
+        params: {
+          vendorConfig: {
+            mediaid: 'vendor-id',
+            advertising: {
+              tag: ['test-tag']
+            }
+          }
+        }
+      }
+
+      let provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const video = provider.getOrtbVideo();
+
+      expect(video.protocols).to.include(PROTOCOLS.VAST_2_0);
+      expect(video.api).to.include(API_FRAMEWORKS.VPAID_2_0);
+      expect(video.mimes).to.include(VPAID_MIME_TYPE);
+    });
+    //
+    // We can't determine what type of outstream play is occuring
+    // if the src is absent so we should not set placement
+    it('should not set placement when src is absent', function() {
+      document.body.innerHTML = `<video preload id='test' width="${200}" height="${100}"></video>`
+      const provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const video = provider.getOrtbVideo();
+      expect(video).to.not.have.property('placement')
+    })
+    //
+    it('should populate position when fullscreen', function () {
+      const provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const player = videojs.getPlayer('test')
+      player.isFullscreen = () => true;
+      const video = provider.getOrtbVideo();
+      expect(video.pos).to.equal(7);
+    });
+    //
+    it('should populate length when loaded', function () {
+      const provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const player = videojs.getPlayer('test')
+      player.readyState = () => 1
+      player.duration = () => 100
+      const content = provider.getOrtbContent();
+      expect(content.len).to.equal(100);
+    });
+    //
+    it('should return the correct playback method for autoplay', function () {
+      const provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const player = videojs.getPlayer('test')
+      player.autoplay(true)
+      const video = provider.getOrtbVideo();
+      expect(video.playbackmethod).to.include(PLAYBACK_METHODS.AUTOPLAY);
+    });
+    //
+    it('should return the correct playback method for autoplay muted', function () {
+      const provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const player = videojs.getPlayer('test')
+      player.muted = () => true
+      player.autoplay = () => true
+      const video = provider.getOrtbVideo();
+      expect(video.playbackmethod).to.include(PLAYBACK_METHODS.AUTOPLAY_MUTED);
+    });
+    //
+    it('should return the correct playback method for the other autoplay muted', function () {
+      const provider = VideojsProvider(config, videojs, null, null, null, utils);
+      provider.init();
+      const player = videojs.getPlayer('test')
+      player.autoplay = () => 'muted'
+      const video = provider.getOrtbVideo();
+      expect(video.playbackmethod).to.include(PLAYBACK_METHODS.AUTOPLAY_MUTED);
+    });
+  });
+});
+
+describe('utils', function() {
+  describe('getSetupConfig', function() {
+    it('should return undefined when config is absent', function () {
+      expect(utils.getSetupConfig()).to.be.undefined;
+    });
+
+    it('should give priority to vendorConfig', function () {
+      const config = {
+        autostart: false,
+        mute: false,
+        params: {
+          vendorConfig: {
+            autostart: true,
+            mute: true,
+            other: true
+          }
+        }
+      };
+      const setupConfig = utils.getSetupConfig(config);
+      expect(setupConfig.autostart).to.be.true;
+      expect(setupConfig.mute).to.be.true;
+      expect(setupConfig.other).to.be.true;
+    });
+
+    it('should only global apply properties when absent from vendor config', function () {
+      const config = {
+        autostart: false,
+        params: {
+          vendorConfig: {
+            other: true
+          }
+        }
+      };
+      const setupConfig = utils.getSetupConfig(config);
+      expect(setupConfig.autostart).to.be.false;
+      expect(setupConfig.mute).to.be.undefined;
+      expect(setupConfig.other).to.be.true;
+    });
+  });
+
+  describe('getAdConfig', function () {
+    it('should return empty object when config is absent', function () {
+      expect(utils.getAdConfig()).to.deep.equal({});
+    });
+
+    it('should return adPluginConfig', function () {
+      const config = {
+        params: {
+          adPluginConfig: {
+            vpaid: true,
+          }
+        }
+      };
+
+      expect(utils.getAdConfig(config)).to.be.equal(config.params.adPluginConfig);
+    });
+  });
+
+  describe('getPositionCode', function() {
+    it('should return the correct position when video is above the fold', function () {
+      const code = utils.getPositionCode({
+        left: window.innerWidth / 10,
+        top: 0,
+        width: window.innerWidth - window.innerWidth / 10,
+        height: window.innerHeight,
+      })
+      expect(code).to.equal(AD_POSITION.ABOVE_THE_FOLD)
+    });
+
+    it('should return the correct position when video is below the fold', function () {
+      const code = utils.getPositionCode({
+        left: window.innerWidth / 10,
+        top: window.innerHeight,
+        width: window.innerWidth - window.innerWidth / 10,
+        height: window.innerHeight / 2,
+      })
+      expect(code).to.equal(AD_POSITION.BELOW_THE_FOLD)
+    });
+
+    it('should return the unkown position when the video is out of bounds', function () {
+      const code = utils.getPositionCode({
+        left: window.innerWidth / 10,
+        top: window.innerHeight,
+        width: window.innerWidth,
+        height: window.innerHeight,
+      })
+      expect(code).to.equal(AD_POSITION.UNKNOWN)
+    });
+  });
+
+  describe('Playlist', function () {
+    const emptyPlayer = {};
+
+    describe('getPlaylistCount', function () {
+      it('should return 1 when playlist is absent', function () {
+        expect(utils.getPlaylistCount(emptyPlayer)).to.be.equal(1);
+      });
+
+      it('should return playlist length', function () {
+        document.body.innerHTML = `
+      <video preload id='test' width="${200}" height="${100}">
+      <source src="http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4" type="video/mp4">
+      </video>`;
+        const player = videojs('test', {});
+        player.playlist([{
+          sources: { src: 'sample.mp4' }
+        }, {
+          sources: { src: 'sample2.mp4' }
+        }]);
+        expect(utils.getPlaylistCount(player)).to.be.equal(2);
+        player.dispose();
+      });
+    });
+
+    describe('getCurrentPlaylistIndex', function () {
+      it('should return 0 when playlist is absent', function () {
+        expect(utils.getCurrentPlaylistIndex(emptyPlayer)).to.be.equal(0);
+      });
+    });
+
+    describe('getCurrentPlaylistItem', function () {
+      it('should return undefined when playlist is absent', function () {
+        expect(utils.getCurrentPlaylistItem(emptyPlayer)).to.be.undefined;
+      });
+    });
+  });
+
+  describe('Get Media', function () {
+    describe('parseSource', function () {
+      it('should return src property when source is object', function () {
+        expect(utils.parseSource({
+          src: 'test.url',
+          other: 'other'
+        })).to.be.equal('test.url');
+      });
+
+      it('should return source when it is a string', function () {
+        expect(utils.parseSource('test.url')).to.be.equal('test.url');
+      });
+
+      it('should return undefined when not object or string', function () {
+        expect(utils.parseSource(() => {})).to.be.undefined;
+      });
+    });
+
+    describe('getMediaUrl', function () {
+      it('should return undefined when arg is missing', function () {
+        expect(utils.getMediaUrl()).to.be.undefined;
+      });
+
+      it('should parse first index when arg is array', function () {
+        expect(utils.getMediaUrl(['test.url.1', 'test.url.2'])).to.be.equal('test.url.1');
+      });
+    });
+  });
+})
diff --git a/test/spec/modules/videoModule/videoImpressionVerifier_spec.js b/test/spec/modules/videoModule/videoImpressionVerifier_spec.js
new file mode 100644
index 00000000000..58109219a37
--- /dev/null
+++ b/test/spec/modules/videoModule/videoImpressionVerifier_spec.js
@@ -0,0 +1,112 @@
+import { baseImpressionVerifier, PB_PREFIX } from 'modules/videoModule/videoImpressionVerifier.js';
+
+let trackerMock;
+trackerMock = {
+  store: sinon.spy(),
+  remove: sinon.spy()
+}
+
+describe('Base Impression Verifier', function() {
+  describe('trackBid', function () {
+    it('should generate uuid', function () {
+      const baseVerifier = baseImpressionVerifier(trackerMock);
+      const uuid = baseVerifier.trackBid({});
+      expect(uuid.substring(0, 3)).to.equal(PB_PREFIX);
+      expect(uuid.length).to.be.lessThan(16);
+    });
+  });
+
+  describe('getBidIdentifiers', function () {
+    it('should match ad id to uuid', function () {
+
+    });
+  });
+});
+
+/*
+const adUnitCode = 'test_ad_unit_code';
+const sampleBid = {
+  adId: 'test_ad_id',
+  adUnitCode,
+  vastUrl: 'test_ad_url'
+};
+const sampleAdUnit = {
+  code: adUnitCode,
+};
+
+const expectedImpressionUrl = 'test_impression_url';
+const expectedImpressionId = 'test_impression_id';
+const expectedErrorUrl = 'test_error_url';
+const expectedVastXml = 'test_xml';
+
+it('should not modify the bid\'s adXml when the tracking config is omitted', function () {
+  const adUnit = Object.assign({}, sampleAdUnit, { video: { adServer: { tracking: null } } });
+  const pbGlobal = Object.assign({}, pbGlobalMock, { adUnits: [ adUnit ] });
+  pbVideoFactory(null, () => ({}), pbGlobal, pbEvents);
+
+  bidAdjustmentCb(sampleBid);
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.called).to.be.false;
+  // expect(vastXmlEditorMock.buildVastWrapper.called).to.be.false;
+});
+
+it('should request a vast wrapper when only an ad url is provided', function () {
+  const adUnit = Object.assign({}, sampleAdUnit, { video: { adServer: { tracking: { } } } });
+  const pbGlobal = Object.assign({}, pbGlobalMock, { adUnits: [ adUnit ] });
+  pbVideoFactory(null, () => ({}), pbGlobal, pbEvents);
+
+  bidAdjustmentCb(sampleBid);
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.called).to.be.false;
+  // expect(vastXmlEditorMock.buildVastWrapper.called).to.be.true;
+});
+
+it('should request the addition of tracking nodes when an ad xml is provided', function () {
+  const adUnit = Object.assign({}, sampleAdUnit, { video: { adServer: { tracking: { } } } });
+  const pbGlobal = Object.assign({}, pbGlobalMock, { adUnits: [ adUnit ] });
+  pbVideoFactory(null, () => ({}), pbGlobal, pbEvents);
+
+  const bid = Object.assign({}, sampleBid, { vastXml: 'test_xml' });
+  bidAdjustmentCb(bid);
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.called).to.be.true;
+  // expect(vastXmlEditorMock.buildVastWrapper.called).to.be.false;
+});
+
+it('should pass the tracking information as args to the xml editing function', function () {
+  const adUnit = Object.assign({}, sampleAdUnit, { video: { adServer: { tracking: {
+    impression: {
+      url: expectedImpressionUrl,
+      id: expectedImpressionId
+    },
+    error: {
+      url: expectedErrorUrl
+    }
+  } } } });
+  const pbGlobal = Object.assign({}, pbGlobalMock, { adUnits: [ adUnit ] });
+  pbVideoFactory(null, () => ({}), pbGlobal, pbEvents);
+
+  const bid = Object.assign({}, sampleBid, { vastXml: expectedVastXml });
+  bidAdjustmentCb(bid);
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.called).to.be.true;
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.calledWith(expectedVastXml, expectedImpressionUrl, expectedImpressionId, expectedErrorUrl))
+  // expect(vastXmlEditorMock.buildVastWrapper.called).to.be.false;
+});
+
+it('should generate the impression id when not specified in config', function () {
+  const adUnit = Object.assign({}, sampleAdUnit, { video: { adServer: { tracking: {
+    impression: {
+      url: expectedImpressionUrl,
+    },
+    error: {
+      url: expectedErrorUrl
+    }
+  } } } });
+  const pbGlobal = Object.assign({}, pbGlobalMock, { adUnits: [ adUnit ] });
+  pbVideoFactory(null, () => ({}), pbGlobal, pbEvents);
+
+  const bid = Object.assign({}, sampleBid, { vastXml: expectedVastXml });
+  bidAdjustmentCb(bid);
+  const expectedGeneratedId = sampleBid.adId + '-impression';
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.called).to.be.true;
+  // expect(vastXmlEditorMock.getVastXmlWithTrackingNodes.calledWith(expectedVastXml, expectedImpressionUrl, expectedGeneratedId, expectedErrorUrl))
+  // expect(vastXmlEditorMock.buildVastWrapper.called).to.be.false;
+});
+*/
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index aac36ee76a1..4c1f5c3b455 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -1241,7 +1241,7 @@ describe('Unit: Prebid Module', function () {
 
     it('should require doc and id params', function () {
       $$PREBID_GLOBAL$$.renderAd();
-      var error = 'Error trying to write ad Id :undefined to the page. Missing document or adId';
+      var error = 'Error trying to write ad Id :undefined to the page. Missing adId';
       assert.ok(spyLogError.calledWith(error), 'expected param error was logged');
     });
 

From 21712ca1f99e573c51d217ddcc4a4f08273dfb9d Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Fri, 21 Oct 2022 12:21:48 -0700
Subject: [PATCH 374/569] PBJS-ORTB conversion library (#8738)

* Automatically resolve libraries and their dependencies

* Move AnalyticsAdapter under libraries

* PBJS-ORTB conversion library

* Update ortbConverter README

* Improvements on request generation

* refactor openxOrtbBidAdapter

* Update README

* Filter out imps that have no id

* Fix nativeMapper logic

* Prebid core: simplify native ORTB logic

* Remove nativeMapper; do not mix ORTB request and response

* fix lint

* set bidRequest.nativeParams after ortb -> legacy conversion

* Fix native trackers for native ortb responses (including Prebid Server)

* Clean up native processors; add s2sConfig.ortbNative

* Make ext.prebid.floors.enabled respect first party data

* do not set placement for oustream video

* Improvements

* convert improvedigitalBidAdapter

* Update openxOrtbBidAdapter

* Improve video validation logic

* Move skip validation back to improvedigital

* Update README

* Override (not merge) context.nativeRequest

* Update improvedigital adapter

* Address PR feedback on improvedigital

* Fix tmax to s2sConfig.timeout for PBS adapter

* PBS adapter: set source.ext.schain with the most commonly used schain

* Remove dead code

* Use auctionId for source.tid

* Update package-lock

* Set source.tid to auctionId

* Update README

* Update README

* Update README
---
 libraries/ortbConverter/README.md             | 378 +++++++++
 libraries/ortbConverter/converter.js          | 135 ++++
 libraries/ortbConverter/lib/composer.js       |  43 +
 .../ortbConverter/lib/mergeProcessors.js      |   9 +
 libraries/ortbConverter/lib/sizes.js          |  14 +
 libraries/ortbConverter/processors/banner.js  |  40 +
 libraries/ortbConverter/processors/default.js | 167 ++++
 .../ortbConverter/processors/mediaType.js     |  21 +
 libraries/ortbConverter/processors/native.js  |  37 +
 libraries/ortbConverter/processors/video.js   |  66 ++
 libraries/pbsExtensions/pbsExtensions.js      |  12 +
 libraries/pbsExtensions/processors/aliases.js |  17 +
 .../pbsExtensions/processors/mediaType.js     |  23 +
 libraries/pbsExtensions/processors/params.js  |  22 +
 libraries/pbsExtensions/processors/pbs.js     |  99 +++
 .../processors/requestExtPrebid.js            |  30 +
 libraries/pbsExtensions/processors/video.js   |  23 +
 modules/consentManagement.js                  |  23 +-
 modules/consentManagementUsp.js               |  11 +-
 modules/currency.js                           |   9 +
 modules/improvedigitalBidAdapter.js           | 620 ++++-----------
 modules/multibid/index.js                     |  12 +
 modules/openxOrtbBidAdapter.js                | 395 +++-------
 modules/prebidServerBidAdapter/index.js       | 735 +-----------------
 .../prebidServerBidAdapter/ortbConverter.js   | 274 +++++++
 modules/priceFloors.js                        |  72 ++
 modules/schain.js                             |  25 +-
 modules/userId/index.js                       |  11 +-
 package-lock.json                             |  12 +-
 src/pbjsORTB.js                               |  35 +
 src/utils.js                                  |  21 +
 src/utils/currency.js                         |  16 +
 .../modules/improvedigitalBidAdapter_spec.js  | 356 ++++-----
 test/spec/modules/openxOrtbBidAdapter_spec.js | 126 +--
 .../modules/prebidServerBidAdapter_spec.js    | 276 +++----
 test/spec/ortbConverter/banner_spec.js        | 203 +++++
 test/spec/ortbConverter/composer_spec.js      |  69 ++
 test/spec/ortbConverter/converter_spec.js     | 283 +++++++
 test/spec/ortbConverter/currency_spec.js      |  40 +
 .../ortbConverter/default_processors_spec.js  |  61 ++
 test/spec/ortbConverter/gdpr_spec.js          |  38 +
 test/spec/ortbConverter/mediaTypes_spec.js    |  67 ++
 .../ortbConverter/mergeProcessors_spec.js     |  59 ++
 test/spec/ortbConverter/multibid_spec.js      |  35 +
 test/spec/ortbConverter/native_spec.js        |  95 +++
 test/spec/ortbConverter/pbjsORTB_spec.js      |  67 ++
 .../pbsExtensions/aliases_spec.js             |  57 ++
 .../pbsExtensions/params_spec.js              |  96 +++
 .../ortbConverter/pbsExtensions/video_spec.js |  52 ++
 test/spec/ortbConverter/priceFloors_spec.js   | 143 ++++
 test/spec/ortbConverter/schain_spec.js        |  33 +
 test/spec/ortbConverter/userId_spec.js        |  21 +
 test/spec/ortbConverter/usp_spec.js           |  15 +
 test/spec/ortbConverter/video_spec.js         | 189 +++++
 test/spec/utils_spec.js                       |  46 +-
 55 files changed, 3970 insertions(+), 1864 deletions(-)
 create mode 100644 libraries/ortbConverter/README.md
 create mode 100644 libraries/ortbConverter/converter.js
 create mode 100644 libraries/ortbConverter/lib/composer.js
 create mode 100644 libraries/ortbConverter/lib/mergeProcessors.js
 create mode 100644 libraries/ortbConverter/lib/sizes.js
 create mode 100644 libraries/ortbConverter/processors/banner.js
 create mode 100644 libraries/ortbConverter/processors/default.js
 create mode 100644 libraries/ortbConverter/processors/mediaType.js
 create mode 100644 libraries/ortbConverter/processors/native.js
 create mode 100644 libraries/ortbConverter/processors/video.js
 create mode 100644 libraries/pbsExtensions/pbsExtensions.js
 create mode 100644 libraries/pbsExtensions/processors/aliases.js
 create mode 100644 libraries/pbsExtensions/processors/mediaType.js
 create mode 100644 libraries/pbsExtensions/processors/params.js
 create mode 100644 libraries/pbsExtensions/processors/pbs.js
 create mode 100644 libraries/pbsExtensions/processors/requestExtPrebid.js
 create mode 100644 libraries/pbsExtensions/processors/video.js
 create mode 100644 modules/prebidServerBidAdapter/ortbConverter.js
 create mode 100644 src/pbjsORTB.js
 create mode 100644 src/utils/currency.js
 create mode 100644 test/spec/ortbConverter/banner_spec.js
 create mode 100644 test/spec/ortbConverter/composer_spec.js
 create mode 100644 test/spec/ortbConverter/converter_spec.js
 create mode 100644 test/spec/ortbConverter/currency_spec.js
 create mode 100644 test/spec/ortbConverter/default_processors_spec.js
 create mode 100644 test/spec/ortbConverter/gdpr_spec.js
 create mode 100644 test/spec/ortbConverter/mediaTypes_spec.js
 create mode 100644 test/spec/ortbConverter/mergeProcessors_spec.js
 create mode 100644 test/spec/ortbConverter/multibid_spec.js
 create mode 100644 test/spec/ortbConverter/native_spec.js
 create mode 100644 test/spec/ortbConverter/pbjsORTB_spec.js
 create mode 100644 test/spec/ortbConverter/pbsExtensions/aliases_spec.js
 create mode 100644 test/spec/ortbConverter/pbsExtensions/params_spec.js
 create mode 100644 test/spec/ortbConverter/pbsExtensions/video_spec.js
 create mode 100644 test/spec/ortbConverter/priceFloors_spec.js
 create mode 100644 test/spec/ortbConverter/schain_spec.js
 create mode 100644 test/spec/ortbConverter/userId_spec.js
 create mode 100644 test/spec/ortbConverter/usp_spec.js
 create mode 100644 test/spec/ortbConverter/video_spec.js

diff --git a/libraries/ortbConverter/README.md b/libraries/ortbConverter/README.md
new file mode 100644
index 00000000000..31f56b4c754
--- /dev/null
+++ b/libraries/ortbConverter/README.md
@@ -0,0 +1,378 @@
+# Prebid.js - ORTB conversion library
+
+This library provides methods to convert Prebid.js bid request objects to ORTB requests, 
+and ORTB responses to Prebid.js bid response objects. 
+
+## Usage
+
+The simplest way to use this from an adapter is:
+
+```javascript
+import {ortbConverter} from '../../libraries/ortbConverter/converter.js'
+
+const converter = ortbConverter({     
+    context: {
+        // `netRevenue` and `ttl` are required properties of bid responses - provide a default for them 
+        netRevenue: true,    // or false if your adapter should set bidResponse.netRevenue = false
+        ttl: 30              // default bidResponse.ttl (when not specified in ORTB response.seatbid[].bid[].exp)  
+    }
+});
+
+registerBidder({
+    // ... rest of your spec goes here ...    
+    buildRequests(bidRequests, bidderRequest) {
+        const data = converter.toORTB({bidRequests, bidderRequest})
+        // you may need to adjust `data` to suit your needs - see "customization" below
+        return [{
+            method: METHOD,
+            url: ENDPOINT_URL,
+            data
+        }]
+    },
+    interpretResponse(response, request) {
+        const bids = converter.fromORTB({response: response.body, request: request.data}).bids;
+        // likewise, you may need to adjust the bid response objects
+        return bids;
+    },
+})
+```
+
+Without any customization, the library will generate complete ORTB requests, but ignores your [bid params](#params). 
+If your endpoint sets `response.seatbid[].bid[].mtype` (part of the ORTB 2.6 spec), it will also parse the response into complete bidResponse objects. See [setting response mediaTypes](#response-mediaTypes) if that is not the case.
+
+### Module-specific conversions
+
+Prebid.js features that require a module also require it for their corresponding ORTB conversion logic. For example, `imp.bidfloor` is only populated if the `priceFloors` module is active; `request.cur` needs the `currency` module, and so on. Notably, this means that to get those fields populated from your unit tests, you must import those modules first; see [this suite](https://github.com/prebid/Prebid.js/blob/master/test/spec/modules/openxOrtbBidAdapter_spec.js) for an example.
+
+## Customization
+
+### Modifying return values directly
+
+You are free to modify the objects returned by both `toORTB` and `fromORTB`:
+
+```javascript
+const data = converter.toORTB({bidRequests, bidderRequest});
+deepSetValue(data.imp[0], 'ext.myCustomParam', bidRequests[0].params.myCustomParam);
+```
+
+However, there are two restrictions (to avoid them, use the [other customization options](#fine-customization)):
+
+ - you may not change the `imp[].id` returned by `toORTB`; they ared used internally to match responses to their requests.
+     ```javascript
+     const data = converter.toORTB({bidRequests, bidderRequest});
+     data.imp[0].id = 'custom-imp-id' // do not do this - it will cause an error later in `fromORTB`
+     ```
+   See also [overriding `imp.id`](#imp-id).
+ - the `request` argument passed to `fromORTB` must be the same object returned by `toORTB`.
+    ```javascript
+    let data = converter.toORTB({bidRequests, bidderRequest});
+   
+    data = mergeDeep(                                              // the original object is lost
+      {ext: {myCustomParam: bidRequests[0].params.myCustomParam}}, // `fromORTB` will later throw an error
+      data
+    ); 
+    
+    // do this instead:                                                                                     
+    mergeDeep(                                                     
+      data, 
+      {ext: {myCustomParam: bidRequests[0].params.myCustomParam}}, 
+      data
+    )   
+    ```
+
+<a id="fine-customization" />
+### Fine grained customization - imp, request, bidResponse, response
+
+When invoked, `toORTB({bidRequests, bidderRequest})` first loops through each request in `bidRequests`, converting them into ORTB `imp` objects.
+It then packages them into a single ORTB request, adding other parameters that are not imp-specific (such as for example `request.tmax`).
+
+Likewise, `fromORTB({request, response})` first loops through each `response.seatbid[].bid[]`, converting them into Prebid bidResponses; it then packages them into 
+a single return value.
+
+You can customize each of these steps using the `ortbConverter` arguments `imp`, `request`, `bidResponse` and `response`:
+
+### <a id="imp" />Customizing imps: `imp(buildImp, bidRequest, context)`
+
+Invoked once for each input `bidRequest`; should return the ORTB `imp` object to include in the request.
+The arguments are:
+
+- `buildImp`: a function taking `(bidRequest, context)` and returning an ORTB `imp` object;
+- `bidRequest`: the bid request object to convert;
+- `context`: a [context object](#context) that contains at least:
+   - `bidderRequest`: the `bidderRequest` argument passed to `toORTB`.
+   
+#### <a id="params" />Example: attaching custom bid params
+
+```javascript
+const converter = ortbConverter({
+   imp(buildImp, bidRequest, context) {
+       const imp = buildImp(bidRequest, context);
+       deepSetValue(imp, 'ext.params', bidRequest.params);
+       return imp;
+   }
+})
+```
+
+#### <a id="imp-id" /> Example: overriding imp.id
+
+```javascript
+const converter = ortbConverter({
+   imp(buildImp, bidRequest, context) {
+       const imp = buildImp(bidRequest, context);
+       imp.id = randomIdentifierStr();
+       return imp;
+   }
+})
+```
+
+### <a id="request" /> Customizing the request: `request(buildRequest, imps, bidderRequest, context)`
+
+Invoked once after all bidRequests have been converted into `imp`s; should return the complete ORTB request. The return value
+of this function is also the return value of `toORTB`.
+The arguments are:
+
+- `buildRequest`: a function taking `(imps, bidderRequest, context)` and returning an ORTB request object;
+- `imps` an array of ORTB `imp` objects that should be included in the request;
+- `bidderRequest`: the `bidderRequest` argument passed to `toORTB`;
+- `context`: a [context object](#context) that contains at least:
+    - `bidRequests`: the `bidRequests` argument passed to `toORTB`.
+
+#### Example: setting additional request properties
+
+```javascript
+const converter = ortbConverter({
+   request(buildRequest, imps, bidderRequest, context) {
+      const request = buildRequest(imps, bidderRequest, context);
+      deepSetValue(request, 'ext.adapterVersion', '0.0.1'); 
+      return request;
+   }
+})
+```
+
+### <a id="bidResponse" /> Customizing bid responses: `bidResponse(buildBidResponse, bid, context)`
+
+Invoked once for each `seatbid[].bid[]` in the response; should return the corresponding Prebid.js bid response object.
+The arguments are:
+- `buildBidResponse`: a function taking `(bid, context)` and returning a Prebid.js bid response object;
+- `bid`: an ORTB `seatbid[].bid[]` object;
+- `context`: a [context object](#context) that contains at least:
+    - `seatbid`: the ORTB `seatbid[]` object that encloses `bid`;
+    - `imp`: the ORTB request's `imp` object that matches `bid.impid`;
+    - `bidRequest`: the Prebid.js bid request object that was used to generate `context.imp`;
+    - `ortbRequest`: the `request` argument passed to `fromORTB`;
+    - `ortbResponse`: the `response` argument passed to `fromORTB`.
+
+#### Example: setting a custom outstream renderer
+
+```javascript
+const converter = ortbConverter({
+    bidResponse(buildBidResponse, bid, context) {
+        const bidResponse = buildBidResponse(bid, context);
+        const {bidRequest} = context;
+        if (bidResponse.mediaType === VIDEO && bidRequest.mediaTypes.video.context === 'outstream') {
+            bidResponse.renderer = Renderer.install({
+                url: RENDERER_URL,
+                id: bidRequest.bidId,  
+                adUnitCode: bidRequest.adUnitCode
+            });
+        }
+        return bidResponse;
+    }
+})
+```
+
+#### <a id="response-mediaTypes" /> Example: setting response mediaType
+
+In ORTB 2.5, bid responses do not specify their mediatype, which is something Prebid.js requires. You can provide it as
+`context.mediaType`:
+
+```javascript
+const converter = ortbConverter({
+    bidResponse(buildBidResponse, bid, context) {
+        context.mediaType =  deepAccess(bid, 'ext.mediaType'); 
+        return buildBidResponse(bid, context)
+    }
+})
+```
+
+If you know that a particular ORTB request/response pair deals with exclusively one mediaType, you may also pass it directly in the [context parameter](#context). 
+Note that - compared to the above - this has additional effects, because `context.mediaType` is also considered during `imp` generation - see [special context properties](#special-context).
+
+```javascript
+converter.toORTB({
+    bidRequests: bidRequests.filter(isVideoBid),
+    bidderRequest,
+    context: {mediaType: 'video'} // make everything in this request/response deal with video only
+})
+```
+
+Note that this will _not_ work as intended:
+
+```javascript
+
+const converter = ortbConverter({
+    bidResponse(buildBidResponse, bid, context) {
+        const bidResponse = buildBidResponse(bid, context); // this throws; buildBidResponse needs to know the 
+                                                            // mediaType to properly populate bidResponse.ad, 
+                                                            // bidResponse.native etc
+        bidResponse.mediaType = deepAccess(bid, 'ext.mediaType'); // too late, use context.mediaType
+        return bidResponse;
+    }
+});
+
+```
+
+### <a id="response" /> Customizing the response: `response(buildResponse, bidResponses, ortbResponse, context)`
+
+Invoked once, after all `seatbid[].bid[]` objects have been converted to corresponding bid responses. The value returned 
+by this function is also the value returned by `fromORTB`.
+The arguments are:
+
+- `buildResponse`: a function that takes `(bidResponses, ortbResponse, context)` and returns `{bids: bidResponses}`. In the future, this may contain additional response data not necessarily tied to any bid (for example fledge auction configuration).
+- `bidResponses`: array of Prebid.js bid response objects
+- `ortbResponse`: the `response` argument passed to `fromORTB`
+- `context`: a [context object](#context) that contains at least:
+    - `ortbRequest`: the `request` argument passed to `fromORTB`;
+    - `bidderRequest`: the `bidderRequest` argument passed to `toORTB`;
+    - `bidRequests`: the `bidRequests` argument passed to `toORTB`.
+
+#### Example: logging server-side errors
+
+```javascript
+const converter = ortbConverter({
+    response(buildResponse, bidResponses, ortbResponse, context) {
+        (deepAccess(ortbResponse, 'ext.errors') || []).forEach((e) => logWarn('Server error', e));
+        return buildResponse(bidResponses, ortbResponse, context);
+    }
+})
+```
+
+### Even finer grained customization - processor overrides
+
+Each of the four conversion steps described above - imp, request, bidResponse and response - is further broken down into
+smaller units of work (called _processors_). For example, when the currency module is included, it adds a _request processor_ 
+that sets `request.cur`; the priceFloors module adds an _imp processor_ that sets `imp.bidfloor` and `imp.bidfloorcur`, and so on.
+
+Each processor can be overridden or disabled through the `overrides` argument:
+
+#### Example: disabling currency
+```javascript
+const converter = ortbConverter({
+    overrides: {
+        request: {
+            currency: false
+        }
+    }
+})
+```
+
+The above is similar in effect to:
+
+```javascript
+const converter = ortbConverter({
+    request(buildRequest, imps, bidderRequest, context) {
+        const request = buildRequest(imps, bidderRequest, context);
+        delete request.cur;
+        return request;
+    }
+})
+```
+
+With the main difference being that setting `currency: false` will disable currency logic entirely, while the `request`
+version will still set `request.cur`, then delete it. If the currency processor is ever updated to deal with more than just `request.cur`, the `request`
+function will also need to be updated accordingly.
+
+#### Example: taking video parameters from `bidRequest.params.video`
+
+Processors can also be overridden:
+
+```javascript
+const converter = ortbConverter({
+    overrides: {
+        imp: {
+            video(orig, imp, bidRequest, context) {
+                // `orig` is the video imp processor, which looks at bidRequest.mediaTypes[VIDEO] 
+                // to populate imp.video
+                // alter its input `bidRequest` to also pick up parameters from `bidRequest.params`
+                let videoParams = bidRequest.mediaTypes[VIDEO];
+                if (videoParams) {
+                    videoParams = Object.assign({}, videoParams, bidRequest.params.video);
+                    bidRequest = {...bidRequest, mediaTypes: {[VIDEO]: videoParams}}
+                }
+                orig(imp, bidRequest, context);
+            } 
+        }
+    }
+});
+```
+
+#### Processor override functions
+
+Processor overrides are similar to the override options described above, except that they take the object to process as argument:
+
+- `imp` processor overrides take `(orig, imp, bidRequest, context)`, where:
+   - `orig` is the processor function being overridden, which itself takes `(imp, bidRequest, context)`;
+   - `imp` is the (partial) imp object to modify;
+   - `bidRequest` and `context` are the same arguments passed to [imp](#imp).
+- `request` processor overrides take `(orig, ortbRequest, bidderRequest, context)`, where:
+   - `orig` is the processor function being overridden, and takes `(ortbRequest, bidderRequest, context)`;
+   - `ortbRequest` is the partial request to modify;
+   - `bidderRequest` and `context` are the same arguments passed to [request](#reuqest).
+- `bidResponse` processor overrides take `(orig, bidResponse, bid, context)`, where: 
+   - `orig` is the processor function being overridden, and takes `(bidResponse, bid, context)`;
+   - `bidResponse` is the partial bid response to modify;
+   - `bid` and `context` are the same arguments passed to [bidResponse](#bidResponse)
+- `response` processor overrides take `(orig, response, ortbResponse, context)`, where:
+   - `orig` is the processor function being overriden, and takes `(response, ortbResponse, context)`;
+   - `response` is the partial response to modify;
+   - `ortbRespones` and `context` are the same arguments passed to [response](#response).
+
+### <a id="context" /> The `context` argument
+
+All customization functions take a `context` argument. This is a plain JS object that is shared between `request` and its corresponding `response`; and between `imp` and its corresponding `bidResponse`:
+
+```javascript
+const converter = ortbConverter({
+    imp(buildImp, bidRequest, context) {
+        // `context` here will be later passed to `bidResponse` (if one matches the imp generated here)
+        context.someData = somethingInterestingAbout(bidRequest);
+        return buildImp(bidRequest, context);
+    },
+    bidResponse(buildBidResponse, bid, context) {
+        const bidResponse = buildBidResponse(bid, context);
+        doSomethingWith(context.someData);
+        return bidResponse;
+    }
+})
+```
+
+`ortbConverter` automatically populates `context` with some values of interest, such as `bidRequest`, `bidderRequest`, etc - as detailed above. In addition, you may pass additional context properties through:
+
+- the `context` argument of `ortbConverter`: e.g. `ortbConverter({context: {ttl: 30}})`. This will set `context.ttl = 30` globally for the converter.
+- the `context` argument of `toORTB`: e.g. `converter.toORTB({bidRequests, bidderRequest, context: {ttl: 30}})`. This will set `context.ttl = 30` only for this request.
+
+### <a id="special-context"/> Special `context` properties
+
+For ease of use, the conversion logic gives special meaning to some context properties:
+
+ - `currency`: a currency string (e.g. `'EUR'`). If specified, overrides the currency to use for computing price floors and `request.cur`. If omitted, both default to `getConfig('currency.adServerCurrency')`.
+ - `mediaType`: a bid mediaType (`'banner'`, `'video'`, or `'native'`). If specified:
+    - disables `imp` generation for other media types (i.e., if `context.mediaType === 'banner'`, only `imp.banner` will be populated; `imp.video` and `imp.native` will not, even if the bid request specifies them);
+    - is passed as the `mediaType` option to `bidRequest.getFloor` when computing price floors;
+    - sets `bidResponse.mediaType`.
+ - `nativeRequest`: a plain object that serves as the base value for `imp.native.request` (and is relevant only for native bid requests).
+      If not specified, the only property that is guaranteed to be populated is `assets`, since Prebid does not require anything else to define a native adUnit. You can use `context.nativeRequest` to provide other properties; for example, you may want to signal support for native impression trackers by setting it to `{eventtrackers: [{event: 1, methods: [1, 2]}]}` (see also the [ORTB Native spec](https://www.iab.com/wp-content/uploads/2018/03/OpenRTB-Native-Ads-Specification-Final-1.2.pdf)).
+ - `netRevenue`: the value to set as `bidResponse.netRevenue`. This is a required property of bid responses that does not have a clear ORTB counterpart.
+ - `ttl`: the default value to use for `bidResponse.ttl` (if the ORTB response does not provide one in `seatbid[].bid[].exp`).
+   
+## Prebid Server extensions
+
+If your endpoint is a Prebid Server instance, you may take advantage of the `pbsExtension` companion library, which adds a number of processors that can populate and parse PBS-specific extensions (typically prefixed `ext.prebid`); these include bidder params (with `transformBidParams`), bidder aliases, targeting keys, and others. 
+
+```javascript
+import {pbsExtensions} from '../../libraries/pbsExtensions/pbsExtensions.js'
+
+const pbsConverter = ortbConverter({
+    processors: pbsExtensions
+})
+```
diff --git a/libraries/ortbConverter/converter.js b/libraries/ortbConverter/converter.js
new file mode 100644
index 00000000000..2057af8b6d3
--- /dev/null
+++ b/libraries/ortbConverter/converter.js
@@ -0,0 +1,135 @@
+import {compose} from './lib/composer.js';
+import {logError, memoize} from '../../src/utils.js';
+import {DEFAULT_PROCESSORS} from './processors/default.js';
+import {BID_RESPONSE, DEFAULT, getProcessors, IMP, REQUEST, RESPONSE} from '../../src/pbjsORTB.js';
+import {mergeProcessors} from './lib/mergeProcessors.js';
+
+export function ortbConverter({
+  context: defaultContext = {},
+  processors = defaultProcessors,
+  overrides = {},
+  imp,
+  request,
+  bidResponse,
+  response,
+} = {}) {
+  const REQ_CTX = new WeakMap();
+
+  function builder(slot, wrapperFn, builderFn, errorHandler) {
+    let build;
+    return function () {
+      if (build == null) {
+        build = (function () {
+          let delegate = builderFn.bind(this, compose(processors()[slot] || {}, overrides[slot] || {}));
+          if (wrapperFn) {
+            delegate = wrapperFn.bind(this, delegate);
+          }
+          return function () {
+            try {
+              return delegate.apply(this, arguments);
+            } catch (e) {
+              errorHandler.call(this, e, ...arguments);
+            }
+          }
+        })();
+      }
+      return build.apply(this, arguments);
+    }
+  }
+
+  const buildImp = builder(IMP, imp,
+    function (process, bidRequest, context) {
+      const imp = {};
+      process(imp, bidRequest, context);
+      return imp;
+    },
+    function (error, bidRequest, context) {
+      logError('Error while converting bidRequest to ORTB imp; request skipped.', {error, bidRequest, context});
+    }
+  );
+
+  const buildRequest = builder(REQUEST, request,
+    function (process, imps, bidderRequest, context) {
+      const ortbRequest = {imp: imps};
+      process(ortbRequest, bidderRequest, context);
+      return ortbRequest;
+    },
+    function (error, imps, bidderRequest, context) {
+      logError('Error while converting to ORTB request', {error, imps, bidderRequest, context});
+      throw error;
+    }
+  );
+
+  const buildBidResponse = builder(BID_RESPONSE, bidResponse,
+    function (process, bid, context) {
+      const bidResponse = {};
+      process(bidResponse, bid, context);
+      return bidResponse;
+    },
+    function (error, bid, context) {
+      logError('Error while converting ORTB seatbid.bid to bidResponse; bid skipped.', {error, bid, context});
+    }
+  );
+
+  const buildResponse = builder(RESPONSE, response,
+    function (process, bidResponses, ortbResponse, context) {
+      const response = {bids: bidResponses};
+      process(response, ortbResponse, context);
+      return response;
+    },
+    function (error, bidResponses, ortbResponse, context) {
+      logError('Error while converting from ORTB response', {error, bidResponses, ortbResponse, context});
+      throw error;
+    }
+  );
+
+  return {
+    toORTB({bidderRequest, bidRequests, context = {}}) {
+      bidRequests = bidRequests || bidderRequest.bids;
+      const ctx = {
+        req: Object.assign({bidRequests}, defaultContext, context),
+        imp: {}
+      }
+      const imps = bidRequests.map(bidRequest => {
+        const impContext = Object.assign({bidderRequest, reqContext: ctx.req}, defaultContext, context);
+        const result = buildImp(bidRequest, impContext);
+        if (result != null) {
+          if (result.hasOwnProperty('id')) {
+            impContext.bidRequest = bidRequest;
+            ctx.imp[result.id] = impContext;
+            return result;
+          }
+          logError('Converted ORTB imp does not specify an id, ignoring bid request', bidRequest, result);
+        }
+      }).filter(Boolean);
+
+      const request = buildRequest(imps, bidderRequest, ctx.req);
+      ctx.req.bidderRequest = bidderRequest;
+      if (request != null) {
+        REQ_CTX.set(request, ctx);
+      }
+      return request;
+    },
+    fromORTB({request, response}) {
+      const ctx = REQ_CTX.get(request);
+      if (ctx == null) {
+        throw new Error('ortbRequest passed to `fromORTB` must be the same object returned by `toORTB`')
+      }
+      function augmentContext(ctx, extraParams = {}) {
+        return Object.assign({ortbRequest: request}, extraParams, ctx);
+      }
+      const impsById = Object.fromEntries((request.imp || []).map(imp => [imp.id, imp]));
+      const bidResponses = (response.seatbid || []).flatMap(seatbid =>
+        (seatbid.bid || []).map((bid) => {
+          if (impsById.hasOwnProperty(bid.impid) && ctx.imp.hasOwnProperty(bid.impid)) {
+            return buildBidResponse(bid, augmentContext(ctx.imp[bid.impid], {imp: impsById[bid.impid], seatbid, ortbResponse: response}));
+          }
+          logError('ORTB response seatbid[].bid[].impid does not match any imp in request; ignoring bid', bid);
+        })
+      ).filter(Boolean);
+      return buildResponse(bidResponses, response, augmentContext(ctx.req));
+    }
+  }
+}
+
+export const defaultProcessors = memoize(() => mergeProcessors(DEFAULT_PROCESSORS, getProcessors(DEFAULT)));
diff --git a/libraries/ortbConverter/lib/composer.js b/libraries/ortbConverter/lib/composer.js
new file mode 100644
index 00000000000..0ceff7f9edb
--- /dev/null
+++ b/libraries/ortbConverter/lib/composer.js
@@ -0,0 +1,43 @@
+const SORTED = new WeakMap();
+
+/**
+ * @typedef {Object} Component
+ * A component function, that can be composed with other compatible functions into one.
+ * Compatible functions take the same arguments; return values are ignored.
+ *
+ * @property {function} fn the component function;
+ * @property {number} priority determines the order in which this function will run when composed with others.
+ */
+
+/**
+ *
+ * @param {Object[string, Component]} components to compose
+ * @param {Object[string, function|boolean]} overrides a map from component name, to a function that should override that component.
+ * Override functions are replacements, except that they get the original function they are overriding as their first argument. If the override
+ * is `false`, the component is disabled.
+ *
+ * @return a function that will run all components in order of priority, with functions from `overrides` taking
+ * precedence over components that match names
+ */
+export function compose(components, overrides = {}) {
+  if (!SORTED.has(components)) {
+    const sorted = Object.entries(components);
+    sorted.sort((a, b) => {
+      a = a[1].priority || 0;
+      b = b[1].priority || 0;
+      return a === b ? 0 : a > b ? -1 : 1
+    });
+    SORTED.set(components, sorted.map(([name, cmp]) => [name, cmp.fn]))
+  }
+  const fns = SORTED.get(components)
+    .filter(([name]) => !overrides.hasOwnProperty(name) || overrides[name])
+    .map(function ([name, fn]) {
+      return overrides.hasOwnProperty(name) ? overrides[name].bind(this, fn) : fn;
+    });
+  return function () {
+    const args = Array.from(arguments);
+    fns.forEach(fn => {
+      fn.apply(this, args);
+    })
+  }
+}
diff --git a/libraries/ortbConverter/lib/mergeProcessors.js b/libraries/ortbConverter/lib/mergeProcessors.js
new file mode 100644
index 00000000000..357cecd45aa
--- /dev/null
+++ b/libraries/ortbConverter/lib/mergeProcessors.js
@@ -0,0 +1,9 @@
+import {PROCESSOR_TYPES} from '../../../src/pbjsORTB.js';
+
+export function mergeProcessors(...processors) {
+  const left = processors.shift();
+  const right = processors.length > 1 ? mergeProcessors(...processors) : processors[0];
+  return Object.fromEntries(
+    PROCESSOR_TYPES.map(type => [type, Object.assign({}, left[type], right[type])])
+  )
+}
diff --git a/libraries/ortbConverter/lib/sizes.js b/libraries/ortbConverter/lib/sizes.js
new file mode 100644
index 00000000000..16b75048203
--- /dev/null
+++ b/libraries/ortbConverter/lib/sizes.js
@@ -0,0 +1,14 @@
+import {parseSizesInput} from '../../../src/utils.js';
+
+export function sizesToFormat(sizes) {
+  sizes = parseSizesInput(sizes);
+
+  // get sizes in form [{ w: <int>, h: <int> }, ...]
+  return sizes.map(size => {
+    const [width, height] = size.split('x');
+    return {
+      w: parseInt(width, 10),
+      h: parseInt(height, 10)
+    };
+  });
+}
diff --git a/libraries/ortbConverter/processors/banner.js b/libraries/ortbConverter/processors/banner.js
new file mode 100644
index 00000000000..51c93b652ef
--- /dev/null
+++ b/libraries/ortbConverter/processors/banner.js
@@ -0,0 +1,40 @@
+import {createTrackPixelHtml, deepAccess, inIframe, mergeDeep} from '../../../src/utils.js';
+import {BANNER} from '../../../src/mediaTypes.js';
+import {sizesToFormat} from '../lib/sizes.js';
+
+/**
+ * fill in a request `imp` with banner parameters from `bidRequest`.
+ */
+export function fillBannerImp(imp, bidRequest, context) {
+  if (context.mediaType && context.mediaType !== BANNER) return;
+
+  const bannerParams = deepAccess(bidRequest, 'mediaTypes.banner');
+  if (bannerParams) {
+    const banner = {
+      topframe: inIframe() === true ? 0 : 1
+    };
+    if (bannerParams.sizes) {
+      banner.format = sizesToFormat(bannerParams.sizes);
+    }
+    if (bannerParams.hasOwnProperty('pos')) {
+      banner.pos = bannerParams.pos;
+    }
+
+    imp.banner = mergeDeep(banner, imp.banner);
+  }
+}
+
+export function bannerResponseProcessor({createPixel = (url) => createTrackPixelHtml(decodeURIComponent(url))} = {}) {
+  return function fillBannerResponse(bidResponse, bid) {
+    if (bidResponse.mediaType === BANNER) {
+      if (bid.adm && bid.nurl) {
+        bidResponse.ad = bid.adm;
+        bidResponse.ad += createPixel(bid.nurl);
+      } else if (bid.adm) {
+        bidResponse.ad = bid.adm;
+      } else if (bid.nurl) {
+        bidResponse.adUrl = bid.nurl;
+      }
+    }
+  };
+}
diff --git a/libraries/ortbConverter/processors/default.js b/libraries/ortbConverter/processors/default.js
new file mode 100644
index 00000000000..70acb7c9953
--- /dev/null
+++ b/libraries/ortbConverter/processors/default.js
@@ -0,0 +1,167 @@
+import {deepSetValue, getDefinedParams, getDNT, mergeDeep} from '../../../src/utils.js';
+import {bannerResponseProcessor, fillBannerImp} from './banner.js';
+import {fillVideoImp, fillVideoResponse} from './video.js';
+import {setResponseMediaType} from './mediaType.js';
+import {fillNativeImp, fillNativeResponse} from './native.js';
+import {BID_RESPONSE, IMP, REQUEST} from '../../../src/pbjsORTB.js';
+import {config} from '../../../src/config.js';
+
+export const DEFAULT_PROCESSORS = {
+  [REQUEST]: {
+    fpd: {
+      // sets initial request to bidderRequest.ortb2
+      priority: 99,
+      fn(ortbRequest, bidderRequest) {
+        mergeDeep(ortbRequest, bidderRequest.ortb2)
+      }
+    },
+    // override FPD app, site, and device with getConfig('app'), etc if defined
+    // TODO: these should be deprecated for v8
+    appFpd: fpdFromTopLevelConfig('app'),
+    siteFpd: fpdFromTopLevelConfig('site'),
+    deviceFpd: fpdFromTopLevelConfig('device'),
+    device: {
+      // sets device w / h / ua / language
+      fn: setDevice
+    },
+    site: {
+      // sets site.domain, page, and ref from refererInfo
+      fn: setSite
+    },
+    props: {
+      // sets request properties id, tmax, test, source.tid
+      fn(ortbRequest, bidderRequest) {
+        Object.assign(ortbRequest, {
+          id: ortbRequest.id || bidderRequest.auctionId,
+          test: ortbRequest.test || 0
+        });
+        const timeout = parseInt(bidderRequest.timeout, 10);
+        if (!isNaN(timeout)) {
+          ortbRequest.tmax = timeout;
+        }
+        deepSetValue(ortbRequest, 'source.tid', ortbRequest.source?.tid || bidderRequest.auctionId);
+      }
+    },
+    coppa: {
+      fn(ortbRequest) {
+        const coppa = config.getConfig('coppa');
+        if (typeof coppa === 'boolean') {
+          deepSetValue(ortbRequest, 'regs.coppa', coppa ? 1 : 0);
+        }
+      }
+    },
+  },
+  [IMP]: {
+    fpd: {
+      // sets initial imp to bidRequest.ortb2Imp
+      priority: 99,
+      fn(imp, bidRequest) {
+        mergeDeep(imp, bidRequest.ortb2Imp);
+      }
+    },
+    id: {
+      // sets imp.id
+      fn(imp, bidRequest) {
+        imp.id = bidRequest.bidId;
+      }
+    },
+    banner: {
+      // populates imp.banner
+      fn: fillBannerImp
+    },
+    video: {
+      // populates imp.video
+      fn: fillVideoImp
+    },
+    pbadslot: {
+      // removes imp.ext.data.pbaslot if it's not a string
+      // TODO: is this needed?
+      fn(imp) {
+        const pbadslot = imp.ext?.data?.pbadslot;
+        if (!pbadslot || typeof pbadslot !== 'string') {
+          delete imp.ext?.data?.pbadslot;
+        }
+      }
+    }
+  },
+  [BID_RESPONSE]: {
+    mediaType: {
+      // sets bidResponse.mediaType from context.mediaType, falling back to seatbid.bid[].mtype
+      priority: 99,
+      fn: setResponseMediaType
+    },
+    banner: {
+      // sets banner response attributes if bidResponse.mediaType === BANNER
+      fn: bannerResponseProcessor(),
+    },
+    video: {
+      // sets video response attributes if bidResponse.mediaType === VIDEO
+      fn: fillVideoResponse
+    },
+    props: {
+      // sets base bidResponse properties common to all types of bids
+      fn(bidResponse, bid, context) {
+        Object.entries({
+          requestId: context.bidRequest?.bidId,
+          seatBidId: bid.id,
+          cpm: bid.price,
+          currency: context.ortbResponse.cur || context.currency,
+          width: bid.w,
+          height: bid.h,
+          dealId: bid.dealid,
+          creative_id: bid.crid,
+          creativeId: bid.crid,
+          burl: bid.burl,
+          ttl: bid.exp || context.ttl,
+          netRevenue: context.netRevenue,
+        }).filter(([k, v]) => typeof v !== 'undefined')
+          .forEach(([k, v]) => bidResponse[k] = v);
+        if (!bidResponse.meta) {
+          bidResponse.meta = {};
+        }
+        if (bid.adomain) {
+          bidResponse.meta.advertiserDomains = bid.adomain;
+        }
+      }
+    }
+  }
+}
+
+if (FEATURES.NATIVE) {
+  DEFAULT_PROCESSORS[IMP].native = {
+    // populates imp.native
+    fn: fillNativeImp
+  }
+  DEFAULT_PROCESSORS[BID_RESPONSE].native = {
+    // populates bidResponse.native if bidResponse.mediaType === NATIVE
+    fn: fillNativeResponse
+  }
+}
+
+function fpdFromTopLevelConfig(prop) {
+  return {
+    priority: 90, // after FPD from 'ortb2', before the rest
+    fn(ortbRequest) {
+      const data = config.getConfig(prop);
+      if (typeof data === 'object') {
+        ortbRequest[prop] = data;
+      }
+    }
+  }
+}
+
+export function setDevice(ortbRequest) {
+  ortbRequest.device = Object.assign({
+    w: window.innerWidth,
+    h: window.innerHeight,
+    dnt: getDNT() ? 1 : 0,
+    ua: window.navigator.userAgent,
+    language: window.navigator.language.split('-').shift()
+  }, ortbRequest.device);
+}
+
+export function setSite(ortbRequest, bidderRequest) {
+  if (bidderRequest.refererInfo) {
+    ortbRequest.site = Object.assign(getDefinedParams(bidderRequest.refererInfo, ['page', 'domain', 'ref']), ortbRequest.site);
+  }
+}
diff --git a/libraries/ortbConverter/processors/mediaType.js b/libraries/ortbConverter/processors/mediaType.js
new file mode 100644
index 00000000000..67232b3ca44
--- /dev/null
+++ b/libraries/ortbConverter/processors/mediaType.js
@@ -0,0 +1,21 @@
+import {BANNER, NATIVE, VIDEO} from '../../../src/mediaTypes.js';
+
+export const ORTB_MTYPES = {
+  1: BANNER,
+  2: VIDEO,
+  4: NATIVE
+}
+
+/**
+ * Sets response mediaType, using ORTB 2.6 `seatbid.bid[].mtype`.
+ *
+ * Note that this will throw away bids if there is no `mtype` in the response.
+ */
+export function setResponseMediaType(bidResponse, bid, context) {
+  if (bidResponse.mediaType) return;
+  const mediaType = context.mediaType;
+  if (!mediaType && !ORTB_MTYPES.hasOwnProperty(bid.mtype)) {
+    throw new Error('Cannot determine mediaType for response')
+  }
+  bidResponse.mediaType = mediaType || ORTB_MTYPES[bid.mtype];
+}
diff --git a/libraries/ortbConverter/processors/native.js b/libraries/ortbConverter/processors/native.js
new file mode 100644
index 00000000000..ff231ce2b55
--- /dev/null
+++ b/libraries/ortbConverter/processors/native.js
@@ -0,0 +1,37 @@
+import {isPlainObject, logWarn, mergeDeep} from '../../../src/utils.js';
+import {NATIVE} from '../../../src/mediaTypes.js';
+
+export function fillNativeImp(imp, bidRequest, context) {
+  if (context.mediaType && context.mediaType !== NATIVE) return;
+  let nativeReq = bidRequest.nativeOrtbRequest;
+  if (nativeReq) {
+    nativeReq = Object.assign({}, context.nativeRequest, nativeReq);
+    if (nativeReq.assets?.length) {
+      imp.native = mergeDeep({}, {
+        request: JSON.stringify(nativeReq),
+        ver: nativeReq.ver
+      }, imp.native)
+    } else {
+      logWarn('mediaTypes.native is set, but no assets were specified. Native request skipped.', bidRequest)
+    }
+  }
+}
+
+export function fillNativeResponse(bidResponse, bid) {
+  if (bidResponse.mediaType === NATIVE) {
+    let ortb;
+    if (typeof bid.adm === 'string') {
+      ortb = JSON.parse(bid.adm);
+    } else {
+      ortb = bid.adm;
+    }
+
+    if (isPlainObject(ortb) && Array.isArray(ortb.assets)) {
+      bidResponse.native = {
+        ortb,
+      }
+    } else {
+      throw new Error('ORTB native response contained no assets');
+    }
+  }
+}
diff --git a/libraries/ortbConverter/processors/video.js b/libraries/ortbConverter/processors/video.js
new file mode 100644
index 00000000000..5fe411e6bcf
--- /dev/null
+++ b/libraries/ortbConverter/processors/video.js
@@ -0,0 +1,66 @@
+import {deepAccess, isEmpty, logWarn, mergeDeep} from '../../../src/utils.js';
+import {VIDEO} from '../../../src/mediaTypes.js';
+import {sizesToFormat} from '../lib/sizes.js';
+
+// parameters that share the same name & semantics between pbjs adUnits and imp.video
+const ORTB_VIDEO_PARAMS = new Set([
+  'pos',
+  'placement',
+  'api',
+  'mimes',
+  'protocols',
+  'playbackmethod',
+  'minduration',
+  'maxduration',
+  'w',
+  'h',
+  'startdelay',
+  'placement',
+  'linearity',
+  'skip',
+  'skipmin',
+  'skipafter',
+  'minbitrate',
+  'maxbitrate',
+  'delivery',
+  'playbackend'
+]);
+
+const PLACEMENT = {
+  'instream': 1,
+}
+
+export function fillVideoImp(imp, bidRequest, context) {
+  if (context.mediaType && context.mediaType !== VIDEO) return;
+
+  const videoParams = deepAccess(bidRequest, 'mediaTypes.video');
+  if (!isEmpty(videoParams)) {
+    const video = Object.fromEntries(
+      Object.entries(videoParams)
+        .filter(([name]) => ORTB_VIDEO_PARAMS.has(name))
+    );
+    if (videoParams.playerSize) {
+      const format = sizesToFormat(videoParams.playerSize);
+      if (format.length > 1) {
+        logWarn('video request specifies more than one playerSize; all but the first will be ignored')
+      }
+      Object.assign(video, format[0]);
+    }
+    const placement = PLACEMENT[videoParams.context];
+    if (placement != null) {
+      video.placement = placement;
+    }
+    imp.video = mergeDeep(video, imp.video);
+  }
+}
+
+export function fillVideoResponse(bidResponse, seatbid, context) {
+  if (bidResponse.mediaType === VIDEO) {
+    if (deepAccess(context.imp, 'video.w') && deepAccess(context.imp, 'video.h')) {
+      [bidResponse.playerWidth, bidResponse.playerHeight] = [context.imp.video.w, context.imp.video.h];
+    }
+
+    if (seatbid.adm) { bidResponse.vastXml = seatbid.adm; }
+    if (seatbid.nurl) { bidResponse.vastUrl = seatbid.nurl; }
+  }
+}
diff --git a/libraries/pbsExtensions/pbsExtensions.js b/libraries/pbsExtensions/pbsExtensions.js
new file mode 100644
index 00000000000..1efded6173f
--- /dev/null
+++ b/libraries/pbsExtensions/pbsExtensions.js
@@ -0,0 +1,12 @@
+import {mergeProcessors} from '../ortbConverter/lib/mergeProcessors.js';
+import {PBS_PROCESSORS} from './processors/pbs.js';
+import {getProcessors, PBS} from '../../src/pbjsORTB.js';
+import {defaultProcessors} from '../ortbConverter/converter.js';
+import {memoize} from '../../src/utils.js';
+
+/**
+ * ORTB converter processor set that understands Prebid Server extensions.
+ *
+ * Pass this as the `processors` option to `ortbConverter` if your backend is a PBS instance.
+ */
+export const pbsExtensions = memoize(() => mergeProcessors(defaultProcessors(), PBS_PROCESSORS, getProcessors(PBS)));
diff --git a/libraries/pbsExtensions/processors/aliases.js b/libraries/pbsExtensions/processors/aliases.js
new file mode 100644
index 00000000000..3dcd2c4fd9b
--- /dev/null
+++ b/libraries/pbsExtensions/processors/aliases.js
@@ -0,0 +1,17 @@
+import adapterManager from '../../../src/adapterManager.js';
+import {deepSetValue} from '../../../src/utils.js';
+
+export function setRequestExtPrebidAliases(ortbRequest, bidderRequest, context, {am = adapterManager} = {}) {
+  if (am.aliasRegistry[bidderRequest.bidderCode]) {
+    const bidder = am.bidderRegistry[bidderRequest.bidderCode];
+    // adding alias only if alias source bidder exists and alias isn't configured to be standalone
+    // pbs adapter
+    if (!bidder || !bidder.getSpec().skipPbsAliasing) {
+      deepSetValue(
+        ortbRequest,
+        `ext.prebid.aliases.${bidderRequest.bidderCode}`,
+        am.aliasRegistry[bidderRequest.bidderCode]
+      );
+    }
+  }
+}
diff --git a/libraries/pbsExtensions/processors/mediaType.js b/libraries/pbsExtensions/processors/mediaType.js
new file mode 100644
index 00000000000..cbcf9a013b1
--- /dev/null
+++ b/libraries/pbsExtensions/processors/mediaType.js
@@ -0,0 +1,23 @@
+import {BANNER, NATIVE, VIDEO} from '../../../src/mediaTypes.js';
+import {ORTB_MTYPES} from '../../ortbConverter/processors/mediaType.js';
+
+export const SUPPORTED_MEDIA_TYPES = {
+  // map from pbjs mediaType to its corresponding imp property
+  [BANNER]: 'banner',
+  [NATIVE]: 'native',
+  [VIDEO]: 'video'
+}
+
+/**
+ * Sets bidResponse.mediaType, using ORTB 2.6 `seatbid.bid[].mtype`, falling back to `ext.prebid.type`, falling back to 'banner'.
+ */
+export function extPrebidMediaType(bidResponse, bid, context) {
+  let mediaType = context.mediaType;
+  if (!mediaType) {
+    mediaType = ORTB_MTYPES.hasOwnProperty(bid.mtype) ? ORTB_MTYPES[bid.mtype] : bid.ext?.prebid?.type
+    if (!SUPPORTED_MEDIA_TYPES.hasOwnProperty(mediaType)) {
+      mediaType = BANNER;
+    }
+  }
+  bidResponse.mediaType = mediaType;
+}
diff --git a/libraries/pbsExtensions/processors/params.js b/libraries/pbsExtensions/processors/params.js
new file mode 100644
index 00000000000..010ffa5b372
--- /dev/null
+++ b/libraries/pbsExtensions/processors/params.js
@@ -0,0 +1,22 @@
+import {auctionManager} from '../../../src/auctionManager.js';
+import adapterManager from '../../../src/adapterManager.js';
+import {deepSetValue} from '../../../src/utils.js';
+
+export function setImpBidParams(
+  imp, bidRequest, context,
+  {adUnit, bidderRequests, index = auctionManager.index, bidderRegistry = adapterManager.bidderRegistry} = {}) {
+  let params = bidRequest.params;
+  const adapter = bidderRegistry[bidRequest.bidder];
+  if (adapter && adapter.getSpec().transformBidParams) {
+    adUnit = adUnit || index.getAdUnit(bidRequest);
+    bidderRequests = bidderRequests || [context.bidderRequest];
+    params = adapter.getSpec().transformBidParams(params, true, adUnit, bidderRequests);
+  }
+  if (params) {
+    deepSetValue(
+      imp,
+      `ext.prebid.bidder.${bidRequest.bidder}`,
+      params
+    );
+  }
+}
diff --git a/libraries/pbsExtensions/processors/pbs.js b/libraries/pbsExtensions/processors/pbs.js
new file mode 100644
index 00000000000..56a2a391c76
--- /dev/null
+++ b/libraries/pbsExtensions/processors/pbs.js
@@ -0,0 +1,99 @@
+import {BID_RESPONSE, IMP, REQUEST, RESPONSE} from '../../../src/pbjsORTB.js';
+import {deepAccess, isPlainObject, isStr, mergeDeep} from '../../../src/utils.js';
+import {extPrebidMediaType} from './mediaType.js';
+import {setRequestExtPrebidAliases} from './aliases.js';
+import {setImpBidParams} from './params.js';
+import {setRequestExtPrebid, setRequestExtPrebidChannel} from './requestExtPrebid.js';
+import {setBidResponseVideoCache} from './video.js';
+
+export const PBS_PROCESSORS = {
+  [REQUEST]: {
+    extPrebid: {
+      // set request.ext.prebid.auctiontimestamp, .debug and .targeting
+      fn: setRequestExtPrebid
+    },
+    extPrebidChannel: {
+      // sets request.ext.prebid.channel
+      fn: setRequestExtPrebidChannel
+    },
+    extPrebidAliases: {
+      // sets ext.prebid.aliases
+      fn: setRequestExtPrebidAliases
+    }
+  },
+  [IMP]: {
+    params: {
+      // sets bid ext.prebid.bidder.[bidderCode] with bidRequest.params, passed through transformBidParams if necessary
+      fn: setImpBidParams
+    },
+  },
+  [BID_RESPONSE]: {
+    mediaType: {
+      // sets bidResponse.mediaType according to context.mediaType, falling back to imp.ext.prebid.type
+      fn: extPrebidMediaType,
+      priority: 99,
+    },
+    videoCache: {
+      // sets response video attributes; in addition, looks at ext.prebid.cache and .targeting to set video cache key and URL
+      fn: setBidResponseVideoCache,
+      priority: -10, // after 'video'
+    },
+    bidderCode: {
+      // sets bidderCode from on seatbid.seat
+      fn(bidResponse, bid, context) {
+        bidResponse.bidderCode = context.seatbid.seat;
+        bidResponse.adapterCode = deepAccess(bid, 'ext.prebid.meta.adaptercode') || context.bidRequest?.bidder || bidResponse.bidderCode;
+      }
+    },
+    pbsBidId: {
+      // sets bidResponse.pbsBidId from ext.prebid.bidid
+      fn(bidResponse, bid) {
+        const bidId = deepAccess(bid, 'ext.prebid.bidid');
+        if (isStr(bidId)) {
+          bidResponse.pbsBidId = bidId;
+        }
+      }
+    },
+    adserverTargeting: {
+      // sets bidResponse.adserverTargeting from ext.prebid.targeting
+      fn(bidResponse, bid) {
+        const targeting = deepAccess(bid, 'ext.prebid.targeting');
+        if (isPlainObject(targeting)) {
+          bidResponse.adserverTargeting = targeting;
+        }
+      }
+    },
+    extPrebidMeta: {
+      // sets bidResponse.meta from ext.prebid.meta
+      fn(bidResponse, bid) {
+        bidResponse.meta = mergeDeep({}, deepAccess(bid, 'ext.prebid.meta'), bidResponse.meta);
+      }
+    },
+    pbsWurl: {
+      // sets bidResponse.pbsWurl from ext.prebid.events.win
+      fn(bidResponse, bid) {
+        const wurl = deepAccess(bid, 'ext.prebid.events.win');
+        if (isStr(wurl)) {
+          bidResponse.pbsWurl = wurl;
+        }
+      }
+    },
+  },
+  [RESPONSE]: {
+    serverSideStats: {
+      // updates bidderRequest and bidRequests with serverErrors from ext.errors and serverResponseTimeMs from ext.responsetimemillis
+      fn(response, ortbResponse, context) {
+        Object.entries({
+          errors: 'serverErrors',
+          responsetimemillis: 'serverResponseTimeMs'
+        }).forEach(([serverName, clientName]) => {
+          const value = deepAccess(ortbResponse, `ext.${serverName}.${context.bidderRequest.bidderCode}`);
+          if (value) {
+            context.bidderRequest[clientName] = value;
+            context.bidRequests.forEach(bid => bid[clientName] = value);
+          }
+        })
+      }
+    },
+  }
+}
diff --git a/libraries/pbsExtensions/processors/requestExtPrebid.js b/libraries/pbsExtensions/processors/requestExtPrebid.js
new file mode 100644
index 00000000000..bbb6add45ce
--- /dev/null
+++ b/libraries/pbsExtensions/processors/requestExtPrebid.js
@@ -0,0 +1,30 @@
+import {deepSetValue, mergeDeep} from '../../../src/utils.js';
+import {config} from '../../../src/config.js';
+import {getGlobal} from '../../../src/prebidGlobal.js';
+
+export function setRequestExtPrebid(ortbRequest, bidderRequest) {
+  deepSetValue(
+    ortbRequest,
+    'ext.prebid',
+    mergeDeep(
+      {
+        auctiontimestamp: bidderRequest.auctionStart,
+        targeting: {
+          includewinners: true,
+          includebidderkeys: false
+        }
+      },
+      ortbRequest.ext?.prebid,
+    )
+  );
+  if (config.getConfig('debug')) {
+    ortbRequest.ext.prebid.debug = true;
+  }
+}
+
+export function setRequestExtPrebidChannel(ortbRequest) {
+  deepSetValue(ortbRequest, 'ext.prebid.channel', Object.assign({
+    name: 'pbjs',
+    version: getGlobal().version
+  }, ortbRequest.ext?.prebid?.channel));
+}
diff --git a/libraries/pbsExtensions/processors/video.js b/libraries/pbsExtensions/processors/video.js
new file mode 100644
index 00000000000..0a517fd0575
--- /dev/null
+++ b/libraries/pbsExtensions/processors/video.js
@@ -0,0 +1,23 @@
+import {VIDEO} from '../../../src/mediaTypes.js';
+import {deepAccess} from '../../../src/utils.js';
+
+export function setBidResponseVideoCache(bidResponse, bid) {
+  if (bidResponse.mediaType === VIDEO) {
+    // try to get cache values from 'response.ext.prebid.cache'
+    // else try 'bid.ext.prebid.targeting' as fallback
+    let {cacheId: videoCacheKey, url: vastUrl} = deepAccess(bid, 'ext.prebid.cache.vastXml') || {};
+    if (!videoCacheKey || !vastUrl) {
+      const {hb_uuid: uuid, hb_cache_host: cacheHost, hb_cache_path: cachePath} = deepAccess(bid, 'ext.prebid.targeting') || {};
+      if (uuid && cacheHost && cachePath) {
+        videoCacheKey = uuid;
+        vastUrl = `https://${cacheHost}${cachePath}?uuid=${uuid}`;
+      }
+    }
+    if (videoCacheKey && vastUrl) {
+      Object.assign(bidResponse, {
+        videoCacheKey,
+        vastUrl
+      })
+    }
+  }
+}
diff --git a/modules/consentManagement.js b/modules/consentManagement.js
index 3d6562958c3..95d622e55e4 100644
--- a/modules/consentManagement.js
+++ b/modules/consentManagement.js
@@ -4,11 +4,12 @@
  * and make it available for any GDPR supported adapters to read/pass this information to
  * their system.
  */
-import {isNumber, isPlainObject, isStr, logError, logInfo, logWarn} from '../src/utils.js';
+import {deepSetValue, isNumber, isPlainObject, isStr, logError, logInfo, logWarn} from '../src/utils.js';
 import {config} from '../src/config.js';
 import {gdprDataHandler} from '../src/adapterManager.js';
 import {includes} from '../src/polyfill.js';
 import {timedAuctionHook} from '../src/utils/perfMetrics.js';
+import {registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
 
 const DEFAULT_CMP = 'iab';
 const DEFAULT_CONSENT_TIMEOUT = 10000;
@@ -354,3 +355,23 @@ export function setConsentConfig(config) {
   loadConsentData(); // immediately look up consent data to make it available without requiring an auction
 }
 config.getConfig('consentManagement', config => setConsentConfig(config.consentManagement));
+
+export function setOrtbGdpr(ortbRequest, bidderRequest) {
+  const consent = bidderRequest.gdprConsent;
+  if (consent) {
+    if (typeof consent.gdprApplies === 'boolean') {
+      deepSetValue(ortbRequest, 'regs.ext.gdpr', consent.gdprApplies ? 1 : 0);
+    }
+    deepSetValue(ortbRequest, 'user.ext.consent', consent.consentString);
+  }
+}
+
+export function setOrtbAdditionalConsent(ortbRequest, bidderRequest) {
+  const addtl = bidderRequest.gdprConsent?.addtlConsent;
+  if (addtl && typeof addtl === 'string') {
+    deepSetValue(ortbRequest, 'user.ext.ConsentedProvidersSettings.consented_providers', addtl);
+  }
+}
+
+registerOrtbProcessor({type: REQUEST, name: 'gdpr', fn: setOrtbGdpr});
+registerOrtbProcessor({type: REQUEST, name: 'gdprAddtlConsent', fn: setOrtbAdditionalConsent})
diff --git a/modules/consentManagementUsp.js b/modules/consentManagementUsp.js
index 76bc7982be7..1e77dd4ef48 100644
--- a/modules/consentManagementUsp.js
+++ b/modules/consentManagementUsp.js
@@ -4,9 +4,10 @@
  * information and make it available for any USP (CCPA) supported adapters to
  * read/pass this information to their system.
  */
-import {isFn, isNumber, isPlainObject, isStr, logError, logInfo, logWarn} from '../src/utils.js';
+import {deepSetValue, isFn, isNumber, isPlainObject, isStr, logError, logInfo, logWarn} from '../src/utils.js';
 import {config} from '../src/config.js';
 import {uspDataHandler} from '../src/adapterManager.js';
+import {registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
 import {timedAuctionHook} from '../src/utils/perfMetrics.js';
 import {getHook} from '../src/hook.js';
 
@@ -308,3 +309,11 @@ function enableConsentManagement(configFromUser = false) {
 config.getConfig('consentManagement', config => setConsentConfig(config.consentManagement));
 
 getHook('requestBids').before(requestBidsHook, 50);
+
+export function setOrtbUsp(ortbRequest, bidderRequest) {
+  if (bidderRequest.uspConsent) {
+    deepSetValue(ortbRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+  }
+}
+
+registerOrtbProcessor({type: REQUEST, name: 'usp', fn: setOrtbUsp});
diff --git a/modules/currency.js b/modules/currency.js
index 2c8070bcb08..9272a507d05 100644
--- a/modules/currency.js
+++ b/modules/currency.js
@@ -5,6 +5,7 @@ import {ajax} from '../src/ajax.js';
 import {config} from '../src/config.js';
 import {getHook} from '../src/hook.js';
 import {defer} from '../src/utils/promise.js';
+import {registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
 import {timedBidResponseHook} from '../src/utils/perfMetrics.js';
 
 const DEFAULT_CURRENCY_RATE_URL = 'https://cdn.jsdelivr.net/gh/prebid/currency-file@1/latest.json?date=$$TODAY$$';
@@ -314,3 +315,11 @@ function roundFloat(num, dec) {
   }
   return Math.round(num * d) / d;
 }
+
+export function setOrtbCurrency(ortbRequest, bidderRequest, context) {
+  if (currencySupportEnabled) {
+    ortbRequest.cur = ortbRequest.cur || [context.currency || adServerCurrency];
+  }
+}
+
+registerOrtbProcessor({type: REQUEST, name: 'currency', fn: setOrtbCurrency});
diff --git a/modules/improvedigitalBidAdapter.js b/modules/improvedigitalBidAdapter.js
index 044c27dc9e8..cc039354878 100644
--- a/modules/improvedigitalBidAdapter.js
+++ b/modules/improvedigitalBidAdapter.js
@@ -1,24 +1,10 @@
-import {
-  cleanObj,
-  deepAccess,
-  deepClone,
-  deepSetValue,
-  getBidIdParameter,
-  getBidRequest,
-  getDNT,
-  getUniqueIdentifierStr,
-  isFn,
-  isPlainObject,
-  logWarn,
-  mergeDeep
-} from '../src/utils.js';
+import {deepAccess, deepSetValue, getBidIdParameter, getUniqueIdentifierStr, logWarn, mergeDeep} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
-import {createEidsArray} from './userId/eids.js';
 import {hasPurpose1Consent} from '../src/utils/gpdr.js';
-import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import {ortbConverter} from '../libraries/ortbConverter/converter.js';
 import {loadExternalScript} from '../src/adloader.js';
 
 const BIDDER_CODE = 'improvedigital';
@@ -31,44 +17,12 @@ const IFRAME_SYNC_URL = 'https://hb.360yield.com/prebid-universal-creative/load-
 
 const VIDEO_PARAMS = {
   DEFAULT_MIMES: ['video/mp4'],
-  SUPPORTED_PROPERTIES: ['mimes', 'minduration', 'maxduration', 'protocols', 'w', 'h', 'startdelay', 'placement', 'linearity', 'skip', 'skipmin',
-    'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate', 'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend', 'delivery', 'pos', 'companionad',
-    'api', 'companiontype', 'ext'],
   PLACEMENT_TYPE: {
     INSTREAM: 1,
     OUTSTREAM: 3,
   }
 };
 
-const NATIVE_DATA = {
-  VERSION: '1.2',
-  ASSET_TYPES: {
-    TITLE: 'title',
-    IMG: 'img',
-    DATA: 'data',
-  },
-  ASSETS: {
-    title: {id: 0, name: 'title', assetType: 'title', default: {len: 140}},
-    sponsoredBy: {id: 1, name: 'sponsoredBy', assetType: 'data', type: 1},
-    icon: {id: 2, name: 'icon', assetType: 'img', type: 2},
-    body: {id: 3, name: 'body', assetType: 'data', type: 2},
-    image: {id: 4, name: 'image', assetType: 'img', type: 3},
-    rating: {id: 5, name: 'rating', assetType: 'data', type: 3},
-    likes: {id: 6, name: 'likes', assetType: 'data', type: 4},
-    downloads: {id: 7, name: 'downloads', assetType: 'data', type: 5},
-    price: {id: 8, name: 'price', assetType: 'data', type: 6},
-    salePrice: {id: 9, name: 'salePrice', assetType: 'data', type: 7},
-    phone: {id: 10, name: 'phone', assetType: 'data', type: 8},
-    address: {id: 11, name: 'address', assetType: 'data', type: 9},
-    body2: {id: 12, name: 'body2', assetType: 'data', type: 10},
-    displayUrl: {id: 13, name: 'displayUrl', assetType: 'data', type: 11},
-    cta: {id: 14, name: 'cta', assetType: 'data', type: 12},
-  },
-  getAssetById(id) {
-    return Object.values(this.ASSETS).find(asset => id === asset.id);
-  }
-};
-
 export const spec = {
   code: BIDDER_CODE,
   gvlid: 253,
@@ -94,85 +48,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests(bidRequests, bidderRequest) {
-    // convert Native ORTB definition to old-style prebid native definition
-    bidRequests = convertOrtbRequestToProprietaryNative(bidRequests);
-
-    const request = {
-      cur: [config.getConfig('currency.adServerCurrency') || 'USD'],
-      ext: {
-        improvedigital: {
-          sdk: {
-            name: 'pbjs',
-            version: '$prebid.version$',
-          }
-        }
-      }
-    };
-
-    // Device
-    request.device = (typeof config.getConfig('device') === 'object') ? config.getConfig('device') : {};
-    request.device.w = request.device.w || window.innerWidth;
-    request.device.h = request.device.h || window.innerHeight;
-    if (getDNT()) {
-      request.device.dnt = 1;
-    }
-
-    // Coppa
-    const coppa = config.getConfig('coppa');
-    if (typeof coppa === 'boolean') {
-      deepSetValue(request, 'regs.coppa', Number(coppa));
-    }
-
-    if (bidderRequest) {
-      // GDPR
-      const gdprConsent = deepAccess(bidderRequest, 'gdprConsent');
-      if (gdprConsent) {
-        if (typeof gdprConsent.gdprApplies === 'boolean') {
-          deepSetValue(request, 'regs.ext.gdpr', Number(gdprConsent.gdprApplies));
-        }
-        deepSetValue(request, 'user.ext.consent', gdprConsent.consentString);
-
-        // Additional Consent String
-        const additionalConsent = deepAccess(gdprConsent, 'addtlConsent');
-        if (additionalConsent && additionalConsent.indexOf('~') !== -1) {
-          // Google Ad Tech Provider IDs
-          const atpIds = additionalConsent.substring(additionalConsent.indexOf('~') + 1);
-          if (atpIds) {
-            deepSetValue(
-              request,
-              'user.ext.consented_providers_settings.consented_providers',
-              atpIds.split('.').map(id => parseInt(id, 10))
-            );
-          }
-        }
-      }
-
-      // Timeout
-      if (bidderRequest.timeout) {
-        request.tmax = parseInt(bidderRequest.timeout);
-      }
-      // US Privacy
-      if (typeof bidderRequest.uspConsent !== typeof undefined) {
-        deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
-      }
-    }
-
-    ID_REQUEST.buildSiteOrApp(request, bidderRequest);
-
-    const bidRequest0 = bidRequests[0];
-
-    deepSetValue(request, 'source.ext.schain', bidRequest0.schain);
-    deepSetValue(request, 'source.tid', bidRequest0.transactionId);
-
     // Save a placement id to send it to the ad server when fetching the user syncs
-    this.syncStore.placementId = this.syncStore.placementId || bidRequest0.params.placementId;
-
-    if (bidRequest0.userId) {
-      const eids = createEidsArray(bidRequest0.userId);
-      deepSetValue(request, 'user.ext.eids', eids.length ? eids : undefined);
-    }
-
-    return ID_REQUEST.buildServerRequests(request, bidRequests, bidderRequest);
+    this.syncStore.placementId = this.syncStore.placementId || bidRequests[0].params.placementId;
+    return ID_REQUEST.buildServerRequests(bidRequests, bidderRequest);
   },
 
   /**
@@ -182,48 +60,8 @@ export const spec = {
    * @param bidderRequest
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
-  interpretResponse(serverResponse, { bidderRequest }) {
-    if (!Array.isArray(deepAccess(serverResponse, 'body.seatbid'))) {
-      return [];
-    }
-
-    const bids = [];
-
-    serverResponse.body.seatbid.forEach(seatbid => {
-      if (!Array.isArray(seatbid.bid)) return;
-
-      seatbid.bid.forEach(bidObject => {
-        if (!bidObject.adm || !bidObject.price || bidObject.hasOwnProperty('errorCode')) {
-          return;
-        }
-        const bidRequest = getBidRequest(bidObject.impid, [bidderRequest]);
-        const idExt = deepAccess(bidObject, `ext.${BIDDER_CODE}`, {});
-
-        const bid = {
-          requestId: bidObject.impid,
-          cpm: bidObject.price,
-          creativeId: bidObject.crid,
-          currency: serverResponse.body.cur.toUpperCase() || 'USD',
-          dealId: (typeof idExt.buying_type === 'string' && idExt.buying_type !== 'rtb') ? idExt.line_item_id : undefined,
-          meta: {
-            advertiserDomains: bidObject.adomain ? bidObject.adomain : []
-          },
-          netRevenue: idExt.is_net || false,
-          ttl: CREATIVE_TTL
-        }
-
-        ID_RESPONSE.buildAd(bid, bidRequest, bidObject);
-
-        ID_RAZR.forwardBid({
-          bidRequest,
-          bid
-        });
-
-        bids.push(bid);
-      });
-    });
-
-    return bids;
+  interpretResponse(serverResponse, { ortbRequest }) {
+    return CONVERTER.fromORTB({request: ortbRequest, response: serverResponse.body}).bids;
   },
 
   /**
@@ -267,38 +105,165 @@ export const spec = {
 
 registerBidder(spec);
 
+export const CONVERTER = ortbConverter({
+  context: {
+    ttl: CREATIVE_TTL,
+    nativeRequest: {
+      eventtrackers: [
+        {event: 1, methods: [1, 2]},
+      ]
+    }
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    imp.secure = Number(window.location.protocol === 'https:');
+    if (!imp.bidfloor && bidRequest.params.bidFloor) {
+      imp.bidfloor = bidRequest.params.bidFloor;
+      imp.bidfloorcur = getBidIdParameter('bidFloorCur', bidRequest.params).toUpperCase() || 'USD'
+    }
+    const bidderParamsPath = context.extendMode ? 'ext.prebid.bidder.improvedigital' : 'ext.bidder';
+    const placementId = bidRequest.params.placementId;
+    if (placementId) {
+      deepSetValue(imp, `${bidderParamsPath}.placementId`, placementId);
+      if (context.extendMode) {
+        deepSetValue(imp, 'ext.prebid.storedrequest.id', '' + placementId);
+      }
+    } else {
+      deepSetValue(imp, `${bidderParamsPath}.publisherId`, getBidIdParameter('publisherId', bidRequest.params));
+      deepSetValue(imp, `${bidderParamsPath}.placementKey`, getBidIdParameter('placementKey', bidRequest.params));
+    }
+    deepSetValue(imp, `${bidderParamsPath}.keyValues`, getBidIdParameter('keyValues', bidRequest.params) || undefined);
+
+    return imp;
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const request = buildRequest(imps, bidderRequest, context);
+    mergeDeep(request, {
+      id: getUniqueIdentifierStr(),
+      source: {
+        // TODO: once https://github.com/prebid/Prebid.js/issues/8573 is resolved, this should be handled by the base ortbConverter logic
+        tid: context.bidRequests[0].transactionId,
+      },
+      ext: {
+        improvedigital: {
+          sdk: {
+            name: 'pbjs',
+            version: '$prebid.version$',
+          }
+        }
+      },
+    });
+    return request;
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    if (!bid.adm || !bid.price || bid.hasOwnProperty('errorCode')) {
+      return;
+    }
+    const {bidRequest} = context;
+    context.mediaType = (() => {
+      const requestMediaTypes = Object.keys(bidRequest.mediaTypes);
+      if (requestMediaTypes.length === 1) return requestMediaTypes[0];
+      // Detect media type for multi-format response
+      if (bid.adm.search(/^(<\?xml|<vast)/i) !== -1) {
+        return VIDEO;
+      } else if (bid.adm[0] === '{') {
+        return NATIVE;
+      } else {
+        return BANNER;
+      }
+    })();
+    const bidResponse = buildBidResponse(bid, context);
+    const idExt = deepAccess(bid, `ext.${BIDDER_CODE}`, {});
+    Object.assign(bidResponse, {
+      dealId: (typeof idExt.buying_type === 'string' && idExt.buying_type !== 'rtb') ? idExt.line_item_id : undefined,
+      netRevenue: idExt.is_net || false,
+    })
+    if (bidResponse.mediaType === VIDEO && ID_REQUEST.isOutstreamVideo(bidRequest)) {
+      Object.assign(bidResponse, {
+        adResponse: { content: bidResponse.vastXml },
+        renderer: ID_OUTSTREAM.createRenderer(bidRequest)
+      })
+    }
+    ID_RAZR.forwardBid({bidRequest, bid: bidResponse});
+    return bidResponse;
+  },
+  overrides: {
+    imp: {
+      banner(fillImpBanner, imp, bidRequest, context) {
+        // override to disregard banner.sizes if usePrebidSizes is not set
+        if (!bidRequest.mediaTypes[BANNER]) return;
+        if (config.getConfig('improvedigital.usePrebidSizes') !== true) {
+          const banner = Object.assign({}, bidRequest.mediaTypes[BANNER], {sizes: null});
+          bidRequest = {...bidRequest, mediaTypes: {[BANNER]: banner}}
+        }
+        fillImpBanner(imp, bidRequest, context);
+      },
+      video(fillImpVideo, imp, bidRequest, context) {
+        // override to use video params from both mediaTypes.video and bidRequest.params.video
+        if (!bidRequest.mediaTypes[VIDEO]) return;
+        const video = Object.assign(
+          {mimes: VIDEO_PARAMS.DEFAULT_MIMES},
+          bidRequest.mediaTypes[VIDEO],
+          bidRequest.params?.video
+        )
+        fillImpVideo(
+          imp,
+          {...bidRequest, mediaTypes: {[VIDEO]: video}},
+          context
+        );
+        deepSetValue(imp, 'ext.is_rewarded_inventory', (video.rewarded === 1 || deepAccess(video, 'ext.rewarded') === 1) || undefined);
+        if (!imp.video.placement && ID_REQUEST.isOutstreamVideo(bidRequest)) {
+          // fillImpVideo will have already set placement = 1 for instream
+          imp.video.placement = VIDEO_PARAMS.PLACEMENT_TYPE.OUTSTREAM;
+        }
+      }
+    },
+    request: {
+      gdprAddtlConsent(setAddtlConsent, ortbRequest, bidderRequest) {
+        // override attlConsent processor to do some additional parsing, and use a different destination
+        const additionalConsent = deepAccess(bidderRequest, 'gdprConsent.addtlConsent');
+        if (additionalConsent && additionalConsent.indexOf('~') !== -1) {
+          // Google Ad Tech Provider IDs
+          const atpIds = additionalConsent.substring(additionalConsent.indexOf('~') + 1);
+          if (atpIds) {
+            deepSetValue(
+              ortbRequest,
+              'user.ext.consented_providers_settings.consented_providers',
+              atpIds.split('.').map(id => parseInt(id, 10))
+            );
+          }
+        }
+      }
+    }
+  }
+})
+
 const ID_REQUEST = {
-  buildServerRequests(basicRequest, bidRequests, bidderRequest) {
+  buildServerRequests(bidRequests, bidderRequest) {
     const globalExtendMode = config.getConfig('improvedigital.extend') === true;
     const requests = [];
     const singleRequestMode = config.getConfig('improvedigital.singleRequest') === true;
 
-    const extendImps = [];
-    const adServerImps = [];
+    const extendBids = [];
+    const adServerBids = [];
 
-    function formatRequest(imps, transactionId, extendMode) {
-      const request = deepClone(basicRequest);
-      request.imp = imps;
-      request.id = getUniqueIdentifierStr();
-      if (transactionId) {
-        deepSetValue(request, 'source.tid', transactionId);
-      }
+    function formatRequest(bidRequests, extendMode) {
+      const ortbRequest = CONVERTER.toORTB({bidRequests, bidderRequest, context: {extendMode}});
       const adServerUrl = hasPurpose1Consent(bidderRequest?.gdprConsent) ? AD_SERVER_URL : BASIC_ADS_URL;
       return {
         method: 'POST',
         url: extendMode ? EXTEND_URL : adServerUrl,
-        data: JSON.stringify(request),
-        bidderRequest
+        data: JSON.stringify(ortbRequest),
+        ortbRequest
       }
-    };
+    }
 
     bidRequests.map((bidRequest) => {
       const extendModeEnabled = this.isExtendModeEnabled(globalExtendMode, bidRequest.params);
-      const imp = this.buildImp(bidRequest, extendModeEnabled);
       if (singleRequestMode) {
-        extendModeEnabled ? extendImps.push(imp) : adServerImps.push(imp);
+        extendModeEnabled ? extendBids.push(bidRequest) : adServerBids.push(bidRequest);
       } else {
-        requests.push(formatRequest([imp], bidRequest.transactionId, extendModeEnabled));
+        requests.push(formatRequest([bidRequest], extendModeEnabled));
       }
     });
 
@@ -306,11 +271,11 @@ const ID_REQUEST = {
       return requests;
     }
     // In the single request mode, split imps between those going to the ad server and those going to extend server
-    if (extendImps.length) {
-      requests.push(formatRequest(extendImps, bidderRequest.auctionId, true));
+    if (extendBids.length) {
+      requests.push(formatRequest(extendBids, true));
     }
-    if (adServerImps.length) {
-      requests.push(formatRequest(adServerImps, bidderRequest.auctionId, false));
+    if (adServerBids.length) {
+      requests.push(formatRequest(adServerBids, false));
     }
 
     return requests;
@@ -324,289 +289,10 @@ const ID_REQUEST = {
     return extendMode;
   },
 
-  buildImp(bidRequest, extendMode) {
-    const imp = {
-      id: getBidIdParameter('bidId', bidRequest) || getUniqueIdentifierStr(),
-      secure: Number(window.location.protocol === 'https:'),
-    };
-
-    // Floor
-    const bidFloor = this.getBidFloor(bidRequest) || getBidIdParameter('bidFloor', bidRequest.params);
-    if (bidFloor) {
-      const bidFloorCur = getBidIdParameter('bidFloorCur', bidRequest.params) || 'USD';
-      deepSetValue(imp, 'bidfloor', bidFloor);
-      deepSetValue(imp, 'bidfloorcur', bidFloorCur ? bidFloorCur.toUpperCase() : undefined);
-    }
-
-    const bidderParamsPath = extendMode ? 'ext.prebid.bidder.improvedigital' : 'ext.bidder';
-    const placementId = getBidIdParameter('placementId', bidRequest.params);
-    if (placementId) {
-      deepSetValue(imp, `${bidderParamsPath}.placementId`, placementId);
-      if (extendMode) {
-        deepSetValue(imp, 'ext.prebid.storedrequest.id', '' + placementId);
-      }
-    } else {
-      deepSetValue(imp, `${bidderParamsPath}.publisherId`, getBidIdParameter('publisherId', bidRequest.params));
-      deepSetValue(imp, `${bidderParamsPath}.placementKey`, getBidIdParameter('placementKey', bidRequest.params));
-    }
-
-    deepSetValue(imp, `${bidderParamsPath}.keyValues`, getBidIdParameter('keyValues', bidRequest.params) || undefined);
-
-    // Adding GPID
-    const gpid = deepAccess(bidRequest, 'ortb2Imp.ext.gpid') ||
-      deepAccess(bidRequest, 'ortb2Imp.ext.data.pbadslot') ||
-      deepAccess(bidRequest, 'ortb2Imp.ext.data.adserver.adslot');
-
-    deepSetValue(imp, 'ext.gpid', gpid);
-
-    // Adding Interstitial Signal
-    if (deepAccess(bidRequest, 'ortb2Imp.instl')) {
-      imp.instl = 1;
-    }
-
-    const videoParams = deepAccess(bidRequest, 'mediaTypes.video');
-    if (videoParams) {
-      imp.video = this.buildVideoRequest(bidRequest);
-      deepSetValue(imp, 'ext.is_rewarded_inventory', (videoParams.rewarded === 1 || deepAccess(videoParams, 'ext.rewarded') === 1) || undefined);
-    }
-
-    if (deepAccess(bidRequest, 'mediaTypes.banner')) {
-      imp.banner = this.buildBannerRequest(bidRequest);
-    }
-
-    if (deepAccess(bidRequest, 'mediaTypes.native')) {
-      const nativeImp = this.buildNativeRequest(bidRequest);
-      if (nativeImp) {
-        imp.native = nativeImp;
-      }
-    }
-
-    return imp;
-  },
-
-  buildVideoRequest(bidRequest) {
-    const videoParams = deepClone(bidRequest.mediaTypes.video);
-    const videoImproveParams = deepClone(deepAccess(bidRequest, 'params.video', {}));
-    const video = {...videoParams, ...videoImproveParams};
-
-    if (Array.isArray(video.playerSize)) {
-      // Player size can be defined as [w, h] or [[w, h]]
-      const size = Array.isArray(video.playerSize[0]) ? video.playerSize[0] : video.playerSize;
-      video.w = size[0];
-      video.h = size[1];
-    }
-    video.placement = this.isOutstreamVideo(bidRequest) ? VIDEO_PARAMS.PLACEMENT_TYPE.OUTSTREAM : VIDEO_PARAMS.PLACEMENT_TYPE.INSTREAM;
-
-    // Mimes is required
-    if (!video.mimes) {
-      video.mimes = VIDEO_PARAMS.DEFAULT_MIMES;
-    }
-
-    // skip must be 0 or 1
-    if (video.skip !== 1) {
-      delete video.skipmin;
-      delete video.skipafter;
-      if (video.skip !== 0) {
-        logWarn(`video.skip: invalid value '${video.skip}'. Expected 0 or 1`);
-        delete video.skip;
-      }
-    }
-
-    Object.keys(video).forEach(prop => {
-      if (VIDEO_PARAMS.SUPPORTED_PROPERTIES.indexOf(prop) === -1) delete video[prop];
-    });
-    return video;
-  },
-
-  buildBannerRequest(bidRequest) {
-    // Set the desired creative sizes
-    // Input Format: array of pairs, i.e. [[300, 250], [250, 250]]
-    // Unless improvedigital.usePrebidSizes == true, no sizes are sent to the server
-    // and the sizes defined in the server for the placement will be used
-    const banner = {};
-    if (config.getConfig('improvedigital.usePrebidSizes') === true && bidRequest.sizes) {
-      // Convert sizes from [x, y] to { w: x, h: y}
-      banner.format = bidRequest.sizes.map(sizePair => ({w: sizePair[0], h: sizePair[1]}));
-    }
-    return banner;
-  },
-
-  buildNativeRequest(bidRequest) {
-    const nativeParams = bidRequest.nativeParams;
-    if (!nativeParams) {
-      return null;
-    }
-    const request = {
-      eventtrackers: [
-        {event: 1, methods: [1, 2]}
-      ],
-      assets: [],
-    }
-    for (let i of Object.keys(nativeParams)) {
-      const assetOrtbParams = NATIVE_DATA.ASSETS[i];
-      if (assetOrtbParams) {
-        const assetParams = nativeParams[i];
-        const asset = {
-          id: assetOrtbParams.id,
-          required: Number(assetParams.required),
-        };
-        switch (assetOrtbParams.assetType) {
-          case NATIVE_DATA.ASSET_TYPES.TITLE:
-            asset.title = {len: assetParams.len || assetOrtbParams.default.len};
-            break;
-          case NATIVE_DATA.ASSET_TYPES.DATA:
-            asset.data = cleanObj({type: assetOrtbParams.type, len: assetParams.len})
-            break;
-          case NATIVE_DATA.ASSET_TYPES.IMG:
-            asset.img = cleanObj({
-              type: assetOrtbParams.type,
-              w: deepAccess(assetParams, 'sizes.0'),
-              h: deepAccess(assetParams, 'sizes.1'),
-              wmin: deepAccess(assetParams, 'aspect_ratios.0.min_width'),
-              hmin: deepAccess(assetParams, 'aspect_ratios.0.min_height')
-            });
-            break;
-          default:
-            return;
-        }
-        request.assets.push(asset);
-      }
-    }
-    if (!request.assets.length) {
-      logWarn('No native assets recognized. Ignoring native ad request');
-      return null;
-    }
-    return { ver: NATIVE_DATA.VERSION, request: JSON.stringify(request) };
-  },
-
   isOutstreamVideo(bidRequest) {
     return deepAccess(bidRequest, 'mediaTypes.video.context') === 'outstream';
   },
 
-  getBidFloor(bidRequest) {
-    if (!isFn(bidRequest.getFloor)) {
-      return null;
-    }
-    const floor = bidRequest.getFloor({
-      currency: 'USD',
-      mediaType: '*',
-      size: '*'
-    });
-    if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
-      return floor.floor;
-    }
-    return null;
-  },
-
-  buildSiteOrApp(request, bidderRequest) {
-    const app = {};
-    const configAppSettings = config.getConfig('app') || {};
-    const fpdAppSettings = bidderRequest.ortb2?.app || {};
-    mergeDeep(app, configAppSettings, fpdAppSettings);
-
-    if (Object.keys(app).length !== 0) {
-      request.app = app;
-    } else {
-      const site = {};
-      const url = deepAccess(bidderRequest, 'refererInfo.page');
-      if (url) {
-        site.page = url;
-        site.domain = bidderRequest.refererInfo.domain;
-      }
-      const configSiteSettings = config.getConfig('site') || {};
-      const fpdSiteSettings = deepAccess(bidderRequest, 'ortb2.site') || {};
-      mergeDeep(site, configSiteSettings, fpdSiteSettings);
-      request.site = site;
-    }
-  },
-};
-
-const ID_RESPONSE = {
-  buildAd(bid, bidRequest, bidResponse) {
-    if (bidRequest.mediaTypes && Object.keys(bidRequest.mediaTypes).length === 1) {
-      if (deepAccess(bidRequest, 'mediaTypes.video')) {
-        this.buildVideoAd(bid, bidRequest, bidResponse);
-      } else if (deepAccess(bidRequest, 'mediaTypes.banner')) {
-        this.buildBannerAd(bid, bidRequest, bidResponse);
-      } else if (deepAccess(bidRequest, 'mediaTypes.native')) {
-        this.buildNativeAd(bid, bidRequest, bidResponse)
-      }
-    } else {
-      // Detect media type for multi-format response
-      if (bidResponse.adm.search(/^(<\?xml|<vast)/i) !== -1) {
-        this.buildVideoAd(bid, bidRequest, bidResponse);
-      } else if (bidResponse.adm[0] === '{') {
-        this.buildNativeAd(bid, bidRequest, bidResponse);
-      } else {
-        this.buildBannerAd(bid, bidRequest, bidResponse);
-      }
-    }
-  },
-
-  buildVideoAd(bid, bidRequest, bidResponse) {
-    bid.mediaType = VIDEO;
-    bid.vastXml = bidResponse.adm;
-    if (ID_REQUEST.isOutstreamVideo(bidRequest)) {
-      bid.adResponse = { content: bid.vastXml };
-      bid.renderer = ID_OUTSTREAM.createRenderer(bidRequest);
-    }
-  },
-
-  buildBannerAd(bid, bidRequest, bidResponse) {
-    bid.mediaType = BANNER;
-    bid.ad = bidResponse.adm;
-    bid.width = bidResponse.w;
-    bid.height = bidResponse.h;
-  },
-
-  buildNativeAd(bid, bidRequest, bidResponse) {
-    bid.mediaType = NATIVE;
-    const nativeResponse = JSON.parse(bidResponse.adm);
-    const nativeAd = {
-      clickUrl: deepAccess(nativeResponse, 'link.url'),
-      clickTrackers: deepAccess(nativeResponse, 'link.clicktrackers'),
-      privacyLink: nativeResponse.privacy
-    }
-    // Trackers
-    if (nativeResponse.eventtrackers) {
-      nativeAd.impressionTrackers = [];
-      nativeResponse.eventtrackers.forEach(tracker => {
-        // Only handle impression event. Viewability events are not supported yet.
-        if (tracker.event !== 1) return;
-        switch (tracker.method) {
-          case 1: // img
-            nativeAd.impressionTrackers.push(tracker.url);
-            break;
-          case 2: // js
-            // javascriptTrackers is a string. If there's more than one JS tracker in bid response, the last script will be used.
-            nativeAd.javascriptTrackers = `<script src=\"${tracker.url}\"></script>`;
-            break;
-        }
-      });
-    } else {
-      nativeAd.impressionTrackers = nativeResponse.imptrackers || [];
-      nativeAd.javascriptTrackers = nativeResponse.jstracker;
-    }
-    nativeResponse.assets.map(asset => {
-      const assetParams = NATIVE_DATA.getAssetById(asset.id);
-      switch (assetParams.assetType) {
-        case NATIVE_DATA.ASSET_TYPES.TITLE:
-          nativeAd.title = asset.title.text;
-          break;
-        case NATIVE_DATA.ASSET_TYPES.DATA:
-          nativeAd[assetParams.name] = asset.data.value;
-          break;
-        case NATIVE_DATA.ASSET_TYPES.IMG:
-          nativeAd[assetParams.name] = {
-            url: asset.img.url,
-            width: asset.img.w,
-            height: asset.img.h,
-          };
-          break;
-      }
-    });
-    bid.native = nativeAd;
-  },
 };
 
 const ID_OUTSTREAM = {
diff --git a/modules/multibid/index.js b/modules/multibid/index.js
index 76f4ede8f8e..df77a157bee 100644
--- a/modules/multibid/index.js
+++ b/modules/multibid/index.js
@@ -12,6 +12,7 @@ import * as events from '../../src/events.js';
 import CONSTANTS from '../../src/constants.json';
 import {addBidderRequests} from '../../src/auction.js';
 import {getHighestCpmBidsFromBidPool, sortByDealAndPriceBucketOrCpm} from '../../src/targeting.js';
+import {PBS, registerOrtbProcessor, REQUEST} from '../../src/pbjsORTB.js';
 import {timedBidResponseHook} from '../../src/utils/perfMetrics.js';
 
 const MODULE_NAME = 'multibid';
@@ -236,3 +237,14 @@ function init() {
 }
 
 init();
+
+export function setOrtbExtPrebidMultibid(ortbRequest) {
+  const multibid = config.getConfig('multibid');
+  if (multibid) {
+    deepSetValue(ortbRequest, 'ext.prebid.multibid', multibid.map(o =>
+      Object.fromEntries(Object.entries(o).map(([k, v]) => [k.toLowerCase(), v])))
+    )
+  }
+}
+
+registerOrtbProcessor({type: REQUEST, name: 'extPrebidMultibid', fn: setOrtbExtPrebidMultibid, dialects: [PBS]});
diff --git a/modules/openxOrtbBidAdapter.js b/modules/openxOrtbBidAdapter.js
index 50b62544dfa..200d2cf0fed 100644
--- a/modules/openxOrtbBidAdapter.js
+++ b/modules/openxOrtbBidAdapter.js
@@ -1,14 +1,12 @@
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import * as utils from '../src/utils.js';
+import {mergeDeep} from '../src/utils.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import {includes} from '../src/polyfill.js';
+import {ortbConverter} from '../libraries/ortbConverter/converter.js';
 
 const bidderConfig = 'hb_pb_ortb';
 const bidderVersion = '1.0';
-const VIDEO_TARGETING = ['startdelay', 'mimes', 'minduration', 'maxduration', 'delivery',
-  'startdelay', 'skip', 'playbackmethod', 'api', 'protocol', 'boxingallowed', 'maxextended',
-  'linearity', 'delivery', 'protocols', 'placement', 'minbitrate', 'maxbitrate', 'battr', 'ext'];
 export const REQUEST_URL = 'https://rtb.openx.net/openrtbb/prebidjs';
 export const SYNC_URL = 'https://u.openx.net/w/1.0/pd';
 export const DEFAULT_PH = '2d1251ae-7f3a-47cf-bd2a-2f288854a0ba';
@@ -24,6 +22,118 @@ export const spec = {
 
 registerBidder(spec);
 
+const converter = ortbConverter({
+  context: {
+    netRevenue: true,
+    ttl: 300
+  },
+  imp(buildImp, bidRequest, context) {
+    const imp = buildImp(bidRequest, context);
+    if (bidRequest.mediaTypes[VIDEO]?.context === 'outstream') {
+      imp.video.placement = imp.video.placement || 4;
+    }
+    if (imp.ext?.ae && !context.bidderRequest.fledgeEnabled) {
+      // TODO: we may want to standardize this and move fledge logic to ortbConverter
+      delete imp.ext.ae;
+    }
+    mergeDeep(imp, {
+      tagid: bidRequest.params.unit,
+      ext: {
+        divid: bidRequest.adUnitCode
+      }
+    });
+    if (bidRequest.params.customParams) {
+      utils.deepSetValue(imp, 'ext.customParams', bidRequest.params.customParams);
+    }
+    if (bidRequest.params.customFloor && !imp.bidfloor) {
+      imp.bidfloor = bidRequest.params.customFloor;
+    }
+    return imp;
+  },
+  request(buildRequest, imps, bidderRequest, context) {
+    const req = buildRequest(imps, bidderRequest, context);
+    mergeDeep(req, {
+      at: 1,
+      ext: {
+        bc: `${bidderConfig}_${bidderVersion}`
+      }
+    })
+    const bid = context.bidRequests[0];
+    if (bid.params.doNotTrack) {
+      utils.deepSetValue(req, 'device.dnt', 1);
+    }
+    if (bid.params.platform) {
+      utils.deepSetValue(req, 'ext.platform', bid.params.platform);
+    }
+    if (bid.params.delDomain) {
+      utils.deepSetValue(req, 'ext.delDomain', bid.params.delDomain);
+    }
+    if (bid.params.response_template_name) {
+      utils.deepSetValue(req, 'ext.response_template_name', bid.params.response_template_name);
+    }
+    if (bid.params.test) {
+      req.test = 1
+    }
+    return req;
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    const bidResponse = buildBidResponse(bid, context);
+    if (bid.ext) {
+      bidResponse.meta.networkId = bid.ext.dsp_id;
+      bidResponse.meta.advertiserId = bid.ext.buyer_id;
+      bidResponse.meta.brandId = bid.ext.brand_id;
+    }
+    const {ortbResponse} = context;
+    if (ortbResponse.ext && ortbResponse.ext.paf) {
+      bidResponse.meta.paf = Object.assign({}, ortbResponse.ext.paf);
+      bidResponse.meta.paf.content_id = utils.deepAccess(bid, 'ext.paf.content_id');
+    }
+    return bidResponse;
+  },
+  response(buildResponse, bidResponses, ortbResponse, context) {
+    // pass these from request to the responses for use in userSync
+    const {ortbRequest} = context;
+    if (ortbRequest.ext) {
+      if (ortbRequest.ext.delDomain) {
+        utils.deepSetValue(ortbResponse, 'ext.delDomain', ortbRequest.ext.delDomain);
+      }
+      if (ortbRequest.ext.platform) {
+        utils.deepSetValue(ortbResponse, 'ext.platform', ortbRequest.ext.platform);
+      }
+    }
+    const response = buildResponse(bidResponses, ortbResponse, context);
+    // TODO: we may want to standardize this and move fledge logic to ortbConverter
+    let fledgeAuctionConfigs = utils.deepAccess(ortbResponse, 'ext.fledge_auction_configs');
+    if (fledgeAuctionConfigs) {
+      fledgeAuctionConfigs = Object.entries(fledgeAuctionConfigs).map(([bidId, cfg]) => {
+        return Object.assign({
+          bidId,
+          auctionSignals: {}
+        }, cfg);
+      });
+      return {
+        bids: response.bids,
+        fledgeAuctionConfigs,
+      }
+    } else {
+      return response.bids
+    }
+  },
+  overrides: {
+    imp: {
+      bidfloor(setBidFloor, imp, bidRequest, context) {
+        // enforce floors should always be in USD
+        // TODO: does it make sense that request.cur can be any currency, but request.imp[].bidfloorcur must be USD?
+        const floor = {};
+        setBidFloor(floor, bidRequest, {...context, currency: 'USD'});
+        if (floor.bidfloorcur === 'USD') {
+          Object.assign(imp, floor);
+        }
+      }
+    }
+  }
+});
+
 function transformBidParams(params, isOpenRtb) {
   return utils.convertTypes({
     'unit': 'string',
@@ -47,190 +157,21 @@ function isBidRequestValid(bidRequest) {
 function buildRequests(bids, bidderRequest) {
   let videoBids = bids.filter(bid => isVideoBid(bid));
   let bannerBids = bids.filter(bid => isBannerBid(bid));
-  let requests = bannerBids.length ? [createBannerRequest(bannerBids, bidderRequest)] : [];
+  let requests = bannerBids.length ? [createRequest(bannerBids, bidderRequest, BANNER)] : [];
   videoBids.forEach(bid => {
-    requests.push(createVideoRequest(bid, bidderRequest));
+    requests.push(createRequest([bid], bidderRequest, VIDEO));
   });
   return requests;
 }
 
-function createBannerRequest(bids, bidderRequest) {
-  let data = getBaseRequest(bids[0], bidderRequest);
-  data.imp = bids.map(bid => {
-    const floor = getFloor(bid, BANNER);
-    let imp = {
-      id: bid.bidId,
-      tagid: bid.params.unit,
-      banner: {
-        format: toFormat(bid.mediaTypes.banner.sizes),
-        topframe: utils.inIframe() ? 0 : 1
-      },
-      ext: {divid: bid.adUnitCode}
-    };
-
-    if (bidderRequest.fledgeEnabled) {
-      imp.ext.ae = bid?.ortb2Imp?.ext?.ae
-    }
-
-    enrichImp(imp, bid, floor);
-    return imp;
-  });
+function createRequest(bidRequests, bidderRequest, mediaType) {
   return {
     method: 'POST',
     url: config.getConfig('openxOrtbUrl') || REQUEST_URL,
-    data: data
-  }
-}
-
-function toFormat(sizes) {
-  return sizes.map((s) => {
-    return { w: s[0], h: s[1] };
-  });
-}
-
-function enrichImp(imp, bid, floor) {
-  if (bid.params.customParams) {
-    utils.deepSetValue(imp, 'ext.customParams', bid.params.customParams);
-  }
-  if (floor > 0) {
-    imp.bidfloor = floor;
-    imp.bidfloorcur = 'USD';
-  } else if (bid.params.customFloor) {
-    imp.bidfloor = bid.params.customFloor;
-  }
-  if (bid.ortb2Imp && bid.ortb2Imp.ext && bid.ortb2Imp.ext.data) {
-    imp.ext.data = bid.ortb2Imp.ext.data;
+    data: converter.toORTB({bidRequests, bidderRequest, context: {mediaType}})
   }
 }
 
-function createVideoRequest(bid, bidderRequest) {
-  let width;
-  let height;
-  const videoMediaType = utils.deepAccess(bid, `mediaTypes.video`);
-  const playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
-  const context = utils.deepAccess(bid, 'mediaTypes.video.context');
-  const floor = getFloor(bid, VIDEO);
-
-  // normalize config for video size
-  if (utils.isArray(bid.sizes) && bid.sizes.length === 2 && !utils.isArray(bid.sizes[0])) {
-    width = parseInt(bid.sizes[0], 10);
-    height = parseInt(bid.sizes[1], 10);
-  } else if (utils.isArray(bid.sizes) && utils.isArray(bid.sizes[0]) && bid.sizes[0].length === 2) {
-    width = parseInt(bid.sizes[0][0], 10);
-    height = parseInt(bid.sizes[0][1], 10);
-  } else if (utils.isArray(playerSize) && playerSize.length === 2) {
-    width = parseInt(playerSize[0], 10);
-    height = parseInt(playerSize[1], 10);
-  }
-
-  let data = getBaseRequest(bid, bidderRequest);
-  data.imp = [{
-    id: bid.bidId,
-    tagid: bid.params.unit,
-    video: {
-      w: width,
-      h: height,
-      topframe: utils.inIframe() ? 0 : 1
-    },
-    ext: {divid: bid.adUnitCode}
-  }];
-
-  enrichImp(data.imp[0], bid, floor);
-
-  if (context) {
-    if (context === 'instream') {
-      data.imp[0].video.placement = 1;
-    } else if (context === 'outstream') {
-      data.imp[0].video.placement = 4;
-    }
-  }
-
-  // backward compatability for video params
-  let videoParams = bid.params.video || bid.params.openrtb || {};
-  if (utils.isArray(videoParams.imp)) {
-    videoParams = videoParams[0].video;
-  }
-
-  Object.keys(videoParams)
-    .filter(param => includes(VIDEO_TARGETING, param))
-    .forEach(param => data.imp[0].video[param] = videoParams[param]);
-  Object.keys(videoMediaType)
-    .filter(param => includes(VIDEO_TARGETING, param))
-    .forEach(param => data.imp[0].video[param] = videoMediaType[param]);
-
-  return {
-    method: 'POST',
-    url: REQUEST_URL,
-    data: data
-  };
-}
-
-function getBaseRequest(bid, bidderRequest) {
-  let req = {
-    id: bidderRequest.auctionId,
-    cur: [config.getConfig('currency.adServerCurrency') || 'USD'],
-    at: 1,
-    tmax: config.getConfig('bidderTimeout'),
-    site: {
-      page: config.getConfig('pageUrl') || bidderRequest.refererInfo.referer
-    },
-    regs: {
-      coppa: (config.getConfig('coppa') === true || bid.params.coppa) ? 1 : 0,
-    },
-    device: {
-      dnt: (utils.getDNT() || bid.params.doNotTrack) ? 1 : 0,
-      h: screen.height,
-      w: screen.width,
-      ua: window.navigator.userAgent,
-      language: window.navigator.language.split('-').shift()
-    },
-    ext: {
-      bc: `${bidderConfig}_${bidderVersion}`
-    }
-  };
-
-  if (bid.params.platform) {
-    utils.deepSetValue(req, 'ext.platform', bid.params.platform);
-  }
-  if (bid.params.delDomain) {
-    utils.deepSetValue(req, 'ext.delDomain', bid.params.delDomain);
-  }
-  if (bid.params.response_template_name) {
-    utils.deepSetValue(req, 'ext.response_template_name', bid.params.response_template_name);
-  }
-  if (bid.params.test) {
-    req.test = 1;
-  }
-  if (bidderRequest.gdprConsent) {
-    if (bidderRequest.gdprConsent.gdprApplies !== undefined) {
-      utils.deepSetValue(req, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies === true ? 1 : 0);
-    }
-    if (bidderRequest.gdprConsent.consentString !== undefined) {
-      utils.deepSetValue(req, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
-    }
-    if (bidderRequest.gdprConsent.addtlConsent !== undefined) {
-      utils.deepSetValue(req, 'user.ext.ConsentedProvidersSettings.consented_providers', bidderRequest.gdprConsent.addtlConsent);
-    }
-  }
-  if (bidderRequest.uspConsent) {
-    utils.deepSetValue(req, 'regs.ext.us_privacy', bidderRequest.uspConsent);
-  }
-  if (bid.schain) {
-    utils.deepSetValue(req, 'source.ext.schain', bid.schain);
-  }
-  if (bid.userIdAsEids) {
-    utils.deepSetValue(req, 'user.ext.eids', bid.userIdAsEids);
-  }
-  const commonFpd = bidderRequest.ortb2 || {};
-  if (commonFpd.site) {
-    utils.mergeDeep(req, {site: commonFpd.site});
-  }
-  if (commonFpd.user) {
-    utils.mergeDeep(req, {user: commonFpd.user});
-  }
-  return req;
-}
-
 function isVideoBid(bid) {
   return utils.deepAccess(bid, 'mediaTypes.video');
 }
@@ -239,107 +180,11 @@ function isBannerBid(bid) {
   return utils.deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
 }
 
-function getFloor(bid, mediaType) {
-  let floor = 0;
-
-  if (typeof bid.getFloor === 'function') {
-    const floorInfo = bid.getFloor({
-      currency: 'USD',
-      mediaType: mediaType,
-      size: '*'
-    });
-
-    if (typeof floorInfo === 'object' &&
-      floorInfo.currency === 'USD' &&
-      !isNaN(parseFloat(floorInfo.floor))) {
-      floor = Math.max(floor, parseFloat(floorInfo.floor));
-    }
-  }
-
-  return floor;
-}
-
-function interpretOrtbResponse(resp, req) {
+function interpretResponse(resp, req) {
   if (!resp.body) {
     resp.body = {nbr: 0};
   }
-
-  // pass these from request to the responses for use in userSync
-  if (req.data.ext) {
-    if (req.data.ext.delDomain) {
-      utils.deepSetValue(resp, 'body.ext.delDomain', req.data.ext.delDomain);
-    }
-    if (req.data.ext.platform) {
-      utils.deepSetValue(resp, 'body.ext.platform', req.data.ext.platform);
-    }
-  }
-
-  const respBody = resp.body;
-  if (!respBody || 'nbr' in respBody || !Array.isArray(respBody.seatbid)) {
-    return [];
-  }
-
-  let bids = [];
-  respBody.seatbid.forEach(seatbid => {
-    bids = [...bids, ...seatbid.bid.map(bid => {
-      let response = {
-        requestId: bid.impid,
-        cpm: bid.price,
-        width: bid.w,
-        height: bid.h,
-        creativeId: bid.crid,
-        dealId: bid.dealid,
-        currency: respBody.cur || 'USD',
-        netRevenue: true,
-        ttl: 300,
-        mediaType: 'banner' in req.data.imp[0] ? BANNER : VIDEO,
-        meta: { advertiserDomains: bid.adomain }
-      };
-
-      if (response.mediaType === VIDEO) {
-        if (bid.nurl) {
-          response.vastUrl = bid.nurl;
-        } else {
-          response.vastXml = bid.adm;
-        }
-      } else {
-        response.ad = bid.adm;
-      }
-
-      if (bid.ext) {
-        response.meta.networkId = bid.ext.dsp_id;
-        response.meta.advertiserId = bid.ext.buyer_id;
-        response.meta.brandId = bid.ext.brand_id;
-      }
-
-      if (respBody.ext && respBody.ext.paf) {
-        response.meta.paf = Object.assign({}, respBody.ext.paf);
-        response.meta.paf.content_id = utils.deepAccess(bid, 'ext.paf.content_id');
-      }
-
-      return response;
-    })];
-  });
-
-  return bids;
-}
-
-function interpretResponse(resp, req) {
-  const bids = interpretOrtbResponse(resp, req);
-  let fledgeAuctionConfigs = utils.deepAccess(resp, 'body.ext.fledge_auction_configs');
-  if (fledgeAuctionConfigs) {
-    fledgeAuctionConfigs = Object.entries(fledgeAuctionConfigs).map(([bidId, cfg]) => {
-      return Object.assign({
-        bidId,
-        auctionSignals: {}
-      }, cfg);
-    });
-    return {
-      bids,
-      fledgeAuctionConfigs,
-    }
-  }
-  return bids;
+  return converter.fromORTB({request: req.data, response: resp.body});
 }
 
 /**
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 3a082b3199f..072c280aecf 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -1,19 +1,11 @@
 import Adapter from '../../src/adapter.js';
-import {createBid} from '../../src/bidfactory.js';
 import {
   bind,
-  createTrackPixelHtml,
-  deepAccess,
   deepClone,
-  deepSetValue,
   flatten,
   generateUUID,
-  getBidRequest,
-  getDefinedParams,
   getPrebidInternal,
   insertUserSyncIframe,
-  isArray,
-  isEmpty,
   isNumber,
   isPlainObject,
   isStr,
@@ -21,34 +13,27 @@ import {
   logInfo,
   logMessage,
   logWarn,
-  mergeDeep,
-  parseSizesInput,
-  timestamp,
   triggerPixel,
-  uniques
+  uniques,
+  deepAccess,
 } from '../../src/utils.js';
 import CONSTANTS from '../../src/constants.json';
 import adapterManager from '../../src/adapterManager.js';
 import {config} from '../../src/config.js';
-import {NATIVE, VIDEO} from '../../src/mediaTypes.js';
 import {isValid} from '../../src/adapters/bidderFactory.js';
 import * as events from '../../src/events.js';
-import {find, includes} from '../../src/polyfill.js';
+import {includes} from '../../src/polyfill.js';
 import {S2S_VENDORS} from './config.js';
 import {ajax} from '../../src/ajax.js';
 import {hook} from '../../src/hook.js';
-import {getGlobal} from '../../src/prebidGlobal.js';
 import {hasPurpose1Consent} from '../../src/utils/gpdr.js';
+import {buildPBSRequest, interpretPBSResponse} from './ortbConverter.js';
 import {useMetrics} from '../../src/utils/perfMetrics.js';
 
 const getConfig = config.getConfig;
 
 const TYPE = CONSTANTS.S2S.SRC;
 let _syncCount = 0;
-const DEFAULT_S2S_TTL = 60;
-const DEFAULT_S2S_CURRENCY = 'USD';
-const DEFAULT_S2S_NETREVENUE = true;
-
 let _s2sConfigs;
 
 let eidPermissions;
@@ -95,12 +80,13 @@ let eidPermissions;
  * @property {boolean} [cacheMarkup] whether to cache the adm result
  * @property {string} [syncEndpoint] endpoint URL for syncing cookies
  * @property {Object} [extPrebid] properties will be merged into request.ext.prebid
+ * @property {Object} [ortbNative] base value for imp.native.request
  */
 
 /**
  * @type {S2SDefaultConfig}
  */
-const s2sDefaultConfig = {
+export const s2sDefaultConfig = {
   bidders: Object.freeze([]),
   timeout: 1000,
   syncTimeout: 1000,
@@ -108,7 +94,14 @@ const s2sDefaultConfig = {
   adapter: 'prebidServer',
   allowUnknownBidderCodes: false,
   adapterOptions: {},
-  syncUrlModifier: {}
+  syncUrlModifier: {},
+  ortbNative: {
+    context: 1,
+    plcmttype: 1,
+    eventtrackers: [
+      {event: 1, methods: [1]}
+    ],
+  }
 };
 
 config.setDefaults({
@@ -355,97 +348,6 @@ function doClientSideSyncs(bidders, gdprConsent, uspConsent) {
   });
 }
 
-function _appendSiteAppDevice(request, pageUrl, accountId) {
-  if (!request) return;
-
-  // ORTB specifies app OR site
-  if (typeof config.getConfig('app') === 'object') {
-    request.app = config.getConfig('app');
-    request.app.publisher = {id: accountId};
-  } else {
-    request.site = {};
-    if (isPlainObject(config.getConfig('site'))) {
-      request.site = config.getConfig('site');
-    }
-    // set publisher.id if not already defined
-    if (!deepAccess(request.site, 'publisher.id')) {
-      deepSetValue(request.site, 'publisher.id', accountId);
-    }
-    // set site.page if not already defined
-    if (!request.site.page) {
-      request.site.page = pageUrl;
-    }
-  }
-  if (typeof config.getConfig('device') === 'object') {
-    request.device = config.getConfig('device');
-  }
-  if (!request.device) {
-    request.device = {};
-  }
-  if (!request.device.w) {
-    request.device.w = window.innerWidth;
-  }
-  if (!request.device.h) {
-    request.device.h = window.innerHeight;
-  }
-}
-
-function addBidderFirstPartyDataToRequest(request, bidderFpd) {
-  const fpdConfigs = Object.entries(bidderFpd).reduce((acc, [bidder, bidderOrtb2]) => {
-    const ortb2 = mergeDeep({}, bidderOrtb2);
-    acc.push({
-      bidders: [ bidder ],
-      config: { ortb2 }
-    });
-    return acc;
-  }, []);
-
-  if (fpdConfigs.length) {
-    deepSetValue(request, 'ext.prebid.bidderconfig', fpdConfigs);
-  }
-}
-
-// https://iabtechlab.com/wp-content/uploads/2016/07/OpenRTB-Native-Ads-Specification-Final-1.2.pdf#page=40
-let nativeDataNames = Object.keys(CONSTANTS.PREBID_NATIVE_DATA_KEYS_TO_ORTB);
-
-// returns object with legacy asset name as key and asset id as value:
-// { "sponsoredBy": 1, ... }
-let nativeDataIdMap = nativeDataNames.reduce((prev, key) => {
-  prev[key] = CONSTANTS.NATIVE_ASSET_TYPES[CONSTANTS.PREBID_NATIVE_DATA_KEYS_TO_ORTB[key]];
-  return prev;
-}, {});
-
-let nativeImgIdMap = {
-  icon: 1,
-  image: 3
-};
-
-let nativeEventTrackerEventMap = {
-  impression: 1,
-  'viewable-mrc50': 2,
-  'viewable-mrc100': 3,
-  'viewable-video50': 4,
-};
-
-let nativeEventTrackerMethodMap = {
-  img: 1,
-  js: 2
-};
-
-if (FEATURES.NATIVE) {
-  // enable reverse lookup
-  [
-    nativeDataIdMap,
-    nativeImgIdMap,
-    nativeEventTrackerEventMap,
-    nativeEventTrackerMethodMap
-  ].forEach(map => {
-    Object.keys(map).forEach(key => {
-      map[map[key]] = key;
-    });
-  });
-}
-
 /**
  * map wurl to auction id and adId for use in the BID_WON event
  */
@@ -462,18 +364,6 @@ function addWurl(auctionId, adId, wurl) {
   }
 }
 
-function getPbsResponseData(bidderRequests, response, pbsName, pbjsName) {
-  const bidderValues = deepAccess(response, `ext.${pbsName}`);
-  if (bidderValues) {
-    Object.keys(bidderValues).forEach(bidder => {
-      let biddersReq = find(bidderRequests, bidderReq => bidderReq.bidderCode === bidder);
-      if (biddersReq) {
-        biddersReq[pbjsName] = bidderValues[bidder];
-      }
-    });
-  }
-}
-
 /**
  * @param {string} auctionId
  * @param {string} adId generated value set to bidObject.adId by bidderFactory Bid()
@@ -501,595 +391,6 @@ export function resetWurlMap() {
   wurlMap = {};
 }
 
-function ORTB2(s2sBidRequest, bidderRequests, adUnits, requestedBidders) {
-  this.s2sBidRequest = s2sBidRequest;
-  this.bidderRequests = bidderRequests;
-  this.adUnits = adUnits;
-  this.s2sConfig = s2sBidRequest.s2sConfig;
-  this.requestedBidders = requestedBidders;
-
-  this.bidIdMap = {};
-  this.adUnitsByImp = {};
-  this.impRequested = {};
-  this.auctionId = bidderRequests.map(br => br.auctionId).reduce((l, r) => (l == null || l === r) && r);
-  this.requestTimestamp = timestamp();
-}
-
-Object.assign(ORTB2.prototype, {
-  buildRequest() {
-    const {s2sBidRequest, bidderRequests: bidRequests, adUnits, s2sConfig, requestedBidders} = this;
-
-    let imps = [];
-    let aliases = {};
-    const firstBidRequest = bidRequests[0];
-    let floorMin = null;
-    let floorMinCur = null;
-
-    // transform ad unit into array of OpenRTB impression objects
-    let impIds = new Set();
-    adUnits.forEach(adUnit => {
-      // TODO: support labels / conditional bids
-      // for now, just warn about them
-      adUnit.bids.forEach((bid) => {
-        if (bid.mediaTypes != null) {
-          logWarn(`Prebid Server adapter does not (yet) support bidder-specific mediaTypes for the same adUnit. Size mapping configuration will be ignored for adUnit: ${adUnit.code}, bidder: ${bid.bidder}`);
-        }
-      });
-
-      // in case there is a duplicate imp.id, add '-2' suffix to the second imp.id.
-      // e.g. if there are 2 adUnits (case of twin adUnit codes) with code 'test',
-      // first imp will have id 'test' and second imp will have id 'test-2'
-      let impressionId = adUnit.code;
-      let i = 1;
-      while (impIds.has(impressionId)) {
-        i++;
-        impressionId = `${adUnit.code}-${i}`;
-      }
-      impIds.add(impressionId);
-      this.adUnitsByImp[impressionId] = adUnit;
-
-      const videoParams = deepAccess(adUnit, 'mediaTypes.video');
-      const bannerParams = deepAccess(adUnit, 'mediaTypes.banner');
-
-      adUnit.bids.forEach(bid => {
-        this.setBidRequestId(impressionId, bid.bidder, bid.bid_id);
-        // check for and store valid aliases to add to the request
-        if (adapterManager.aliasRegistry[bid.bidder]) {
-          const bidder = adapterManager.bidderRegistry[bid.bidder];
-          // adding alias only if alias source bidder exists and alias isn't configured to be standalone
-          // pbs adapter
-          if (!bidder || !bidder.getSpec().skipPbsAliasing) {
-            aliases[bid.bidder] = adapterManager.aliasRegistry[bid.bidder];
-          }
-        }
-      });
-
-      let mediaTypes = {};
-      if (bannerParams && bannerParams.sizes) {
-        const sizes = parseSizesInput(bannerParams.sizes);
-
-        // get banner sizes in form [{ w: <int>, h: <int> }, ...]
-        const format = sizes.map(size => {
-          const [ width, height ] = size.split('x');
-          const w = parseInt(width, 10);
-          const h = parseInt(height, 10);
-          return { w, h };
-        });
-
-        mediaTypes['banner'] = {format};
-
-        if (bannerParams.pos) mediaTypes['banner'].pos = bannerParams.pos;
-      }
-
-      if (!isEmpty(videoParams)) {
-        if (videoParams.context === 'outstream' && !videoParams.renderer && !adUnit.renderer) {
-          // Don't push oustream w/o renderer to request object.
-          logError('Outstream bid without renderer cannot be sent to Prebid Server.');
-        } else {
-          if (videoParams.context === 'instream' && !videoParams.hasOwnProperty('placement')) {
-            videoParams.placement = 1;
-          }
-
-          mediaTypes['video'] = Object.keys(videoParams).filter(param => param !== 'context')
-            .reduce((result, param) => {
-              if (param === 'playerSize') {
-                result.w = deepAccess(videoParams, `${param}.0.0`);
-                result.h = deepAccess(videoParams, `${param}.0.1`);
-              } else {
-                result[param] = videoParams[param];
-              }
-              return result;
-            }, {});
-        }
-      }
-      const nativeReq = deepAccess(adUnit, 'nativeOrtbRequest');
-      if (FEATURES.NATIVE && nativeReq) {
-        const defaultRequest = {
-          // TODO: determine best way to pass these and if we allow defaults
-          context: 1,
-          plcmttype: 1,
-          eventtrackers: [
-            { event: 1, methods: [1] }
-          ],
-          // TODO: figure out how to support privacy field
-          // privacy: int
-        };
-        try {
-          const request = Object.assign(defaultRequest, nativeReq);
-          mediaTypes[NATIVE] = {
-            request: JSON.stringify(request),
-            ver: '1.2'
-          };
-        } catch (e) {
-          logError('error creating native request: ' + String(e));
-        }
-      }
-
-      // get bidder params in form { <bidder code>: {...params} }
-      // initialize reduce function with the user defined `ext` properties on the ad unit
-      const ext = adUnit.bids.reduce((acc, bid) => {
-        if (bid.bidder == null) return acc;
-        const adapter = adapterManager.bidderRegistry[bid.bidder];
-        if (adapter && adapter.getSpec().transformBidParams) {
-          bid.params = adapter.getSpec().transformBidParams(bid.params, true, adUnit, bidRequests);
-        }
-        deepSetValue(acc,
-          `prebid.bidder.${bid.bidder}`,
-          (s2sConfig.adapterOptions && s2sConfig.adapterOptions[bid.bidder]) ? Object.assign({}, bid.params, s2sConfig.adapterOptions[bid.bidder]) : bid.params
-        );
-        return acc;
-      }, {...deepAccess(adUnit, 'ortb2Imp.ext')});
-
-      const imp = { ...adUnit.ortb2Imp, id: impressionId, ext, secure: s2sConfig.secure };
-
-      const ortb2 = {...deepAccess(adUnit, 'ortb2Imp.ext.data')};
-      Object.keys(ortb2).forEach(prop => {
-        /**
-          * Prebid AdSlot
-          * @type {(string|undefined)}
-        */
-        if (prop === 'pbadslot') {
-          if (typeof ortb2[prop] === 'string' && ortb2[prop]) {
-            deepSetValue(imp, 'ext.data.pbadslot', ortb2[prop]);
-          } else {
-            // remove pbadslot property if it doesn't meet the spec
-            delete imp.ext.data.pbadslot;
-          }
-        } else if (prop === 'adserver') {
-          /**
-           * Copy GAM AdUnit and Name to imp
-           */
-          ['name', 'adslot'].forEach(name => {
-            /** @type {(string|undefined)} */
-            const value = deepAccess(ortb2, `adserver.${name}`);
-            if (typeof value === 'string' && value) {
-              deepSetValue(imp, `ext.data.adserver.${name.toLowerCase()}`, value);
-            }
-          });
-        } else {
-          deepSetValue(imp, `ext.data.${prop}`, ortb2[prop]);
-        }
-      });
-
-      mergeDeep(imp, mediaTypes);
-
-      const convertCurrency = typeof getGlobal().convertCurrency !== 'function'
-        ? (amount) => amount
-        : (amount, from, to) => {
-          if (from === to) return amount;
-          let result = null;
-          try {
-            result = getGlobal().convertCurrency(amount, from, to);
-          } catch (e) {
-          }
-          return result;
-        }
-
-      const floor = (() => {
-        // we have to pick a floor for the imp - here we attempt to find the minimum floor
-        // across all bids for this adUnit
-        const s2sCurrency = config.getConfig('currency.adServerCurrency') || DEFAULT_S2S_CURRENCY;
-
-        return adUnit.bids
-          .map((bid) => this.getBidRequest(imp.id, bid.bidder))
-          .map((bid) => {
-            if (!bid || typeof bid.getFloor !== 'function') return;
-            try {
-              const {currency, floor} = bid.getFloor({
-                currency: s2sCurrency
-              });
-
-              return {
-                currency,
-                floor: parseFloat(floor)
-              }
-            } catch (e) {
-              logError('PBS: getFloor threw an error: ', e);
-            }
-          })
-          .reduce((min, floor) => {
-            // if any bid does not have a valid floor, do not attempt to send any to PBS
-            if (floor == null || floor.currency == null || floor.floor == null || isNaN(floor.floor)) {
-              min.min = null;
-            }
-            if (min.min === null) {
-              return min;
-            }
-            // otherwise, pick the minimum one (or, in some strange confluence of circumstances, the one in the best currency)
-            if (min.ref == null) {
-              min.ref = min.min = floor;
-            } else {
-              const value = convertCurrency(floor.floor, floor.currency, min.ref.currency);
-
-              if (value != null && value < min.ref.floor) {
-                min.ref.floor = value;
-                min.min = floor;
-              }
-            }
-
-            return min;
-          }, {}).min
-      })();
-
-      if (floor) {
-        imp.bidfloor = floor.floor;
-        imp.bidfloorcur = floor.currency;
-
-        // logic below relates to https://github.com/prebid/Prebid.js/issues/8749 and does the following:
-        // 1. check client-side floors (ref bidfloor/bidfloorcur & ortb2Imp floorMin/floorMinCur (if present))
-        // 2. set pbs req wide floorMinCur to the first floor currency found when iterating over imp's
-        //    (if currency conversion logic present, convert all imp floor values to this currency)
-        // 3. compare/store ref to lowest floorMin value as each imp is iterated over
-        // 4. set req wide floorMin and floorMinCur values for pbs after iterations are done
-        if (floorMinCur == null) { floorMinCur = floor.currency }
-        const ortb2ImpFloorMin = imp.ext?.prebid?.floors?.floorMin || imp.ext?.prebid?.floorMin;
-        const ortb2ImpFloorCur = imp.ext?.prebid?.floors?.floorMinCur || imp.ext?.prebid?.floorMinCur || floorMinCur;
-
-        const convertedFloorMinValue = convertCurrency(floor.floor, floor.currency, floorMinCur);
-        const convertedOrtb2ImpFloorMinValue = ortb2ImpFloorMin && ortb2ImpFloorCur ? convertCurrency(ortb2ImpFloorMin, ortb2ImpFloorCur, floorMinCur) : false;
-
-        const lowestImpFloorMin = convertedOrtb2ImpFloorMinValue && convertedOrtb2ImpFloorMinValue < convertedFloorMinValue
-          ? convertedOrtb2ImpFloorMinValue
-          : convertedFloorMinValue;
-
-        deepSetValue(imp, 'ext.prebid.floors.floorMin', lowestImpFloorMin);
-        if (floorMin == null || floorMin > lowestImpFloorMin) { floorMin = lowestImpFloorMin }
-      }
-
-      if (imp.banner || imp.video || imp.native) {
-        imps.push(imp);
-      }
-    });
-
-    if (!imps.length) {
-      logError('Request to Prebid Server rejected due to invalid media type(s) in adUnit.');
-      return;
-    }
-    const request = {
-      id: firstBidRequest.auctionId,
-      source: {tid: firstBidRequest.auctionId},
-      tmax: s2sConfig.timeout,
-      imp: imps,
-      // to do: add setconfig option to pass test = 1
-      test: 0,
-      ext: {
-        prebid: {
-          // set ext.prebid.auctiontimestamp with the auction timestamp. Data type is long integer.
-          auctiontimestamp: firstBidRequest.auctionStart,
-          targeting: {
-            // includewinners is always true for openrtb
-            includewinners: true,
-            // includebidderkeys always false for openrtb
-            includebidderkeys: false
-          }
-        }
-      }
-    };
-
-    // If the price floors module is active, then we need to signal to PBS! If floorData obj is present is best way to check
-    if (typeof deepAccess(firstBidRequest, 'bids.0.floorData') === 'object') {
-      request.ext.prebid.floors = { enabled: false };
-    }
-
-    // This is no longer overwritten unless name and version explicitly overwritten by extPrebid (mergeDeep)
-    request.ext.prebid = Object.assign(request.ext.prebid, {channel: {name: 'pbjs', version: $$PREBID_GLOBAL$$.version}});
-
-    // set debug flag if in debug mode
-    if (getConfig('debug')) {
-      request.ext.prebid = Object.assign(request.ext.prebid, {debug: true});
-    }
-
-    // s2sConfig video.ext.prebid is passed through openrtb to PBS
-    if (s2sConfig.extPrebid && typeof s2sConfig.extPrebid === 'object') {
-      request.ext.prebid = mergeDeep(request.ext.prebid, s2sConfig.extPrebid);
-    }
-
-    // get reference to pbs config schain bidder names (if any exist)
-    const pbsSchainBidderNamesArr = request.ext.prebid?.schains ? request.ext.prebid.schains.flatMap(s => s.bidders) : [];
-    // create an schains object
-    const schains = Object.fromEntries(
-      (request.ext.prebid?.schains || []).map(({bidders, schain}) => [JSON.stringify(schain), {bidders: new Set(bidders), schain}])
-    );
-
-    // compare bidder specific schains with pbs specific schains
-    request.ext.prebid.schains = Object.values(
-      bidRequests
-        .map((req) => [req.bidderCode, req.bids[0].schain])
-        .reduce((chains, [bidder, chain]) => {
-          const chainKey = JSON.stringify(chain);
-
-          switch (true) {
-            // if pbjs bidder name is same as pbs bidder name, pbs bidder name always wins
-            case chainKey && pbsSchainBidderNamesArr.indexOf(bidder) !== -1:
-              logInfo(`bidder-specific schain for ${bidder} skipped due to existing entry`);
-              break;
-            // if a pbjs schain obj is equal to an schain obj that exists on the pbs side, add the bidder name on the pbs side
-            case chainKey && chains.hasOwnProperty(chainKey) && pbsSchainBidderNamesArr.indexOf(bidder) === -1:
-              chains[chainKey].bidders.add(bidder);
-              break;
-            // if a pbjs schain obj is not on the pbs side, add a new schain entry on the pbs side
-            case chainKey && !chains.hasOwnProperty(chainKey):
-              chains[chainKey] = {bidders: new Set(), schain: chain};
-              chains[chainKey].bidders.add(bidder);
-              break;
-            default:
-          }
-
-          return chains;
-        }, schains)
-    ).map(({bidders, schain}) => ({bidders: Array.from(bidders), schain}));
-    // if schains evaluates to an empty array, remove it from the prebid object
-    if (request.ext.prebid.schains.length === 0) delete request.ext.prebid.schains;
-
-    /**
-     * @type {(string[]|string|undefined)} - OpenRTB property 'cur', currencies available for bids
-     */
-    const adServerCur = config.getConfig('currency.adServerCurrency');
-    if (adServerCur && typeof adServerCur === 'string') {
-      // if the value is a string, wrap it with an array
-      request.cur = [adServerCur];
-    } else if (Array.isArray(adServerCur) && adServerCur.length) {
-      // if it's an array, get the first element
-      request.cur = [adServerCur[0]];
-    }
-
-    _appendSiteAppDevice(request, bidRequests[0].refererInfo.page, s2sConfig.accountId);
-
-    // pass schain object if it is present
-    const schain = deepAccess(bidRequests, '0.bids.0.schain');
-    if (schain) {
-      request.source.ext = {
-        schain: schain
-      };
-    }
-
-    if (!isEmpty(aliases)) {
-      request.ext.prebid.aliases = {...request.ext.prebid.aliases, ...aliases};
-    }
-
-    const bidUserIdAsEids = deepAccess(bidRequests, '0.bids.0.userIdAsEids');
-    if (isArray(bidUserIdAsEids) && bidUserIdAsEids.length > 0) {
-      deepSetValue(request, 'user.ext.eids', bidUserIdAsEids);
-    }
-
-    if (isArray(eidPermissions) && eidPermissions.length > 0) {
-      if (requestedBidders && isArray(requestedBidders)) {
-        eidPermissions.forEach(i => {
-          if (i.bidders) {
-            i.bidders = i.bidders.filter(bidder => includes(requestedBidders, bidder))
-          }
-        });
-      }
-      deepSetValue(request, 'ext.prebid.data.eidpermissions', eidPermissions);
-    }
-
-    const multibid = config.getConfig('multibid');
-    if (multibid) {
-      deepSetValue(request, 'ext.prebid.multibid', multibid.reduce((result, i) => {
-        let obj = {};
-
-        Object.keys(i).forEach(key => {
-          obj[key.toLowerCase()] = i[key];
-        });
-
-        result.push(obj);
-
-        return result;
-      }, []));
-    }
-
-    if (bidRequests) {
-      if (firstBidRequest.gdprConsent) {
-        // note - gdprApplies & consentString may be undefined in certain use-cases for consentManagement module
-        let gdprApplies;
-        if (typeof firstBidRequest.gdprConsent.gdprApplies === 'boolean') {
-          gdprApplies = firstBidRequest.gdprConsent.gdprApplies ? 1 : 0;
-        }
-        deepSetValue(request, 'regs.ext.gdpr', gdprApplies);
-        deepSetValue(request, 'user.ext.consent', firstBidRequest.gdprConsent.consentString);
-        if (firstBidRequest.gdprConsent.addtlConsent && typeof firstBidRequest.gdprConsent.addtlConsent === 'string') {
-          deepSetValue(request, 'user.ext.ConsentedProvidersSettings.consented_providers', firstBidRequest.gdprConsent.addtlConsent);
-        }
-      }
-
-      // US Privacy (CCPA) support
-      if (firstBidRequest.uspConsent) {
-        deepSetValue(request, 'regs.ext.us_privacy', firstBidRequest.uspConsent);
-      }
-    }
-
-    if (getConfig('coppa') === true) {
-      deepSetValue(request, 'regs.coppa', 1);
-    }
-
-    const commonFpd = s2sBidRequest.ortb2Fragments?.global || {};
-    mergeDeep(request, commonFpd);
-
-    addBidderFirstPartyDataToRequest(request, s2sBidRequest.ortb2Fragments?.bidder || {});
-
-    request.imp.forEach((imp) => this.impRequested[imp.id] = imp);
-
-    if (request.ext?.prebid?.floors?.enabled) {
-      request.ext.prebid.floors.floorMin = floorMin;
-      request.ext.prebid.floors.floorMinCur = floorMinCur;
-    }
-
-    return request;
-  },
-
-  interpretResponse(response) {
-    const {bidderRequests, s2sConfig} = this;
-    const bids = [];
-
-    [['errors', 'serverErrors'], ['responsetimemillis', 'serverResponseTimeMs']]
-      .forEach(info => getPbsResponseData(bidderRequests, response, info[0], info[1]))
-
-    if (response.seatbid) {
-      // a seatbid object contains a `bid` array and a `seat` string
-      response.seatbid.forEach(seatbid => {
-        (seatbid.bid || []).forEach(bid => {
-          let bidRequest = this.getBidRequest(bid.impid, seatbid.seat);
-          if (bidRequest == null) {
-            // for stored impression, a request was made with bidder code `null`. Pick it up here so that NO_BID, BID_WON, etc events
-            // can work as expected (otherwise, the original request will always result in NO_BID).
-            bidRequest = this.getBidRequest(bid.impid, null);
-          }
-
-          const cpm = bid.price;
-          const status = cpm !== 0 ? CONSTANTS.STATUS.GOOD : CONSTANTS.STATUS.NO_BID;
-          let bidObject = createBid(status, {
-            bidder: seatbid.seat,
-            src: TYPE,
-            bidId: bidRequest ? (bidRequest.bidId || bidRequest.bid_Id) : null,
-            transactionId: this.adUnitsByImp[bid.impid].transactionId,
-            auctionId: this.auctionId,
-          });
-          bidObject.requestBidder = bidRequest?.bidder;
-          bidObject.requestTimestamp = this.requestTimestamp;
-          bidObject.cpm = cpm;
-          if (bid?.ext?.prebid?.meta?.adaptercode) {
-            bidObject.adapterCode = bid.ext.prebid.meta.adaptercode;
-          } else if (bidRequest?.bidder) {
-            bidObject.adapterCode = bidRequest.bidder;
-          } else {
-            bidObject.adapterCode = seatbid.seat;
-          }
-
-          // temporarily leaving attaching it to each bidResponse so no breaking change
-          // BUT: this is a flat map, so it should be only attached to bidderRequest, a the change above does
-          let serverResponseTimeMs = deepAccess(response, ['ext', 'responsetimemillis', seatbid.seat].join('.'));
-          if (bidRequest && serverResponseTimeMs) {
-            bidRequest.serverResponseTimeMs = serverResponseTimeMs;
-          }
-
-          // Look for seatbid[].bid[].ext.prebid.bidid and place it in the bidResponse object for use in analytics adapters as 'pbsBidId'
-          const bidId = deepAccess(bid, 'ext.prebid.bidid');
-          if (isStr(bidId)) {
-            bidObject.pbsBidId = bidId;
-          }
-
-          // store wurl by auctionId and adId so it can be accessed from the BID_WON event handler
-          if (isStr(deepAccess(bid, 'ext.prebid.events.win'))) {
-            addWurl(this.auctionId, bidObject.adId, deepAccess(bid, 'ext.prebid.events.win'));
-          }
-
-          let extPrebidTargeting = deepAccess(bid, 'ext.prebid.targeting');
-
-          // If ext.prebid.targeting exists, add it as a property value named 'adserverTargeting'
-          // The removal of hb_winurl and hb_bidid targeting values is temporary
-          // once we get through the transition, this block will be removed.
-          if (isPlainObject(extPrebidTargeting)) {
-            // If wurl exists, remove hb_winurl and hb_bidid targeting attributes
-            if (isStr(deepAccess(bid, 'ext.prebid.events.win'))) {
-              extPrebidTargeting = getDefinedParams(extPrebidTargeting, Object.keys(extPrebidTargeting)
-                .filter(i => (i.indexOf('hb_winurl') === -1 && i.indexOf('hb_bidid') === -1)));
-            }
-            bidObject.adserverTargeting = extPrebidTargeting;
-          }
-
-          bidObject.seatBidId = bid.id;
-
-          if (deepAccess(bid, 'ext.prebid.type') === VIDEO) {
-            bidObject.mediaType = VIDEO;
-            const impReq = this.impRequested[bid.impid];
-            [bidObject.playerWidth, bidObject.playerHeight] = [impReq.video.w, impReq.video.h];
-
-            // try to get cache values from 'response.ext.prebid.cache.js'
-            // else try 'bid.ext.prebid.targeting' as fallback
-            if (bid.ext.prebid.cache && typeof bid.ext.prebid.cache.vastXml === 'object' && bid.ext.prebid.cache.vastXml.cacheId && bid.ext.prebid.cache.vastXml.url) {
-              bidObject.videoCacheKey = bid.ext.prebid.cache.vastXml.cacheId;
-              bidObject.vastUrl = bid.ext.prebid.cache.vastXml.url;
-            } else if (extPrebidTargeting && extPrebidTargeting.hb_uuid && extPrebidTargeting.hb_cache_host && extPrebidTargeting.hb_cache_path) {
-              bidObject.videoCacheKey = extPrebidTargeting.hb_uuid;
-              // build url using key and cache host
-              bidObject.vastUrl = `https://${extPrebidTargeting.hb_cache_host}${extPrebidTargeting.hb_cache_path}?uuid=${extPrebidTargeting.hb_uuid}`;
-            }
-
-            if (bid.adm) { bidObject.vastXml = bid.adm; }
-            if (!bidObject.vastUrl && bid.nurl) { bidObject.vastUrl = bid.nurl; }
-          } else if (FEATURES.NATIVE && deepAccess(bid, 'ext.prebid.type') === NATIVE) {
-            bidObject.mediaType = NATIVE;
-            let ortb;
-            if (typeof bid.adm === 'string') {
-              ortb = bidObject.adm = JSON.parse(bid.adm);
-            } else {
-              ortb = bidObject.adm = bid.adm;
-            }
-
-            if (isPlainObject(ortb) && Array.isArray(ortb.assets)) {
-              bidObject.native = {
-                ortb,
-              };
-            } else {
-              logError('prebid server native response contained no assets');
-            }
-          } else { // banner
-            if (bid.adm && bid.nurl) {
-              bidObject.ad = bid.adm;
-              bidObject.ad += createTrackPixelHtml(decodeURIComponent(bid.nurl));
-            } else if (bid.adm) {
-              bidObject.ad = bid.adm;
-            } else if (bid.nurl) {
-              bidObject.adUrl = bid.nurl;
-            }
-          }
-
-          bidObject.width = bid.w;
-          bidObject.height = bid.h;
-          if (bid.dealid) { bidObject.dealId = bid.dealid; }
-          bidObject.creative_id = bid.crid;
-          bidObject.creativeId = bid.crid;
-          if (bid.burl) { bidObject.burl = bid.burl; }
-          bidObject.currency = (response.cur) ? response.cur : DEFAULT_S2S_CURRENCY;
-          bidObject.meta = {};
-          let extPrebidMeta = deepAccess(bid, 'ext.prebid.meta');
-          if (extPrebidMeta && isPlainObject(extPrebidMeta)) { bidObject.meta = deepClone(extPrebidMeta); }
-          if (bid.adomain) { bidObject.meta.advertiserDomains = bid.adomain; }
-
-          // the OpenRTB location for "TTL" as understood by Prebid.js is "exp" (expiration).
-          const configTtl = s2sConfig.defaultTtl || DEFAULT_S2S_TTL;
-          bidObject.ttl = (bid.exp) ? bid.exp : configTtl;
-          bidObject.netRevenue = (bid.netRevenue) ? bid.netRevenue : DEFAULT_S2S_NETREVENUE;
-
-          bids.push({ adUnit: this.adUnitsByImp[bid.impid].code, bid: bidObject });
-        });
-      });
-    }
-
-    return bids;
-  },
-  setBidRequestId(impId, bidderCode, bidId) {
-    this.bidIdMap[this.impBidderKey(impId, bidderCode)] = bidId;
-  },
-  getBidRequest(impId, bidderCode) {
-    const key = this.impBidderKey(impId, bidderCode);
-    return this.bidIdMap[key] && getBidRequest(this.bidIdMap[key], this.bidderRequests);
-  },
-  impBidderKey(impId, bidderCode) {
-    return `${impId}${bidderCode}`;
-  }
-});
-
 /**
  * BID_WON event to request the wurl
  * @param {Bid} bid the winning bid object
@@ -1161,6 +462,9 @@ export function PrebidServer() {
           } else {
             if (metrics.measureTime('addBidResponse.validate', () => isValid(adUnit, bid))) {
               addBidResponse(adUnit, bid);
+              if (bid.pbsWurl) {
+                addWurl(bid.auctionId, bid.adId, bid.pbsWurl);
+              }
             } else {
               addBidResponse.reject(adUnit, bid, CONSTANTS.REJECTION_REASON.INVALID);
             }
@@ -1200,8 +504,7 @@ export const processPBSRequest = hook('sync', function (s2sBidRequest, bidReques
     .reduce(flatten, [])
     .filter(uniques);
 
-  const ortb2 = new ORTB2(s2sBidRequest, bidRequests, adUnits, requestedBidders);
-  const request = s2sBidRequest.metrics.measureTime('buildRequests', () => ortb2.buildRequest());
+  const request = s2sBidRequest.metrics.measureTime('buildRequests', () => buildPBSRequest(s2sBidRequest, bidRequests, adUnits, requestedBidders, eidPermissions));
   const requestJson = request && JSON.stringify(request);
   logInfo('BidRequest: ' + requestJson);
   const endpointUrl = getMatchingConsentUrl(s2sBidRequest.s2sConfig.endpoint, gdprConsent);
@@ -1215,7 +518,7 @@ export const processPBSRequest = hook('sync', function (s2sBidRequest, bidReques
           let result;
           try {
             result = JSON.parse(response);
-            const bids = s2sBidRequest.metrics.measureTime('interpretResponse', () => ortb2.interpretResponse(result));
+            const bids = s2sBidRequest.metrics.measureTime('interpretResponse', () => interpretPBSResponse(result, request).bids);
             bids.forEach(onBid);
           } catch (error) {
             logError(error);
diff --git a/modules/prebidServerBidAdapter/ortbConverter.js b/modules/prebidServerBidAdapter/ortbConverter.js
new file mode 100644
index 00000000000..0aee261c25d
--- /dev/null
+++ b/modules/prebidServerBidAdapter/ortbConverter.js
@@ -0,0 +1,274 @@
+import {ortbConverter} from '../../libraries/ortbConverter/converter.js';
+import {
+  deepAccess,
+  deepSetValue,
+  getBidRequest,
+  getDefinedParams,
+  isArray,
+  logError,
+  logWarn,
+  mergeDeep,
+  timestamp
+} from '../../src/utils.js';
+import {config} from '../../src/config.js';
+import CONSTANTS from '../../src/constants.json';
+import {createBid} from '../../src/bidfactory.js';
+import {pbsExtensions} from '../../libraries/pbsExtensions/pbsExtensions.js';
+import {setImpBidParams} from '../../libraries/pbsExtensions/processors/params.js';
+import {SUPPORTED_MEDIA_TYPES} from '../../libraries/pbsExtensions/processors/mediaType.js';
+import {IMP, REQUEST, RESPONSE} from '../../src/pbjsORTB.js';
+import {beConvertCurrency} from '../../src/utils/currency.js';
+
+const DEFAULT_S2S_TTL = 60;
+const DEFAULT_S2S_CURRENCY = 'USD';
+const DEFAULT_S2S_NETREVENUE = true;
+const BIDDER_SPECIFIC_REQUEST_PROPS = new Set(['bidderCode', 'bidderRequestId', 'uniquePbsTid', 'bids', 'timeout']);
+
+const PBS_CONVERTER = ortbConverter({
+  processors: pbsExtensions,
+  context: {
+    netRevenue: DEFAULT_S2S_NETREVENUE,
+  },
+  imp(buildImp, proxyBidRequest, context) {
+    Object.assign(context, proxyBidRequest.pbsData);
+    const imp = buildImp(proxyBidRequest, context);
+    if (Object.values(SUPPORTED_MEDIA_TYPES).some(mtype => imp[mtype])) {
+      imp.secure = context.s2sBidRequest.s2sConfig.secure;
+      return imp;
+    }
+  },
+  request(buildRequest, imps, proxyBidderRequest, context) {
+    if (!imps.length) {
+      logError('Request to Prebid Server rejected due to invalid media type(s) in adUnit.');
+    } else {
+      let {s2sBidRequest, requestedBidders, eidPermissions} = context;
+      const request = buildRequest(imps, proxyBidderRequest, context);
+
+      request.tmax = s2sBidRequest.s2sConfig.timeout;
+      deepSetValue(request, 'source.tid', proxyBidderRequest.auctionId);
+
+      [request.app, request.site].forEach(section => {
+        if (section && !section.publisher?.id) {
+          deepSetValue(section, 'publisher.id', s2sBidRequest.s2sConfig.accountId);
+        }
+      })
+
+      if (isArray(eidPermissions) && eidPermissions.length > 0) {
+        if (requestedBidders && isArray(requestedBidders)) {
+          eidPermissions = eidPermissions.map(p => ({
+            ...p,
+            bidders: p.bidders.filter(bidder => requestedBidders.includes(bidder))
+          }))
+        }
+        deepSetValue(request, 'ext.prebid.data.eidpermissions', eidPermissions);
+      }
+
+      return request;
+    }
+  },
+  bidResponse(buildBidResponse, bid, context) {
+    // before sending the response throgh "stock" ortb conversion, here we need to:
+    // - filter out ones that come from an "unknown" bidder (if allowUnknownBidderCode is not set)
+    // - overwrite context.bidRequest with the actual bid request for this seat / imp combination
+
+    let bidRequest = context.actualBidRequests.get(context.seatbid.seat);
+    if (bidRequest == null) {
+      // for stored impressions, a request was made with bidder code `null`. Pick it up here so that NO_BID, BID_WON, etc events
+      // can work as expected (otherwise, the original request will always result in NO_BID).
+      bidRequest = context.actualBidRequests.get(null);
+    }
+
+    if (bidRequest) {
+      Object.assign(context, {
+        bidRequest,
+        bidderRequest: context.actualBidderRequests.find(req => req.bidderCode === bidRequest.bidder)
+      })
+    }
+
+    const bidResponse = buildBidResponse(bid, context);
+    bidResponse.requestBidder = bidRequest?.bidder;
+
+    if (bidResponse.native?.ortb) {
+      // TODO: do we need to set bidResponse.adm here?
+      // Any consumers can now get the same object from bidResponse.native.ortb;
+      // I could not find any, which raises the question - who is looking for this?
+      bidResponse.adm = bidResponse.native.ortb;
+    }
+
+    // because core has special treatment for PBS adapter responses, we need some additional processing
+    bidResponse.requestTimestamp = context.requestTimestamp;
+    const status = bid.price !== 0 ? CONSTANTS.STATUS.GOOD : CONSTANTS.STATUS.NO_BID;
+    return {
+      bid: Object.assign(createBid(status, {
+        src: CONSTANTS.S2S.SRC,
+        bidId: bidRequest ? (bidRequest.bidId || bidRequest.bid_Id) : null,
+        transactionId: context.adUnit.transactionId,
+        auctionId: context.bidderRequest.auctionId,
+      }), bidResponse),
+      adUnit: context.adUnit.code
+    };
+  },
+  overrides: {
+    [IMP]: {
+      id(orig, imp, proxyBidRequest, context) {
+        imp.id = context.impId;
+      },
+      params(orig, imp, proxyBidRequest, context) {
+        // override params processing to do it for each bidRequest in this imp;
+        // also, take overrides from s2sConfig.adapterOptions
+        const adapterOptions = context.s2sBidRequest.s2sConfig.adapterOptions;
+        for (const req of context.actualBidRequests.values()) {
+          setImpBidParams(imp, req, context, context);
+          if (adapterOptions && adapterOptions[req.bidder]) {
+            Object.assign(imp.ext.prebid.bidder[req.bidder], adapterOptions[req.bidder]);
+          }
+        }
+      },
+      bidfloor(orig, imp, proxyBidRequest, context) {
+        // for bid floors, we pass each bidRequest associated with this imp through normal bidfloor processing,
+        // and aggregate all of them into a single, minimum floor to put in the request
+        let min;
+        for (const req of context.actualBidRequests.values()) {
+          const floor = {};
+          orig(floor, req, context);
+          // if any bid does not have a valid floor, do not attempt to send any to PBS
+          if (floor.bidfloorcur == null || floor.bidfloor == null) {
+            min = null;
+            break;
+          } else if (min == null) {
+            min = floor;
+          } else {
+            const value = beConvertCurrency(floor.bidfloor, floor.bidfloorcur, min.bidfloorcur);
+            if (value != null && value < min.bidfloor) {
+              min = floor;
+            }
+          }
+        }
+        if (min != null) {
+          Object.assign(imp, min);
+        }
+      }
+    },
+    [REQUEST]: {
+      fpd(orig, ortbRequest, proxyBidderRequest, context) {
+        // FPD is handled different for PBS - the base request will only contain global FPD;
+        // bidder-specific values are set in ext.prebid.bidderconfig
+
+        mergeDeep(ortbRequest, context.s2sBidRequest.ortb2Fragments?.global);
+
+        // also merge in s2sConfig.extPrebid
+        if (context.s2sBidRequest.s2sConfig.extPrebid && typeof context.s2sBidRequest.s2sConfig.extPrebid === 'object') {
+          deepSetValue(ortbRequest, 'ext.prebid', mergeDeep(ortbRequest.ext?.prebid || {}, context.s2sBidRequest.s2sConfig.extPrebid));
+        }
+
+        const fpdConfigs = Object.entries(context.s2sBidRequest.ortb2Fragments?.bidder || {}).map(([bidder, ortb2]) => ({
+          bidders: [bidder],
+          config: {ortb2}
+        }));
+        if (fpdConfigs.length) {
+          deepSetValue(ortbRequest, 'ext.prebid.bidderconfig', fpdConfigs);
+        }
+      },
+      extPrebidAliases(orig, ortbRequest, proxyBidderRequest, context) {
+        // override alias processing to do it for each bidder in the request
+        context.actualBidderRequests.forEach(req => orig(ortbRequest, req, context));
+      },
+      sourceExtSchain(orig, ortbRequest, proxyBidderRequest, context) {
+        // pass schains in ext.prebid.schains, with the most commonly used one in source.ext.schain
+        let mainChain;
+
+        let chains = (deepAccess(ortbRequest, 'ext.prebid.schains') || []);
+        const chainBidders = new Set(chains.flatMap((item) => item.bidders));
+
+        chains = Object.values(
+          chains
+            .concat(context.actualBidderRequests
+              .filter((req) => !chainBidders.has(req.bidderCode)) // schain defined in s2sConfig.extPrebid takes precedence
+              .map((req) => ({
+                bidders: [req.bidderCode],
+                schain: deepAccess(req, 'bids.0.schain')
+              })))
+            .filter(({bidders, schain}) => bidders?.length > 0 && schain)
+            .reduce((chains, {bidders, schain}) => {
+              const key = JSON.stringify(schain);
+              if (!chains.hasOwnProperty(key)) {
+                chains[key] = {bidders: new Set(), schain};
+              }
+              bidders.forEach((bidder) => chains[key].bidders.add(bidder));
+              if (mainChain == null || chains[key].bidders.size > mainChain.bidders.size) {
+                mainChain = chains[key]
+              }
+              return chains;
+            }, {})
+        ).map(({bidders, schain}) => ({bidders: Array.from(bidders), schain}));
+
+        if (mainChain != null) {
+          deepSetValue(ortbRequest, 'source.ext.schain', mainChain.schain);
+        }
+
+        if (chains.length) {
+          deepSetValue(ortbRequest, 'ext.prebid.schains', chains);
+        }
+      }
+    },
+    [RESPONSE]: {
+      serverSideStats(orig, response, ortbResponse, context) {
+        // override to process each request
+        context.actualBidderRequests.forEach(req => orig(response, ortbResponse, {...context, bidderRequest: req, bidRequests: req.bids}));
+      }
+    }
+  },
+});
+
+export function buildPBSRequest(s2sBidRequest, bidderRequests, adUnits, requestedBidders, eidPermissions) {
+  const requestTimestamp = timestamp();
+  const impIds = new Set();
+  const proxyBidRequests = [];
+
+  adUnits.forEach(adUnit => {
+    const actualBidRequests = new Map();
+
+    adUnit.bids.forEach((bid) => {
+      if (bid.mediaTypes != null) {
+        // TODO: support labels / conditional bids
+        // for now, just warn about them
+        logWarn(`Prebid Server adapter does not (yet) support bidder-specific mediaTypes for the same adUnit. Size mapping configuration will be ignored for adUnit: ${adUnit.code}, bidder: ${bid.bidder}`);
+      }
+      actualBidRequests.set(bid.bidder, getBidRequest(bid.bid_id, bidderRequests));
+    });
+
+    let impId = adUnit.code;
+    let i = 1;
+    while (impIds.has(impId)) {
+      i++;
+      impId = `${adUnit.code}-${i}`;
+    }
+    impIds.add(impId)
+    proxyBidRequests.push({
+      ...adUnit,
+      ...getDefinedParams(actualBidRequests.values().next().value || {}, ['userId', 'userIdAsEids', 'schain']),
+      pbsData: {impId, actualBidRequests, adUnit}
+    });
+  });
+
+  const proxyBidderRequest = Object.fromEntries(Object.entries(bidderRequests[0]).filter(([k]) => !BIDDER_SPECIFIC_REQUEST_PROPS.has(k)))
+
+  return PBS_CONVERTER.toORTB({
+    bidderRequest: proxyBidderRequest,
+    bidRequests: proxyBidRequests,
+    context: {
+      currency: config.getConfig('currency.adServerCurrency') || DEFAULT_S2S_CURRENCY,
+      ttl: s2sBidRequest.s2sConfig.defaultTtl || DEFAULT_S2S_TTL,
+      requestTimestamp,
+      s2sBidRequest,
+      requestedBidders,
+      actualBidderRequests: bidderRequests,
+      eidPermissions,
+      nativeRequest: s2sBidRequest.s2sConfig.ortbNative,
+    }
+  });
+}
+
+export function interpretPBSResponse(response, request) {
+  return PBS_CONVERTER.fromORTB({response, request});
+}
diff --git a/modules/priceFloors.js b/modules/priceFloors.js
index 5aee87d474e..d7ab811d673 100644
--- a/modules/priceFloors.js
+++ b/modules/priceFloors.js
@@ -10,6 +10,7 @@ import {
   logError,
   logInfo,
   logWarn,
+  mergeDeep,
   parseGPTSingleSizeArray,
   parseUrl,
   pick
@@ -24,7 +25,9 @@ import {find} from '../src/polyfill.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {bidderSettings} from '../src/bidderSettings.js';
 import {auctionManager} from '../src/auctionManager.js';
+import {IMP, PBS, registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
 import {timedAuctionHook, timedBidResponseHook} from '../src/utils/perfMetrics.js';
+import {beConvertCurrency} from '../src/utils/currency.js';
 
 /**
  * @summary This Module is intended to provide users with the ability to dynamically set and enforce price floors on a per auction basis.
@@ -745,3 +748,72 @@ export const addBidResponseHook = timedBidResponseHook('priceFloors', function a
 });
 
 config.getConfig('floors', config => handleSetFloorsConfig(config.floors));
+
+/**
+ * Sets bidfloor and bidfloorcur for ORTB imp objects
+ */
+export function setOrtbImpBidFloor(imp, bidRequest, context) {
+  if (typeof bidRequest.getFloor === 'function') {
+    let currency, floor;
+    try {
+      ({currency, floor} = bidRequest.getFloor({
+        currency: context.currency || config.getConfig('currency.adServerCurrency') || 'USD',
+        mediaType: context.mediaType || '*',
+        size: '*'
+      }));
+    } catch (e) {
+      logWarn('Cannot compute floor for bid', bidRequest);
+      return;
+    }
+    floor = parseFloat(floor);
+    if (currency != null && floor != null && !isNaN(floor)) {
+      Object.assign(imp, {
+        bidfloor: floor,
+        bidfloorcur: currency
+      });
+    }
+  }
+}
+
+export function setImpExtPrebidFloors(imp, bidRequest, context) {
+  // logic below relates to https://github.com/prebid/Prebid.js/issues/8749 and does the following:
+  // 1. check client-side floors (ref bidfloor/bidfloorcur & ortb2Imp floorMin/floorMinCur (if present))
+  // 2. set pbs req wide floorMinCur to the first floor currency found when iterating over imp's
+  //    (if currency conversion logic present, convert all imp floor values to this currency)
+  // 3. compare/store ref to lowest floorMin value as each imp is iterated over
+  // 4. set req wide floorMin and floorMinCur values for pbs after iterations are done
+
+  if (imp.bidfloor != null) {
+    let {floorMinCur, floorMin} = context.reqContext.floorMin || {};
+
+    if (floorMinCur == null) { floorMinCur = imp.bidfloorcur }
+    const ortb2ImpFloorCur = imp.ext?.prebid?.floors?.floorMinCur || imp.ext?.prebid?.floorMinCur || floorMinCur;
+    const ortb2ImpFloorMin = imp.ext?.prebid?.floors?.floorMin || imp.ext?.prebid?.floorMin;
+    const convertedFloorMinValue = beConvertCurrency(imp.bidfloor, imp.bidfloorcur, floorMinCur);
+    const convertedOrtb2ImpFloorMinValue = ortb2ImpFloorMin && ortb2ImpFloorCur ? beConvertCurrency(ortb2ImpFloorMin, ortb2ImpFloorCur, floorMinCur) : false;
+
+    const lowestImpFloorMin = convertedOrtb2ImpFloorMinValue && convertedOrtb2ImpFloorMinValue < convertedFloorMinValue
+      ? convertedOrtb2ImpFloorMinValue
+      : convertedFloorMinValue;
+
+    deepSetValue(imp, 'ext.prebid.floors.floorMin', lowestImpFloorMin);
+    if (floorMin == null || floorMin > lowestImpFloorMin) { floorMin = lowestImpFloorMin }
+    context.reqContext.floorMin = {floorMin, floorMinCur};
+  }
+}
+
+/**
+ * PBS specific extension: set ext.prebid.floors.enabled = false if floors are processed client-side
+ */
+export function setOrtbExtPrebidFloors(ortbRequest, bidderRequest, context) {
+  if (addedFloorsHook) {
+    deepSetValue(ortbRequest, 'ext.prebid.floors.enabled', ortbRequest.ext?.prebid?.floors?.enabled || false);
+  }
+  if (context?.floorMin) {
+    mergeDeep(ortbRequest, {ext: {prebid: {floors: context.floorMin}}})
+  }
+}
+
+registerOrtbProcessor({type: IMP, name: 'bidfloor', fn: setOrtbImpBidFloor});
+registerOrtbProcessor({type: IMP, name: 'extPrebidFloors', fn: setImpExtPrebidFloors, dialects: [PBS], priority: -1});
+registerOrtbProcessor({type: REQUEST, name: 'extPrebidFloors', fn: setOrtbExtPrebidFloors, dialects: [PBS]});
diff --git a/modules/schain.js b/modules/schain.js
index ef1c6da78ce..eac2cb93b0a 100644
--- a/modules/schain.js
+++ b/modules/schain.js
@@ -1,6 +1,18 @@
 import { config } from '../src/config.js';
 import adapterManager from '../src/adapterManager.js';
-import { isNumber, isStr, isArray, isPlainObject, hasOwn, logError, isInteger, _each, logWarn } from '../src/utils.js';
+import {
+  isNumber,
+  isStr,
+  isArray,
+  isPlainObject,
+  hasOwn,
+  logError,
+  isInteger,
+  _each,
+  logWarn,
+  deepAccess, deepSetValue
+} from '../src/utils.js';
+import {registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
 
 // https://github.com/InteractiveAdvertisingBureau/openrtb/blob/master/supplychainobject.md
 
@@ -181,3 +193,14 @@ export function init() {
 }
 
 init()
+
+export function setOrtbSourceExtSchain(ortbRequest, bidderRequest, context) {
+  if (!deepAccess(ortbRequest, 'source.ext.schain')) {
+    const schain = deepAccess(context, 'bidRequests.0.schain');
+    if (schain) {
+      deepSetValue(ortbRequest, 'source.ext.schain', schain);
+    }
+  }
+}
+
+registerOrtbProcessor({type: REQUEST, name: 'sourceExtSchain', fn: setOrtbSourceExtSchain});
diff --git a/modules/userId/index.js b/modules/userId/index.js
index 73295011089..6df78b9e73c 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -149,11 +149,12 @@ import {
   logInfo,
   logWarn,
   timestamp,
-  isEmpty
+  isEmpty, deepSetValue
 } from '../../src/utils.js';
 import {getPPID as coreGetPPID} from '../../src/adserver.js';
 import {defer, GreedyPromise} from '../../src/utils/promise.js';
 import {hasPurpose1Consent} from '../../src/utils/gpdr.js';
+import {registerOrtbProcessor, REQUEST} from '../../src/pbjsORTB.js';
 import {newMetrics, timedAuctionHook, useMetrics} from '../../src/utils/perfMetrics.js';
 
 const MODULE_NAME = 'User ID';
@@ -1082,3 +1083,11 @@ export function init(config, {delay = GreedyPromise.timeout} = {}) {
 init(config);
 
 module('userId', attachIdSystem);
+
+export function setOrtbUserExtEids(ortbRequest, bidderRequest, context) {
+  const eids = deepAccess(context, 'bidRequests.0.userIdAsEids');
+  if (eids) {
+    deepSetValue(ortbRequest, 'user.ext.eids', eids);
+  }
+}
+registerOrtbProcessor({type: REQUEST, name: 'userExtEids', fn: setOrtbUserExtEids});
diff --git a/package-lock.json b/package-lock.json
index daa59e6ad12..61d961b102e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19020,9 +19020,9 @@
       }
     },
     "node_modules/nan": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
-      "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
       "dev": true,
       "optional": true
     },
@@ -43578,9 +43578,9 @@
       }
     },
     "nan": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
-      "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
       "dev": true,
       "optional": true
     },
diff --git a/src/pbjsORTB.js b/src/pbjsORTB.js
new file mode 100644
index 00000000000..cc5c1c5bdd9
--- /dev/null
+++ b/src/pbjsORTB.js
@@ -0,0 +1,35 @@
+export const PROCESSOR_TYPES = ['request', 'imp', 'bidResponse', 'response'];
+export const PROCESSOR_DIALECTS = ['default', 'pbs'];
+export const [REQUEST, IMP, BID_RESPONSE, RESPONSE] = PROCESSOR_TYPES;
+export const [DEFAULT, PBS] = PROCESSOR_DIALECTS;
+
+const types = new Set(PROCESSOR_TYPES);
+
+export function processorRegistry() {
+  const processors = {};
+
+  return {
+    registerOrtbProcessor({type, name, fn, priority = 0, dialects = [DEFAULT]}) {
+      if (!types.has(type)) {
+        throw new Error(`ORTB processor type must be one of: ${PROCESSOR_TYPES.join(', ')}`)
+      }
+      dialects.forEach(dialect => {
+        if (!processors.hasOwnProperty(dialect)) {
+          processors[dialect] = {};
+        }
+        if (!processors[dialect].hasOwnProperty(type)) {
+          processors[dialect][type] = {};
+        }
+        processors[dialect][type][name] = {
+          priority,
+          fn
+        }
+      })
+    },
+    getProcessors(dialect) {
+      return processors[dialect] || {};
+    }
+  }
+}
+
+export const {registerOrtbProcessor, getProcessors} = processorRegistry();
diff --git a/src/utils.js b/src/utils.js
index 9e49e1687ae..869e1007841 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1377,6 +1377,27 @@ export function safeJSONParse(data) {
   } catch (e) {}
 }
 
+/**
+ * Returns a memoized version of `fn`.
+ *
+ * @param fn
+ * @param key cache key generator, invoked with the same arguments passed to `fn`.
+ *        By default, the first argument is used as key.
+ * @return {function(): any}
+ */
+export function memoize(fn, key = function (arg) { return arg; }) {
+  const cache = new Map();
+  const memoized = function () {
+    const cacheKey = key.apply(this, arguments);
+    if (!cache.has(cacheKey)) {
+      cache.set(cacheKey, fn.apply(this, arguments));
+    }
+    return cache.get(cacheKey);
+  }
+  memoized.clear = cache.clear.bind(cache);
+  return memoized;
+}
+
 /**
  * Sets dataset attributes on a script
  * @param {Script} script
diff --git a/src/utils/currency.js b/src/utils/currency.js
new file mode 100644
index 00000000000..ab7e5faa1ea
--- /dev/null
+++ b/src/utils/currency.js
@@ -0,0 +1,16 @@
+import {getGlobal} from '../prebidGlobal.js';
+
+/**
+ * "best effort" wrapper around currency conversion; always returns an amount that may or may not be correct.
+ */
+export function beConvertCurrency(amount, from, to) {
+  if (from === to) return amount;
+  let result = amount;
+  if (typeof getGlobal().convertCurrency === 'function') {
+    try {
+      result = getGlobal().convertCurrency(amount, from, to);
+    } catch (e) {
+    }
+  }
+  return result;
+}
diff --git a/test/spec/modules/improvedigitalBidAdapter_spec.js b/test/spec/modules/improvedigitalBidAdapter_spec.js
index d88266af386..9190c008a9f 100644
--- a/test/spec/modules/improvedigitalBidAdapter_spec.js
+++ b/test/spec/modules/improvedigitalBidAdapter_spec.js
@@ -1,9 +1,20 @@
 import { expect } from 'chai';
-import { spec } from 'modules/improvedigitalBidAdapter.js';
+import {CONVERTER, spec} from 'modules/improvedigitalBidAdapter.js';
 import { config } from 'src/config.js';
 import { deepClone } from 'src/utils.js';
 import {BANNER, NATIVE, VIDEO} from '../../../src/mediaTypes';
 import { deepSetValue } from '../../../src/utils';
+// load modules that register ORTB processors
+import 'src/prebid.js';
+import 'modules/currency.js';
+import 'modules/userId/index.js';
+import 'modules/multibid/index.js';
+import 'modules/priceFloors.js';
+import 'modules/consentManagement.js';
+import 'modules/consentManagementUsp.js';
+import 'modules/schain.js';
+import {decorateAdUnitsWithNativeParams, toLegacyResponse} from '../../../src/native.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
 
 describe('Improve Digital Adapter Tests', function () {
   const METHOD = 'POST';
@@ -93,6 +104,7 @@ describe('Improve Digital Adapter Tests', function () {
   };
 
   const simpleSmartTagBidRequest = {
+    mediaTypes: {},
     bidder: 'improvedigital',
     bidId: '1a2b3c',
     placementCode: 'placement1',
@@ -103,27 +115,27 @@ describe('Improve Digital Adapter Tests', function () {
   };
 
   const bidderRequest = {
-    bids: [simpleBidRequest]
+    bids: [simpleBidRequest],
   };
 
   const extendBidderRequest = {
-    bids: [extendBidRequest]
+    bids: [extendBidRequest],
   };
 
   const instreamBidderRequest = {
-    bids: [instreamBidRequest]
+    bids: [instreamBidRequest],
   };
 
   const outstreamBidderRequest = {
-    bids: [outstreamBidRequest]
+    bids: [outstreamBidRequest],
   };
 
   const multiFormatBidderRequest = {
-    bids: [multiFormatBidRequest]
+    bids: [multiFormatBidRequest],
   };
 
   const nativeBidderRequest = {
-    bids: [nativeBidRequest]
+    bids: [nativeBidRequest],
   };
 
   const gdprConsent = {
@@ -147,6 +159,12 @@ describe('Improve Digital Adapter Tests', function () {
     },
   };
 
+  function updateNativeParams(bidRequests) {
+    bidRequests = deepClone(bidRequests);
+    decorateAdUnitsWithNativeParams(bidRequests);
+    return bidRequests;
+  }
+
   describe('isBidRequestValid', function () {
     it('should return false when no bid', function () {
       expect(spec.isBidRequestValid()).to.equal(false);
@@ -203,20 +221,18 @@ describe('Improve Digital Adapter Tests', function () {
       expect(request).to.be.an('object');
       expect(request.method).to.equal(METHOD);
       expect(request.url).to.equal(AD_SERVER_URL);
-      expect(request.bidderRequest).to.deep.equal(bidderRequest);
 
       const payload = JSON.parse(request.data);
       expect(payload).to.be.an('object');
       expect(payload.id).to.be.a('string');
       expect(payload.tmax).not.to.exist;
-      expect(payload.cur).to.be.an('array');
       expect(payload.regs).to.not.exist;
       expect(payload.schain).to.not.exist;
-      expect(payload.source).to.deep.equal({ ext: {}, tid: 'f183e871-fbed-45f0-a427-c8a63c4c01eb' });
+      sinon.assert.match(payload.source, {tid: 'f183e871-fbed-45f0-a427-c8a63c4c01eb'})
       expect(payload.device).to.be.an('object');
       expect(payload.user).to.not.exist;
-      expect(payload.imp).to.deep.equal([
-        {
+      sinon.assert.match(payload.imp, [
+        sinon.match({
           id: '33e9500b21129f',
           secure: 0,
           ext: {
@@ -230,28 +246,23 @@ describe('Improve Digital Adapter Tests', function () {
               {w: 160, h: 600},
             ]
           }
-        }
+        })
       ]);
     });
 
     it('should make a well-formed request object for multi-format ad unit', function () {
       getConfigStub = sinon.stub(config, 'getConfig');
       getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
-      const request = spec.buildRequests([multiFormatBidRequest], multiFormatBidderRequest)[0];
+      const request = spec.buildRequests(updateNativeParams([multiFormatBidRequest]), multiFormatBidderRequest)[0];
       expect(request).to.be.an('object');
       expect(request.method).to.equal(METHOD);
       expect(request.url).to.equal(AD_SERVER_URL);
-      expect(request.bidderRequest).to.deep.equal(multiFormatBidderRequest);
 
       const payload = JSON.parse(request.data);
       expect(payload).to.be.an('object');
-      expect(payload.imp).to.deep.equal([
-        {
+      sinon.assert.match(payload.imp, [
+        sinon.match({
           id: '33e9500b21129f',
-          native: {
-            request: '{"eventtrackers":[{"event":1,"methods":[1,2]}],"assets":[{"id":3,"required":1,"data":{"type":2}}]}',
-            ver: '1.2'
-          },
           secure: 0,
           ext: {
             bidder: {
@@ -270,53 +281,54 @@ describe('Improve Digital Adapter Tests', function () {
               {w: 160, h: 600},
             ]
           }
-        }
+        })
       ]);
+      if (FEATURES.NATIVE) {
+        sinon.assert.match(payload.imp[0], {
+          native: {
+            ver: '1.2'
+          },
+        })
+        const nativeReq = JSON.parse(payload.imp[0].native.request);
+        sinon.assert.match(nativeReq, {
+          eventtrackers: [
+            {event: 1, methods: [1, 2]},
+          ],
+          'assets': [
+            sinon.match({'required': 1, 'data': {'type': 2}})
+          ]
+        });
+      }
     });
 
-    it('should make a well-formed native request', function () {
-      const payload = JSON.parse(spec.buildRequests([nativeBidRequest], {})[0].data);
-      expect(payload.imp[0].native).to.deep.equal({
-        ver: '1.2',
-        request: '{"eventtrackers":[{"event":1,"methods":[1,2]}],"assets":[{"id":0,"required":1,"title":{"len":140}},{"id":3,"required":1,"data":{"type":2}}]}'
+    if (FEATURES.NATIVE) {
+      it('should make a well-formed native request', function () {
+        const payload = JSON.parse(spec.buildRequests(updateNativeParams([nativeBidRequest]), {})[0].data);
+        const nativeReq = JSON.parse(payload.imp[0].native.request);
+        sinon.assert.match(nativeReq, {
+          eventtrackers: [
+            {event: 1, methods: [1, 2]},
+          ],
+          assets: [
+            sinon.match({required: 1, title: {len: 140}}),
+            sinon.match({required: 1, data: {type: 2}})
+          ]
+        })
       });
-    });
 
-    it('should not make native request when nativeParams is undefined', function () {
-      const request = deepClone(nativeBidRequest);
-      delete request.nativeParams;
-      const payload = JSON.parse(spec.buildRequests([request], {})[0].data);
-      expect(payload.imp[0].native).to.not.exist;
-    });
-
-    it('should not make native request when no assets', function () {
-      const request = deepClone(nativeBidRequest);
-      request.nativeParams = {};
-      const payload = JSON.parse(spec.buildRequests([request], {})[0].data);
-      expect(payload.imp[0].native).to.not.exist;
-    });
-
-    it('should make a well-formed native request', function () {
-      const payload = JSON.parse(spec.buildRequests([nativeBidRequest], {})[0].data);
-      expect(payload.imp[0].native).to.deep.equal({
-        ver: '1.2',
-        request: '{"eventtrackers":[{"event":1,"methods":[1,2]}],"assets":[{"id":0,"required":1,"title":{"len":140}},{"id":3,"required":1,"data":{"type":2}}]}'
+      it('should not make native request when nativeOrtbRequest is undefined', function () {
+        const requests = updateNativeParams([nativeBidRequest]);
+        delete requests[0].nativeOrtbRequest;
+        const payload = JSON.parse(spec.buildRequests(requests, {})[0].data);
+        expect(payload.imp[0].native).to.not.exist;
       });
-    });
 
-    it('should not make native request when nativeParams is undefined', function () {
-      const request = deepClone(nativeBidRequest);
-      delete request.nativeParams;
-      const payload = JSON.parse(spec.buildRequests([request], {})[0].data);
-      expect(payload.imp[0].native).to.not.exist;
-    });
-
-    it('should not make native request when no assets', function () {
-      const request = deepClone(nativeBidRequest);
-      request.nativeParams = {};
-      const payload = JSON.parse(spec.buildRequests([request], {})[0].data);
-      expect(payload.imp[0].native).to.not.exist;
-    });
+      it('should not make native request when no assets', function () {
+        const requests = updateNativeParams([{...nativeBidRequest, nativeParams: {}}])
+        const payload = JSON.parse(spec.buildRequests(requests, {})[0].data);
+        expect(payload.imp[0].native).to.not.exist;
+      });
+    }
 
     it('should set placementKey and publisherId for smart tags', function () {
       const payload = JSON.parse(spec.buildRequests([simpleSmartTagBidRequest], bidderRequest)[0].data);
@@ -337,10 +349,14 @@ describe('Improve Digital Adapter Tests', function () {
     });
 
     it('should add currency', function () {
-      const bidRequest = Object.assign({}, simpleBidRequest);
-      getConfigStub = sinon.stub(config, 'getConfig').returns('JPY');
-      const payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
-      expect(payload.cur).to.deep.equal(['JPY']);
+      config.setConfig({currency: {adServerCurrency: 'JPY'}});
+      try {
+        const bidRequest = Object.assign({}, simpleBidRequest);
+        const payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequest)[0].data);
+        expect(payload.cur).to.deep.equal(['JPY']);
+      } finally {
+        config.resetConfig();
+      }
     });
 
     it('should add bid floor', function () {
@@ -486,40 +502,6 @@ describe('Improve Digital Adapter Tests', function () {
       expect(payload.imp[0].video.w).equal(640);
     });
 
-    it('should set skip params only if skip=1', function() {
-      const bidRequest = deepClone(instreamBidRequest);
-      // 1
-      const videoTest = {
-        skip: 1,
-        skipmin: 5,
-        skipafter: 30
-      }
-      bidRequest.params.video = videoTest;
-      let request = spec.buildRequests([bidRequest], {})[0];
-      let payload = JSON.parse(request.data);
-      expect(payload.imp[0].video.skip).to.equal(1);
-      expect(payload.imp[0].video.skipmin).to.equal(5);
-      expect(payload.imp[0].video.skipafter).to.equal(30);
-
-      // 0 - leave out skipmin and skipafter
-      videoTest.skip = 0;
-      bidRequest.params.video = videoTest;
-      request = spec.buildRequests([bidRequest], {})[0];
-      payload = JSON.parse(request.data);
-      expect(payload.imp[0].video.skip).to.equal(0);
-      expect(payload.imp[0].video.skipmin).to.not.exist;
-      expect(payload.imp[0].video.skipafter).to.not.exist;
-
-      // other
-      videoTest.skip = 'blah';
-      bidRequest.params.video = videoTest;
-      request = spec.buildRequests([bidRequest], {})[0];
-      payload = JSON.parse(request.data);
-      expect(payload.imp[0].video.skip).to.not.exist;
-      expect(payload.imp[0].video.skipmin).to.not.exist;
-      expect(payload.imp[0].video.skipafter).to.not.exist;
-    });
-
     it('should ignore invalid/unexpected video params', function() {
       const bidRequest = deepClone(instreamBidRequest);
       // 1
@@ -583,7 +565,7 @@ describe('Improve Digital Adapter Tests', function () {
         }]
       }]}};
       const bidRequest = Object.assign({}, simpleBidRequest);
-      bidRequest.userId = userId;
+      bidRequest.userIdAsEids = createEidsArray(userId);
       const request = spec.buildRequests([bidRequest], bidderRequestReferrer)[0];
       const payload = JSON.parse(request.data);
       expect(payload.user).to.deep.equal(expectedUserObject);
@@ -596,8 +578,6 @@ describe('Improve Digital Adapter Tests', function () {
       ], bidderRequest);
       expect(requests).to.be.an('array');
       expect(requests.length).to.equal(2);
-      expect(requests[0].bidderRequest).to.deep.equal(bidderRequest);
-      expect(requests[1].bidderRequest).to.deep.equal(bidderRequest);
     });
 
     it('should return one request in a single request mode', function () {
@@ -632,7 +612,7 @@ describe('Improve Digital Adapter Tests', function () {
       getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
       const request = spec.buildRequests([simpleBidRequest], bidderRequest)[0];
       const payload = JSON.parse(request.data);
-      expect(payload.imp[0].banner).to.deep.equal({
+      sinon.assert.match(payload.imp[0].banner, {
         format: [
           { w: 300, h: 250 },
           { w: 160, h: 600 }
@@ -651,7 +631,7 @@ describe('Improve Digital Adapter Tests', function () {
       bidRequest.params.size = size;
       const request = spec.buildRequests([bidRequest], bidderRequest)[0];
       const payload = JSON.parse(request.data);
-      expect(payload.imp[0].banner).to.deep.equal({
+      sinon.assert.match(payload.imp[0].banner, {
         format: [
           { w: 300, h: 250 },
           { w: 160, h: 600 }
@@ -659,44 +639,6 @@ describe('Improve Digital Adapter Tests', function () {
       });
     });
 
-    it('should set GPID and Instl Signal', function () {
-      const bidRequest = Object.assign({
-        ortb2Imp: {
-          instl: true,
-          ext: {
-            gpid: '/123/ID-FORMAT',
-            data: {
-              pbadslot: '/123/ID-FORMAT-PBADSLOT',
-              adserver: {
-                adslot: '/123/ID-FORMAT-ADSERVER-PB-ADSLOT',
-              }
-            }
-          },
-        }
-      }, simpleBidRequest);
-      let request = spec.buildRequests([bidRequest], bidderRequest)[0];
-      let payload = JSON.parse(request.data);
-      expect(payload.imp[0].ext.gpid).to.equal('/123/ID-FORMAT');
-      expect(payload.imp[0].instl).to.equal(1);
-
-      delete bidRequest.ortb2Imp.ext.gpid;
-      request = spec.buildRequests([bidRequest], bidderRequest)[0];
-      payload = JSON.parse(request.data);
-      expect(payload.imp[0].ext.gpid).to.equal('/123/ID-FORMAT-PBADSLOT');
-
-      delete bidRequest.ortb2Imp.ext.data.pbadslot;
-      request = spec.buildRequests([bidRequest], bidderRequest)[0];
-      payload = JSON.parse(request.data);
-      expect(payload.imp[0].ext.gpid).to.equal('/123/ID-FORMAT-ADSERVER-PB-ADSLOT');
-
-      delete bidRequest.ortb2Imp.ext.data.adserver;
-      delete bidRequest.ortb2Imp.instl;
-      request = spec.buildRequests([bidRequest], bidderRequest)[0];
-      payload = JSON.parse(request.data);
-      expect(payload.imp[0].ext.gpid).to.not.exist;
-      expect(payload.imp[0].instl).to.not.exist;
-    });
-
     it('should not set site when app is defined in FPD', function () {
       const ortb2 = {app: {content: 'XYZ'}};
       let request = spec.buildRequests([simpleBidRequest], {...bidderRequest, ortb2})[0];
@@ -747,6 +689,7 @@ describe('Improve Digital Adapter Tests', function () {
     it('should set site when app not available', function () {
       getConfigStub = sinon.stub(config, 'getConfig');
       getConfigStub.withArgs('app').returns(undefined);
+      getConfigStub.withArgs('site').returns({});
       let request = spec.buildRequests([simpleBidRequest], bidderRequest)[0];
       let payload = JSON.parse(request.data);
       expect(payload.site).does.exist;
@@ -829,7 +772,6 @@ describe('Improve Digital Adapter Tests', function () {
                   'agency_id': '0'
                 }
               },
-              'exp': 120,
               'crid': '510265',
               'price': 1.9200543539802946,
               'id': '35adfe19-d6e9-46b9-9f7d-20da7026b965',
@@ -872,7 +814,6 @@ describe('Improve Digital Adapter Tests', function () {
                   'agency_id': '0'
                 }
               },
-              'exp': 120,
               'crid': '510265',
               'price': 1.9200543539802946,
               'id': '35adfe19-d6e9-46b9-9f7d-20da7026b965',
@@ -892,7 +833,6 @@ describe('Improve Digital Adapter Tests', function () {
                   'agency_id': '0'
                 }
               },
-              'exp': 120,
               'crid': '479163',
               'price': 1.9200543539802946,
               'id': '83c8d524-0955-4d0c-b558-4c9f3600e09b',
@@ -937,10 +877,9 @@ describe('Improve Digital Adapter Tests', function () {
                 }
               },
               'crid': '544456',
-              'exp': 120,
               'id': '52098fad-20c1-476b-a4fa-41e275e5a4a5',
               'price': 1.8600000000000003,
-              'adm': '{"ver":"1.1","imptrackers":["https://secure.adnxs.com/imptr?id=52311&t=2","https://euw-ice.360yield.com/imp_pixel?ic=hcUBlCANx1FabHBf6FR2gC7UO4xEyXahdZAn0-B5qL-bb3A74BJ1smyWIyW7IWcC0SOjSXzVpevTHXxTqJ.sf.Qhahyy6tSo.0j1QWfXlH8sM4-8vKWjMjw-x.IrJJNlwkQ0s1CdwcwTefcLXm5l2E-W19VhACuV7f3mgrZMNjiSw.SjJAfyPC3SIyAMRjYfj53UmjriQ46T7lhmkqxK8wHmksYCdbZc3PZESk8NWl28sxdjNvnYYCFMcJbeav.LOLabyTXfwy-1cEPbQs.IKMRZIKaqccTDPV3wOtzbNv0jQzatd3Nnv-PGFQcjQ-GW3i27W04Fws4kodpFSn-B6VwZAjzLzoyd5gBncyRnAyCplEbgHU5sZ1IyKHWjgCl3ZtRIK5vqrRD5D-xqgSnOi7-phG.CqZWDZ4bMDSfQg2ZnbvUTyGKcEl0WR59dW5izTMV4Fjizcrvr5T-t.zMbGwz.hGnmLIyhTqh.IcwW.GiDLVExlDlix5S1LXIWVsSyrQ=="],"assets":[{"id":1,"data":{"value":"ImproveDigital","type":1}},{"id":3,"data":{"value":"Test content.","type":2}},{"id":0,"title":{"text":"Sample Prebid Test Title"}}],"link":{"url":"https://euw-ice.360yield.com/click/hcUBlHOV7YhVse8RyBa0ajjyPa9Vt17e4g-1m3cRj3E67vq-RYux.SiUeAmBfNBcoOqkUc6A15AWmi4yFu5K-BdkaYjildyyk7fNLyR6hWr411kv4vrFwm5jrIBceuHS6K8oN69f.uCo8zGTdR2TbSlldwcpahQPlufZU.6VaMsu4IC53uEiUT5vb7kAw6TTlxuGBNq6zaGryiWEV2.N3YYJDTyYPh8tv-ZFyeFZFm0Gnjv.xWbC.70JcRUVU9UelQaPsTpTWYTXBhJt84YJUw1-GNtaLNVLSjjZbVoA2fsMti5p6OBmF.7u39on2OPgvseIkSmge7Pqg63pRqdP75hp.DAEk6OkcN1jGnwP2DSbvpaSbin5lVqjfO0B-wnQgfQTCUtM5v4JmkNweLhUf9Q-x.nPKLW5SccEk9ZFXzY2-1wpT3PWm8Tix3NRscLPZub9wHzL..pl6ip8cQ9hp16UjwT4H6RMAxL0R7bl-h2pAicGAzYmuO7ntRESKUoIWA==//http%3A%2F%2Fquantum-advertising.com%2Ffr%2F"},"jstracker":"<script type=\\"application/javascript\\">var js_tracker = [\\"https://secure.adnxs.com/imptr?id=52312&t=1\\", \\"https://pixel.adsafeprotected.com/rjss/st/291611/36974035/skeleton.js?ias_adpath=[class~=ea_improve_pid_${TAG_ID}]\\"]</script>"}',
+              'adm': "{\"ver\":\"1.1\",\"imptrackers\":[\"https://secure.adnxs.com/imptr?id=52311&t=2\",\"https://euw-ice.360yield.com/imp_pixel?ic=hcUBlCANx1FabHBf6FR2gC7UO4xEyXahdZAn0-B5qL-bb3A74BJ1smyWIyW7IWcC0SOjSXzVpevTHXxTqJ.sf.Qhahyy6tSo.0j1QWfXlH8sM4-8vKWjMjw-x.IrJJNlwkQ0s1CdwcwTefcLXm5l2E-W19VhACuV7f3mgrZMNjiSw.SjJAfyPC3SIyAMRjYfj53UmjriQ46T7lhmkqxK8wHmksYCdbZc3PZESk8NWl28sxdjNvnYYCFMcJbeav.LOLabyTXfwy-1cEPbQs.IKMRZIKaqccTDPV3wOtzbNv0jQzatd3Nnv-PGFQcjQ-GW3i27W04Fws4kodpFSn-B6VwZAjzLzoyd5gBncyRnAyCplEbgHU5sZ1IyKHWjgCl3ZtRIK5vqrRD5D-xqgSnOi7-phG.CqZWDZ4bMDSfQg2ZnbvUTyGKcEl0WR59dW5izTMV4Fjizcrvr5T-t.zMbGwz.hGnmLIyhTqh.IcwW.GiDLVExlDlix5S1LXIWVsSyrQ==\"],\"assets\":[{\"id\":1,\"data\":{\"value\":\"ImproveDigital\",\"type\":1}},{\"id\":3,\"data\":{\"value\":\"Test content.\",\"type\":2}},{\"id\":0,\"title\":{\"text\":\"Sample Prebid Test Title\"}}],\"link\":{\"url\":\"https://euw-ice.360yield.com/click/hcUBlHOV7YhVse8RyBa0ajjyPa9Vt17e4g-1m3cRj3E67vq-RYux.SiUeAmBfNBcoOqkUc6A15AWmi4yFu5K-BdkaYjildyyk7fNLyR6hWr411kv4vrFwm5jrIBceuHS6K8oN69f.uCo8zGTdR2TbSlldwcpahQPlufZU.6VaMsu4IC53uEiUT5vb7kAw6TTlxuGBNq6zaGryiWEV2.N3YYJDTyYPh8tv-ZFyeFZFm0Gnjv.xWbC.70JcRUVU9UelQaPsTpTWYTXBhJt84YJUw1-GNtaLNVLSjjZbVoA2fsMti5p6OBmF.7u39on2OPgvseIkSmge7Pqg63pRqdP75hp.DAEk6OkcN1jGnwP2DSbvpaSbin5lVqjfO0B-wnQgfQTCUtM5v4JmkNweLhUf9Q-x.nPKLW5SccEk9ZFXzY2-1wpT3PWm8Tix3NRscLPZub9wHzL..pl6ip8cQ9hp16UjwT4H6RMAxL0R7bl-h2pAicGAzYmuO7ntRESKUoIWA==//http%3A%2F%2Fquantum-advertising.com%2Ffr%2F\"},\"jstracker\":\"<script type=\\\"application/javascript\\\">var js_tracker = ['https://secure.adnxs.com/imptr?id=52312&t=1', 'https://pixel.adsafeprotected.com/rjss/st/291611/36974035/skeleton.js?ias_adpath=[class~=ea_improve_pid_${TAG_ID}]']</script>\"}",
               'impid': '33e9500b21129f',
               'cid': '196108'
             }
@@ -968,7 +907,6 @@ describe('Improve Digital Adapter Tests', function () {
                   'agency_id': '0'
                 }
               },
-              'exp': 120,
               'crid': '484367',
               'price': 9.600271769901472,
               'id': 'b131fd7b-5759-4b72-800e-60e69291e7d9',
@@ -1012,7 +950,6 @@ describe('Improve Digital Adapter Tests', function () {
                   'agency_id': '0'
                 }
               },
-              'exp': 120,
               'crid': '544063',
               'price': 1.9199364935359489,
               'id': '1fcf4dd8-a783-48ed-b59c-8fc8eeccb024',
@@ -1041,20 +978,17 @@ describe('Improve Digital Adapter Tests', function () {
         width: 728,
         height: 90,
         ttl: 300,
-        ad: '<html><body style="margin:0%"><script>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688,"keyValues":{"testKey":["testValue"]},"bidFloor":0.05,"bidFloorCur":"eUR","size":{"w":800,"h":600}},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]}},"sizes":[[300,250],[160,600]]},"bid":{"requestId":"33e9500b21129f","cpm":1.9200543539802946,"creativeId":"510265","currency":"EUR","dealId":320896,"meta":{"advertiserDomains":[]},"netRevenue":false,"ttl":300,"mediaType":"banner","ad":"<html><body style=\\"margin:0%\\"><a href=\\"https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com\\" target=\\"_blank\\"><img style=\\"border: 0;\\" border=\\"0\\" width=728 height=90 src=\\"https://creative.360yield.com/file/241121/728x90.jpg\\" alt=\\" \\"/></a><img src=\\"https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk\\" alt=\\" \\" style=\\"display:none\\"/><improvedigital_ad_output_information tp_id=\\"\\" buyer_id=\\"0\\" rtb_advertiser=\\"\\" campaign_id=\\"123159\\" line_item_id=\\"320896\\" creative_id=\\"510265\\" crid=\\"0\\" placement_id=\\"22135702\\"></improvedigital_ad_output_information></body></html>","width":728,"height":90}}};</script><a href="https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com" target="_blank"><img style="border: 0;" border="0" width=728 height=90 src="https://creative.360yield.com/file/241121/728x90.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="510265" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
+        ad: '<html><body style="margin:0%">\x3Cscript>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688,"keyValues":{"testKey":["testValue"]},"bidFloor":0.05,"bidFloorCur":"eUR","size":{"w":800,"h":600}},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]}},"sizes":[[300,250],[160,600]]},"bid":{"mediaType":"banner","ad":"<html><body style=\\"margin:0%\\"><a href=\\"https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com\\" target=\\"_blank\\"><img style=\\"border: 0;\\" border=\\"0\\" width=728 height=90 src=\\"https://creative.360yield.com/file/241121/728x90.jpg\\" alt=\\" \\"/></a><img src=\\"https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk\\" alt=\\" \\" style=\\"display:none\\"/><improvedigital_ad_output_information tp_id=\\"\\" buyer_id=\\"0\\" rtb_advertiser=\\"\\" campaign_id=\\"123159\\" line_item_id=\\"320896\\" creative_id=\\"510265\\" crid=\\"0\\" placement_id=\\"22135702\\"></improvedigital_ad_output_information></body></html>","requestId":"33e9500b21129f","seatBidId":"35adfe19-d6e9-46b9-9f7d-20da7026b965","cpm":1.9200543539802946,"currency":"EUR","width":728,"height":90,"creative_id":"510265","creativeId":"510265","ttl":300,"meta":{},"dealId":320896,"netRevenue":false}}};\x3C/script><a href="https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com" target="_blank"><img style="border: 0;" border="0" width=728 height=90 src="https://creative.360yield.com/file/241121/728x90.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="510265" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
         creativeId: '510265',
         dealId: 320896,
         netRevenue: false,
         mediaType: BANNER,
-        meta: {
-          advertiserDomains: []
-        }
       }
     ];
 
     const multiFormatExpectedBid = [
       Object.assign({}, expectedBid[0], {
-        ad: '<html><body style="margin:0%"><script>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]},"native":{},"video":{"context":"outstream","playerSize":[640,480]}},"sizes":[[300,250],[160,600]],"nativeParams":{"body":{"required":true}}},"bid":{"requestId":"33e9500b21129f","cpm":1.9200543539802946,"creativeId":"510265","currency":"EUR","dealId":320896,"meta":{"advertiserDomains":[]},"netRevenue":false,"ttl":300,"mediaType":"banner","ad":"<html><body style=\\"margin:0%\\"><a href=\\"https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com\\" target=\\"_blank\\"><img style=\\"border: 0;\\" border=\\"0\\" width=728 height=90 src=\\"https://creative.360yield.com/file/241121/728x90.jpg\\" alt=\\" \\"/></a><img src=\\"https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk\\" alt=\\" \\" style=\\"display:none\\"/><improvedigital_ad_output_information tp_id=\\"\\" buyer_id=\\"0\\" rtb_advertiser=\\"\\" campaign_id=\\"123159\\" line_item_id=\\"320896\\" creative_id=\\"510265\\" crid=\\"0\\" placement_id=\\"22135702\\"></improvedigital_ad_output_information></body></html>","width":728,"height":90}}};</script><a href="https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com" target="_blank"><img style="border: 0;" border="0" width=728 height=90 src="https://creative.360yield.com/file/241121/728x90.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="510265" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>'
+        ad: '<html><body style="margin:0%">\x3Cscript>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]},"native":{},"video":{"context":"outstream","playerSize":[640,480]}},"sizes":[[300,250],[160,600]],"nativeParams":{"body":{"required":true}}},"bid":{"mediaType":"banner","ad":"<html><body style=\\"margin:0%\\"><a href=\\"https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com\\" target=\\"_blank\\"><img style=\\"border: 0;\\" border=\\"0\\" width=728 height=90 src=\\"https://creative.360yield.com/file/241121/728x90.jpg\\" alt=\\" \\"/></a><img src=\\"https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk\\" alt=\\" \\" style=\\"display:none\\"/><improvedigital_ad_output_information tp_id=\\"\\" buyer_id=\\"0\\" rtb_advertiser=\\"\\" campaign_id=\\"123159\\" line_item_id=\\"320896\\" creative_id=\\"510265\\" crid=\\"0\\" placement_id=\\"22135702\\"></improvedigital_ad_output_information></body></html>","requestId":"33e9500b21129f","seatBidId":"35adfe19-d6e9-46b9-9f7d-20da7026b965","cpm":1.9200543539802946,"currency":"EUR","width":728,"height":90,"creative_id":"510265","creativeId":"510265","ttl":300,"meta":{},"dealId":320896,"netRevenue":false}}};\x3C/script><a href="https://na-ice.360yield.com/click/wIUgWAXQ-Teg9bFreqmjvvwpXD86tInZbesBQgOtGBHqZatmIY9C1mo-1kWRx32zN2mfOxtmyaaHpr.Qh5pspzJarrsm08TtkRSeTc2mnsRuQ2MKzCTvbospesMJR28YLZ.3g06DwS6c5XOJuesd0eODk7GCqtmJ18c6CTmdWDUdDxiknLAPHVXAfvlDH5AA9utF7TNNGjaxvyMpQD51.Dt5GFjcJLnwWnGSajoSr9JfomoGenbLkabLmzylSXd1p9xyrzTmWU39FvagEOZnMb2ixlc.JDxXA1ZnaR.e7ywkwiJnDtg1Om0EJAYOmUh0oTozbXeo26iwLLZxVxV0owOHY61zhHYyHcpBakqtelYPWZcmBJEXfl5KIekB2CiLQqxCi3TKdg5FztAQY0Tf3mTmiGZev0RkeiX5fnxS8jbWSD-cCgB51PNLn0X5EEkUPkOJh9JV713OOcyDhsgaFPezUcvuD7nNrxB71aWcH6MMfk1BFQ7kSVi9WHQvauaTxrWm//https%3A%2F%2Fazerion.com" target="_blank"><img style="border: 0;" border="0" width=728 height=90 src="https://creative.360yield.com/file/241121/728x90.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=wIUgWDjQ.pQrjtYOEKs44M3pIqNnfojBPkSd3WRdHnRawHiRiER7A-0RowzsOtOLq7MWtEFnWsRXYZZmJcZPGft0cNSs8lNOVZnXWHLDv3Dyqo8VGI4737RieGIK0DrIjlVXzFmuYeXufriRfPHVGiV-hz6VIateQ6I7.xR5O.48..ZoEGfRpIJGzqeqz12cWnFUPhBScQ6sPLlb6B1RiTpNh170OhIVfX80N2g4jn-U.xJ262ND29bBvImQsJjz29o8mmGL3TfbzUHzr.ob-ozfP9.ZHh.B5tD-M5qG9rAlIU6Q7I-zchnhv1W5OzU5mfMYy9yMLKqBemQGJA1KaiZJV79lwnDki-6PIg1v09h86eJqXYHHsUobx4Np5lMT6-5UdHXZPpR8T08b4keLREQw-lpqKum92pwUCVAYPeFdmTeKk1gUKPcaWxN8QfaQeoLJfb.88n3-vp.-aBCkxlZwXjXSd55QV.uwi-bTtFwaZjGHpNkIBG3D19kNl.Yb55Rk" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="510265" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
       })
     ];
 
@@ -1067,14 +1001,11 @@ describe('Improve Digital Adapter Tests', function () {
         width: 300,
         height: 250,
         ttl: 300,
-        ad: '<html><body style="margin:0%"><script>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688,"keyValues":{"testKey":["testValue"]},"bidFloor":0.05,"bidFloorCur":"eUR","size":{"w":800,"h":600}},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]}},"sizes":[[300,250],[160,600]]},"bid":{"requestId":"33e9500b21129f","cpm":1.9200543539802946,"creativeId":"479163","currency":"EUR","dealId":320896,"meta":{"advertiserDomains":[]},"netRevenue":false,"ttl":300,"mediaType":"banner","ad":"<html><body style=\\"margin:0%\\"><a href=\\"https://na-ice.360yield.com/click/.2RC3VhfEsdhtcsRiT8bWksMTmBbkfnj1AaD3C6Bht.Bp85KK5vjzZvJMpigI4ECdhllWuzbk2UhQt8VEGq1tg8m1OEot7Gs94PplWYs2ESdXpGAPFHiqdbZstOOhfiWL4D.k6lXfgNmbRhpL.SktYeEAiRaOZHQAX.22IEQ0swRnEdNyjHXYEkNIgpvMLqkZTv.JYM.iW9NwyJLIqk4Djh8X301iRLxexGBTl7-.n93WbkSCVY6uwdXSzoQrtK1r3fTrS34rdgpqFt6ZIBLKWI2ByLM2.aQqfvev5BCMOeyEKY8CcSg9SoDiPyQsvcz9bTckLtqs3AD3Qu8I.2rGn1NID7ljgg6-dERrorPK9A5XK67Pv34UqUe2xILQ6wvi52dX4p5d3yxsI9BMfnxzkn7MullVJdn-NiSB2rTe2MFozJc5G1nEwtpsMwZpBxl00PCcMsyETtaKbhqa3Gq5nCuce4AEhL6109IrZscUUzBMSKLSX16HlFfmPZ.gDnWCI3lO35UbGdL7lKjbT9mHYQ-//http%3A%2F%2Fblah.com\\" target=\\"_blank\\"><img style=\\"border: 0;\\" border=\\"0\\" width=300 height=250 src=\\"https://creative.360yield.com/file/238052/test_ads-300x250.jpg\\" alt=\\" \\"/></a><img src=\\"https://na-ice.360yield.com/imp_pixel?ic=.2RC3VqxeCtOU3G5i6Wejh69dm5JnKlRXeieMtJA63nfGMyuFoWTTjSU5PfHLg2PtnmDRFgHJgGE19QyjAGj6ZQVy0iUk-HF-.zsAlx.7Fx3m5fPE7RIYw.kjy-BvuprFqfU-qlm03KTks6zVLDSIspuxemNQ1HBhq6QZSm9qqAVY-1XS-KbImfb.fll3VvhJXy7Ru.KstgDfAJwt5vYxVab6efvjAIhOrrv6uXaywFVTtu9-gK5pKgIkdixxuYE2jLUyEh9GiRyRCH0jhhUVUmSfrjE4OuTq-7TmCYXQQ5Vk9AqOV.JybF8d35IeyAbF2aywwdZA2SGGEGeYIoOy.7D8TpuVqXxvnUyeKXlCfmzXcJs27W2sKGUTfpWc-TyhAOHKzwqrxP-QN5D1QRCXFWgAm.rwUBguE-oL1Q7NOaCsaRwINRwvQrastWNFUDEYzrB32NL-wIkILdh9e96JwhKiwGwJ1VqH.6RDDutUi9CLreYQl348exTfqL44Ia5VTLn7e0rA6s9V1tg55V7TX36\\" alt=\\" \\" style=\\"display:none\\"/><improvedigital_ad_output_information tp_id=\\"\\" buyer_id=\\"0\\" rtb_advertiser=\\"\\" campaign_id=\\"123159\\" line_item_id=\\"320896\\" creative_id=\\"479163\\" crid=\\"0\\" placement_id=\\"22135702\\"></improvedigital_ad_output_information></body></html>","width":300,"height":250}}};</script><a href="https://na-ice.360yield.com/click/.2RC3VhfEsdhtcsRiT8bWksMTmBbkfnj1AaD3C6Bht.Bp85KK5vjzZvJMpigI4ECdhllWuzbk2UhQt8VEGq1tg8m1OEot7Gs94PplWYs2ESdXpGAPFHiqdbZstOOhfiWL4D.k6lXfgNmbRhpL.SktYeEAiRaOZHQAX.22IEQ0swRnEdNyjHXYEkNIgpvMLqkZTv.JYM.iW9NwyJLIqk4Djh8X301iRLxexGBTl7-.n93WbkSCVY6uwdXSzoQrtK1r3fTrS34rdgpqFt6ZIBLKWI2ByLM2.aQqfvev5BCMOeyEKY8CcSg9SoDiPyQsvcz9bTckLtqs3AD3Qu8I.2rGn1NID7ljgg6-dERrorPK9A5XK67Pv34UqUe2xILQ6wvi52dX4p5d3yxsI9BMfnxzkn7MullVJdn-NiSB2rTe2MFozJc5G1nEwtpsMwZpBxl00PCcMsyETtaKbhqa3Gq5nCuce4AEhL6109IrZscUUzBMSKLSX16HlFfmPZ.gDnWCI3lO35UbGdL7lKjbT9mHYQ-//http%3A%2F%2Fblah.com" target="_blank"><img style="border: 0;" border="0" width=300 height=250 src="https://creative.360yield.com/file/238052/test_ads-300x250.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=.2RC3VqxeCtOU3G5i6Wejh69dm5JnKlRXeieMtJA63nfGMyuFoWTTjSU5PfHLg2PtnmDRFgHJgGE19QyjAGj6ZQVy0iUk-HF-.zsAlx.7Fx3m5fPE7RIYw.kjy-BvuprFqfU-qlm03KTks6zVLDSIspuxemNQ1HBhq6QZSm9qqAVY-1XS-KbImfb.fll3VvhJXy7Ru.KstgDfAJwt5vYxVab6efvjAIhOrrv6uXaywFVTtu9-gK5pKgIkdixxuYE2jLUyEh9GiRyRCH0jhhUVUmSfrjE4OuTq-7TmCYXQQ5Vk9AqOV.JybF8d35IeyAbF2aywwdZA2SGGEGeYIoOy.7D8TpuVqXxvnUyeKXlCfmzXcJs27W2sKGUTfpWc-TyhAOHKzwqrxP-QN5D1QRCXFWgAm.rwUBguE-oL1Q7NOaCsaRwINRwvQrastWNFUDEYzrB32NL-wIkILdh9e96JwhKiwGwJ1VqH.6RDDutUi9CLreYQl348exTfqL44Ia5VTLn7e0rA6s9V1tg55V7TX36" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="479163" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
+        ad: '<html><body style="margin:0%">\x3Cscript>window.__razr_config = {"prebid":{"bidRequest":{"bidder":"improvedigital","params":{"placementId":1053688,"keyValues":{"testKey":["testValue"]},"bidFloor":0.05,"bidFloorCur":"eUR","size":{"w":800,"h":600}},"adUnitCode":"div-gpt-ad-1499748733608-0","transactionId":"f183e871-fbed-45f0-a427-c8a63c4c01eb","bidId":"33e9500b21129f","bidderRequestId":"2772c1e566670b","auctionId":"192721e36a0239","mediaTypes":{"banner":{"sizes":[[300,250],[160,600]]}},"sizes":[[300,250],[160,600]]},"bid":{"mediaType":"banner","ad":"<html><body style=\\"margin:0%\\"><a href=\\"https://na-ice.360yield.com/click/.2RC3VhfEsdhtcsRiT8bWksMTmBbkfnj1AaD3C6Bht.Bp85KK5vjzZvJMpigI4ECdhllWuzbk2UhQt8VEGq1tg8m1OEot7Gs94PplWYs2ESdXpGAPFHiqdbZstOOhfiWL4D.k6lXfgNmbRhpL.SktYeEAiRaOZHQAX.22IEQ0swRnEdNyjHXYEkNIgpvMLqkZTv.JYM.iW9NwyJLIqk4Djh8X301iRLxexGBTl7-.n93WbkSCVY6uwdXSzoQrtK1r3fTrS34rdgpqFt6ZIBLKWI2ByLM2.aQqfvev5BCMOeyEKY8CcSg9SoDiPyQsvcz9bTckLtqs3AD3Qu8I.2rGn1NID7ljgg6-dERrorPK9A5XK67Pv34UqUe2xILQ6wvi52dX4p5d3yxsI9BMfnxzkn7MullVJdn-NiSB2rTe2MFozJc5G1nEwtpsMwZpBxl00PCcMsyETtaKbhqa3Gq5nCuce4AEhL6109IrZscUUzBMSKLSX16HlFfmPZ.gDnWCI3lO35UbGdL7lKjbT9mHYQ-//http%3A%2F%2Fblah.com\\" target=\\"_blank\\"><img style=\\"border: 0;\\" border=\\"0\\" width=300 height=250 src=\\"https://creative.360yield.com/file/238052/test_ads-300x250.jpg\\" alt=\\" \\"/></a><img src=\\"https://na-ice.360yield.com/imp_pixel?ic=.2RC3VqxeCtOU3G5i6Wejh69dm5JnKlRXeieMtJA63nfGMyuFoWTTjSU5PfHLg2PtnmDRFgHJgGE19QyjAGj6ZQVy0iUk-HF-.zsAlx.7Fx3m5fPE7RIYw.kjy-BvuprFqfU-qlm03KTks6zVLDSIspuxemNQ1HBhq6QZSm9qqAVY-1XS-KbImfb.fll3VvhJXy7Ru.KstgDfAJwt5vYxVab6efvjAIhOrrv6uXaywFVTtu9-gK5pKgIkdixxuYE2jLUyEh9GiRyRCH0jhhUVUmSfrjE4OuTq-7TmCYXQQ5Vk9AqOV.JybF8d35IeyAbF2aywwdZA2SGGEGeYIoOy.7D8TpuVqXxvnUyeKXlCfmzXcJs27W2sKGUTfpWc-TyhAOHKzwqrxP-QN5D1QRCXFWgAm.rwUBguE-oL1Q7NOaCsaRwINRwvQrastWNFUDEYzrB32NL-wIkILdh9e96JwhKiwGwJ1VqH.6RDDutUi9CLreYQl348exTfqL44Ia5VTLn7e0rA6s9V1tg55V7TX36\\" alt=\\" \\" style=\\"display:none\\"/><improvedigital_ad_output_information tp_id=\\"\\" buyer_id=\\"0\\" rtb_advertiser=\\"\\" campaign_id=\\"123159\\" line_item_id=\\"320896\\" creative_id=\\"479163\\" crid=\\"0\\" placement_id=\\"22135702\\"></improvedigital_ad_output_information></body></html>","requestId":"33e9500b21129f","seatBidId":"83c8d524-0955-4d0c-b558-4c9f3600e09b","cpm":1.9200543539802946,"currency":"EUR","width":300,"height":250,"creative_id":"479163","creativeId":"479163","ttl":300,"meta":{},"dealId":320896,"netRevenue":false}}};\x3C/script><a href="https://na-ice.360yield.com/click/.2RC3VhfEsdhtcsRiT8bWksMTmBbkfnj1AaD3C6Bht.Bp85KK5vjzZvJMpigI4ECdhllWuzbk2UhQt8VEGq1tg8m1OEot7Gs94PplWYs2ESdXpGAPFHiqdbZstOOhfiWL4D.k6lXfgNmbRhpL.SktYeEAiRaOZHQAX.22IEQ0swRnEdNyjHXYEkNIgpvMLqkZTv.JYM.iW9NwyJLIqk4Djh8X301iRLxexGBTl7-.n93WbkSCVY6uwdXSzoQrtK1r3fTrS34rdgpqFt6ZIBLKWI2ByLM2.aQqfvev5BCMOeyEKY8CcSg9SoDiPyQsvcz9bTckLtqs3AD3Qu8I.2rGn1NID7ljgg6-dERrorPK9A5XK67Pv34UqUe2xILQ6wvi52dX4p5d3yxsI9BMfnxzkn7MullVJdn-NiSB2rTe2MFozJc5G1nEwtpsMwZpBxl00PCcMsyETtaKbhqa3Gq5nCuce4AEhL6109IrZscUUzBMSKLSX16HlFfmPZ.gDnWCI3lO35UbGdL7lKjbT9mHYQ-//http%3A%2F%2Fblah.com" target="_blank"><img style="border: 0;" border="0" width=300 height=250 src="https://creative.360yield.com/file/238052/test_ads-300x250.jpg" alt=" "/></a><img src="https://na-ice.360yield.com/imp_pixel?ic=.2RC3VqxeCtOU3G5i6Wejh69dm5JnKlRXeieMtJA63nfGMyuFoWTTjSU5PfHLg2PtnmDRFgHJgGE19QyjAGj6ZQVy0iUk-HF-.zsAlx.7Fx3m5fPE7RIYw.kjy-BvuprFqfU-qlm03KTks6zVLDSIspuxemNQ1HBhq6QZSm9qqAVY-1XS-KbImfb.fll3VvhJXy7Ru.KstgDfAJwt5vYxVab6efvjAIhOrrv6uXaywFVTtu9-gK5pKgIkdixxuYE2jLUyEh9GiRyRCH0jhhUVUmSfrjE4OuTq-7TmCYXQQ5Vk9AqOV.JybF8d35IeyAbF2aywwdZA2SGGEGeYIoOy.7D8TpuVqXxvnUyeKXlCfmzXcJs27W2sKGUTfpWc-TyhAOHKzwqrxP-QN5D1QRCXFWgAm.rwUBguE-oL1Q7NOaCsaRwINRwvQrastWNFUDEYzrB32NL-wIkILdh9e96JwhKiwGwJ1VqH.6RDDutUi9CLreYQl348exTfqL44Ia5VTLn7e0rA6s9V1tg55V7TX36" alt=" " style="display:none"/><improvedigital_ad_output_information tp_id="" buyer_id="0" rtb_advertiser="" campaign_id="123159" line_item_id="320896" creative_id="479163" crid="0" placement_id="22135702"></improvedigital_ad_output_information></body></html>',
         creativeId: '479163',
         dealId: 320896,
         netRevenue: false,
         mediaType: BANNER,
-        meta: {
-          advertiserDomains: []
-        }
       }
     ];
 
@@ -1100,93 +1031,106 @@ describe('Improve Digital Adapter Tests', function () {
       content: expectedBidOutstreamVideo[0].vastXml
     };
 
+    function makeRequest(bidderRequest) {
+      return {
+        ortbRequest: CONVERTER.toORTB({bidderRequest})
+      }
+    }
+
+    function expectMatch(actual, expected) {
+      sinon.assert.match(actual, expected.map(i => sinon.match(i)));
+    }
+
     it('should return a well-formed display bid', function () {
-      const bids = spec.interpretResponse(serverResponse, {bidderRequest});
-      expect(bids).to.deep.equal(expectedBid);
+      const bids = spec.interpretResponse(serverResponse, makeRequest(bidderRequest));
+      expectMatch(bids, expectedBid);
     });
 
     it('should return a well-formed display bid for multi-format ad unit', function () {
-      const bids = spec.interpretResponse(serverResponse, {bidderRequest: multiFormatBidderRequest});
-      expect(bids).to.deep.equal(multiFormatExpectedBid);
+      const bids = spec.interpretResponse(serverResponse, makeRequest(multiFormatBidderRequest));
+
+      expectMatch(bids, multiFormatExpectedBid);
     });
 
     it('should return two bids', function () {
-      const bids = spec.interpretResponse(serverResponseTwoBids, {bidderRequest});
-      expect(bids).to.deep.equal(expectedTwoBids);
+      const bids = spec.interpretResponse(serverResponseTwoBids, makeRequest(bidderRequest));
+      expectMatch(bids, expectedTwoBids);
     });
 
     it('should set dealId correctly', function () {
+      const request = makeRequest(bidderRequest);
       const response = deepClone(serverResponse);
       let bids;
 
       delete response.body.seatbid[0].bid[0].ext.improvedigital.line_item_id;
       response.body.seatbid[0].bid[0].ext.improvedigital.buying_type = 'deal_id';
-      bids = spec.interpretResponse(response, {bidderRequest});
+      bids = spec.interpretResponse(response, request);
       expect(bids[0].dealId).to.not.exist;
 
       response.body.seatbid[0].bid[0].ext.improvedigital.line_item_id = 268515;
       delete response.body.seatbid[0].bid[0].ext.improvedigital.buying_type;
-      bids = spec.interpretResponse(response, {bidderRequest});
+      bids = spec.interpretResponse(response, request);
       expect(bids[0].dealId).to.not.exist;
 
       response.body.seatbid[0].bid[0].ext.improvedigital.line_item_id = 268515;
       response.body.seatbid[0].bid[0].ext.improvedigital.buying_type = 'rtb';
-      bids = spec.interpretResponse(response, {bidderRequest});
+      bids = spec.interpretResponse(response, request);
       expect(bids[0].dealId).to.not.exist;
 
       response.body.seatbid[0].bid[0].ext.improvedigital.line_item_id = 268515;
       response.body.seatbid[0].bid[0].ext.improvedigital.buying_type = 'classic';
-      bids = spec.interpretResponse(response, {bidderRequest});
+      bids = spec.interpretResponse(response, request);
       expect(bids[0].dealId).to.equal(268515);
 
       response.body.seatbid[0].bid[0].ext.improvedigital.line_item_id = 268515;
       response.body.seatbid[0].bid[0].ext.improvedigital.buying_type = 'deal_id';
-      bids = spec.interpretResponse(response, {bidderRequest});
+      bids = spec.interpretResponse(response, request);
       expect(bids[0].dealId).to.equal(268515);
     });
 
     it('should set currency', function () {
       const response = deepClone(serverResponse);
-      response.body.cur = 'eur';
-      const bids = spec.interpretResponse(response, {bidderRequest});
+      response.body.cur = 'EUR';
+      const bids = spec.interpretResponse(response, makeRequest(bidderRequest));
       expect(bids[0].currency).to.equal('EUR');
     });
 
     it('should return empty array for bad response or no price', function () {
+      const request = makeRequest(bidderRequest);
       let response = deepClone(serverResponse);
       let bids;
 
       // Price missing or 0
       response.body.seatbid[0].bid[0].price = 0;
-      bids = spec.interpretResponse(response, {bidderRequest});
+      bids = spec.interpretResponse(response, request);
       expect(bids).to.deep.equal([]);
       delete response.body.seatbid[0].bid[0];
-      bids = spec.interpretResponse(response, {bidderRequest});
+      bids = spec.interpretResponse(response, request);
       expect(bids).to.deep.equal([]);
       response.body.seatbid[0].bid[0] = [];
-      bids = spec.interpretResponse(response, {bidderRequest});
+      bids = spec.interpretResponse(response, request);
       expect(bids).to.deep.equal([]);
 
       // errorCode present
       response = deepClone(serverResponse);
       response.body.seatbid[0].bid[0].errorCode = undefined;
-      bids = spec.interpretResponse(response, {bidderRequest});
+      bids = spec.interpretResponse(response, request);
       expect(bids).to.deep.equal([]);
 
       // adm and native missing
       response = deepClone(serverResponse);
       delete response.body.seatbid[0].bid[0].adm;
-      bids = spec.interpretResponse(response, {bidderRequest});
+      bids = spec.interpretResponse(response, request);
       expect(bids).to.deep.equal([]);
       response.body.seatbid[0].bid[0].adm = null;
-      bids = spec.interpretResponse(response, {bidderRequest});
+      bids = spec.interpretResponse(response, request);
       expect(bids).to.deep.equal([]);
     });
 
     it('should set netRevenue', function () {
       const response = deepClone(serverResponse);
       response.body.seatbid[0].bid[0].ext.improvedigital.is_net = true;
-      const bids = spec.interpretResponse(response, {bidderRequest});
+      const bids = spec.interpretResponse(response, makeRequest(bidderRequest));
       expect(bids[0].netRevenue).to.equal(true);
     });
 
@@ -1194,59 +1138,53 @@ describe('Improve Digital Adapter Tests', function () {
       const adomain = ['domain.com'];
       const response = deepClone(serverResponse);
       response.body.seatbid[0].bid[0].adomain = adomain;
-      const bids = spec.interpretResponse(response, {bidderRequest});
+      const bids = spec.interpretResponse(response, makeRequest(bidderRequest));
       expect(bids[0].meta.advertiserDomains).to.equal(adomain);
     });
     //
     // Native ads
-    it('should return a well-formed native ad bid', function () {
-      const bids = spec.interpretResponse(serverResponseNative, {bidderRequest: nativeBidderRequest});
-      // Verify Native Response
-      expect(bids[0].native).to.exist;
-      const nativeBid = bids[0].native;
-      const nativeResp = JSON.parse(serverResponseNative.body.seatbid[0].bid[0].adm);
-      // Verify Native Response
-      expect(nativeBid.clickUrl).to.exist.and.equal(nativeResp.link.url);
-      expect(nativeBid.impressionTrackers).to.exist.and.deep.equal(nativeResp.imptrackers);
-      expect(nativeBid.javascriptTrackers).to.exist.and.deep.equal(nativeResp.jstracker);
-
-      // Verify Assets
-      expect(nativeBid.title).to.exist.and.equal('Sample Prebid Test Title');
-      expect(nativeBid.sponsoredBy).to.exist.and.equal('ImproveDigital');
-      expect(nativeBid.body).to.exist.and.equal('Test content.');
-    });
+    if (FEATURES.NATIVE) {
+      it('should return a well-formed native ad bid', function () {
+        const reqBids = updateNativeParams(nativeBidderRequest.bids);
+        const request = makeRequest({
+          ...nativeBidderRequest,
+          reqBids
+        })
+        const bids = spec.interpretResponse(serverResponseNative, request);
+        expect(bids[0].native.ortb).to.eql(JSON.parse(serverResponseNative.body.seatbid[0].bid[0].adm))
+      });
 
-    it('should return a well-formed native bid for multi-format ad unit', function () {
-      const bids = spec.interpretResponse(serverResponseNative, {bidderRequest: multiFormatBidderRequest});
-      expect(bids[0].mediaType).to.equal(NATIVE);
-    });
+      it('should return a well-formed native bid for multi-format ad unit', function () {
+        const bids = spec.interpretResponse(serverResponseNative, makeRequest(multiFormatBidderRequest));
+        expect(bids[0].mediaType).to.equal(NATIVE);
+      });
+    }
 
     // Video
     it('should return a well-formed instream video bid', function () {
-      const bids = spec.interpretResponse(serverResponseVideo, {bidderRequest: instreamBidderRequest});
-      expect(bids).to.deep.equal(expectedBidInstreamVideo);
+      const bids = spec.interpretResponse(serverResponseVideo, makeRequest(instreamBidderRequest));
+      expectMatch(bids, expectedBidInstreamVideo);
     });
 
     it('should return a well-formed outstream video bid', function () {
-      const bids = spec.interpretResponse(serverResponseVideo, {bidderRequest: outstreamBidderRequest});
+      const bids = spec.interpretResponse(serverResponseVideo, makeRequest(outstreamBidderRequest));
       expect(bids[0].renderer).to.exist;
-      delete (bids[0].renderer);
-      expect(bids).to.deep.equal(expectedBidOutstreamVideo);
+      expectMatch(bids, expectedBidOutstreamVideo);
     });
 
     it('should return a well-formed outstream video bid for multi-format ad unit', function () {
+      const request = makeRequest(multiFormatBidderRequest);
       const videoResponse = deepClone(serverResponseVideo);
-      let bids = spec.interpretResponse(videoResponse, {bidderRequest: multiFormatBidderRequest});
+      let bids = spec.interpretResponse(videoResponse, request);
       expect(bids[0].renderer).to.exist;
-      delete (bids[0].renderer);
-      expect(bids).to.deep.equal(expectedBidOutstreamVideo);
+      expectMatch(bids, expectedBidOutstreamVideo);
 
       videoResponse.body.seatbid[0].bid[0].adm = '<vAst';
-      bids = spec.interpretResponse(videoResponse, {bidderRequest: multiFormatBidderRequest});
+      bids = spec.interpretResponse(videoResponse, request);
       expect(bids[0].mediaType).to.equal(VIDEO);
 
       videoResponse.body.seatbid[0].bid[0].adm = '<?xml';
-      bids = spec.interpretResponse(videoResponse, {bidderRequest: multiFormatBidderRequest});
+      bids = spec.interpretResponse(videoResponse, request);
       expect(bids[0].mediaType).to.equal(VIDEO);
     });
   });
diff --git a/test/spec/modules/openxOrtbBidAdapter_spec.js b/test/spec/modules/openxOrtbBidAdapter_spec.js
index 246411b457a..09e76d6ca7a 100644
--- a/test/spec/modules/openxOrtbBidAdapter_spec.js
+++ b/test/spec/modules/openxOrtbBidAdapter_spec.js
@@ -4,6 +4,16 @@ import {newBidder} from 'src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from 'src/mediaTypes.js';
 import {config} from 'src/config.js';
 import * as utils from 'src/utils.js';
+// load modules that register ORTB processors
+import 'src/prebid.js'
+import 'modules/currency.js';
+import 'modules/userId/index.js';
+import 'modules/multibid/index.js';
+import 'modules/priceFloors.js';
+import 'modules/consentManagement.js';
+import 'modules/consentManagementUsp.js';
+import 'modules/schain.js';
+import {deepClone} from 'src/utils.js';
 
 const DEFAULT_SYNC = SYNC_URL + '?ph=' + DEFAULT_PH;
 
@@ -632,7 +642,7 @@ describe('OpenxRtbAdapter', function () {
           it('should not send the regs object, when consent string is undefined', function () {
             delete bidderRequest.uspConsent;
             const request = spec.buildRequests(bidRequests, bidderRequest);
-            expect(request[0].data.regs).to.not.have.property('ext');
+            expect(request[0].data.regs?.us_privacy).to.not.exist;
           });
         });
 
@@ -698,8 +708,7 @@ describe('OpenxRtbAdapter', function () {
             delete bidderRequest.gdprConsent.gdprApplies;
             bidderRequest.bids = bidRequests;
             const request = spec.buildRequests(bidRequests, bidderRequest);
-            expect(request[0].data.regs).to.not.have.property('ext');
-            expect(request[1].data.regs).to.not.have.property('ext');
+            expect(request[0].data.regs?.ext?.gdpr).to.not.be.ok;
             expect(request[0].data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
             expect(request[1].data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
           });
@@ -717,7 +726,7 @@ describe('OpenxRtbAdapter', function () {
       context('coppa', function() {
         it('when there are no coppa param settings, should not send a coppa flag', function () {
           const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
-          expect(request[0].data.regs.coppa).to.equal(0);
+          expect(request[0].data.regs?.coppa).to.be.not.ok;
         });
 
         it('should send a coppa flag there is when there is coppa param settings in the bid requests', function () {
@@ -1081,55 +1090,57 @@ describe('OpenxRtbAdapter', function () {
       });
     });
 
-    context('when there is a response, the common response properties', function () {
-      beforeEach(function () {
-        bidRequestConfigs = [{
-          bidder: 'openx',
-          params: {
-            unit: '12345678',
-            delDomain: 'test-del-domain'
-          },
-          adUnitCode: 'adunit-code',
-          mediaTypes: {
-            banner: {
-              sizes: [[300, 250], [300, 600]],
-            },
-          },
-          bidId: 'test-bid-id',
-          bidderRequestId: 'test-bidder-request-id',
-          auctionId: 'test-auction-id'
-        }];
-
-        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
-
-        bidResponse = {
-          seatbid: [{
-            bid: [{
-              impid: 'test-bid-id',
-              price: 2,
-              w: 300,
-              h: 250,
-              crid: 'test-creative-id',
-              dealid: 'test-deal-id',
-              adm: 'test-ad-markup',
-              adomain: ['brand.com'],
-              ext: {
-                dsp_id: '123',
-                buyer_id: '456',
-                brand_id: '789',
-                paf: {
-                  content_id: 'paf_content_id'
-                }
-              }
-            }]
-          }],
-          cur: 'AUS',
+    const SAMPLE_BID_REQUESTS = [{
+      bidder: 'openx',
+      params: {
+        unit: '12345678',
+        delDomain: 'test-del-domain'
+      },
+      adUnitCode: 'adunit-code',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 600]],
+        },
+      },
+      bidId: 'test-bid-id',
+      bidderRequestId: 'test-bidder-request-id',
+      auctionId: 'test-auction-id'
+    }];
+
+    const SAMPLE_BID_RESPONSE = {
+      seatbid: [{
+        bid: [{
+          impid: 'test-bid-id',
+          price: 2,
+          w: 300,
+          h: 250,
+          crid: 'test-creative-id',
+          dealid: 'test-deal-id',
+          adm: 'test-ad-markup',
+          adomain: ['brand.com'],
           ext: {
+            dsp_id: '123',
+            buyer_id: '456',
+            brand_id: '789',
             paf: {
-              transmission: {version: '12'}
+              content_id: 'paf_content_id'
             }
           }
-        };
+        }]
+      }],
+      cur: 'AUS',
+      ext: {
+        paf: {
+          transmission: {version: '12'}
+        }
+      }
+    };
+
+    context('when there is a response, the common response properties', function () {
+      beforeEach(function () {
+        bidRequestConfigs = deepClone(SAMPLE_BID_REQUESTS);
+        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
+        bidResponse = deepClone(SAMPLE_BID_RESPONSE);
 
         bid = spec.interpretResponse({body: bidResponse}, bidRequest)[0];
       });
@@ -1196,6 +1207,23 @@ describe('OpenxRtbAdapter', function () {
       });
     });
 
+    context('when there is more than one response', () => {
+      let bids;
+      beforeEach(function () {
+        bidRequestConfigs = deepClone(SAMPLE_BID_REQUESTS);
+        bidRequest = spec.buildRequests(bidRequestConfigs, {refererInfo: {}})[0];
+        bidResponse = deepClone(SAMPLE_BID_RESPONSE);
+        bidResponse.seatbid[0].bid.push(deepClone(bidResponse.seatbid[0].bid[0]));
+        bidResponse.seatbid[0].bid[1].ext.paf.content_id = 'second_paf'
+
+        bids = spec.interpretResponse({body: bidResponse}, bidRequest);
+      });
+
+      it('should not confuse paf content_id', () => {
+        expect(bids.map(b => b.meta.paf.content_id)).to.eql(['paf_content_id', 'second_paf']);
+      });
+    })
+
     context('when the response is a banner', function() {
       beforeEach(function () {
         bidRequestConfigs = [{
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 4b9efa72e61..f5f77e61056 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -1,5 +1,10 @@
 import { expect } from 'chai';
-import { PrebidServer as Adapter, resetSyncedStatus, resetWurlMap } from 'modules/prebidServerBidAdapter/index.js';
+import {
+  PrebidServer as Adapter,
+  resetSyncedStatus,
+  resetWurlMap,
+  s2sDefaultConfig
+} from 'modules/prebidServerBidAdapter/index.js';
 import adapterManager from 'src/adapterManager.js';
 import * as utils from 'src/utils.js';
 import { ajax } from 'src/ajax.js';
@@ -13,6 +18,14 @@ import 'modules/appnexusBidAdapter.js' // appnexus alias test
 import 'modules/rubiconBidAdapter.js' // rubicon alias test
 import 'src/prebid.js' // $$PREBID_GLOBAL$$.aliasBidder test
 import 'modules/currency.js' // adServerCurrency test
+// also load modules that register ORTB processors
+import 'modules/currency.js';
+import 'modules/userId/index.js';
+import 'modules/multibid/index.js';
+import 'modules/priceFloors.js';
+import 'modules/consentManagement.js';
+import 'modules/consentManagementUsp.js';
+import 'modules/schain.js';
 import { hook } from '../../../src/hook.js';
 import { decorateAdUnitsWithNativeParams } from '../../../src/native.js';
 import { auctionManager } from '../../../src/auctionManager.js';
@@ -552,6 +565,7 @@ describe('S2S Adapter', function () {
 
   beforeEach(function () {
     config.resetConfig();
+    config.setConfig({floors: {enabled: false}});
     adapter = new Adapter();
     BID_REQUESTS = [
       {
@@ -620,6 +634,14 @@ describe('S2S Adapter', function () {
       expect(requestBid.source.tid).to.equal(BID_REQUESTS[0].auctionId);
     });
 
+    it('should set tmax to s2sConfig.timeout', () => {
+      const cfg = {...CONFIG, timeout: 123};
+      config.setConfig({s2sConfig: cfg});
+      adapter.callBids({...REQUEST, s2sConfig: cfg}, BID_REQUESTS, addBidResponse, done, ajax);
+      const req = JSON.parse(server.requests[0].requestBody);
+      expect(req.tmax).to.eql(123);
+    })
+
     it('should block request if config did not define p1Consent URL in endpoint object config', function () {
       let badConfig = utils.deepClone(CONFIG);
       badConfig.endpoint = { noP1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction' };
@@ -957,11 +979,11 @@ describe('S2S Adapter', function () {
       config.setConfig(_config);
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(requestBid.device).to.deep.equal({
+      sinon.assert.match(requestBid.device, {
         ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC',
         w: window.innerWidth,
         h: window.innerHeight
-      });
+      })
       expect(requestBid.app).to.deep.equal({
         bundle: 'com.test.app',
         publisher: { 'id': '1' }
@@ -984,11 +1006,11 @@ describe('S2S Adapter', function () {
       config.setConfig(_config);
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
-      expect(requestBid.device).to.deep.equal({
+      sinon.assert.match(requestBid.device, {
         ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC',
         w: window.innerWidth,
         h: window.innerHeight
-      });
+      })
       expect(requestBid.app).to.deep.equal({
         bundle: 'com.test.app',
         publisher: { 'id': '1' }
@@ -1029,6 +1051,8 @@ describe('S2S Adapter', function () {
         expect(
           BID_REQUESTS[0].bids[0].getFloor.calledWith({
             currency: 'USD',
+            mediaType: '*',
+            size: '*'
           })
         ).to.be.true;
 
@@ -1058,6 +1082,8 @@ describe('S2S Adapter', function () {
         expect(
           BID_REQUESTS[0].bids[0].getFloor.calledWith({
             currency: 'USD',
+            mediaType: '*',
+            size: '*'
           })
         ).to.be.true;
 
@@ -1085,6 +1111,8 @@ describe('S2S Adapter', function () {
         expect(
           BID_REQUESTS[0].bids[0].getFloor.calledWith({
             currency: 'JPY',
+            mediaType: '*',
+            size: '*'
           })
         ).to.be.true;
       });
@@ -1250,9 +1278,9 @@ describe('S2S Adapter', function () {
             conversionFn: null
           },
           'is not working': {
-            expectDesc: 'first',
-            expectedFloor: 2,
-            expectedCur: '1',
+            expectDesc: 'absolute minimum',
+            expectedFloor: 1,
+            expectedCur: '10',
             conversionFn: () => {
               throw new Error();
             }
@@ -1291,6 +1319,47 @@ describe('S2S Adapter', function () {
 
     if (FEATURES.NATIVE) {
       describe('native requests', function () {
+        const ORTB_NATIVE_REQ = {
+          'ver': '1.2',
+          'assets': [
+            {
+              'required': 1,
+              'id': 0,
+              'title': {
+                'len': 800
+              }
+            },
+            {
+              'required': 1,
+              'id': 1,
+              'img': {
+                'type': 3,
+                'w': 989,
+                'h': 742
+              }
+            },
+            {
+              'required': 1,
+              'id': 2,
+              'img': {
+                'type': 1,
+                'wmin': 10,
+                'hmin': 10,
+                'ext': {
+                  'aspectratios': ['1:1']
+                }
+              }
+            },
+            {
+              'required': 1,
+              'id': 3,
+              'data': {
+                'type': 1
+              }
+            }
+          ]
+        };
+
         it('adds device.w and device.h even if the config lacks a device object', function () {
           const _config = {
             s2sConfig: CONFIG,
@@ -1300,14 +1369,15 @@ describe('S2S Adapter', function () {
           config.setConfig(_config);
           adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
           const requestBid = JSON.parse(server.requests[0].requestBody);
-          expect(requestBid.device).to.deep.equal({
+          sinon.assert.match(requestBid.device, {
             w: window.innerWidth,
             h: window.innerHeight
-          });
+          })
           expect(requestBid.app).to.deep.equal({
             bundle: 'com.test.app',
             publisher: { 'id': '1' }
           });
+          expect(requestBid.imp[0].native.ver).to.equal('1.2');
         });
 
         it('adds native request for OpenRTB', function () {
@@ -1316,54 +1386,17 @@ describe('S2S Adapter', function () {
           };
 
           config.setConfig(_config);
-          adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+          adapter.callBids({...REQUEST, s2sConfig: Object.assign({}, CONFIG, s2sDefaultConfig)}, BID_REQUESTS, addBidResponse, done, ajax);
           const requestBid = JSON.parse(server.requests[0].requestBody);
           const ortbReq = JSON.parse(requestBid.imp[0].native.request);
           expect(ortbReq).to.deep.equal({
-            'ver': '1.2',
+            ...ORTB_NATIVE_REQ,
             'context': 1,
             'plcmttype': 1,
             'eventtrackers': [{
               event: 1,
               methods: [1]
             }],
-            'assets': [
-              {
-                'required': 1,
-                'id': 0,
-                'title': {
-                  'len': 800
-                }
-              },
-              {
-                'required': 1,
-                'id': 1,
-                'img': {
-                  'type': 3,
-                  'w': 989,
-                  'h': 742
-                }
-              },
-              {
-                'required': 1,
-                'id': 2,
-                'img': {
-                  'type': 1,
-                  'wmin': 10,
-                  'hmin': 10,
-                  'ext': {
-                    'aspectratios': ['1:1']
-                  }
-                }
-              },
-              {
-                'required': 1,
-                'id': 3,
-                'data': {
-                  'type': 1
-                }
-              }
-            ]
           });
           expect(requestBid.imp[0].native.ver).to.equal('1.2');
         });
@@ -1388,6 +1421,29 @@ describe('S2S Adapter', function () {
           expect(requestBid.imp[0].native.ver).to.equal('1.2');
         });
 
+        it('can override default values for imp.native.request with s2sConfig.ortbNative', () => {
+          const cfg = {
+            ...CONFIG,
+            ortbNative: {
+              eventtrackers: [
+                {event: 1, methods: [1, 2]}
+              ]
+            }
+          }
+          config.setConfig({
+            s2sConfig: cfg
+          });
+          adapter.callBids({...REQUEST, s2sConfig: cfg}, BID_REQUESTS, addBidResponse, done, ajax);
+          const requestBid = JSON.parse(server.requests[0].requestBody);
+          const ortbReq = JSON.parse(requestBid.imp[0].native.request);
+          expect(ortbReq).to.eql({
+            ...ORTB_NATIVE_REQ,
+            eventtrackers: [
+              {event: 1, methods: [1, 2]}
+            ]
+          })
+        })
+
         it('should not include ext.aspectratios if adunit\'s aspect_ratios do not define radio_width and ratio_height', () => {
           const req = deepClone(REQUEST);
           req.ad_units[0].mediaTypes.native.icon.aspect_ratios[0] = {'min_width': 1, 'min_height': 2};
@@ -1444,13 +1500,14 @@ describe('S2S Adapter', function () {
 
       const aliasBidder = {
         bidder: 'beintoo',
+        bid_id: REQUEST.ad_units[0].bids[0].bid_id,
         params: { placementId: '123456' }
       };
 
       const request = utils.deepClone(REQUEST);
       request.ad_units[0].bids = [aliasBidder];
 
-      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(request, [{...BID_REQUESTS[0], bidderCode: 'beintoo'}], addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.ext).to.haveOwnProperty('prebid');
@@ -1472,6 +1529,7 @@ describe('S2S Adapter', function () {
       config.setConfig({ s2sConfig: adjustedConfig });
 
       const aliasBidder = {
+        ...REQUEST.ad_units[0].bids[0],
         bidder: 'bidderD',
         params: {
           unit: '10433394',
@@ -1484,7 +1542,7 @@ describe('S2S Adapter', function () {
       request.ad_units[0].bids = [aliasBidder];
       request.s2sConfig = adjustedConfig;
 
-      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(request, [{...BID_REQUESTS[0], bidderCode: aliasBidder.bidder}], addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.ext.prebid.aliases).to.deep.equal({ bidderD: 'mockBidder' });
@@ -1496,6 +1554,7 @@ describe('S2S Adapter', function () {
       const alias = 'foobar';
       const aliasBidder = {
         bidder: alias,
+        bid_id: REQUEST.ad_units[0].bids[0].bid_id,
         params: { placementId: '123456' }
       };
 
@@ -1504,7 +1563,7 @@ describe('S2S Adapter', function () {
 
       // TODO: stub this
       $$PREBID_GLOBAL$$.aliasBidder('appnexus', alias);
-      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(request, [{...BID_REQUESTS[0], bidderCode: 'foobar'}], addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.ext).to.haveOwnProperty('prebid');
@@ -1536,13 +1595,14 @@ describe('S2S Adapter', function () {
       })
       const aliasBidder = {
         bidder: 'bidderCodeForTestSkipBPSAlias_Alias',
+        bid_id: REQUEST.ad_units[0].bids[0].bid_id,
         params: { aid: 123 }
       };
 
       const request = utils.deepClone(REQUEST);
       request.ad_units[0].bids = [aliasBidder];
 
-      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(request, [{...BID_REQUESTS[0], bidderCode: aliasBidder.bidder}], addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
@@ -1572,6 +1632,7 @@ describe('S2S Adapter', function () {
       const alias = 'foobar_1';
       const aliasBidder = {
         bidder: alias,
+        bid_id: REQUEST.ad_units[0].bids[0].bid_id,
         params: { aid: 1234567 }
       };
 
@@ -1580,7 +1641,7 @@ describe('S2S Adapter', function () {
 
       // TODO: stub this
       $$PREBID_GLOBAL$$.aliasBidder('appnexus', alias, { skipPbsAliasing: true });
-      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(request, [{...BID_REQUESTS[0], bidderCode: aliasBidder.bidder}], addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
@@ -1607,14 +1668,15 @@ describe('S2S Adapter', function () {
       });
       config.setConfig({ s2sConfig: s2sConfig });
 
-      const myRequest = utils.deepClone(REQUEST);
-      myRequest.ad_units[0].bids[0].params.usePaymentRule = true;
-      myRequest.ad_units[0].bids[0].params.keywords = {
-        foo: ['bar', 'baz'],
-        fizz: ['buzz']
-      };
+      Object.assign(BID_REQUESTS[0].bids[0].params, {
+        usePaymentRule: true,
+        keywords: {
+          foo: ['bar', 'baz'],
+          fizz: ['buzz']
+        }
+      })
 
-      adapter.callBids(myRequest, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       const requestParams = requestBid.imp[0].ext.prebid.bidder;
@@ -1812,18 +1874,6 @@ describe('S2S Adapter', function () {
       expect(requestBid.user.ext.eids.filter(eid => eid.source === 'liveramp.com')[0].uids[0].id).is.equal('0000-1111-2222-3333');
     });
 
-    it('when config \'currency.adServerCurrency\' value is an array: ORTB has property \'cur\' value set to a single item array', function () {
-      config.setConfig({
-        currency: { adServerCurrency: ['USD', 'GB', 'UK', 'AU'] },
-      });
-
-      const bidRequests = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(REQUEST, bidRequests, addBidResponse, done, ajax);
-
-      const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
-      expect(parsedRequestBody.cur).to.deep.equal(['USD']);
-    });
-
     it('when config \'currency.adServerCurrency\' value is a string: ORTB has property \'cur\' value set to a single item array', function () {
       config.setConfig({
         currency: { adServerCurrency: 'NZ' },
@@ -2157,29 +2207,22 @@ describe('S2S Adapter', function () {
       ]);
     });
 
-    it('passes schain object in request', function () {
-      const bidRequests = utils.deepClone(BID_REQUESTS);
-      const schainObject = {
-        'ver': '1.0',
-        'complete': 1,
-        'nodes': [
-          {
-            'asi': 'indirectseller.com',
-            'sid': '00001',
-            'hp': 1
-          },
+    it('should "promote" the most reused bidder schain to source.ext.schain', () => {
+      const bidderReqs = [
+        {...deepClone(BID_REQUESTS[0]), bidderCode: 'A'},
+        {...deepClone(BID_REQUESTS[0]), bidderCode: 'B'},
+        {...deepClone(BID_REQUESTS[0]), bidderCode: 'C'}
+      ];
+      const chain1 = {chain: 1};
+      const chain2 = {chain: 2};
 
-          {
-            'asi': 'indirectseller-2.com',
-            'sid': '00002',
-            'hp': 2
-          }
-        ]
-      };
-      bidRequests[0].bids[0].schain = schainObject;
-      adapter.callBids(REQUEST, bidRequests, addBidResponse, done, ajax);
-      const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
-      expect(parsedRequestBody.source.ext.schain).to.deep.equal(schainObject);
+      bidderReqs[0].bids[0].schain = chain1;
+      bidderReqs[1].bids[0].schain = chain2;
+      bidderReqs[2].bids[0].schain = chain2;
+
+      adapter.callBids(REQUEST, bidderReqs, addBidResponse, done, ajax);
+      const req = JSON.parse(server.requests[0].requestBody);
+      expect(req.source.ext.schain).to.eql(chain2);
     });
 
     it('passes multibid array in request', function () {
@@ -2842,43 +2885,6 @@ describe('S2S Adapter', function () {
       expect(response).to.have.property('pbsBidId', '654321');
     });
 
-    it('handles response cache from ext.prebid.targeting with wurl and removes invalid targeting', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: {
-          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
-        }
-      });
-      config.setConfig({ s2sConfig });
-      const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
-      cacheResponse.seatbid.forEach(item => {
-        item.bid[0].ext.prebid.events = {
-          win: 'https://wurl.com?a=1&b=2'
-        };
-        item.bid[0].ext.prebid.targeting = {
-          hb_uuid: 'a5ad3993',
-          hb_cache_host: 'prebid-cache.net',
-          hb_cache_path: '/cache',
-          hb_winurl: 'https://hbwinurl.com?a=1&b=2',
-          hb_bidid: '1234567890',
-        }
-      });
-
-      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
-      s2sVidRequest.s2sConfig = s2sConfig;
-
-      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
-      server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
-
-      sinon.assert.calledOnce(addBidResponse);
-      const response = addBidResponse.firstCall.args[1];
-
-      expect(response.adserverTargeting).to.deep.equal({
-        hb_uuid: 'a5ad3993',
-        hb_cache_host: 'prebid-cache.net',
-        hb_cache_path: '/cache'
-      });
-    });
-
     it('add request property pbsBidId with ext.prebid.bidid value', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
         endpoint: {
@@ -3513,11 +3519,7 @@ describe('S2S Adapter', function () {
 
       expect(requestBid.ext.prebid.floors).to.be.undefined;
 
-      // should pass of floorData is object
-      bidRequest[0].bids[0].floorData = {
-        skipped: false,
-        location: 'fetch',
-      }
+      config.setConfig({floors: {}});
 
       adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
       requestBid = JSON.parse(server.requests[1].requestBody);
diff --git a/test/spec/ortbConverter/banner_spec.js b/test/spec/ortbConverter/banner_spec.js
new file mode 100644
index 00000000000..0f6686283a1
--- /dev/null
+++ b/test/spec/ortbConverter/banner_spec.js
@@ -0,0 +1,203 @@
+import {fillBannerImp, bannerResponseProcessor} from '../../../libraries/ortbConverter/processors/banner.js';
+import {BANNER, VIDEO} from '../../../src/mediaTypes.js';
+import {inIframe} from '../../../src/utils.js';
+
+const topframe = inIframe() ? 0 : 1;
+
+describe('pbjs -> ortb banner conversion', () => {
+  [
+    {
+      t: 'non-banner request',
+      request: {
+        mediaTypes: {
+          video: {}
+        }
+      },
+      imp: {}
+    },
+    {
+      t: 'banner with no sizes',
+      request: {
+        mediaTypes: {
+          banner: {
+            pos: 'pos',
+          }
+        }
+      },
+      imp: {
+        banner: {
+          topframe,
+          pos: 'pos',
+        }
+      }
+    },
+    {
+      t: 'single size banner',
+      request: {
+        mediaTypes: {
+          banner: {
+            sizes: [1, 2],
+          }
+        }
+      },
+      imp: {
+        banner: {
+          format: [
+            {w: 1, h: 2}
+          ],
+          topframe,
+        }
+      }
+    },
+    {
+      t: 'multi size banner',
+      request: {
+        mediaTypes: {
+          banner: {
+            sizes: [[1, 2], [3, 4]]
+          }
+        }
+      },
+      imp: {
+        banner: {
+          format: [
+            {w: 1, h: 2},
+            {w: 3, h: 4}
+          ],
+          topframe,
+        }
+      }
+    },
+    {
+      t: 'banner with pos param',
+      request: {
+        mediaTypes: {
+          banner: {
+            sizes: [1, 2],
+            pos: 'pos'
+          }
+        }
+      },
+      imp: {
+        banner: {
+          format: [
+            {w: 1, h: 2}
+          ],
+          pos: 'pos',
+          topframe,
+        }
+      },
+    },
+    {
+      t: 'banner with pos 0',
+      request: {
+        mediaTypes: {
+          banner: {
+            sizes: [1, 2],
+            pos: 0
+          }
+        }
+      },
+      imp: {
+        banner: {
+          format: [
+            {w: 1, h: 2}
+          ],
+          pos: 0,
+          topframe,
+        }
+      }
+    }
+  ].forEach(({t, request, imp}) => {
+    it(`can convert ${t}`, () => {
+      const actual = {};
+      fillBannerImp(actual, request, {});
+      expect(actual).to.eql(imp);
+    });
+  });
+
+  it('should keep ortb2Imp.banner', () => {
+    const imp = {
+      banner: {
+        someParam: 'someValue'
+      }
+    };
+    fillBannerImp(imp, {mediaTypes: {banner: {sizes: [1, 2]}}}, {});
+    expect(imp.banner.someParam).to.eql('someValue');
+  });
+
+  it('does nothing if context.mediaType is set but is not BANNER', () => {
+    const imp = {};
+    fillBannerImp(imp, {mediaTypes: {banner: {sizes: [1, 2]}}}, {mediaType: VIDEO});
+    expect(imp).to.eql({});
+  })
+});
+
+describe('ortb -> pbjs banner conversion', () => {
+  let createPixel, seatbid2Banner;
+  beforeEach(() => {
+    createPixel = sinon.stub().callsFake((url) => `${url}Pixel`);
+    seatbid2Banner = bannerResponseProcessor({createPixel});
+  });
+
+  [
+    {
+      t: 'non-banner request',
+      seatbid: {
+        adm: 'mockAdm',
+        nurl: 'mockNurl'
+      },
+      response: {
+        mediaType: VIDEO
+      },
+      expected: {
+        mediaType: VIDEO
+      }
+    },
+    {
+      t: 'response with both adm and nurl',
+      seatbid: {
+        adm: 'mockAdm',
+        nurl: 'mockUrl'
+      },
+      response: {
+        mediaType: BANNER,
+      },
+      expected: {
+        mediaType: BANNER,
+        ad: 'mockAdmmockUrlPixel'
+      }
+    },
+    {
+      t: 'response with just adm',
+      seatbid: {
+        adm: 'mockAdm'
+      },
+      response: {
+        mediaType: BANNER,
+      },
+      expected: {
+        mediaType: BANNER,
+        ad: 'mockAdm'
+      }
+    },
+    {
+      t: 'response with just nurl',
+      seatbid: {
+        nurl: 'mockNurl'
+      },
+      response: {
+        mediaType: BANNER
+      },
+      expected: {
+        mediaType: BANNER,
+        adUrl: 'mockNurl'
+      }
+    }
+  ].forEach(({t, seatbid, response, expected}) => {
+    it(`can handle ${t}`, () => {
+      seatbid2Banner(response, seatbid, context);
+      expect(response).to.eql(expected)
+    })
+  });
+})
diff --git a/test/spec/ortbConverter/composer_spec.js b/test/spec/ortbConverter/composer_spec.js
new file mode 100644
index 00000000000..f342df38fde
--- /dev/null
+++ b/test/spec/ortbConverter/composer_spec.js
@@ -0,0 +1,69 @@
+import {compose} from '../../../libraries/ortbConverter/lib/composer.js';
+
+describe('compose', () => {
+  it('runs each component in order of priority', () => {
+    const order = [];
+    const components = {
+      first: {
+        fn: sinon.stub().callsFake(() => order.push(1)),
+      },
+      second: {
+        fn: sinon.stub().callsFake(() => order.push(2)),
+        priority: 10
+      },
+      third: {
+        fn: sinon.stub().callsFake(() => order.push(3)),
+        priority: 5
+      }
+    };
+    compose(components)();
+    expect(order).to.eql([2, 3, 1]);
+  });
+
+  it('passes parameters to each component', () => {
+    const components = {
+      first: {
+        fn: sinon.stub()
+      },
+      second: {
+        fn: sinon.stub()
+      }
+    };
+    compose(components)('one', 'two');
+    Object.values(components).forEach(comp => {
+      sinon.assert.calledWith(comp.fn, 'one', 'two')
+    })
+  })
+
+  it('respects overrides', () => {
+    const components = {
+      first: {
+        fn: sinon.stub()
+      },
+      second: {
+        fn: sinon.stub()
+      }
+    };
+    const overrides = {
+      second: sinon.stub()
+    }
+    compose(components, overrides)('one', 'two');
+    sinon.assert.calledWith(overrides.second, components.second.fn, 'one', 'two')
+  })
+
+  it('disables components when override is false', () => {
+    const components = {
+      first: {
+        fn: sinon.stub(),
+      },
+      second: {
+        fn: sinon.stub()
+      }
+    };
+    const overrides = {
+      second: false
+    };
+    compose(components, overrides)('one', 'two');
+    sinon.assert.notCalled(components.second.fn);
+  })
+});
diff --git a/test/spec/ortbConverter/converter_spec.js b/test/spec/ortbConverter/converter_spec.js
new file mode 100644
index 00000000000..e00b46e66da
--- /dev/null
+++ b/test/spec/ortbConverter/converter_spec.js
@@ -0,0 +1,283 @@
+import {ortbConverter} from '../../../libraries/ortbConverter/converter.js';
+import {BID_RESPONSE, IMP, REQUEST, RESPONSE} from '../../../src/pbjsORTB.js';
+
+describe('pbjs-ortb converter', () => {
+  const MOCK_BIDDER_REQUEST = {
+    id: 'bidderRequest',
+    bids: [
+      {
+        id: 111
+      },
+      {
+        id: 112
+      }
+    ]
+  }
+
+  const MOCK_ORTB_RESPONSE = {
+    id: 'response',
+    seatbid: [
+      {
+        seat: 'mockBidder1',
+        bid: [
+          {
+            impid: 'imp0'
+          },
+          {
+            impid: 'imp1'
+          }
+        ]
+      },
+      {
+        seat: 'mockBidder2',
+        bid: [
+          {
+            impid: 'imp1'
+          }
+        ]
+      }
+    ]
+  }
+
+  let processors, reqCnt, impCnt;
+
+  beforeEach(() => {
+    reqCnt = 0;
+    impCnt = 0;
+    processors = {
+      [REQUEST]: {
+        req: {
+          fn(ortbRequest, bidderRequest, context) {
+            ortbRequest.id = `req${reqCnt++}`;
+            if (context.ctx) {
+              ortbRequest.ctx = context.ctx;
+            }
+          }
+        }
+      },
+      [IMP]: {
+        imp: {
+          fn(imp, bidRequest, context) {
+            imp.id = `imp${impCnt++}`;
+            imp.bidId = bidRequest.id;
+            if (context.ctx) {
+              imp.ctx = context.ctx;
+            }
+            if (context.reqContext?.ctx) {
+              imp.reqCtx = context.reqContext?.ctx;
+            }
+          }
+        }
+      },
+      [BID_RESPONSE]: {
+        resp: {
+          fn(bidResponse, bid, context) {
+            bidResponse.impid = bid.impid;
+            bidResponse.bidId = context.imp.bidId;
+            if (context.ctx) {
+              bidResponse.ctx = context.ctx;
+            }
+            if (context.reqContext?.ctx) {
+              bidResponse.reqCtx = context.reqContext?.ctx;
+            }
+          }
+        }
+      },
+      [RESPONSE]: {
+        resp: {
+          fn(response, ortbResponse, context) {
+            response.marker = true;
+            if (context.ctx) {
+              response.ctx = context.ctx;
+            }
+          }
+        }
+      }
+    }
+  });
+
+  function makeConverter(options = {}) {
+    options = Object.assign({
+      processors: () => processors
+    }, options);
+    return ortbConverter(options);
+  }
+
+  it('runs each processor', () => {
+    const cvt = makeConverter();
+    const request = cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST});
+    expect(request).to.eql({
+      id: 'req0',
+      imp: [
+        {id: 'imp0', bidId: 111},
+        {id: 'imp1', bidId: 112}
+      ]
+    });
+    const response = cvt.fromORTB({request, response: MOCK_ORTB_RESPONSE});
+    expect(response.bids).to.eql([{
+      impid: 'imp0',
+      bidId: 111
+    }, {
+      impid: 'imp1',
+      bidId: 112
+    }, {
+      impid: 'imp1',
+      bidId: 112
+    }]);
+    expect(response.marker).to.be.true;
+  });
+
+  it('fromORTB throws if request was not produced by the same converter', () => {
+    expect(() => {
+      makeConverter().fromORTB({
+        request: {
+          imp: [
+            {
+              id: 'imp0'
+            }
+          ]
+        },
+        response: MOCK_ORTB_RESPONSE
+      })
+    }).to.throw();
+  });
+
+  it('gives precedence to the bidRequests argument over bidderRequest.bids', () => {
+    expect(makeConverter().toORTB({bidderRequest: MOCK_BIDDER_REQUEST, bidRequests: [MOCK_BIDDER_REQUEST.bids[0]]})).to.eql({
+      id: 'req0',
+      imp: [
+        {
+          id: 'imp0',
+          bidId: 111
+        }
+      ]
+    })
+  });
+
+  it('passes context to every processor', () => {
+    const cvt = makeConverter();
+    const request = cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST, context: {ctx: 'context'}});
+    expect(request.ctx).to.equal('context');
+    request.imp.forEach(imp => expect(imp.ctx).to.equal('context'));
+    const response = cvt.fromORTB({request, response: MOCK_ORTB_RESPONSE});
+    expect(response.ctx).to.eql('context');
+    response.bids.forEach(bidResponse => expect(bidResponse.ctx).to.equal('context'));
+  });
+
+  it('passes request context to imp and bidResponse processors', () => {
+    const cvt = makeConverter();
+    const request = cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST, context: {ctx: 'context'}});
+    expect(request.imp[0].reqCtx).to.eql('context');
+    const response = cvt.fromORTB({request, response: MOCK_ORTB_RESPONSE});
+    expect(response.bids[0].reqCtx).to.eql('context');
+  });
+
+  it('allows overriding of imp building with `imp`', () => {
+    const cvt = makeConverter({
+      imp: function (buildImp, bidRequest, context) {
+        return Object.assign({
+          extraArg: bidRequest.id,
+          extraCtx: context.ctx
+        }, buildImp(bidRequest, context));
+      }
+    });
+    const request = cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST, context: {ctx: 'context'}});
+    expect(request.imp.length).to.eql(2);
+    request.imp.forEach(imp => {
+      expect(imp.extraArg).to.eql(imp.bidId);
+      expect(imp.extraCtx).to.eql('context');
+    })
+  });
+
+  it('allows filtering imps with `imp`', () => {
+    const cvt = makeConverter({
+      imp(buildImp, bidRequest, context) {
+        if (bidRequest.id === 112) {
+          return buildImp(bidRequest, context);
+        }
+      }
+    });
+    expect(cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST}).imp.length).to.eql(1);
+  });
+
+  it('does not include imps that have no id', () => {
+    const cvt = makeConverter({
+      imp(buildImp, bidRequest, context) {
+        const imp = buildImp(bidRequest, context);
+        delete imp.id;
+        return imp;
+      }
+    });
+    expect(cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST}).imp.length).to.eql(0);
+  })
+
+  it('allows overriding of response building with bidResponse', () => {
+    const cvt = makeConverter({
+      bidResponse(buildResponse, bid, context) {
+        return Object.assign({
+          extraArg: context.bidRequest.id,
+          extraCtx: context.ctx
+        }, buildResponse(bid, context));
+      }
+    });
+    const response = cvt.fromORTB({
+      response: MOCK_ORTB_RESPONSE,
+      request: cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST, context: {ctx: 'context'}})
+    });
+
+    expect(response.bids.length).to.equal(3);
+    response.bids.forEach(response => {
+      expect(response.extraArg).to.eql(response.bidId);
+      expect(response.extraCtx).to.eql('context');
+    });
+  });
+
+  it('allows filtering of responses with `bidResponse`', () => {
+    const cvt = makeConverter({
+      bidResponse(buildBidResponse, bid, context) {
+        if (context.seatbid.seat === 'mockBidder1' && context.imp.id === 'imp0') {
+          return buildBidResponse(bid, context);
+        }
+      }
+    });
+    expect(cvt.fromORTB({
+      request: cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST}),
+      response: MOCK_ORTB_RESPONSE
+    }).bids.length).to.equal(1);
+  });
+
+  it('allows overriding of request building with `request`', () => {
+    const cvt = makeConverter({
+      request(buildRequest, imps, bidderRequest, context) {
+        return {
+          request: buildRequest(imps, bidderRequest, context),
+          extraArg: bidderRequest.id,
+          extraCtx: context.ctx
+        }
+      }
+    });
+    const req = cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST, context: {ctx: 'context'}});
+    expect(req.extraArg).to.equal(MOCK_BIDDER_REQUEST.id);
+    expect(req.extraCtx).to.equal('context');
+    expect(req.request.imp.length).to.equal(2);
+  });
+
+  it('allows overriding of response building with `response`', () => {
+    const cvt = makeConverter({
+      response(buildResponse, bidResponses, ortbResponse, context) {
+        return {
+          response: buildResponse(bidResponses, ortbResponse, context),
+          extraArg: ortbResponse.id,
+          extraCtx: context.ctx
+        }
+      }
+    });
+    const resp = cvt.fromORTB({
+      request: cvt.toORTB({bidderRequest: MOCK_BIDDER_REQUEST, context: {ctx: 'context'}}),
+      response: MOCK_ORTB_RESPONSE,
+    });
+    expect(resp.extraArg).to.equal(MOCK_ORTB_RESPONSE.id);
+    expect(resp.extraCtx).to.equal('context');
+    expect(resp.response.bids.length).to.equal(3);
+  })
+})
diff --git a/test/spec/ortbConverter/currency_spec.js b/test/spec/ortbConverter/currency_spec.js
new file mode 100644
index 00000000000..76f81223f27
--- /dev/null
+++ b/test/spec/ortbConverter/currency_spec.js
@@ -0,0 +1,40 @@
+import {config} from 'src/config.js';
+import {setOrtbCurrency} from '../../../modules/currency.js';
+
+describe('pbjs -> ortb currency', () => {
+  before(() => {
+    config.resetConfig();
+  });
+
+  afterEach(() => {
+    config.resetConfig();
+  });
+
+  it('does not set cur by default', () => {
+    const req = {};
+    setOrtbCurrency(req, {}, {});
+    expect(req).to.eql({});
+  });
+
+  it('sets currency based on config', () => {
+    config.setConfig({
+      currency: {
+        adServerCurrency: 'EUR'
+      }
+    });
+    const req = {};
+    setOrtbCurrency(req, {}, {});
+    expect(req.cur).to.eql(['EUR']);
+  });
+
+  it('sets currency based on context', () => {
+    config.setConfig({
+      currency: {
+        adServerCurrency: 'EUR'
+      }
+    });
+    const req = {};
+    setOrtbCurrency(req, {}, {currency: 'JPY'});
+    expect(req.cur).to.eql(['JPY']);
+  })
+});
diff --git a/test/spec/ortbConverter/default_processors_spec.js b/test/spec/ortbConverter/default_processors_spec.js
new file mode 100644
index 00000000000..28a35390b86
--- /dev/null
+++ b/test/spec/ortbConverter/default_processors_spec.js
@@ -0,0 +1,61 @@
+import {setDevice, setSite} from '../../../libraries/ortbConverter/processors/default.js';
+
+describe('setDevice', () => {
+  it('sets device.w,  h, dnt, language, ua', () => {
+    const req = {};
+    setDevice(req);
+    ['h', 'w', 'dnt', 'language', 'ua'].forEach(prop => expect(req.device[prop]).to.exist)
+  });
+
+  it('does not override FPD', () => {
+    const req = {
+      device: {
+        w: 'w',
+        h: 'h',
+        ext: {}
+      }
+    };
+    setDevice(req);
+    sinon.assert.match(req.device, {
+      w: 'w',
+      h: 'h',
+      ext: {}
+    })
+  });
+});
+
+describe('setSite', () => {
+  const refererInfo = {
+    page: 'page.com',
+    ref: 'ref.com',
+    domain: 'domain.com'
+  };
+
+  it('sets site, domain, ref from refererInfo', () => {
+    const req = {
+      site: {
+        ext: {}
+      }
+    };
+    setSite(req, {refererInfo});
+    sinon.assert.match(req.site, refererInfo);
+    expect(req.site.ext).to.eql({});
+  });
+
+  it('does not override FPD', () => {
+    const req = {
+      site: {
+        ref: 'other ref'
+      }
+    }
+    setSite(req, {refererInfo});
+    expect(req.site.ref).to.eql('other ref');
+    ['domain', 'page'].forEach(prop => expect(req.site[prop]).to.eql(refererInfo[prop]));
+  });
+
+  it('does not set null properties from refererInfo', () => {
+    const req = {};
+    setSite(req, {refererInfo: {...refererInfo, ref: null}});
+    expect(req.site.ref).to.not.exist;
+  });
+});
diff --git a/test/spec/ortbConverter/gdpr_spec.js b/test/spec/ortbConverter/gdpr_spec.js
new file mode 100644
index 00000000000..9851d7603b4
--- /dev/null
+++ b/test/spec/ortbConverter/gdpr_spec.js
@@ -0,0 +1,38 @@
+import {setOrtbAdditionalConsent, setOrtbGdpr} from '../../../modules/consentManagement.js';
+
+describe('pbjs - ortb gpdr', () => {
+  it('sets gdpr properties from bidderRequest', () => {
+    const req = {};
+    setOrtbGdpr(req, {gdprConsent: {gdprApplies: true, consentString: 'consent'}});
+    expect(req.regs.ext.gdpr).to.eql(1);
+    expect(req.user.ext.consent).to.eql('consent');
+  });
+
+  it('does not set it if missing', () => {
+    const req = {};
+    setOrtbGdpr(req, {});
+    expect(req).to.eql({});
+  });
+
+  it('sets user.ext.consent, but not regs.ext.gdpr, if gpdrApplies is not a boolean', () => {
+    const req = {};
+    setOrtbGdpr(req, {
+      gdprConsent: {consentString: 'mock-consent'}
+    });
+    expect(req).to.eql({
+      user: {
+        ext: {
+          consent: 'mock-consent'
+        }
+      }
+    })
+  });
+});
+
+describe('pbjs -> ortb addtlConsent', () => {
+  it('sets ConsentedProvidersSettings', () => {
+    const req = {};
+    setOrtbAdditionalConsent(req, {gdprConsent: {addtlConsent: 'tl'}});
+    expect(req.user.ext.ConsentedProvidersSettings.consented_providers).to.eql('tl');
+  });
+})
diff --git a/test/spec/ortbConverter/mediaTypes_spec.js b/test/spec/ortbConverter/mediaTypes_spec.js
new file mode 100644
index 00000000000..4f4fd99fb75
--- /dev/null
+++ b/test/spec/ortbConverter/mediaTypes_spec.js
@@ -0,0 +1,67 @@
+import {ORTB_MTYPES, setResponseMediaType} from '../../../libraries/ortbConverter/processors/mediaType.js';
+import {BANNER} from '../../../src/mediaTypes.js';
+import {extPrebidMediaType} from '../../../libraries/pbsExtensions/processors/mediaType.js';
+
+function testMtype(processor) {
+  describe('respects 2.6 mtype', () => {
+    Object.entries(ORTB_MTYPES).forEach(([mtype, pbtype]) => {
+      it(`${mtype} -> ${pbtype}`, () => {
+        const resp = {};
+        processor(resp, {
+          mtype: parseInt(mtype, 10)
+        }, {});
+        expect(resp.mediaType).to.eql(pbtype);
+      });
+    });
+  });
+}
+
+describe('ortb -> pbjs mediaType conversion', () => {
+  testMtype(setResponseMediaType);
+  it('throws if mtype is missing', () => {
+    expect(() => {
+      setResponseMediaType({}, {});
+    }).to.throw();
+  });
+
+  it('respects pre-set bidResponse.mediaType', () => {
+    const resp = {mediaType: 'video'};
+    setResponseMediaType(resp, {mtype: 1});
+    expect(resp.mediaType).to.eql('video');
+  });
+
+  it('gives precedence to context.mediaType', () => {
+    const resp = {};
+    setResponseMediaType(resp, {mtype: 1}, {mediaType: 'video'});
+    expect(resp.mediaType).to.eql('video')
+  })
+});
+
+describe('ortb -> pbjs mediaType conversion based on ext.prebid.type', () => {
+  testMtype(extPrebidMediaType);
+  describe('respects ext.prebid.type', () => {
+    Object.values(ORTB_MTYPES).forEach(mediaType => {
+      const response = {};
+      extPrebidMediaType(response, {
+        ext: {
+          prebid: {
+            type: mediaType
+          }
+        }
+      }, {});
+      expect(response.mediaType).to.eql(mediaType);
+    });
+  });
+
+  it('defaults to banner', () => {
+    const response = {};
+    extPrebidMediaType(response, {}, {});
+    expect(response.mediaType).to.eql(BANNER);
+  });
+
+  it('gives precedence to context.mediaType', () => {
+    const response = {};
+    extPrebidMediaType(response, {ext: {prebid: {type: 'banner'}}}, {mediaType: 'video'});
+    expect(response.mediaType).to.eql('video');
+  })
+});
diff --git a/test/spec/ortbConverter/mergeProcessors_spec.js b/test/spec/ortbConverter/mergeProcessors_spec.js
new file mode 100644
index 00000000000..ba15de06031
--- /dev/null
+++ b/test/spec/ortbConverter/mergeProcessors_spec.js
@@ -0,0 +1,59 @@
+import {mergeProcessors} from '../../../libraries/ortbConverter/lib/mergeProcessors.js';
+import {BID_RESPONSE, IMP, REQUEST, RESPONSE} from '../../../src/pbjsORTB.js';
+
+describe('mergeProcessors', () => {
+  it('can merge', () => {
+    const result = mergeProcessors({
+      [REQUEST]: {
+        first: {
+          priority: 0,
+          fn: 'first'
+        }
+      },
+      [RESPONSE]: {
+        second: {
+          priority: 1,
+          fn: 'second'
+        }
+      }
+    }, {
+      [REQUEST]: {
+        first: {
+          fn: 'overriden'
+        }
+      },
+      [IMP]: {
+        third: {
+          fn: 'third'
+        }
+      }
+    }, {
+      [IMP]: {
+        third: {
+          priority: 3,
+          fn: 'overridden'
+        }
+      }
+    });
+    expect(result).to.eql({
+      [REQUEST]: {
+        first: {
+          fn: 'overriden'
+        }
+      },
+      [IMP]: {
+        third: {
+          priority: 3,
+          fn: 'overridden'
+        },
+      },
+      [RESPONSE]: {
+        second: {
+          priority: 1,
+          fn: 'second'
+        }
+      },
+      [BID_RESPONSE]: {}
+    });
+  });
+});
diff --git a/test/spec/ortbConverter/multibid_spec.js b/test/spec/ortbConverter/multibid_spec.js
new file mode 100644
index 00000000000..4886aaf6069
--- /dev/null
+++ b/test/spec/ortbConverter/multibid_spec.js
@@ -0,0 +1,35 @@
+import {config} from 'src/config.js';
+import {setOrtbExtPrebidMultibid} from '../../../modules/multibid/index.js';
+
+describe('pbjs - ortb ext.prebid.multibid', () => {
+  before(() => {
+    config.resetConfig();
+  });
+  afterEach(() => {
+    config.resetConfig();
+  });
+
+  it('sets ext.prebid.multibid according to config', () => {
+    config.setConfig({
+      multibid: [
+        {
+          bidder: 'A',
+          maxBids: 2
+        },
+        {
+          bidder: 'B',
+          maxBids: 3
+        }
+      ]
+    });
+    const req = {};
+    setOrtbExtPrebidMultibid(req);
+    expect(req.ext.prebid.multibid).to.eql([{bidder: 'A', maxbids: 2}, {bidder: 'B', maxbids: 3}]);
+  });
+
+  it('does not set it if not configured', () => {
+    const req = {};
+    setOrtbExtPrebidMultibid(req);
+    expect(req).to.eql({});
+  })
+});
diff --git a/test/spec/ortbConverter/native_spec.js b/test/spec/ortbConverter/native_spec.js
new file mode 100644
index 00000000000..56c733817cd
--- /dev/null
+++ b/test/spec/ortbConverter/native_spec.js
@@ -0,0 +1,95 @@
+import {fillNativeImp, fillNativeResponse} from '../../../libraries/ortbConverter/processors/native.js';
+import {BANNER, NATIVE} from '../../../src/mediaTypes.js';
+
+describe('pbjs -> ortb native requests', () => {
+  function toNative(bidRequest, context) {
+    const imp = {};
+    fillNativeImp(imp, bidRequest, context);
+    return imp;
+  }
+
+  it('should do nothing if request has no nativeOrtbRequest', () => {
+    expect(toNative({}, {})).to.eql({});
+  });
+
+  it('should set imp.native according to nativeOrtbRequest', () => {
+    const nativeOrtbRequest = {ver: 'version', prop: 'value', assets: [{}]};
+    const imp = toNative({nativeOrtbRequest}, {});
+    expect(imp.native.ver).to.eql('version');
+    expect(JSON.parse(imp.native.request)).to.eql(nativeOrtbRequest);
+  });
+
+  it('should do nothing if context.mediaType is set but is not NATIVE', () => {
+    expect(toNative({nativeOrtbRequest: {ver: 'version'}}, {mediaType: BANNER})).to.eql({})
+  });
+
+  it('should merge context.nativeRequest', () => {
+    const nativeOrtbRequest = {ver: 'version', eventtrackers: [{tracker: 'req'}], assets: [{}]};
+    const nativeDefaults = {eventtrackers: [{tracker: 'default'}], other: 'other'};
+    const imp = toNative({nativeOrtbRequest}, {nativeRequest: nativeDefaults});
+    expect(imp.native.ver).to.eql('version');
+    expect(JSON.parse(imp.native.request)).to.eql({
+      assets: [{}],
+      ver: 'version',
+      eventtrackers: [{tracker: 'req'}],
+      other: 'other'
+    });
+  });
+
+  it('should keep ortb2Imp.native', () => {
+    const imp = {
+      native: {
+        something: 'orother'
+      }
+    }
+    fillNativeImp(imp, {nativeOrtbRequest: {ver: 'version'}}, {});
+    expect(imp.native.something).to.eql('orother')
+  });
+
+  it('should do nothing if there are no assets', () => {
+    const imp = {};
+    fillNativeImp(imp, {nativeOrtbRequest: {assets: []}}, {});
+    expect(imp).to.eql({});
+  })
+});
+
+describe('ortb -> ortb native response', () => {
+  const MOCK_NATIVE_RESPONSE = {
+    property: 'value',
+    assets: [
+      {
+        id: 0
+      }
+    ]
+  }
+  Object.entries({
+    'serialized': JSON.stringify(MOCK_NATIVE_RESPONSE),
+    'an object': MOCK_NATIVE_RESPONSE
+  }).forEach(([t, adm]) => {
+    describe(`when adm is ${t}`, () => {
+      let bid;
+      beforeEach(() => {
+        bid = {adm};
+      })
+      it('should set bidResponse.native', () => {
+        const bidResponse = {
+          mediaType: NATIVE
+        };
+        fillNativeResponse(bidResponse, bid, {});
+        expect(bidResponse.native).to.eql({ortb: MOCK_NATIVE_RESPONSE});
+      });
+    });
+    it('should throw if response has no assets', () => {
+      expect(() => fillNativeResponse({mediaType: NATIVE}, {adm: {...MOCK_NATIVE_RESPONSE, assets: null}}, {})).to.throw;
+    })
+    it('should do nothing if bidResponse.mediaType is not NATIVE', () => {
+      const bidResponse = {
+        mediaType: BANNER
+      };
+      fillNativeResponse(bidResponse, {adm: MOCK_NATIVE_RESPONSE}, {});
+      expect(bidResponse).to.eql({
+        mediaType: BANNER
+      })
+    })
+  })
+});
diff --git a/test/spec/ortbConverter/pbjsORTB_spec.js b/test/spec/ortbConverter/pbjsORTB_spec.js
new file mode 100644
index 00000000000..16aefec2b35
--- /dev/null
+++ b/test/spec/ortbConverter/pbjsORTB_spec.js
@@ -0,0 +1,67 @@
+import {
+  DEFAULT,
+  PBS,
+  PROCESSOR_TYPES,
+  processorRegistry,
+  REQUEST
+} from '../../../src/pbjsORTB.js';
+
+describe('pbjsORTB register / get processors', () => {
+  let registerOrtbProcessor, getProcessors;
+  beforeEach(() => {
+    ({registerOrtbProcessor, getProcessors} = processorRegistry());
+  })
+  PROCESSOR_TYPES.forEach(type => {
+    it(`can get and set ${type} processors`, () => {
+      const proc = function () {};
+      registerOrtbProcessor({
+        type,
+        name: 'test',
+        fn: proc
+      });
+      expect(getProcessors(DEFAULT)).to.eql({
+        [type]: {
+          test: {
+            priority: 0,
+            fn: proc
+          }
+        }
+      });
+    });
+  });
+
+  it('throws on wrong type', () => {
+    expect(() => registerOrtbProcessor({
+      type: 'incorrect',
+      name: 'test',
+      fn: function () {}
+    })).to.throw();
+  });
+
+  it('can set priority', () => {
+    const proc = function () {};
+    registerOrtbProcessor({type: REQUEST, name: 'test', fn: proc, priority: 10});
+    expect(getProcessors(DEFAULT)).to.eql({
+      [REQUEST]: {
+        test: {
+          priority: 10,
+          fn: proc
+        }
+      }
+    })
+  });
+
+  it('can assign processors to specific dialects', () => {
+    const proc = function () {};
+    registerOrtbProcessor({type: REQUEST, name: 'test', fn: proc, dialects: [PBS]});
+    expect(getProcessors(DEFAULT)).to.eql({});
+    expect(getProcessors(PBS)).to.eql({
+      [REQUEST]: {
+        test: {
+          priority: 0,
+          fn: proc
+        }
+      }
+    })
+  });
+});
diff --git a/test/spec/ortbConverter/pbsExtensions/aliases_spec.js b/test/spec/ortbConverter/pbsExtensions/aliases_spec.js
new file mode 100644
index 00000000000..712ceaa397c
--- /dev/null
+++ b/test/spec/ortbConverter/pbsExtensions/aliases_spec.js
@@ -0,0 +1,57 @@
+import {setRequestExtPrebidAliases} from '../../../../libraries/pbsExtensions/processors/aliases.js';
+
+describe('PBS - ortb ext.prebid.aliases', () => {
+  let aliasRegistry, bidderRegistry;
+
+  function setAliases(bidderRequest) {
+    const req = {}
+    setRequestExtPrebidAliases(req, bidderRequest, {}, {
+      am: {
+        bidderRegistry,
+        aliasRegistry
+      }
+    });
+    return req;
+  }
+
+  beforeEach(() => {
+    aliasRegistry = {};
+    bidderRegistry = {};
+  })
+
+  describe('has no effect if', () => {
+    it('bidder is not an alias', () => {
+      expect(setAliases({bidderCode: 'not-an-alias'})).to.eql({});
+    });
+
+    it('bidder sets skipPbsAliasing', () => {
+      aliasRegistry['alias'] = 'bidder';
+      bidderRegistry['alias'] = {
+        getSpec() {
+          return {
+            skipPbsAliasing: true
+          }
+        }
+      };
+      expect(setAliases({bidderCode: 'alias'})).to.eql({});
+    });
+  });
+
+  it('sets ext.prebid.aliases.BIDDER', () => {
+    aliasRegistry['alias'] = 'bidder';
+    bidderRegistry['alias'] = {
+      getSpec() {
+        return {}
+      }
+    };
+    expect(setAliases({bidderCode: 'alias'})).to.eql({
+      ext: {
+        prebid: {
+          aliases: {
+            alias: 'bidder'
+          }
+        }
+      }
+    })
+  });
+})
diff --git a/test/spec/ortbConverter/pbsExtensions/params_spec.js b/test/spec/ortbConverter/pbsExtensions/params_spec.js
new file mode 100644
index 00000000000..73b92a0755d
--- /dev/null
+++ b/test/spec/ortbConverter/pbsExtensions/params_spec.js
@@ -0,0 +1,96 @@
+import {setImpBidParams} from '../../../../libraries/pbsExtensions/processors/params.js';
+
+describe('pbjs -> ortb bid params to imp[].ext.prebid.BIDDER', () => {
+  let bidderRegistry, index, adUnit;
+  beforeEach(() => {
+    bidderRegistry = {};
+    adUnit = {code: 'mockAdUnit'};
+    index = {
+      getAdUnit() {
+        return adUnit;
+      }
+    }
+  });
+
+  function setParams(bidRequest, context, deps = {}) {
+    const imp = {};
+    setImpBidParams(imp, bidRequest, context, Object.assign({bidderRegistry, index}, deps))
+    return imp;
+  }
+
+  it('sets params in ext.prebid.bidder.BIDDER', () => {
+    expect(setParams({bidder: 'mockBidder', params: {a: 'param'}})).to.eql({
+      ext: {
+        prebid: {
+          bidder: {
+            mockBidder: {
+              a: 'param'
+            }
+          }
+        }
+      }
+    })
+  });
+
+  it('has no effect if bidRequest has no params', () => {
+    expect(setParams({bidder: 'mockBidder'})).to.eql({});
+  })
+
+  describe('when adapter provides transformBidParams', () => {
+    let transform, bidderRequest;
+    beforeEach(() => {
+      bidderRequest = {bidderCode: 'mockBidder'};
+      transform = sinon.stub().callsFake((p) => Object.assign({transformed: true}, p));
+      bidderRegistry.mockBidder = {
+        getSpec() {
+          return {
+            transformBidParams: transform
+          }
+        }
+      }
+    })
+
+    it('runs params through transform', () => {
+      expect(setParams({bidder: 'mockBidder', params: {a: 'param'}}, {bidderRequest})).to.eql({
+        ext: {
+          prebid: {
+            bidder: {
+              mockBidder: {
+                a: 'param',
+                transformed: true
+              }
+            }
+          }
+        }
+      });
+    });
+
+    it('runs through transform even if bid has no params', () => {
+      expect(setParams({bidder: 'mockBidder'}, {bidderRequest})).to.eql({
+        ext: {
+          prebid: {
+            bidder: {
+              mockBidder: {
+                transformed: true
+              }
+            }
+          }
+        }
+      })
+    })
+
+    it('by default, passes adUnit from index, bidderRequest from context', () => {
+      const params = {a: 'param'};
+      setParams({bidder: 'mockBidder', params}, {bidderRequest});
+      sinon.assert.calledWith(transform, params, true, adUnit, [bidderRequest])
+    });
+
+    it('uses provided adUnit, bidderRequests', () => {
+      const adUnit = {code: 'other-ad-unit'};
+      const bidderRequests = [{bidderCode: 'one'}, {bidderCode: 'two'}];
+      const params = {a: 'param'};
+      setParams({bidder: 'mockBidder', params}, {}, {adUnit, bidderRequests});
+      sinon.assert.calledWith(transform, params, true, adUnit, bidderRequests);
+    })
+  });
+});
diff --git a/test/spec/ortbConverter/pbsExtensions/video_spec.js b/test/spec/ortbConverter/pbsExtensions/video_spec.js
new file mode 100644
index 00000000000..5bba32c447a
--- /dev/null
+++ b/test/spec/ortbConverter/pbsExtensions/video_spec.js
@@ -0,0 +1,52 @@
+import {setBidResponseVideoCache} from '../../../../libraries/pbsExtensions/processors/video.js';
+
+describe('pbjs - ortb videoCacheKey based on ext.prebid', () => {
+  const EXT_PREBID_CACHE = {
+    ext: {
+      prebid: {
+        cache: {
+          vastXml: {
+            cacheId: 'id',
+            url: 'url'
+          }
+        }
+      }
+    }
+  }
+
+  function setCache(bid) {
+    const bidResponse = {mediaType: 'video'};
+    setBidResponseVideoCache(bidResponse, bid);
+    return bidResponse;
+  }
+
+  it('has no effect if mediaType is not video', () => {
+    const resp = {mediaType: 'banner'};
+    setBidResponseVideoCache(resp, EXT_PREBID_CACHE);
+    expect(resp).to.eql({mediaType: 'banner'});
+  });
+
+  it('sets videoCacheKey, vastUrl from ext.prebid.cache.vastXml', () => {
+    sinon.assert.match(setCache(EXT_PREBID_CACHE), {
+      videoCacheKey: 'id',
+      vastUrl: 'url'
+    });
+  });
+
+  it('sets videoCacheKey, vastUrl from ext.prebid.targeting', () => {
+    sinon.assert.match(setCache({
+      ext: {
+        prebid: {
+          targeting: {
+            hb_uuid: 'id',
+            hb_cache_host: 'host',
+            hb_cache_path: '/path'
+          }
+        }
+      }
+    }), {
+      vastUrl: 'https://host/path?uuid=id',
+      videoCacheKey: 'id'
+    })
+  });
+});
diff --git a/test/spec/ortbConverter/priceFloors_spec.js b/test/spec/ortbConverter/priceFloors_spec.js
new file mode 100644
index 00000000000..f6d37992711
--- /dev/null
+++ b/test/spec/ortbConverter/priceFloors_spec.js
@@ -0,0 +1,143 @@
+import {config} from 'src/config.js';
+import {setOrtbExtPrebidFloors, setOrtbImpBidFloor} from '../../../modules/priceFloors.js';
+import 'src/prebid.js';
+
+describe('pbjs - ortb imp floor params', () => {
+  before(() => {
+    config.resetConfig();
+  });
+
+  afterEach(() => {
+    config.resetConfig();
+  });
+
+  Object.entries({
+    'has no getFloor': {},
+    'has getFloor that throws': {
+      getFloor: sinon.stub().callsFake(() => { throw new Error() }),
+    },
+    'returns invalid floor': {
+      getFloor: sinon.stub().callsFake(() => ({floor: NaN, currency: null}))
+    }
+  }).forEach(([t, req]) => {
+    it(`has no effect if bid ${t}`, () => {
+      const imp = {};
+      setOrtbImpBidFloor(imp, {}, {});
+      expect(imp).to.eql({});
+    })
+  })
+
+  it('sets bidfoor and bidfloorcur according to getFloor', () => {
+    const imp = {};
+    const req = {
+      getFloor() {
+        return {
+          currency: 'EUR',
+          floor: '1.23'
+        }
+      }
+    };
+    setOrtbImpBidFloor(imp, req, {});
+    expect(imp).to.eql({
+      bidfloor: 1.23,
+      bidfloorcur: 'EUR'
+    })
+  });
+
+  Object.entries({
+    'missing currency': {floor: 1.23},
+    'missing floor': {currency: 'USD'},
+    'not a number': {floor: 'abc', currency: 'USD'}
+  }).forEach(([t, floor]) => {
+    it(`should not set bidfloor if floor is ${t}`, () => {
+      const imp = {};
+      const req = {
+        getFloor: () => floor
+      }
+      setOrtbImpBidFloor(imp, req, {});
+      expect(imp).to.eql({});
+    })
+  })
+
+  describe('asks for floor in currency', () => {
+    let req;
+    beforeEach(() => {
+      req = {
+        getFloor(opts) {
+          return {
+            floor: 1.23,
+            currency: opts.currency
+          }
+        }
+      }
+    })
+
+    it('from context.currency', () => {
+      const imp = {};
+      setOrtbImpBidFloor(imp, req, {currency: 'JPY'});
+      config.setConfig({
+        currency: {
+          adServerCurrency: 'EUR'
+        }
+      })
+      expect(imp.bidfloorcur).to.eql('JPY');
+    });
+
+    it('from config', () => {
+      const imp = {};
+      config.setConfig({
+        currency: {
+          adServerCurrency: 'EUR'
+        }
+      });
+      setOrtbImpBidFloor(imp, req, {});
+      expect(imp.bidfloorcur).to.eql('EUR');
+    });
+
+    it('defaults to USD', () => {
+      const imp = {};
+      setOrtbImpBidFloor(imp, req, {});
+      expect(imp.bidfloorcur).to.eql('USD');
+    })
+  });
+
+  it('asks for specific mediaType if context.mediaType is set', () => {
+    let reqMediaType;
+    const req = {
+      getFloor(opts) {
+        reqMediaType = opts.mediaType;
+      }
+    }
+    setOrtbImpBidFloor({}, req, {mediaType: 'banner'});
+    expect(reqMediaType).to.eql('banner');
+  })
+});
+
+describe('setOrtbExtPrebidFloors', () => {
+  before(() => {
+    config.setConfig({floors: {}});
+  })
+  after(() => {
+    config.setConfig({floors: {enabled: false}});
+  });
+
+  it('should set ext.prebid.floors.enabled to false', () => {
+    const req = {};
+    setOrtbExtPrebidFloors(req);
+    expect(req.ext.prebid.floors.enabled).to.equal(false);
+  })
+
+  it('should respect fpd', () => {
+    const req = {
+      ext: {
+        prebid: {
+          floors: {
+            enabled: true
+          }
+        }
+      }
+    }
+    setOrtbExtPrebidFloors(req);
+    expect(req.ext.prebid.floors.enabled).to.equal(true);
+  })
+})
diff --git a/test/spec/ortbConverter/schain_spec.js b/test/spec/ortbConverter/schain_spec.js
new file mode 100644
index 00000000000..8eeef445948
--- /dev/null
+++ b/test/spec/ortbConverter/schain_spec.js
@@ -0,0 +1,33 @@
+import {setOrtbSourceExtSchain} from '../../../modules/schain.js';
+
+describe('pbjs - ortb source.ext.schain', () => {
+  it('sets schain from request', () => {
+    const req = {};
+    setOrtbSourceExtSchain(req, {}, {
+      bidRequests: [{schain: {s: 'chain'}}]
+    });
+    expect(req.source.ext.schain).to.eql({s: 'chain'});
+  });
+
+  it('does not set it if missing', () => {
+    const req = {};
+    setOrtbSourceExtSchain(req, {}, {bidRequests: [{}]});
+    expect(req).to.eql({});
+  })
+
+  it('does not set it if already in request', () => {
+    const req = {
+      source: {
+        ext: {
+          schain: {s: 'chain'}
+        }
+      }
+    }
+    setOrtbSourceExtSchain(req, {}, {
+      bidRequests: [{
+        schain: {other: 'chain'}
+      }]
+    });
+    expect(req.source.ext.schain).to.eql({s: 'chain'});
+  })
+});
diff --git a/test/spec/ortbConverter/userId_spec.js b/test/spec/ortbConverter/userId_spec.js
new file mode 100644
index 00000000000..0b1c8878edf
--- /dev/null
+++ b/test/spec/ortbConverter/userId_spec.js
@@ -0,0 +1,21 @@
+import {setOrtbUserExtEids} from '../../../modules/userId/index.js';
+
+describe('pbjs - ortb user eids', () => {
+  it('sets user.ext.eids from request', () => {
+    const req = {};
+    setOrtbUserExtEids(req, {}, {
+      bidRequests: [
+        {
+          userIdAsEids: {e: 'id'}
+        }
+      ]
+    });
+    expect(req.user.ext.eids).to.eql({e: 'id'});
+  });
+
+  it('has no effect if requests have no eids', () => {
+    const req = {};
+    setOrtbUserExtEids(req, {}, [{}]);
+    expect(req).to.eql({});
+  })
+})
diff --git a/test/spec/ortbConverter/usp_spec.js b/test/spec/ortbConverter/usp_spec.js
new file mode 100644
index 00000000000..01ff689cd97
--- /dev/null
+++ b/test/spec/ortbConverter/usp_spec.js
@@ -0,0 +1,15 @@
+import {setOrtbUsp} from '../../../modules/consentManagementUsp.js';
+
+describe('pbjs - ortb usp', () => {
+  it('sets regs.ext.us_privacy from bidderRequest', () => {
+    const req = {};
+    setOrtbUsp(req, {uspConsent: '1NN'});
+    expect(req.regs.ext.us_privacy).to.eql('1NN');
+  });
+
+  it('does not set if missing', () => {
+    const req = {};
+    setOrtbUsp(req, {});
+    expect(req).to.eql({});
+  });
+})
diff --git a/test/spec/ortbConverter/video_spec.js b/test/spec/ortbConverter/video_spec.js
new file mode 100644
index 00000000000..8ac6d8b4d08
--- /dev/null
+++ b/test/spec/ortbConverter/video_spec.js
@@ -0,0 +1,189 @@
+import {fillVideoImp, fillVideoResponse, VALIDATIONS} from '../../../libraries/ortbConverter/processors/video.js';
+import {BANNER, VIDEO} from '../../../src/mediaTypes.js';
+
+describe('pbjs -> ortb video conversion', () => {
+  [
+    {
+      t: 'non-video request',
+      request: {
+        mediaTypes: {
+          banner: {}
+        }
+      },
+      imp: {}
+    },
+    {
+      t: 'instream video request',
+      request: {
+        mediaTypes: {
+          video: {
+            playerSize: [[1, 2]],
+            context: 'instream',
+            mimes: ['video/mp4'],
+            skip: 1,
+          }
+        }
+      },
+      imp: {
+        video: {
+          w: 1,
+          h: 2,
+          mimes: ['video/mp4'],
+          skip: 1,
+          placement: 1,
+        },
+      },
+    },
+    {
+      t: 'outstream video request',
+      request: {
+        mediaTypes: {
+          video: {
+            playerSize: [[1, 2]],
+            context: 'outstream',
+            mimes: ['video/mp4'],
+            skip: 1
+          }
+        }
+      },
+      imp: {
+        video: {
+          w: 1,
+          h: 2,
+          mimes: ['video/mp4'],
+          skip: 1,
+        },
+      },
+    },
+    {
+      t: 'video request with explicit placement',
+      request: {
+        mediaTypes: {
+          video: {
+            playerSize: [[1, 2]],
+            placement: 'explicit'
+          }
+        }
+      },
+      imp: {
+        video: {
+          w: 1,
+          h: 2,
+          placement: 'explicit',
+        }
+      }
+    },
+    {
+      t: 'video request with multiple playerSizes',
+      request: {
+        mediaTypes: {
+          video: {
+            playerSize: [[1, 2], [3, 4]]
+          }
+        }
+      },
+      imp: {
+        video: {
+          w: 1,
+          h: 2,
+        }
+      }
+    },
+    {
+      t: 'video request with 2-tuple playerSize',
+      request: {
+        mediaTypes: {
+          video: {
+            playerSize: [1, 2]
+          }
+        }
+      },
+      imp: {
+        video: {
+          w: 1,
+          h: 2,
+        }
+      }
+    },
+  ].forEach(({t, request, imp}) => {
+    it(`can handle ${t}`, () => {
+      const actual = {};
+      fillVideoImp(actual, request, {});
+      expect(actual).to.eql(imp);
+    });
+  });
+
+  it('should keep ortb2Imp.video', () => {
+    const imp = {
+      video: {
+        someParam: 'someValue'
+      }
+    };
+    fillVideoImp(imp, {mediaTypes: {video: {playerSize: [[1, 2]]}}}, {});
+    expect(imp.video.someParam).to.eql('someValue');
+  });
+
+  it('does nothing is context.mediaType is set but is not VIDEO', () => {
+    const imp = {};
+    fillVideoImp(imp, {mediaTypes: {video: {playerSize: [[1, 2]]}}}, {mediaType: BANNER});
+    expect(imp).to.eql({});
+  });
+});
+
+describe('ortb -> pbjs video conversion', () => {
+  [
+    {
+      t: 'non-video response',
+      seatbid: {},
+      response: {
+        mediaType: BANNER
+      },
+      expected: {
+        mediaType: BANNER
+      }
+    },
+    {
+      t: 'simple video response',
+      seatbid: {
+        adm: 'mockAdm',
+        nurl: 'mockNurl'
+      },
+      response: {
+        mediaType: VIDEO,
+      },
+      context: {
+        imp: {
+          video: {
+            w: 1,
+            h: 2
+          }
+        }
+      },
+      expected: {
+        mediaType: VIDEO,
+        playerWidth: 1,
+        playerHeight: 2,
+        vastXml: 'mockAdm',
+        vastUrl: 'mockNurl'
+      }
+    },
+    {
+      t: 'video response without playerSize',
+      seatbid: {},
+      response: {
+        mediaType: VIDEO,
+      },
+      context: {
+        imp: {}
+      },
+      expected: {
+        mediaType: VIDEO
+      }
+    }
+  ].forEach(({t, seatbid, context, response, expected}) => {
+    it(`can handle ${t}`, () => {
+      fillVideoResponse(response, seatbid, context);
+      expect(response).to.eql(expected);
+    })
+  })
+})
diff --git a/test/spec/utils_spec.js b/test/spec/utils_spec.js
index 500f479355d..9199b259ad6 100644
--- a/test/spec/utils_spec.js
+++ b/test/spec/utils_spec.js
@@ -2,7 +2,7 @@ import { getAdServerTargeting } from 'test/fixtures/fixtures.js';
 import { expect } from 'chai';
 import CONSTANTS from 'src/constants.json';
 import * as utils from 'src/utils.js';
-import {deepEqual, waitForElementToLoad} from 'src/utils.js';
+import {memoize, deepEqual, waitForElementToLoad} from 'src/utils.js';
 
 var assert = require('assert');
 
@@ -1260,3 +1260,47 @@ describe('Utils', function () {
     });
   });
 });
+
+describe('memoize', () => {
+  let fn;
+
+  beforeEach(() => {
+    fn = sinon.stub().callsFake(function() {
+      return Array.from(arguments);
+    });
+  });
+
+  it('delegates to fn', () => {
+    expect(memoize(fn)('one', 'two')).to.eql(['one', 'two']);
+  });
+
+  it('caches result after first call, if first argument is the same', () => {
+    const mem = memoize(fn);
+    mem('one', 'two');
+    expect(mem('one', 'three')).to.eql(['one', 'two']);
+    expect(fn.callCount).to.equal(1);
+  });
+
+  it('delegates again when the first argument changes', () => {
+    const mem = memoize(fn);
+    mem('one', 'two');
+    expect(mem('two', 'one')).to.eql(['two', 'one']);
+    expect(fn.callCount).to.eql(2);
+  });
+
+  it('can clear cache with .clear', () => {
+    const mem = memoize(fn);
+    mem('arg');
+    mem.clear();
+    expect(mem('arg')).to.eql(['arg']);
+    expect(fn.callCount).to.equal(2);
+  });
+
+  it('allows setting cache keys', () => {
+    const mem = memoize(fn, (...args) => args.join(','))
+    mem('one', 'two');
+    mem('one', 'three');
+    expect(mem('one', 'three')).to.eql(['one', 'three']);
+    expect(fn.callCount).to.eql(2);
+  })
+})

From f2e8881dbd216de1b2d055bb4edeb15bcfa29637 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 12:23:56 -0700
Subject: [PATCH 375/569] Bump minimatch from 0.2.14 to 3.0.4 (#9143)

Bumps [minimatch](https://github.com/isaacs/minimatch) from 0.2.14 to 3.0.4.
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Commits](https://github.com/isaacs/minimatch/compare/v0.2.14...v3.0.4)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 10025 +-------------------------------------------
 1 file changed, 33 insertions(+), 9992 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 61d961b102e..e11da6fba7b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2344,12 +2344,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/linkify-it": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
-      "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
-      "dev": true
-    },
     "node_modules/@types/lodash": {
       "version": "4.14.179",
       "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz",
@@ -2383,16 +2377,6 @@
         "@types/lodash": "*"
       }
     },
-    "node_modules/@types/markdown-it": {
-      "version": "12.2.3",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
-      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/linkify-it": "*",
-        "@types/mdurl": "*"
-      }
-    },
     "node_modules/@types/mdast": {
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
@@ -3786,35 +3770,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/acorn-node": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
-      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/adm-zip": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz",
-      "integrity": "sha512-J2LiZpRxcLsJm2IwoekNa6COwzEZnMwCJ3vxz0UCw2NYUH2WFi7svuDrVccq5KpBGmzGUgFa0L0FwEmKmu/rzQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.0"
-      }
-    },
     "node_modules/aes-decrypter": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.3.tgz",
@@ -3857,6 +3812,7 @@
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=0.4.2"
       }
@@ -4127,15 +4083,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -4267,12 +4214,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
-      "dev": true
-    },
     "node_modules/asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -4282,24 +4223,6 @@
         "safer-buffer": "~2.1.0"
       }
     },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
     "node_modules/assert": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
@@ -4348,27 +4271,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/astw": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz",
-      "integrity": "sha512-E/4z//dvN0lfr8zAx8hXeQ8o3nRoQaL/wqI7fAALEvh/40mnyUxfFB9MwyDHYKVDtS3cp3Pow5s96djZR5lkWw==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^4.0.3"
-      }
-    },
-    "node_modules/astw/node_modules/acorn": {
-      "version": "4.0.13",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-      "integrity": "sha512-fu2ygVGuMmlzG8ZeRJ0bvR41nsAkxxhbyk8bZ1SS521Z7vmgJFTQQlfz/Mp/nJexGBz+v8sC9bM6+lNgskt4Ug==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/async": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
@@ -4983,12 +4885,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/Base64": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz",
-      "integrity": "sha512-reGEWshDmTDQDsCec/HduOO9Wyj6yMOupMfhIf3ugN1TDlK2NQW4DDJSqNNtp380SNcvRfXtO8HSCQot0d0SMw==",
-      "dev": true
-    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -5045,69 +4941,6 @@
         "tweetnacl": "^0.14.3"
       }
     },
-    "node_modules/beefy": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/beefy/-/beefy-1.1.0.tgz",
-      "integrity": "sha512-olZqTbw6gnofdbG98uAKvG6O/AjV6WGuPsKpYF41VQK39sUYvulm86RssD1K/iVNkkSJ8cuYeheJ8Nk2gz16wA==",
-      "dev": true,
-      "dependencies": {
-        "chokidar": "0.8.1",
-        "colors": "~0.6.0-1",
-        "ignorepatterns": "1.0.1",
-        "mime": "~1.2.9",
-        "nopt": "~2.1.1",
-        "open": "0.0.3",
-        "portfinder": "~0.2.1",
-        "response-stream": "0.0.0",
-        "script-injector": "~0.1.0",
-        "sse-stream": "0.0.4",
-        "through": "~2.2.0"
-      },
-      "bin": {
-        "beefy": "bin/beefy"
-      }
-    },
-    "node_modules/beefy/node_modules/chokidar": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-0.8.1.tgz",
-      "integrity": "sha512-Bl/CteHnM5g3eKGPMkraZQW7Yzk2Gu87eE3jdaMfCNJP79sVa54M5KHStr3WtJl4vVoVSndVDws6IFLTmMa3Lw==",
-      "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
-      "dev": true,
-      "hasInstallScript": true
-    },
-    "node_modules/beefy/node_modules/colors": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
-      "integrity": "sha512-OsSVtHK8Ir8r3+Fxw/b4jS1ZLPXkV6ZxDRJQzeD7qo0SqMXWrHDM71DgYzPMHY8SFJ0Ao+nNU2p1MmwdzKqPrw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.1.90"
-      }
-    },
-    "node_modules/beefy/node_modules/mime": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-      "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
-      "dev": true
-    },
-    "node_modules/beefy/node_modules/nopt": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
-      "integrity": "sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==",
-      "dev": true,
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      }
-    },
-    "node_modules/beefy/node_modules/through": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
-      "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
-      "dev": true
-    },
     "node_modules/beeper": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
@@ -5210,12 +5043,6 @@
       "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
       "dev": true
     },
-    "node_modules/bn.js": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
-      "dev": true
-    },
     "node_modules/body": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
@@ -5286,20 +5113,6 @@
       "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
       "dev": true
     },
-    "node_modules/boom": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
-      "integrity": "sha512-OvfN8y1oAxxphzkl2SnCS+ztV/uVKTATtgLjWYg/7KwcNyf3rzpHxNQJZCKtsZd4+MteKczhWbSjtEX4bGgU9g==",
-      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "hoek": "0.9.x"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -5322,581 +5135,12 @@
         "node": ">=8"
       }
     },
-    "node_modules/brfs": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/brfs/-/brfs-0.0.9.tgz",
-      "integrity": "sha512-5bjo0XG6pPGTFJsS4rtvP1vvwLp3UstdF062l10RKcfG60+izXak0DFcfQwMtBQNGlFm588mM2WvD02hJErVYg==",
-      "dev": true,
-      "dependencies": {
-        "escodegen": "0.0.17",
-        "falafel": "~0.1.6",
-        "through": "~2.2.0"
-      },
-      "bin": {
-        "brfs": "bin/cmd.js"
-      }
-    },
-    "node_modules/brfs/node_modules/escodegen": {
-      "version": "0.0.17",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-0.0.17.tgz",
-      "integrity": "sha512-muX87X0L2dvVJ4ZPKAJLQlcyg2qhl6ps8Ow8vOAcuoFIrZLtXNMGfjnD19LSTrZ1SBHQsI+tvD8YlsJqHhfXrw==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "~1.0.2",
-        "estraverse": "~0.0.4"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      },
-      "optionalDependencies": {
-        "source-map": ">= 0.1.2"
-      }
-    },
-    "node_modules/brfs/node_modules/esprima": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
-      "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/brfs/node_modules/estraverse": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz",
-      "integrity": "sha512-21DfBCsFJGb3HZr0vEBH1Wk1tGSbbzA8I/xtSSoy/pRtupHv0OgBmObcNGXM3ec6/pOXTOOUYY9/5bfluzz0sw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/brfs/node_modules/through": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
-      "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
-      "dev": true
-    },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
-      "dev": true
-    },
-    "node_modules/browser-pack": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz",
-      "integrity": "sha512-BHla5EbbxjNyLMFUMamVjeTY+q1QwHbrYNXlWOkw71QcBqAQF7maJyNh3OI/V0d5YyNdMYD6tiPhJB9ukBo99Q==",
-      "dev": true,
-      "dependencies": {
-        "combine-source-map": "~0.3.0",
-        "concat-stream": "~1.4.1",
-        "defined": "~0.0.0",
-        "JSONStream": "~0.8.4",
-        "through2": "~0.5.1",
-        "umd": "^2.1.0"
-      },
-      "bin": {
-        "browser-pack": "bin/cmd.js"
-      }
-    },
-    "node_modules/browser-pack/node_modules/concat-stream": {
-      "version": "1.4.11",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
-      "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "~1.1.9",
-        "typedarray": "~0.0.5"
-      }
-    },
-    "node_modules/browser-pack/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/browser-pack/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/browser-pack/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/browser-pack/node_modules/through2": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-      "integrity": "sha512-zexCrAOTbjkBCXGyozn7hhS3aEaqdrc59mAD2E3dKYzV1vFuEGQ1hEDJN2oQMQFwy4he2zyLqPZV+AlfS8ZWJA==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.0.17",
-        "xtend": "~3.0.0"
-      }
-    },
-    "node_modules/browser-pack/node_modules/through2/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/browser-pack/node_modules/xtend": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-      "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/browser-resolve": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
-      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "1.1.7"
-      }
-    },
-    "node_modules/browser-resolve/node_modules/resolve": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-      "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
-      "dev": true
-    },
     "node_modules/browser-stdout": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
       "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
       "dev": true
     },
-    "node_modules/browserify": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/browserify/-/browserify-8.1.3.tgz",
-      "integrity": "sha512-0KKOkCQXCvP64qm73CtESE92pVnB5MkjA2W/Tmf+S4uPHVY4/SeCwO7wdr4mkke5ySoVyMqsOcMa5zo6uh9c9A==",
-      "dev": true,
-      "dependencies": {
-        "assert": "~1.3.0",
-        "browser-pack": "^3.2.0",
-        "browser-resolve": "^1.3.0",
-        "browserify-zlib": "~0.1.2",
-        "buffer": "^3.0.0",
-        "builtins": "~0.0.3",
-        "commondir": "0.0.1",
-        "concat-stream": "~1.4.1",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "~0.0.1",
-        "crypto-browserify": "^3.0.0",
-        "deep-equal": "~0.2.1",
-        "defined": "~0.0.0",
-        "deps-sort": "^1.3.5",
-        "domain-browser": "~1.1.0",
-        "duplexer2": "~0.0.2",
-        "events": "~1.0.0",
-        "glob": "^4.0.5",
-        "http-browserify": "^1.4.0",
-        "https-browserify": "~0.0.0",
-        "inherits": "~2.0.1",
-        "insert-module-globals": "^6.2.0",
-        "isarray": "0.0.1",
-        "JSONStream": "~0.8.3",
-        "labeled-stream-splicer": "^1.0.0",
-        "module-deps": "^3.6.3",
-        "os-browserify": "~0.1.1",
-        "parents": "^1.0.1",
-        "path-browserify": "~0.0.0",
-        "process": "^0.10.0",
-        "punycode": "~1.2.3",
-        "querystring-es3": "~0.2.0",
-        "readable-stream": "^1.0.33-1",
-        "resolve": "~0.7.1",
-        "shallow-copy": "0.0.1",
-        "shasum": "^1.0.0",
-        "shell-quote": "~0.0.1",
-        "stream-browserify": "^1.0.0",
-        "string_decoder": "~0.10.0",
-        "subarg": "^1.0.0",
-        "syntax-error": "^1.1.1",
-        "through2": "^1.0.0",
-        "timers-browserify": "^1.0.1",
-        "tty-browserify": "~0.0.0",
-        "umd": "~2.1.0",
-        "url": "~0.10.1",
-        "util": "~0.10.1",
-        "vm-browserify": "~0.0.1",
-        "xtend": "^3.0.0"
-      },
-      "bin": {
-        "browserify": "bin/cmd.js"
-      }
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/browserify-zlib": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-      "integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==",
-      "dev": true,
-      "dependencies": {
-        "pako": "~0.2.0"
-      }
-    },
-    "node_modules/browserify/node_modules/assert": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz",
-      "integrity": "sha512-5aKcpD+XnHpZ7EGxsuo6uoILNh0rvm0Ypa17GlkrF2CNSPhvdgi3ft9XsL2ajdVOI2I3xuGZnHvlXAeqTZYvXg==",
-      "dev": true,
-      "dependencies": {
-        "util": "0.10.3"
-      }
-    },
-    "node_modules/browserify/node_modules/assert/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
-      "dev": true
-    },
-    "node_modules/browserify/node_modules/assert/node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.1"
-      }
-    },
-    "node_modules/browserify/node_modules/base64-js": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
-      "integrity": "sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/browserify/node_modules/buffer": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.2.tgz",
-      "integrity": "sha512-c3M77NkHJxS0zx/ErxXhDLr1v3y2MDXPeTJPvLNOaIYJ4ymHBUFQ9EXzt9HYuqAJllMoNb/EZ8hIiulnQFAUuQ==",
-      "dev": true,
-      "dependencies": {
-        "base64-js": "0.0.8",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "node_modules/browserify/node_modules/buffer/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
-    },
-    "node_modules/browserify/node_modules/commondir": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz",
-      "integrity": "sha512-Ghe1LmLv3G3c0XJYu+c88MCRIPqWQ67qaqKY1KvuN4uPAjfUj+y4hvcpZ2kCPrjpRNyklW4dpAZZ8a7vOh50tg==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/browserify/node_modules/concat-stream": {
-      "version": "1.4.11",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
-      "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "~1.1.9",
-        "typedarray": "~0.0.5"
-      }
-    },
-    "node_modules/browserify/node_modules/deep-equal": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
-      "integrity": "sha512-FXgye2Jr6oEk01S7gmSrHrPEQ1ontR7wwl+nYiZ8h4SXlHVm0DYda74BIPcHz2s2qPz4+375IcAz1vsWLwddgQ==",
-      "dev": true
-    },
-    "node_modules/browserify/node_modules/duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "node_modules/browserify/node_modules/events": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz",
-      "integrity": "sha512-XK19KwlDJo8XsceooxNDK1pObtcT44+Xte6V/jQc4a+fHq1qEouThyyX2ePmS0hS8RcCulmRxzg+T8jiLKAFFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/browserify/node_modules/glob": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-      "integrity": "sha512-I0rTWUKSZKxPSIAIaqhSXTM/DiII6wame+rEC3cFA5Lqmr9YmdL7z6Hj9+bdWtTvoY1Su4/OiMLmb37Y7JzvJQ==",
-      "dev": true,
-      "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^2.0.1",
-        "once": "^1.3.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/browserify/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
-    },
-    "node_modules/browserify/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/browserify/node_modules/minimatch": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-      "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
-      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/browserify/node_modules/process": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.10.1.tgz",
-      "integrity": "sha512-dyIett8dgGIZ/TXKUzeYExt7WA6ldDzys9vTDU/cCA9L17Ypme+KzS+NjQCjpn9xsvi/shbMC+yP/BcFMBz0NA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/browserify/node_modules/punycode": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz",
-      "integrity": "sha512-h/vscxLPvI2l7k/0dFUKZ5I5TgMCJ/Pl+J6rw77PDuQM6UApf/GaRVkjv/YSm2k+fbp7Yw8dxsoe29DolT7h7w==",
-      "dev": true,
-      "engines": [
-        "node",
-        "rhino"
-      ]
-    },
-    "node_modules/browserify/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/browserify/node_modules/resolve": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
-      "integrity": "sha512-zxmAcifDjKxmUbk7chQdKhDSn8ml08g+MYyU37xhEXBp+N81cfbYsm4e0Gn9jtLbAvbR8w8Ox09xqUZtPuCoeA==",
-      "dev": true
-    },
-    "node_modules/browserify/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/browserify/node_modules/through2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.1.13-1 <1.2.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/browserify/node_modules/through2/node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/browserify/node_modules/url": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-      "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/browserify/node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
-      "dev": true
-    },
-    "node_modules/browserify/node_modules/util": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/browserify/node_modules/xtend": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-      "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
     "node_modules/browserslist": {
       "version": "4.21.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
@@ -6083,12 +5327,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
-      "dev": true
-    },
     "node_modules/buffers": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
@@ -6098,12 +5336,6 @@
         "node": ">=0.2.0"
       }
     },
-    "node_modules/builtins": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz",
-      "integrity": "sha512-T8uCGKc0/2aLVt6omt8JxDRBoWEMkku+wFesxnhxnt4NygVZG99zqxo7ciK8eebszceKamGoUiLdkXCgGQyrQw==",
-      "dev": true
-    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -6342,15 +5574,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/callsite": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-      "integrity": "sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -6369,28 +5592,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/camelcase-keys/node_modules/camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/can-autoplay": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/can-autoplay/-/can-autoplay-3.0.2.tgz",
@@ -6418,18 +5619,6 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
       "dev": true
     },
-    "node_modules/catharsis": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
-      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.15"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/ccount": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
@@ -6619,16 +5808,6 @@
         "node": ">=6.0"
       }
     },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "node_modules/class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -6879,35 +6058,6 @@
         "node": ">=0.1.90"
       }
     },
-    "node_modules/combine-source-map": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
-      "integrity": "sha512-HRKa6g9SC1xd6ifto8ay6SxvyHaaQ50/8NO1ZONXx2hsIF9t/52qXa7Eeivaf5KFOSowK7Nm8TkIL/VC4khdBA==",
-      "dev": true,
-      "dependencies": {
-        "convert-source-map": "~0.3.0",
-        "inline-source-map": "~0.3.0",
-        "source-map": "~0.1.31"
-      }
-    },
-    "node_modules/combine-source-map/node_modules/convert-source-map": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
-      "integrity": "sha512-+4nRk0k3oEpwUB7/CalD7xE2z4VmtEnnq0GO2IPTkrooTrAhEsWvuLF5iWP1dXrwluki/azwXV1ve7gtYuPldg==",
-      "dev": true
-    },
-    "node_modules/combine-source-map/node_modules/source-map": {
-      "version": "0.1.43",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-      "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
-      "dev": true,
-      "dependencies": {
-        "amdefine": ">=0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -6930,15 +6080,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/commander": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz",
-      "integrity": "sha512-qebjpyeaA/nJ4w3EO2cV2++/zEkccPnjWogzA2rff+Lk8ILI75vULeTmyd4wPxWdKwtP3J+G39IXVZadh0UHyw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.x"
-      }
-    },
     "node_modules/commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -7019,16 +6160,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/config-chain": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
-      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
-      "dev": true,
-      "dependencies": {
-        "ini": "^1.3.4",
-        "proto-list": "~1.2.1"
-      }
-    },
     "node_modules/connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
@@ -7068,18 +6199,6 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
       "dev": true
     },
-    "node_modules/console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "node_modules/constants-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz",
-      "integrity": "sha512-FL+diDS9AKR5BAA2M+GNk8lnH64tRE3zepTG9hucxc7o04LgCRhkQZhF7u/OKHZT8LLRT+sZEi9qFzXUchq9pA==",
-      "dev": true
-    },
     "node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -7288,49 +6407,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      }
-    },
-    "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
     "node_modules/criteo-direct-rsa-validate": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/criteo-direct-rsa-validate/-/criteo-direct-rsa-validate-1.1.0.tgz",
@@ -7359,42 +6435,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/cryptiles": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
-      "integrity": "sha512-gvWSbgqP+569DdslUiCelxIv3IYK5Lgmq1UrRnk+s1WxQOQ16j3GPDcjdtgL5Au65DU/xQi6q3xPtf5Kta+3IQ==",
-      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "boom": "0.4.x"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/crypto-js": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
@@ -7432,37 +6472,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/cssauron": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
-      "integrity": "sha512-Ht70DcFBh+/ekjVrYS2PlDMdSQEl3OFNmjK6lcn49HptBgilXf/Zwg4uFh9Xn0pX3Q8YOkSjIFOfK2osvdqpBw==",
-      "dev": true,
-      "dependencies": {
-        "through": "X.X.X"
-      }
-    },
-    "node_modules/ctype": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-      "integrity": "sha512-T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==",
-      "dev": true,
-      "dependencies": {
-        "array-find-index": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -7552,15 +6561,6 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/debuglog": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
-      "integrity": "sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
@@ -7744,12 +6744,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/defined": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz",
-      "integrity": "sha512-zpqiCT8bODLu3QSmLLic8xJnYWBFjOSu/fBCm189oAiTtPq/PSanNACKZDS7kgSyCJY7P+IcODzlIogBK/9RBg==",
-      "dev": true
-    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -7767,80 +6761,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/deps-sort": {
-      "version": "1.3.9",
-      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz",
-      "integrity": "sha512-aEnmQuu/Hf5h8akL8QshYWzk9MVBg/JYMyNq/Lz68i69nR17tunjP6o/AC6Tn48c8ayzG6aeKs6OoFOtVCtvrQ==",
-      "dev": true,
-      "dependencies": {
-        "JSONStream": "^1.0.3",
-        "shasum": "^1.0.0",
-        "subarg": "^1.0.0",
-        "through2": "^1.0.0"
-      },
-      "bin": {
-        "deps-sort": "bin/cmd.js"
-      }
-    },
-    "node_modules/deps-sort/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/deps-sort/node_modules/jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-      "dev": true,
-      "engines": [
-        "node >= 0.2.0"
-      ]
-    },
-    "node_modules/deps-sort/node_modules/JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "dependencies": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      },
-      "bin": {
-        "JSONStream": "bin.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/deps-sort/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/deps-sort/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/deps-sort/node_modules/through2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.1.13-1 <1.2.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
     "node_modules/dequal": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
@@ -7850,16 +6770,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
     "node_modules/destroy": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
@@ -7895,37 +6805,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/detective": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
-      "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^5.2.1",
-        "defined": "^1.0.0"
-      }
-    },
-    "node_modules/detective/node_modules/acorn": {
-      "version": "5.7.4",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/detective/node_modules/defined": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
-      "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/devtools": {
       "version": "7.16.16",
       "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
@@ -7984,16 +6863,6 @@
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/dezalgo": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
-      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
-      "dev": true,
-      "dependencies": {
-        "asap": "^2.0.0",
-        "wrappy": "1"
-      }
-    },
     "node_modules/di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -8018,23 +6887,6 @@
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
     "node_modules/dlv": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
@@ -8255,16 +7107,6 @@
       "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
       "dev": true
     },
-    "node_modules/domain-browser": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
-      "integrity": "sha512-fJ5MoHxe69h3E4/lJtFRhcWwLb04bhIBSfvCEMS1YDH+/9yEZTqBHTSTgch8nCP5tE5k2gdQEjodUqJzy7qJ9Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
-      }
-    },
     "node_modules/dset": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
@@ -8399,27 +7241,6 @@
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.243.tgz",
       "integrity": "sha512-BgLD2gBX43OSXwlT01oYRRD5NIB4n3okTRxkzEAC6G0SZG4TTlyrWMjbOo0fajCwqwpRtMHXQNMjtRN6qpNtfw=="
     },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
@@ -8516,15 +7337,6 @@
       "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
       "dev": true
     },
-    "node_modules/entities": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
     "node_modules/errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -8666,20 +7478,6 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "node_modules/es6-map": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-      "integrity": "sha512-mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A==",
-      "dev": true,
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-set": "~0.1.5",
-        "es6-symbol": "~3.1.1",
-        "event-emitter": "~0.3.5"
-      }
-    },
     "node_modules/es6-object-assign": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
@@ -8701,29 +7499,6 @@
         "es6-promise": "^4.0.3"
       }
     },
-    "node_modules/es6-set": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz",
-      "integrity": "sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==",
-      "dev": true,
-      "dependencies": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.62",
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "^3.1.3",
-        "event-emitter": "^0.3.5",
-        "type": "^2.7.2"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/es6-set/node_modules/type": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-      "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
-      "dev": true
-    },
     "node_modules/es6-symbol": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
@@ -8862,21 +7637,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/escope": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
-      "integrity": "sha512-75IUQsusDdalQEW/G/2esa87J7raqdJF+Ca0/Xm5C3Q58Nr4yVYjZGp/P1+2xiEVgXRrA39dpRb8LcshajbqDQ==",
-      "dev": true,
-      "dependencies": {
-        "es6-map": "^0.1.3",
-        "es6-weak-map": "^2.0.1",
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/eslint": {
       "version": "7.32.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
@@ -9349,19 +8109,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/esprima-fb": {
-      "version": "10001.1.0-dev-harmony-fb",
-      "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-10001.1.0-dev-harmony-fb.tgz",
-      "integrity": "sha512-z2dx3A/ZGNamsDjJS4FZPXnpoRCEkQXqouKBCOaJifyx4HkEVoSQ3YWFX18Scut1Aq9gnctzLWcWJgKkL0xNQw==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/esquery": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
@@ -9413,15 +8160,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/estraverse-fb": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/estraverse-fb/-/estraverse-fb-1.3.2.tgz",
-      "integrity": "sha512-wp3lfRrWy5EQD9TqesuYM1SKVP4ERT0cUatb4e8Vznf4K5IOpREhuyXZxGj3a9s9mvX5vGZKNHA4R9D4kp9Q9A==",
-      "dev": true,
-      "peerDependencies": {
-        "estraverse": "*"
-      }
-    },
     "node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
@@ -9491,16 +8229,6 @@
         "node": ">=0.8.x"
       }
     },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "node_modules/execa": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
@@ -10000,31 +8728,6 @@
       "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==",
       "dev": true
     },
-    "node_modules/falafel": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/falafel/-/falafel-0.1.6.tgz",
-      "integrity": "sha512-r1s3VwKzm6PB35MZmnfZoF6NTgSKRxf8How2lBsrDq81OsYXb/2fR8ysfURHCTlFpqJDQVA88iB70wFrFRYDsA==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/falafel/node_modules/esprima": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
-      "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/fancy-log": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
@@ -10156,58 +8859,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/fileset": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz",
-      "integrity": "sha512-aK3PFyHSwWsBJCarRxMRIXSGamfroi9ehG8f4e5A2n5nSlEVHe8y44jNTIN4+HdZSpK3FNV0EdihH1iDWTdnGg==",
-      "dev": true,
-      "dependencies": {
-        "glob": "5.x",
-        "minimatch": "2.x"
-      }
-    },
-    "node_modules/fileset/node_modules/glob": {
-      "version": "5.0.15",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-      "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
-      "dev": true,
-      "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/fileset/node_modules/minimatch": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-      "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
-      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/fill-keys": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
-      "integrity": "sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA==",
-      "dev": true,
-      "dependencies": {
-        "is-object": "~1.0.1",
-        "merge-descriptors": "~1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -10451,23 +9102,6 @@
         "node": ">= 0.12"
       }
     },
-    "node_modules/formatio": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
-      "integrity": "sha512-cPh7is6k3d8tIUh+pnXXuAbD/uhSXGgqLPw0UrYpv5lfdJ+MMMSjx40JNpqP7Top9Nt25YomWEiRmkHbOvkCaA==",
-      "deprecated": "This package is unmaintained. Use @sinonjs/formatio instead",
-      "dev": true,
-      "dependencies": {
-        "samsam": "~1.1"
-      }
-    },
-    "node_modules/formatio/node_modules/samsam": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.3.tgz",
-      "integrity": "sha512-t9rCPskf50hZ53eH8Z+cSWD4LfJBac+8vSSuzi1Y2HzygyXxtAl0BaR3hr6iI6A+nFQbkmJNC/brQLNEeVnrmg==",
-      "deprecated": "This package has been deprecated in favour of @sinonjs/samsam",
-      "dev": true
-    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -10682,24 +9316,6 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/generate-function": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
-      "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
-      "dev": true,
-      "dependencies": {
-        "is-property": "^1.0.2"
-      }
-    },
-    "node_modules/generate-object-property": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "integrity": "sha512-TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ==",
-      "dev": true,
-      "dependencies": {
-        "is-property": "^1.0.0"
-      }
-    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -10760,15 +9376,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -10815,79 +9422,6 @@
         "assert-plus": "^1.0.0"
       }
     },
-    "node_modules/gh-got": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/gh-got/-/gh-got-1.1.0.tgz",
-      "integrity": "sha512-jo4rP5ugI6fZGjS0vmvHlM8P7EBA39p8to4r2i+LqYXxeg4M8qnPXiKaetDfH0YLXkO9Hfsa2mKIjMsGJwcdGQ==",
-      "dev": true,
-      "dependencies": {
-        "got": "^3.2.0",
-        "object-assign": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gh-got/node_modules/duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/gh-got/node_modules/got": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-3.3.1.tgz",
-      "integrity": "sha512-7chPlc0pWHjvq7B6dEEXz4GphoDupOvBSSl6AwRsAJX7GPTZ+bturaZiIigX4Dp6KrAP67nvzuKkNc0SLA0DKg==",
-      "dev": true,
-      "dependencies": {
-        "duplexify": "^3.2.0",
-        "infinity-agent": "^2.0.0",
-        "is-redirect": "^1.0.0",
-        "is-stream": "^1.0.0",
-        "lowercase-keys": "^1.0.0",
-        "nested-error-stacks": "^1.0.0",
-        "object-assign": "^3.0.0",
-        "prepend-http": "^1.0.0",
-        "read-all-stream": "^3.0.0",
-        "timed-out": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gh-got/node_modules/got/node_modules/object-assign": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-      "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gh-got/node_modules/lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gh-got/node_modules/object-assign": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
-      "integrity": "sha512-CdsOUYIh5wIiozhJ3rLQgmUTgcyzFwZZrqhkKhODMoGtPKM+wt0h0CNIoauJWMsS9822EdzPsF/6mb4nLvPN5g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/git-up": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/git-up/-/git-up-6.0.0.tgz",
@@ -10913,18 +9447,6 @@
       "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==",
       "dev": true
     },
-    "node_modules/github-url-from-git": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz",
-      "integrity": "sha512-WWOec4aRI7YAykQ9+BHmzjyNlkfJFG8QLXnDTsLz/kZefq7qkzdfo4p6fkYYMIq1aj+gZcQs/1HQhQh3DPPxlQ==",
-      "dev": true
-    },
-    "node_modules/github-url-from-username-repo": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz",
-      "integrity": "sha512-Tj8CQqRoFVTglGdQ8FQmfq8gOOoOYZX7tnOKP8jq8Hdz2OTDhxvtlkLAbrqMYZ7X/YdaYQoUG1IBWxISBfqZ+Q==",
-      "dev": true
-    },
     "node_modules/glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -12963,15 +11485,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-color": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
-      "integrity": "sha512-kaNz5OTAYYmt646Hkqw50/qyxP2vFnTVu5AQ1Zmk22Kk5+4Qx6BpO8+u7IKsML5fOsFk0ZT0AcCJNYwcvaLBvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -13064,64 +11577,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash-base/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/hash-base/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
     "node_modules/hast-util-is-element": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-2.1.2.tgz",
@@ -13181,23 +11636,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/hawk": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-      "integrity": "sha512-am8sVA2bCJIw8fuuVcKvmmNnGFUGW8spTkVtj2fXTEZVkfN42bwFZFtDem57eFi+NSxurJB8EQ7Jd3uCHLn8Vw==",
-      "deprecated": "This module moved to @hapi/hawk. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "boom": "0.4.x",
-        "cryptiles": "0.2.x",
-        "hoek": "0.9.x",
-        "sntp": "0.2.x"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -13216,28 +11654,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
-      "dev": true,
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/hoek": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
-      "integrity": "sha512-ZZ6eGyzGjyMTmpSPYVECXy9uNfqBR7x5CavhUaLOeD6W0vWK1mp/b7O3f86XE0Mtfo9rZ6Bh3fnuw9Xr8MF9zA==",
-      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/home-or-tmp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
@@ -13275,147 +11691,6 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
-    "node_modules/html-select": {
-      "version": "2.3.24",
-      "resolved": "https://registry.npmjs.org/html-select/-/html-select-2.3.24.tgz",
-      "integrity": "sha512-kQ+YZoVQ8Aux6bUqMVc0iufcZOv03+xYZ4J5v2beT5wkNrW/e2roZ8pnU4LunVOVBGFkbodFKR0TvuMkTdyrJQ==",
-      "dev": true,
-      "dependencies": {
-        "cssauron": "^1.1.0",
-        "duplexer2": "~0.0.2",
-        "inherits": "^2.0.1",
-        "minimist": "~0.0.8",
-        "readable-stream": "^1.0.27-1",
-        "split": "~0.3.0",
-        "stream-splicer": "^1.2.0",
-        "through2": "^1.0.0"
-      },
-      "bin": {
-        "html-select": "bin/cmd.js"
-      }
-    },
-    "node_modules/html-select/node_modules/duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "node_modules/html-select/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/html-select/node_modules/minimist": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-      "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
-      "dev": true
-    },
-    "node_modules/html-select/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/html-select/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/html-select/node_modules/through2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.1.13-1 <1.2.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/html-tokenize": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/html-tokenize/-/html-tokenize-1.2.5.tgz",
-      "integrity": "sha512-7sCme3w9Hiv/kfL6sO6ePTGAV5fY6P7WDZyOs0zfXXU8vsS1ps1CQfGe0J1yuAdcCnOJ9h66RLYX/e9Cife8yw==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "minimist": "~0.0.8",
-        "readable-stream": "~1.0.27-1",
-        "through2": "~0.4.1"
-      },
-      "bin": {
-        "html-tokenize": "bin/cmd.js"
-      }
-    },
-    "node_modules/html-tokenize/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/html-tokenize/node_modules/minimist": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-      "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
-      "dev": true
-    },
-    "node_modules/html-tokenize/node_modules/object-keys": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-      "integrity": "sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==",
-      "dev": true
-    },
-    "node_modules/html-tokenize/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/html-tokenize/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/html-tokenize/node_modules/through2": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-      "integrity": "sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.0.17",
-        "xtend": "~2.1.1"
-      }
-    },
-    "node_modules/html-tokenize/node_modules/xtend": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-      "integrity": "sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==",
-      "dev": true,
-      "dependencies": {
-        "object-keys": "~0.4.0"
-      },
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
     "node_modules/html-void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-2.0.1.tgz",
@@ -13426,16 +11701,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/http-browserify": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
-      "integrity": "sha512-Irf/LJXmE3cBzU1eaR4+NEX6bmVLqt1wkmDiA7kBwH7zmb0D8kBAXsDmQ88hhj/qv9iEZKlyGx/hrMcFi8sOHw==",
-      "dev": true,
-      "dependencies": {
-        "Base64": "~0.2.0",
-        "inherits": "~2.0.1"
-      }
-    },
     "node_modules/http-cache-semantics": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
@@ -13505,12 +11770,6 @@
         "node": ">=10.19.0"
       }
     },
-    "node_modules/https-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-      "integrity": "sha512-EjDQFbgJr1vDD/175UJeSX3ncQ3+RUnCL5NkthQGHvF4VNHlzTy8ifJfTqz47qiPRqaFH58+CbuG3x51WuB1XQ==",
-      "dev": true
-    },
     "node_modules/https-proxy-agent": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
@@ -13564,15 +11823,6 @@
         "node": ">= 4"
       }
     },
-    "node_modules/ignorepatterns": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ignorepatterns/-/ignorepatterns-1.0.1.tgz",
-      "integrity": "sha512-9bm+Wivwyocr88go3y04hpX3qdFs6EgsxrjjpcI9C2GAqxcWYVMJaS9h9KL8ftJk1xP/8NzPxfHk6K1X7p0CRQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
     "node_modules/import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -13607,36 +11857,12 @@
         "node": ">=0.8.19"
       }
     },
-    "node_modules/indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==",
-      "dev": true,
-      "dependencies": {
-        "repeating": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==",
-      "dev": true
-    },
     "node_modules/individual": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
       "integrity": "sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g==",
       "dev": true
     },
-    "node_modules/infinity-agent": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz",
-      "integrity": "sha512-CnfUJe5o2S9aAQWXGMhDZI4UL39MAJV3guOTfHHIdos4tuVHkl1j/J+1XLQn+CLIvqcpgQR/p+xXYXzcrhCe5w==",
-      "dev": true
-    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -13658,27 +11884,6 @@
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true
     },
-    "node_modules/inline-source-map": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
-      "integrity": "sha512-RNlldBXZ7BBcVm3HjXIXiwKxih1lnuKbzeLBRDSB/qaqk8/g4JEZBjxpBQMhqEthQyGv7ycu8r/8PKGgBdIqrA==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "~0.3.0"
-      }
-    },
-    "node_modules/inline-source-map/node_modules/source-map": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
-      "integrity": "sha512-jz8leTIGS8+qJywWiO9mKza0hJxexdeIYXhDHw9avTQcXSNAGk3hiiRMpmI2Qf9dOrZDrDpgH9VNefzuacWC9A==",
-      "dev": true,
-      "dependencies": {
-        "amdefine": ">=0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/inquirer": {
       "version": "8.1.5",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.5.tgz",
@@ -13765,143 +11970,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/insert-module-globals": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz",
-      "integrity": "sha512-ryk8hTKUZCc300SPOOwx30WhE5oRUssPDVlIoO8vtoMNBy5HGeesVRl3HF7ra4ll42T0IdnwD9XR9svh6+RRhg==",
-      "dev": true,
-      "dependencies": {
-        "combine-source-map": "~0.6.1",
-        "concat-stream": "~1.4.1",
-        "is-buffer": "^1.1.0",
-        "JSONStream": "^1.0.3",
-        "lexical-scope": "^1.2.0",
-        "process": "~0.11.0",
-        "through2": "^1.0.0",
-        "xtend": "^4.0.0"
-      },
-      "bin": {
-        "insert-module-globals": "bin/cmd.js"
-      }
-    },
-    "node_modules/insert-module-globals/node_modules/combine-source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
-      "integrity": "sha512-XKRNtuZRlVDTuSGKsfZpXYz80y0XDbYS4a+FzafTgmYHy/ckruFBx7Nd6WaQnFHVI3O6IseWVdXUvZutMpjSkQ==",
-      "dev": true,
-      "dependencies": {
-        "convert-source-map": "~1.1.0",
-        "inline-source-map": "~0.5.0",
-        "lodash.memoize": "~3.0.3",
-        "source-map": "~0.4.2"
-      }
-    },
-    "node_modules/insert-module-globals/node_modules/concat-stream": {
-      "version": "1.4.11",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
-      "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "~1.1.9",
-        "typedarray": "~0.0.5"
-      }
-    },
-    "node_modules/insert-module-globals/node_modules/convert-source-map": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
-      "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==",
-      "dev": true
-    },
-    "node_modules/insert-module-globals/node_modules/inline-source-map": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz",
-      "integrity": "sha512-2WtHG0qX9OH9TVcxsLVfq3Tzr+qtL6PtWgoh0XAAKe4KkdA/57Q+OGJuRJHA4mZ2OZnkJ/ZAaXf9krLB12/nIg==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "~0.4.0"
-      }
-    },
-    "node_modules/insert-module-globals/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/insert-module-globals/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/insert-module-globals/node_modules/jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-      "dev": true,
-      "engines": [
-        "node >= 0.2.0"
-      ]
-    },
-    "node_modules/insert-module-globals/node_modules/JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "dependencies": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      },
-      "bin": {
-        "JSONStream": "bin.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/insert-module-globals/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/insert-module-globals/node_modules/source-map": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-      "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
-      "dev": true,
-      "dependencies": {
-        "amdefine": ">=0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/insert-module-globals/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/insert-module-globals/node_modules/through2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.1.13-1 <1.2.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
     "node_modules/internal-slot": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
@@ -14272,25 +12340,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-my-ip-valid": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.1.tgz",
-      "integrity": "sha512-jxc8cBcOWbNK2i2aTkCZP6i7wkHF1bqKFrwEHuN5Jtg5BSaZHUZQ/JTOJwoV41YvHnOaRyWWh72T/KvfNz9DJg==",
-      "dev": true
-    },
-    "node_modules/is-my-json-valid": {
-      "version": "2.20.6",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.6.tgz",
-      "integrity": "sha512-1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw==",
-      "dev": true,
-      "dependencies": {
-        "generate-function": "^2.0.0",
-        "generate-object-property": "^1.1.0",
-        "is-my-ip-valid": "^1.0.0",
-        "jsonpointer": "^5.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
     "node_modules/is-nan": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
@@ -14373,15 +12422,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
-      "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-plain-obj": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
@@ -14409,21 +12449,6 @@
       "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
       "dev": true
     },
-    "node_modules/is-property": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==",
-      "dev": true
-    },
-    "node_modules/is-redirect": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-      "integrity": "sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
@@ -14862,39 +12887,6 @@
         "url": "https://bevry.me/fund"
       }
     },
-    "node_modules/jade": {
-      "version": "0.26.3",
-      "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
-      "integrity": "sha512-mkk3vzUHFjzKjpCXeu+IjXeZD+QOTjUUdubgmHtHTDwvAO2ZTkMTTVrapts5CWz3JvJryh/4KWZpjeZrCepZ3A==",
-      "deprecated": "Jade has been renamed to pug, please install the latest version of pug instead of jade",
-      "dev": true,
-      "dependencies": {
-        "commander": "0.6.1",
-        "mkdirp": "0.3.0"
-      },
-      "bin": {
-        "jade": "bin/jade"
-      }
-    },
-    "node_modules/jade/node_modules/commander": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
-      "integrity": "sha512-0fLycpl1UMTGX257hRsu/arL/cUbcvQM4zMKwvLvzXtfdezIV4yotPS2dYtknF+NmEfWSoCEF6+hj9XLm/6hEw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.x"
-      }
-    },
-    "node_modules/jade/node_modules/mkdirp": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
-      "integrity": "sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==",
-      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/jake": {
       "version": "10.8.5",
       "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
@@ -15249,12 +13241,6 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/jju": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
-      "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==",
-      "dev": true
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -15286,77 +13272,12 @@
         "node": ">=4"
       }
     },
-    "node_modules/js2xmlparser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
-      "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
-      "dev": true,
-      "dependencies": {
-        "xmlcreate": "^2.0.4"
-      }
-    },
     "node_modules/jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
       "dev": true
     },
-    "node_modules/jsdoc": {
-      "version": "3.6.11",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.11.tgz",
-      "integrity": "sha512-8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.9.4",
-        "@types/markdown-it": "^12.2.3",
-        "bluebird": "^3.7.2",
-        "catharsis": "^0.9.0",
-        "escape-string-regexp": "^2.0.0",
-        "js2xmlparser": "^4.0.2",
-        "klaw": "^3.0.0",
-        "markdown-it": "^12.3.2",
-        "markdown-it-anchor": "^8.4.1",
-        "marked": "^4.0.10",
-        "mkdirp": "^1.0.4",
-        "requizzle": "^0.2.3",
-        "strip-json-comments": "^3.1.0",
-        "taffydb": "2.6.2",
-        "underscore": "~1.13.2"
-      },
-      "bin": {
-        "jsdoc": "jsdoc.js"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/jsdoc/node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "node_modules/jsdoc/node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jsdoc/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -15386,15 +13307,6 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "node_modules/json-parse-helpfulerror": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
-      "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==",
-      "dev": true,
-      "dependencies": {
-        "jju": "^1.1.0"
-      }
-    },
     "node_modules/json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
@@ -15407,15 +13319,6 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "node_modules/json-stable-stringify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
-      "integrity": "sha512-nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==",
-      "dev": true,
-      "dependencies": {
-        "jsonify": "~0.0.0"
-      }
-    },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -15451,65 +13354,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/jsonify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
-      "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/jsonlint": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz",
-      "integrity": "sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==",
-      "dev": true,
-      "dependencies": {
-        "JSV": "^4.0.x",
-        "nomnom": "^1.5.x"
-      },
-      "bin": {
-        "jsonlint": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/jsonparse": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
-      "integrity": "sha512-fw7Q/8gFR8iSekUi9I+HqWIap6mywuoe7hQIg3buTVjuZgALKj4HAmm0X6f+TaL4c9NJbvyFQdaI2ppr5p6dnQ==",
-      "dev": true,
-      "engines": [
-        "node >= 0.2.0"
-      ]
-    },
-    "node_modules/jsonpointer": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
-      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/JSONStream": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-      "integrity": "sha512-l0NN3IcqrZfZBJp7JWDJIHsnPV7yzJWqsYxQzL8Fwdx1BmEMjLuvtYkv+P9pbvpyfP75/f4MeDZhWNU4is32uA==",
-      "dev": true,
-      "dependencies": {
-        "jsonparse": "0.0.5",
-        "through": ">=2.2.7 <3"
-      },
-      "bin": {
-        "JSONStream": "index.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
@@ -15525,15 +13369,6 @@
         "node": ">=0.6.0"
       }
     },
-    "node_modules/JSV": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
-      "integrity": "sha512-ZJ6wx9xaKJ3yFUhq5/sk82PJMuUyLk277I8mQeyDgCTjGdjWJIvPfaU5LIXaMuaN2UO1X3kZH4+lgphublZUHw==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/just-clone": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-1.0.2.tgz",
@@ -15973,12 +13808,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/kew": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz",
-      "integrity": "sha512-TQRJfHoVm4f2exuRqjcpURhzGcC4GEIPyiLquo4mBfz0JgsVg19VeyTmKp6RKSOIhHQ6F4SgEhsnUlBduGV9Yw==",
-      "dev": true
-    },
     "node_modules/keycode": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
@@ -16003,15 +13832,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/klaw": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
-      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
     "node_modules/kleur": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
@@ -16043,23 +13863,6 @@
         "url": "https://github.com/sindresorhus/ky?sponsor=1"
       }
     },
-    "node_modules/labeled-stream-splicer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
-      "integrity": "sha512-3KBjPRnXrYC5h2jEf/d6hO7Lcl+38QzRVTOyHA2sFzZVMYwsUFuejlrOMwAjmz13hVBr9ruDS1RwE4YEz8P58w==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "isarray": "~0.0.1",
-        "stream-splicer": "^1.1.0"
-      }
-    },
-    "node_modules/labeled-stream-splicer/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
     "node_modules/last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -16131,15 +13934,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/lexical-scope": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
-      "integrity": "sha512-ntJ8IcBCuKwudML7vAuT/L0aIMU0+9vO25K4CjLPYgzf1NZ0bAhJJBZrvkO+oUGgKcbdkH8UZdRsaEg+wULLRw==",
-      "dev": true,
-      "dependencies": {
-        "astw": "^2.0.0"
-      }
-    },
     "node_modules/liftoff": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
@@ -16202,15 +13996,6 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
-    "node_modules/linkify-it": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
-      "dev": true,
-      "dependencies": {
-        "uc.micro": "^1.0.1"
-      }
-    },
     "node_modules/listenercount": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
@@ -16311,87 +14096,12 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "node_modules/lodash._arraycopy": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz",
-      "integrity": "sha512-RHShTDnPKP7aWxlvXKiDT6IX2jCs6YZLCtNhOru/OX2Q/tzX295vVBK5oX1ECtN+2r86S0Ogy8ykP1sgCZAN0A==",
-      "dev": true
-    },
-    "node_modules/lodash._arrayeach": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz",
-      "integrity": "sha512-Mn7HidOVcl3mkQtbPsuKR0Fj0N6Q6DQB77CtYncZcJc0bx5qv2q4Gl6a0LC1AN+GSxpnBDNnK3CKEm9XNA4zqQ==",
-      "dev": true
-    },
-    "node_modules/lodash._arraymap": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._arraymap/-/lodash._arraymap-3.0.0.tgz",
-      "integrity": "sha512-IhRssF2bzQoFQ2Q5H1O52HuJY+OtcHDZekEhaMJ6RkUF+gpLlAsizSRsKp3Ho555ANRk69DFp5b4LOlym4S0bw==",
-      "dev": true
-    },
-    "node_modules/lodash._baseassign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-      "integrity": "sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
-    "node_modules/lodash._baseclone": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz",
-      "integrity": "sha512-1K0dntf2dFQ5my0WoGKkduewR6+pTNaqX03kvs45y7G5bzl4B3kTR4hDfJIc2aCQDeLyQHhS280tc814m1QC1Q==",
-      "dev": true,
-      "dependencies": {
-        "lodash._arraycopy": "^3.0.0",
-        "lodash._arrayeach": "^3.0.0",
-        "lodash._baseassign": "^3.0.0",
-        "lodash._basefor": "^3.0.0",
-        "lodash.isarray": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
     "node_modules/lodash._basecopy": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
       "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
       "dev": true
     },
-    "node_modules/lodash._basedifference": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-3.0.3.tgz",
-      "integrity": "sha512-4BcJlOv36b3v+kHdJWcgsDi96ns8neNLuDtbzzjW3+eh3XhFVmFPH2tu6GJK2e5eRYMQ8izHU35iAyNjRyDtCQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._baseindexof": "^3.0.0",
-        "lodash._cacheindexof": "^3.0.0",
-        "lodash._createcache": "^3.0.0"
-      }
-    },
-    "node_modules/lodash._baseflatten": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz",
-      "integrity": "sha512-fESngZd+X4k+GbTxdMutf8ohQa0s3sJEHIcwtu4/LsIQ2JTDzdRxDCMQjW+ezzwRitLmHnacVVmosCbxifefbw==",
-      "dev": true,
-      "dependencies": {
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
-    "node_modules/lodash._basefor": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz",
-      "integrity": "sha512-6bc3b8grkpMgDcVJv9JYZAk/mHgcqMljzm7OsbmcE2FGUMmmLQTPHlh/dFqR8LA0GQ7z4K67JSotVKu5058v1A==",
-      "dev": true
-    },
-    "node_modules/lodash._baseindexof": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz",
-      "integrity": "sha512-bSYo8Pc/f0qAkr8fPJydpJjtrHiSynYfYBjtANIgXv5xEf1WlTC63dIDlgu0s9dmTvzRu1+JJTxcIAHe+sH0FQ==",
-      "dev": true
-    },
     "node_modules/lodash._basetostring": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
@@ -16404,38 +14114,6 @@
       "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
       "dev": true
     },
-    "node_modules/lodash._bindcallback": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-      "integrity": "sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==",
-      "dev": true
-    },
-    "node_modules/lodash._cacheindexof": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz",
-      "integrity": "sha512-S8dUjWr7SUT/X6TBIQ/OYoCHo1Stu1ZRy6uMUSKqzFnZp5G5RyQizSm6kvxD2Ewyy6AVfMg4AToeZzKfF99T5w==",
-      "dev": true
-    },
-    "node_modules/lodash._createassigner": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
-      "integrity": "sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw==",
-      "dev": true,
-      "dependencies": {
-        "lodash._bindcallback": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash.restparam": "^3.0.0"
-      }
-    },
-    "node_modules/lodash._createcache": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz",
-      "integrity": "sha512-ev5SP+iFpZOugyab/DEUQxUeZP5qyciVTlgQ1f4Vlw7VUcCD8fVnyIqVUEIaoFH9zjAqdgi69KiofzvVmda/ZQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._getnative": "^3.0.0"
-      }
-    },
     "node_modules/lodash._getnative": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
@@ -16448,22 +14126,6 @@
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
       "dev": true
     },
-    "node_modules/lodash._pickbyarray": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash._pickbyarray/-/lodash._pickbyarray-3.0.2.tgz",
-      "integrity": "sha512-tHzBIfgugzI7HV0y8MJS1z/ryWDh8NyD6AV+so9vlplRnhD4qBuwoyDt7g241ad3F43YDFghCN+R3iaFd4Azvw==",
-      "dev": true
-    },
-    "node_modules/lodash._pickbycallback": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._pickbycallback/-/lodash._pickbycallback-3.0.0.tgz",
-      "integrity": "sha512-DVP27YmN0lB+j/Tgd/+gtxfmW/XihgWpQpHptBuwyp2fD9zEBRwwcnw6Qej16LUV8LRFuTqyoc0i6ON97d/C5w==",
-      "dev": true,
-      "dependencies": {
-        "lodash._basefor": "^3.0.0",
-        "lodash.keysin": "^3.0.0"
-      }
-    },
     "node_modules/lodash._reescape": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
@@ -16559,12 +14221,6 @@
       "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
       "dev": true
     },
-    "node_modules/lodash.istypedarray": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz",
-      "integrity": "sha512-lGWJ6N8AA3KSv+ZZxlTdn4f6A7kMfpJboeyvbFdE7IU9YAgweODqmOgdUHOA+c6lVWeVLysdaxciFXi+foVsWw==",
-      "dev": true
-    },
     "node_modules/lodash.keys": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
@@ -16576,44 +14232,12 @@
         "lodash.isarray": "^3.0.0"
       }
     },
-    "node_modules/lodash.keysin": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-3.0.8.tgz",
-      "integrity": "sha512-YDB/5xkL3fBKFMDaC+cfGV00pbiJ6XoJIfRmBhv7aR6wWtbCW6IzkiWnTfkiHTF6ALD7ff83dAtB3OEaSoyQPg==",
-      "dev": true,
-      "dependencies": {
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.memoize": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
-      "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==",
-      "dev": true
-    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/lodash.omit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-3.1.0.tgz",
-      "integrity": "sha512-vC3fSzZDmPlwk+kCGYMQyUpPeRBgmOK/WrhmjlWVUjEch35gQR3iRbCV9rL7KgMHVeVhnq7A+TRrPvzvg67y9w==",
-      "dev": true,
-      "dependencies": {
-        "lodash._arraymap": "^3.0.0",
-        "lodash._basedifference": "^3.0.0",
-        "lodash._baseflatten": "^3.0.0",
-        "lodash._bindcallback": "^3.0.0",
-        "lodash._pickbyarray": "^3.0.0",
-        "lodash._pickbycallback": "^3.0.0",
-        "lodash.keysin": "^3.0.0",
-        "lodash.restparam": "^3.0.0"
-      }
-    },
     "node_modules/lodash.pickby": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
@@ -16651,16 +14275,6 @@
         "lodash._reinterpolate": "^3.0.0"
       }
     },
-    "node_modules/lodash.toplainobject": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz",
-      "integrity": "sha512-wMI0Ju1bvSmnBS3EcRRH/3zDnZOPpDtMtNDzbbNMKuTrEpALsf+sPyMeogmv63Y11qZQO7H1xFzohIEGRMjPYA==",
-      "dev": true,
-      "dependencies": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash.keysin": "^3.0.0"
-      }
-    },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -16763,19 +14377,6 @@
         "loose-envify": "cli.js"
       }
     },
-    "node_modules/loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==",
-      "dev": true,
-      "dependencies": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/loupe": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
@@ -16908,38 +14509,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/markdown-it": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1",
-        "entities": "~2.1.0",
-        "linkify-it": "^3.0.1",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
-      },
-      "bin": {
-        "markdown-it": "bin/markdown-it.js"
-      }
-    },
-    "node_modules/markdown-it-anchor": {
-      "version": "8.6.5",
-      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.5.tgz",
-      "integrity": "sha512-PI1qEHHkTNWT+X6Ip9w+paonfIQ+QZP9sCeMYi47oqhH+EsW8CrJ8J7CzV19QVOj6il8ATGbK2nTECj22ZHGvQ==",
-      "dev": true,
-      "peerDependencies": {
-        "@types/markdown-it": "*",
-        "markdown-it": "*"
-      }
-    },
-    "node_modules/markdown-it/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
     "node_modules/markdown-table": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.2.tgz",
@@ -16950,58 +14519,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/markdownlint": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.0.6.tgz",
-      "integrity": "sha512-2jxomIcTY+HWnrMWv7Q/T93d7yp4RXNGkoQXWq5II1TgyQj5pFDoB7HZSCX57ATk9zZTb1++jwXR3uHn6AKmew==",
-      "dev": true,
-      "dependencies": {
-        "markdown-it": "^4.2.2"
-      }
-    },
-    "node_modules/markdownlint/node_modules/entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
-    "node_modules/markdownlint/node_modules/linkify-it": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
-      "integrity": "sha512-eGHwtlABkp1NOJSiKUNqBf3SYAS5jPHtvRXPAgNaQwTqmkTahjtiLH9NtxdR5IOPhNvwNMN/diswSfZKzUkhGg==",
-      "dev": true,
-      "dependencies": {
-        "uc.micro": "^1.0.1"
-      }
-    },
-    "node_modules/markdownlint/node_modules/markdown-it": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz",
-      "integrity": "sha512-Rl8dHHeLuAh3E72OPY0tY7CLvlxgHiLhlshIYswAAabAg4YDBLa6e/LTgNkkxBO2K61ESzoquPQFMw/iMrT1PA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "~1.0.2",
-        "entities": "~1.1.1",
-        "linkify-it": "~1.2.0",
-        "mdurl": "~1.0.0",
-        "uc.micro": "^1.0.0"
-      },
-      "bin": {
-        "markdown-it": "bin/markdown-it.js"
-      }
-    },
-    "node_modules/marked": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.1.1.tgz",
-      "integrity": "sha512-0cNMnTcUJPxbA6uWmCmjWz4NJRe/0Xfk2NhXCUHjew9qJzFN20krFnsUe7QynwqOwa5m1fZ4UDg0ycKFVC0ccw==",
-      "dev": true,
-      "bin": {
-        "marked": "bin/marked.js"
-      },
-      "engines": {
-        "node": ">= 12"
-      }
-    },
     "node_modules/marky": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.4.tgz",
@@ -17050,17 +14567,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
     "node_modules/mdast-util-definitions": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz",
@@ -17403,79 +14909,6 @@
         "node": ">=4.3.0 <5.0.0 || >=5.10"
       }
     },
-    "node_modules/meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
-      "dev": true,
-      "dependencies": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/meow/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/meow/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
-      "dev": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/meow/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/meow/node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -18175,25 +15608,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
     "node_modules/mime": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
@@ -18252,18 +15666,6 @@
         "dom-walk": "^0.1.0"
       }
     },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
-      "dev": true
-    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -18353,111 +15755,6 @@
         "url": "https://opencollective.com/mochajs"
       }
     },
-    "node_modules/mocha-phantomjs": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.6.0.tgz",
-      "integrity": "sha512-siI6m2uw3Xyjruz9eEP8JTVHOtnOxdmnEqXM0IrOt3Nbw4oPJw6u8Q6MG6hqnbH9fJ3i60F3bYlmSEbgwuNsQw==",
-      "dev": true,
-      "dependencies": {
-        "commander": "~2.0.0",
-        "mocha": "~1.20.1"
-      },
-      "bin": {
-        "mocha-phantomjs": "bin/mocha-phantomjs"
-      },
-      "peerDependencies": {
-        "phantomjs": "1.9.1 - 1.9.7-15"
-      }
-    },
-    "node_modules/mocha-phantomjs/node_modules/diff": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz",
-      "integrity": "sha512-0bTLzyr1S59cPsgAD/lR+ivvHTbgPb+k/mUR6WGqma1J6QDU+kUegI8uQFuH/cMUNK7JGN3Tk1Y5Jf2MO85WrA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/mocha-phantomjs/node_modules/glob": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz",
-      "integrity": "sha512-WPaLsMHD1lYEqAmIQI6VOJSPwuBdGShDWnj1yUo0vQqEO809R8W3LM9OVU13CnnDhyv/EiNwOtxEW74SmrzS6w==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "~2.0.0",
-        "inherits": "2",
-        "minimatch": "~0.2.11"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/mocha-phantomjs/node_modules/graceful-fs": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
-      "integrity": "sha512-hcj/NTUWv+C3MbqrVb9F+aH6lvTwEHJdx2foBxlrVq5h6zE8Bfu4pv4CAAqbDcZrw/9Ak5lsRXlY9Ao8/F0Tuw==",
-      "deprecated": "please upgrade to graceful-fs 4 for compatibility with current and future versions of Node.js",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/mocha-phantomjs/node_modules/growl": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz",
-      "integrity": "sha512-VWv7s1EI41AG2LiCr7uAuxWikLDN1SQOuEUc37d/P34NAIIYgkvWYngNw0d9d9iCrDFL0SYCE9UQpxhIjjtuLg==",
-      "dev": true
-    },
-    "node_modules/mocha-phantomjs/node_modules/lru-cache": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-      "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==",
-      "dev": true
-    },
-    "node_modules/mocha-phantomjs/node_modules/minimatch": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-      "integrity": "sha512-zZ+Jy8lVWlvqqeM8iZB7w7KmQkoJn8djM585z88rywrEbzoqawVa9FR5p2hwD+y74nfuKOjmNvi9gtWJNLqHvA==",
-      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "2",
-        "sigmund": "~1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/mocha-phantomjs/node_modules/mkdirp": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-      "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
-      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "dev": true
-    },
-    "node_modules/mocha-phantomjs/node_modules/mocha": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz",
-      "integrity": "sha512-25Nq3BuIYCy80uEix+hBlZcr/gnLzpcYqfsaPAxZm2qbMFmed8I3nP8N05KagK4BTkGYUvsRJ47istvRqFO8fw==",
-      "deprecated": "Mocha v1.x is no longer supported.",
-      "dev": true,
-      "dependencies": {
-        "commander": "2.0.0",
-        "debug": "*",
-        "diff": "1.0.7",
-        "glob": "3.2.3",
-        "growl": "1.7.x",
-        "jade": "0.26.3",
-        "mkdirp": "0.3.5"
-      },
-      "bin": {
-        "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
-      },
-      "engines": {
-        "node": ">= 0.4.x"
-      }
-    },
     "node_modules/mocha/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -18742,131 +16039,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/module-deps": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
-      "integrity": "sha512-EbWWlSGaCVidEsLsSzkY6l/jm0IcGDSQ8tGwtjM8joTrxqxP0om02Px9Np8D7FMZ/vZFdsOGbio+WqkKQxYuTA==",
-      "dev": true,
-      "dependencies": {
-        "browser-resolve": "^1.7.0",
-        "concat-stream": "~1.4.5",
-        "defined": "^1.0.0",
-        "detective": "^4.0.0",
-        "duplexer2": "0.0.2",
-        "inherits": "^2.0.1",
-        "JSONStream": "^1.0.3",
-        "parents": "^1.0.0",
-        "readable-stream": "^1.1.13",
-        "resolve": "^1.1.3",
-        "stream-combiner2": "~1.0.0",
-        "subarg": "^1.0.0",
-        "through2": "^1.0.0",
-        "xtend": "^4.0.0"
-      },
-      "bin": {
-        "module-deps": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/module-deps/node_modules/concat-stream": {
-      "version": "1.4.11",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
-      "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "~1.1.9",
-        "typedarray": "~0.0.5"
-      }
-    },
-    "node_modules/module-deps/node_modules/defined": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
-      "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/module-deps/node_modules/duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "node_modules/module-deps/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/module-deps/node_modules/jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-      "dev": true,
-      "engines": [
-        "node >= 0.2.0"
-      ]
-    },
-    "node_modules/module-deps/node_modules/JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "dependencies": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      },
-      "bin": {
-        "JSONStream": "bin.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/module-deps/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/module-deps/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/module-deps/node_modules/through2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.1.13-1 <1.2.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/module-not-found-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
-      "integrity": "sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==",
-      "dev": true
-    },
     "node_modules/morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
@@ -19070,14 +16242,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/natives": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz",
-      "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==",
-      "deprecated": "This module relies on Node.js's internals and will break at some point. Do not use it, and update to graceful-fs@4.x.",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -19107,15 +16271,6 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "node_modules/nested-error-stacks": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz",
-      "integrity": "sha512-o32anp9JA7oezPOFSfG2BBXSdHepOm5FpJvwxHWDtfJ3Bg3xdi68S6ijPlEOfUg6quxZWyvJM+8fHk1yMDKspA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.1"
-      }
-    },
     "node_modules/next-tick": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
@@ -19200,68 +16355,6 @@
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
       "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
     },
-    "node_modules/node-uuid": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-      "integrity": "sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA==",
-      "deprecated": "Use uuid module instead",
-      "dev": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
-    "node_modules/nomnom": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
-      "integrity": "sha512-5s0JxqhDx9/rksG2BTMVN1enjWSvPidpoSgViZU4ZXULyTe+7jxcCRLB6f42Z0l1xYJpleCBtSyY6Lwg3uu5CQ==",
-      "deprecated": "Package no longer supported. Contact support@npmjs.com for more info.",
-      "dev": true,
-      "dependencies": {
-        "chalk": "~0.4.0",
-        "underscore": "~1.6.0"
-      }
-    },
-    "node_modules/nomnom/node_modules/ansi-styles": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
-      "integrity": "sha512-3iF4FIKdxaVYT3JqQuY3Wat/T2t7TRbbQ94Fu50ZUCbLy4TFbTzr90NOHQodQkNqmeEGCw8WbeP78WNi6SKYUA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/nomnom/node_modules/chalk": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
-      "integrity": "sha512-sQfYDlfv2DGVtjdoQqxS0cEZDroyG8h6TamA6rvxwlrU5BaSLDx9xhatBYl2pxZ7gmpNaPFVwBtdGdu5rQ+tYQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "~1.0.0",
-        "has-color": "~0.1.0",
-        "strip-ansi": "~0.1.0"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/nomnom/node_modules/strip-ansi": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
-      "integrity": "sha512-behete+3uqxecWlDAm5lmskaSaISA+ThQ4oNNBDTBJt0x2ppR6IPqfZNuj6BLaLJ/Sji4TPZlcRyOis8wXQTLg==",
-      "dev": true,
-      "bin": {
-        "strip-ansi": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/nomnom/node_modules/underscore": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-      "integrity": "sha512-z4o1fvKUojIWh9XuaVLUDdf86RQiq13AC1dmHbTpoyuu+bquHms76v16CjycCbec87J7z0k//SiQVk0sMdFmpQ==",
-      "dev": true
-    },
     "node_modules/nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -19274,12 +16367,6 @@
         "nopt": "bin/nopt.js"
       }
     },
-    "node_modules/nopt-usage": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/nopt-usage/-/nopt-usage-0.1.0.tgz",
-      "integrity": "sha512-Tg2sISrWBbSsCRqpEMmdxn3KZfacrd0N2NYpZQIq0MHxGHMjwzYlxeB9pVIom/g7CBK28atDUQsTlOfG0wOsNA==",
-      "dev": true
-    },
     "node_modules/normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -19334,43 +16421,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/npm-license": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/npm-license/-/npm-license-0.2.3.tgz",
-      "integrity": "sha512-Sm6zqTVReBGe1C5A3Vr7pqYFmawM3oF/MKhhk0LRAOZPEOygr96KkiJ5P0ZQMDP3F7HRW6zyy7gxIIos+6foww==",
-      "dev": true,
-      "dependencies": {
-        "mkdirp": "~0.5.0",
-        "nopt": "~3.0.1",
-        "nopt-usage": "^0.1.0",
-        "package-license": "~0.1.1",
-        "pkginfo": "^0.3.0",
-        "read-installed": "~3.1.3",
-        "treeify": "~1.0.1",
-        "underscore": "~1.4.4"
-      },
-      "bin": {
-        "npm-license": "bin/npm-license"
-      }
-    },
-    "node_modules/npm-license/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/npm-license/node_modules/underscore": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
-      "integrity": "sha512-ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ==",
-      "dev": true
-    },
     "node_modules/npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -19392,73 +16442,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/npmconf": {
-      "version": "0.0.24",
-      "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz",
-      "integrity": "sha512-LX0bX+RmuBuEITg26i7+dx+d9cfYU+giB7eOiSkT5IwvuAzzIx02u4GXwSC3jsQMDMb/kXC57R8tybRSVYfbWw==",
-      "deprecated": "this package has been reintegrated into npm and is now out of date with respect to npm",
-      "dev": true,
-      "dependencies": {
-        "config-chain": "~1.1.1",
-        "inherits": "~1.0.0",
-        "ini": "~1.1.0",
-        "mkdirp": "~0.3.3",
-        "nopt": "2",
-        "once": "~1.1.1",
-        "osenv": "0.0.3",
-        "semver": "~1.1.0"
-      }
-    },
-    "node_modules/npmconf/node_modules/inherits": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
-      "integrity": "sha512-Al67oatbRSo3RV5hRqIoln6Y5yMVbJSIn4jEJNL7VCImzq/kLr7vvb6sFRJXqr8rpHc/2kJOM+y0sPKN47VdzA==",
-      "dev": true
-    },
-    "node_modules/npmconf/node_modules/ini": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz",
-      "integrity": "sha512-B6L/jfyFRcG2dqKiHggWnfby52Iy07iabE4F6srQAr/OmVKBRE5uU+B5MQ+nQ7NiYnjz93gENh1GhqHzpDgHgA==",
-      "deprecated": "Please update to ini >=1.3.6 to avoid a prototype pollution issue",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/npmconf/node_modules/mkdirp": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-      "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
-      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "dev": true
-    },
-    "node_modules/npmconf/node_modules/nopt": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
-      "integrity": "sha512-gIOTA/uJuhPwFqp+spY7VQ1satbnGlD+iQVZxI18K6hs8Evq4sX81Ml7BB5byP/LsbR2yBVtmvdEmhi7evJ6Aw==",
-      "dev": true,
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      }
-    },
-    "node_modules/npmconf/node_modules/once": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz",
-      "integrity": "sha512-frdJr++QKEg4+JylTX+NNLgSoO6M2pDNYOOXe4WGIYKKBADBI9nU3oa06y4D4FpAJ3obAsjExeBOnscYJB9Blw==",
-      "dev": true
-    },
-    "node_modules/npmconf/node_modules/semver": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz",
-      "integrity": "sha512-9causpLEkYDrfTz7cprleLz9dnlb0oKsKRHl33K92wJmXLhVc2dGlrQGJT/sjtLOAyuoQZl+ClI77+lnvzPSKg==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
     "node_modules/number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -19753,15 +16736,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/open": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/open/-/open-0.0.3.tgz",
-      "integrity": "sha512-Vm6nsJHcKV8kdOtHESAFAymOOf1VlKrttpwTqtLxvxRDIh8PSw4lWq5qk88QkAvNwnkv/1dNi2lvedhmam/ggw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
     "node_modules/opener": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
@@ -19792,24 +16766,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/optimist": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
-      "integrity": "sha512-TCx0dXQzVtSCg2OgY/bO9hjM9cV4XYx09TVK+s3+FhkjT6LovsLe+pPMzpWf+6yXK/hUizs2gUoTw3jHM0VaTQ==",
-      "dev": true,
-      "dependencies": {
-        "wordwrap": "~0.0.2"
-      }
-    },
-    "node_modules/optimist/node_modules/wordwrap": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -19936,12 +16892,6 @@
         "readable-stream": "^2.0.1"
       }
     },
-    "node_modules/os-browserify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
-      "integrity": "sha512-aZicJZccvxWOZ0Bja2eAch2L8RIJWBuRYmM8Gwl/JjNtRltH0Itcz4eH/ESyuIWfse8cc93ZCf0XrzhXK2HEDA==",
-      "dev": true
-    },
     "node_modules/os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
@@ -19972,12 +16922,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/osenv": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz",
-      "integrity": "sha512-VBk1bfdaO4gh3OWO8LBuDY2alp0buL8YzQ6t13xyc8PQPrnUg5AgQvINQx3UkS4dom8UGCL597q4Y2+M4TPvmw==",
-      "dev": true
-    },
     "node_modules/p-cancelable": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
@@ -20038,18 +16982,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/package-license": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/package-license/-/package-license-0.1.2.tgz",
-      "integrity": "sha512-Q5zmx+M9ZJneMpYS6MlYL77gqeMYWuyErXMnQ/83WCztmYQD7Z0U9XGLvX9OKFFXwRj2NzdzlM0y9Jzcww2O1Q==",
-      "dev": true
-    },
-    "node_modules/pako": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-      "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
-      "dev": true
-    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -20062,28 +16994,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/parents": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-      "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==",
-      "dev": true,
-      "dependencies": {
-        "path-platform": "~0.11.15"
-      }
-    },
-    "node_modules/parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "dependencies": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "node_modules/parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -20181,12 +17091,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
     "node_modules/path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
@@ -20211,12 +17115,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
-      "dev": true
-    },
     "node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -20231,15 +17129,6 @@
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
-    "node_modules/path-platform": {
-      "version": "0.11.15",
-      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
-      "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/path-root": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
@@ -20307,22 +17196,6 @@
         "through": "~2.3"
       }
     },
-    "node_modules/pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": true,
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -20335,239 +17208,6 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
-    "node_modules/phantomjs": {
-      "version": "1.9.7-15",
-      "resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-15.tgz",
-      "integrity": "sha512-s4PSN1L0iVwgv9ZkrSKcfojyPAtwGWhXxjn2p1P/ljuw3cx+FW3hKP00x247mIYbKeKSMylOd4euDQOMpUIAsg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "adm-zip": "0.2.1",
-        "kew": "~0.1.7",
-        "mkdirp": "0.3.5",
-        "ncp": "0.4.2",
-        "npmconf": "0.0.24",
-        "progress": "^1.1.5",
-        "request": "2.36.0",
-        "request-progress": "^0.3.1",
-        "rimraf": "~2.2.2",
-        "which": "~1.0.5"
-      },
-      "bin": {
-        "phantomjs": "bin/phantomjs"
-      }
-    },
-    "node_modules/phantomjs/node_modules/asn1": {
-      "version": "0.1.11",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-      "integrity": "sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.4.9"
-      }
-    },
-    "node_modules/phantomjs/node_modules/assert-plus": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-      "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/phantomjs/node_modules/async": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/phantomjs/node_modules/aws-sign2": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-      "integrity": "sha512-oqUX0DM5j7aPWPCnpWebiyNIj2wiNI87ZxnOMoGv0aE4TGlBy2N+5iWc6dQ/NOKZaBD2W6PVz8jtOGkWzSC5EA==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/phantomjs/node_modules/combined-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-      "integrity": "sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "delayed-stream": "0.0.5"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/phantomjs/node_modules/delayed-stream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-      "integrity": "sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/phantomjs/node_modules/forever-agent": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
-      "integrity": "sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/phantomjs/node_modules/form-data": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-      "integrity": "sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "async": "~0.9.0",
-        "combined-stream": "~0.0.4",
-        "mime": "~1.2.11"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/phantomjs/node_modules/hawk": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
-      "integrity": "sha512-Sg+VzrI7TjUomO0rjD6UXawsj50ykn5sB/xKNW/IenxzRVyw/wt9A2FLzYpGL/r0QG5hyXY8nLx/2m8UutoDcg==",
-      "deprecated": "This module moved to @hapi/hawk. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "boom": "0.4.x",
-        "cryptiles": "0.2.x",
-        "hoek": "0.9.x",
-        "sntp": "0.2.x"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/phantomjs/node_modules/http-signature": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-      "integrity": "sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "asn1": "0.1.11",
-        "assert-plus": "^0.1.5",
-        "ctype": "0.5.3"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/phantomjs/node_modules/mime": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-      "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
-      "dev": true
-    },
-    "node_modules/phantomjs/node_modules/mkdirp": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-      "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
-      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "dev": true
-    },
-    "node_modules/phantomjs/node_modules/oauth-sign": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
-      "integrity": "sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/phantomjs/node_modules/progress": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-      "integrity": "sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/phantomjs/node_modules/qs": {
-      "version": "0.6.6",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz",
-      "integrity": "sha512-kN+yNdAf29Jgp+AYHUmC7X4QdJPR8czuMWLNLc0aRxkQ7tB3vJQEONKKT9ou/rW7EbqVec11srC9q9BiVbcnHA==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/phantomjs/node_modules/request": {
-      "version": "2.36.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
-      "integrity": "sha512-iVii/ruMH9i8k++HYYPqi+nb1Pbgz7UOTGbFEiyhl7uDN8PhyFV2lGJa8XLIUS5tyt5scERcLkwqvCNF84Vv2Q==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dev": true,
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "dependencies": {
-        "forever-agent": "~0.5.0",
-        "json-stringify-safe": "~5.0.0",
-        "mime": "~1.2.9",
-        "node-uuid": "~1.4.0",
-        "qs": "~0.6.0"
-      },
-      "optionalDependencies": {
-        "aws-sign2": "~0.5.0",
-        "form-data": "~0.1.0",
-        "hawk": "~1.0.0",
-        "http-signature": "~0.10.0",
-        "oauth-sign": "~0.3.0",
-        "tough-cookie": ">=0.12.0",
-        "tunnel-agent": "~0.4.0"
-      }
-    },
-    "node_modules/phantomjs/node_modules/rimraf": {
-      "version": "2.2.8",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-      "integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
-      "dev": true,
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/phantomjs/node_modules/tunnel-agent": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-      "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/phantomjs/node_modules/which": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz",
-      "integrity": "sha512-E87fdQ/eRJr9W1X4wTPejNy9zTW3FI2vpCZSJ/HAY+TkjKVC0TUm1jk6vn2Z7qay0DQy0+RBGdXxj+RmmiGZKQ==",
-      "dev": true,
-      "bin": {
-        "which": "bin/which"
-      }
-    },
     "node_modules/picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -20712,15 +17352,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/pkginfo": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
-      "integrity": "sha512-yO5feByMzAp96LtP58wvPKSbaKAi/1C4kV9XpTctr6EepnP6F33RBNOiVrdz9BrPA98U2BMFsTNHo44TWcbQ2A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/plugin-error": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
@@ -20748,28 +17379,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/portfinder": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-0.2.1.tgz",
-      "integrity": "sha512-U7dHe7mfMMP5cIwbqBHh/likunxAEiBsQLiThUWjyeRK6/C3um2uk+VGiekUW8q3h+s793gdNfagCM3aaXMeOg==",
-      "dev": true,
-      "dependencies": {
-        "mkdirp": "0.0.x"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/portfinder/node_modules/mkdirp": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz",
-      "integrity": "sha512-r4Ml2CH2Kl4B0+Lwq1SVru0vjMxdtR+UEb938WTQcsnU+EJz8dUV/HY0LTZh466nUSljia9cvqW3LZLWs3l8LQ==",
-      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -20813,15 +17422,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/pretty-format": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
@@ -20927,12 +17527,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/proto-list": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
-      "dev": true
-    },
     "node_modules/protocols": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz",
@@ -20957,23 +17551,6 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "dev": true
     },
-    "node_modules/proxyquire": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz",
-      "integrity": "sha512-mZZq4F50qaBkngvlf9paNfaSb5gtJ0mFPnBjda4NxCpXpMAaVfSLguRr9y2KXF6koOSBf4AanD2inuEQw3aCcA==",
-      "dev": true,
-      "dependencies": {
-        "fill-keys": "^1.0.2",
-        "module-not-found-error": "^1.0.0",
-        "resolve": "~1.1.7"
-      }
-    },
-    "node_modules/proxyquire/node_modules/resolve": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-      "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
-      "dev": true
-    },
     "node_modules/prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -21007,26 +17584,6 @@
       "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
-    "node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
     "node_modules/pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -21200,15 +17757,6 @@
         "node": ">=0.4.x"
       }
     },
-    "node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -21236,16 +17784,6 @@
         "safe-buffer": "^5.1.0"
       }
     },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
     "node_modules/range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -21274,121 +17812,6 @@
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
-    "node_modules/read-all-stream": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
-      "integrity": "sha512-DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w==",
-      "dev": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0",
-        "readable-stream": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-installed": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-3.1.5.tgz",
-      "integrity": "sha512-XxD5VDz32T6rLCFfYElTif8/lkqcs9y51Gs2r30rAfT7LUGzJWaXLrwvn6fXkDsTzGcPr7Pj8CggOxwTxl/ozQ==",
-      "dev": true,
-      "dependencies": {
-        "debuglog": "^1.0.1",
-        "read-package-json": "1",
-        "readdir-scoped-modules": "^1.0.0",
-        "semver": "2 || 3 || 4",
-        "slide": "~1.1.3",
-        "util-extend": "^1.0.1"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "2 || 3"
-      }
-    },
-    "node_modules/read-installed/node_modules/graceful-fs": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
-      "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "natives": "^1.1.3"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/read-installed/node_modules/semver": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-      "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/read-package-json": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-1.3.3.tgz",
-      "integrity": "sha512-9bayCl9cbXy3AL0qXhLQ0vliEgpzUVeLegSOrde3ujTHy2W18UsJiMUXEWkjbBB4ZnJzZPVuo2vAW62j4gY7gg==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^5.0.3",
-        "json-parse-helpfulerror": "^1.0.2",
-        "normalize-package-data": "^1.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "2 || 3"
-      }
-    },
-    "node_modules/read-package-json/node_modules/glob": {
-      "version": "5.0.15",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-      "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
-      "dev": true,
-      "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/read-package-json/node_modules/graceful-fs": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
-      "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "natives": "^1.1.3"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/read-package-json/node_modules/normalize-package-data": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz",
-      "integrity": "sha512-pyPVJAzFiaioifPIsJBEoKJ9YcPHz7UhckZ7wqhBztLLCu6NozkIDrN+frzrCwjXtfunXfaMWIDtcDhnbO8fWA==",
-      "dev": true,
-      "dependencies": {
-        "github-url-from-git": "^1.3.0",
-        "github-url-from-username-repo": "^1.0.0",
-        "semver": "2 || 3 || 4"
-      }
-    },
-    "node_modules/read-package-json/node_modules/semver": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-      "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
     "node_modules/read-pkg": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
@@ -21593,39 +18016,6 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
       "dev": true
     },
-    "node_modules/readable-wrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz",
-      "integrity": "sha512-/8n0Mr10S+HGKFygQ42Z40JIXwafPH3A72pwmlNClThgsImV5LJJiCue5Je1asxwY082sYxq/+kTxH6nTn0w3g==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "^1.1.13-1"
-      }
-    },
-    "node_modules/readable-wrap/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/readable-wrap/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/readable-wrap/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
     "node_modules/readdir-glob": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.1.tgz",
@@ -21635,18 +18025,6 @@
         "minimatch": "^3.0.4"
       }
     },
-    "node_modules/readdir-scoped-modules": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
-      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
-      "dev": true,
-      "dependencies": {
-        "debuglog": "^1.0.1",
-        "dezalgo": "^1.0.0",
-        "graceful-fs": "^4.1.2",
-        "once": "^1.3.0"
-      }
-    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -21659,46 +18037,6 @@
         "node": ">=8.10.0"
       }
     },
-    "node_modules/readline2": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz",
-      "integrity": "sha512-qs8GGG+hLGMaDOGjd+mDglDoYcHDkjIY7z5RU0/ApsGT0qypyrWskNeemUqD+UxIXiZoMYT5aLwGp4ehoyZhIg==",
-      "dev": true,
-      "dependencies": {
-        "mute-stream": "0.0.4",
-        "strip-ansi": "^2.0.1"
-      }
-    },
-    "node_modules/readline2/node_modules/ansi-regex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
-      "integrity": "sha512-q5i8bFLg2wDfsuR56c1NzlJFPzVD+9mxhDrhqOGigEFa87OZHlF+9dWeGWzVTP/0ECiA/JUGzfzRr2t3eYORRw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/readline2/node_modules/mute-stream": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
-      "integrity": "sha512-amvrY4m/7oZamehMoFi1tbwU/kXbVvRTGM2S7F+PZi3n51Jx+9AcSQ3EQsag3tR+hS2higfgOP/Kl8kri/X52A==",
-      "dev": true
-    },
-    "node_modules/readline2/node_modules/strip-ansi": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
-      "integrity": "sha512-2h8q2CP3EeOhDJ+jd932PRMpa3/pOJFGoF22J1U/DNbEK2gSW2DqeF46VjCXsSQXhC+k/l8/gaaRBQKL6hUPfQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^1.0.0"
-      },
-      "bin": {
-        "strip-ansi": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/rechoir": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -21735,19 +18073,6 @@
         "node": "*"
       }
     },
-    "node_modules/redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==",
-      "dev": true,
-      "dependencies": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -22113,15 +18438,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/request-progress": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
-      "integrity": "sha512-+IAgzH8yWAEgHjOOQzYEqRm0BpNlE6xFgsziGMiTxxMhrkBcCOe9bNWH7bDR+XtHToUMgCZlDgLqjk6cAP/+Ig==",
-      "dev": true,
-      "dependencies": {
-        "throttleit": "~0.0.2"
-      }
-    },
     "node_modules/request/node_modules/qs": {
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
@@ -22155,15 +18471,6 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
-    "node_modules/requizzle": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz",
-      "integrity": "sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.14"
-      }
-    },
     "node_modules/resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -22227,12 +18534,6 @@
       "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
-    "node_modules/response-stream": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/response-stream/-/response-stream-0.0.0.tgz",
-      "integrity": "sha512-tWH3QWqkXv7AgYRXidIhPKO1SqPix2E0gM3x/vxf60LHQHWNS8AVrB3RnYexPAoo5dOc0bGzDlUgtsBvV3CWLA==",
-      "dev": true
-    },
     "node_modules/responselike": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
@@ -22279,34 +18580,12 @@
         "node": ">=0.12"
       }
     },
-    "node_modules/rewire": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/rewire/-/rewire-2.5.2.tgz",
-      "integrity": "sha512-9wOlgRHTOzUv5dQO2XD2qWob+7yi/QXh7SSwLJW5wMAkAdkYuaCtcPuLAXUTllK0MjSvtpxUqAWMuSrrdt9VNw==",
-      "dev": true
-    },
     "node_modules/rfdc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
       "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
       "dev": true
     },
-    "node_modules/rfile": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz",
-      "integrity": "sha512-aNeTpY8g6DYmqPvakau22B0SipQTskO8FtYXzn8qg4X4bN9ExIH8VAhq/L9w7N8HvESYeSSwk3e4GmW+rLLAxQ==",
-      "dev": true,
-      "dependencies": {
-        "callsite": "~1.0.0",
-        "resolve": "~0.3.0"
-      }
-    },
-    "node_modules/rfile/node_modules/resolve": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz",
-      "integrity": "sha512-mxx/I/wLjxtryDBtrrb0ZNzaYERVWaHpJ0W0Arm8N4l8b+jiX/U5yKcsj0zQpF9UuKN1uz80EUTOudON6OPuaQ==",
-      "dev": true
-    },
     "node_modules/rgb2hex": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.2.5.tgz",
@@ -22328,54 +18607,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/ruglify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz",
-      "integrity": "sha512-XfRj1YJdm/gnZNvmpQ5L+2YGRHglDGMPgJRbitgCxC3GzKVQF/t+ij1aNcNg2AnEXGtLHJDwoSWrAq3TUm0EVg==",
-      "dev": true,
-      "dependencies": {
-        "rfile": "~1.0",
-        "uglify-js": "~2.2"
-      }
-    },
-    "node_modules/ruglify/node_modules/source-map": {
-      "version": "0.1.43",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-      "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
-      "dev": true,
-      "dependencies": {
-        "amdefine": ">=0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/ruglify/node_modules/uglify-js": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz",
-      "integrity": "sha512-viLk+/8G0zm2aKt1JJAVcz5J/5ytdiNaIsKgrre3yvSUjwVG6ZUujGH7E2TiPigZUwLYCe7eaIUEP2Zka2VJPA==",
-      "dev": true,
-      "dependencies": {
-        "optimist": "~0.3.5",
-        "source-map": "~0.1.7"
-      },
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/run-async": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
@@ -22394,12 +18625,6 @@
         "individual": "^2.0.0"
       }
     },
-    "node_modules/rx": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz",
-      "integrity": "sha512-u5qvfulb7NXoY/+OE28920WEgFi6aiDjf5iF9rA2f9tBXejLgTLd0WxkclvIQWjFFHfNJlb7pSTsrjgiDh+Uug==",
-      "dev": true
-    },
     "node_modules/rxjs": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
@@ -22502,17 +18727,6 @@
         "ajv": "^6.9.1"
       }
     },
-    "node_modules/script-injector": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/script-injector/-/script-injector-0.1.7.tgz",
-      "integrity": "sha512-0iW1D9UKsOPNUVBHvR76KePNS5TamEBN38bT5k7BqsXItsyV5oJTZbVsvOF3YS2xJ7GB7pszmgfDFJbIgHmrDQ==",
-      "dev": true,
-      "dependencies": {
-        "duplexer": "~0.1.1",
-        "through": "~2.3.4",
-        "trumpet": "~1.6.3"
-      }
-    },
     "node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -22760,35 +18974,6 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/shallow-copy": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
-      "integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw==",
-      "dev": true
-    },
-    "node_modules/shasum": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
-      "integrity": "sha512-UTzHm/+AzKfO9RgPgRpDIuMSNie1ubXRaljjlhFMNGYoG7z+rm9AHLPMf70R7887xboDH9Q+5YQbWKObFHEAtw==",
-      "dev": true,
-      "dependencies": {
-        "json-stable-stringify": "~0.0.0",
-        "sha.js": "~2.4.4"
-      }
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -22810,48 +18995,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/shell-quote": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz",
-      "integrity": "sha512-uEWz7wa9vnCi9w4mvKZMgbHFk3DCKjLQlZcy0tJxUH4NwZjRrPPHXAYIEt2TmJs600Dcgj0Z3fZLZKVPVdGNbQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/shelljs": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
-      "integrity": "sha512-Ny0KN4dyT8ZSCE0frtcbAJGoM/HTArpyPkeli1/00aYfm0sbD/Gk/4x7N2DP9QKGpBsiQH7n6rpm1L79RtviEQ==",
-      "dev": true,
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/shelljs-nodecli": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shelljs-nodecli/-/shelljs-nodecli-0.1.1.tgz",
-      "integrity": "sha512-/e+APCWKKW9A8YMHKgDzhWQ21zPuDLjn6ATBczxbp6uUeiCSwvw95ynKAjMsRd1yrd5dlCkMKJoc/Lpwrt2w+A==",
-      "dev": true,
-      "dependencies": {
-        "shelljs": "~0.2"
-      }
-    },
-    "node_modules/shelljs-nodecli/node_modules/shelljs": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
-      "integrity": "sha512-LQiM15qPbSyzHDFfI4v7EVhjBXG5PUAKWVBnVMBXwdlQSHZtzKYeKGzDHBIqpenPrCsPWqBSOF5o7oSvSfX+CA==",
-      "dev": true,
-      "bin": {
-        "shjs": "bin/shjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -22866,12 +19009,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/sigmund": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-      "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==",
-      "dev": true
-    },
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -22997,15 +19134,6 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/slide": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-      "integrity": "sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -23211,20 +19339,6 @@
         "urix": "^0.1.0"
       }
     },
-    "node_modules/sntp": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
-      "integrity": "sha512-bDLrKa/ywz65gCl+LmOiIhteP1bhEsAAzhfMedPoiHP3dyYnAevlaJshdqb9Yu0sRifyP/fRqSt8t+5qGIWlGQ==",
-      "deprecated": "This module moved to @hapi/sntp. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "hoek": "0.9.x"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/socket.io": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
@@ -23421,21 +19535,6 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
-    "node_modules/sse-stream": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/sse-stream/-/sse-stream-0.0.4.tgz",
-      "integrity": "sha512-rnDUubW7a4CZAB5D0r2OtFU/zvY05MoNGHMX6deAYK0wWaizrNcHzimf+Nk5y0sqntGAPpWEnIopWrrAf2TBVg==",
-      "dev": true,
-      "dependencies": {
-        "through": "~2.2.7"
-      }
-    },
-    "node_modules/sse-stream/node_modules/through": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
-      "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
-      "dev": true
-    },
     "node_modules/sshpk": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
@@ -23592,40 +19691,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/stream-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz",
-      "integrity": "sha512-e+V5xc4LlkOiRr64kZTUdb11exsbpSnwb9uwmXaHeDXCpfHg7vaefMJOxi21Pe74ZOqjZ87blBcqqpNAM4Ku0g==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^1.0.27-1"
-      }
-    },
-    "node_modules/stream-browserify/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/stream-browserify/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/stream-browserify/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
     "node_modules/stream-buffers": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
@@ -23644,80 +19709,6 @@
         "duplexer": "~0.1.1"
       }
     },
-    "node_modules/stream-combiner2": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
-      "integrity": "sha512-7DO1SfBVnyIyo9ytUjSyVojT5bp1ZY6h3pj7HUs6PwcRSd/r8mBOHbRwYC7nbHRakKzMKyNp5HWJRv4GgVherA==",
-      "dev": true,
-      "dependencies": {
-        "duplexer2": "~0.0.2",
-        "through2": "~0.5.1"
-      }
-    },
-    "node_modules/stream-combiner2/node_modules/duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "node_modules/stream-combiner2/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/stream-combiner2/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/stream-combiner2/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/stream-combiner2/node_modules/through2": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-      "integrity": "sha512-zexCrAOTbjkBCXGyozn7hhS3aEaqdrc59mAD2E3dKYzV1vFuEGQ1hEDJN2oQMQFwy4he2zyLqPZV+AlfS8ZWJA==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.0.17",
-        "xtend": "~3.0.0"
-      }
-    },
-    "node_modules/stream-combiner2/node_modules/through2/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/stream-combiner2/node_modules/xtend": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-      "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
     "node_modules/stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
@@ -23730,54 +19721,6 @@
       "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
       "dev": true
     },
-    "node_modules/stream-splicer": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz",
-      "integrity": "sha512-nmUMEbdm/sZYqe9dZs7mqJvTYpunsDbIWI5FiBCMc/hMVd6vwzy+ITmo7C3gcLYqrn+uQ1w+EJwooWvJ997JAA==",
-      "dev": true,
-      "dependencies": {
-        "indexof": "0.0.1",
-        "inherits": "^2.0.1",
-        "isarray": "~0.0.1",
-        "readable-stream": "^1.1.13-1",
-        "readable-wrap": "^1.0.0",
-        "through2": "^1.0.0"
-      }
-    },
-    "node_modules/stream-splicer/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/stream-splicer/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/stream-splicer/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/stream-splicer/node_modules/through2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.1.13-1 <1.2.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
     "node_modules/streamroller": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.4.tgz",
@@ -23867,13 +19810,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/stringstream": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
-      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -23913,42 +19849,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==",
-      "dev": true,
-      "dependencies": {
-        "get-stdin": "^4.0.1"
-      },
-      "bin": {
-        "strip-indent": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
-      "integrity": "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg==",
-      "dev": true,
-      "bin": {
-        "strip-json-comments": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/subarg": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
-      "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.1.0"
-      }
-    },
     "node_modules/suffix": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
@@ -23994,15 +19894,6 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "node_modules/syntax-error": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
-      "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
-      "dev": true,
-      "dependencies": {
-        "acorn-node": "^1.2.0"
-      }
-    },
     "node_modules/table": {
       "version": "6.8.0",
       "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
@@ -24041,12 +19932,6 @@
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true
     },
-    "node_modules/taffydb": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
-      "integrity": "sha512-y3JaeRSplks6NYQuCOj3ZFMO3j60rTwbuKCvZxsAraGYH2epusatvZ0baZYA01WsGqJBq/Dl6vOrMUJqyMj8kA==",
-      "dev": true
-    },
     "node_modules/tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -24298,12 +20183,6 @@
         "url": "https://bevry.me/fund"
       }
     },
-    "node_modules/throttleit": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
-      "integrity": "sha512-HtlTFeyYs1elDM2txiIGsdXHaq8kffVaZH/QEBRbo95zQqzlsBx5ELKhkPOZVad9OK9oxzwx6UrQN8Vfh/+yag==",
-      "dev": true
-    },
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -24362,27 +20241,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/timed-out": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz",
-      "integrity": "sha512-pqqJOi1rF5zNs/ps4vmbE4SFCrM4iR7LW+GHAsHqO/EumqbIWceioevYLM5xZRgQSH6gFgL9J/uB7EcJhQ9niQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/timers-browserify": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
-      "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==",
-      "dev": true,
-      "dependencies": {
-        "process": "~0.11.0"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
     "node_modules/timers-ext": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
@@ -24454,13 +20312,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/to-iso-string": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz",
-      "integrity": "sha512-oeHLgfWA7d0CPQa6h0+i5DAJZISz5un0d5SHPkw+Untclcvzv9T+AC3CvGXlZJdOlIbxbTfyyzlqCXc5hjpXYg==",
-      "deprecated": "to-iso-string has been deprecated, use @segment/to-iso-string instead.",
-      "dev": true
-    },
     "node_modules/to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -24594,15 +20445,6 @@
         "node": "*"
       }
     },
-    "node_modules/treeify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.0.1.tgz",
-      "integrity": "sha512-i3MKN4nGEOuVAcd7s5MtAc2+QBExwcaRT/6/CzUSYVYwzM58bJ3H3wwCPu2PEAGjVPHjfIC/MPaXsxPGUk07cg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/trim-lines": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
@@ -24613,15 +20455,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
@@ -24641,63 +20474,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/trumpet": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/trumpet/-/trumpet-1.6.6.tgz",
-      "integrity": "sha512-A4cn/zuq0AsxS5M8cD+7GUoIhOoK2qkcpFUwlpHnNOsTPzCq7FITZV9lg95ydupJcQRi/kFQzGIn7oN3kNp10w==",
-      "dev": true,
-      "dependencies": {
-        "duplexer2": "~0.0.2",
-        "html-select": "^2.3.5",
-        "html-tokenize": "^1.1.1",
-        "inherits": "^2.0.0",
-        "readable-stream": "^1.0.27-1",
-        "through2": "^1.0.0"
-      }
-    },
-    "node_modules/trumpet/node_modules/duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "node_modules/trumpet/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/trumpet/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/trumpet/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/trumpet/node_modules/through2": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-      "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.1.13-1 <1.2.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
     "node_modules/tsconfig-paths": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.13.0.tgz",
@@ -24728,12 +20504,6 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
-    "node_modules/tty-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
-      "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
-      "dev": true
-    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -24809,6 +20579,20 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
+    "node_modules/typescript": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
     "node_modules/typescript-compare": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
@@ -24849,12 +20633,6 @@
         "node": "*"
       }
     },
-    "node_modules/uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-      "dev": true
-    },
     "node_modules/uglify-js": {
       "version": "3.15.2",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz",
@@ -24868,93 +20646,6 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
-      "dev": true
-    },
-    "node_modules/umd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/umd/-/umd-2.1.0.tgz",
-      "integrity": "sha512-mEAJeceExHnblcAwN3BQtDPYOrTy4ALeBh6nQ9KW0cUCd0UU714jAfil2jvq09b67IizwJIiTVFOjE+/52Dyvw==",
-      "dev": true,
-      "dependencies": {
-        "rfile": "~1.0.0",
-        "ruglify": "~1.0.0",
-        "through": "~2.3.4",
-        "uglify-js": "~2.4.0"
-      },
-      "bin": {
-        "umd": "bin/cli.js"
-      }
-    },
-    "node_modules/umd/node_modules/async": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-      "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
-      "dev": true
-    },
-    "node_modules/umd/node_modules/camelcase": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-      "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/umd/node_modules/source-map": {
-      "version": "0.1.34",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
-      "integrity": "sha512-yfCwDj0vR9RTwt3pEzglgb3ZgmcXHt6DjG3bjJvzPwTL+5zDQ2MhmSzAcTy0GTiQuCiriSWXvWM1/NhKdXuoQA==",
-      "dev": true,
-      "dependencies": {
-        "amdefine": ">=0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/umd/node_modules/uglify-js": {
-      "version": "2.4.24",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz",
-      "integrity": "sha512-tktIjwackfZLd893KGJmXc1hrRHH1vH9Po3xFh1XBjjeGAnN02xJ3SuoA+n1L29/ZaCA18KzCFlckS+vfPugiA==",
-      "dev": true,
-      "dependencies": {
-        "async": "~0.2.6",
-        "source-map": "0.1.34",
-        "uglify-to-browserify": "~1.0.0",
-        "yargs": "~3.5.4"
-      },
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/umd/node_modules/wordwrap": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-      "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/umd/node_modules/yargs": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
-      "integrity": "sha512-5j382E4xQSs71p/xZQsU1PtRA2HXPAjX0E0DkoGLxwNASMOKX6A9doV1NrZmj85u2Pjquz402qonBzz/yLPbPA==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^1.0.2",
-        "decamelize": "^1.0.0",
-        "window-size": "0.1.0",
-        "wordwrap": "0.0.2"
-      }
-    },
     "node_modules/unbox-primitive": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
@@ -24989,21 +20680,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/underscore": {
-      "version": "1.13.6",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
-      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
-      "dev": true
-    },
-    "node_modules/underscore.string": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz",
-      "integrity": "sha512-yxkabuCaIBnzfIvX3kBxQqCs0ar/bfJwDnFEHJUm/ZrRVhT3IItdRF5cZjARLzEnyQYtIUhsZ2LG2j3HidFOFQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/undertaker": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
@@ -25397,18 +21073,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/user-home": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-      "integrity": "sha512-aggiKfEEubv3UwRNqTzLInZpAOmKzwdHqEBmW/hBA/mt99eg+b4VrX6i+IRLxU8+WJYfa33rGwRseg4eElUgsQ==",
-      "dev": true,
-      "bin": {
-        "user-home": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/util": {
       "version": "0.12.4",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
@@ -25429,12 +21093,6 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "node_modules/util-extend": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz",
-      "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==",
-      "dev": true
-    },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -25861,15 +21519,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha512-NyZNR3WDah+NPkjh/YmhuWSsT4a0mF0BJYgUmvrJ70zxjTXh5Y2Asobxlh0Nfs0PCFB5FVpRJft7NozAWFMwLQ==",
-      "dev": true,
-      "dependencies": {
-        "indexof": "0.0.1"
-      }
-    },
     "node_modules/void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
@@ -25990,9 +21639,9 @@
       }
     },
     "node_modules/webdriverio/node_modules/minimatch": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
@@ -26430,15 +22079,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/window-size": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-      "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -26561,18 +22201,6 @@
         }
       }
     },
-    "node_modules/xml-escape": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.0.0.tgz",
-      "integrity": "sha512-gCT82WbwOT9SBI/94j5i0tqHpjHIP/0kP11BS8s2wcBtdcFsDNLS9sLvA+C55fD3hpGhgnE/r7hfeBFkiMATjw==",
-      "dev": true
-    },
-    "node_modules/xmlcreate": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
-      "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
-      "dev": true
-    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -26832,1003 +22460,11 @@
       }
     },
     "plugins/eslint": {
+      "name": "eslint-plugin-prebid",
       "version": "1.0.0",
       "integrity": "sha512-DH8lk8H4D+XCWtPm7C27IzzD4lkBHv49YTqOHeS/1mYCp4rn1j3NNNA1gl2q+CNYaAPSZDaS5DwRL/ErDP6O4Q==",
       "dev": true,
-      "dependencies": {
-        "chalk": "^1.0.0",
-        "concat-stream": "^1.4.6",
-        "debug": "^2.1.1",
-        "doctrine": "^0.6.2",
-        "escape-string-regexp": "^1.0.2",
-        "escope": "^3.2.0",
-        "espree": "^2.2.0",
-        "estraverse": "^4.1.0",
-        "estraverse-fb": "^1.3.1",
-        "globals": "^8.2.0",
-        "inquirer": "^0.8.2",
-        "is-my-json-valid": "^2.10.0",
-        "js-yaml": "^3.2.5",
-        "lodash.clonedeep": "^3.0.1",
-        "lodash.merge": "^3.3.2",
-        "lodash.omit": "^3.1.0",
-        "minimatch": "^2.0.1",
-        "mkdirp": "^0.5.0",
-        "object-assign": "^2.0.0",
-        "optionator": "^0.5.0",
-        "path-is-absolute": "^1.0.0",
-        "path-is-inside": "^1.0.1",
-        "strip-json-comments": "~1.0.1",
-        "text-table": "~0.2.0",
-        "user-home": "^1.0.0",
-        "xml-escape": "~1.0.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "devDependencies": {
-        "beefy": "^1.0.0",
-        "brfs": "0.0.9",
-        "browserify": "^8.1.3",
-        "chai": "^1.9.1",
-        "coveralls": "2.11.2",
-        "dateformat": "^1.0.8",
-        "esprima": "^2.4.1",
-        "esprima-fb": "^10001.1.0-dev-harmony-fb",
-        "gh-got": "^1.0.3",
-        "istanbul": "^0.3.5",
-        "jsdoc": "^3.3.0-beta1",
-        "jsonlint": "^1.6.2",
-        "markdownlint": "^0.0.6",
-        "mocha": "^2.1.0",
-        "mocha-phantomjs": "3.6.0",
-        "npm-license": "^0.2.3",
-        "phantomjs": "1.9.7-15",
-        "proxyquire": "^1.0.0",
-        "rewire": "^2.3.4",
-        "semver": "^4.1.0",
-        "shelljs": "^0.3.0",
-        "shelljs-nodecli": "~0.1.0",
-        "sinon": "1.14.1",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "plugins/eslint/node_modules/ansi-regex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
-      "integrity": "sha512-q5i8bFLg2wDfsuR56c1NzlJFPzVD+9mxhDrhqOGigEFa87OZHlF+9dWeGWzVTP/0ECiA/JUGzfzRr2t3eYORRw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/argparse": {
-      "version": "0.1.16",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
-      "integrity": "sha512-LjmC2dNpdn2L4UzyoaIr11ELYoLn37ZFy9zObrQFHsSuOepeUEMKnM8w5KL4Tnrp2gy88rRuQt6Ky8Bjml+Baw==",
-      "dev": true,
-      "dependencies": {
-        "underscore": "~1.7.0",
-        "underscore.string": "~2.4.0"
-      }
-    },
-    "plugins/eslint/node_modules/asn1": {
-      "version": "0.1.11",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-      "integrity": "sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.4.9"
-      }
-    },
-    "plugins/eslint/node_modules/assert-plus": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-      "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "plugins/eslint/node_modules/assertion-error": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz",
-      "integrity": "sha512-g/gZV+G476cnmtYI+Ko9d5khxSoCSoom/EaNmmCfwpOvBXEJ18qwFrxfP1/CsIqk2no1sAKKwxndV0tP7ROOFQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "plugins/eslint/node_modules/aws-sign2": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-      "integrity": "sha512-oqUX0DM5j7aPWPCnpWebiyNIj2wiNI87ZxnOMoGv0aE4TGlBy2N+5iWc6dQ/NOKZaBD2W6PVz8jtOGkWzSC5EA==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "plugins/eslint/node_modules/chai": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-1.10.0.tgz",
-      "integrity": "sha512-E3L9M2SeQU1XagJkE9KJyTAXXHKJkJ1EsKkFp0Rl53lYa3mro2PVgYHNiCb2YRa2nUeyg7aqmI1EIcSBayNd5w==",
-      "dev": true,
-      "dependencies": {
-        "assertion-error": "1.0.0",
-        "deep-eql": "0.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "plugins/eslint/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/cli-width": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz",
-      "integrity": "sha512-eMU2akIeEIkCxGXUNmDnJq1KzOIiPnJ+rKqRe6hcxE3vIOPvpMrBYOn/Bl7zNlYJj/zQxXquAnozHUCf9Whnsg==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/combined-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-      "integrity": "sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "delayed-stream": "0.0.5"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "plugins/eslint/node_modules/commander": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
-      "integrity": "sha512-CD452fnk0jQyk3NfnK+KkR/hUPoHt5pVaKHogtyyv3N0U4QfAal9W0/rXLOg/vVZgQKa7jdtXypKs1YAip11uQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.x"
-      }
-    },
-    "plugins/eslint/node_modules/coveralls": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz",
-      "integrity": "sha512-+OK2imSCDXSYaOyAxGVUmzDfDtCYLW+gtdDVpjvq99R5Dyry4Puj3EQ/4YnsxNc6RHsuhx3wIkHSBIRaJZY5YQ==",
-      "dev": true,
-      "dependencies": {
-        "js-yaml": "3.0.1",
-        "lcov-parse": "0.0.6",
-        "log-driver": "1.2.4",
-        "request": "2.40.0"
-      },
-      "bin": {
-        "coveralls": "bin/coveralls.js"
-      },
-      "engines": {
-        "node": ">=0.8.6"
-      }
-    },
-    "plugins/eslint/node_modules/coveralls/node_modules/esprima": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
-      "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "plugins/eslint/node_modules/coveralls/node_modules/js-yaml": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz",
-      "integrity": "sha512-dgxgLzZS9qLWAQd/wrVG8tOiRSBJq1Ss9gbd7+fdBhcia3efHjLLpPkcUhKOyVACxTEAgnao3RT1kj1otiW42g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "~ 0.1.11",
-        "esprima": "~ 1.0.2"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      },
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "plugins/eslint/node_modules/dateformat": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-      "integrity": "sha512-5sFRfAAmbHdIts+eKjR9kYJoF0ViCMVX9yqLu5A7S/v+nd077KgCITOMiirmyCBiZpKLDXbBOkYm6tu7rX/TKg==",
-      "dev": true,
-      "dependencies": {
-        "get-stdin": "^4.0.1",
-        "meow": "^3.3.0"
-      },
-      "bin": {
-        "dateformat": "bin/cli.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "plugins/eslint/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "plugins/eslint/node_modules/deep-eql": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
-      "integrity": "sha512-6sEotTRGBFiNcqVoeHwnfopbSpi5NbH1VWJmYCVkmxMmaVTT0bUTrNaGyBwhgP4MZL012W/mkzIn3Da+iDYweg==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "0.1.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "plugins/eslint/node_modules/delayed-stream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-      "integrity": "sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "plugins/eslint/node_modules/diff": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
-      "integrity": "sha512-VzVc42hMZbYU9Sx/ltb7KYuQ6pqAw+cbFWVy4XKdkuEL2CFaRLGEnISPs7YdzaUGpi+CpIqvRmu7hPQ4T7EQ5w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "plugins/eslint/node_modules/doctrine": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.6.4.tgz",
-      "integrity": "sha512-FSGvDB23RFdm/Z2hEINXN1AcBW5I4YBqpGD/lScJV34vuOwrPFyLHN9bwCzLa6lUmqS6ipdp5XlVJRQ6yJ5iSA==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^1.1.6",
-        "isarray": "0.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/escodegen": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.7.1.tgz",
-      "integrity": "sha512-2cd7+JUtUEmZVpGmfF9r+uRYXswJAkf85Ce8GvdBa7hSvdjY8hGo+rwC5syAgYzqHpfxNJzLntFjw6879yPbgQ==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^1.2.2",
-        "estraverse": "^1.9.1",
-        "esutils": "^2.0.2",
-        "optionator": "^0.5.0"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=0.12.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.2.0"
-      }
-    },
-    "plugins/eslint/node_modules/escodegen/node_modules/esprima": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz",
-      "integrity": "sha512-S9VbPDU0adFErpDai3qDkjq8+G05ONtKzcyNrPKg/ZKa+tf879nX2KexNU95b31UoTJjRLInNBHHHjFPoCd7lQ==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "plugins/eslint/node_modules/escodegen/node_modules/estraverse": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-      "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/escodegen/node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/espree": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz",
-      "integrity": "sha512-HWJpgkL44cbjWiOTC9Pm34RZE57H1g9V4Ln9U14TUtiywFTLMMpMCtmQK5rkjbGBXigQT8bS3r45+Dt5+m0SZg==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/esprima": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.5.0.tgz",
-      "integrity": "sha512-uM6hfS0/8ybNIj8SGRMdidPJy5uhWqWN/GIkyqnMAbCSL44yfFGLuBpRRCgOpBXBZt2OymQuM+IfahkqJq3DWw==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/esutils": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz",
-      "integrity": "sha512-RG1ZkUT7iFJG9LSHr7KDuuMSlujfeTtMNIcInURxKAxhMtwQhI3NrQhz26gZQYlsYZQKzsnwtpKrFKj9K9Qu1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/fast-levenshtein": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz",
-      "integrity": "sha512-hYsfI0s4lfQ2rHVFKXwAr/L/ZSbq9TZwgXtZqW7ANcn9o9GKvcbWxOnxx7jykXf/Ezv1V8TvaBEKcGK7DWKX5A==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/figures": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-      "integrity": "sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5",
-        "object-assign": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/figures/node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/forever-agent": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
-      "integrity": "sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "plugins/eslint/node_modules/form-data": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-      "integrity": "sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "async": "~0.9.0",
-        "combined-stream": "~0.0.4",
-        "mime": "~1.2.11"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "plugins/eslint/node_modules/form-data/node_modules/async": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
-      "dev": true,
-      "optional": true
-    },
-    "plugins/eslint/node_modules/glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-      "integrity": "sha512-hVb0zwEZwC1FXSKRPFTeOtN7AArJcJlI6ULGLtrstaswKNlrTJqAA+1lYlSUop4vjA423xlBzqfVS3iWGlqJ+g==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2",
-        "minimatch": "0.3"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "plugins/eslint/node_modules/glob/node_modules/minimatch": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-      "integrity": "sha512-WFX1jI1AaxNTZVOHLBVazwTWKaQjoykSzCBNXB72vDTCzopQGtyP91tKdFK5cv1+qMwPyiTu1HqUriqplI8pcA==",
-      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "2",
-        "sigmund": "~1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "plugins/eslint/node_modules/globals": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-8.18.0.tgz",
-      "integrity": "sha512-IHCTKEGo42ICEkTZBADyl4HX06hVdFF4qdJdqOgaBe5X8RE1/MrvubetsEtGTcwjs46djFq0Gc3+5RgTsc3UoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/growl": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-      "integrity": "sha512-RTBwDHhNuOx4F0hqzItc/siXCasGfC4DeWcBamclWd+6jWtBaeB/SGbMkGf0eiQoW7ib8JpvOgnUsmgMHI3Mfw==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/has-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/http-signature": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-      "integrity": "sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "asn1": "0.1.11",
-        "assert-plus": "^0.1.5",
-        "ctype": "0.5.3"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "plugins/eslint/node_modules/inquirer": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz",
-      "integrity": "sha512-+rksrtdqQ8do7yOsmP5YIgbSdbZYuCIrnfH5vjFYGAr1XgJpMksb3rFZMJ3jiKuUyDVEA4MVDYbkA3ribJn3Tg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^1.1.1",
-        "chalk": "^1.0.0",
-        "cli-width": "^1.0.1",
-        "figures": "^1.3.5",
-        "lodash": "^3.3.1",
-        "readline2": "^0.1.1",
-        "rx": "^2.4.3",
-        "through": "^2.3.6"
-      }
-    },
-    "plugins/eslint/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/istanbul": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.22.tgz",
-      "integrity": "sha512-8H/jxiee2UqX/mviKkPoKQYMxU2t995FC5PwO4zjWeDPOozjoeKqxEyN62l9o5+UgzvYQbrKgQjjxhGON8FcMg==",
-      "deprecated": "This module is no longer maintained, try this instead:\n  npm i nyc\nVisit https://istanbul.js.org/integrations for other alternatives.",
-      "dev": true,
-      "dependencies": {
-        "abbrev": "1.0.x",
-        "async": "1.x",
-        "escodegen": "1.7.x",
-        "esprima": "2.5.x",
-        "fileset": "0.2.x",
-        "handlebars": "^4.0.1",
-        "js-yaml": "3.x",
-        "mkdirp": "0.5.x",
-        "nopt": "3.x",
-        "once": "1.x",
-        "resolve": "1.1.x",
-        "supports-color": "^3.1.0",
-        "which": "^1.1.1",
-        "wordwrap": "^1.0.0"
-      },
-      "bin": {
-        "istanbul": "lib/cli.js"
-      }
-    },
-    "plugins/eslint/node_modules/istanbul/node_modules/supports-color": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-      "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "plugins/eslint/node_modules/lcov-parse": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz",
-      "integrity": "sha512-chuBQJZiBq28YUM6Yr3tf3h5Lxhb+DvhbxxSNpsHURSXiZXOzp49phiWG2pKHboOehJDujivwNQGRP8mAErMvQ==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/levn": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz",
-      "integrity": "sha512-mvp+NO++YH0B+e8cC/SvJxk6k5Z9Ngd3iXuz7tmT8vZCyQZj/5SI1GkFOiZGGPkm5wWGI9SUrqiAfPq7BJH+0w==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.0",
-        "type-check": "~0.3.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "plugins/eslint/node_modules/lodash": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-      "integrity": "sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/lodash.clonedeep": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz",
-      "integrity": "sha512-I8MpGh5z+6OixDAAb21teLSZDmqVPjlq02Q7ZFrbn2xnQHYYuJf6on/94SWpF/p0s3p/cEv/53ro4AhDOfCR0g==",
-      "dev": true,
-      "dependencies": {
-        "lodash._baseclone": "^3.0.0",
-        "lodash._bindcallback": "^3.0.0"
-      }
-    },
-    "plugins/eslint/node_modules/lodash.isplainobject": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz",
-      "integrity": "sha512-P4wZnho5curNqeEq/x292Pb57e1v+woR7DJ84DURelKB46lby8aDEGVobSaYtzHdQBWQrJSdxcCwjlGOvvdIyg==",
-      "dev": true,
-      "dependencies": {
-        "lodash._basefor": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.keysin": "^3.0.0"
-      }
-    },
-    "plugins/eslint/node_modules/lodash.merge": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-3.3.2.tgz",
-      "integrity": "sha512-ZgGZpRhWLjivGUbjtApZR4HyLv/UAyoYqESVYkK4aLBJVHRrbFpG+GNnE9JPijliME4LkKM0SFI/WyOiBiv1+w==",
-      "dev": true,
-      "dependencies": {
-        "lodash._arraycopy": "^3.0.0",
-        "lodash._arrayeach": "^3.0.0",
-        "lodash._createassigner": "^3.0.0",
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0",
-        "lodash.isplainobject": "^3.0.0",
-        "lodash.istypedarray": "^3.0.0",
-        "lodash.keys": "^3.0.0",
-        "lodash.keysin": "^3.0.0",
-        "lodash.toplainobject": "^3.0.0"
-      }
-    },
-    "plugins/eslint/node_modules/log-driver": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz",
-      "integrity": "sha512-QmyGbAcBbHk8ysCGtT6FQ+LZML6+EeT0NdotCJGu72kNhknXtdso1G/NI0r7j45whFYNTU15XMW+JGOvGX07QQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.6"
-      }
-    },
-    "plugins/eslint/node_modules/lolex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz",
-      "integrity": "sha512-wGZrF3AlAWxG2j+6NyyttZ/UVxW8o/F+q01IUGuf2PiEIAUG9av/vpBS5TQHTQtzPmPJB4CZWjwyGR4C4aX83w==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/lru-cache": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-      "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/mime": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-      "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
-      "dev": true,
-      "optional": true
-    },
-    "plugins/eslint/node_modules/mime-types": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
-      "integrity": "sha512-echfutj/t5SoTL4WZpqjA1DCud1XO0WQF3/GJ48YBmc4ZMhCK77QA6Z/w6VTQERLKuJ4drze3kw2TUT8xZXVNw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "plugins/eslint/node_modules/minimatch": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-      "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
-      "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "plugins/eslint/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "plugins/eslint/node_modules/mocha": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
-      "integrity": "sha512-jNt2iEk9FPmZLzL+sm4FNyOIDYXf2wUU6L4Cc8OIKK/kzgMHKPi4YhTZqG4bW4kQVdIv6wutDybRhXfdnujA1Q==",
-      "dev": true,
-      "dependencies": {
-        "commander": "2.3.0",
-        "debug": "2.2.0",
-        "diff": "1.4.0",
-        "escape-string-regexp": "1.0.2",
-        "glob": "3.2.11",
-        "growl": "1.9.2",
-        "jade": "0.26.3",
-        "mkdirp": "0.5.1",
-        "supports-color": "1.2.0",
-        "to-iso-string": "0.0.2"
-      },
-      "bin": {
-        "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
-      },
-      "engines": {
-        "node": ">= 0.8.x"
-      }
-    },
-    "plugins/eslint/node_modules/mocha/node_modules/debug": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-      "integrity": "sha512-X0rGvJcskG1c3TgSCPqHJ0XJgwlcvOC7elJ5Y0hYuKBZoVqWpAMfLOeIh2UI/DCQ5ruodIjvsugZtjUYUw2pUw==",
-      "dev": true,
-      "dependencies": {
-        "ms": "0.7.1"
-      }
-    },
-    "plugins/eslint/node_modules/mocha/node_modules/escape-string-regexp": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
-      "integrity": "sha512-cQpUid7bdTUnFin8S7BnNdOk+/eDqQmKgCANSyd/jAhrKEvxUvr9VQ8XZzXiOtest8NLfk3FSBZzwvemZNQ6Vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "plugins/eslint/node_modules/mocha/node_modules/minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/mocha/node_modules/mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
-      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "dev": true,
-      "dependencies": {
-        "minimist": "0.0.8"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "plugins/eslint/node_modules/mocha/node_modules/ms": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-      "integrity": "sha512-lRLiIR9fSNpnP6TC4v8+4OU7oStC01esuNowdQ34L+Gk8e5Puoc88IqJ+XAY/B3Mn2ZKis8l8HX90oU8ivzUHg==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/mocha/node_modules/supports-color": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
-      "integrity": "sha512-mS5xsnjTh5b7f2DM6bch6lR582UCOTphzINlZnDsfpIRrwI6r58rb6YSSGsdexkm8qw2bBVO2ID2fnJOTuLiPA==",
-      "dev": true,
-      "bin": {
-        "supports-color": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/oauth-sign": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
-      "integrity": "sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "plugins/eslint/node_modules/object-assign": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
-      "integrity": "sha512-CdsOUYIh5wIiozhJ3rLQgmUTgcyzFwZZrqhkKhODMoGtPKM+wt0h0CNIoauJWMsS9822EdzPsF/6mb4nLvPN5g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/optionator": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz",
-      "integrity": "sha512-jUr7aBk/kCInAEsl+qxuw4ORpe458atDKXNLhyvPUD4NfnsJsbAViX1b9nb/0rS62lO8cIFd1VoiaXLQ+MybOw==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.2",
-        "fast-levenshtein": "~1.0.0",
-        "levn": "~0.2.5",
-        "prelude-ls": "~1.1.1",
-        "type-check": "~0.3.1",
-        "wordwrap": "~0.0.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "plugins/eslint/node_modules/optionator/node_modules/wordwrap": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "plugins/eslint/node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "plugins/eslint/node_modules/qs": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz",
-      "integrity": "sha512-tHuOP9TN/1VmDM/ylApGK1QF3PSIP8I6bHDEfoKNQeViREQ/sfu1bAUrA1hoDun8p8Tpm7jcsz47g+3PiGoYdg==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/request": {
-      "version": "2.40.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
-      "integrity": "sha512-waNoGB4Z7bPn+lgqPk7l7hhze4Vd68jKccnwLeS7vr9GMxz0iWQbYTbBNWzfIk87Urx7V44pu29qjF/omej+Fw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dev": true,
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "dependencies": {
-        "forever-agent": "~0.5.0",
-        "json-stringify-safe": "~5.0.0",
-        "mime-types": "~1.0.1",
-        "node-uuid": "~1.4.0",
-        "qs": "~1.0.0"
-      },
-      "optionalDependencies": {
-        "aws-sign2": "~0.5.0",
-        "form-data": "~0.1.0",
-        "hawk": "1.1.1",
-        "http-signature": "~0.10.0",
-        "oauth-sign": "~0.3.0",
-        "stringstream": "~0.0.4",
-        "tough-cookie": ">=0.12.0",
-        "tunnel-agent": "~0.4.0"
-      }
-    },
-    "plugins/eslint/node_modules/resolve": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-      "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/semver": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-      "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "plugins/eslint/node_modules/sinon": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.14.1.tgz",
-      "integrity": "sha512-cysrMyrriLwSn5Ye82xTCAVVS6Q6XLxlZE3jtPb4IFng2npN3lQWQ5Uyaud6cRpzztbEy2sbJkrDSbIl6OKUCA==",
-      "dev": true,
-      "dependencies": {
-        "formatio": "1.1.1",
-        "lolex": "1.1.0",
-        "util": ">=0.10.3 <1"
-      },
-      "engines": {
-        "node": ">=0.1.103"
-      }
-    },
-    "plugins/eslint/node_modules/source-map": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-      "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "amdefine": ">=0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "plugins/eslint/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "plugins/eslint/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "plugins/eslint/node_modules/tunnel-agent": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-      "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "plugins/eslint/node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "plugins/eslint/node_modules/type-detect": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
-      "integrity": "sha512-5rqszGVwYgBoDkIm2oUtvkfZMQ0vk29iDMU0W2qCa3rG0vPDNczCMT4hV/bLBgLg8k8ri6+u3Zbt+S/14eMzlA==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "plugins/eslint/node_modules/underscore": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
-      "integrity": "sha512-cp0oQQyZhUM1kpJDLdGO1jPZHgS/MpzoWYfe9+CM2h/QGDZlqwT2T3YGukuBdaNJ/CAPoeyAZRRHz8JFo176vA==",
-      "dev": true
-    },
-    "plugins/eslint/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
+      "license": "Apache-2.0"
     }
   },
   "dependencies": {
@@ -29455,12 +24091,6 @@
         "@types/node": "*"
       }
     },
-    "@types/linkify-it": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
-      "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
-      "dev": true
-    },
     "@types/lodash": {
       "version": "4.14.179",
       "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz",
@@ -29494,16 +24124,6 @@
         "@types/lodash": "*"
       }
     },
-    "@types/markdown-it": {
-      "version": "12.2.3",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
-      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
-      "dev": true,
-      "requires": {
-        "@types/linkify-it": "*",
-        "@types/mdurl": "*"
-      }
-    },
     "@types/mdast": {
       "version": "3.0.10",
       "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
@@ -30642,29 +25262,6 @@
       "dev": true,
       "requires": {}
     },
-    "acorn-node": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
-      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
-      "dev": true,
-      "requires": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true
-    },
-    "adm-zip": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz",
-      "integrity": "sha512-J2LiZpRxcLsJm2IwoekNa6COwzEZnMwCJ3vxz0UCw2NYUH2WFi7svuDrVccq5KpBGmzGUgFa0L0FwEmKmu/rzQ==",
-      "dev": true
-    },
     "aes-decrypter": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.3.tgz",
@@ -30699,7 +25296,8 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "ansi-colors": {
       "version": "4.1.1",
@@ -30903,12 +25501,6 @@
       "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
       "dev": true
     },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==",
-      "dev": true
-    },
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -31008,12 +25600,6 @@
         "es-abstract": "^1.19.0"
       }
     },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
-      "dev": true
-    },
     "asn1": {
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
@@ -31023,26 +25609,6 @@
         "safer-buffer": "~2.1.0"
       }
     },
-    "asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
     "assert": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
@@ -31079,23 +25645,6 @@
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true
     },
-    "astw": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz",
-      "integrity": "sha512-E/4z//dvN0lfr8zAx8hXeQ8o3nRoQaL/wqI7fAALEvh/40mnyUxfFB9MwyDHYKVDtS3cp3Pow5s96djZR5lkWw==",
-      "dev": true,
-      "requires": {
-        "acorn": "^4.0.3"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha512-fu2ygVGuMmlzG8ZeRJ0bvR41nsAkxxhbyk8bZ1SS521Z7vmgJFTQQlfz/Mp/nJexGBz+v8sC9bM6+lNgskt4Ug==",
-          "dev": true
-        }
-      }
-    },
     "async": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
@@ -31622,12 +26171,6 @@
         }
       }
     },
-    "Base64": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz",
-      "integrity": "sha512-reGEWshDmTDQDsCec/HduOO9Wyj6yMOupMfhIf3ugN1TDlK2NQW4DDJSqNNtp380SNcvRfXtO8HSCQot0d0SMw==",
-      "dev": true
-    },
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -31664,60 +26207,6 @@
         "tweetnacl": "^0.14.3"
       }
     },
-    "beefy": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/beefy/-/beefy-1.1.0.tgz",
-      "integrity": "sha512-olZqTbw6gnofdbG98uAKvG6O/AjV6WGuPsKpYF41VQK39sUYvulm86RssD1K/iVNkkSJ8cuYeheJ8Nk2gz16wA==",
-      "dev": true,
-      "requires": {
-        "chokidar": "0.8.1",
-        "colors": "~0.6.0-1",
-        "ignorepatterns": "1.0.1",
-        "mime": "~1.2.9",
-        "nopt": "~2.1.1",
-        "open": "0.0.3",
-        "portfinder": "~0.2.1",
-        "response-stream": "0.0.0",
-        "script-injector": "~0.1.0",
-        "sse-stream": "0.0.4",
-        "through": "~2.2.0"
-      },
-      "dependencies": {
-        "chokidar": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-0.8.1.tgz",
-          "integrity": "sha512-Bl/CteHnM5g3eKGPMkraZQW7Yzk2Gu87eE3jdaMfCNJP79sVa54M5KHStr3WtJl4vVoVSndVDws6IFLTmMa3Lw==",
-          "dev": true
-        },
-        "colors": {
-          "version": "0.6.2",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
-          "integrity": "sha512-OsSVtHK8Ir8r3+Fxw/b4jS1ZLPXkV6ZxDRJQzeD7qo0SqMXWrHDM71DgYzPMHY8SFJ0Ao+nNU2p1MmwdzKqPrw==",
-          "dev": true
-        },
-        "mime": {
-          "version": "1.2.11",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-          "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
-          "dev": true
-        },
-        "nopt": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
-          "integrity": "sha512-x8vXm7BZ2jE1Txrxh/hO74HTuYZQEbo8edoRcANgdZ4+PCV+pbjd/xdummkmjjC7LU5EjPzlu8zEq/oxWylnKA==",
-          "dev": true,
-          "requires": {
-            "abbrev": "1"
-          }
-        },
-        "through": {
-          "version": "2.2.7",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
-          "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
-          "dev": true
-        }
-      }
-    },
     "beeper": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
@@ -31798,12 +26287,6 @@
       "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
       "dev": true
     },
-    "bn.js": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
-      "dev": true
-    },
     "body": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
@@ -31872,16 +26355,6 @@
         }
       }
     },
-    "boom": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
-      "integrity": "sha512-OvfN8y1oAxxphzkl2SnCS+ztV/uVKTATtgLjWYg/7KwcNyf3rzpHxNQJZCKtsZd4+MteKczhWbSjtEX4bGgU9g==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "hoek": "0.9.x"
-      }
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -31901,518 +26374,12 @@
         "fill-range": "^7.0.1"
       }
     },
-    "brfs": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/brfs/-/brfs-0.0.9.tgz",
-      "integrity": "sha512-5bjo0XG6pPGTFJsS4rtvP1vvwLp3UstdF062l10RKcfG60+izXak0DFcfQwMtBQNGlFm588mM2WvD02hJErVYg==",
-      "dev": true,
-      "requires": {
-        "escodegen": "0.0.17",
-        "falafel": "~0.1.6",
-        "through": "~2.2.0"
-      },
-      "dependencies": {
-        "escodegen": {
-          "version": "0.0.17",
-          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-0.0.17.tgz",
-          "integrity": "sha512-muX87X0L2dvVJ4ZPKAJLQlcyg2qhl6ps8Ow8vOAcuoFIrZLtXNMGfjnD19LSTrZ1SBHQsI+tvD8YlsJqHhfXrw==",
-          "dev": true,
-          "requires": {
-            "esprima": "~1.0.2",
-            "estraverse": "~0.0.4",
-            "source-map": ">= 0.1.2"
-          }
-        },
-        "esprima": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
-          "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
-          "dev": true
-        },
-        "estraverse": {
-          "version": "0.0.4",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz",
-          "integrity": "sha512-21DfBCsFJGb3HZr0vEBH1Wk1tGSbbzA8I/xtSSoy/pRtupHv0OgBmObcNGXM3ec6/pOXTOOUYY9/5bfluzz0sw==",
-          "dev": true
-        },
-        "through": {
-          "version": "2.2.7",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
-          "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
-          "dev": true
-        }
-      }
-    },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
-      "dev": true
-    },
-    "browser-pack": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz",
-      "integrity": "sha512-BHla5EbbxjNyLMFUMamVjeTY+q1QwHbrYNXlWOkw71QcBqAQF7maJyNh3OI/V0d5YyNdMYD6tiPhJB9ukBo99Q==",
-      "dev": true,
-      "requires": {
-        "combine-source-map": "~0.3.0",
-        "concat-stream": "~1.4.1",
-        "defined": "~0.0.0",
-        "JSONStream": "~0.8.4",
-        "through2": "~0.5.1",
-        "umd": "^2.1.0"
-      },
-      "dependencies": {
-        "concat-stream": {
-          "version": "1.4.11",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
-          "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
-          "dev": true,
-          "requires": {
-            "inherits": "~2.0.1",
-            "readable-stream": "~1.1.9",
-            "typedarray": "~0.0.5"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-          "dev": true
-        },
-        "through2": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-          "integrity": "sha512-zexCrAOTbjkBCXGyozn7hhS3aEaqdrc59mAD2E3dKYzV1vFuEGQ1hEDJN2oQMQFwy4he2zyLqPZV+AlfS8ZWJA==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.0.17",
-            "xtend": "~3.0.0"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.34",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-              "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-              "dev": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
-                "isarray": "0.0.1",
-                "string_decoder": "~0.10.x"
-              }
-            }
-          }
-        },
-        "xtend": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-          "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
-          "dev": true
-        }
-      }
-    },
-    "browser-resolve": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
-      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
-      "dev": true,
-      "requires": {
-        "resolve": "1.1.7"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
-          "dev": true
-        }
-      }
-    },
     "browser-stdout": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
       "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
       "dev": true
     },
-    "browserify": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/browserify/-/browserify-8.1.3.tgz",
-      "integrity": "sha512-0KKOkCQXCvP64qm73CtESE92pVnB5MkjA2W/Tmf+S4uPHVY4/SeCwO7wdr4mkke5ySoVyMqsOcMa5zo6uh9c9A==",
-      "dev": true,
-      "requires": {
-        "assert": "~1.3.0",
-        "browser-pack": "^3.2.0",
-        "browser-resolve": "^1.3.0",
-        "browserify-zlib": "~0.1.2",
-        "buffer": "^3.0.0",
-        "builtins": "~0.0.3",
-        "commondir": "0.0.1",
-        "concat-stream": "~1.4.1",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "~0.0.1",
-        "crypto-browserify": "^3.0.0",
-        "deep-equal": "~0.2.1",
-        "defined": "~0.0.0",
-        "deps-sort": "^1.3.5",
-        "domain-browser": "~1.1.0",
-        "duplexer2": "~0.0.2",
-        "events": "~1.0.0",
-        "glob": "^4.0.5",
-        "http-browserify": "^1.4.0",
-        "https-browserify": "~0.0.0",
-        "inherits": "~2.0.1",
-        "insert-module-globals": "^6.2.0",
-        "isarray": "0.0.1",
-        "JSONStream": "~0.8.3",
-        "labeled-stream-splicer": "^1.0.0",
-        "module-deps": "^3.6.3",
-        "os-browserify": "~0.1.1",
-        "parents": "^1.0.1",
-        "path-browserify": "~0.0.0",
-        "process": "^0.10.0",
-        "punycode": "~1.2.3",
-        "querystring-es3": "~0.2.0",
-        "readable-stream": "^1.0.33-1",
-        "resolve": "~0.7.1",
-        "shallow-copy": "0.0.1",
-        "shasum": "^1.0.0",
-        "shell-quote": "~0.0.1",
-        "stream-browserify": "^1.0.0",
-        "string_decoder": "~0.10.0",
-        "subarg": "^1.0.0",
-        "syntax-error": "^1.1.1",
-        "through2": "^1.0.0",
-        "timers-browserify": "^1.0.1",
-        "tty-browserify": "~0.0.0",
-        "umd": "~2.1.0",
-        "url": "~0.10.1",
-        "util": "~0.10.1",
-        "vm-browserify": "~0.0.1",
-        "xtend": "^3.0.0"
-      },
-      "dependencies": {
-        "assert": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz",
-          "integrity": "sha512-5aKcpD+XnHpZ7EGxsuo6uoILNh0rvm0Ypa17GlkrF2CNSPhvdgi3ft9XsL2ajdVOI2I3xuGZnHvlXAeqTZYvXg==",
-          "dev": true,
-          "requires": {
-            "util": "0.10.3"
-          },
-          "dependencies": {
-            "inherits": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-              "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
-              "dev": true
-            },
-            "util": {
-              "version": "0.10.3",
-              "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-              "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
-              "dev": true,
-              "requires": {
-                "inherits": "2.0.1"
-              }
-            }
-          }
-        },
-        "base64-js": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
-          "integrity": "sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==",
-          "dev": true
-        },
-        "buffer": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.2.tgz",
-          "integrity": "sha512-c3M77NkHJxS0zx/ErxXhDLr1v3y2MDXPeTJPvLNOaIYJ4ymHBUFQ9EXzt9HYuqAJllMoNb/EZ8hIiulnQFAUuQ==",
-          "dev": true,
-          "requires": {
-            "base64-js": "0.0.8",
-            "ieee754": "^1.1.4",
-            "isarray": "^1.0.0"
-          },
-          "dependencies": {
-            "isarray": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-              "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-              "dev": true
-            }
-          }
-        },
-        "commondir": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz",
-          "integrity": "sha512-Ghe1LmLv3G3c0XJYu+c88MCRIPqWQ67qaqKY1KvuN4uPAjfUj+y4hvcpZ2kCPrjpRNyklW4dpAZZ8a7vOh50tg==",
-          "dev": true
-        },
-        "concat-stream": {
-          "version": "1.4.11",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
-          "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
-          "dev": true,
-          "requires": {
-            "inherits": "~2.0.1",
-            "readable-stream": "~1.1.9",
-            "typedarray": "~0.0.5"
-          }
-        },
-        "deep-equal": {
-          "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
-          "integrity": "sha512-FXgye2Jr6oEk01S7gmSrHrPEQ1ontR7wwl+nYiZ8h4SXlHVm0DYda74BIPcHz2s2qPz4+375IcAz1vsWLwddgQ==",
-          "dev": true
-        },
-        "duplexer2": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-          "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.1.9"
-          }
-        },
-        "events": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/events/-/events-1.0.2.tgz",
-          "integrity": "sha512-XK19KwlDJo8XsceooxNDK1pObtcT44+Xte6V/jQc4a+fHq1qEouThyyX2ePmS0hS8RcCulmRxzg+T8jiLKAFFQ==",
-          "dev": true
-        },
-        "glob": {
-          "version": "4.5.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-          "integrity": "sha512-I0rTWUKSZKxPSIAIaqhSXTM/DiII6wame+rEC3cFA5Lqmr9YmdL7z6Hj9+bdWtTvoY1Su4/OiMLmb37Y7JzvJQ==",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^2.0.1",
-            "once": "^1.3.0"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-          "dev": true
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "2.0.10",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.0.0"
-          }
-        },
-        "process": {
-          "version": "0.10.1",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.10.1.tgz",
-          "integrity": "sha512-dyIett8dgGIZ/TXKUzeYExt7WA6ldDzys9vTDU/cCA9L17Ypme+KzS+NjQCjpn9xsvi/shbMC+yP/BcFMBz0NA==",
-          "dev": true
-        },
-        "punycode": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz",
-          "integrity": "sha512-h/vscxLPvI2l7k/0dFUKZ5I5TgMCJ/Pl+J6rw77PDuQM6UApf/GaRVkjv/YSm2k+fbp7Yw8dxsoe29DolT7h7w==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "resolve": {
-          "version": "0.7.4",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz",
-          "integrity": "sha512-zxmAcifDjKxmUbk7chQdKhDSn8ml08g+MYyU37xhEXBp+N81cfbYsm4e0Gn9jtLbAvbR8w8Ox09xqUZtPuCoeA==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-          "dev": true
-        },
-        "through2": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.1.13-1 <1.2.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          },
-          "dependencies": {
-            "xtend": {
-              "version": "4.0.2",
-              "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-              "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-              "dev": true
-            }
-          }
-        },
-        "url": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-          "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==",
-          "dev": true,
-          "requires": {
-            "punycode": "1.3.2",
-            "querystring": "0.2.0"
-          },
-          "dependencies": {
-            "punycode": {
-              "version": "1.3.2",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-              "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
-              "dev": true
-            }
-          }
-        },
-        "util": {
-          "version": "0.10.4",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        },
-        "xtend": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-          "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
-          "dev": true
-        }
-      }
-    },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-      "integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==",
-      "dev": true,
-      "requires": {
-        "pako": "~0.2.0"
-      }
-    },
     "browserslist": {
       "version": "4.21.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
@@ -32549,24 +26516,12 @@
       "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
       "dev": true
     },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
-      "dev": true
-    },
     "buffers": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
       "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
       "dev": true
     },
-    "builtins": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz",
-      "integrity": "sha512-T8uCGKc0/2aLVt6omt8JxDRBoWEMkku+wFesxnhxnt4NygVZG99zqxo7ciK8eebszceKamGoUiLdkXCgGQyrQw==",
-      "dev": true
-    },
     "bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -32749,12 +26704,6 @@
         "get-intrinsic": "^1.0.2"
       }
     },
-    "callsite": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-      "integrity": "sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==",
-      "dev": true
-    },
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -32767,24 +26716,6 @@
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
-    "camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==",
-          "dev": true
-        }
-      }
-    },
     "can-autoplay": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/can-autoplay/-/can-autoplay-3.0.2.tgz",
@@ -32802,15 +26733,6 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
       "dev": true
     },
-    "catharsis": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
-      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.15"
-      }
-    },
     "ccount": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
@@ -32944,16 +26866,6 @@
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "dev": true
     },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -33156,34 +27068,6 @@
       "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
       "dev": true
     },
-    "combine-source-map": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
-      "integrity": "sha512-HRKa6g9SC1xd6ifto8ay6SxvyHaaQ50/8NO1ZONXx2hsIF9t/52qXa7Eeivaf5KFOSowK7Nm8TkIL/VC4khdBA==",
-      "dev": true,
-      "requires": {
-        "convert-source-map": "~0.3.0",
-        "inline-source-map": "~0.3.0",
-        "source-map": "~0.1.31"
-      },
-      "dependencies": {
-        "convert-source-map": {
-          "version": "0.3.5",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
-          "integrity": "sha512-+4nRk0k3oEpwUB7/CalD7xE2z4VmtEnnq0GO2IPTkrooTrAhEsWvuLF5iWP1dXrwluki/azwXV1ve7gtYuPldg==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
-      }
-    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -33199,12 +27083,6 @@
       "integrity": "sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==",
       "dev": true
     },
-    "commander": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz",
-      "integrity": "sha512-qebjpyeaA/nJ4w3EO2cV2++/zEkccPnjWogzA2rff+Lk8ILI75vULeTmyd4wPxWdKwtP3J+G39IXVZadh0UHyw==",
-      "dev": true
-    },
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -33277,16 +27155,6 @@
         }
       }
     },
-    "config-chain": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
-      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
-      "dev": true,
-      "requires": {
-        "ini": "^1.3.4",
-        "proto-list": "~1.2.1"
-      }
-    },
     "connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
@@ -33322,18 +27190,6 @@
       "integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g==",
       "dev": true
     },
-    "console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "constants-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz",
-      "integrity": "sha512-FL+diDS9AKR5BAA2M+GNk8lnH64tRE3zepTG9hucxc7o04LgCRhkQZhF7u/OKHZT8LLRT+sZEi9qFzXUchq9pA==",
-      "dev": true
-    },
     "content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -33482,51 +27338,6 @@
         }
       }
     },
-    "create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
     "criteo-direct-rsa-validate": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/criteo-direct-rsa-validate/-/criteo-direct-rsa-validate-1.1.0.tgz",
@@ -33552,35 +27363,6 @@
         "which": "^2.0.1"
       }
     },
-    "cryptiles": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
-      "integrity": "sha512-gvWSbgqP+569DdslUiCelxIv3IYK5Lgmq1UrRnk+s1WxQOQ16j3GPDcjdtgL5Au65DU/xQi6q3xPtf5Kta+3IQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "boom": "0.4.x"
-      }
-    },
-    "crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      }
-    },
     "crypto-js": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
@@ -33617,31 +27399,6 @@
       "integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
       "dev": true
     },
-    "cssauron": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
-      "integrity": "sha512-Ht70DcFBh+/ekjVrYS2PlDMdSQEl3OFNmjK6lcn49HptBgilXf/Zwg4uFh9Xn0pX3Q8YOkSjIFOfK2osvdqpBw==",
-      "dev": true,
-      "requires": {
-        "through": "X.X.X"
-      }
-    },
-    "ctype": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-      "integrity": "sha512-T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg==",
-      "dev": true,
-      "optional": true
-    },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==",
-      "dev": true,
-      "requires": {
-        "array-find-index": "^1.0.1"
-      }
-    },
     "custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -33716,12 +27473,6 @@
         }
       }
     },
-    "debuglog": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
-      "integrity": "sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==",
-      "dev": true
-    },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
@@ -33860,12 +27611,6 @@
         "isobject": "^3.0.1"
       }
     },
-    "defined": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz",
-      "integrity": "sha512-zpqiCT8bODLu3QSmLLic8xJnYWBFjOSu/fBCm189oAiTtPq/PSanNACKZDS7kgSyCJY7P+IcODzlIogBK/9RBg==",
-      "dev": true
-    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -33877,86 +27622,12 @@
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
       "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
     },
-    "deps-sort": {
-      "version": "1.3.9",
-      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz",
-      "integrity": "sha512-aEnmQuu/Hf5h8akL8QshYWzk9MVBg/JYMyNq/Lz68i69nR17tunjP6o/AC6Tn48c8ayzG6aeKs6OoFOtVCtvrQ==",
-      "dev": true,
-      "requires": {
-        "JSONStream": "^1.0.3",
-        "shasum": "^1.0.0",
-        "subarg": "^1.0.0",
-        "through2": "^1.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "jsonparse": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-          "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-          "dev": true
-        },
-        "JSONStream": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-          "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-          "dev": true,
-          "requires": {
-            "jsonparse": "^1.2.0",
-            "through": ">=2.2.7 <3"
-          }
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-          "dev": true
-        },
-        "through2": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.1.13-1 <1.2.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          }
-        }
-      }
-    },
     "dequal": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
       "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
       "dev": true
     },
-    "des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
     "destroy": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
@@ -33980,30 +27651,6 @@
       "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
       "dev": true
     },
-    "detective": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
-      "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
-      "dev": true,
-      "requires": {
-        "acorn": "^5.2.1",
-        "defined": "^1.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "5.7.4",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
-          "dev": true
-        },
-        "defined": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
-          "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
-          "dev": true
-        }
-      }
-    },
     "devtools": {
       "version": "7.16.16",
       "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
@@ -34045,16 +27692,6 @@
       "integrity": "sha512-myh3hSFp0YWa2GED11PmbLhV4dv9RdO7YUz27XJrbQLnP5bMbZL6dfOOILTHO57yH0kX5GfuOZBsg/4NamfPvQ==",
       "dev": true
     },
-    "dezalgo": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
-      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
-      "dev": true,
-      "requires": {
-        "asap": "^2.0.0",
-        "wrappy": "1"
-      }
-    },
     "di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -34073,25 +27710,6 @@
       "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
       "dev": true
     },
-    "diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
     "dlv": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
@@ -34267,12 +27885,6 @@
       "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
       "dev": true
     },
-    "domain-browser": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
-      "integrity": "sha512-fJ5MoHxe69h3E4/lJtFRhcWwLb04bhIBSfvCEMS1YDH+/9yEZTqBHTSTgch8nCP5tE5k2gdQEjodUqJzy7qJ9Q==",
-      "dev": true
-    },
     "dset": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz",
@@ -34394,29 +28006,6 @@
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.243.tgz",
       "integrity": "sha512-BgLD2gBX43OSXwlT01oYRRD5NIB4n3okTRxkzEAC6G0SZG4TTlyrWMjbOo0fajCwqwpRtMHXQNMjtRN6qpNtfw=="
     },
-    "elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
     "emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
@@ -34495,12 +28084,6 @@
       "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
       "dev": true
     },
-    "entities": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-      "dev": true
-    },
     "errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -34617,20 +28200,6 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "es6-map": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-      "integrity": "sha512-mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A==",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14",
-        "es6-iterator": "~2.0.1",
-        "es6-set": "~0.1.5",
-        "es6-symbol": "~3.1.1",
-        "event-emitter": "~0.3.5"
-      }
-    },
     "es6-object-assign": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
@@ -34652,28 +28221,6 @@
         "es6-promise": "^4.0.3"
       }
     },
-    "es6-set": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz",
-      "integrity": "sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==",
-      "dev": true,
-      "requires": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.62",
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "^3.1.3",
-        "event-emitter": "^0.3.5",
-        "type": "^2.7.2"
-      },
-      "dependencies": {
-        "type": {
-          "version": "2.7.2",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-          "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
-          "dev": true
-        }
-      }
-    },
     "es6-symbol": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
@@ -34781,18 +28328,6 @@
         }
       }
     },
-    "escope": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
-      "integrity": "sha512-75IUQsusDdalQEW/G/2esa87J7raqdJF+Ca0/Xm5C3Q58Nr4yVYjZGp/P1+2xiEVgXRrA39dpRb8LcshajbqDQ==",
-      "dev": true,
-      "requires": {
-        "es6-map": "^0.1.3",
-        "es6-weak-map": "^2.0.1",
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
     "eslint": {
       "version": "7.32.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
@@ -35072,785 +28607,7 @@
       }
     },
     "eslint-plugin-prebid": {
-      "version": "file:plugins/eslint",
-      "requires": {
-        "beefy": "^1.0.0",
-        "brfs": "0.0.9",
-        "browserify": "^8.1.3",
-        "chai": "^1.9.1",
-        "chalk": "^1.0.0",
-        "concat-stream": "^1.4.6",
-        "coveralls": "2.11.2",
-        "dateformat": "^1.0.8",
-        "debug": "^2.1.1",
-        "doctrine": "^0.6.2",
-        "escape-string-regexp": "^1.0.2",
-        "escope": "^3.2.0",
-        "espree": "^2.2.0",
-        "esprima": "^2.4.1",
-        "esprima-fb": "^10001.1.0-dev-harmony-fb",
-        "estraverse": "^4.1.0",
-        "estraverse-fb": "^1.3.1",
-        "gh-got": "^1.0.3",
-        "globals": "^8.2.0",
-        "inquirer": "^0.8.2",
-        "is-my-json-valid": "^2.10.0",
-        "istanbul": "^0.3.5",
-        "js-yaml": "^3.2.5",
-        "jsdoc": "^3.3.0-beta1",
-        "jsonlint": "^1.6.2",
-        "lodash.clonedeep": "^3.0.1",
-        "lodash.merge": "^3.3.2",
-        "lodash.omit": "^3.1.0",
-        "markdownlint": "^0.0.6",
-        "minimatch": "^2.0.1",
-        "mkdirp": "^0.5.0",
-        "mocha": "^2.1.0",
-        "mocha-phantomjs": "3.6.0",
-        "npm-license": "^0.2.3",
-        "object-assign": "^2.0.0",
-        "optionator": "^0.5.0",
-        "path-is-absolute": "^1.0.0",
-        "path-is-inside": "^1.0.1",
-        "phantomjs": "1.9.7-15",
-        "proxyquire": "^1.0.0",
-        "rewire": "^2.3.4",
-        "semver": "^4.1.0",
-        "shelljs": "^0.3.0",
-        "shelljs-nodecli": "~0.1.0",
-        "sinon": "1.14.1",
-        "strip-json-comments": "~1.0.1",
-        "text-table": "~0.2.0",
-        "through": "^2.3.6",
-        "user-home": "^1.0.0",
-        "xml-escape": "~1.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
-          "integrity": "sha512-q5i8bFLg2wDfsuR56c1NzlJFPzVD+9mxhDrhqOGigEFa87OZHlF+9dWeGWzVTP/0ECiA/JUGzfzRr2t3eYORRw==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-          "dev": true
-        },
-        "argparse": {
-          "version": "0.1.16",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
-          "integrity": "sha512-LjmC2dNpdn2L4UzyoaIr11ELYoLn37ZFy9zObrQFHsSuOepeUEMKnM8w5KL4Tnrp2gy88rRuQt6Ky8Bjml+Baw==",
-          "dev": true,
-          "requires": {
-            "underscore": "~1.7.0",
-            "underscore.string": "~2.4.0"
-          }
-        },
-        "asn1": {
-          "version": "0.1.11",
-          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-          "integrity": "sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA==",
-          "dev": true,
-          "optional": true
-        },
-        "assert-plus": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-          "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
-          "dev": true,
-          "optional": true
-        },
-        "assertion-error": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz",
-          "integrity": "sha512-g/gZV+G476cnmtYI+Ko9d5khxSoCSoom/EaNmmCfwpOvBXEJ18qwFrxfP1/CsIqk2no1sAKKwxndV0tP7ROOFQ==",
-          "dev": true
-        },
-        "aws-sign2": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-          "integrity": "sha512-oqUX0DM5j7aPWPCnpWebiyNIj2wiNI87ZxnOMoGv0aE4TGlBy2N+5iWc6dQ/NOKZaBD2W6PVz8jtOGkWzSC5EA==",
-          "dev": true,
-          "optional": true
-        },
-        "chai": {
-          "version": "1.10.0",
-          "resolved": "https://registry.npmjs.org/chai/-/chai-1.10.0.tgz",
-          "integrity": "sha512-E3L9M2SeQU1XagJkE9KJyTAXXHKJkJ1EsKkFp0Rl53lYa3mro2PVgYHNiCb2YRa2nUeyg7aqmI1EIcSBayNd5w==",
-          "dev": true,
-          "requires": {
-            "assertion-error": "1.0.0",
-            "deep-eql": "0.1.3"
-          }
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "cli-width": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz",
-          "integrity": "sha512-eMU2akIeEIkCxGXUNmDnJq1KzOIiPnJ+rKqRe6hcxE3vIOPvpMrBYOn/Bl7zNlYJj/zQxXquAnozHUCf9Whnsg==",
-          "dev": true
-        },
-        "combined-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-          "integrity": "sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delayed-stream": "0.0.5"
-          }
-        },
-        "commander": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
-          "integrity": "sha512-CD452fnk0jQyk3NfnK+KkR/hUPoHt5pVaKHogtyyv3N0U4QfAal9W0/rXLOg/vVZgQKa7jdtXypKs1YAip11uQ==",
-          "dev": true
-        },
-        "coveralls": {
-          "version": "2.11.2",
-          "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz",
-          "integrity": "sha512-+OK2imSCDXSYaOyAxGVUmzDfDtCYLW+gtdDVpjvq99R5Dyry4Puj3EQ/4YnsxNc6RHsuhx3wIkHSBIRaJZY5YQ==",
-          "dev": true,
-          "requires": {
-            "js-yaml": "3.0.1",
-            "lcov-parse": "0.0.6",
-            "log-driver": "1.2.4",
-            "request": "2.40.0"
-          },
-          "dependencies": {
-            "esprima": {
-              "version": "1.0.4",
-              "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
-              "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
-              "dev": true
-            },
-            "js-yaml": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz",
-              "integrity": "sha512-dgxgLzZS9qLWAQd/wrVG8tOiRSBJq1Ss9gbd7+fdBhcia3efHjLLpPkcUhKOyVACxTEAgnao3RT1kj1otiW42g==",
-              "dev": true,
-              "requires": {
-                "argparse": "~ 0.1.11",
-                "esprima": "~ 1.0.2"
-              }
-            }
-          }
-        },
-        "dateformat": {
-          "version": "1.0.12",
-          "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-          "integrity": "sha512-5sFRfAAmbHdIts+eKjR9kYJoF0ViCMVX9yqLu5A7S/v+nd077KgCITOMiirmyCBiZpKLDXbBOkYm6tu7rX/TKg==",
-          "dev": true,
-          "requires": {
-            "get-stdin": "^4.0.1",
-            "meow": "^3.3.0"
-          }
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "deep-eql": {
-          "version": "0.1.3",
-          "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
-          "integrity": "sha512-6sEotTRGBFiNcqVoeHwnfopbSpi5NbH1VWJmYCVkmxMmaVTT0bUTrNaGyBwhgP4MZL012W/mkzIn3Da+iDYweg==",
-          "dev": true,
-          "requires": {
-            "type-detect": "0.1.1"
-          }
-        },
-        "delayed-stream": {
-          "version": "0.0.5",
-          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-          "integrity": "sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA==",
-          "dev": true,
-          "optional": true
-        },
-        "diff": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
-          "integrity": "sha512-VzVc42hMZbYU9Sx/ltb7KYuQ6pqAw+cbFWVy4XKdkuEL2CFaRLGEnISPs7YdzaUGpi+CpIqvRmu7hPQ4T7EQ5w==",
-          "dev": true
-        },
-        "doctrine": {
-          "version": "0.6.4",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.6.4.tgz",
-          "integrity": "sha512-FSGvDB23RFdm/Z2hEINXN1AcBW5I4YBqpGD/lScJV34vuOwrPFyLHN9bwCzLa6lUmqS6ipdp5XlVJRQ6yJ5iSA==",
-          "dev": true,
-          "requires": {
-            "esutils": "^1.1.6",
-            "isarray": "0.0.1"
-          }
-        },
-        "escodegen": {
-          "version": "1.7.1",
-          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.7.1.tgz",
-          "integrity": "sha512-2cd7+JUtUEmZVpGmfF9r+uRYXswJAkf85Ce8GvdBa7hSvdjY8hGo+rwC5syAgYzqHpfxNJzLntFjw6879yPbgQ==",
-          "dev": true,
-          "requires": {
-            "esprima": "^1.2.2",
-            "estraverse": "^1.9.1",
-            "esutils": "^2.0.2",
-            "optionator": "^0.5.0",
-            "source-map": "~0.2.0"
-          },
-          "dependencies": {
-            "esprima": {
-              "version": "1.2.5",
-              "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz",
-              "integrity": "sha512-S9VbPDU0adFErpDai3qDkjq8+G05ONtKzcyNrPKg/ZKa+tf879nX2KexNU95b31UoTJjRLInNBHHHjFPoCd7lQ==",
-              "dev": true
-            },
-            "estraverse": {
-              "version": "1.9.3",
-              "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-              "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==",
-              "dev": true
-            },
-            "esutils": {
-              "version": "2.0.3",
-              "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-              "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-              "dev": true
-            }
-          }
-        },
-        "espree": {
-          "version": "2.2.5",
-          "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz",
-          "integrity": "sha512-HWJpgkL44cbjWiOTC9Pm34RZE57H1g9V4Ln9U14TUtiywFTLMMpMCtmQK5rkjbGBXigQT8bS3r45+Dt5+m0SZg==",
-          "dev": true
-        },
-        "esprima": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.5.0.tgz",
-          "integrity": "sha512-uM6hfS0/8ybNIj8SGRMdidPJy5uhWqWN/GIkyqnMAbCSL44yfFGLuBpRRCgOpBXBZt2OymQuM+IfahkqJq3DWw==",
-          "dev": true
-        },
-        "esutils": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz",
-          "integrity": "sha512-RG1ZkUT7iFJG9LSHr7KDuuMSlujfeTtMNIcInURxKAxhMtwQhI3NrQhz26gZQYlsYZQKzsnwtpKrFKj9K9Qu1A==",
-          "dev": true
-        },
-        "fast-levenshtein": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz",
-          "integrity": "sha512-hYsfI0s4lfQ2rHVFKXwAr/L/ZSbq9TZwgXtZqW7ANcn9o9GKvcbWxOnxx7jykXf/Ezv1V8TvaBEKcGK7DWKX5A==",
-          "dev": true
-        },
-        "figures": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-          "integrity": "sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==",
-          "dev": true,
-          "requires": {
-            "escape-string-regexp": "^1.0.5",
-            "object-assign": "^4.1.0"
-          },
-          "dependencies": {
-            "object-assign": {
-              "version": "4.1.1",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-              "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-              "dev": true
-            }
-          }
-        },
-        "forever-agent": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
-          "integrity": "sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A==",
-          "dev": true
-        },
-        "form-data": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-          "integrity": "sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "async": "~0.9.0",
-            "combined-stream": "~0.0.4",
-            "mime": "~1.2.11"
-          },
-          "dependencies": {
-            "async": {
-              "version": "0.9.2",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-              "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "glob": {
-          "version": "3.2.11",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-          "integrity": "sha512-hVb0zwEZwC1FXSKRPFTeOtN7AArJcJlI6ULGLtrstaswKNlrTJqAA+1lYlSUop4vjA423xlBzqfVS3iWGlqJ+g==",
-          "dev": true,
-          "requires": {
-            "inherits": "2",
-            "minimatch": "0.3"
-          },
-          "dependencies": {
-            "minimatch": {
-              "version": "0.3.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-              "integrity": "sha512-WFX1jI1AaxNTZVOHLBVazwTWKaQjoykSzCBNXB72vDTCzopQGtyP91tKdFK5cv1+qMwPyiTu1HqUriqplI8pcA==",
-              "dev": true,
-              "requires": {
-                "lru-cache": "2",
-                "sigmund": "~1.0.0"
-              }
-            }
-          }
-        },
-        "globals": {
-          "version": "8.18.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-8.18.0.tgz",
-          "integrity": "sha512-IHCTKEGo42ICEkTZBADyl4HX06hVdFF4qdJdqOgaBe5X8RE1/MrvubetsEtGTcwjs46djFq0Gc3+5RgTsc3UoQ==",
-          "dev": true
-        },
-        "growl": {
-          "version": "1.9.2",
-          "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-          "integrity": "sha512-RTBwDHhNuOx4F0hqzItc/siXCasGfC4DeWcBamclWd+6jWtBaeB/SGbMkGf0eiQoW7ib8JpvOgnUsmgMHI3Mfw==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
-          "dev": true
-        },
-        "http-signature": {
-          "version": "0.10.1",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-          "integrity": "sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asn1": "0.1.11",
-            "assert-plus": "^0.1.5",
-            "ctype": "0.5.3"
-          }
-        },
-        "inquirer": {
-          "version": "0.8.5",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz",
-          "integrity": "sha512-+rksrtdqQ8do7yOsmP5YIgbSdbZYuCIrnfH5vjFYGAr1XgJpMksb3rFZMJ3jiKuUyDVEA4MVDYbkA3ribJn3Tg==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^1.1.1",
-            "chalk": "^1.0.0",
-            "cli-width": "^1.0.1",
-            "figures": "^1.3.5",
-            "lodash": "^3.3.1",
-            "readline2": "^0.1.1",
-            "rx": "^2.4.3",
-            "through": "^2.3.6"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "istanbul": {
-          "version": "0.3.22",
-          "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.3.22.tgz",
-          "integrity": "sha512-8H/jxiee2UqX/mviKkPoKQYMxU2t995FC5PwO4zjWeDPOozjoeKqxEyN62l9o5+UgzvYQbrKgQjjxhGON8FcMg==",
-          "dev": true,
-          "requires": {
-            "abbrev": "1.0.x",
-            "async": "1.x",
-            "escodegen": "1.7.x",
-            "esprima": "2.5.x",
-            "fileset": "0.2.x",
-            "handlebars": "^4.0.1",
-            "js-yaml": "3.x",
-            "mkdirp": "0.5.x",
-            "nopt": "3.x",
-            "once": "1.x",
-            "resolve": "1.1.x",
-            "supports-color": "^3.1.0",
-            "which": "^1.1.1",
-            "wordwrap": "^1.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "3.2.3",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-              "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^1.0.0"
-              }
-            }
-          }
-        },
-        "lcov-parse": {
-          "version": "0.0.6",
-          "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz",
-          "integrity": "sha512-chuBQJZiBq28YUM6Yr3tf3h5Lxhb+DvhbxxSNpsHURSXiZXOzp49phiWG2pKHboOehJDujivwNQGRP8mAErMvQ==",
-          "dev": true
-        },
-        "levn": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz",
-          "integrity": "sha512-mvp+NO++YH0B+e8cC/SvJxk6k5Z9Ngd3iXuz7tmT8vZCyQZj/5SI1GkFOiZGGPkm5wWGI9SUrqiAfPq7BJH+0w==",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "~1.1.0",
-            "type-check": "~0.3.1"
-          }
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==",
-          "dev": true
-        },
-        "lodash.clonedeep": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz",
-          "integrity": "sha512-I8MpGh5z+6OixDAAb21teLSZDmqVPjlq02Q7ZFrbn2xnQHYYuJf6on/94SWpF/p0s3p/cEv/53ro4AhDOfCR0g==",
-          "dev": true,
-          "requires": {
-            "lodash._baseclone": "^3.0.0",
-            "lodash._bindcallback": "^3.0.0"
-          }
-        },
-        "lodash.isplainobject": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz",
-          "integrity": "sha512-P4wZnho5curNqeEq/x292Pb57e1v+woR7DJ84DURelKB46lby8aDEGVobSaYtzHdQBWQrJSdxcCwjlGOvvdIyg==",
-          "dev": true,
-          "requires": {
-            "lodash._basefor": "^3.0.0",
-            "lodash.isarguments": "^3.0.0",
-            "lodash.keysin": "^3.0.0"
-          }
-        },
-        "lodash.merge": {
-          "version": "3.3.2",
-          "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-3.3.2.tgz",
-          "integrity": "sha512-ZgGZpRhWLjivGUbjtApZR4HyLv/UAyoYqESVYkK4aLBJVHRrbFpG+GNnE9JPijliME4LkKM0SFI/WyOiBiv1+w==",
-          "dev": true,
-          "requires": {
-            "lodash._arraycopy": "^3.0.0",
-            "lodash._arrayeach": "^3.0.0",
-            "lodash._createassigner": "^3.0.0",
-            "lodash._getnative": "^3.0.0",
-            "lodash.isarguments": "^3.0.0",
-            "lodash.isarray": "^3.0.0",
-            "lodash.isplainobject": "^3.0.0",
-            "lodash.istypedarray": "^3.0.0",
-            "lodash.keys": "^3.0.0",
-            "lodash.keysin": "^3.0.0",
-            "lodash.toplainobject": "^3.0.0"
-          }
-        },
-        "log-driver": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz",
-          "integrity": "sha512-QmyGbAcBbHk8ysCGtT6FQ+LZML6+EeT0NdotCJGu72kNhknXtdso1G/NI0r7j45whFYNTU15XMW+JGOvGX07QQ==",
-          "dev": true
-        },
-        "lolex": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz",
-          "integrity": "sha512-wGZrF3AlAWxG2j+6NyyttZ/UVxW8o/F+q01IUGuf2PiEIAUG9av/vpBS5TQHTQtzPmPJB4CZWjwyGR4C4aX83w==",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-          "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==",
-          "dev": true
-        },
-        "mime": {
-          "version": "1.2.11",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-          "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
-          "dev": true,
-          "optional": true
-        },
-        "mime-types": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
-          "integrity": "sha512-echfutj/t5SoTL4WZpqjA1DCud1XO0WQF3/GJ48YBmc4ZMhCK77QA6Z/w6VTQERLKuJ4drze3kw2TUT8xZXVNw==",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "2.0.10",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.0.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.6"
-          }
-        },
-        "mocha": {
-          "version": "2.5.3",
-          "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
-          "integrity": "sha512-jNt2iEk9FPmZLzL+sm4FNyOIDYXf2wUU6L4Cc8OIKK/kzgMHKPi4YhTZqG4bW4kQVdIv6wutDybRhXfdnujA1Q==",
-          "dev": true,
-          "requires": {
-            "commander": "2.3.0",
-            "debug": "2.2.0",
-            "diff": "1.4.0",
-            "escape-string-regexp": "1.0.2",
-            "glob": "3.2.11",
-            "growl": "1.9.2",
-            "jade": "0.26.3",
-            "mkdirp": "0.5.1",
-            "supports-color": "1.2.0",
-            "to-iso-string": "0.0.2"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "2.2.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-              "integrity": "sha512-X0rGvJcskG1c3TgSCPqHJ0XJgwlcvOC7elJ5Y0hYuKBZoVqWpAMfLOeIh2UI/DCQ5ruodIjvsugZtjUYUw2pUw==",
-              "dev": true,
-              "requires": {
-                "ms": "0.7.1"
-              }
-            },
-            "escape-string-regexp": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
-              "integrity": "sha512-cQpUid7bdTUnFin8S7BnNdOk+/eDqQmKgCANSyd/jAhrKEvxUvr9VQ8XZzXiOtest8NLfk3FSBZzwvemZNQ6Vg==",
-              "dev": true
-            },
-            "minimist": {
-              "version": "0.0.8",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-              "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
-              "dev": true
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
-              "dev": true,
-              "requires": {
-                "minimist": "0.0.8"
-              }
-            },
-            "ms": {
-              "version": "0.7.1",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-              "integrity": "sha512-lRLiIR9fSNpnP6TC4v8+4OU7oStC01esuNowdQ34L+Gk8e5Puoc88IqJ+XAY/B3Mn2ZKis8l8HX90oU8ivzUHg==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "1.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
-              "integrity": "sha512-mS5xsnjTh5b7f2DM6bch6lR582UCOTphzINlZnDsfpIRrwI6r58rb6YSSGsdexkm8qw2bBVO2ID2fnJOTuLiPA==",
-              "dev": true
-            }
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-          "dev": true
-        },
-        "oauth-sign": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
-          "integrity": "sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ==",
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
-          "integrity": "sha512-CdsOUYIh5wIiozhJ3rLQgmUTgcyzFwZZrqhkKhODMoGtPKM+wt0h0CNIoauJWMsS9822EdzPsF/6mb4nLvPN5g==",
-          "dev": true
-        },
-        "optionator": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz",
-          "integrity": "sha512-jUr7aBk/kCInAEsl+qxuw4ORpe458atDKXNLhyvPUD4NfnsJsbAViX1b9nb/0rS62lO8cIFd1VoiaXLQ+MybOw==",
-          "dev": true,
-          "requires": {
-            "deep-is": "~0.1.2",
-            "fast-levenshtein": "~1.0.0",
-            "levn": "~0.2.5",
-            "prelude-ls": "~1.1.1",
-            "type-check": "~0.3.1",
-            "wordwrap": "~0.0.2"
-          },
-          "dependencies": {
-            "wordwrap": {
-              "version": "0.0.3",
-              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-              "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
-              "dev": true
-            }
-          }
-        },
-        "prelude-ls": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-          "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-          "dev": true
-        },
-        "qs": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz",
-          "integrity": "sha512-tHuOP9TN/1VmDM/ylApGK1QF3PSIP8I6bHDEfoKNQeViREQ/sfu1bAUrA1hoDun8p8Tpm7jcsz47g+3PiGoYdg==",
-          "dev": true
-        },
-        "request": {
-          "version": "2.40.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
-          "integrity": "sha512-waNoGB4Z7bPn+lgqPk7l7hhze4Vd68jKccnwLeS7vr9GMxz0iWQbYTbBNWzfIk87Urx7V44pu29qjF/omej+Fw==",
-          "dev": true,
-          "requires": {
-            "aws-sign2": "~0.5.0",
-            "forever-agent": "~0.5.0",
-            "form-data": "~0.1.0",
-            "hawk": "1.1.1",
-            "http-signature": "~0.10.0",
-            "json-stringify-safe": "~5.0.0",
-            "mime-types": "~1.0.1",
-            "node-uuid": "~1.4.0",
-            "oauth-sign": "~0.3.0",
-            "qs": "~1.0.0",
-            "stringstream": "~0.0.4",
-            "tough-cookie": ">=0.12.0",
-            "tunnel-agent": "~0.4.0"
-          }
-        },
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
-          "dev": true
-        },
-        "semver": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-          "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
-          "dev": true
-        },
-        "sinon": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.14.1.tgz",
-          "integrity": "sha512-cysrMyrriLwSn5Ye82xTCAVVS6Q6XLxlZE3jtPb4IFng2npN3lQWQ5Uyaud6cRpzztbEy2sbJkrDSbIl6OKUCA==",
-          "dev": true,
-          "requires": {
-            "formatio": "1.1.1",
-            "lolex": "1.1.0",
-            "util": ">=0.10.3 <1"
-          }
-        },
-        "source-map": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-          "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-              "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-          "dev": true
-        },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
-          "dev": true,
-          "optional": true
-        },
-        "type-check": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-          "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "~1.1.2"
-          }
-        },
-        "type-detect": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
-          "integrity": "sha512-5rqszGVwYgBoDkIm2oUtvkfZMQ0vk29iDMU0W2qCa3rG0vPDNczCMT4hV/bLBgLg8k8ri6+u3Zbt+S/14eMzlA==",
-          "dev": true
-        },
-        "underscore": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
-          "integrity": "sha512-cp0oQQyZhUM1kpJDLdGO1jPZHgS/MpzoWYfe9+CM2h/QGDZlqwT2T3YGukuBdaNJ/CAPoeyAZRRHz8JFo176vA==",
-          "dev": true
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
+      "version": "file:plugins/eslint"
     },
     "eslint-plugin-promise": {
       "version": "5.2.0",
@@ -35924,12 +28681,6 @@
       "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
       "dev": true
     },
-    "esprima-fb": {
-      "version": "10001.1.0-dev-harmony-fb",
-      "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-10001.1.0-dev-harmony-fb.tgz",
-      "integrity": "sha512-z2dx3A/ZGNamsDjJS4FZPXnpoRCEkQXqouKBCOaJifyx4HkEVoSQ3YWFX18Scut1Aq9gnctzLWcWJgKkL0xNQw==",
-      "dev": true
-    },
     "esquery": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
@@ -35970,13 +28721,6 @@
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true
     },
-    "estraverse-fb": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/estraverse-fb/-/estraverse-fb-1.3.2.tgz",
-      "integrity": "sha512-wp3lfRrWy5EQD9TqesuYM1SKVP4ERT0cUatb4e8Vznf4K5IOpREhuyXZxGj3a9s9mvX5vGZKNHA4R9D4kp9Q9A==",
-      "dev": true,
-      "requires": {}
-    },
     "estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
@@ -36039,16 +28783,6 @@
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true
     },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "execa": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
@@ -36454,23 +29188,6 @@
       "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==",
       "dev": true
     },
-    "falafel": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/falafel/-/falafel-0.1.6.tgz",
-      "integrity": "sha512-r1s3VwKzm6PB35MZmnfZoF6NTgSKRxf8How2lBsrDq81OsYXb/2fR8ysfURHCTlFpqJDQVA88iB70wFrFRYDsA==",
-      "dev": true,
-      "requires": {
-        "esprima": "~1.0.2"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
-          "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==",
-          "dev": true
-        }
-      }
-    },
     "fancy-log": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
@@ -36582,50 +29299,6 @@
         }
       }
     },
-    "fileset": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz",
-      "integrity": "sha512-aK3PFyHSwWsBJCarRxMRIXSGamfroi9ehG8f4e5A2n5nSlEVHe8y44jNTIN4+HdZSpK3FNV0EdihH1iDWTdnGg==",
-      "dev": true,
-      "requires": {
-        "glob": "5.x",
-        "minimatch": "2.x"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "minimatch": {
-          "version": "2.0.10",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.0.0"
-          }
-        }
-      }
-    },
-    "fill-keys": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
-      "integrity": "sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA==",
-      "dev": true,
-      "requires": {
-        "is-object": "~1.0.1",
-        "merge-descriptors": "~1.0.0"
-      }
-    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -36814,23 +29487,6 @@
         "mime-types": "^2.1.12"
       }
     },
-    "formatio": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
-      "integrity": "sha512-cPh7is6k3d8tIUh+pnXXuAbD/uhSXGgqLPw0UrYpv5lfdJ+MMMSjx40JNpqP7Top9Nt25YomWEiRmkHbOvkCaA==",
-      "dev": true,
-      "requires": {
-        "samsam": "~1.1"
-      },
-      "dependencies": {
-        "samsam": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.3.tgz",
-          "integrity": "sha512-t9rCPskf50hZ53eH8Z+cSWD4LfJBac+8vSSuzi1Y2HzygyXxtAl0BaR3hr6iI6A+nFQbkmJNC/brQLNEeVnrmg==",
-          "dev": true
-        }
-      }
-    },
     "forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -37010,24 +29666,6 @@
         "globule": "^1.0.0"
       }
     },
-    "generate-function": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
-      "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
-      "dev": true,
-      "requires": {
-        "is-property": "^1.0.2"
-      }
-    },
-    "generate-object-property": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "integrity": "sha512-TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ==",
-      "dev": true,
-      "requires": {
-        "is-property": "^1.0.0"
-      }
-    },
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -37067,12 +29705,6 @@
       "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
       "dev": true
     },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
-      "dev": true
-    },
     "get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -37107,68 +29739,6 @@
         "assert-plus": "^1.0.0"
       }
     },
-    "gh-got": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/gh-got/-/gh-got-1.1.0.tgz",
-      "integrity": "sha512-jo4rP5ugI6fZGjS0vmvHlM8P7EBA39p8to4r2i+LqYXxeg4M8qnPXiKaetDfH0YLXkO9Hfsa2mKIjMsGJwcdGQ==",
-      "dev": true,
-      "requires": {
-        "got": "^3.2.0",
-        "object-assign": "^2.0.0"
-      },
-      "dependencies": {
-        "duplexify": {
-          "version": "3.7.1",
-          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-          "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.0.0",
-            "inherits": "^2.0.1",
-            "readable-stream": "^2.0.0",
-            "stream-shift": "^1.0.0"
-          }
-        },
-        "got": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/got/-/got-3.3.1.tgz",
-          "integrity": "sha512-7chPlc0pWHjvq7B6dEEXz4GphoDupOvBSSl6AwRsAJX7GPTZ+bturaZiIigX4Dp6KrAP67nvzuKkNc0SLA0DKg==",
-          "dev": true,
-          "requires": {
-            "duplexify": "^3.2.0",
-            "infinity-agent": "^2.0.0",
-            "is-redirect": "^1.0.0",
-            "is-stream": "^1.0.0",
-            "lowercase-keys": "^1.0.0",
-            "nested-error-stacks": "^1.0.0",
-            "object-assign": "^3.0.0",
-            "prepend-http": "^1.0.0",
-            "read-all-stream": "^3.0.0",
-            "timed-out": "^2.0.0"
-          },
-          "dependencies": {
-            "object-assign": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-              "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
-              "dev": true
-            }
-          }
-        },
-        "lowercase-keys": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-          "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-          "dev": true
-        },
-        "object-assign": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
-          "integrity": "sha512-CdsOUYIh5wIiozhJ3rLQgmUTgcyzFwZZrqhkKhODMoGtPKM+wt0h0CNIoauJWMsS9822EdzPsF/6mb4nLvPN5g==",
-          "dev": true
-        }
-      }
-    },
     "git-up": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/git-up/-/git-up-6.0.0.tgz",
@@ -37194,18 +29764,6 @@
       "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==",
       "dev": true
     },
-    "github-url-from-git": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.5.0.tgz",
-      "integrity": "sha512-WWOec4aRI7YAykQ9+BHmzjyNlkfJFG8QLXnDTsLz/kZefq7qkzdfo4p6fkYYMIq1aj+gZcQs/1HQhQh3DPPxlQ==",
-      "dev": true
-    },
-    "github-url-from-username-repo": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz",
-      "integrity": "sha512-Tj8CQqRoFVTglGdQ8FQmfq8gOOoOYZX7tnOKP8jq8Hdz2OTDhxvtlkLAbrqMYZ7X/YdaYQoUG1IBWxISBfqZ+Q==",
-      "dev": true
-    },
     "glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -38870,12 +31428,6 @@
       "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
       "dev": true
     },
-    "has-color": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
-      "integrity": "sha512-kaNz5OTAYYmt646Hkqw50/qyxP2vFnTVu5AQ1Zmk22Kk5+4Qx6BpO8+u7IKsML5fOsFk0ZT0AcCJNYwcvaLBvw==",
-      "dev": true
-    },
     "has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -38943,46 +31495,6 @@
         }
       }
     },
-    "hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
     "hast-util-is-element": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-2.1.2.tgz",
@@ -39026,19 +31538,6 @@
       "integrity": "sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg==",
       "dev": true
     },
-    "hawk": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-      "integrity": "sha512-am8sVA2bCJIw8fuuVcKvmmNnGFUGW8spTkVtj2fXTEZVkfN42bwFZFtDem57eFi+NSxurJB8EQ7Jd3uCHLn8Vw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "boom": "0.4.x",
-        "cryptiles": "0.2.x",
-        "hoek": "0.9.x",
-        "sntp": "0.2.x"
-      }
-    },
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -39051,24 +31550,6 @@
       "integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==",
       "dev": true
     },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
-      "dev": true,
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "hoek": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
-      "integrity": "sha512-ZZ6eGyzGjyMTmpSPYVECXy9uNfqBR7x5CavhUaLOeD6W0vWK1mp/b7O3f86XE0Mtfo9rZ6Bh3fnuw9Xr8MF9zA==",
-      "dev": true,
-      "optional": true
-    },
     "home-or-tmp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
@@ -39100,158 +31581,12 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
-    "html-select": {
-      "version": "2.3.24",
-      "resolved": "https://registry.npmjs.org/html-select/-/html-select-2.3.24.tgz",
-      "integrity": "sha512-kQ+YZoVQ8Aux6bUqMVc0iufcZOv03+xYZ4J5v2beT5wkNrW/e2roZ8pnU4LunVOVBGFkbodFKR0TvuMkTdyrJQ==",
-      "dev": true,
-      "requires": {
-        "cssauron": "^1.1.0",
-        "duplexer2": "~0.0.2",
-        "inherits": "^2.0.1",
-        "minimist": "~0.0.8",
-        "readable-stream": "^1.0.27-1",
-        "split": "~0.3.0",
-        "stream-splicer": "^1.2.0",
-        "through2": "^1.0.0"
-      },
-      "dependencies": {
-        "duplexer2": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-          "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.1.9"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-          "dev": true
-        },
-        "through2": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.1.13-1 <1.2.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          }
-        }
-      }
-    },
-    "html-tokenize": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/html-tokenize/-/html-tokenize-1.2.5.tgz",
-      "integrity": "sha512-7sCme3w9Hiv/kfL6sO6ePTGAV5fY6P7WDZyOs0zfXXU8vsS1ps1CQfGe0J1yuAdcCnOJ9h66RLYX/e9Cife8yw==",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1",
-        "minimist": "~0.0.8",
-        "readable-stream": "~1.0.27-1",
-        "through2": "~0.4.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
-          "dev": true
-        },
-        "object-keys": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-          "integrity": "sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-          "dev": true
-        },
-        "through2": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-          "integrity": "sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.0.17",
-            "xtend": "~2.1.1"
-          }
-        },
-        "xtend": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-          "integrity": "sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==",
-          "dev": true,
-          "requires": {
-            "object-keys": "~0.4.0"
-          }
-        }
-      }
-    },
     "html-void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-2.0.1.tgz",
       "integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==",
       "dev": true
     },
-    "http-browserify": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz",
-      "integrity": "sha512-Irf/LJXmE3cBzU1eaR4+NEX6bmVLqt1wkmDiA7kBwH7zmb0D8kBAXsDmQ88hhj/qv9iEZKlyGx/hrMcFi8sOHw==",
-      "dev": true,
-      "requires": {
-        "Base64": "~0.2.0",
-        "inherits": "~2.0.1"
-      }
-    },
     "http-cache-semantics": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
@@ -39308,12 +31643,6 @@
         "resolve-alpn": "^1.0.0"
       }
     },
-    "https-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-      "integrity": "sha512-EjDQFbgJr1vDD/175UJeSX3ncQ3+RUnCL5NkthQGHvF4VNHlzTy8ifJfTqz47qiPRqaFH58+CbuG3x51WuB1XQ==",
-      "dev": true
-    },
     "https-proxy-agent": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
@@ -39344,12 +31673,6 @@
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true
     },
-    "ignorepatterns": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ignorepatterns/-/ignorepatterns-1.0.1.tgz",
-      "integrity": "sha512-9bm+Wivwyocr88go3y04hpX3qdFs6EgsxrjjpcI9C2GAqxcWYVMJaS9h9KL8ftJk1xP/8NzPxfHk6K1X7p0CRQ==",
-      "dev": true
-    },
     "import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -39374,33 +31697,12 @@
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
-    "indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==",
-      "dev": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
-    },
-    "indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==",
-      "dev": true
-    },
     "individual": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
       "integrity": "sha512-pWt8hBCqJsUWI/HtcfWod7+N9SgAqyPEaF7JQjwzjn5vGrpg6aQ5qeAFQ7dx//UH4J1O+7xqew+gCeeFt6xN/g==",
       "dev": true
     },
-    "infinity-agent": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz",
-      "integrity": "sha512-CnfUJe5o2S9aAQWXGMhDZI4UL39MAJV3guOTfHHIdos4tuVHkl1j/J+1XLQn+CLIvqcpgQR/p+xXYXzcrhCe5w==",
-      "dev": true
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -39422,26 +31724,6 @@
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "dev": true
     },
-    "inline-source-map": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
-      "integrity": "sha512-RNlldBXZ7BBcVm3HjXIXiwKxih1lnuKbzeLBRDSB/qaqk8/g4JEZBjxpBQMhqEthQyGv7ycu8r/8PKGgBdIqrA==",
-      "dev": true,
-      "requires": {
-        "source-map": "~0.3.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
-          "integrity": "sha512-jz8leTIGS8+qJywWiO9mKza0hJxexdeIYXhDHw9avTQcXSNAGk3hiiRMpmI2Qf9dOrZDrDpgH9VNefzuacWC9A==",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
-      }
-    },
     "inquirer": {
       "version": "8.1.5",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.5.tgz",
@@ -39509,127 +31791,6 @@
         }
       }
     },
-    "insert-module-globals": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz",
-      "integrity": "sha512-ryk8hTKUZCc300SPOOwx30WhE5oRUssPDVlIoO8vtoMNBy5HGeesVRl3HF7ra4ll42T0IdnwD9XR9svh6+RRhg==",
-      "dev": true,
-      "requires": {
-        "combine-source-map": "~0.6.1",
-        "concat-stream": "~1.4.1",
-        "is-buffer": "^1.1.0",
-        "JSONStream": "^1.0.3",
-        "lexical-scope": "^1.2.0",
-        "process": "~0.11.0",
-        "through2": "^1.0.0",
-        "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "combine-source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
-          "integrity": "sha512-XKRNtuZRlVDTuSGKsfZpXYz80y0XDbYS4a+FzafTgmYHy/ckruFBx7Nd6WaQnFHVI3O6IseWVdXUvZutMpjSkQ==",
-          "dev": true,
-          "requires": {
-            "convert-source-map": "~1.1.0",
-            "inline-source-map": "~0.5.0",
-            "lodash.memoize": "~3.0.3",
-            "source-map": "~0.4.2"
-          }
-        },
-        "concat-stream": {
-          "version": "1.4.11",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
-          "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
-          "dev": true,
-          "requires": {
-            "inherits": "~2.0.1",
-            "readable-stream": "~1.1.9",
-            "typedarray": "~0.0.5"
-          }
-        },
-        "convert-source-map": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
-          "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==",
-          "dev": true
-        },
-        "inline-source-map": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz",
-          "integrity": "sha512-2WtHG0qX9OH9TVcxsLVfq3Tzr+qtL6PtWgoh0XAAKe4KkdA/57Q+OGJuRJHA4mZ2OZnkJ/ZAaXf9krLB12/nIg==",
-          "dev": true,
-          "requires": {
-            "source-map": "~0.4.0"
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "jsonparse": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-          "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-          "dev": true
-        },
-        "JSONStream": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-          "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-          "dev": true,
-          "requires": {
-            "jsonparse": "^1.2.0",
-            "through": ">=2.2.7 <3"
-          }
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-          "dev": true
-        },
-        "through2": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.1.13-1 <1.2.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          }
-        }
-      }
-    },
     "internal-slot": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
@@ -39883,25 +32044,6 @@
       "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
       "dev": true
     },
-    "is-my-ip-valid": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.1.tgz",
-      "integrity": "sha512-jxc8cBcOWbNK2i2aTkCZP6i7wkHF1bqKFrwEHuN5Jtg5BSaZHUZQ/JTOJwoV41YvHnOaRyWWh72T/KvfNz9DJg==",
-      "dev": true
-    },
-    "is-my-json-valid": {
-      "version": "2.20.6",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.6.tgz",
-      "integrity": "sha512-1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw==",
-      "dev": true,
-      "requires": {
-        "generate-function": "^2.0.0",
-        "generate-object-property": "^1.1.0",
-        "is-my-ip-valid": "^1.0.0",
-        "jsonpointer": "^5.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
     "is-nan": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
@@ -39959,12 +32101,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
-      "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
-      "dev": true
-    },
     "is-plain-obj": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
@@ -39983,18 +32119,6 @@
       "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
       "dev": true
     },
-    "is-property": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==",
-      "dev": true
-    },
-    "is-redirect": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-      "integrity": "sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==",
-      "dev": true
-    },
     "is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
@@ -40324,30 +32448,6 @@
         "textextensions": "^3.2.0"
       }
     },
-    "jade": {
-      "version": "0.26.3",
-      "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
-      "integrity": "sha512-mkk3vzUHFjzKjpCXeu+IjXeZD+QOTjUUdubgmHtHTDwvAO2ZTkMTTVrapts5CWz3JvJryh/4KWZpjeZrCepZ3A==",
-      "dev": true,
-      "requires": {
-        "commander": "0.6.1",
-        "mkdirp": "0.3.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
-          "integrity": "sha512-0fLycpl1UMTGX257hRsu/arL/cUbcvQM4zMKwvLvzXtfdezIV4yotPS2dYtknF+NmEfWSoCEF6+hj9XLm/6hEw==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
-          "integrity": "sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==",
-          "dev": true
-        }
-      }
-    },
     "jake": {
       "version": "10.8.5",
       "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
@@ -40614,12 +32714,6 @@
         "supports-color": "^8.0.0"
       }
     },
-    "jju": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
-      "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==",
-      "dev": true
-    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -40643,64 +32737,12 @@
         }
       }
     },
-    "js2xmlparser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
-      "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
-      "dev": true,
-      "requires": {
-        "xmlcreate": "^2.0.4"
-      }
-    },
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
       "dev": true
     },
-    "jsdoc": {
-      "version": "3.6.11",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.11.tgz",
-      "integrity": "sha512-8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg==",
-      "dev": true,
-      "requires": {
-        "@babel/parser": "^7.9.4",
-        "@types/markdown-it": "^12.2.3",
-        "bluebird": "^3.7.2",
-        "catharsis": "^0.9.0",
-        "escape-string-regexp": "^2.0.0",
-        "js2xmlparser": "^4.0.2",
-        "klaw": "^3.0.0",
-        "markdown-it": "^12.3.2",
-        "markdown-it-anchor": "^8.4.1",
-        "marked": "^4.0.10",
-        "mkdirp": "^1.0.4",
-        "requizzle": "^0.2.3",
-        "strip-json-comments": "^3.1.0",
-        "taffydb": "2.6.2",
-        "underscore": "~1.13.2"
-      },
-      "dependencies": {
-        "bluebird": {
-          "version": "3.7.2",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-          "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-          "dev": true
-        },
-        "strip-json-comments": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-          "dev": true
-        }
-      }
-    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -40724,15 +32766,6 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "json-parse-helpfulerror": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz",
-      "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==",
-      "dev": true,
-      "requires": {
-        "jju": "^1.1.0"
-      }
-    },
     "json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
@@ -40745,15 +32778,6 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "json-stable-stringify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
-      "integrity": "sha512-nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==",
-      "dev": true,
-      "requires": {
-        "jsonify": "~0.0.0"
-      }
-    },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -40781,44 +32805,6 @@
         "universalify": "^2.0.0"
       }
     },
-    "jsonify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
-      "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
-      "dev": true
-    },
-    "jsonlint": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz",
-      "integrity": "sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==",
-      "dev": true,
-      "requires": {
-        "JSV": "^4.0.x",
-        "nomnom": "^1.5.x"
-      }
-    },
-    "jsonparse": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
-      "integrity": "sha512-fw7Q/8gFR8iSekUi9I+HqWIap6mywuoe7hQIg3buTVjuZgALKj4HAmm0X6f+TaL4c9NJbvyFQdaI2ppr5p6dnQ==",
-      "dev": true
-    },
-    "jsonpointer": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
-      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
-      "dev": true
-    },
-    "JSONStream": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz",
-      "integrity": "sha512-l0NN3IcqrZfZBJp7JWDJIHsnPV7yzJWqsYxQzL8Fwdx1BmEMjLuvtYkv+P9pbvpyfP75/f4MeDZhWNU4is32uA==",
-      "dev": true,
-      "requires": {
-        "jsonparse": "0.0.5",
-        "through": ">=2.2.7 <3"
-      }
-    },
     "jsprim": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
@@ -40831,12 +32817,6 @@
         "verror": "1.10.0"
       }
     },
-    "JSV": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
-      "integrity": "sha512-ZJ6wx9xaKJ3yFUhq5/sk82PJMuUyLk277I8mQeyDgCTjGdjWJIvPfaU5LIXaMuaN2UO1X3kZH4+lgphublZUHw==",
-      "dev": true
-    },
     "just-clone": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-1.0.2.tgz",
@@ -41193,12 +33173,6 @@
         "webpack-merge": "^4.1.5"
       }
     },
-    "kew": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz",
-      "integrity": "sha512-TQRJfHoVm4f2exuRqjcpURhzGcC4GEIPyiLquo4mBfz0JgsVg19VeyTmKp6RKSOIhHQ6F4SgEhsnUlBduGV9Yw==",
-      "dev": true
-    },
     "keycode": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
@@ -41220,15 +33194,6 @@
       "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true
     },
-    "klaw": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
-      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
     "kleur": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
@@ -41251,25 +33216,6 @@
       "integrity": "sha512-01TBSOqlHmLfcQhHseugGHLxPtU03OyZWaLDWt5MfzCkijG6xWFvAQPhKVn0cR2MMjYvBP9keQ8A3+rQEhLO5g==",
       "dev": true
     },
-    "labeled-stream-splicer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
-      "integrity": "sha512-3KBjPRnXrYC5h2jEf/d6hO7Lcl+38QzRVTOyHA2sFzZVMYwsUFuejlrOMwAjmz13hVBr9ruDS1RwE4YEz8P58w==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "isarray": "~0.0.1",
-        "stream-splicer": "^1.1.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        }
-      }
-    },
     "last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -41323,15 +33269,6 @@
         "type-check": "~0.4.0"
       }
     },
-    "lexical-scope": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
-      "integrity": "sha512-ntJ8IcBCuKwudML7vAuT/L0aIMU0+9vO25K4CjLPYgzf1NZ0bAhJJBZrvkO+oUGgKcbdkH8UZdRsaEg+wULLRw==",
-      "dev": true,
-      "requires": {
-        "astw": "^2.0.0"
-      }
-    },
     "liftoff": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
@@ -41392,15 +33329,6 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
-    "linkify-it": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
-      "dev": true,
-      "requires": {
-        "uc.micro": "^1.0.1"
-      }
-    },
     "listenercount": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
@@ -41482,87 +33410,12 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "lodash._arraycopy": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz",
-      "integrity": "sha512-RHShTDnPKP7aWxlvXKiDT6IX2jCs6YZLCtNhOru/OX2Q/tzX295vVBK5oX1ECtN+2r86S0Ogy8ykP1sgCZAN0A==",
-      "dev": true
-    },
-    "lodash._arrayeach": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz",
-      "integrity": "sha512-Mn7HidOVcl3mkQtbPsuKR0Fj0N6Q6DQB77CtYncZcJc0bx5qv2q4Gl6a0LC1AN+GSxpnBDNnK3CKEm9XNA4zqQ==",
-      "dev": true
-    },
-    "lodash._arraymap": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._arraymap/-/lodash._arraymap-3.0.0.tgz",
-      "integrity": "sha512-IhRssF2bzQoFQ2Q5H1O52HuJY+OtcHDZekEhaMJ6RkUF+gpLlAsizSRsKp3Ho555ANRk69DFp5b4LOlym4S0bw==",
-      "dev": true
-    },
-    "lodash._baseassign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-      "integrity": "sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==",
-      "dev": true,
-      "requires": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
-    "lodash._baseclone": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz",
-      "integrity": "sha512-1K0dntf2dFQ5my0WoGKkduewR6+pTNaqX03kvs45y7G5bzl4B3kTR4hDfJIc2aCQDeLyQHhS280tc814m1QC1Q==",
-      "dev": true,
-      "requires": {
-        "lodash._arraycopy": "^3.0.0",
-        "lodash._arrayeach": "^3.0.0",
-        "lodash._baseassign": "^3.0.0",
-        "lodash._basefor": "^3.0.0",
-        "lodash.isarray": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
     "lodash._basecopy": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
       "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
       "dev": true
     },
-    "lodash._basedifference": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-3.0.3.tgz",
-      "integrity": "sha512-4BcJlOv36b3v+kHdJWcgsDi96ns8neNLuDtbzzjW3+eh3XhFVmFPH2tu6GJK2e5eRYMQ8izHU35iAyNjRyDtCQ==",
-      "dev": true,
-      "requires": {
-        "lodash._baseindexof": "^3.0.0",
-        "lodash._cacheindexof": "^3.0.0",
-        "lodash._createcache": "^3.0.0"
-      }
-    },
-    "lodash._baseflatten": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz",
-      "integrity": "sha512-fESngZd+X4k+GbTxdMutf8ohQa0s3sJEHIcwtu4/LsIQ2JTDzdRxDCMQjW+ezzwRitLmHnacVVmosCbxifefbw==",
-      "dev": true,
-      "requires": {
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
-    "lodash._basefor": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz",
-      "integrity": "sha512-6bc3b8grkpMgDcVJv9JYZAk/mHgcqMljzm7OsbmcE2FGUMmmLQTPHlh/dFqR8LA0GQ7z4K67JSotVKu5058v1A==",
-      "dev": true
-    },
-    "lodash._baseindexof": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz",
-      "integrity": "sha512-bSYo8Pc/f0qAkr8fPJydpJjtrHiSynYfYBjtANIgXv5xEf1WlTC63dIDlgu0s9dmTvzRu1+JJTxcIAHe+sH0FQ==",
-      "dev": true
-    },
     "lodash._basetostring": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
@@ -41575,38 +33428,6 @@
       "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
       "dev": true
     },
-    "lodash._bindcallback": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-      "integrity": "sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==",
-      "dev": true
-    },
-    "lodash._cacheindexof": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz",
-      "integrity": "sha512-S8dUjWr7SUT/X6TBIQ/OYoCHo1Stu1ZRy6uMUSKqzFnZp5G5RyQizSm6kvxD2Ewyy6AVfMg4AToeZzKfF99T5w==",
-      "dev": true
-    },
-    "lodash._createassigner": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
-      "integrity": "sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw==",
-      "dev": true,
-      "requires": {
-        "lodash._bindcallback": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash.restparam": "^3.0.0"
-      }
-    },
-    "lodash._createcache": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz",
-      "integrity": "sha512-ev5SP+iFpZOugyab/DEUQxUeZP5qyciVTlgQ1f4Vlw7VUcCD8fVnyIqVUEIaoFH9zjAqdgi69KiofzvVmda/ZQ==",
-      "dev": true,
-      "requires": {
-        "lodash._getnative": "^3.0.0"
-      }
-    },
     "lodash._getnative": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
@@ -41619,22 +33440,6 @@
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
       "dev": true
     },
-    "lodash._pickbyarray": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash._pickbyarray/-/lodash._pickbyarray-3.0.2.tgz",
-      "integrity": "sha512-tHzBIfgugzI7HV0y8MJS1z/ryWDh8NyD6AV+so9vlplRnhD4qBuwoyDt7g241ad3F43YDFghCN+R3iaFd4Azvw==",
-      "dev": true
-    },
-    "lodash._pickbycallback": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._pickbycallback/-/lodash._pickbycallback-3.0.0.tgz",
-      "integrity": "sha512-DVP27YmN0lB+j/Tgd/+gtxfmW/XihgWpQpHptBuwyp2fD9zEBRwwcnw6Qej16LUV8LRFuTqyoc0i6ON97d/C5w==",
-      "dev": true,
-      "requires": {
-        "lodash._basefor": "^3.0.0",
-        "lodash.keysin": "^3.0.0"
-      }
-    },
     "lodash._reescape": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
@@ -41730,12 +33535,6 @@
       "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
       "dev": true
     },
-    "lodash.istypedarray": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz",
-      "integrity": "sha512-lGWJ6N8AA3KSv+ZZxlTdn4f6A7kMfpJboeyvbFdE7IU9YAgweODqmOgdUHOA+c6lVWeVLysdaxciFXi+foVsWw==",
-      "dev": true
-    },
     "lodash.keys": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
@@ -41747,44 +33546,12 @@
         "lodash.isarray": "^3.0.0"
       }
     },
-    "lodash.keysin": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-3.0.8.tgz",
-      "integrity": "sha512-YDB/5xkL3fBKFMDaC+cfGV00pbiJ6XoJIfRmBhv7aR6wWtbCW6IzkiWnTfkiHTF6ALD7ff83dAtB3OEaSoyQPg==",
-      "dev": true,
-      "requires": {
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
-    "lodash.memoize": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
-      "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==",
-      "dev": true
-    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.omit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-3.1.0.tgz",
-      "integrity": "sha512-vC3fSzZDmPlwk+kCGYMQyUpPeRBgmOK/WrhmjlWVUjEch35gQR3iRbCV9rL7KgMHVeVhnq7A+TRrPvzvg67y9w==",
-      "dev": true,
-      "requires": {
-        "lodash._arraymap": "^3.0.0",
-        "lodash._basedifference": "^3.0.0",
-        "lodash._baseflatten": "^3.0.0",
-        "lodash._bindcallback": "^3.0.0",
-        "lodash._pickbyarray": "^3.0.0",
-        "lodash._pickbycallback": "^3.0.0",
-        "lodash.keysin": "^3.0.0",
-        "lodash.restparam": "^3.0.0"
-      }
-    },
     "lodash.pickby": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
@@ -41822,16 +33589,6 @@
         "lodash._reinterpolate": "^3.0.0"
       }
     },
-    "lodash.toplainobject": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz",
-      "integrity": "sha512-wMI0Ju1bvSmnBS3EcRRH/3zDnZOPpDtMtNDzbbNMKuTrEpALsf+sPyMeogmv63Y11qZQO7H1xFzohIEGRMjPYA==",
-      "dev": true,
-      "requires": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash.keysin": "^3.0.0"
-      }
-    },
     "lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
@@ -41911,16 +33668,6 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==",
-      "dev": true,
-      "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      }
-    },
     "loupe": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
@@ -42028,85 +33775,12 @@
         "object-visit": "^1.0.0"
       }
     },
-    "markdown-it": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
-      "dev": true,
-      "requires": {
-        "argparse": "^2.0.1",
-        "entities": "~2.1.0",
-        "linkify-it": "^3.0.1",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        }
-      }
-    },
-    "markdown-it-anchor": {
-      "version": "8.6.5",
-      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.5.tgz",
-      "integrity": "sha512-PI1qEHHkTNWT+X6Ip9w+paonfIQ+QZP9sCeMYi47oqhH+EsW8CrJ8J7CzV19QVOj6il8ATGbK2nTECj22ZHGvQ==",
-      "dev": true,
-      "requires": {}
-    },
     "markdown-table": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.2.tgz",
       "integrity": "sha512-y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA==",
       "dev": true
     },
-    "markdownlint": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.0.6.tgz",
-      "integrity": "sha512-2jxomIcTY+HWnrMWv7Q/T93d7yp4RXNGkoQXWq5II1TgyQj5pFDoB7HZSCX57ATk9zZTb1++jwXR3uHn6AKmew==",
-      "dev": true,
-      "requires": {
-        "markdown-it": "^4.2.2"
-      },
-      "dependencies": {
-        "entities": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-          "dev": true
-        },
-        "linkify-it": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz",
-          "integrity": "sha512-eGHwtlABkp1NOJSiKUNqBf3SYAS5jPHtvRXPAgNaQwTqmkTahjtiLH9NtxdR5IOPhNvwNMN/diswSfZKzUkhGg==",
-          "dev": true,
-          "requires": {
-            "uc.micro": "^1.0.1"
-          }
-        },
-        "markdown-it": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz",
-          "integrity": "sha512-Rl8dHHeLuAh3E72OPY0tY7CLvlxgHiLhlshIYswAAabAg4YDBLa6e/LTgNkkxBO2K61ESzoquPQFMw/iMrT1PA==",
-          "dev": true,
-          "requires": {
-            "argparse": "~1.0.2",
-            "entities": "~1.1.1",
-            "linkify-it": "~1.2.0",
-            "mdurl": "~1.0.0",
-            "uc.micro": "^1.0.0"
-          }
-        }
-      }
-    },
-    "marked": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.1.1.tgz",
-      "integrity": "sha512-0cNMnTcUJPxbA6uWmCmjWz4NJRe/0Xfk2NhXCUHjew9qJzFN20krFnsUe7QynwqOwa5m1fZ4UDg0ycKFVC0ccw==",
-      "dev": true
-    },
     "marky": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.4.tgz",
@@ -42148,17 +33822,6 @@
         }
       }
     },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
     "mdast-util-definitions": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz",
@@ -42425,66 +34088,6 @@
         "readable-stream": "^2.0.1"
       }
     },
-    "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
-      "dev": true,
-      "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
-          "dev": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
-          "dev": true,
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "read-pkg": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^1.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^1.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
-          "dev": true,
-          "requires": {
-            "find-up": "^1.0.0",
-            "read-pkg": "^1.0.0"
-          }
-        }
-      }
-    },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -42925,24 +34528,6 @@
         }
       }
     },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
     "mime": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
@@ -42983,18 +34568,6 @@
         "dom-walk": "^0.1.0"
       }
     },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
-      "dev": true
-    },
     "minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -43262,190 +34835,6 @@
         }
       }
     },
-    "mocha-phantomjs": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.6.0.tgz",
-      "integrity": "sha512-siI6m2uw3Xyjruz9eEP8JTVHOtnOxdmnEqXM0IrOt3Nbw4oPJw6u8Q6MG6hqnbH9fJ3i60F3bYlmSEbgwuNsQw==",
-      "dev": true,
-      "requires": {
-        "commander": "~2.0.0",
-        "mocha": "~1.20.1"
-      },
-      "dependencies": {
-        "diff": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.7.tgz",
-          "integrity": "sha512-0bTLzyr1S59cPsgAD/lR+ivvHTbgPb+k/mUR6WGqma1J6QDU+kUegI8uQFuH/cMUNK7JGN3Tk1Y5Jf2MO85WrA==",
-          "dev": true
-        },
-        "glob": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz",
-          "integrity": "sha512-WPaLsMHD1lYEqAmIQI6VOJSPwuBdGShDWnj1yUo0vQqEO809R8W3LM9OVU13CnnDhyv/EiNwOtxEW74SmrzS6w==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "~2.0.0",
-            "inherits": "2",
-            "minimatch": "~0.2.11"
-          }
-        },
-        "graceful-fs": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
-          "integrity": "sha512-hcj/NTUWv+C3MbqrVb9F+aH6lvTwEHJdx2foBxlrVq5h6zE8Bfu4pv4CAAqbDcZrw/9Ak5lsRXlY9Ao8/F0Tuw==",
-          "dev": true
-        },
-        "growl": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/growl/-/growl-1.7.0.tgz",
-          "integrity": "sha512-VWv7s1EI41AG2LiCr7uAuxWikLDN1SQOuEUc37d/P34NAIIYgkvWYngNw0d9d9iCrDFL0SYCE9UQpxhIjjtuLg==",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-          "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "0.2.14",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-          "integrity": "sha512-zZ+Jy8lVWlvqqeM8iZB7w7KmQkoJn8djM585z88rywrEbzoqawVa9FR5p2hwD+y74nfuKOjmNvi9gtWJNLqHvA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "2",
-            "sigmund": "~1.0.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.3.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-          "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
-          "dev": true
-        },
-        "mocha": {
-          "version": "1.20.1",
-          "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz",
-          "integrity": "sha512-25Nq3BuIYCy80uEix+hBlZcr/gnLzpcYqfsaPAxZm2qbMFmed8I3nP8N05KagK4BTkGYUvsRJ47istvRqFO8fw==",
-          "dev": true,
-          "requires": {
-            "commander": "2.0.0",
-            "debug": "*",
-            "diff": "1.0.7",
-            "glob": "3.2.3",
-            "growl": "1.7.x",
-            "jade": "0.26.3",
-            "mkdirp": "0.3.5"
-          }
-        }
-      }
-    },
-    "module-deps": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
-      "integrity": "sha512-EbWWlSGaCVidEsLsSzkY6l/jm0IcGDSQ8tGwtjM8joTrxqxP0om02Px9Np8D7FMZ/vZFdsOGbio+WqkKQxYuTA==",
-      "dev": true,
-      "requires": {
-        "browser-resolve": "^1.7.0",
-        "concat-stream": "~1.4.5",
-        "defined": "^1.0.0",
-        "detective": "^4.0.0",
-        "duplexer2": "0.0.2",
-        "inherits": "^2.0.1",
-        "JSONStream": "^1.0.3",
-        "parents": "^1.0.0",
-        "readable-stream": "^1.1.13",
-        "resolve": "^1.1.3",
-        "stream-combiner2": "~1.0.0",
-        "subarg": "^1.0.0",
-        "through2": "^1.0.0",
-        "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "concat-stream": {
-          "version": "1.4.11",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.11.tgz",
-          "integrity": "sha512-X3JMh8+4je3U1cQpG87+f9lXHDrqcb2MVLg9L7o8b1UZ0DzhRrUpdn65ttzu10PpJPPI3MQNkis+oha6TSA9Mw==",
-          "dev": true,
-          "requires": {
-            "inherits": "~2.0.1",
-            "readable-stream": "~1.1.9",
-            "typedarray": "~0.0.5"
-          }
-        },
-        "defined": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
-          "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
-          "dev": true
-        },
-        "duplexer2": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-          "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.1.9"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "jsonparse": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-          "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
-          "dev": true
-        },
-        "JSONStream": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-          "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-          "dev": true,
-          "requires": {
-            "jsonparse": "^1.2.0",
-            "through": ">=2.2.7 <3"
-          }
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-          "dev": true
-        },
-        "through2": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.1.13-1 <1.2.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          }
-        }
-      }
-    },
-    "module-not-found-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
-      "integrity": "sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==",
-      "dev": true
-    },
     "morgan": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
@@ -43618,13 +35007,6 @@
         }
       }
     },
-    "natives": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz",
-      "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==",
-      "dev": true,
-      "optional": true
-    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -43648,15 +35030,6 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "nested-error-stacks": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz",
-      "integrity": "sha512-o32anp9JA7oezPOFSfG2BBXSdHepOm5FpJvwxHWDtfJ3Bg3xdi68S6ijPlEOfUg6quxZWyvJM+8fHk1yMDKspA==",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1"
-      }
-    },
     "next-tick": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
@@ -43732,53 +35105,6 @@
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
       "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
     },
-    "node-uuid": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
-      "integrity": "sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA==",
-      "dev": true
-    },
-    "nomnom": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
-      "integrity": "sha512-5s0JxqhDx9/rksG2BTMVN1enjWSvPidpoSgViZU4ZXULyTe+7jxcCRLB6f42Z0l1xYJpleCBtSyY6Lwg3uu5CQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "~0.4.0",
-        "underscore": "~1.6.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
-          "integrity": "sha512-3iF4FIKdxaVYT3JqQuY3Wat/T2t7TRbbQ94Fu50ZUCbLy4TFbTzr90NOHQodQkNqmeEGCw8WbeP78WNi6SKYUA==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
-          "integrity": "sha512-sQfYDlfv2DGVtjdoQqxS0cEZDroyG8h6TamA6rvxwlrU5BaSLDx9xhatBYl2pxZ7gmpNaPFVwBtdGdu5rQ+tYQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "~1.0.0",
-            "has-color": "~0.1.0",
-            "strip-ansi": "~0.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
-          "integrity": "sha512-behete+3uqxecWlDAm5lmskaSaISA+ThQ4oNNBDTBJt0x2ppR6IPqfZNuj6BLaLJ/Sji4TPZlcRyOis8wXQTLg==",
-          "dev": true
-        },
-        "underscore": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-          "integrity": "sha512-z4o1fvKUojIWh9XuaVLUDdf86RQiq13AC1dmHbTpoyuu+bquHms76v16CjycCbec87J7z0k//SiQVk0sMdFmpQ==",
-          "dev": true
-        }
-      }
-    },
     "nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -43788,12 +35114,6 @@
         "abbrev": "1"
       }
     },
-    "nopt-usage": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/nopt-usage/-/nopt-usage-0.1.0.tgz",
-      "integrity": "sha512-Tg2sISrWBbSsCRqpEMmdxn3KZfacrd0N2NYpZQIq0MHxGHMjwzYlxeB9pVIom/g7CBK28atDUQsTlOfG0wOsNA==",
-      "dev": true
-    },
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -43835,39 +35155,6 @@
         "once": "^1.3.2"
       }
     },
-    "npm-license": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/npm-license/-/npm-license-0.2.3.tgz",
-      "integrity": "sha512-Sm6zqTVReBGe1C5A3Vr7pqYFmawM3oF/MKhhk0LRAOZPEOygr96KkiJ5P0ZQMDP3F7HRW6zyy7gxIIos+6foww==",
-      "dev": true,
-      "requires": {
-        "mkdirp": "~0.5.0",
-        "nopt": "~3.0.1",
-        "nopt-usage": "^0.1.0",
-        "package-license": "~0.1.1",
-        "pkginfo": "^0.3.0",
-        "read-installed": "~3.1.3",
-        "treeify": "~1.0.1",
-        "underscore": "~1.4.4"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.6"
-          }
-        },
-        "underscore": {
-          "version": "1.4.4",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
-          "integrity": "sha512-ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ==",
-          "dev": true
-        }
-      }
-    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -43885,63 +35172,6 @@
         }
       }
     },
-    "npmconf": {
-      "version": "0.0.24",
-      "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz",
-      "integrity": "sha512-LX0bX+RmuBuEITg26i7+dx+d9cfYU+giB7eOiSkT5IwvuAzzIx02u4GXwSC3jsQMDMb/kXC57R8tybRSVYfbWw==",
-      "dev": true,
-      "requires": {
-        "config-chain": "~1.1.1",
-        "inherits": "~1.0.0",
-        "ini": "~1.1.0",
-        "mkdirp": "~0.3.3",
-        "nopt": "2",
-        "once": "~1.1.1",
-        "osenv": "0.0.3",
-        "semver": "~1.1.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
-          "integrity": "sha512-Al67oatbRSo3RV5hRqIoln6Y5yMVbJSIn4jEJNL7VCImzq/kLr7vvb6sFRJXqr8rpHc/2kJOM+y0sPKN47VdzA==",
-          "dev": true
-        },
-        "ini": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz",
-          "integrity": "sha512-B6L/jfyFRcG2dqKiHggWnfby52Iy07iabE4F6srQAr/OmVKBRE5uU+B5MQ+nQ7NiYnjz93gENh1GhqHzpDgHgA==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.3.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-          "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
-          "dev": true
-        },
-        "nopt": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
-          "integrity": "sha512-gIOTA/uJuhPwFqp+spY7VQ1satbnGlD+iQVZxI18K6hs8Evq4sX81Ml7BB5byP/LsbR2yBVtmvdEmhi7evJ6Aw==",
-          "dev": true,
-          "requires": {
-            "abbrev": "1"
-          }
-        },
-        "once": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz",
-          "integrity": "sha512-frdJr++QKEg4+JylTX+NNLgSoO6M2pDNYOOXe4WGIYKKBADBI9nU3oa06y4D4FpAJ3obAsjExeBOnscYJB9Blw==",
-          "dev": true
-        },
-        "semver": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz",
-          "integrity": "sha512-9causpLEkYDrfTz7cprleLz9dnlb0oKsKRHl33K92wJmXLhVc2dGlrQGJT/sjtLOAyuoQZl+ClI77+lnvzPSKg==",
-          "dev": true
-        }
-      }
-    },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -44159,12 +35389,6 @@
         "mimic-fn": "^2.1.0"
       }
     },
-    "open": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/open/-/open-0.0.3.tgz",
-      "integrity": "sha512-Vm6nsJHcKV8kdOtHESAFAymOOf1VlKrttpwTqtLxvxRDIh8PSw4lWq5qk88QkAvNwnkv/1dNi2lvedhmam/ggw==",
-      "dev": true
-    },
     "opener": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
@@ -44188,23 +35412,6 @@
         }
       }
     },
-    "optimist": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
-      "integrity": "sha512-TCx0dXQzVtSCg2OgY/bO9hjM9cV4XYx09TVK+s3+FhkjT6LovsLe+pPMzpWf+6yXK/hUizs2gUoTw3jHM0VaTQ==",
-      "dev": true,
-      "requires": {
-        "wordwrap": "~0.0.2"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
-          "dev": true
-        }
-      }
-    },
     "optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -44300,12 +35507,6 @@
         "readable-stream": "^2.0.1"
       }
     },
-    "os-browserify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
-      "integrity": "sha512-aZicJZccvxWOZ0Bja2eAch2L8RIJWBuRYmM8Gwl/JjNtRltH0Itcz4eH/ESyuIWfse8cc93ZCf0XrzhXK2HEDA==",
-      "dev": true
-    },
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
@@ -44327,12 +35528,6 @@
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
-    "osenv": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz",
-      "integrity": "sha512-VBk1bfdaO4gh3OWO8LBuDY2alp0buL8YzQ6t13xyc8PQPrnUg5AgQvINQx3UkS4dom8UGCL597q4Y2+M4TPvmw==",
-      "dev": true
-    },
     "p-cancelable": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
@@ -44375,18 +35570,6 @@
       "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
       "dev": true
     },
-    "package-license": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/package-license/-/package-license-0.1.2.tgz",
-      "integrity": "sha512-Q5zmx+M9ZJneMpYS6MlYL77gqeMYWuyErXMnQ/83WCztmYQD7Z0U9XGLvX9OKFFXwRj2NzdzlM0y9Jzcww2O1Q==",
-      "dev": true
-    },
-    "pako": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-      "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
-      "dev": true
-    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -44396,28 +35579,6 @@
         "callsites": "^3.0.0"
       }
     },
-    "parents": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
-      "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==",
-      "dev": true,
-      "requires": {
-        "path-platform": "~0.11.15"
-      }
-    },
-    "parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "requires": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -44491,12 +35652,6 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
-    "path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
@@ -44515,12 +35670,6 @@
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
-      "dev": true
-    },
     "path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -44532,12 +35681,6 @@
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
-    "path-platform": {
-      "version": "0.11.15",
-      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
-      "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==",
-      "dev": true
-    },
     "path-root": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
@@ -44592,19 +35735,6 @@
         "through": "~2.3"
       }
     },
-    "pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": true,
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -44617,184 +35747,6 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
-    "phantomjs": {
-      "version": "1.9.7-15",
-      "resolved": "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-15.tgz",
-      "integrity": "sha512-s4PSN1L0iVwgv9ZkrSKcfojyPAtwGWhXxjn2p1P/ljuw3cx+FW3hKP00x247mIYbKeKSMylOd4euDQOMpUIAsg==",
-      "dev": true,
-      "requires": {
-        "adm-zip": "0.2.1",
-        "kew": "~0.1.7",
-        "mkdirp": "0.3.5",
-        "ncp": "0.4.2",
-        "npmconf": "0.0.24",
-        "progress": "^1.1.5",
-        "request": "2.36.0",
-        "request-progress": "^0.3.1",
-        "rimraf": "~2.2.2",
-        "which": "~1.0.5"
-      },
-      "dependencies": {
-        "asn1": {
-          "version": "0.1.11",
-          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-          "integrity": "sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA==",
-          "dev": true,
-          "optional": true
-        },
-        "assert-plus": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-          "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
-          "dev": true,
-          "optional": true
-        },
-        "async": {
-          "version": "0.9.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-          "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
-          "dev": true,
-          "optional": true
-        },
-        "aws-sign2": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-          "integrity": "sha512-oqUX0DM5j7aPWPCnpWebiyNIj2wiNI87ZxnOMoGv0aE4TGlBy2N+5iWc6dQ/NOKZaBD2W6PVz8jtOGkWzSC5EA==",
-          "dev": true,
-          "optional": true
-        },
-        "combined-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-          "integrity": "sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delayed-stream": "0.0.5"
-          }
-        },
-        "delayed-stream": {
-          "version": "0.0.5",
-          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-          "integrity": "sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA==",
-          "dev": true,
-          "optional": true
-        },
-        "forever-agent": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
-          "integrity": "sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A==",
-          "dev": true
-        },
-        "form-data": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-          "integrity": "sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "async": "~0.9.0",
-            "combined-stream": "~0.0.4",
-            "mime": "~1.2.11"
-          }
-        },
-        "hawk": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
-          "integrity": "sha512-Sg+VzrI7TjUomO0rjD6UXawsj50ykn5sB/xKNW/IenxzRVyw/wt9A2FLzYpGL/r0QG5hyXY8nLx/2m8UutoDcg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "0.4.x",
-            "cryptiles": "0.2.x",
-            "hoek": "0.9.x",
-            "sntp": "0.2.x"
-          }
-        },
-        "http-signature": {
-          "version": "0.10.1",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-          "integrity": "sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asn1": "0.1.11",
-            "assert-plus": "^0.1.5",
-            "ctype": "0.5.3"
-          }
-        },
-        "mime": {
-          "version": "1.2.11",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-          "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.3.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-          "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
-          "dev": true
-        },
-        "oauth-sign": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
-          "integrity": "sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ==",
-          "dev": true,
-          "optional": true
-        },
-        "progress": {
-          "version": "1.1.8",
-          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-          "integrity": "sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw==",
-          "dev": true
-        },
-        "qs": {
-          "version": "0.6.6",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz",
-          "integrity": "sha512-kN+yNdAf29Jgp+AYHUmC7X4QdJPR8czuMWLNLc0aRxkQ7tB3vJQEONKKT9ou/rW7EbqVec11srC9q9BiVbcnHA==",
-          "dev": true
-        },
-        "request": {
-          "version": "2.36.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
-          "integrity": "sha512-iVii/ruMH9i8k++HYYPqi+nb1Pbgz7UOTGbFEiyhl7uDN8PhyFV2lGJa8XLIUS5tyt5scERcLkwqvCNF84Vv2Q==",
-          "dev": true,
-          "requires": {
-            "aws-sign2": "~0.5.0",
-            "forever-agent": "~0.5.0",
-            "form-data": "~0.1.0",
-            "hawk": "~1.0.0",
-            "http-signature": "~0.10.0",
-            "json-stringify-safe": "~5.0.0",
-            "mime": "~1.2.9",
-            "node-uuid": "~1.4.0",
-            "oauth-sign": "~0.3.0",
-            "qs": "~0.6.0",
-            "tough-cookie": ">=0.12.0",
-            "tunnel-agent": "~0.4.0"
-          }
-        },
-        "rimraf": {
-          "version": "2.2.8",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-          "integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
-          "dev": true
-        },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
-          "dev": true,
-          "optional": true
-        },
-        "which": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz",
-          "integrity": "sha512-E87fdQ/eRJr9W1X4wTPejNy9zTW3FI2vpCZSJ/HAY+TkjKVC0TUm1jk6vn2Z7qay0DQy0+RBGdXxj+RmmiGZKQ==",
-          "dev": true
-        }
-      }
-    },
     "picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -44896,12 +35848,6 @@
         }
       }
     },
-    "pkginfo": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
-      "integrity": "sha512-yO5feByMzAp96LtP58wvPKSbaKAi/1C4kV9XpTctr6EepnP6F33RBNOiVrdz9BrPA98U2BMFsTNHo44TWcbQ2A==",
-      "dev": true
-    },
     "plugin-error": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
@@ -44925,23 +35871,6 @@
         }
       }
     },
-    "portfinder": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-0.2.1.tgz",
-      "integrity": "sha512-U7dHe7mfMMP5cIwbqBHh/likunxAEiBsQLiThUWjyeRK6/C3um2uk+VGiekUW8q3h+s793gdNfagCM3aaXMeOg==",
-      "dev": true,
-      "requires": {
-        "mkdirp": "0.0.x"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz",
-          "integrity": "sha512-r4Ml2CH2Kl4B0+Lwq1SVru0vjMxdtR+UEb938WTQcsnU+EJz8dUV/HY0LTZh466nUSljia9cvqW3LZLWs3l8LQ==",
-          "dev": true
-        }
-      }
-    },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
@@ -44966,12 +35895,6 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
-    "prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==",
-      "dev": true
-    },
     "pretty-format": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
@@ -45042,12 +35965,6 @@
       "integrity": "sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==",
       "dev": true
     },
-    "proto-list": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
-      "dev": true
-    },
     "protocols": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz",
@@ -45069,25 +35986,6 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "dev": true
     },
-    "proxyquire": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz",
-      "integrity": "sha512-mZZq4F50qaBkngvlf9paNfaSb5gtJ0mFPnBjda4NxCpXpMAaVfSLguRr9y2KXF6koOSBf4AanD2inuEQw3aCcA==",
-      "dev": true,
-      "requires": {
-        "fill-keys": "^1.0.2",
-        "module-not-found-error": "^1.0.0",
-        "resolve": "~1.1.7"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
-          "dev": true
-        }
-      }
-    },
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -45115,28 +36013,6 @@
       "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
-    "public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-          "dev": true
-        }
-      }
-    },
     "pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -45271,12 +36147,6 @@
       "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
       "dev": true
     },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
-      "dev": true
-    },
     "querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -45298,16 +36168,6 @@
         "safe-buffer": "^5.1.0"
       }
     },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
     "range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -45330,103 +36190,6 @@
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true
     },
-    "read-all-stream": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
-      "integrity": "sha512-DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w==",
-      "dev": true,
-      "requires": {
-        "pinkie-promise": "^2.0.0",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "read-installed": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-3.1.5.tgz",
-      "integrity": "sha512-XxD5VDz32T6rLCFfYElTif8/lkqcs9y51Gs2r30rAfT7LUGzJWaXLrwvn6fXkDsTzGcPr7Pj8CggOxwTxl/ozQ==",
-      "dev": true,
-      "requires": {
-        "debuglog": "^1.0.1",
-        "graceful-fs": "2 || 3",
-        "read-package-json": "1",
-        "readdir-scoped-modules": "^1.0.0",
-        "semver": "2 || 3 || 4",
-        "slide": "~1.1.3",
-        "util-extend": "^1.0.1"
-      },
-      "dependencies": {
-        "graceful-fs": {
-          "version": "3.0.12",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
-          "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "natives": "^1.1.3"
-          }
-        },
-        "semver": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-          "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
-          "dev": true
-        }
-      }
-    },
-    "read-package-json": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-1.3.3.tgz",
-      "integrity": "sha512-9bayCl9cbXy3AL0qXhLQ0vliEgpzUVeLegSOrde3ujTHy2W18UsJiMUXEWkjbBB4ZnJzZPVuo2vAW62j4gY7gg==",
-      "dev": true,
-      "requires": {
-        "glob": "^5.0.3",
-        "graceful-fs": "2 || 3",
-        "json-parse-helpfulerror": "^1.0.2",
-        "normalize-package-data": "^1.0.0"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "3.0.12",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
-          "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "natives": "^1.1.3"
-          }
-        },
-        "normalize-package-data": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz",
-          "integrity": "sha512-pyPVJAzFiaioifPIsJBEoKJ9YcPHz7UhckZ7wqhBztLLCu6NozkIDrN+frzrCwjXtfunXfaMWIDtcDhnbO8fWA==",
-          "dev": true,
-          "requires": {
-            "github-url-from-git": "^1.3.0",
-            "github-url-from-username-repo": "^1.0.0",
-            "semver": "2 || 3 || 4"
-          }
-        },
-        "semver": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-          "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
-          "dev": true
-        }
-      }
-    },
     "read-pkg": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-7.1.0.tgz",
@@ -45568,41 +36331,6 @@
         }
       }
     },
-    "readable-wrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz",
-      "integrity": "sha512-/8n0Mr10S+HGKFygQ42Z40JIXwafPH3A72pwmlNClThgsImV5LJJiCue5Je1asxwY082sYxq/+kTxH6nTn0w3g==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^1.1.13-1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-          "dev": true
-        }
-      }
-    },
     "readdir-glob": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.1.tgz",
@@ -45612,18 +36340,6 @@
         "minimatch": "^3.0.4"
       }
     },
-    "readdir-scoped-modules": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
-      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
-      "dev": true,
-      "requires": {
-        "debuglog": "^1.0.1",
-        "dezalgo": "^1.0.0",
-        "graceful-fs": "^4.1.2",
-        "once": "^1.3.0"
-      }
-    },
     "readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -45633,39 +36349,6 @@
         "picomatch": "^2.2.1"
       }
     },
-    "readline2": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz",
-      "integrity": "sha512-qs8GGG+hLGMaDOGjd+mDglDoYcHDkjIY7z5RU0/ApsGT0qypyrWskNeemUqD+UxIXiZoMYT5aLwGp4ehoyZhIg==",
-      "dev": true,
-      "requires": {
-        "mute-stream": "0.0.4",
-        "strip-ansi": "^2.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
-          "integrity": "sha512-q5i8bFLg2wDfsuR56c1NzlJFPzVD+9mxhDrhqOGigEFa87OZHlF+9dWeGWzVTP/0ECiA/JUGzfzRr2t3eYORRw==",
-          "dev": true
-        },
-        "mute-stream": {
-          "version": "0.0.4",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
-          "integrity": "sha512-amvrY4m/7oZamehMoFi1tbwU/kXbVvRTGM2S7F+PZi3n51Jx+9AcSQ3EQsag3tR+hS2higfgOP/Kl8kri/X52A==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
-          "integrity": "sha512-2h8q2CP3EeOhDJ+jd932PRMpa3/pOJFGoF22J1U/DNbEK2gSW2DqeF46VjCXsSQXhC+k/l8/gaaRBQKL6hUPfQ==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^1.0.0"
-          }
-        }
-      }
-    },
     "rechoir": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -45695,16 +36378,6 @@
         }
       }
     },
-    "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==",
-      "dev": true,
-      "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      }
-    },
     "regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -46004,15 +36677,6 @@
         }
       }
     },
-    "request-progress": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
-      "integrity": "sha512-+IAgzH8yWAEgHjOOQzYEqRm0BpNlE6xFgsziGMiTxxMhrkBcCOe9bNWH7bDR+XtHToUMgCZlDgLqjk6cAP/+Ig==",
-      "dev": true,
-      "requires": {
-        "throttleit": "~0.0.2"
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -46031,15 +36695,6 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
-    "requizzle": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz",
-      "integrity": "sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.14"
-      }
-    },
     "resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -46087,12 +36742,6 @@
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
-    "response-stream": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/response-stream/-/response-stream-0.0.0.tgz",
-      "integrity": "sha512-tWH3QWqkXv7AgYRXidIhPKO1SqPix2E0gM3x/vxf60LHQHWNS8AVrB3RnYexPAoo5dOc0bGzDlUgtsBvV3CWLA==",
-      "dev": true
-    },
     "responselike": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
@@ -46135,36 +36784,12 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
-    "rewire": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/rewire/-/rewire-2.5.2.tgz",
-      "integrity": "sha512-9wOlgRHTOzUv5dQO2XD2qWob+7yi/QXh7SSwLJW5wMAkAdkYuaCtcPuLAXUTllK0MjSvtpxUqAWMuSrrdt9VNw==",
-      "dev": true
-    },
     "rfdc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
       "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
       "dev": true
     },
-    "rfile": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz",
-      "integrity": "sha512-aNeTpY8g6DYmqPvakau22B0SipQTskO8FtYXzn8qg4X4bN9ExIH8VAhq/L9w7N8HvESYeSSwk3e4GmW+rLLAxQ==",
-      "dev": true,
-      "requires": {
-        "callsite": "~1.0.0",
-        "resolve": "~0.3.0"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz",
-          "integrity": "sha512-mxx/I/wLjxtryDBtrrb0ZNzaYERVWaHpJ0W0Arm8N4l8b+jiX/U5yKcsj0zQpF9UuKN1uz80EUTOudON6OPuaQ==",
-          "dev": true
-        }
-      }
-    },
     "rgb2hex": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.2.5.tgz",
@@ -46180,47 +36805,6 @@
         "glob": "^7.1.3"
       }
     },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "ruglify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz",
-      "integrity": "sha512-XfRj1YJdm/gnZNvmpQ5L+2YGRHglDGMPgJRbitgCxC3GzKVQF/t+ij1aNcNg2AnEXGtLHJDwoSWrAq3TUm0EVg==",
-      "dev": true,
-      "requires": {
-        "rfile": "~1.0",
-        "uglify-js": "~2.2"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        },
-        "uglify-js": {
-          "version": "2.2.5",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz",
-          "integrity": "sha512-viLk+/8G0zm2aKt1JJAVcz5J/5ytdiNaIsKgrre3yvSUjwVG6ZUujGH7E2TiPigZUwLYCe7eaIUEP2Zka2VJPA==",
-          "dev": true,
-          "requires": {
-            "optimist": "~0.3.5",
-            "source-map": "~0.1.7"
-          }
-        }
-      }
-    },
     "run-async": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
@@ -46236,12 +36820,6 @@
         "individual": "^2.0.0"
       }
     },
-    "rx": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz",
-      "integrity": "sha512-u5qvfulb7NXoY/+OE28920WEgFi6aiDjf5iF9rA2f9tBXejLgTLd0WxkclvIQWjFFHfNJlb7pSTsrjgiDh+Uug==",
-      "dev": true
-    },
     "rxjs": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
@@ -46331,17 +36909,6 @@
         }
       }
     },
-    "script-injector": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/script-injector/-/script-injector-0.1.7.tgz",
-      "integrity": "sha512-0iW1D9UKsOPNUVBHvR76KePNS5TamEBN38bT5k7BqsXItsyV5oJTZbVsvOF3YS2xJ7GB7pszmgfDFJbIgHmrDQ==",
-      "dev": true,
-      "requires": {
-        "duplexer": "~0.1.1",
-        "through": "~2.3.4",
-        "trumpet": "~1.6.3"
-      }
-    },
     "semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -46551,32 +37118,6 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "shallow-copy": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
-      "integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw==",
-      "dev": true
-    },
-    "shasum": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
-      "integrity": "sha512-UTzHm/+AzKfO9RgPgRpDIuMSNie1ubXRaljjlhFMNGYoG7z+rm9AHLPMf70R7887xboDH9Q+5YQbWKObFHEAtw==",
-      "dev": true,
-      "requires": {
-        "json-stable-stringify": "~0.0.0",
-        "sha.js": "~2.4.4"
-      }
-    },
     "shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -46592,35 +37133,6 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
-    "shell-quote": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz",
-      "integrity": "sha512-uEWz7wa9vnCi9w4mvKZMgbHFk3DCKjLQlZcy0tJxUH4NwZjRrPPHXAYIEt2TmJs600Dcgj0Z3fZLZKVPVdGNbQ==",
-      "dev": true
-    },
-    "shelljs": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
-      "integrity": "sha512-Ny0KN4dyT8ZSCE0frtcbAJGoM/HTArpyPkeli1/00aYfm0sbD/Gk/4x7N2DP9QKGpBsiQH7n6rpm1L79RtviEQ==",
-      "dev": true
-    },
-    "shelljs-nodecli": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shelljs-nodecli/-/shelljs-nodecli-0.1.1.tgz",
-      "integrity": "sha512-/e+APCWKKW9A8YMHKgDzhWQ21zPuDLjn6ATBczxbp6uUeiCSwvw95ynKAjMsRd1yrd5dlCkMKJoc/Lpwrt2w+A==",
-      "dev": true,
-      "requires": {
-        "shelljs": "~0.2"
-      },
-      "dependencies": {
-        "shelljs": {
-          "version": "0.2.6",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz",
-          "integrity": "sha512-LQiM15qPbSyzHDFfI4v7EVhjBXG5PUAKWVBnVMBXwdlQSHZtzKYeKGzDHBIqpenPrCsPWqBSOF5o7oSvSfX+CA==",
-          "dev": true
-        }
-      }
-    },
     "side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -46632,12 +37144,6 @@
         "object-inspect": "^1.9.0"
       }
     },
-    "sigmund": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-      "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==",
-      "dev": true
-    },
     "signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -46736,12 +37242,6 @@
         }
       }
     },
-    "slide": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-      "integrity": "sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==",
-      "dev": true
-    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -46917,16 +37417,6 @@
         }
       }
     },
-    "sntp": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
-      "integrity": "sha512-bDLrKa/ywz65gCl+LmOiIhteP1bhEsAAzhfMedPoiHP3dyYnAevlaJshdqb9Yu0sRifyP/fRqSt8t+5qGIWlGQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "hoek": "0.9.x"
-      }
-    },
     "socket.io": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
@@ -47092,23 +37582,6 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
-    "sse-stream": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/sse-stream/-/sse-stream-0.0.4.tgz",
-      "integrity": "sha512-rnDUubW7a4CZAB5D0r2OtFU/zvY05MoNGHMX6deAYK0wWaizrNcHzimf+Nk5y0sqntGAPpWEnIopWrrAf2TBVg==",
-      "dev": true,
-      "requires": {
-        "through": "~2.2.7"
-      },
-      "dependencies": {
-        "through": {
-          "version": "2.2.7",
-          "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
-          "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
-          "dev": true
-        }
-      }
-    },
     "sshpk": {
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
@@ -47232,42 +37705,6 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
     },
-    "stream-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz",
-      "integrity": "sha512-e+V5xc4LlkOiRr64kZTUdb11exsbpSnwb9uwmXaHeDXCpfHg7vaefMJOxi21Pe74ZOqjZ87blBcqqpNAM4Ku0g==",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^1.0.27-1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-          "dev": true
-        }
-      }
-    },
     "stream-buffers": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz",
@@ -47283,81 +37720,6 @@
         "duplexer": "~0.1.1"
       }
     },
-    "stream-combiner2": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
-      "integrity": "sha512-7DO1SfBVnyIyo9ytUjSyVojT5bp1ZY6h3pj7HUs6PwcRSd/r8mBOHbRwYC7nbHRakKzMKyNp5HWJRv4GgVherA==",
-      "dev": true,
-      "requires": {
-        "duplexer2": "~0.0.2",
-        "through2": "~0.5.1"
-      },
-      "dependencies": {
-        "duplexer2": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-          "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.1.9"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-          "dev": true
-        },
-        "through2": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
-          "integrity": "sha512-zexCrAOTbjkBCXGyozn7hhS3aEaqdrc59mAD2E3dKYzV1vFuEGQ1hEDJN2oQMQFwy4he2zyLqPZV+AlfS8ZWJA==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.0.17",
-            "xtend": "~3.0.0"
-          },
-          "dependencies": {
-            "readable-stream": {
-              "version": "1.0.34",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-              "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-              "dev": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
-                "isarray": "0.0.1",
-                "string_decoder": "~0.10.x"
-              }
-            }
-          }
-        },
-        "xtend": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-          "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
-          "dev": true
-        }
-      }
-    },
     "stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
@@ -47370,56 +37732,6 @@
       "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
       "dev": true
     },
-    "stream-splicer": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz",
-      "integrity": "sha512-nmUMEbdm/sZYqe9dZs7mqJvTYpunsDbIWI5FiBCMc/hMVd6vwzy+ITmo7C3gcLYqrn+uQ1w+EJwooWvJ997JAA==",
-      "dev": true,
-      "requires": {
-        "indexof": "0.0.1",
-        "inherits": "^2.0.1",
-        "isarray": "~0.0.1",
-        "readable-stream": "^1.1.13-1",
-        "readable-wrap": "^1.0.0",
-        "through2": "^1.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-          "dev": true
-        },
-        "through2": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.1.13-1 <1.2.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          }
-        }
-      }
-    },
     "streamroller": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.4.tgz",
@@ -47495,13 +37807,6 @@
         "character-entities-legacy": "^3.0.0"
       }
     },
-    "stringstream": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
-      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
-      "dev": true,
-      "optional": true
-    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -47529,30 +37834,6 @@
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
-    "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^4.0.1"
-      }
-    },
-    "strip-json-comments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
-      "integrity": "sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg==",
-      "dev": true
-    },
-    "subarg": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
-      "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.1.0"
-      }
-    },
     "suffix": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
@@ -47583,15 +37864,6 @@
         "es6-symbol": "^3.1.1"
       }
     },
-    "syntax-error": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
-      "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
-      "dev": true,
-      "requires": {
-        "acorn-node": "^1.2.0"
-      }
-    },
     "table": {
       "version": "6.8.0",
       "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
@@ -47625,12 +37897,6 @@
         }
       }
     },
-    "taffydb": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
-      "integrity": "sha512-y3JaeRSplks6NYQuCOj3ZFMO3j60rTwbuKCvZxsAraGYH2epusatvZ0baZYA01WsGqJBq/Dl6vOrMUJqyMj8kA==",
-      "dev": true
-    },
     "tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -47819,12 +38085,6 @@
       "integrity": "sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==",
       "dev": true
     },
-    "throttleit": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
-      "integrity": "sha512-HtlTFeyYs1elDM2txiIGsdXHaq8kffVaZH/QEBRbo95zQqzlsBx5ELKhkPOZVad9OK9oxzwx6UrQN8Vfh/+yag==",
-      "dev": true
-    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -47881,21 +38141,6 @@
       "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
       "dev": true
     },
-    "timed-out": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz",
-      "integrity": "sha512-pqqJOi1rF5zNs/ps4vmbE4SFCrM4iR7LW+GHAsHqO/EumqbIWceioevYLM5xZRgQSH6gFgL9J/uB7EcJhQ9niQ==",
-      "dev": true
-    },
-    "timers-browserify": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
-      "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==",
-      "dev": true,
-      "requires": {
-        "process": "~0.11.0"
-      }
-    },
     "timers-ext": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
@@ -47960,12 +38205,6 @@
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
     },
-    "to-iso-string": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz",
-      "integrity": "sha512-oeHLgfWA7d0CPQa6h0+i5DAJZISz5un0d5SHPkw+Untclcvzv9T+AC3CvGXlZJdOlIbxbTfyyzlqCXc5hjpXYg==",
-      "dev": true
-    },
     "to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -48075,24 +38314,12 @@
       "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
       "dev": true
     },
-    "treeify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.0.1.tgz",
-      "integrity": "sha512-i3MKN4nGEOuVAcd7s5MtAc2+QBExwcaRT/6/CzUSYVYwzM58bJ3H3wwCPu2PEAGjVPHjfIC/MPaXsxPGUk07cg==",
-      "dev": true
-    },
     "trim-lines": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
       "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
       "dev": true
     },
-    "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
-      "dev": true
-    },
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
@@ -48105,65 +38332,6 @@
       "integrity": "sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==",
       "dev": true
     },
-    "trumpet": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/trumpet/-/trumpet-1.6.6.tgz",
-      "integrity": "sha512-A4cn/zuq0AsxS5M8cD+7GUoIhOoK2qkcpFUwlpHnNOsTPzCq7FITZV9lg95ydupJcQRi/kFQzGIn7oN3kNp10w==",
-      "dev": true,
-      "requires": {
-        "duplexer2": "~0.0.2",
-        "html-select": "^2.3.5",
-        "html-tokenize": "^1.1.1",
-        "inherits": "^2.0.0",
-        "readable-stream": "^1.0.27-1",
-        "through2": "^1.0.0"
-      },
-      "dependencies": {
-        "duplexer2": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-          "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.1.9"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-          "dev": true
-        },
-        "through2": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-          "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.1.13-1 <1.2.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          }
-        }
-      }
-    },
     "tsconfig-paths": {
       "version": "3.13.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.13.0.tgz",
@@ -48193,12 +38361,6 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
-    "tty-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
-      "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
-      "dev": true
-    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -48256,6 +38418,13 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
+    "typescript": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "dev": true,
+      "peer": true
+    },
     "typescript-compare": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz",
@@ -48283,12 +38452,6 @@
       "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==",
       "dev": true
     },
-    "uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-      "dev": true
-    },
     "uglify-js": {
       "version": "3.15.2",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz",
@@ -48296,77 +38459,6 @@
       "dev": true,
       "optional": true
     },
-    "uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==",
-      "dev": true
-    },
-    "umd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/umd/-/umd-2.1.0.tgz",
-      "integrity": "sha512-mEAJeceExHnblcAwN3BQtDPYOrTy4ALeBh6nQ9KW0cUCd0UU714jAfil2jvq09b67IizwJIiTVFOjE+/52Dyvw==",
-      "dev": true,
-      "requires": {
-        "rfile": "~1.0.0",
-        "ruglify": "~1.0.0",
-        "through": "~2.3.4",
-        "uglify-js": "~2.4.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "0.2.10",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-          "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.1.34",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
-          "integrity": "sha512-yfCwDj0vR9RTwt3pEzglgb3ZgmcXHt6DjG3bjJvzPwTL+5zDQ2MhmSzAcTy0GTiQuCiriSWXvWM1/NhKdXuoQA==",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        },
-        "uglify-js": {
-          "version": "2.4.24",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz",
-          "integrity": "sha512-tktIjwackfZLd893KGJmXc1hrRHH1vH9Po3xFh1XBjjeGAnN02xJ3SuoA+n1L29/ZaCA18KzCFlckS+vfPugiA==",
-          "dev": true,
-          "requires": {
-            "async": "~0.2.6",
-            "source-map": "0.1.34",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.5.4"
-          }
-        },
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "3.5.4",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
-          "integrity": "sha512-5j382E4xQSs71p/xZQsU1PtRA2HXPAjX0E0DkoGLxwNASMOKX6A9doV1NrZmj85u2Pjquz402qonBzz/yLPbPA==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^1.0.2",
-            "decamelize": "^1.0.0",
-            "window-size": "0.1.0",
-            "wordwrap": "0.0.2"
-          }
-        }
-      }
-    },
     "unbox-primitive": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
@@ -48395,18 +38487,6 @@
       "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
       "dev": true
     },
-    "underscore": {
-      "version": "1.13.6",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
-      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
-      "dev": true
-    },
-    "underscore.string": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz",
-      "integrity": "sha512-yxkabuCaIBnzfIvX3kBxQqCs0ar/bfJwDnFEHJUm/ZrRVhT3IItdRF5cZjARLzEnyQYtIUhsZ2LG2j3HidFOFQ==",
-      "dev": true
-    },
     "undertaker": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
@@ -48712,12 +38792,6 @@
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
-    "user-home": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-      "integrity": "sha512-aggiKfEEubv3UwRNqTzLInZpAOmKzwdHqEBmW/hBA/mt99eg+b4VrX6i+IRLxU8+WJYfa33rGwRseg4eElUgsQ==",
-      "dev": true
-    },
     "util": {
       "version": "0.12.4",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
@@ -48738,12 +38812,6 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "util-extend": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz",
-      "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==",
-      "dev": true
-    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -49085,15 +39153,6 @@
         "source-map": "^0.5.1"
       }
     },
-    "vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha512-NyZNR3WDah+NPkjh/YmhuWSsT4a0mF0BJYgUmvrJ70zxjTXh5Y2Asobxlh0Nfs0PCFB5FVpRJft7NozAWFMwLQ==",
-      "dev": true,
-      "requires": {
-        "indexof": "0.0.1"
-      }
-    },
     "void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
@@ -49202,9 +39261,9 @@
           }
         },
         "minimatch": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-          "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
           "dev": true,
           "requires": {
             "brace-expansion": "^2.0.1"
@@ -49516,12 +39575,6 @@
         "is-typed-array": "^1.1.7"
       }
     },
-    "window-size": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-      "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
-      "dev": true
-    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -49610,18 +39663,6 @@
       "dev": true,
       "requires": {}
     },
-    "xml-escape": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.0.0.tgz",
-      "integrity": "sha512-gCT82WbwOT9SBI/94j5i0tqHpjHIP/0kP11BS8s2wcBtdcFsDNLS9sLvA+C55fD3hpGhgnE/r7hfeBFkiMATjw==",
-      "dev": true
-    },
-    "xmlcreate": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
-      "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
-      "dev": true
-    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",

From b744a9d7e478cf8f5529db48dcbd3daf1654594f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 12:45:11 -0700
Subject: [PATCH 376/569] Bump @xmldom/xmldom from 0.7.5 to 0.7.6 (#9144)

Bumps [@xmldom/xmldom](https://github.com/xmldom/xmldom) from 0.7.5 to 0.7.6.
- [Release notes](https://github.com/xmldom/xmldom/releases)
- [Changelog](https://github.com/xmldom/xmldom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xmldom/xmldom/compare/0.7.5...0.7.6)

---
updated-dependencies:
- dependency-name: "@xmldom/xmldom"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e11da6fba7b..ec0bebcd2d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3711,9 +3711,9 @@
       }
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz",
-      "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==",
+      "version": "0.7.6",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.6.tgz",
+      "integrity": "sha512-HHXP9hskkFQHy8QxxUXkS7946FFIhYVfGqsk0WLwllmexN9x/+R4UBLvurHEuyXRfVEObVR8APuQehykLviwSQ==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
@@ -25217,9 +25217,9 @@
       }
     },
     "@xmldom/xmldom": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz",
-      "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==",
+      "version": "0.7.6",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.6.tgz",
+      "integrity": "sha512-HHXP9hskkFQHy8QxxUXkS7946FFIhYVfGqsk0WLwllmexN9x/+R4UBLvurHEuyXRfVEObVR8APuQehykLviwSQ==",
       "dev": true
     },
     "@xtuc/ieee754": {

From 0a267ddb587f955494bb9cf6cb49dba0810fd933 Mon Sep 17 00:00:00 2001
From: matthieularere-msq
 <63732822+matthieularere-msq@users.noreply.github.com>
Date: Mon, 24 Oct 2022 13:51:50 +0200
Subject: [PATCH 377/569] Oxxion Rtd Module: initial module release (#9102)

* add oxxionRtdProvider new module

* +

* add tests

* Update oxxionRtdProvider.md

* Update oxxionRtdProvider.js

* Update oxxionRtdProvider_spec.js

* +

* change test

* change tests

* change tests

* change tests

* change tests

* requests changes

* requests changes

* requested changes
---
 modules/oxxionRtdProvider.js                | 119 ++++++++++++++++
 modules/oxxionRtdProvider.md                |  48 +++++++
 test/spec/modules/oxxionRtdProvider_spec.js | 142 ++++++++++++++++++++
 3 files changed, 309 insertions(+)
 create mode 100644 modules/oxxionRtdProvider.js
 create mode 100644 modules/oxxionRtdProvider.md
 create mode 100644 test/spec/modules/oxxionRtdProvider_spec.js

diff --git a/modules/oxxionRtdProvider.js b/modules/oxxionRtdProvider.js
new file mode 100644
index 00000000000..b4964818ddf
--- /dev/null
+++ b/modules/oxxionRtdProvider.js
@@ -0,0 +1,119 @@
+import { submodule } from '../src/hook.js'
+import { deepAccess, logInfo } from '../src/utils.js'
+
+const oxxionRtdSearchFor = [ 'adUnitCode', 'auctionId', 'bidder', 'bidderCode', 'bidId', 'cpm', 'creativeId', 'currency', 'width', 'height', 'mediaType', 'netRevenue', 'originalCpm', 'originalCurrency', 'requestId', 'size', 'source', 'status', 'timeToRespond', 'transactionId', 'ttl', 'sizes', 'mediaTypes', 'src', 'userId', 'labelAny', 'adId' ];
+const LOG_PREFIX = 'oxxionRtdProvider submodule: ';
+
+const allAdUnits = [];
+
+/** @type {RtdSubmodule} */
+export const oxxionSubmodule = {
+  name: 'oxxionRtd',
+  init: init,
+  onAuctionEndEvent: onAuctionEnd,
+  getBidRequestData: getAdUnits,
+};
+
+function init(config, userConsent) {
+  if (!config.params || !config.params.domain || !config.params.contexts || !Array.isArray(config.params.contexts) || config.params.contexts.length == 0) {
+    return false
+  }
+  return true;
+}
+
+function getAdUnits(reqBidsConfigObj, callback, config, userConsent) {
+  const reqAdUnits = reqBidsConfigObj.adUnits;
+  if (Array.isArray(reqAdUnits)) {
+    reqAdUnits.forEach(adunit => {
+      if (config.params.contexts.includes(deepAccess(adunit, 'mediaTypes.video.context'))) {
+        allAdUnits.push(adunit);
+      }
+    });
+  }
+}
+
+function insertVideoTracking(bidResponse, config, maxCpm) {
+  if (bidResponse.mediaType === 'video') {
+    const trackingUrl = getImpUrl(config, bidResponse, maxCpm);
+    if (!trackingUrl) {
+      return;
+    }
+    // Vast Impression URL
+    if (bidResponse.vastUrl) {
+      bidResponse.vastImpUrl = bidResponse.vastImpUrl
+        ? trackingUrl + '&url=' + encodeURI(bidResponse.vastImpUrl)
+        : trackingUrl
+    }
+    // Vast XML document
+    if (bidResponse.vastXml !== undefined) {
+      const doc = new DOMParser().parseFromString(bidResponse.vastXml, 'text/xml');
+      const wrappers = doc.querySelectorAll('VAST Ad Wrapper, VAST Ad InLine');
+      let hasAltered = false;
+      if (wrappers.length) {
+        wrappers.forEach(wrapper => {
+          const impression = doc.createElement('Impression');
+          impression.appendChild(doc.createCDATASection(trackingUrl));
+          wrapper.appendChild(impression)
+        });
+        bidResponse.vastXml = new XMLSerializer().serializeToString(doc);
+        hasAltered = true;
+      }
+      if (hasAltered) {
+        logInfo(LOG_PREFIX + 'insert into vastXml for adId ' + bidResponse.adId);
+      }
+    }
+  }
+}
+
+function getImpUrl(config, data, maxCpm) {
+  const adUnitCode = data.adUnitCode;
+  const adUnits = allAdUnits.find(adunit => adunit.code === adUnitCode &&
+  'mediaTypes' in adunit &&
+  'video' in adunit.mediaTypes &&
+  typeof adunit.mediaTypes.video.context === 'string');
+  const context = adUnits !== undefined
+    ? adUnits.mediaTypes.video.context
+    : 'unknown';
+  if (!config.params.contexts.includes(context)) {
+    return false;
+  }
+  let trackingImpUrl = 'https://' + config.params.domain + '.oxxion.io/analytics/vast_imp?';
+  trackingImpUrl += oxxionRtdSearchFor.reduce((acc, param) => {
+    switch (typeof data[param]) {
+      case 'string':
+      case 'number':
+        acc += param + '=' + data[param] + '&'
+        break;
+    }
+    return acc;
+  }, '');
+  const cpmIncrement = Math.round(100000 * (data.cpm - maxCpm)) / 100000;
+  return trackingImpUrl + 'cpmIncrement=' + cpmIncrement + '&context=' + context;
+}
+
+function onAuctionEnd(auctionDetails, config, userConsent) {
+  const transactionsToCheck = {}
+  auctionDetails.adUnits.forEach(adunit => {
+    if (config.params.contexts.includes(deepAccess(adunit, 'mediaTypes.video.context'))) {
+      transactionsToCheck[adunit.transactionId] = {'bids': {}, 'maxCpm': 0.0, 'secondMaxCpm': 0.0};
+    }
+  });
+  for (const key in auctionDetails.bidsReceived) {
+    if (auctionDetails.bidsReceived[key].transactionId in transactionsToCheck) {
+      transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['bids'][auctionDetails.bidsReceived[key].adId] = {'key': key, 'cpm': auctionDetails.bidsReceived[key].cpm};
+      if (auctionDetails.bidsReceived[key].cpm > transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['maxCpm']) {
+        transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['secondMaxCpm'] = transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['maxCpm'];
+        transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['maxCpm'] = auctionDetails.bidsReceived[key].cpm;
+      } else if (auctionDetails.bidsReceived[key].cpm > transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['secondMaxCpm']) {
+        transactionsToCheck[auctionDetails.bidsReceived[key].transactionId]['secondMaxCpm'] = auctionDetails.bidsReceived[key].cpm;
+      }
+    }
+  };
+  Object.keys(transactionsToCheck).forEach(transaction => {
+    Object.keys(transactionsToCheck[transaction]['bids']).forEach(bid => {
+      insertVideoTracking(auctionDetails.bidsReceived[transactionsToCheck[transaction]['bids'][bid].key], config, transactionsToCheck[transaction].secondMaxCpm);
+    });
+  });
+}
+
+submodule('realTimeData', oxxionSubmodule);
diff --git a/modules/oxxionRtdProvider.md b/modules/oxxionRtdProvider.md
new file mode 100644
index 00000000000..061acdbe11a
--- /dev/null
+++ b/modules/oxxionRtdProvider.md
@@ -0,0 +1,48 @@
+# Overview
+
+Module Name: Oxxion Rtd Provider
+Module Type: Rtd Provider
+Maintainer: tech@oxxion.io
+
+# Oxxion Real-Time-Data submodule
+
+Oxxion helps you to understand how your prebid stack performs.
+This Rtd module is to use in order to improve video events tracking.
+
+# Integration
+
+Make sure to have the following modules listed while building prebid : `rtdModule,oxxionRtdProvider`
+`rtbModule` is required to activate real-time-data submodules.
+For example :
+```
+gulp build --modules=schain,priceFloors,currency,consentManagement,appnexusBidAdapter,rubiconBidAdapter,rtdModule,oxxionRtdProvider
+```
+
+Then add the oxxion Rtd module to your prebid configuration :
+```
+pbjs.setConfig(
+  ...
+  realTimeData: {
+    auctionDelay: 200,
+    dataProviders: [
+      {
+          name: "oxxionRtd",
+          waitForIt: true,
+          params: {
+            domain: "test.endpoint",
+            contexts: ["instream"],
+          }
+       }
+    ]
+  }
+  ...
+)
+```
+
+# setConfig Parameters
+
+| Name                             | Type     | Description                                                                                                 |
+|:---------------------------------|:---------|:------------------------------------------------------------------------------------------------------------|
+| domain                           | String   | This string identifies yourself in Oxxion's systems and is provided to you by your Oxxion representative.   |
+| contexts                         | Array    | Array defining which video contexts to add tracking events into. Values can be instream and/or outstream.   |
+
diff --git a/test/spec/modules/oxxionRtdProvider_spec.js b/test/spec/modules/oxxionRtdProvider_spec.js
new file mode 100644
index 00000000000..776076cc215
--- /dev/null
+++ b/test/spec/modules/oxxionRtdProvider_spec.js
@@ -0,0 +1,142 @@
+import {oxxionSubmodule} from 'modules/oxxionRtdProvider.js';
+import 'src/prebid.js';
+
+const utils = require('src/utils.js');
+
+const moduleConfig = {
+  params: {
+    domain: 'test.endpoint',
+    contexts: ['instream', 'outstream']
+  }
+};
+
+let request = {
+  'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
+  'timestamp': 1647424261187,
+  'auctionEnd': 1647424261714,
+  'auctionStatus': 'completed',
+  'adUnits': [
+    {
+      'code': 'msq_tag_200124_banner',
+      'mediaTypes': { 'banner': { 'sizes': [[300, 600]] } },
+      'bids': [{'bidder': 'appnexus', 'params': {'placementId': 123456}}],
+      'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b40'
+    },
+    {
+      'code': 'msq_tag_200125_video',
+      'mediaTypes': { 'video': { 'context': 'instream' }, playerSize: [640, 480], mimes: ['video/mp4'] },
+      'bids': [
+        {'bidder': 'mediasquare', 'params': {'code': 'publishername_atf_desktop_rg_video', 'owner': 'test'}},
+        {'bidder': 'appnexusAst', 'params': {'placementId': 345678}},
+      ],
+      'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b41'
+    },
+  ]
+};
+
+let bids = [{
+  'bidderCode': 'mediasquare',
+  'width': 640,
+  'height': 480,
+  'statusMessage': 'Bid available',
+  'adId': '3647626fdbe68a',
+  'requestId': '2d891705d2125b',
+  'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b41',
+  'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
+  'mediaType': 'video',
+  'source': 'client',
+  'cpm': 0.9723,
+  'creativeId': 'freewheel|AdswizzAd71819',
+  'currency': 'USD',
+  'netRevenue': true,
+  'ttl': 2000,
+  'mediasquare': {
+    'bidder': 'freewheel',
+    'code': 'test/publishername_atf_desktop_rg_video',
+    'hasConsent': true
+  },
+  'meta': {
+    'advertiserDomains': [
+      'unknown'
+    ]
+  },
+  'vastUrl': 'https://some.vast-url.com',
+  'vastXml': '<VAST version="3.0"><Ad><Wrapper><VASTAdTagURI><![CDATA[https://pbs-front.mediasquare.fr/cache?uuid=4de68767e8f2f9974fd4addd5a9d135a]]></VASTAdTagURI><Impression><![CDATA[https://pbs-front.mediasquare.fr/winning?adUnitCode=&auctionId=ZltsQnBqbcyC6aalwAdD4irnXmrl3E&bidder=freewheel&code=test/publishername_atf_desktop_rg_video&cpm=0.9723&creativeId=AdswizzAd71819&currency=USD&hasConsent=true&mediaType=video&pbjs=&requestId=2d891705d2125b&size=video&timeToRespond=unknown]]></Impression></Wrapper></Ad></VAST>',
+  'adapterCode': 'mediasquare',
+  'originalCpm': 0.9723,
+  'originalCurrency': 'USD',
+  'responseTimestamp': 1665505150740,
+  'requestTimestamp': 1665505150594,
+  'bidder': 'mediasquare',
+  'adUnitCode': 'msq_tag_200125_video',
+  'timeToRespond': 146,
+  'size': '640x480',
+}, {
+  'bidderCode': 'appnexusAst',
+  'width': 640,
+  'height': 480,
+  'statusMessage': 'Bid available',
+  'adId': '4b2e1581c0ca1a',
+  'requestId': '2d891705d2125b',
+  'transactionId': 'de664ccb-e18b-4436-aeb0-362382eb1b41',
+  'auctionId': '1e8b993d-8f0a-4232-83eb-3639ddf3a44b',
+  'mediaType': 'video',
+  'source': 'client',
+  'cpm': 1.9723,
+  'creativeId': '159080650',
+  'currency': 'USD',
+  'netRevenue': true,
+  'ttl': 2000,
+  'vastUrl': 'https://some.vast-url.com',
+  'vastXml': '<VAST version="3.0"><Ad><InLine><AdSystem>Adnxs</AdSystem><AdTitle>Title</AdTitle><Creatives/></InLine></Ad></VAST>',
+  'adapterCode': 'mediasquare',
+  'originalCpm': 1.9723,
+  'originalCurrency': 'USD',
+  'responseTimestamp': 1665505150740,
+  'requestTimestamp': 1665505150594,
+  'bidder': 'appnexusAst',
+  'adUnitCode': 'msq_tag_200125_video',
+  'timeToRespond': 146,
+  'size': '640x480',
+  'vastImpUrl': 'https://some.tracking-url.com'
+},
+];
+
+describe('oxxionRtdProvider', () => {
+  describe('Oxxion RTD sub module', () => {
+    it('should init, return true, and set the params', () => {
+      expect(oxxionSubmodule.init(moduleConfig)).to.equal(true);
+    });
+  });
+
+  describe('Oxxion RTD sub module', () => {
+    let auctionEnd = request;
+    auctionEnd.bidsReceived = bids;
+    it('call everything', function() {
+      oxxionSubmodule.getBidRequestData(request, null, moduleConfig);
+      oxxionSubmodule.onAuctionEndEvent(auctionEnd, moduleConfig);
+    });
+    it('check vastImpUrl', function() {
+      expect(auctionEnd.bidsReceived[0]).to.have.property('vastImpUrl');
+      let expectVastImpUrl = 'https://' + moduleConfig.params.domain + '.oxxion.io/analytics/vast_imp?';
+      expect(auctionEnd.bidsReceived[1].vastImpUrl).to.contain(expectVastImpUrl);
+      expect(auctionEnd.bidsReceived[1].vastImpUrl).to.contain(encodeURI('https://some.tracking-url.com'));
+    });
+    it('check vastXml', function() {
+      expect(auctionEnd.bidsReceived[0]).to.have.property('vastXml');
+      let vastWrapper = new DOMParser().parseFromString(auctionEnd.bidsReceived[0].vastXml, 'text/xml');
+      let impressions = vastWrapper.querySelectorAll('VAST Ad Wrapper Impression');
+      expect(impressions.length).to.equal(2);
+      expect(auctionEnd.bidsReceived[1]).to.have.property('vastXml');
+      expect(auctionEnd.bidsReceived[1].adId).to.equal('4b2e1581c0ca1a');
+      let vastInline = new DOMParser().parseFromString(auctionEnd.bidsReceived[1].vastXml, 'text/xml');
+      let inline = vastInline.querySelectorAll('VAST Ad InLine');
+      expect(inline).to.have.lengthOf(1);
+      let inlineImpressions = vastInline.querySelectorAll('VAST Ad InLine Impression');
+      expect(inlineImpressions).to.have.lengthOf.above(0);
+    });
+    it('check cpmIncrement', function() {
+      expect(auctionEnd.bidsReceived[1].vastImpUrl).to.contain(encodeURI('cpmIncrement=1'));
+    });
+  });
+});

From 64aff9b1af9bb1b2761e1012f628299f16c0eb46 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Mon, 24 Oct 2022 08:55:04 -0700
Subject: [PATCH 378/569] Prebid core: return a promise from `requestBids`
 (#9106)

---
 src/prebid.js                   | 139 +++++++++++++++++---------------
 test/spec/unit/pbjs_api_spec.js | 139 ++++++++++++++++++++++----------
 2 files changed, 168 insertions(+), 110 deletions(-)

diff --git a/src/prebid.js b/src/prebid.js
index 0378f8c27ed..7b1cfd258ec 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -622,7 +622,7 @@ $$PREBID_GLOBAL$$.removeAdUnit = function (adUnitCode) {
  * @alias module:pbjs.requestBids
  */
 $$PREBID_GLOBAL$$.requestBids = (function() {
-  const delegate = hook('async', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels, auctionId, ortb2, metrics } = {}) {
+  const delegate = hook('sync', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels, auctionId, ortb2, metrics } = {}) {
     events.emit(REQUEST_BIDS);
     const cbTimeout = timeout || config.getConfig('bidderTimeout');
     logInfo('Invoking $$PREBID_GLOBAL$$.requestBids', arguments);
@@ -646,7 +646,7 @@ $$PREBID_GLOBAL$$.requestBids = (function() {
   });
 })();
 
-export const startAuction = hook('async', function ({ bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ortb2Fragments, metrics } = {}) {
+export const startAuction = hook('sync', function ({ bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ortb2Fragments, metrics } = {}) {
   const s2sBidders = getS2SBidderSet(config.getConfig('s2sConfig') || []);
   adUnits = useMetrics(metrics).measureTime('requestBids.validate', () => checkAdUnitSetup(adUnits));
 
@@ -658,77 +658,82 @@ export const startAuction = hook('async', function ({ bidsBackHandler, timeout:
     adUnitCodes = adUnits && adUnits.map(unit => unit.code);
   }
 
-  /*
-   * for a given adunit which supports a set of mediaTypes
-   * and a given bidder which supports a set of mediaTypes
-   * a bidder is eligible to participate on the adunit
-   * if it supports at least one of the mediaTypes on the adunit
-   */
-  adUnits.forEach(adUnit => {
-    // get the adunit's mediaTypes, defaulting to banner if mediaTypes isn't present
-    const adUnitMediaTypes = Object.keys(adUnit.mediaTypes || { 'banner': 'banner' });
-
-    // get the bidder's mediaTypes
-    const allBidders = adUnit.bids.map(bid => bid.bidder);
-    const bidderRegistry = adapterManager.bidderRegistry;
-
-    const bidders = allBidders.filter(bidder => !s2sBidders.has(bidder));
-
-    const tid = adUnit.ortb2Imp?.ext?.tid || generateUUID();
-    adUnit.transactionId = tid;
-    // Populate ortb2Imp.ext.tid with transactionId. Specifying a transaction ID per item in the ortb impression array, lets multiple transaction IDs be transmitted in a single bid request.
-    deepSetValue(adUnit, 'ortb2Imp.ext.tid', tid);
-
-    bidders.forEach(bidder => {
-      const adapter = bidderRegistry[bidder];
-      const spec = adapter && adapter.getSpec && adapter.getSpec();
-      // banner is default if not specified in spec
-      const bidderMediaTypes = (spec && spec.supportedMediaTypes) || ['banner'];
-
-      // check if the bidder's mediaTypes are not in the adUnit's mediaTypes
-      const bidderEligible = adUnitMediaTypes.some(type => includes(bidderMediaTypes, type));
-      if (!bidderEligible) {
-        // drop the bidder from the ad unit if it's not compatible
-        logWarn(unsupportedBidderMessage(adUnit, bidder));
-        adUnit.bids = adUnit.bids.filter(bid => bid.bidder !== bidder);
-      } else {
-        adunitCounter.incrementBidderRequestsCounter(adUnit.code, bidder);
+  return new Promise((resolve) => {
+    function auctionDone(bids, timedOut, auctionId) {
+      if (typeof bidsBackHandler === 'function') {
+        try {
+          bidsBackHandler(bids, timedOut, auctionId);
+        } catch (e) {
+          logError('Error executing bidsBackHandler', null, e);
+        }
       }
+      resolve({bids, timedOut, auctionId});
+    }
+
+    /*
+     * for a given adunit which supports a set of mediaTypes
+     * and a given bidder which supports a set of mediaTypes
+     * a bidder is eligible to participate on the adunit
+     * if it supports at least one of the mediaTypes on the adunit
+     */
+    adUnits.forEach(adUnit => {
+      // get the adunit's mediaTypes, defaulting to banner if mediaTypes isn't present
+      const adUnitMediaTypes = Object.keys(adUnit.mediaTypes || { 'banner': 'banner' });
+
+      // get the bidder's mediaTypes
+      const allBidders = adUnit.bids.map(bid => bid.bidder);
+      const bidderRegistry = adapterManager.bidderRegistry;
+
+      const bidders = allBidders.filter(bidder => !s2sBidders.has(bidder));
+
+      const tid = adUnit.ortb2Imp?.ext?.tid || generateUUID();
+      adUnit.transactionId = tid;
+      // Populate ortb2Imp.ext.tid with transactionId. Specifying a transaction ID per item in the ortb impression array, lets multiple transaction IDs be transmitted in a single bid request.
+      deepSetValue(adUnit, 'ortb2Imp.ext.tid', tid);
+
+      bidders.forEach(bidder => {
+        const adapter = bidderRegistry[bidder];
+        const spec = adapter && adapter.getSpec && adapter.getSpec();
+        // banner is default if not specified in spec
+        const bidderMediaTypes = (spec && spec.supportedMediaTypes) || ['banner'];
+
+        // check if the bidder's mediaTypes are not in the adUnit's mediaTypes
+        const bidderEligible = adUnitMediaTypes.some(type => includes(bidderMediaTypes, type));
+        if (!bidderEligible) {
+          // drop the bidder from the ad unit if it's not compatible
+          logWarn(unsupportedBidderMessage(adUnit, bidder));
+          adUnit.bids = adUnit.bids.filter(bid => bid.bidder !== bidder);
+        } else {
+          adunitCounter.incrementBidderRequestsCounter(adUnit.code, bidder);
+        }
+      });
+      adunitCounter.incrementRequestsCounter(adUnit.code);
     });
-    adunitCounter.incrementRequestsCounter(adUnit.code);
-  });
 
-  if (!adUnits || adUnits.length === 0) {
-    logMessage('No adUnits configured. No bids requested.');
-    if (typeof bidsBackHandler === 'function') {
-      // executeCallback, this will only be called in case of first request
-      try {
-        bidsBackHandler();
-      } catch (e) {
-        logError('Error executing bidsBackHandler', null, e);
+    if (!adUnits || adUnits.length === 0) {
+      logMessage('No adUnits configured. No bids requested.');
+      auctionDone();
+    } else {
+      const auction = auctionManager.createAuction({
+        adUnits,
+        adUnitCodes,
+        callback: auctionDone,
+        cbTimeout,
+        labels,
+        auctionId,
+        ortb2Fragments,
+        metrics,
+      });
+
+      let adUnitsLen = adUnits.length;
+      if (adUnitsLen > 15) {
+        logInfo(`Current auction ${auction.getAuctionId()} contains ${adUnitsLen} adUnits.`, adUnits);
       }
-    }
-    return;
-  }
 
-  const auction = auctionManager.createAuction({
-    adUnits,
-    adUnitCodes,
-    callback: bidsBackHandler,
-    cbTimeout,
-    labels,
-    auctionId,
-    ortb2Fragments,
-    metrics,
+      adUnitCodes.forEach(code => targeting.setLatestAuctionForAdUnit(code, auction.getAuctionId()));
+      auction.callBids();
+    }
   });
-
-  let adUnitsLen = adUnits.length;
-  if (adUnitsLen > 15) {
-    logInfo(`Current auction ${auction.getAuctionId()} contains ${adUnitsLen} adUnits.`, adUnits);
-  }
-
-  adUnitCodes.forEach(code => targeting.setLatestAuctionForAdUnit(code, auction.getAuctionId()));
-  auction.callBids();
 }, 'startAuction');
 
 export function executeCallbacks(fn, reqBidsConfigObj) {
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index 4c1f5c3b455..e83608325d8 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -21,7 +21,8 @@ import {hook} from '../../../src/hook.js';
 import {reset as resetDebugging} from '../../../src/debugging.js';
 import $$PREBID_GLOBAL$$ from 'src/prebid.js';
 import {resetAuctionState} from 'src/auction.js';
-
+import {stubAuctionIndex} from '../../helpers/indexStub.js';
+import {createBid} from '../../../src/bidfactory.js';
 var assert = require('chai').assert;
 var expect = require('chai').expect;
 
@@ -1467,7 +1468,6 @@ describe('Unit: Prebid Module', function () {
     after(function () {
       clock.restore();
     });
-    let bidsBackHandlerStub = sinon.stub();
 
     const BIDDER_CODE = 'sampleBidder';
     let bids = [{
@@ -1504,11 +1504,12 @@ describe('Unit: Prebid Module', function () {
       'start': 1000
     }];
 
+    let spec, indexStub, auction, completeAuction;
+
     beforeEach(function () {
       logMessageSpy = sinon.spy(utils, 'logMessage');
       makeRequestsStub = sinon.stub(adapterManager, 'makeBidRequests');
       makeRequestsStub.returns(bidRequests);
-
       adUnits = [{
         code: 'adUnit-code',
         mediaTypes: {
@@ -1516,45 +1517,53 @@ describe('Unit: Prebid Module', function () {
             sizes: [[300, 250]]
           }
         },
+        transactionId: 'mock-tid',
         bids: [
           {bidder: BIDDER_CODE, params: {placementId: 'id'}},
         ]
       }];
-      let adUnitCodes = ['adUnit-code'];
-      let auction = auctionModule.newAuction({
-        adUnits,
-        adUnitCodes,
-        callback: bidsBackHandlerStub,
-        cbTimeout: 2000
-      });
-      let createAuctionStub = sinon.stub(auctionModule, 'newAuction');
-      createAuctionStub.returns(auction);
-    });
-
-    afterEach(function () {
-      clock.restore();
-      adapterManager.makeBidRequests.restore();
-      auctionModule.newAuction.restore();
-      utils.logMessage.restore();
-    });
-
-    it('should execute callback after timeout', function () {
-      let spec = {
+      indexStub = sinon.stub(auctionManager, 'index');
+      indexStub.get(() => stubAuctionIndex({adUnits, bidRequests}))
+      sinon.stub(adapterManager, 'callBids').callsFake((_, bidrequests, addBidResponse, adapterDone) => {
+        completeAuction = (bidsReceived) => {
+          bidsReceived.forEach((bid) => addBidResponse(bid.adUnitCode, Object.assign(createBid(), bid)));
+          bidRequests.forEach((req) => adapterDone.call(req));
+        }
+      })
+      const origNewAuction = auctionModule.newAuction;
+      sinon.stub(auctionModule, 'newAuction').callsFake(function (opts) {
+        auction = origNewAuction(opts);
+        return auction;
+      })
+      spec = {
         code: BIDDER_CODE,
         isBidRequestValid: sinon.stub(),
         buildRequests: sinon.stub(),
         interpretResponse: sinon.stub(),
         getUserSyncs: sinon.stub(),
-        onTimeout: sinon.stub()
+        onTimeout: sinon.stub(),
+        onSetTargeting: sinon.stub(),
       };
 
       registerBidder(spec);
       spec.buildRequests.returns([{'id': 123, 'method': 'POST'}]);
       spec.isBidRequestValid.returns(true);
       spec.interpretResponse.returns(bids);
+    });
+
+    afterEach(function () {
+      clock.restore();
+      adapterManager.makeBidRequests.restore();
+      adapterManager.callBids.restore();
+      indexStub.restore();
+      auction.getBidsReceived = () => [];
+      auctionModule.newAuction.restore();
+      utils.logMessage.restore();
+    });
 
+    it('should execute callback after timeout', function () {
       let requestObj = {
-        bidsBackHandler: null, // does not need to be defined because of newAuction mock in beforeEach
+        bidsBackHandler: sinon.stub(),
         timeout: 2000,
         adUnits: adUnits
       };
@@ -1567,26 +1576,13 @@ describe('Unit: Prebid Module', function () {
       clock.tick(1);
       assert.ok(logMessageSpy.calledWith(sinon.match(re)), 'executeCallback called');
 
-      expect(bidsBackHandlerStub.getCall(0).args[1]).to.equal(true,
+      expect(requestObj.bidsBackHandler.getCall(0).args[1]).to.equal(true,
         'bidsBackHandler should be called with timedOut=true');
 
       sinon.assert.called(spec.onTimeout);
     });
 
-    it('should execute callback after setTargeting', function () {
-      let spec = {
-        code: BIDDER_CODE,
-        isBidRequestValid: sinon.stub(),
-        buildRequests: sinon.stub(),
-        interpretResponse: sinon.stub(),
-        onSetTargeting: sinon.stub()
-      };
-
-      registerBidder(spec);
-      spec.buildRequests.returns([{'id': 123, 'method': 'POST'}]);
-      spec.isBidRequestValid.returns(true);
-      spec.interpretResponse.returns(bids);
-
+    it('should execute `onSetTargeting` after setTargetingForGPTAsync', function () {
       const bidId = 1;
       const auctionId = 1;
       let adResponse = Object.assign({
@@ -1595,6 +1591,7 @@ describe('Unit: Prebid Module', function () {
         width: 300,
         height: 250,
         adUnitCode: bidRequests[0].bids[0].adUnitCode,
+        transactionId: 'mock-tid',
         adserverTargeting: {
           'hb_bidder': BIDDER_CODE,
           'hb_adid': bidId,
@@ -1603,20 +1600,76 @@ describe('Unit: Prebid Module', function () {
         },
         bidder: bids[0].bidderCode,
       }, bids[0]);
-      auction.getBidsReceived = function() { return [adResponse]; }
-      auction.getAuctionId = () => auctionId;
 
       let requestObj = {
-        bidsBackHandler: null, // does not need to be defined because of newAuction mock in beforeEach
+        bidsBackHandler: null,
         timeout: 2000,
         adUnits: adUnits
       };
 
       $$PREBID_GLOBAL$$.requestBids(requestObj);
+      completeAuction([adResponse]);
       $$PREBID_GLOBAL$$.setTargetingForGPTAsync();
 
       sinon.assert.called(spec.onSetTargeting);
     });
+
+    describe('returns a promise that resolves', () => {
+      Object.entries({
+        'immediately, without bidsBackHandler': (req) => $$PREBID_GLOBAL$$.requestBids(req),
+        'after bidsBackHandler': (() => {
+          const bidsBackHandler = sinon.stub();
+          return function (req) {
+            return $$PREBID_GLOBAL$$.requestBids({...req, bidsBackHandler}).then(({bids, timedOut, auctionId}) => {
+              sinon.assert.calledWith(bidsBackHandler, bids, timedOut, auctionId);
+              return {bids, timedOut, auctionId};
+            })
+          }
+        })(),
+        'after a bidsBackHandler that throws': (req) => $$PREBID_GLOBAL$$.requestBids({...req, bidsBackHandler: () => { throw new Error() }})
+      }).forEach(([t, requestBids]) => {
+        describe(t, () => {
+          it('with no args, when no adUnits are defined', () => {
+            return requestBids({}).then((res) => {
+              expect(res).to.eql({
+                bids: undefined,
+                timedOut: undefined,
+                auctionId: undefined
+              });
+            });
+          });
+
+          it('on timeout', (done) => {
+            requestBids({
+              auctionId: 'mock-auctionId',
+              adUnits,
+              timeout: 10
+            }).then(({timedOut, bids, auctionId}) => {
+              expect(timedOut).to.be.true;
+              expect(bids).to.eql({});
+              expect(auctionId).to.eql('mock-auctionId');
+              done();
+            });
+            clock.tick(12);
+          });
+
+          it('with auction result', (done) => {
+            const bid = {
+              bidder: 'mock-bidder',
+              adUnitCode: adUnits[0].code,
+              transactionId: adUnits[0].transactionId
+            }
+            requestBids({
+              adUnits,
+            }).then(({bids}) => {
+              sinon.assert.match(bids[bid.adUnitCode].bids[0], bid)
+              done();
+            });
+            completeAuction([bid]);
+          })
+        })
+      })
+    })
   })
 
   describe('requestBids', function () {

From 8a1935e0e3d096bec47f92b82393289ebdd0dd99 Mon Sep 17 00:00:00 2001
From: TAKENORI MATSUMOTO <takenori.matsumoto@gmail.com>
Date: Tue, 25 Oct 2022 21:47:14 +0900
Subject: [PATCH 379/569] Fix typo "noDecodeWholeUrl" to "noDecodeWholeURL" at
 the priceFloors module (#9150)

Co-authored-by: Takenori Matsumoto <tmatsumoto@magnite.com>
---
 modules/priceFloors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/priceFloors.js b/modules/priceFloors.js
index d7ab811d673..8b5976149d0 100644
--- a/modules/priceFloors.js
+++ b/modules/priceFloors.js
@@ -82,7 +82,7 @@ const getHostname = (() => {
   let domain;
   return function() {
     if (domain == null) {
-      domain = parseUrl(getRefererInfo().topmostLocation, {noDecodeWholeUrl: true}).hostname;
+      domain = parseUrl(getRefererInfo().topmostLocation, {noDecodeWholeURL: true}).hostname;
     }
     return domain;
   }

From 4329b2a0d5a6fdc0cfbfcc11d845b16988e14ae7 Mon Sep 17 00:00:00 2001
From: Jeremy Sadwith <jeremy@kargo.com>
Date: Wed, 26 Oct 2022 05:23:31 -0400
Subject: [PATCH 380/569] pageURL pull from topmostLocation (#9152)

---
 modules/kargoBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kargoBidAdapter.js b/modules/kargoBidAdapter.js
index f4563081aa7..c0faf2490cb 100644
--- a/modules/kargoBidAdapter.js
+++ b/modules/kargoBidAdapter.js
@@ -225,7 +225,7 @@ export const spec = {
   _getAllMetadata(bidderRequest, tdid) {
     return {
       userIDs: spec._getUserIds(tdid, bidderRequest.uspConsent, bidderRequest.gdprConsent),
-      pageURL: bidderRequest.refererInfo && bidderRequest.refererInfo.page,
+      pageURL: bidderRequest?.refererInfo?.topmostLocation || bidderRequest?.refererInfo?.page,
       rawCRB: storage.getCookie('krg_crb'),
       rawCRBLocalStorage: spec._getLocalStorageSafely('krg_crb')
     };

From 0642d6c95bfaf99732e549570e2b7278bdab22cc Mon Sep 17 00:00:00 2001
From: Antoin <antoinfive@gmail.com>
Date: Wed, 26 Oct 2022 06:55:54 -0400
Subject: [PATCH 381/569] Concert Bid Adapter: Add prebid unified ID 2.0 and
 slot coordinates (#9122)

* collect EIDs for bid request

* add ad slot positioning to payload

Co-authored-by: Brett Bloxom <38990705+BrettBlox@users.noreply.github.com>
---
 modules/concertBidAdapter.js                | 46 ++++++++++++++++-
 test/spec/modules/concertBidAdapter_spec.js | 56 +++++++++++++++++++++
 2 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/modules/concertBidAdapter.js b/modules/concertBidAdapter.js
index fc6fc23c26d..620e77a5a08 100644
--- a/modules/concertBidAdapter.js
+++ b/modules/concertBidAdapter.js
@@ -34,6 +34,9 @@ export const spec = {
   buildRequests: function(validBidRequests, bidderRequest) {
     logMessage(validBidRequests);
     logMessage(bidderRequest);
+
+    const eids = [];
+
     let payload = {
       meta: {
         prebidVersion: '$prebid.version$',
@@ -49,6 +52,10 @@ export const spec = {
     };
 
     payload.slots = validBidRequests.map(bidRequest => {
+      collectEid(eids, bidRequest);
+      const adUnitElement = document.getElementById(bidRequest.adUnitCode)
+      const coordinates = getOffset(adUnitElement)
+
       let slot = {
         name: bidRequest.adUnitCode,
         bidId: bidRequest.bidId,
@@ -59,12 +66,15 @@ export const spec = {
         adSlot: bidRequest.params.slot || bidRequest.adUnitCode,
         placementId: bidRequest.params.placementId || '',
         site: bidRequest.params.site || bidderRequest.refererInfo.page,
-        ref: bidderRequest.refererInfo.ref
-      };
+        ref: bidderRequest.refererInfo.ref,
+        offsetCoordinates: { x: coordinates?.left, y: coordinates?.top }
+      }
 
       return slot;
     });
 
+    payload.meta.eids = eids.filter(Boolean);
+
     logMessage(payload);
 
     return {
@@ -216,3 +226,35 @@ function consentAllowsPpid(bidderRequest) {
 
   return (uspConsent || gdprConsent);
 }
+
+function collectEid(eids, bid) {
+  if (bid.userId) {
+    const eid = getUserId(bid.userId.uid2 && bid.userId.uid2.id, 'uidapi.com', undefined, 3)
+    eids.push(eid)
+  }
+}
+
+function getUserId(id, source, uidExt, atype) {
+  if (id) {
+    const uid = { id, atype };
+
+    if (uidExt) {
+      uid.ext = uidExt;
+    }
+
+    return {
+      source,
+      uids: [ uid ]
+    };
+  }
+}
+
+function getOffset(el) {
+  if (el) {
+    const rect = el.getBoundingClientRect();
+    return {
+      left: rect.left + window.scrollX,
+      top: rect.top + window.scrollY
+    };
+  }
+}
diff --git a/test/spec/modules/concertBidAdapter_spec.js b/test/spec/modules/concertBidAdapter_spec.js
index 2f9eda0ca7c..10ea997b304 100644
--- a/test/spec/modules/concertBidAdapter_spec.js
+++ b/test/spec/modules/concertBidAdapter_spec.js
@@ -7,11 +7,33 @@ describe('ConcertAdapter', function () {
   let bidRequests;
   let bidRequest;
   let bidResponse;
+  let element;
+  let sandbox;
 
   afterEach(function () {
     $$PREBID_GLOBAL$$.bidderSettings = {};
+    sandbox.restore();
   });
+
   beforeEach(function () {
+    element = {
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
+      getBoundingClientRect: () => {
+        return {
+          width: element.width,
+          height: element.height,
+
+          left: element.x,
+          top: element.y,
+          right: element.x + element.width,
+          bottom: element.y + element.height
+        };
+      }
+    };
+
     $$PREBID_GLOBAL$$.bidderSettings = {
       concert: {
         storageAllowed: true
@@ -56,6 +78,9 @@ describe('ConcertAdapter', function () {
         ]
       }
     }
+
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(document, 'getElementById').withArgs('desktop_leaderboard_variable').returns(element)
   });
 
   describe('spec.isBidRequestValid', function() {
@@ -119,6 +144,37 @@ describe('ConcertAdapter', function () {
 
       expect(payload.meta.uid).to.equal('foo');
     });
+
+    it('should add uid2 to eids list if available', function() {
+      bidRequests[0].userId = { uid2: { id: 'uid123' } }
+
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+      const meta = payload.meta
+
+      expect(meta.eids.length).to.equal(1);
+      expect(meta.eids[0].uids[0].id).to.equal('uid123')
+      expect(meta.eids[0].uids[0].atype).to.equal(3)
+    })
+
+    it('should return empty eids list if none are available', function() {
+      bidRequests[0].userId = { testId: { id: 'uid123' } }
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+      const meta = payload.meta
+
+      expect(meta.eids.length).to.equal(0);
+    });
+
+    it('should return x/y offset coordiantes when element is present', function() {
+      Object.assign(element, { x: 100, y: 0, width: 400, height: 400 })
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+      const slot = payload.slots[0];
+
+      expect(slot.offsetCoordinates.x).to.equal(100)
+      expect(slot.offsetCoordinates.y).to.equal(0)
+    })
   });
 
   describe('spec.interpretResponse', function() {

From 4ff34061c97661b8865c2553eec3fdb4b95fdc7f Mon Sep 17 00:00:00 2001
From: github-tom-kuhnen <101572885+github-tom-kuhnen@users.noreply.github.com>
Date: Wed, 26 Oct 2022 20:45:15 +0200
Subject: [PATCH 382/569] Teads: add the gvlid declaration (#9155)

---
 modules/teadsIdSystem.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/teadsIdSystem.js b/modules/teadsIdSystem.js
index 20ca4dca460..c18f8fb76ac 100644
--- a/modules/teadsIdSystem.js
+++ b/modules/teadsIdSystem.js
@@ -37,6 +37,11 @@ export const teadsIdSubmodule = {
      * @type {string}
      */
   name: MODULE_NAME,
+  /**
+   * Vendor id of Teads
+   * @type {number}
+   */
+  gvlid: GVL_ID,
   /**
      * decode the stored id value for passing to bid requests
      * @function

From ea7ee396e42a33f330636c4e1c3dc27a80784906 Mon Sep 17 00:00:00 2001
From: product-aax <103228925+product-aax@users.noreply.github.com>
Date: Thu, 27 Oct 2022 00:41:35 +0530
Subject: [PATCH 383/569] AAX Blockmeter RTD Module : Initial Release (#9135)

* AAX Blockmeter RTD Module Release

* added url in rtd configuration params as params.url

* Prebid 7.21.0 release

* Increment version to 7.22.0-pre

* Prebid core: do not enforce valid size in bid responses (#9138)

* Prebid 7.22.0 release

* Increment version to 7.23.0-pre

* added url in rtd configuration params as params.url

Co-authored-by: shubham.si <sinhashubham07@gmail.com>
Co-authored-by: Prebid.js automated release <prebidjs-release@prebid.org>
Co-authored-by: Demetrio Girardi <dgirardi@prebid.org>
---
 modules/.submodules.json                |  1 +
 modules/aaxBlockmeterRtdProvider.js     | 59 +++++++++++++++++++++++++
 modules/aaxBlockmeterRtdProvider.md     | 48 ++++++++++++++++++++
 src/adloader.js                         |  3 +-
 test/spec/modules/aaxBlockmeter_spec.js | 58 ++++++++++++++++++++++++
 5 files changed, 168 insertions(+), 1 deletion(-)
 create mode 100644 modules/aaxBlockmeterRtdProvider.js
 create mode 100644 modules/aaxBlockmeterRtdProvider.md
 create mode 100644 test/spec/modules/aaxBlockmeter_spec.js

diff --git a/modules/.submodules.json b/modules/.submodules.json
index e4678a86b71..e4d09b8c9df 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -52,6 +52,7 @@
     ],
     "rtdModule": [
       "1plusXRtdProvider",
+      "aaxBlockmeterRtdProvider",
       "airgridRtdProvider",
       "akamaiDapRtdProvider",
       "blueconicRtdProvider",
diff --git a/modules/aaxBlockmeterRtdProvider.js b/modules/aaxBlockmeterRtdProvider.js
new file mode 100644
index 00000000000..a3b7b4812a7
--- /dev/null
+++ b/modules/aaxBlockmeterRtdProvider.js
@@ -0,0 +1,59 @@
+import {isEmptyStr, isStr, logError, isFn, logWarn} from '../src/utils.js';
+import {submodule} from '../src/hook.js';
+import { loadExternalScript } from '../src/adloader.js';
+
+export const _config = {
+  MODULE: 'aaxBlockmeter',
+  ADSERVER_TARGETING_KEY: 'atk',
+  BLOCKMETER_URL: 'c.aaxads.com/aax.js',
+  VERSION: '1.2'
+};
+
+window.aax = window.aax || {};
+
+function loadBlockmeter(_rtdConfig) {
+  if (!(_rtdConfig.params && _rtdConfig.params.pub) || !isStr(_rtdConfig.params && _rtdConfig.params.pub) || isEmptyStr(_rtdConfig.params && _rtdConfig.params.pub)) {
+    logError(`${_config.MODULE}: params.pub should be a string`);
+    return false;
+  }
+
+  const params = [];
+  params.push(`pub=${_rtdConfig.params.pub}`);
+  params.push(`dn=${window.location.hostname}`);
+
+  let url = _rtdConfig.params.url;
+  if (!url || isEmptyStr(url)) {
+    logWarn(`${_config.MODULE}: params.url is missing, using default url.`);
+    url = `${_config.BLOCKMETER_URL}?ver=${_config.VERSION}`;
+  }
+
+  const scriptUrl = `https://${url}&${params.join('&')}`;
+  loadExternalScript(scriptUrl, _config.MODULE);
+  return true;
+}
+
+function markAdBlockInventory(codes, _rtdConfig, _userConsent) {
+  return codes.reduce((targets, code) => {
+    targets[code] = targets[code] || {};
+    const getAaxTargets = () => isFn(window.aax.getTargetingData)
+      ? window.aax.getTargetingData(code, _rtdConfig, _userConsent)
+      : {};
+    targets[code] = {
+      [_config.ADSERVER_TARGETING_KEY]: code,
+      ...getAaxTargets()
+    };
+    return targets;
+  }, {});
+}
+
+export const aaxBlockmeterRtdModule = {
+  name: _config.MODULE,
+  init: loadBlockmeter,
+  getTargetingData: markAdBlockInventory,
+};
+
+function registerSubModule() {
+  submodule('realTimeData', aaxBlockmeterRtdModule);
+}
+
+registerSubModule();
diff --git a/modules/aaxBlockmeterRtdProvider.md b/modules/aaxBlockmeterRtdProvider.md
new file mode 100644
index 00000000000..0a317f85b85
--- /dev/null
+++ b/modules/aaxBlockmeterRtdProvider.md
@@ -0,0 +1,48 @@
+## Overview
+
+Module Name: AAX Blockmeter Realtime Data Module  
+Module Type: Rtd Provider  
+Maintainer: product@aax.media  
+
+## Description
+
+The module enables publishers to measure traffic coming from visitors using adblockers. 
+
+AAX can also help publishers monetize this traffic by allowing them to serve [acceptable ads](https://acceptableads.com/about/) to these adblock visitors and recover their lost revenue. [Reach out to us](https://www.aax.media/try-blockmeter/) to know more.
+
+## Integration
+
+Build the AAX Blockmeter Realtime Data Module into the Prebid.js package with:
+
+```
+gulp build --modules=aaxBlockmeterRtdProvider,rtdModule
+```
+
+## Configuration
+
+This module is configured as part of the `realTimeData.dataProviders` object.
+
+|    Name    |  Scope   | Description                  |     Example     |  Type  |
+|:----------:|:--------:|:-----------------------------|:---------------:|:------:|
+|    `name`    | required | Real time data module name   | `'aaxBlockmeter'` | `string` |
+|   `params`   | required |                              |                 | `Object` |
+| `params.pub` | required | AAX to share pub ID, [Reach out to us](https://www.aax.media/try-blockmeter/) to know more! |   `'AAX00000'`    | `string` |
+| `params.url`     | optional | AAX Blockmeter Script Url. Defaults to `'c.aaxads.com/aax.js?ver=1.2'` | `'c.aaxads.com/aax.js?ver=1.2'`   | `string` |
+
+### Example
+
+```javascript
+pbjs.setConfig({
+        "realTimeData": {
+             "dataProviders": [
+                {
+                    "name": "aaxBlockmeter",
+                    "params": {
+                        "pub": "AAX00000",
+                        "url": "c.aaxads.com/aax.js?ver=1.2",
+                    }
+                }
+             ]
+        }
+})
+```
diff --git a/src/adloader.js b/src/adloader.js
index 6b7427d3e52..64408683e9f 100644
--- a/src/adloader.js
+++ b/src/adloader.js
@@ -19,7 +19,8 @@ const _approvedLoadExternalJSList = [
   'inskin',
   'hadron',
   'medianet',
-  'improvedigital'
+  'improvedigital',
+  'aaxBlockmeter'
 ]
 
 /**
diff --git a/test/spec/modules/aaxBlockmeter_spec.js b/test/spec/modules/aaxBlockmeter_spec.js
new file mode 100644
index 00000000000..f9704361976
--- /dev/null
+++ b/test/spec/modules/aaxBlockmeter_spec.js
@@ -0,0 +1,58 @@
+import {aaxBlockmeterRtdModule} from '../../../modules/aaxBlockmeterRtdProvider.js';
+import * as sinon from 'sinon';
+import {assert} from 'chai';
+
+let sandbox;
+let getTargetingDataSpy;
+
+const config = {
+  dataProviders: [{
+    'name': 'aaxBlockmeter',
+    'params': {
+      'pub': 'publisher_id',
+    }
+  }]
+};
+
+describe('aaxBlockmeter realtime module', function () {
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+    window.aax = window.aax || {};
+    window.aax.getTargetingData = getTargetingDataSpy = sandbox.spy();
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+    window.aax = {};
+  });
+
+  it('init should return false when config is empty', function () {
+    assert.equal(aaxBlockmeterRtdModule.init({}), false);
+  });
+
+  it('init should return false when config.params id is empty', function () {
+    assert.equal(aaxBlockmeterRtdModule.init({params: {}}), false);
+  });
+
+  it('init should return true when config.params.pub is not string', function () {
+    assert.equal(aaxBlockmeterRtdModule.init({params: {pub: 12345}}), false);
+  });
+
+  it('init should return true when config.params.pub id is passed and is string typed', function () {
+    assert.equal(aaxBlockmeterRtdModule.init(config.dataProviders[0]), true);
+  });
+
+  describe('getTargetingData should work correctly', function () {
+    it('should return ad unit codes when ad units are present', function () {
+      const codes = ['code1', 'code2'];
+      assert.deepEqual(aaxBlockmeterRtdModule.getTargetingData(codes), {
+        code1: {'atk': 'code1'},
+        code2: {'atk': 'code2'},
+      });
+    });
+
+    it('should call aax.getTargetingData if loaded', function () {
+      aaxBlockmeterRtdModule.getTargetingData([], config.dataProviders[0], null);
+    });
+  });
+});

From 1d334e70cee194f9bfcf171044a16a1bbe9d9fc7 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Thu, 27 Oct 2022 11:51:17 -0700
Subject: [PATCH 384/569] Multiple modules: USP data deletion event handling
 (#9116)

* Multiple modules: USP data deletion event handling

* Add `onDataDeletionRequest` to RTD submodule spec

Co-authored-by: Patrick McCann <patmmccann@gmail.com>
---
 modules/consentManagementUsp.js               |  25 +++--
 modules/rtdModule/index.js                    |  23 +++-
 modules/userId/index.js                       |  59 +++++++++-
 src/adapterManager.js                         |  63 +++++++++--
 .../spec/modules/consentManagementUsp_spec.js |  82 ++++++++++----
 test/spec/modules/realTimeDataModule_spec.js  |  65 +++++++++++
 test/spec/modules/userId_spec.js              |  68 +++++++++++-
 test/spec/unit/core/adapterManager_spec.js    | 102 ++++++++++++++++++
 8 files changed, 449 insertions(+), 38 deletions(-)

diff --git a/modules/consentManagementUsp.js b/modules/consentManagementUsp.js
index 1e77dd4ef48..805c796312c 100644
--- a/modules/consentManagementUsp.js
+++ b/modules/consentManagementUsp.js
@@ -6,7 +6,7 @@
  */
 import {deepSetValue, isFn, isNumber, isPlainObject, isStr, logError, logInfo, logWarn} from '../src/utils.js';
 import {config} from '../src/config.js';
-import {uspDataHandler} from '../src/adapterManager.js';
+import adapterManager, {uspDataHandler} from '../src/adapterManager.js';
 import {registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
 import {timedAuctionHook} from '../src/utils/perfMetrics.js';
 import {getHook} from '../src/hook.js';
@@ -115,6 +115,11 @@ function lookupUspConsent({onSuccess, onError}) {
       USPAPI_VERSION,
       callbackHandler.consentDataCallback
     );
+    uspapiFunction(
+      'registerDeletion',
+      USPAPI_VERSION,
+      adapterManager.callDataDeletionRequest
+    )
   } else {
     logInfo(
       'Detected USP CMP is outside the current iframe where Prebid.js is located, calling it now...'
@@ -124,12 +129,17 @@ function lookupUspConsent({onSuccess, onError}) {
       uspapiFrame,
       callbackHandler.consentDataCallback
     );
+    callUspApiWhileInIframe(
+      'registerDeletion',
+      uspapiFrame,
+      adapterManager.callDataDeletionRequest
+    );
   }
 
+  let listening = false;
+
   function callUspApiWhileInIframe(commandName, uspapiFrame, moduleCallback) {
-    /* Setup up a __uspapi function to do the postMessage and stash the callback.
-      This function behaves, from the caller's perspective, identicially to the in-frame __uspapi call (although it is not synchronous) */
-    window.__uspapi = function (cmd, ver, callback) {
+    function callUsp(cmd, ver, callback) {
       let callId = Math.random() + '';
       let msg = {
         __uspapiCall: {
@@ -144,10 +154,13 @@ function lookupUspConsent({onSuccess, onError}) {
     };
 
     /** when we get the return message, call the stashed callback */
-    window.addEventListener('message', readPostMessageResponse, false);
+    if (!listening) {
+      window.addEventListener('message', readPostMessageResponse, false);
+      listening = true;
+    }
 
     // call uspapi
-    window.__uspapi(commandName, USPAPI_VERSION, moduleCallback);
+    callUsp(commandName, USPAPI_VERSION, moduleCallback);
 
     function readPostMessageResponse(event) {
       const res = event && event.data && event.data.__uspapiReturn;
diff --git a/modules/rtdModule/index.js b/modules/rtdModule/index.js
index e32d2169c5c..876da8dda37 100644
--- a/modules/rtdModule/index.js
+++ b/modules/rtdModule/index.js
@@ -108,6 +108,13 @@
  * @param {UserConsentData} userConsent
  */
 
+/**
+ * @function?
+ * @summary on data deletion request
+ * @name RtdSubmodule#onDataDeletionRequest
+ * @param {SubmoduleConfig} config
+ */
+
 /**
  * @interface ModuleConfig
  */
@@ -156,7 +163,7 @@ import {getHook, module} from '../../src/hook.js';
 import {logError, logInfo, logWarn} from '../../src/utils.js';
 import * as events from '../../src/events.js';
 import CONSTANTS from '../../src/constants.json';
-import {gdprDataHandler, uspDataHandler} from '../../src/adapterManager.js';
+import adapterManager, {gdprDataHandler, uspDataHandler} from '../../src/adapterManager.js';
 import {find} from '../../src/polyfill.js';
 import {timedAuctionHook} from '../../src/utils/perfMetrics.js';
 
@@ -230,6 +237,7 @@ export function init(config) {
     _dataProviders = realTimeData.dataProviders;
     setEventsListeners();
     getHook('startAuction').before(setBidRequestsData, 20); // RTD should run before FPD
+    adapterManager.callDataDeletionRequest.before(onDataDeletionRequest);
     initSubModules();
   });
 }
@@ -386,5 +394,18 @@ export function deepMerge(arr) {
   }, {});
 }
 
+export function onDataDeletionRequest(next, ...args) {
+  subModules.forEach((sm) => {
+    if (typeof sm.onDataDeletionRequest === 'function') {
+      try {
+        sm.onDataDeletionRequest(sm.config);
+      } catch (e) {
+        logError(`Error executing ${sm.name}.onDataDeletionRequest`, e)
+      }
+    }
+  });
+  next.apply(this, args);
+}
+
 module('realTimeData', attachRealTimeDataProvider);
 init(config);
diff --git a/modules/userId/index.js b/modules/userId/index.js
index 6df78b9e73c..8fdd4319dfc 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -129,7 +129,7 @@ import {find, includes} from '../../src/polyfill.js';
 import {config} from '../../src/config.js';
 import * as events from '../../src/events.js';
 import {getGlobal} from '../../src/prebidGlobal.js';
-import {gdprDataHandler} from '../../src/adapterManager.js';
+import adapterManager, {gdprDataHandler} from '../../src/adapterManager.js';
 import CONSTANTS from '../../src/constants.json';
 import {hook, module, ready as hooksReady} from '../../src/hook.js';
 import {buildEidPermissions, createEidsArray, USER_IDS_CONFIG} from './eids.js';
@@ -217,6 +217,14 @@ export function setSubmoduleRegistry(submodules) {
   submoduleRegistry = submodules;
 }
 
+function cookieSetter(submodule) {
+  const domainOverride = (typeof submodule.submodule.domainOverride === 'function') ? submodule.submodule.domainOverride() : null;
+  const name = submodule.config.storage.name;
+  return function setCookie(suffix, value, expiration) {
+    coreStorage.setCookie(name + (suffix || ''), value, expiration, 'Lax', domainOverride);
+  }
+}
+
 /**
  * @param {SubmoduleContainer} submodule
  * @param {(Object|string)} value
@@ -226,15 +234,15 @@ export function setStoredValue(submodule, value) {
    * @type {SubmoduleStorage}
    */
   const storage = submodule.config.storage;
-  const domainOverride = (typeof submodule.submodule.domainOverride === 'function') ? submodule.submodule.domainOverride() : null;
 
   try {
-    const valueStr = isPlainObject(value) ? JSON.stringify(value) : value;
     const expiresStr = (new Date(Date.now() + (storage.expires * (60 * 60 * 24 * 1000)))).toUTCString();
+    const valueStr = isPlainObject(value) ? JSON.stringify(value) : value;
     if (storage.type === COOKIE) {
-      coreStorage.setCookie(storage.name, valueStr, expiresStr, 'Lax', domainOverride);
+      const setCookie = cookieSetter(submodule);
+      setCookie(null, value, expiresStr);
       if (typeof storage.refreshInSeconds === 'number') {
-        coreStorage.setCookie(`${storage.name}_last`, new Date().toUTCString(), expiresStr, 'Lax', domainOverride);
+        setCookie('_last', new Date().toUTCString(), expiresStr);
       }
     } else if (storage.type === LOCAL_STORAGE) {
       coreStorage.setDataInLocalStorage(`${storage.name}_exp`, expiresStr);
@@ -248,6 +256,31 @@ export function setStoredValue(submodule, value) {
   }
 }
 
+export function deleteStoredValue(submodule) {
+  let deleter, suffixes;
+  switch (submodule.config?.storage?.type) {
+    case COOKIE:
+      const setCookie = cookieSetter(submodule);
+      const expiry = (new Date(Date.now() - 1000 * 60 * 60 * 24)).toUTCString();
+      deleter = (suffix) => setCookie(suffix, '', expiry)
+      suffixes = ['', '_last'];
+      break;
+    case LOCAL_STORAGE:
+      deleter = (suffix) => coreStorage.removeDataFromLocalStorage(submodule.config.storage.name + suffix)
+      suffixes = ['', '_last', '_exp'];
+      break;
+  }
+  if (deleter) {
+    suffixes.forEach(suffix => {
+      try {
+        deleter(suffix)
+      } catch (e) {
+        logError(e);
+      }
+    });
+  }
+}
+
 function setPrebidServerEidPermissions(initializedSubmodules) {
   let setEidPermissions = getPrebidInternal().setEidPermissions;
   if (typeof setEidPermissions === 'function' && isArray(initializedSubmodules)) {
@@ -1010,12 +1043,28 @@ function updateSubmodules() {
   if (!addedUserIdHook && submodules.length) {
     // priority value 40 will load after consentManagement with a priority of 50
     getGlobal().requestBids.before(requestBidsHook, 40);
+    adapterManager.callDataDeletionRequest.before(requestDataDeletion);
     coreGetPPID.after((next) => next(getPPID()));
     logInfo(`${MODULE_NAME} - usersync config updated for ${submodules.length} submodules: `, submodules.map(a => a.submodule.name));
     addedUserIdHook = true;
   }
 }
 
+export function requestDataDeletion(next, ...args) {
+  logInfo('UserID: received data deletion request; deleting all stored IDs...')
+  submodules.forEach(submodule => {
+    if (typeof submodule.submodule.onDataDeletionRequest === 'function') {
+      try {
+        submodule.submodule.onDataDeletionRequest(submodule.config, submodule.idObj, ...args);
+      } catch (e) {
+        logError(`Error calling onDataDeletionRequest for ID submodule ${submodule.submodule.name}`, e);
+      }
+    }
+    deleteStoredValue(submodule);
+  })
+  next.apply(this, args);
+}
+
 /**
  * enable submodule in User ID
  * @param {Submodule} submodule
diff --git a/src/adapterManager.js b/src/adapterManager.js
index 4722013d5f0..eb6a74a82a4 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -35,6 +35,7 @@ import {GdprConsentHandler, UspConsentHandler} from './consentHandler.js';
 import * as events from './events.js';
 import CONSTANTS from './constants.json';
 import {useMetrics} from './utils/perfMetrics.js';
+import {auctionManager} from './auctionManager.js';
 
 export const PARTITIONS = {
   CLIENT: 'client',
@@ -553,19 +554,30 @@ adapterManager.getAnalyticsAdapter = function(code) {
   return _analyticsRegistry[code];
 }
 
-function tryCallBidderMethod(bidder, method, param) {
+function getBidderMethod(bidder, method) {
+  const adapter = _bidderRegistry[bidder];
+  const spec = adapter?.getSpec && adapter.getSpec();
+  if (spec && spec[method] && typeof spec[method] === 'function') {
+    return [spec, spec[method]]
+  }
+}
+
+function invokeBidderMethod(bidder, method, spec, fn, ...params) {
   try {
-    const adapter = _bidderRegistry[bidder];
-    const spec = adapter.getSpec();
-    if (spec && spec[method] && typeof spec[method] === 'function') {
-      logInfo(`Invoking ${bidder}.${method}`);
-      config.runWithBidder(bidder, bind.call(spec[method], spec, param));
-    }
+    logInfo(`Invoking ${bidder}.${method}`);
+    config.runWithBidder(bidder, fn.bind(spec, ...params));
   } catch (e) {
     logWarn(`Error calling ${method} of ${bidder}`);
   }
 }
 
+function tryCallBidderMethod(bidder, method, param) {
+  const target = getBidderMethod(bidder, method);
+  if (target != null) {
+    invokeBidderMethod(bidder, method, ...target, param);
+  }
+}
+
 adapterManager.callTimedOutBidders = function(adUnits, timedOutBidders, cbTimeout) {
   timedOutBidders = timedOutBidders.map((timedOutBidder) => {
     // Adding user configured params & timeout to timeout event data
@@ -600,4 +612,41 @@ adapterManager.callBidderError = function(bidder, error, bidderRequest) {
   tryCallBidderMethod(bidder, 'onBidderError', param);
 };
 
+function resolveAlias(alias) {
+  const seen = new Set();
+  while (_aliasRegistry.hasOwnProperty(alias) && !seen.has(alias)) {
+    seen.add(alias);
+    alias = _aliasRegistry[alias];
+  }
+  return alias;
+}
+/**
+ * Ask every adapter to delete PII.
+ * See https://github.com/prebid/Prebid.js/issues/9081
+ */
+adapterManager.callDataDeletionRequest = hook('sync', function (...args) {
+  const method = 'onDataDeletionRequest';
+  Object.keys(_bidderRegistry)
+    .filter((bidder) => !_aliasRegistry.hasOwnProperty(bidder))
+    .forEach(bidder => {
+      const target = getBidderMethod(bidder, method);
+      if (target != null) {
+        const bidderRequests = auctionManager.getBidsRequested().filter((br) =>
+          resolveAlias(br.bidderCode) === bidder
+        );
+        invokeBidderMethod(bidder, method, ...target, bidderRequests, ...args);
+      }
+    });
+  Object.entries(_analyticsRegistry).forEach(([name, entry]) => {
+    const fn = entry?.adapter?.[method];
+    if (typeof fn === 'function') {
+      try {
+        fn.apply(entry.adapter, args);
+      } catch (e) {
+        logError(`error calling ${method} of ${name}`, e);
+      }
+    }
+  });
+});
+
 export default adapterManager;
diff --git a/test/spec/modules/consentManagementUsp_spec.js b/test/spec/modules/consentManagementUsp_spec.js
index 39aeee4470b..f9c3cd5890e 100644
--- a/test/spec/modules/consentManagementUsp_spec.js
+++ b/test/spec/modules/consentManagementUsp_spec.js
@@ -8,8 +8,9 @@ import {
 } from 'modules/consentManagementUsp.js';
 import * as utils from 'src/utils.js';
 import { config } from 'src/config.js';
-import {uspDataHandler} from 'src/adapterManager.js';
+import adapterManager, {uspDataHandler} from 'src/adapterManager.js';
 import 'src/prebid.js';
+import {defer} from '../../../src/utils/promise.js';
 
 let expect = require('chai').expect;
 
@@ -23,6 +24,16 @@ function createIFrameMarker() {
 }
 
 describe('consentManagement', function () {
+  let sandbox;
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(adapterManager, 'callDataDeletionRequest');
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
   it('should enable itself on requestBids using default values', (done) => {
     requestBidsHook(() => {
       expect(uspDataHandler.enabled).to.be.true;
@@ -301,8 +312,11 @@ describe('consentManagement', function () {
     describe('USPAPI workflow for iframed page', function () {
       let ifr = null;
       let stringifyResponse = false;
+      let mockApi, replySent;
 
       beforeEach(function () {
+        mockApi = sinon.stub();
+        replySent = defer();
         sinon.stub(utils, 'logError');
         sinon.stub(utils, 'logWarn');
         ifr = createIFrameMarker();
@@ -322,17 +336,21 @@ describe('consentManagement', function () {
 
       function uspapiMessageHandler(event) {
         if (event && event.data) {
-          var data = event.data;
+          const data = event.data;
           if (data.__uspapiCall) {
-            var callId = data.__uspapiCall.callId;
-            var response = {
-              __uspapiReturn: {
-                callId,
-                returnValue: { uspString: '1YY' },
-                success: true
+            const {command, version, callId} = data.__uspapiCall;
+            let response = mockApi(command, version, callId);
+            if (response) {
+              response = {
+                __uspapiReturn: {
+                  callId,
+                  returnValue: response,
+                  success: true
+                }
               }
-            };
-            event.source.postMessage(stringifyResponse ? JSON.stringify(response) : response, '*');
+              event.source.postMessage(stringifyResponse ? JSON.stringify(response) : response, '*');
+              replySent.resolve();
+            }
           }
         }
       }
@@ -345,6 +363,11 @@ describe('consentManagement', function () {
       function testIFramedPage(testName, messageFormatString) {
         it(`should return the consent string from a postmessage + addEventListener response - ${testName}`, (done) => {
           stringifyResponse = messageFormatString;
+          mockApi.callsFake((cmd) => {
+            if (cmd === 'getUSPData') {
+              return { uspString: '1YY' }
+            }
+          })
           setConsentConfig(goodConfig);
           requestBidsHook(() => {
             let consent = uspDataHandler.getConsentData();
@@ -355,6 +378,20 @@ describe('consentManagement', function () {
           }, {});
         });
       }
+
+      it('fires deletion request on registerDeletion', (done) => {
+        mockApi.callsFake((cmd) => {
+          return cmd === 'registerDeletion'
+        })
+        sinon.assert.notCalled(adapterManager.callDataDeletionRequest);
+        setConsentConfig(goodConfig);
+        replySent.promise.then(() => {
+          setTimeout(() => { // defer again to give time for the message to get through
+            sinon.assert.calledOnce(adapterManager.callDataDeletionRequest);
+            done()
+          }, 200)
+        })
+      });
     });
 
     describe('test without iframe locater', function() {
@@ -400,23 +437,19 @@ describe('consentManagement', function () {
     });
 
     describe('USPAPI workflow for normal pages:', function () {
-      let uspapiStub = sinon.stub();
       let ifr = null;
 
       beforeEach(function () {
         didHookReturn = false;
         ifr = createIFrameMarker();
-        sinon.stub(utils, 'logError');
-        sinon.stub(utils, 'logWarn');
+        sandbox.stub(utils, 'logError');
+        sandbox.stub(utils, 'logWarn');
         window.__uspapi = function() {};
       });
 
       afterEach(function () {
         config.resetConfig();
         $$PREBID_GLOBAL$$.requestBids.removeAll();
-        uspapiStub.restore();
-        utils.logError.restore();
-        utils.logWarn.restore();
         document.body.removeChild(ifr);
         delete window.__uspapi;
         resetConsentData();
@@ -427,7 +460,7 @@ describe('consentManagement', function () {
           uspString: '1NY'
         };
 
-        uspapiStub = sinon.stub(window, '__uspapi').callsFake((...args) => {
+        sandbox.stub(window, '__uspapi').callsFake((...args) => {
           args[2](testConsentData, true);
         });
 
@@ -448,7 +481,7 @@ describe('consentManagement', function () {
           uspString: '1NY'
         };
 
-        uspapiStub = sinon.stub(window, '__uspapi').callsFake((...args) => {
+        sandbox.stub(window, '__uspapi').callsFake((...args) => {
           args[2](testConsentData, true);
         });
 
@@ -463,6 +496,19 @@ describe('consentManagement', function () {
         expect(consentMeta.usp).to.equal(testConsentData.uspString);
         expect(consentMeta.generatedAt).to.be.above(1644367751709);
       });
+
+      it('registers deletion request event listener', () => {
+        let listener;
+        sandbox.stub(window, '__uspapi').callsFake((cmd, _, cb) => {
+          if (cmd === 'registerDeletion') {
+            listener = cb;
+          }
+        });
+        setConsentConfig(goodConfig);
+        sinon.assert.notCalled(adapterManager.callDataDeletionRequest);
+        listener();
+        sinon.assert.calledOnce(adapterManager.callDataDeletionRequest);
+      })
     });
   });
 });
diff --git a/test/spec/modules/realTimeDataModule_spec.js b/test/spec/modules/realTimeDataModule_spec.js
index daeeb9bc47c..ced2f697649 100644
--- a/test/spec/modules/realTimeDataModule_spec.js
+++ b/test/spec/modules/realTimeDataModule_spec.js
@@ -4,6 +4,7 @@ import * as sinon from 'sinon';
 import {default as CONSTANTS} from '../../../src/constants.json';
 import * as events from '../../../src/events.js';
 import 'src/prebid.js';
+import {attachRealTimeDataProvider, onDataDeletionRequest} from 'modules/rtdModule/index.js';
 
 const getBidRequestDataSpy = sinon.spy();
 
@@ -305,4 +306,68 @@ describe('Real time module', function () {
       });
     });
   });
+
+  describe('data deletion requests', () => {
+    let detach = () => null;
+
+    function mkRtdModule(name) {
+      const mod = {
+        name,
+        init: () => true,
+        onDataDeletionRequest: sinon.stub()
+      };
+      detach = ((orig) => {
+        const smDetach = attachRealTimeDataProvider(mod);
+        return function () {
+          orig();
+          smDetach();
+        }
+      })(detach);
+      return mod;
+    }
+    let sm1, sm2, cfg1, cfg2;
+    beforeEach(() => {
+      sm1 = mkRtdModule('mockMod1');
+      sm2 = mkRtdModule('mockMod2');
+      cfg1 = {
+        name: 'mockMod1',
+        i: 0
+      };
+      cfg2 = {
+        name: 'mockMod2',
+        i: 1
+      };
+      rtdModule.init(config);
+      config.setConfig({
+        realTimeData: {
+          dataProviders: [cfg1, cfg2],
+        }
+      });
+    });
+    afterEach(() => {
+      detach();
+      config.resetConfig();
+    });
+
+    it('calls onDataDeletionRequest on submodules', () => {
+      const next = sinon.stub();
+      onDataDeletionRequest(next, {a: 0});
+      sinon.assert.calledWith(next, {a: 0});
+      sinon.assert.calledWith(sm1.onDataDeletionRequest, cfg1);
+      sinon.assert.calledWith(sm2.onDataDeletionRequest, cfg2);
+    });
+
+    describe('does not choke if onDataDeletionRequest', () => {
+      Object.entries({
+        'is missing': () => { delete sm1.onDataDeletionRequest },
+        'throws': () => { sm1.onDataDeletionRequest.throws(new Error()) }
+      }).forEach(([t, setup]) => {
+        it(t, () => {
+          setup();
+          onDataDeletionRequest(sinon.stub());
+          sinon.assert.calledWith(sm2.onDataDeletionRequest, cfg2);
+        })
+      })
+    })
+  });
 });
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 4e9be5417e2..f4abcc4b9f6 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -9,7 +9,7 @@ import {
   setSubmoduleRegistry,
   syncDelay,
   PBJS_USER_ID_OPTOUT_NAME,
-  findRootDomain,
+  findRootDomain, requestDataDeletion,
 } from 'modules/userId/index.js';
 import {createEidsArray} from 'modules/userId/eids.js';
 import {config} from 'src/config.js';
@@ -2703,6 +2703,72 @@ describe('User ID', function () {
       });
     });
 
+    describe('requestDataDeletion', () => {
+      function idMod(name, value) {
+        return {
+          name,
+          getId() {
+            return {id: value}
+          },
+          decode(d) {
+            return {[name]: d}
+          },
+          onDataDeletionRequest: sinon.stub()
+        }
+      }
+      let mod1, mod2, mod3, cfg1, cfg2, cfg3;
+
+      beforeEach(() => {
+        init(config);
+        mod1 = idMod('id1', 'val1');
+        mod2 = idMod('id2', 'val2');
+        mod3 = idMod('id3', 'val3');
+        cfg1 = getStorageMock('id1', 'id1', 'cookie');
+        cfg2 = getStorageMock('id2', 'id2', 'html5');
+        cfg3 = {name: 'id3', value: {id3: 'val3'}};
+        setSubmoduleRegistry([mod1, mod2, mod3]);
+        config.setConfig({
+          auctionDelay: 1,
+          userSync: {
+            userIds: [cfg1, cfg2, cfg3]
+          }
+        });
+        return getGlobal().refreshUserIds();
+      });
+
+      it('deletes stored IDs', () => {
+        expect(coreStorage.getCookie('id1')).to.exist;
+        expect(coreStorage.getDataFromLocalStorage('id2')).to.exist;
+        requestDataDeletion(sinon.stub());
+        expect(coreStorage.getCookie('id1')).to.not.exist;
+        expect(coreStorage.getDataFromLocalStorage('id2')).to.not.exist;
+      });
+
+      it('invokes onDataDeletionRequest', () => {
+        requestDataDeletion(sinon.stub());
+        sinon.assert.calledWith(mod1.onDataDeletionRequest, cfg1, {id1: 'val1'});
+        sinon.assert.calledWith(mod2.onDataDeletionRequest, cfg2, {id2: 'val2'})
+        sinon.assert.calledWith(mod3.onDataDeletionRequest, cfg3, {id3: 'val3'})
+      });
+
+      describe('does not choke when onDataDeletionRequest', () => {
+        Object.entries({
+          'is missing': () => { delete mod1.onDataDeletionRequest },
+          'throws': () => { mod1.onDataDeletionRequest.throws(new Error()) }
+        }).forEach(([t, setup]) => {
+          it(t, () => {
+            setup();
+            const next = sinon.stub();
+            const arg = {random: 'value'};
+            requestDataDeletion(next, arg);
+            sinon.assert.calledOnce(mod2.onDataDeletionRequest);
+            sinon.assert.calledOnce(mod3.onDataDeletionRequest);
+            sinon.assert.calledWith(next, arg);
+          })
+        })
+      })
+    });
+
     describe('findRootDomain', function () {
       let sandbox;
 
diff --git a/test/spec/unit/core/adapterManager_spec.js b/test/spec/unit/core/adapterManager_spec.js
index 6e37da4e85f..3fea8988a95 100644
--- a/test/spec/unit/core/adapterManager_spec.js
+++ b/test/spec/unit/core/adapterManager_spec.js
@@ -20,6 +20,7 @@ import { setSizeConfig } from 'src/sizeMapping.js';
 import {find, includes} from 'src/polyfill.js';
 import s2sTesting from 'modules/s2sTesting.js';
 import {hook} from '../../../../src/hook.js';
+import {auctionManager} from '../../../../src/auctionManager.js';
 var events = require('../../../../src/events');
 
 const CONFIG = {
@@ -2543,4 +2544,105 @@ describe('adapterManager tests', function () {
       })
     });
   });
+
+  describe('callDataDeletionRequest', () => {
+    function delMethodForBidder(bidderCode) {
+      const del = sinon.stub();
+      adapterManager.registerBidAdapter({
+        callBids: sinon.stub(),
+        getSpec() {
+          return {
+            onDataDeletionRequest: del
+          }
+        }
+      }, bidderCode);
+      return del;
+    }
+
+    function delMethodForAnalytics(provider) {
+      const del = sinon.stub();
+      adapterManager.registerAnalyticsAdapter({
+        code: provider,
+        adapter: {
+          enableAnalytics: sinon.stub(),
+          onDataDeletionRequest: del,
+        },
+      })
+      return del;
+    }
+
+    Object.entries({
+      'bid adapters': delMethodForBidder,
+      'analytics adapters': delMethodForAnalytics
+    }).forEach(([t, getDelMethod]) => {
+      describe(t, () => {
+        it('invokes onDataDeletionRequest', () => {
+          const del = getDelMethod('mockAdapter');
+          adapterManager.callDataDeletionRequest();
+          sinon.assert.calledOnce(del);
+        });
+
+        it('does not choke if onDeletionRequest throws', () => {
+          const del1 = getDelMethod('mockAdapter1');
+          const del2 = getDelMethod('mockAdapter2');
+          del1.throws(new Error());
+          adapterManager.callDataDeletionRequest();
+          sinon.assert.calledOnce(del1);
+          sinon.assert.calledOnce(del2);
+        });
+      })
+    })
+
+    describe('for bid adapters', () => {
+      let bidderRequests;
+
+      beforeEach(() => {
+        bidderRequests = [];
+        sinon.stub(auctionManager, 'getBidsRequested').callsFake(() => bidderRequests);
+      })
+      afterEach(() => {
+        auctionManager.getBidsRequested.restore();
+      })
+
+      it('does not invoke onDataDeletionRequest on aliases', () => {
+        const del = delMethodForBidder('mockBidder');
+        adapterManager.aliasBidAdapter('mockBidder', 'mockBidderAlias');
+        adapterManager.aliasBidAdapter('mockBidderAlias2', 'mockBidderAlias');
+        adapterManager.callDataDeletionRequest();
+        sinon.assert.calledOnce(del);
+      });
+
+      it('passes known bidder requests', () => {
+        const del1 = delMethodForBidder('mockBidder1');
+        const del2 = delMethodForBidder('mockBidder2');
+        adapterManager.aliasBidAdapter('mockBidder1', 'mockBidder1Alias');
+        adapterManager.aliasBidAdapter('mockBidder1Alias', 'mockBidder1Alias2')
+        bidderRequests = [
+          {
+            bidderCode: 'mockBidder1',
+            id: 0
+          },
+          {
+            bidderCode: 'mockBidder2',
+            id: 1,
+          },
+          {
+            bidderCode: 'mockBidder1Alias',
+            id: 2,
+          },
+          {
+            bidderCode: 'someOtherBidder',
+            id: 3
+          },
+          {
+            bidderCode: 'mockBidder1Alias2',
+            id: 4
+          }
+        ];
+        adapterManager.callDataDeletionRequest();
+        sinon.assert.calledWith(del1, [bidderRequests[0], bidderRequests[2], bidderRequests[4]]);
+        sinon.assert.calledWith(del2, [bidderRequests[1]]);
+      })
+    })
+  });
 });

From fc67eb022a57985b6173e39556b82e43d185f79a Mon Sep 17 00:00:00 2001
From: Peiyuan <106841361+ix-peiyuan@users.noreply.github.com>
Date: Thu, 27 Oct 2022 14:53:41 -0400
Subject: [PATCH 385/569] IX Bid Adapter: completely change request to POST
 method (#9156)

---
 modules/ixBidAdapter.js                |  88 +---
 test/spec/modules/ixBidAdapter_spec.js | 601 ++++++++++---------------
 2 files changed, 254 insertions(+), 435 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index fc387fac76a..4efed90d147 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -16,15 +16,15 @@ import {
   parseQueryStringParameters,
   safeJSONParse
 } from '../src/utils.js';
-import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
+import { BANNER, VIDEO, NATIVE } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
 import CONSTANTS from '../src/constants.json';
-import {getStorageManager} from '../src/storageManager.js';
+import { getStorageManager } from '../src/storageManager.js';
 import * as events from '../src/events.js';
-import {find} from '../src/polyfill.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {INSTREAM, OUTSTREAM} from '../src/video.js';
-import {Renderer} from '../src/Renderer.js';
+import { find } from '../src/polyfill.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { INSTREAM, OUTSTREAM } from '../src/video.js';
+import { Renderer } from '../src/Renderer.js';
 
 const BIDDER_CODE = 'ix';
 const ALIAS_BIDDER_CODE = 'roundel';
@@ -102,13 +102,13 @@ const VIDEO_PARAMS_ALLOW_LIST = [
 const LOCAL_STORAGE_KEY = 'ixdiag';
 export const LOCAL_STORAGE_FEATURE_TOGGLES_KEY = `${BIDDER_CODE}_features`;
 let hasRegisteredHandler = false;
-export const storage = getStorageManager({gvlid: GLOBAL_VENDOR_ID, bidderCode: BIDDER_CODE});
+export const storage = getStorageManager({ gvlid: GLOBAL_VENDOR_ID, bidderCode: BIDDER_CODE });
 export const FEATURE_TOGGLES = {
   featureToggles: {},
-  isFeatureEnabled: function(ft) {
+  isFeatureEnabled: function (ft) {
     return deepAccess(this.featureToggles, `features.${ft}.activated`)
   },
-  getFeatureToggles: function() {
+  getFeatureToggles: function () {
     if (storage.localStorageIsEnabled()) {
       const parsedToggles = safeJSONParse(storage.getDataFromLocalStorage(LOCAL_STORAGE_FEATURE_TOGGLES_KEY));
       if (deepAccess(parsedToggles, 'expiry') && parsedToggles.expiry >= new Date().getTime()) {
@@ -118,7 +118,7 @@ export const FEATURE_TOGGLES = {
       }
     }
   },
-  setFeatureToggles: function(serverResponse) {
+  setFeatureToggles: function (serverResponse) {
     const responseBody = serverResponse.body;
     const expiryTime = new Date();
     const toggles = deepAccess(responseBody, 'ext.features');
@@ -133,7 +133,7 @@ export const FEATURE_TOGGLES = {
       }
     }
   },
-  clearFeatureToggles: function() {
+  clearFeatureToggles: function () {
     this.featureToggles = {};
     if (storage.localStorageIsEnabled()) {
       storage.removeDataFromLocalStorage(LOCAL_STORAGE_FEATURE_TOGGLES_KEY);
@@ -391,7 +391,7 @@ function parseBid(rawBid, currency, bidRequest) {
     bid.mediaTypes = bidRequest.mediaTypes;
     bid.ttl = isValidExpiry ? rawBid.exp : VIDEO_TIME_TO_LIVE;
   } else if (parsedAdm && parsedAdm.native) {
-    bid.native = {ortb: parsedAdm.native};
+    bid.native = { ortb: parsedAdm.native };
     bid.width = rawBid.w ? rawBid.w : 1;
     bid.height = rawBid.h ? rawBid.h : 1;
     bid.mediaType = NATIVE;
@@ -708,18 +708,6 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
   siteID = validBidRequests[0].params.siteId;
   payload.s = siteID;
 
-  if (!FEATURE_TOGGLES.isFeatureEnabled('pbjs_enable_post')) {
-    if (version) {
-      payload.v = version;
-    }
-    payload.ac = 'j';
-    payload.sd = 1;
-
-    if (version === VIDEO_ENDPOINT_VERSION) {
-      payload.nf = 1;
-    }
-  }
-
   // Parse additional runtime configs.
   const bidderCode = (bidderRequest && bidderRequest.bidderCode) || 'ix';
   const otherIxConfig = config.getConfig(bidderCode);
@@ -762,13 +750,6 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
         logError('IX Bid Adapter: IX config FPD request size has exceeded maximum request size.', { bidder: BIDDER_CODE, code: ERROR_CODES.IX_FPD_EXCEEDS_MAX_SIZE });
       }
     }
-
-    if (!FEATURE_TOGGLES.isFeatureEnabled('pbjs_enable_post')) {
-      // Create t in payload if timeout is configured.
-      if (typeof otherIxConfig.timeout === 'number') {
-        payload.t = otherIxConfig.timeout;
-      }
-    }
   }
 
   for (let adUnitIndex = 0; adUnitIndex < transactionIds.length; adUnitIndex++) {
@@ -909,36 +890,21 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     const isLastAdUnit = adUnitIndex === transactionIds.length - 1;
 
     if (wasAdUnitImpressionsTrimmed || isLastAdUnit) {
-      const clonedPayload = deepClone(payload);
       if (!isLastAdUnit || requestSequenceNumber) {
         r.ext.ixdiag.sn = requestSequenceNumber;
-        clonedPayload.sn = requestSequenceNumber;
       }
 
       requestSequenceNumber++;
-      clonedPayload.r = JSON.stringify(r);
-
-      let requestData;
-
-      if (FEATURE_TOGGLES.isFeatureEnabled('pbjs_enable_post')) {
-        requestData = {
-          method: 'POST',
-          url: baseUrl + '?s=' + payload.s,
-          data: deepClone(r),
-          option: {
-            contentType: 'text/plain',
-          },
-          validBidRequests
-        }
-      } else {
-        requestData = {
-          method: 'GET',
-          url: baseUrl,
-          data: clonedPayload,
-          validBidRequests
-        }
-      }
-      requests.push(requestData);
+
+      requests.push({
+        method: 'POST',
+        url: baseUrl + '?s=' + siteID,
+        data: deepClone(r),
+        option: {
+          contentType: 'text/plain',
+        },
+        validBidRequests
+      });
 
       currentRequestSize = baseRequestSize;
       r.imp = [];
@@ -1532,13 +1498,7 @@ export const spec = {
 
       // Transform rawBid in bid response to the format that will be accepted by prebid.
       const innerBids = seatbid[i].bid;
-      let requestBid;
-
-      if (FEATURE_TOGGLES.isFeatureEnabled('pbjs_enable_post')) {
-        requestBid = bidderRequest.data;
-      } else {
-        requestBid = safeJSONParse(bidderRequest.data.r);
-      }
+      const requestBid = bidderRequest.data;
 
       for (let j = 0; j < innerBids.length; j++) {
         const bidRequest = getBidRequest(innerBids[j].impid, requestBid.imp, bidderRequest.validBidRequests);
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index a1b79358e8c..a2698fa2cdc 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -286,6 +286,44 @@ describe('IndexexchangeAdapter', function () {
     }
   ];
 
+  const DEFAULT_VIDEO_VALID_BID_MEDIUM_SIZE = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '456',
+        video: {
+          skippable: false,
+          mimes: [
+            'video/mp4',
+            'video/webm'
+          ],
+          minduration: 0,
+          maxduration: 60,
+          protocols: [2]
+        },
+        size: [640, 480]
+      },
+      sizes: [[640, 480], [200, 400]],
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [[640, 480], [200, 400]]
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230'
+        }
+      },
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
   const DEFAULT_MULTIFORMAT_BANNER_VALID_BID = [
     {
       bidder: 'ix',
@@ -400,7 +438,7 @@ describe('IndexexchangeAdapter', function () {
         }
       },
       nativeOrtbRequest: {
-        assets: [{id: 0, required: 0, img: {type: 1}}, {id: 1, required: 1, title: {len: 140}}, {id: 2, required: 1, data: {type: 2}}, {id: 3, required: 1, img: {type: 3}}, {id: 4, required: false, video: {mimes: ['video/mp4', 'video/webm'], minduration: 0, maxduration: 120, protocols: [2, 3, 5, 6]}}]
+        assets: [{ id: 0, required: 0, img: { type: 1 } }, { id: 1, required: 1, title: { len: 140 } }, { id: 2, required: 1, data: { type: 2 } }, { id: 3, required: 1, img: { type: 3 } }, { id: 4, required: false, video: { mimes: ['video/mp4', 'video/webm'], minduration: 0, maxduration: 120, protocols: [2, 3, 5, 6] } }]
       },
       adUnitCode: 'div-gpt-ad-1460505748563-0',
       transactionId: '173f49a8-7549-4218-a23c-e7ba59b47231',
@@ -441,7 +479,7 @@ describe('IndexexchangeAdapter', function () {
         }
       },
       nativeOrtbRequest: {
-        assets: [{id: 0, required: 0, img: {type: 1}}, {id: 1, required: 1, title: {len: 140}}, {id: 2, required: 1, data: {type: 2}}, {id: 3, required: 1, img: {type: 3}}, {id: 4, required: false, video: {mimes: ['video/mp4', 'video/webm'], minduration: 0, maxduration: 120, protocols: [2, 3, 5, 6]}}]
+        assets: [{ id: 0, required: 0, img: { type: 1 } }, { id: 1, required: 1, title: { len: 140 } }, { id: 2, required: 1, data: { type: 2 } }, { id: 3, required: 1, img: { type: 3 } }, { id: 4, required: false, video: { mimes: ['video/mp4', 'video/webm'], minduration: 0, maxduration: 120, protocols: [2, 3, 5, 6] } }]
       },
       adUnitCode: 'div-gpt-ad-1460505748562-0',
       transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
@@ -633,31 +671,6 @@ describe('IndexexchangeAdapter', function () {
     }
   };
 
-  const DEFAULT_BIDDER_REQUEST_DATA = {
-    ac: 'j',
-    r: JSON.stringify({
-      id: '345',
-      imp: [
-        {
-          id: '1a2b3c4e',
-          video: {
-            w: 640,
-            h: 480,
-            placement: 1
-          }
-        }
-      ],
-      site: {
-        ref: 'https://ref.com/ref.html',
-        page: 'https://page.com'
-      },
-    }),
-    s: '21',
-    sd: 1,
-    t: 1000,
-    v: 8.1
-  };
-
   const DEFAULT_USERID_DATA = {
     idl_env: '1234-5678-9012-3456', // Liveramp
     netId: 'testnetid123', // NetId
@@ -724,6 +737,8 @@ describe('IndexexchangeAdapter', function () {
     lotamePanoramaId: 'bd738d136bdaa841117fe9b331bb4'
   };
 
+  const extractPayload = function (bidRequest) { return bidRequest.data }
+
   describe('inherited functions', function () {
     it('should exists and is a function', function () {
       const adapter = newBidder(spec);
@@ -778,7 +793,7 @@ describe('IndexexchangeAdapter', function () {
           syncsPerBidder: 3
         }
       });
-      let userSync = spec.getUserSyncs(syncOptions, [{'body': {'ext': {'publishersyncsperbidderoverride': 0}}}]);
+      let userSync = spec.getUserSyncs(syncOptions, [{ 'body': { 'ext': { 'publishersyncsperbidderoverride': 0 } } }]);
       expect(userSync.length).to.equal(0);
     });
 
@@ -792,7 +807,7 @@ describe('IndexexchangeAdapter', function () {
           syncsPerBidder: 3
         }
       });
-      let userSync = spec.getUserSyncs(syncOptions, [{'body': {'ext': {'publishersyncsperbidderoverride': 2}}}]);
+      let userSync = spec.getUserSyncs(syncOptions, [{ 'body': { 'ext': { 'publishersyncsperbidderoverride': 2 } } }]);
       expect(userSync[0].type).to.equal('image');
       const USER_SYNC_URL_0 = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=2&i=0&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
       const USER_SYNC_URL_1 = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=2&i=1&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
@@ -811,7 +826,7 @@ describe('IndexexchangeAdapter', function () {
           syncsPerBidder: 3
         }
       });
-      let userSync = spec.getUserSyncs(syncOptions, [{'body': {'ext': {'publishersyncsperbidderoverride': 4}}}]);
+      let userSync = spec.getUserSyncs(syncOptions, [{ 'body': { 'ext': { 'publishersyncsperbidderoverride': 4 } } }]);
       expect(userSync[0].type).to.equal('image');
       const USER_SYNC_URL_0 = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=3&i=0&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
       const USER_SYNC_URL_1 = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=3&i=1&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
@@ -832,7 +847,7 @@ describe('IndexexchangeAdapter', function () {
           syncsPerBidder: 0
         }
       });
-      let userSync = spec.getUserSyncs(syncOptions, [{'body': {'ext': {'publishersyncsperbidderoverride': 2}}}]);
+      let userSync = spec.getUserSyncs(syncOptions, [{ 'body': { 'ext': { 'publishersyncsperbidderoverride': 2 } } }]);
       expect(userSync[0].type).to.equal('image');
       const USER_SYNC_URL_0 = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=2&i=0&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
       const USER_SYNC_URL_1 = 'https://dsum.casalemedia.com/pbusermatch?origin=prebid&site_id=123&p=2&i=1&gdpr=1&gdpr_consent=3huaa11=qu3198ae&us_privacy=';
@@ -868,7 +883,7 @@ describe('IndexexchangeAdapter', function () {
       const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
       bid.mediaTypes.video.renderer = {
         url: 'test',
-        render: () => {}
+        render: () => { }
       };
       bid.mediaTypes.video.context = 'outstream';
       bid.mediaTypes.video.playerSize = [[300, 249]];
@@ -1080,7 +1095,7 @@ describe('IndexexchangeAdapter', function () {
       bid.nativeOrtbRequest = {}
       expect(spec.isBidRequestValid(bid)).to.be.false;
 
-      bid.nativeOrtbRequest = {assets: []}
+      bid.nativeOrtbRequest = { assets: [] }
       expect(spec.isBidRequestValid(bid)).to.be.false;
     });
   });
@@ -1104,7 +1119,7 @@ describe('IndexexchangeAdapter', function () {
         const cloneValidBid = utils.deepClone(validBid);
         cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
         const request = spec.buildRequests(cloneValidBid, ALIAS_OPTIONS);
-        const payload = JSON.parse(request[0].data.r);
+        const payload = extractPayload(request[0]);
         expect(request).to.be.an('array');
         expect(request).to.have.lengthOf.above(0); // should be 1 or more
         expect(payload.user.eids).to.have.lengthOf(6);
@@ -1115,7 +1130,7 @@ describe('IndexexchangeAdapter', function () {
 
   describe('buildRequestsIdentity', function () {
     let request;
-    let query;
+    let payload;
     let testCopy;
 
     beforeEach(function () {
@@ -1124,7 +1139,7 @@ describe('IndexexchangeAdapter', function () {
         return testCopy;
       };
       request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-      query = request.data;
+      payload = extractPayload(request);
     });
 
     afterEach(function () {
@@ -1137,8 +1152,6 @@ describe('IndexexchangeAdapter', function () {
       });
 
       it('payload should have correct format and value (single identity partner)', function () {
-        const payload = JSON.parse(query.r);
-
         expect(payload.user).to.exist;
         expect(payload.user.eids).to.exist;
         expect(payload.user.eids).to.be.an('array');
@@ -1146,7 +1159,7 @@ describe('IndexexchangeAdapter', function () {
       });
 
       it('identity data in impression should have correct format and value (single identity partner)', function () {
-        const impression = JSON.parse(query.r).user.eids;
+        const impression = payload.user.eids;
         expect(impression[0].source).to.equal(testCopy.IdentityIp.data.source);
         expect(impression[0].uids[0].id).to.equal(testCopy.IdentityIp.data.uids[0].id);
       });
@@ -1166,8 +1179,6 @@ describe('IndexexchangeAdapter', function () {
       });
 
       it('payload should have correct format and value (single identity w/ multi ids)', function () {
-        const payload = JSON.parse(query.r);
-
         expect(payload.user).to.exist;
         expect(payload.user.eids).to.exist;
         expect(payload.user.eids).to.be.an('array');
@@ -1175,7 +1186,7 @@ describe('IndexexchangeAdapter', function () {
       });
 
       it('identity data in impression should have correct format and value (single identity w/ multi ids)', function () {
-        const impression = JSON.parse(query.r).user.eids;
+        const impression = payload.user.eids;
 
         expect(impression[0].source).to.equal(testCopy.IdentityIp.data.source);
         expect(impression[0].uids).to.have.lengthOf(3);
@@ -1210,8 +1221,6 @@ describe('IndexexchangeAdapter', function () {
       });
 
       it('payload should have correct format and value (multiple identity partners)', function () {
-        const payload = JSON.parse(query.r);
-
         expect(payload.user).to.exist;
         expect(payload.user.eids).to.exist;
         expect(payload.user.eids).to.be.an('array');
@@ -1219,7 +1228,7 @@ describe('IndexexchangeAdapter', function () {
       });
 
       it('identity data in impression should have correct format and value (multiple identity partners)', function () {
-        const impression = JSON.parse(query.r).user.eids;
+        const impression = payload.user.eids;
 
         expect(impression[0].source).to.equal(testCopy.IdentityIp.data.source);
         expect(impression[0].uids).to.have.lengthOf(1);
@@ -1242,8 +1251,7 @@ describe('IndexexchangeAdapter', function () {
           return undefined;
         };
         request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-        query = request.data;
-        const payload = JSON.parse(query.r);
+        payload = extractPayload(request);
 
         expect(payload.user).to.exist;
         expect(payload.user.eids).to.not.exist;
@@ -1255,8 +1263,7 @@ describe('IndexexchangeAdapter', function () {
           data: {}
         }
         request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-        query = request.data;
-        const payload = JSON.parse(query.r);
+        payload = extractPayload(request);
 
         expect(payload.user).to.exist;
         expect(payload.user.eids).to.exist;
@@ -1265,8 +1272,7 @@ describe('IndexexchangeAdapter', function () {
       it('payload should not have any user eids if identity data is pending for all partners', function () {
         testCopy.IdentityIp.responsePending = true;
         request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-        query = request.data;
-        const payload = JSON.parse(query.r);
+        payload = extractPayload(request);
 
         expect(payload.user).to.exist;
         expect(payload.user.eids).to.not.exist;
@@ -1276,8 +1282,7 @@ describe('IndexexchangeAdapter', function () {
         testCopy.IdentityIp.responsePending = false;
         testCopy.IdentityIp.data = {};
         request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-        query = request.data;
-        const payload = JSON.parse(query.r);
+        payload = extractPayload(request);
 
         expect(payload.user).to.exist;
         expect(payload.user.eids).to.not.exist;
@@ -1304,7 +1309,7 @@ describe('IndexexchangeAdapter', function () {
       const cloneValidBid = utils.deepClone(DEFAULT_VIDEO_VALID_BID);
       cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
       const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
-      const payload = JSON.parse(request.data.r);
+      const payload = extractPayload(request);
 
       expect(payload.user.eids).to.have.lengthOf(6);
       expect(payload.user.eids).to.have.deep.members(DEFAULT_USERID_PAYLOAD);
@@ -1401,7 +1406,7 @@ describe('IndexexchangeAdapter', function () {
       cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
 
       const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
-      const payload = JSON.parse(request.data.r);
+      const payload = extractPayload(request);
 
       validUserIdPayload = utils.deepClone(DEFAULT_USERID_PAYLOAD);
       validUserIdPayload.push({
@@ -1480,7 +1485,7 @@ describe('IndexexchangeAdapter', function () {
         }]
       });
 
-      const payload = JSON.parse(request.data.r);
+      const payload = extractPayload(request);
       expect(payload.user.eids).to.have.lengthOf(7);
       expect(payload.user.eids).to.have.deep.members(validUserIdPayload);
     });
@@ -1503,7 +1508,7 @@ describe('IndexexchangeAdapter', function () {
       bid.userId = DEFAULT_USERID_BID_DATA;
 
       const request = spec.buildRequests([bid], DEFAULT_OPTION)[0];
-      const r = JSON.parse(request.data.r);
+      const r = extractPayload(request);
 
       expect(r.ext.ixdiag.userIds).to.be.an('array');
       expect(r.ext.ixdiag.userIds.should.not.include('lotamePanoramaId'));
@@ -1514,8 +1519,8 @@ describe('IndexexchangeAdapter', function () {
 
   describe('First party data', function () {
     it('should not set ixdiag.fpd value if not defined', function () {
-      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, {ortb2: {}})[0];
-      const r = JSON.parse(request.data.r);
+      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, { ortb2: {} })[0];
+      const r = extractPayload(request);
 
       expect(r.ext.ixdiag.fpd).to.be.undefined;
     });
@@ -1531,8 +1536,8 @@ describe('IndexexchangeAdapter', function () {
         }
       };
 
-      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, {ortb2})[0];
-      const r = JSON.parse(request.data.r);
+      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, { ortb2 })[0];
+      const r = extractPayload(request);
 
       expect(r.ext.ixdiag.fpd).to.exist;
     });
@@ -1543,7 +1548,7 @@ describe('IndexexchangeAdapter', function () {
       });
 
       const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID)[0];
-      const r = JSON.parse(request.data.r);
+      const r = extractPayload(request);
 
       expect(r.ext.ixdiag.tmax).to.equal(250);
     });
@@ -1553,7 +1558,7 @@ describe('IndexexchangeAdapter', function () {
         bidderTimeout: null
       })
       const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID)[0];
-      const r = JSON.parse(request.data.r);
+      const r = extractPayload(request);
 
       expect(r.ext.ixdiag.tmax).to.be.undefined
     });
@@ -1571,8 +1576,8 @@ describe('IndexexchangeAdapter', function () {
         }
       };
 
-      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, {ortb2})[0];
-      const r = JSON.parse(request.data.r);
+      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, { ortb2 })[0];
+      const r = extractPayload(request);
 
       expect(r.site.keywords).to.exist;
       expect(r.site.search).to.exist;
@@ -1595,8 +1600,8 @@ describe('IndexexchangeAdapter', function () {
       const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
       bid.mediaTypes.banner.sizes = LARGE_SET_OF_SIZES;
 
-      const request = spec.buildRequests([bid], {ortb2})[0];
-      const r = JSON.parse(request.data.r);
+      const request = spec.buildRequests([bid], { ortb2 })[0];
+      const r = extractPayload(request);
 
       expect(r.site.ref).to.exist;
       expect(r.site.keywords).to.be.undefined;
@@ -1608,33 +1613,25 @@ describe('IndexexchangeAdapter', function () {
     let request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
     const requestUrl = request.url;
     const requestMethod = request.method;
-    const query = request.data;
+    const payloadData = request.data;
 
     const bidWithoutSchain = utils.deepClone(DEFAULT_BANNER_VALID_BID);
     delete bidWithoutSchain[0].schain;
     const requestWithoutSchain = spec.buildRequests(bidWithoutSchain, DEFAULT_OPTION)[0];
-    const queryWithoutSchain = requestWithoutSchain.data;
+    const payloadWithoutSchain = extractPayload(requestWithoutSchain);
     const GPID = '/19968336/some-adunit-path';
 
-    it('request should be made to IX endpoint with GET method', function () {
-      expect(requestMethod).to.equal('GET');
-      expect(requestUrl).to.equal(IX_SECURE_ENDPOINT);
+    it('request should be made to IX endpoint with POST method and siteId in query param', function () {
+      expect(requestMethod).to.equal('POST');
+      expect(requestUrl).to.equal(IX_SECURE_ENDPOINT + '?s=' + DEFAULT_BANNER_VALID_BID[0].params.siteId);
+      expect(request.option.contentType).to.equal('text/plain')
     });
 
     it('auction type should be set correctly', function () {
-      const at = JSON.parse(query.r).at;
+      const at = payloadData.at;
       expect(at).to.equal(1);
     })
 
-    it('query object (version, siteID and request) should be correct', function () {
-      expect(query.v).to.equal(BANNER_ENDPOINT_VERSION);
-      expect(query.s).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
-      expect(query.r).to.exist;
-      expect(query.ac).to.equal('j');
-      expect(query.sd).to.equal(1);
-      expect(query.nf).not.to.exist;
-    });
-
     it('should send dfp_adunit_code in request if ortb2Imp.ext.data.adserver.adslot exists', function () {
       const AD_UNIT_CODE = '/19968336/some-adunit-path';
       const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
@@ -1649,7 +1646,7 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
-      const { ext: { dfp_ad_unit_code } } = JSON.parse(requests[0].data.r).imp[0];
+      const { ext: { dfp_ad_unit_code } } = extractPayload(requests[0]).imp[0];
       expect(dfp_ad_unit_code).to.equal(AD_UNIT_CODE);
     });
 
@@ -1661,7 +1658,7 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
-      const { ext: { gpid } } = JSON.parse(requests[0].data.r).imp[0];
+      const { ext: { gpid } } = extractPayload(requests[0]).imp[0];
       expect(gpid).to.equal(GPID);
     });
 
@@ -1673,7 +1670,7 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
-      const { ext: { gpid } } = JSON.parse(requests[0].data.r).imp[0];
+      const { ext: { gpid } } = extractPayload(requests[0]).imp[0];
       expect(gpid).to.equal(GPID);
     });
 
@@ -1686,7 +1683,7 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
-      const imp = JSON.parse(requests[0].data.r).imp[0];
+      const imp = extractPayload(requests[0]).imp[0];
       expect(deepAccess(imp, 'ext.dfp_ad_unit_code')).to.not.exist;
     });
 
@@ -1704,7 +1701,7 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
-      const imp = JSON.parse(requests[0].data.r).imp[0];
+      const imp = extractPayload(requests[0]).imp[0];
       expect(deepAccess(imp, 'ext.gpid')).to.not.exist;
     });
 
@@ -1724,13 +1721,13 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
-      const imp = JSON.parse(requests[0].data.r).imp[0];
+      const imp = extractPayload(requests[0]).imp[0];
       expect(deepAccess(imp, 'ext.gpid')).to.equal(GPID);
       expect(deepAccess(imp, 'ext.dfp_ad_unit_code')).to.equal(AD_UNIT_CODE);
     });
 
     it('payload should have correct format and value', function () {
-      const payload = JSON.parse(query.r);
+      const payload = payloadData;
       expect(payload.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidderRequestId);
       expect(payload.id).to.be.a('string');
       expect(payload.site.page).to.equal(DEFAULT_OPTION.refererInfo.page);
@@ -1748,7 +1745,7 @@ describe('IndexexchangeAdapter', function () {
 
       request = spec.buildRequests(bidWithIntId, DEFAULT_OPTION)[0];
 
-      const payload = JSON.parse(request.data.r);
+      const payload = extractPayload(request);
       expect(bidWithIntId[0].bidderRequestId).to.be.a('number');
       expect(payload.id).to.equal(bidWithIntId[0].bidderRequestId.toString());
       expect(payload.id).to.be.a('string');
@@ -1760,19 +1757,21 @@ describe('IndexexchangeAdapter', function () {
 
       request = spec.buildRequests(bidWithIntId, DEFAULT_OPTION)[0];
 
-      const payload = JSON.parse(request.data.r);
+      const payload = extractPayload(request);
       expect(bidWithIntId[0].bidderRequestId).to.be.a('number');
       expect(payload.id).to.equal(bidWithIntId[0].bidderRequestId.toString());
       expect(payload.id).to.be.a('string');
     });
 
     it('payload should not include schain when not provided', function () {
-      const payload = JSON.parse(queryWithoutSchain.r);
-      expect(payload.source.schain).to.not.exist; // source object currently only written for schain
+      const payload = payloadWithoutSchain;
+
+      const actualSchain = (((payload || {}).source || {}).ext || {}).schain;
+      expect(actualSchain).to.not.exist;
     });
 
     it('impression should have correct format and value', function () {
-      const impression = JSON.parse(query.r).imp[0];
+      const impression = payloadData.imp[0];
       const sidValue = DEFAULT_BANNER_VALID_BID[0].params.id;
 
       expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
@@ -1797,7 +1796,7 @@ describe('IndexexchangeAdapter', function () {
 
       request = spec.buildRequests([bid], DEFAULT_OPTION)[0];
 
-      const payload = JSON.parse(request.data.r);
+      const payload = extractPayload(request);
       payload.imp[0].banner.format.forEach((imp) => {
         expect(imp.ext.siteID).to.be.a('string');
       });
@@ -1813,7 +1812,7 @@ describe('IndexexchangeAdapter', function () {
         const expectedFloor = 3.25;
         bid.getFloor = () => ({ floor: expectedFloor, currency });
         const request = spec.buildRequests([bid], {})[0];
-        const impression = JSON.parse(request.data.r).imp[0];
+        const impression = extractPayload(request).imp[0];
 
         expect(impression.bidfloor).to.equal(expectedFloor);
         expect(impression.bidfloorcur).to.equal(currency);
@@ -1825,7 +1824,7 @@ describe('IndexexchangeAdapter', function () {
         const expectedFloor = 3.25;
         bid.getFloor = () => ({ floor: expectedFloor, currency });
         const request = spec.buildRequests([bid], {})[0];
-        const impression = JSON.parse(request.data.r).imp[0];
+        const impression = extractPayload(request).imp[0];
 
         expect(impression.bidfloor).to.equal(expectedFloor);
         expect(impression.bidfloorcur).to.equal(currency);
@@ -1837,7 +1836,7 @@ describe('IndexexchangeAdapter', function () {
         bid.params.bidFloor = highFloor;
         bid.params.bidFloorCur = 'USD'
         const request = spec.buildRequests([bid], {})[0];
-        const impression = JSON.parse(request.data.r).imp[0];
+        const impression = extractPayload(request).imp[0];
 
         expect(impression.bidfloor).to.equal(highFloor);
         expect(impression.bidfloorcur).to.equal(bid.params.bidFloorCur);
@@ -1851,7 +1850,7 @@ describe('IndexexchangeAdapter', function () {
         const expectedFloor = highFloor;
         bid.getFloor = () => ({ floor: expectedFloor, currency });
         const requestBidFloor = spec.buildRequests([bid], {})[0];
-        const impression = JSON.parse(requestBidFloor.data.r).imp[0];
+        const impression = extractPayload(requestBidFloor).imp[0];
 
         expect(impression.bidfloor).to.equal(highFloor);
         expect(impression.bidfloorcur).to.equal(bid.params.bidFloorCur);
@@ -1863,7 +1862,7 @@ describe('IndexexchangeAdapter', function () {
         bid.params.bidFloor = 50;
         bid.params.bidFloorCur = 'USD';
         const requestBidFloor = spec.buildRequests([bid], {})[0];
-        const impression = JSON.parse(requestBidFloor.data.r).imp[0];
+        const impression = extractPayload(requestBidFloor).imp[0];
 
         expect(impression.bidfloor).to.equal(bid.params.bidFloor);
         expect(impression.bidfloorcur).to.equal(bid.params.bidFloorCur);
@@ -1875,7 +1874,7 @@ describe('IndexexchangeAdapter', function () {
         bid.params.bidFloor = 50;
         bid.params.bidFloorCur = 'USD';
         const requestBidFloor = spec.buildRequests([bid], {})[0];
-        const impression = JSON.parse(requestBidFloor.data.r).imp[0];
+        const impression = extractPayload(requestBidFloor).imp[0];
 
         expect(impression.bidfloor).to.equal(bid.params.bidFloor);
         expect(impression.bidfloorcur).to.equal(bid.params.bidFloorCur);
@@ -1900,7 +1899,7 @@ describe('IndexexchangeAdapter', function () {
         expect(bid.getFloor.getCall(1).args[0].size[0]).to.equal(500);
         expect(bid.getFloor.getCall(1).args[0].size[1]).to.equal(400);
 
-        const impression = JSON.parse(requestBidFloor.data.r).imp[0];
+        const impression = extractPayload(requestBidFloor).imp[0];
         expect(impression.bidfloor).to.equal(expectedFloor);
         expect(impression.bidfloorcur).to.equal(currency);
       });
@@ -1930,7 +1929,7 @@ describe('IndexexchangeAdapter', function () {
         expect(bid.getFloor.getCall(0).args[0].size[0]).to.equal(300);
         expect(bid.getFloor.getCall(0).args[0].size[1]).to.equal(250);
 
-        const impression = JSON.parse(requestBidFloor.data.r).imp[0];
+        const impression = extractPayload(requestBidFloor).imp[0];
         expect(impression.bidfloor).to.equal(expectedFloor);
         expect(impression.bidfloorcur).to.equal(currency);
       });
@@ -1940,7 +1939,7 @@ describe('IndexexchangeAdapter', function () {
       const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
       bid.params.id = 50;
       const requestBidFloor = spec.buildRequests([bid], {})[0];
-      const impression = JSON.parse(requestBidFloor.data.r).imp[0];
+      const impression = extractPayload(requestBidFloor).imp[0];
 
       expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
       expect(impression.banner.format[0].w).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[0]);
@@ -1954,7 +1953,7 @@ describe('IndexexchangeAdapter', function () {
       const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
       bid.params.id = 'abc';
       const requestBidFloor = spec.buildRequests([bid], {})[0];
-      const impression = JSON.parse(requestBidFloor.data.r).imp[0];
+      const impression = extractPayload(requestBidFloor).imp[0];
 
       expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
       expect(impression.banner.format[0].w).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[0]);
@@ -1982,7 +1981,7 @@ describe('IndexexchangeAdapter', function () {
         });
 
         const requestWithFirstPartyData = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-        const pageUrl = JSON.parse(requestWithFirstPartyData.data.r).site.page;
+        const pageUrl = extractPayload(requestWithFirstPartyData).site.page;
         const expectedPageUrl = DEFAULT_OPTION.refererInfo.page + '?ab=123&cd=123%23ab&e%2Ff=456&h%3Fg=456%23cd';
         expect(pageUrl).to.equal(expectedPageUrl);
       });
@@ -1995,7 +1994,7 @@ describe('IndexexchangeAdapter', function () {
         });
 
         const requestFirstPartyDataNumber = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-        const pageUrl = JSON.parse(requestFirstPartyDataNumber.data.r).site.page;
+        const pageUrl = extractPayload(requestFirstPartyDataNumber).site.page;
 
         expect(pageUrl).to.equal(DEFAULT_OPTION.refererInfo.page);
       });
@@ -2006,7 +2005,7 @@ describe('IndexexchangeAdapter', function () {
         });
 
         const requestWithoutConfig = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-        const pageUrl = JSON.parse(requestWithoutConfig.data.r).site.page;
+        const pageUrl = extractPayload(requestWithoutConfig).site.page;
 
         expect(pageUrl).to.equal(DEFAULT_OPTION.refererInfo.page);
         expect(requestWithoutConfig.data.t).to.be.undefined;
@@ -2014,13 +2013,13 @@ describe('IndexexchangeAdapter', function () {
 
       it('should not set first party or timeout if it is setConfig is not called', function () {
         const requestWithoutConfig = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-        const pageUrl = JSON.parse(requestWithoutConfig.data.r).site.page;
+        const pageUrl = extractPayload(requestWithoutConfig).site.page;
 
         expect(pageUrl).to.equal(DEFAULT_OPTION.refererInfo.page);
         expect(requestWithoutConfig.data.t).to.be.undefined;
       });
 
-      it('should set timeout if publisher set it through setConfig', function () {
+      it('should no longer set timeout even if publisher set it through setConfig', function () {
         config.setConfig({
           ix: {
             timeout: 500
@@ -2028,10 +2027,10 @@ describe('IndexexchangeAdapter', function () {
         });
         const requestWithTimeout = spec.buildRequests(DEFAULT_BANNER_VALID_BID, {})[0];
 
-        expect(requestWithTimeout.data.t).to.equal(500);
+        expect(requestWithTimeout.data.t).to.be.undefined;
       });
 
-      it('should set timeout if timeout is a string', function () {
+      it('should no longer set timeout even if timeout is a string', function () {
         config.setConfig({
           ix: {
             timeout: '500'
@@ -2046,11 +2045,10 @@ describe('IndexexchangeAdapter', function () {
     describe('request should contain both banner and video requests', function () {
       const request = spec.buildRequests([DEFAULT_BANNER_VALID_BID[0], DEFAULT_VIDEO_VALID_BID[0]], {});
       it('should have banner request', () => {
-        const bannerImpression = JSON.parse(request[0].data.r).imp[0];
+        const bannerImpression = extractPayload(request[0]).imp[0];
         const sidValue = DEFAULT_BANNER_VALID_BID[0].params.id;
 
-        expect(JSON.parse(request[0].data.r).imp).to.have.lengthOf(1);
-        expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
+        expect(extractPayload(request[0]).imp).to.have.lengthOf(1);
         expect(bannerImpression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
 
         expect(bannerImpression.banner.format).to.be.length(2);
@@ -2067,9 +2065,8 @@ describe('IndexexchangeAdapter', function () {
       });
 
       it('should have video request', () => {
-        const videoImpression = JSON.parse(request[1].data.r).imp[0];
+        const videoImpression = extractPayload(request[1]).imp[0];
 
-        expect(JSON.parse(request[1].data.v)).to.equal(VIDEO_ENDPOINT_VERSION);
         expect(videoImpression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
         expect(videoImpression.video.w).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[0]);
         expect(videoImpression.video.h).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[1]);
@@ -2080,11 +2077,10 @@ describe('IndexexchangeAdapter', function () {
       const request = spec.buildRequests([DEFAULT_BANNER_VALID_BID[0], DEFAULT_NATIVE_VALID_BID[0]]);
 
       it('should have banner request', () => {
-        const bannerImpression = JSON.parse(request[0].data.r).imp[0];
+        const bannerImpression = extractPayload(request[0]).imp[0];
         const sidValue = DEFAULT_BANNER_VALID_BID[0].params.id;
 
-        expect(JSON.parse(request[0].data.r).imp).to.have.lengthOf(1);
-        expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
+        expect(extractPayload(request[0]).imp).to.have.lengthOf(1);
         expect(bannerImpression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
 
         expect(bannerImpression.banner.format).to.be.length(2);
@@ -2101,7 +2097,7 @@ describe('IndexexchangeAdapter', function () {
       });
 
       it('should have native request', () => {
-        const nativeImpression = JSON.parse(request[1].data.r).imp[0];
+        const nativeImpression = extractPayload(request[1]).imp[0];
 
         expect(request[1].data.hasOwnProperty('v')).to.equal(false);
         expect(nativeImpression.id).to.equal(DEFAULT_NATIVE_VALID_BID[0].bidId);
@@ -2133,8 +2129,6 @@ describe('IndexexchangeAdapter', function () {
       const requests = spec.buildRequests([bid, DEFAULT_BANNER_VALID_BID[0]], DEFAULT_OPTION);
       expect(requests).to.be.an('array');
       expect(requests).to.have.lengthOf(2);
-      expect(requests[0].data.sn).to.be.equal(0);
-      expect(requests[1].data.sn).to.be.equal(1);
     });
 
     it('6 ad units should generate only 4 requests', function () {
@@ -2168,10 +2162,7 @@ describe('IndexexchangeAdapter', function () {
       for (var i = 0; i < requests.length; i++) {
         const reqSize = `${requests[i].url}?${utils.parseQueryStringParameters(requests[i].data)}`.length;
         expect(reqSize).to.be.lessThan(8000);
-        let payload = JSON.parse(requests[i].data.r);
-        if (requests.length > 1) {
-          expect(requests[i].data.sn).to.equal(i);
-        }
+        let payload = extractPayload(requests[i]);
         expect(payload.source.ext.schain).to.deep.equal(SAMPLE_SCHAIN);
       }
     });
@@ -2196,7 +2187,7 @@ describe('IndexexchangeAdapter', function () {
       expect(requests).to.be.an('array');
       expect(requests).to.have.lengthOf(1);
 
-      const impressions = JSON.parse(requests[0].data.r).imp;
+      const impressions = extractPayload(requests[0]).imp;
       expect(impressions).to.be.an('array');
       expect(impressions).to.have.lengthOf(3);
       expect(requests[0].data.sn).to.be.undefined;
@@ -2212,7 +2203,7 @@ describe('IndexexchangeAdapter', function () {
       bid2.params.bidId = '2b3c4d5e';
 
       const request = spec.buildRequests([bid, bid2], DEFAULT_OPTION)[0];
-      const impression = JSON.parse(request.data.r).imp[0];
+      const impression = extractPayload(request).imp[0];
       const sidValue = bid.params.id;
 
       expect(impression.id).to.equal(bid.bidId);
@@ -2242,7 +2233,7 @@ describe('IndexexchangeAdapter', function () {
       const bids = [DEFAULT_BANNER_VALID_BID[0], bid];
       const request = spec.buildRequests(bids, DEFAULT_OPTION)[0];
 
-      const impressions = JSON.parse(request.data.r).imp;
+      const impressions = extractPayload(request).imp;
       expect(impressions).to.be.an('array');
       expect(impressions).to.have.lengthOf(2);
       expect(request.data.sn).to.be.undefined;
@@ -2267,7 +2258,7 @@ describe('IndexexchangeAdapter', function () {
 
     it('request should not contain the extra video ad sizes that IX is not configured for', function () {
       const request = spec.buildRequests(DEFAULT_VIDEO_VALID_BID, DEFAULT_OPTION);
-      const impressions = JSON.parse(request[0].data.r).imp;
+      const impressions = extractPayload(request[0]).imp;
 
       expect(impressions).to.be.an('array');
       expect(impressions).to.have.lengthOf(1);
@@ -2280,7 +2271,7 @@ describe('IndexexchangeAdapter', function () {
 
         const requests = spec.buildRequests([bid1, DEFAULT_BANNER_VALID_BID[0]], DEFAULT_OPTION);
 
-        const impressions = JSON.parse(requests[0].data.r).imp;
+        const impressions = extractPayload(requests[0]).imp;
 
         expect(impressions).to.be.an('array');
         expect(impressions).to.have.lengthOf(1);
@@ -2290,24 +2281,15 @@ describe('IndexexchangeAdapter', function () {
 
   describe('buildRequestVideo', function () {
     const request = spec.buildRequests(DEFAULT_VIDEO_VALID_BID, DEFAULT_OPTION);
-    const query = request[0].data;
-
-    it('query object (version, siteID and request) should be correct', function () {
-      expect(query.v).to.equal(VIDEO_ENDPOINT_VERSION);
-      expect(query.s).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.siteId);
-      expect(query.r).to.exist;
-      expect(query.ac).to.equal('j');
-      expect(query.sd).to.equal(1);
-      expect(query.nf).to.equal(1);
-    });
+    const payloadData = request[0].data;
 
     it('auction type should be set correctly', function () {
-      const at = JSON.parse(query.r).at;
+      const at = payloadData.at;
       expect(at).to.equal(1);
     })
 
     it('impression should have correct format and value', function () {
-      const impression = JSON.parse(query.r).imp[0];
+      const impression = payloadData.imp[0];
 
       expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
       expect(impression.video.w).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[0]);
@@ -2326,7 +2308,7 @@ describe('IndexexchangeAdapter', function () {
       bid.mediaTypes.video.context = 'outstream';
       bid.mediaTypes.video.placement = 2;
       const request = spec.buildRequests([bid], {})[0];
-      const impression = JSON.parse(request.data.r).imp[0];
+      const impression = extractPayload(request).imp[0];
 
       expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
       expect(impression.video.placement).to.equal(2);
@@ -2336,7 +2318,7 @@ describe('IndexexchangeAdapter', function () {
       const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
       bid.params.id = 50;
       const request = spec.buildRequests([bid], {})[0];
-      const impression = JSON.parse(request.data.r).imp[0];
+      const impression = extractPayload(request).imp[0];
 
       expect(impression.ext.sid).to.equal('50');
     });
@@ -2345,7 +2327,7 @@ describe('IndexexchangeAdapter', function () {
       const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
       bid.mediaTypes.video.context = 'instream';
       const request = spec.buildRequests([bid], {})[0];
-      const impression = JSON.parse(request.data.r).imp[0];
+      const impression = extractPayload(request).imp[0];
 
       expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
       expect(impression.video.placement).to.equal(1);
@@ -2355,7 +2337,7 @@ describe('IndexexchangeAdapter', function () {
       const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
       bid.mediaTypes.video.context = 'outstream';
       const request = spec.buildRequests([bid], {})[0];
-      const impression = JSON.parse(request.data.r).imp[0];
+      const impression = extractPayload(request).imp[0];
 
       expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
       expect(impression.video.placement).to.equal(4);
@@ -2365,7 +2347,7 @@ describe('IndexexchangeAdapter', function () {
       const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
       bid.mediaTypes.video.context = 'not-valid';
       const request = spec.buildRequests([bid], {})[0];
-      const impression = JSON.parse(request.data.r).imp[0];
+      const impression = extractPayload(request).imp[0];
       expect(impression.video.placement).to.be.undefined;
     });
 
@@ -2375,7 +2357,7 @@ describe('IndexexchangeAdapter', function () {
       bid.mediaTypes.video.protocols = [1];
       bid.mediaTypes.video.mimes = ['video/override'];
       const request = spec.buildRequests([bid], {})[0];
-      const impression = JSON.parse(request.data.r).imp[0];
+      const impression = extractPayload(request).imp[0];
 
       expect(impression.video.protocols[0]).to.equal(2);
       expect(impression.video.mimes[0]).to.not.equal('video/override');
@@ -2386,7 +2368,7 @@ describe('IndexexchangeAdapter', function () {
       bid.mediaTypes.video.context = 'outstream';
       bid.mediaTypes.video.random = true;
       const request = spec.buildRequests([bid], {})[0];
-      const impression = JSON.parse(request.data.r).imp[0];
+      const impression = extractPayload(request).imp[0];
 
       expect(impression.video.random).to.not.exist;
     });
@@ -2401,7 +2383,7 @@ describe('IndexexchangeAdapter', function () {
       bid.mediaTypes.video.api = 2;
       bid.mediaTypes.video.pos = 0;
       const request = spec.buildRequests([bid], {})[0];
-      const impression = JSON.parse(request.data.r).imp[0];
+      const impression = extractPayload(request).imp[0];
 
       expect(impression.video.protocols[0]).to.equal(6);
       expect(impression.video.api).to.equal(2);
@@ -2418,15 +2400,14 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
-      const { ext: { gpid } } = JSON.parse(requests[0].data.r).imp[0];
+      const { ext: { gpid } } = extractPayload(requests[0]).imp[0];
       expect(gpid).to.equal(GPID);
     });
 
     it('should build video request when if video obj is not provided at params level', () => {
       const request = spec.buildRequests([DEFAULT_VIDEO_VALID_BID_NO_VIDEO_PARAMS[0]], {});
-      const videoImpression = JSON.parse(request[0].data.r).imp[0];
+      const videoImpression = extractPayload(request[0]).imp[0];
 
-      expect(JSON.parse(request[0].data.v)).to.equal(VIDEO_ENDPOINT_VERSION);
       expect(videoImpression.id).to.equal(DEFAULT_VIDEO_VALID_BID_NO_VIDEO_PARAMS[0].bidId);
       expect(videoImpression.video.w).to.equal(DEFAULT_VIDEO_VALID_BID_NO_VIDEO_PARAMS[0].mediaTypes.video.playerSize[0][0]);
       expect(videoImpression.video.h).to.equal(DEFAULT_VIDEO_VALID_BID_NO_VIDEO_PARAMS[0].mediaTypes.video.playerSize[0][1]);
@@ -2440,23 +2421,18 @@ describe('IndexexchangeAdapter', function () {
       };
 
       const request = spec.buildRequests([bid]);
-      const videoImpression = JSON.parse(request[0].data.r).imp[0];
+      const videoImpression = extractPayload(request[0]).imp[0];
 
       expect(videoImpression.video.placement).to.eq(5);
     })
   });
 
   describe('buildRequestNative', function () {
-    it('should build request with expected params', function() {
-      const request = spec.buildRequests(DEFAULT_NATIVE_VALID_BID, DEFAULT_OPTION);
-      const query = request[0].data;
+    it('should build request with expected params', function () {
+      const request = spec.buildRequests(DEFAULT_NATIVE_VALID_BID, DEFAULT_OPTION)[0];
 
-      expect(query.hasOwnProperty('v')).to.equal(false);
-      expect(query.s).to.equal(DEFAULT_NATIVE_VALID_BID[0].params.siteId);
-      expect(query.r).to.exist;
-      expect(query.ac).to.equal('j');
-      expect(query.sd).to.equal(1);
-      expect(JSON.parse(query.r).at).to.equal(1);
+      expect(request.data).to.exist;
+      expect(request.method).to.equal('POST')
     });
 
     it('should send gpid in request if ortb2Imp.ext.gpid exists', function () {
@@ -2468,40 +2444,40 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const requests = spec.buildRequests(bids, DEFAULT_OPTION);
-      const { ext: { gpid } } = JSON.parse(requests[0].data.r).imp[0];
+      const { ext: { gpid } } = extractPayload(requests[0]).imp[0];
       expect(gpid).to.equal(GPID);
     });
 
-    it('should build request with required asset properties with default values', function() {
+    it('should build request with required asset properties with default values', function () {
       const request = spec.buildRequests(DEFAULT_NATIVE_VALID_BID, DEFAULT_OPTION);
-      const nativeImpression = JSON.parse(request[0].data.r).imp[0];
+      const nativeImpression = extractPayload(request[0]).imp[0];
 
       expect(request[0].data.hasOwnProperty('v')).to.equal(false);
       expect(nativeImpression.id).to.equal(DEFAULT_NATIVE_VALID_BID[0].bidId);
       expect(nativeImpression.native).to.deep.equal(DEFAULT_NATIVE_IMP);
     });
 
-    it('should set imp.ext.sid for native imps if params.id exist', function() {
+    it('should set imp.ext.sid for native imps if params.id exist', function () {
       const bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID);
       bid[0].params.id = 'abc'
       const request = spec.buildRequests(bid, DEFAULT_OPTION);
-      const nativeImpression = JSON.parse(request[0].data.r).imp[0];
+      const nativeImpression = extractPayload(request[0]).imp[0];
 
       expect(nativeImpression.id).to.equal(DEFAULT_NATIVE_VALID_BID[0].bidId);
       expect(nativeImpression.ext.sid).to.equal('abc');
     });
 
-    it('should build request with given asset properties', function() {
+    it('should build request with given asset properties', function () {
       let bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID)
       bid[0].nativeOrtbRequest = {
-        assets: [{id: 0, required: 0, title: {len: 140}}, {id: 1, required: 0, video: {mimes: ['javascript'], minduration: 10, maxduration: 60, protocols: [1]}}]
+        assets: [{ id: 0, required: 0, title: { len: 140 } }, { id: 1, required: 0, video: { mimes: ['javascript'], minduration: 10, maxduration: 60, protocols: [1] } }]
       }
       const request = spec.buildRequests(bid, DEFAULT_OPTION);
-      const nativeImpression = JSON.parse(request[0].data.r).imp[0];
-      expect(nativeImpression.native).to.deep.equal({request: '{"assets":[{"id":0,"required":0,"title":{"len":140}},{"id":1,"required":0,"video":{"mimes":["javascript"],"minduration":10,"maxduration":60,"protocols":[1]}}],"eventtrackers":[{"event":1,"methods":[1,2]}],"privacy":1}', ver: '1.2'});
+      const nativeImpression = extractPayload(request[0]).imp[0];
+      expect(nativeImpression.native).to.deep.equal({ request: '{"assets":[{"id":0,"required":0,"title":{"len":140}},{"id":1,"required":0,"video":{"mimes":["javascript"],"minduration":10,"maxduration":60,"protocols":[1]}}],"eventtrackers":[{"event":1,"methods":[1,2]}],"privacy":1}', ver: '1.2' });
     });
 
-    it('should build request with all possible Prebid asset properties', function() {
+    it('should build request with all possible Prebid asset properties', function () {
       let bid = utils.deepClone(DEFAULT_NATIVE_VALID_BID)
       bid[0].nativeOrtbRequest = {
         'ver': '1.2',
@@ -2626,17 +2602,16 @@ describe('IndexexchangeAdapter', function () {
         ]
       }
       const request = spec.buildRequests(bid, DEFAULT_OPTION);
-      const nativeImpression = JSON.parse(request[0].data.r).imp[0];
-      expect(nativeImpression.native).to.deep.equal({request: '{"ver":"1.2","assets":[{"id":0,"required":0,"title":{"len":140}},{"id":1,"required":0,"data":{"type":2}},{"id":2,"required":0,"data":{"type":10}},{"id":3,"required":0,"data":{"type":1}},{"id":4,"required":0,"img":{"type":1}},{"id":5,"required":0,"img":{"type":3}},{"id":6,"required":0},{"id":7,"required":0,"data":{"type":11}},{"id":8,"required":0},{"id":9,"required":0},{"id":10,"required":0,"data":{"type":12}},{"id":11,"required":0,"data":{"type":3}},{"id":12,"required":0,"data":{"type":5}},{"id":13,"required":0,"data":{"type":4}},{"id":14,"required":0,"data":{"type":6}},{"id":15,"required":0,"data":{"type":7}},{"id":16,"required":0,"data":{"type":9}},{"id":17,"required":0,"data":{"type":8}}],"eventtrackers":[{"event":1,"methods":[1,2]}],"privacy":1}', ver: '1.2'});
+      const nativeImpression = extractPayload(request[0]).imp[0];
+      expect(nativeImpression.native).to.deep.equal({ request: '{"ver":"1.2","assets":[{"id":0,"required":0,"title":{"len":140}},{"id":1,"required":0,"data":{"type":2}},{"id":2,"required":0,"data":{"type":10}},{"id":3,"required":0,"data":{"type":1}},{"id":4,"required":0,"img":{"type":1}},{"id":5,"required":0,"img":{"type":3}},{"id":6,"required":0},{"id":7,"required":0,"data":{"type":11}},{"id":8,"required":0},{"id":9,"required":0},{"id":10,"required":0,"data":{"type":12}},{"id":11,"required":0,"data":{"type":3}},{"id":12,"required":0,"data":{"type":5}},{"id":13,"required":0,"data":{"type":4}},{"id":14,"required":0,"data":{"type":6}},{"id":15,"required":0,"data":{"type":7}},{"id":16,"required":0,"data":{"type":9}},{"id":17,"required":0,"data":{"type":8}}],"eventtrackers":[{"event":1,"methods":[1,2]}],"privacy":1}', ver: '1.2' });
     })
   });
 
   describe('buildRequestMultiFormat', function () {
     it('only banner bidder params set', function () {
       const request = spec.buildRequests(DEFAULT_MULTIFORMAT_BANNER_VALID_BID, {})
-      const bannerImpression = JSON.parse(request[0].data.r).imp[0];
-      expect(JSON.parse(request[0].data.r).imp).to.have.lengthOf(1);
-      expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
+      const bannerImpression = extractPayload(request[0]).imp[0];
+      expect(extractPayload(request[0]).imp).to.have.lengthOf(1);
       expect(bannerImpression.id).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].bidId);
       expect(bannerImpression.banner.format[0].w).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].params.size[0]);
       expect(bannerImpression.banner.format[0].h).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].params.size[1]);
@@ -2645,9 +2620,8 @@ describe('IndexexchangeAdapter', function () {
     describe('only video bidder params set', function () {
       it('should generate video impression', function () {
         const request = spec.buildRequests(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID, {});
-        const videoImp = JSON.parse(request[1].data.r).imp[0];
-        expect(JSON.parse(request[1].data.r).imp).to.have.lengthOf(1);
-        expect(JSON.parse(request[1].data.v)).to.equal(VIDEO_ENDPOINT_VERSION);
+        const videoImp = extractPayload(request[1]).imp[0];
+        expect(extractPayload(request[1]).imp).to.have.lengthOf(1);
         expect(videoImp.id).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].bidId);
         expect(videoImp.video.w).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.size[0]);
         expect(videoImp.video.h).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.size[1]);
@@ -2659,10 +2633,9 @@ describe('IndexexchangeAdapter', function () {
       const request = spec.buildRequests(bids, {});
 
       it('should return valid banner requests', function () {
-        const impressions = JSON.parse(request[0].data.r).imp;
+        const impressions = extractPayload(request[0]).imp;
 
         expect(impressions).to.have.lengthOf(2);
-        expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
 
         impressions.map((impression, index) => {
           const bid = bids[index];
@@ -2682,17 +2655,16 @@ describe('IndexexchangeAdapter', function () {
       });
 
       it('should return valid banner and video requests', function () {
-        const videoImpression = JSON.parse(request[1].data.r).imp[0];
+        const videoImpression = extractPayload(request[1]).imp[0];
 
-        expect(JSON.parse(request[1].data.r).imp).to.have.lengthOf(1);
-        expect(JSON.parse(request[1].data.v)).to.equal(VIDEO_ENDPOINT_VERSION);
+        expect(extractPayload(request[1]).imp).to.have.lengthOf(1);
         expect(videoImpression.id).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].bidId);
         expect(videoImpression.video.w).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].mediaTypes.video.playerSize[0][0]);
         expect(videoImpression.video.h).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].mediaTypes.video.playerSize[0][1]);
       });
 
       it('should contain all correct IXdiag properties', function () {
-        const diagObj = JSON.parse(request[0].data.r).ext.ixdiag;
+        const diagObj = extractPayload(request[0]).ext.ixdiag;
         expect(diagObj.iu).to.equal(0);
         expect(diagObj.nu).to.equal(0);
         expect(diagObj.ou).to.equal(2);
@@ -2709,6 +2681,17 @@ describe('IndexexchangeAdapter', function () {
   });
 
   describe('interpretResponse', function () {
+    // generate bidderRequest with real buildRequest logic for intepretResponse testing
+    let bannerBidderRequest
+    let videoBidderRequest
+    let nativeBidderRequest
+
+    beforeEach(() => {
+      bannerBidderRequest = spec.buildRequests(DEFAULT_BANNER_VALID_BID, {})[0]
+      videoBidderRequest = spec.buildRequests(DEFAULT_VIDEO_VALID_BID_MEDIUM_SIZE, {})[0]
+      nativeBidderRequest = spec.buildRequests(DEFAULT_NATIVE_VALID_BID, {})[0]
+    });
+
     it('should get correct bid response for banner ad', function () {
       const expectedParse = [
         {
@@ -2730,7 +2713,7 @@ describe('IndexexchangeAdapter', function () {
           }
         }
       ];
-      const result = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, { data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: [] });
+      const result = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, bannerBidderRequest);
       expect(result[0]).to.deep.equal(expectedParse[0]);
     });
 
@@ -2754,7 +2737,7 @@ describe('IndexexchangeAdapter', function () {
           }
         }
       ];
-      const result = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE_WITHOUT_ADOMAIN }, { data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: [] });
+      const result = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE_WITHOUT_ADOMAIN }, bannerBidderRequest);
       expect(result[0]).to.deep.equal(expectedParse[0]);
     });
 
@@ -2781,7 +2764,7 @@ describe('IndexexchangeAdapter', function () {
           }
         }
       ];
-      const result = spec.interpretResponse({ body: bidResponse }, { data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: [] });
+      const result = spec.interpretResponse({ body: bidResponse }, bannerBidderRequest);
     });
 
     it('should set Japanese price correctly', function () {
@@ -2807,7 +2790,7 @@ describe('IndexexchangeAdapter', function () {
           }
         }
       ];
-      const result = spec.interpretResponse({ body: bidResponse }, { data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: [] });
+      const result = spec.interpretResponse({ body: bidResponse }, bannerBidderRequest);
       expect(result[0]).to.deep.equal(expectedParse[0]);
     });
 
@@ -2836,7 +2819,7 @@ describe('IndexexchangeAdapter', function () {
           }
         }
       ];
-      const result = spec.interpretResponse({ body: bidResponse }, { data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: [] });
+      const result = spec.interpretResponse({ body: bidResponse }, bannerBidderRequest);
 
       expect(result[0].dealId).to.equal(expectedParse[0].dealId);
     });
@@ -2863,7 +2846,7 @@ describe('IndexexchangeAdapter', function () {
           }
         }
       ];
-      const result = spec.interpretResponse({ body: bidResponse }, { data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: [] });
+      const result = spec.interpretResponse({ body: bidResponse }, bannerBidderRequest);
       expect(result[0]).to.deep.equal(expectedParse[0]);
     });
 
@@ -2891,7 +2874,7 @@ describe('IndexexchangeAdapter', function () {
           }
         }
       ];
-      const result = spec.interpretResponse({ body: bidResponse }, { data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: [] });
+      const result = spec.interpretResponse({ body: bidResponse }, bannerBidderRequest);
       expect(result[0].dealId).to.deep.equal(expectedParse[0].dealId);
     });
 
@@ -2928,7 +2911,7 @@ describe('IndexexchangeAdapter', function () {
         }
       ];
       const result = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
-        data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: ONE_VIDEO
+        data: videoBidderRequest.data, validBidRequests: ONE_VIDEO
       });
 
       expect(result[0]).to.deep.equal(expectedParse[0]);
@@ -2936,14 +2919,14 @@ describe('IndexexchangeAdapter', function () {
 
     it('should set bid[].renderer if renderer not defined at mediaType.video level', function () {
       const bid = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
-        data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: DEFAULT_MULTIFORMAT_BANNER_VALID_BID
+        data: videoBidderRequest.data, validBidRequests: DEFAULT_MULTIFORMAT_BANNER_VALID_BID
       });
       expect(bid[0].renderer).to.exist;
     });
 
     it('should set renderer URL by parsing video response', function () {
       const bid = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
-        data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: DEFAULT_MULTIFORMAT_BANNER_VALID_BID
+        data: videoBidderRequest.data, validBidRequests: DEFAULT_MULTIFORMAT_BANNER_VALID_BID
       });
       expect(bid[0].renderer.url).to.equal(DEFAULT_VIDEO_BID_RESPONSE.ext.videoplayerurl);
     });
@@ -2952,10 +2935,10 @@ describe('IndexexchangeAdapter', function () {
       let outstreamAdUnit = utils.deepClone(DEFAULT_MULTIFORMAT_BANNER_VALID_BID);
       outstreamAdUnit[0].mediaTypes.video.renderer = {
         url: 'test',
-        render: function() {}
+        render: function () { }
       };
       const bid = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
-        data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: outstreamAdUnit
+        data: videoBidderRequest.data, validBidRequests: outstreamAdUnit
       });
       expect(bid[0].renderer).to.be.undefined;
     });
@@ -2964,10 +2947,10 @@ describe('IndexexchangeAdapter', function () {
       let outstreamAdUnit = utils.deepClone(DEFAULT_MULTIFORMAT_BANNER_VALID_BID);
       outstreamAdUnit[0].renderer = {
         url: 'test',
-        render: function() {}
+        render: function () { }
       };
       const bid = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
-        data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: outstreamAdUnit
+        data: videoBidderRequest.data, validBidRequests: outstreamAdUnit
       });
       expect(bid[0].renderer).to.be.undefined;
     });
@@ -2978,7 +2961,7 @@ describe('IndexexchangeAdapter', function () {
         url: 'test'
       };
       const bid = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
-        data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: outstreamAdUnit
+        data: videoBidderRequest.data, validBidRequests: outstreamAdUnit
       });
       expect(bid[0].renderer).to.exist;
     });
@@ -2987,11 +2970,11 @@ describe('IndexexchangeAdapter', function () {
       let outstreamAdUnit = utils.deepClone(DEFAULT_MULTIFORMAT_BANNER_VALID_BID);
       outstreamAdUnit[0].mediaTypes.video.renderer = {
         url: 'test',
-        render: function() {},
+        render: function () { },
         backupOnly: true
       };
       const bid = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, {
-        data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: outstreamAdUnit
+        data: videoBidderRequest.data, validBidRequests: outstreamAdUnit
       });
       expect(bid[0].renderer).to.exist;
     });
@@ -3029,7 +3012,7 @@ describe('IndexexchangeAdapter', function () {
         }
       ];
       const result = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE_WITH_MTYPE_SET }, {
-        data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: ONE_VIDEO
+        data: videoBidderRequest.data, validBidRequests: ONE_VIDEO
       });
 
       expect(result[0]).to.deep.equal(expectedParse[0]);
@@ -3038,10 +3021,11 @@ describe('IndexexchangeAdapter', function () {
     it('bidrequest should not have page if options is undefined', function () {
       const options = {};
       const validBidWithoutreferInfo = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithoutreferInfo = JSON.parse(validBidWithoutreferInfo[0].data.r);
+      const requestWithoutreferInfo = extractPayload(validBidWithoutreferInfo[0]);
 
+      const expectedURL = IX_SECURE_ENDPOINT + '?s=' + DEFAULT_BANNER_VALID_BID[0].params.siteId
       expect(requestWithoutreferInfo.site.page).to.be.undefined;
-      expect(validBidWithoutreferInfo[0].url).to.equal(IX_SECURE_ENDPOINT);
+      expect(validBidWithoutreferInfo[0].url).to.equal(expectedURL);
     });
 
     it('bidrequest should not have page if options.refererInfo is an empty object', function () {
@@ -3049,10 +3033,11 @@ describe('IndexexchangeAdapter', function () {
         refererInfo: {}
       };
       const validBidWithoutreferInfo = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithoutreferInfo = JSON.parse(validBidWithoutreferInfo[0].data.r);
+      const requestWithoutreferInfo = extractPayload(validBidWithoutreferInfo[0]);
 
+      const expectedURL = IX_SECURE_ENDPOINT + '?s=' + DEFAULT_BANNER_VALID_BID[0].params.siteId
       expect(requestWithoutreferInfo.site.page).to.be.undefined;
-      expect(validBidWithoutreferInfo[0].url).to.equal(IX_SECURE_ENDPOINT);
+      expect(validBidWithoutreferInfo[0].url).to.equal(expectedURL);
     });
 
     it('bidrequest should sent to secure endpoint if page url is secure', function () {
@@ -3062,10 +3047,11 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const validBidWithoutreferInfo = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithoutreferInfo = JSON.parse(validBidWithoutreferInfo[0].data.r);
+      const requestWithoutreferInfo = extractPayload(validBidWithoutreferInfo[0]);
 
+      const expectedURL = IX_SECURE_ENDPOINT + '?s=' + DEFAULT_BANNER_VALID_BID[0].params.siteId
       expect(requestWithoutreferInfo.site.page).to.equal(options.refererInfo.page);
-      expect(validBidWithoutreferInfo[0].url).to.equal(IX_SECURE_ENDPOINT);
+      expect(validBidWithoutreferInfo[0].url).to.equal(expectedURL);
     });
 
     it('should set bid[].ttl to seatbid[].bid[].exp value from response', function () {
@@ -3073,16 +3059,16 @@ describe('IndexexchangeAdapter', function () {
       const VIDEO_RESPONSE_WITH_EXP = utils.deepClone(DEFAULT_VIDEO_BID_RESPONSE);
       VIDEO_RESPONSE_WITH_EXP.seatbid[0].bid[0].exp = 200;
       BANNER_RESPONSE_WITH_EXP.seatbid[0].bid[0].exp = 100;
-      const bannerResult = spec.interpretResponse({ body: BANNER_RESPONSE_WITH_EXP }, { data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: [] });
-      const videoResult = spec.interpretResponse({ body: VIDEO_RESPONSE_WITH_EXP }, { data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: [] });
+      const bannerResult = spec.interpretResponse({ body: BANNER_RESPONSE_WITH_EXP }, bannerBidderRequest);
+      const videoResult = spec.interpretResponse({ body: VIDEO_RESPONSE_WITH_EXP }, videoBidderRequest);
 
       expect(bannerResult[0].ttl).to.equal(100);
       expect(videoResult[0].ttl).to.equal(200);
     });
 
     it('should default bid[].ttl if seat[].bid[].exp is not in the resposne', function () {
-      const bannerResult = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, { data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: [] });
-      const videoResult = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, { data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: [] });
+      const bannerResult = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, bannerBidderRequest);
+      const videoResult = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, videoBidderRequest);
 
       expect(bannerResult[0].ttl).to.equal(300);
       expect(videoResult[0].ttl).to.equal(3600);
@@ -3174,7 +3160,7 @@ describe('IndexexchangeAdapter', function () {
           ttl: 3600
         }
       ];
-      const result = spec.interpretResponse({ body: DEFAULT_NATIVE_BID_RESPONSE }, { data: DEFAULT_BIDDER_REQUEST_DATA, validBidRequests: [] });
+      const result = spec.interpretResponse({ body: DEFAULT_NATIVE_BID_RESPONSE }, nativeBidderRequest);
       expect(result[0]).to.deep.equal(expectedParse[0]);
     });
   });
@@ -3182,7 +3168,7 @@ describe('IndexexchangeAdapter', function () {
   describe('bidrequest consent', function () {
     it('should have consent info if gdprApplies and consentString exist', function () {
       const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION);
-      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
 
       expect(requestWithConsent.regs.ext.gdpr).to.equal(1);
       expect(requestWithConsent.user.ext.consent).to.equal('3huaa11=qu3198ae');
@@ -3196,7 +3182,7 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
 
       expect(requestWithConsent.regs.ext.gdpr).to.equal(1);
       expect(requestWithConsent.user).to.be.undefined;
@@ -3210,7 +3196,7 @@ describe('IndexexchangeAdapter', function () {
         }
       };
       const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
 
       expect(requestWithConsent.regs).to.be.undefined;
       expect(requestWithConsent.user.ext.consent).to.equal('3huaa11=qu3198ae');
@@ -3219,7 +3205,7 @@ describe('IndexexchangeAdapter', function () {
     it('should not have consent info if options.gdprConsent is undefined', function () {
       const options = {};
       const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
 
       expect(requestWithConsent.regs).to.be.undefined;
       expect(requestWithConsent.user).to.be.undefined;
@@ -3230,7 +3216,7 @@ describe('IndexexchangeAdapter', function () {
         uspConsent: '1YYN'
       };
       const validBidWithUspConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithUspConsent = JSON.parse(validBidWithUspConsent[0].data.r);
+      const requestWithUspConsent = extractPayload(validBidWithUspConsent[0]);
 
       expect(requestWithUspConsent.regs.ext.us_privacy).to.equal('1YYN');
     });
@@ -3238,7 +3224,7 @@ describe('IndexexchangeAdapter', function () {
     it('should not have us_privacy if uspConsent undefined', function () {
       const options = {};
       const validBidWithUspConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithUspConsent = JSON.parse(validBidWithUspConsent[0].data.r);
+      const requestWithUspConsent = extractPayload(validBidWithUspConsent[0]);
 
       expect(requestWithUspConsent.regs).to.be.undefined;
     });
@@ -3252,7 +3238,7 @@ describe('IndexexchangeAdapter', function () {
         uspConsent: '1YYN'
       };
       const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
       expect(requestWithConsent.regs.ext.gdpr).to.equal(1);
       expect(requestWithConsent.regs.ext.us_privacy).to.equal('1YYN');
     });
@@ -3266,7 +3252,7 @@ describe('IndexexchangeAdapter', function () {
       };
 
       const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
       expect(requestWithConsent.user.ext.consented_providers_settings.consented_providers).to.equal('1~1.35.41.101');
       expect(requestWithConsent.user.ext.consent).to.equal('3huaa11=qu3198ae');
     });
@@ -3279,7 +3265,7 @@ describe('IndexexchangeAdapter', function () {
       };
 
       const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
-      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      const requestWithConsent = extractPayload(validBidWithConsent[0]);
       expect(utils.deepAccess(requestWithConsent, 'user.ext.consented_providers_settings')).to.not.exist;
       expect(utils.deepAccess(requestWithConsent, 'user.ext.consent')).to.not.exist;
     });
@@ -3287,21 +3273,21 @@ describe('IndexexchangeAdapter', function () {
     it('should set coppa to 1 in config when enabled', () => {
       config.setConfig({ coppa: true })
       const bid = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION);
-      const r = JSON.parse(bid[0].data.r);
+      const r = extractPayload(bid[0]);
 
       expect(r.regs.coppa).to.equal(1);
     });
     it('should not set coppa in config when disabled', () => {
       config.setConfig({ coppa: false })
       const bid = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION);
-      const r = JSON.parse(bid[0].data.r);
+      const r = extractPayload(bid[0]);
 
       expect(r.regs.coppa).to.be.undefined;
     });
     it('should not set coppa when not specified in config', () => {
       config.resetConfig();
       const bid = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION);
-      const r = JSON.parse(bid[0].data.r);
+      const r = extractPayload(bid[0]);
 
       expect(r.regs.coppa).to.be.undefined;
     });
@@ -3402,127 +3388,6 @@ describe('IndexexchangeAdapter', function () {
       expect(FEATURE_TOGGLES.isFeatureEnabled('test')).to.be.undefined;
       expect(FEATURE_TOGGLES.featureToggles).to.deep.equal({});
     });
-
-    it('should create POST request when pbjs_enable_post feature is active', () => {
-      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
-      serverResponse.body.ext.features.pbjs_enable_post = {
-        activated: true
-      };
-      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
-      const builtRequests = {
-        banner: {
-          request: spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0],
-          siteId: DEFAULT_BANNER_VALID_BID[0].params.siteId
-        },
-        video: {
-          request: spec.buildRequests(DEFAULT_VIDEO_VALID_BID, DEFAULT_OPTION)[0],
-          siteId: DEFAULT_VIDEO_VALID_BID[0].params.siteId
-        },
-        native: {
-          request: spec.buildRequests(DEFAULT_NATIVE_VALID_BID, DEFAULT_OPTION)[0],
-          siteId: DEFAULT_NATIVE_VALID_BID[0].params.siteId
-        }
-      };
-
-      Object.keys(builtRequests).forEach((reqType) => {
-        const request = builtRequests[reqType].request;
-        const siteId = builtRequests[reqType].siteId;
-        expect(request.method).to.equal('POST');
-        expect(request.option.contentType).to.equal('text/plain');
-        expect(request.url).to.be.equal(`${IX_SECURE_ENDPOINT}?s=${siteId}`);
-        expect(request.data.r).to.be.undefined;
-        expect(request.data.ac).to.be.undefined;
-        expect(request.data.sd).to.be.undefined;
-        expect(request.data.v).to.be.undefined;
-        expect(request.data.nf).to.be.undefined;
-      });
-    });
-
-    it('should create GET request when pbjs_enable_post feature is disabled', () => {
-      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
-      serverResponse.body.ext.features.pbjs_enable_post = {
-        activated: false
-      };
-      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
-      const builtRequests = {
-        banner: {
-          request: spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0],
-          siteId: DEFAULT_BANNER_VALID_BID[0].params.siteId
-        },
-        video: {
-          request: spec.buildRequests(DEFAULT_VIDEO_VALID_BID, DEFAULT_OPTION)[0],
-          siteId: DEFAULT_VIDEO_VALID_BID[0].params.siteId
-        },
-        native: {
-          request: spec.buildRequests(DEFAULT_NATIVE_VALID_BID, DEFAULT_OPTION)[0],
-          siteId: DEFAULT_NATIVE_VALID_BID[0].params.siteId
-        }
-      };
-
-      Object.keys(builtRequests).forEach((reqType) => {
-        const request = builtRequests[reqType].request;
-        const siteId = builtRequests[reqType].siteId;
-        expect(request.method).to.equal('GET');
-        expect(request.url).to.equal(IX_SECURE_ENDPOINT);
-        expect(request.data.r).to.exist;
-        expect(request.data.ac).to.equal('j');
-        expect(request.data.sd).to.equal(1);
-        expect(request.data.s).to.equal(siteId);
-        if (reqType == 'video') {
-          expect(request.data.nf).to.equal(1);
-        }
-
-        if (reqType === 'native') {
-          expect(request.data.v).to.be.undefined;
-        }
-      });
-    });
-
-    it('should interpertResponse correctly when pbjs_enable_post feature is active', function () {
-      serverResponse.body.ext.features.pbjs_enable_post = {
-        activated: true
-      };
-      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
-      const postBiddderRequestData = {
-        id: '345',
-        imp: [
-          {
-            id: '1a2b3c4e',
-            banner: {
-              w: 300,
-              h: 250,
-              placement: 1
-            }
-          }
-        ],
-        site: {
-          ref: 'https://ref.com/ref.html',
-          page: 'https://page.com'
-        },
-      };
-      const expectedParse = [
-        {
-          requestId: '1a2b3c4d',
-          cpm: 1,
-          creativeId: '12345',
-          width: 300,
-          height: 250,
-          mediaType: 'banner',
-          ad: '<a target="_blank" href="https://www.indexexchange.com"></a>',
-          currency: 'USD',
-          ttl: 300,
-          netRevenue: true,
-          meta: {
-            networkId: 50,
-            brandId: 303325,
-            brandName: 'OECTA',
-            advertiserDomains: ['www.abc.com']
-          }
-        }
-      ];
-      const result = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, { data: postBiddderRequestData, validBidRequests: [] });
-      expect(result[0]).to.deep.equal(expectedParse[0]);
-    });
   });
 
   describe('LocalStorage error codes', () => {
@@ -3640,7 +3505,7 @@ describe('IndexexchangeAdapter', function () {
       };
 
       expect(spec.isBidRequestValid(bid)).to.be.true;
-      spec.buildRequests([bid], {ortb2});
+      spec.buildRequests([bid], { ortb2 });
       expect(JSON.parse(localStorageValues[key])).to.deep.equal({ [TODAY]: { [ERROR_CODES.PB_FPD_EXCEEDS_MAX_SIZE]: 2 } });
     });
 
@@ -3694,30 +3559,24 @@ describe('IndexexchangeAdapter', function () {
       expect(spec.isBidRequestValid(request)).to.be.true;
 
       const data = {
-        ...utils.deepClone(DEFAULT_BIDDER_REQUEST_DATA[0]),
-        r: JSON.stringify({
-          id: '345',
-          imp: [
-            {
-              id: '1a2b3c4e',
-            }
-          ],
-          ext: {
-            ixdiag: {
-              err: {
-                '4': 8
-              }
+        id: '345',
+        imp: [
+          {
+            id: '1a2b3c4e',
+          }
+        ],
+        ext: {
+          ixdiag: {
+            err: {
+              '4': 8
             }
           }
-        }),
+        }
       };
 
-      const validBidRequests = [
-        DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0],
-        DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]
-      ];
+      const validBidRequest = DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0];
 
-      spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, { data, validBidRequests });
+      spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, { data, validBidRequest });
 
       expect(localStorageValues[key]).to.be.undefined;
     });

From 11fd3d30fd44d832374928e509ff6917a632d7a8 Mon Sep 17 00:00:00 2001
From: Yuki Tsujii <yuki.tsujii.37@gmail.com>
Date: Fri, 28 Oct 2022 03:55:24 +0900
Subject: [PATCH 386/569] =?UTF-8?q?localStrage=E3=82=92=E8=AA=AD=E3=81=BF?=
 =?UTF-8?q?=E8=BE=BC=E3=82=80=E3=81=8B=E3=81=A9=E3=81=86=E3=81=8B=E3=81=AF?=
 =?UTF-8?q?default:=20false=E3=81=A8=E3=81=AA=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=20(#9146)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: mediaconsortium-develop <mediaconsortium-develop@bi.garage.co.jp>
---
 modules/dgkeywordRtdProvider.js                | 6 +++---
 test/spec/modules/dgkeywordRtdProvider_spec.js | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/dgkeywordRtdProvider.js b/modules/dgkeywordRtdProvider.js
index 032cb4a780a..99df3b18a39 100644
--- a/modules/dgkeywordRtdProvider.js
+++ b/modules/dgkeywordRtdProvider.js
@@ -41,7 +41,7 @@ export function getDgKeywordsAndSet(reqBidsConfigObj, callback, moduleConfig, us
   } else {
     logMessage('[dgkeyword sub module] dgkeyword targets:', setKeywordTargetBidders);
     logMessage('[dgkeyword sub module] get targets from profile api start.');
-    ajax(getProfileApiUrl(moduleConfig?.params?.url, moduleConfig?.params?.disableReadFpid), {
+    ajax(getProfileApiUrl(moduleConfig?.params?.url, moduleConfig?.params?.enableReadFpid), {
       success: function(response) {
         const res = JSON.parse(response);
         if (!isFinish) {
@@ -96,9 +96,9 @@ export function getDgKeywordsAndSet(reqBidsConfigObj, callback, moduleConfig, us
   }
 }
 
-export function getProfileApiUrl(customeUrl, disableReadFpid) {
+export function getProfileApiUrl(customeUrl, enableReadFpid) {
   const URL = 'https://mediaconsortium.profiles.tagger.opecloud.com/api/v1';
-  const fpid = (disableReadFpid) ? '' : readFpidFromLocalStrage();
+  const fpid = (enableReadFpid) ? readFpidFromLocalStrage() : '';
   let url = customeUrl || URL;
   url = url + '?url=' + encodeURIComponent(window.location.href) + ((fpid) ? `&fpid=${fpid}` : '');
   return url;
diff --git a/test/spec/modules/dgkeywordRtdProvider_spec.js b/test/spec/modules/dgkeywordRtdProvider_spec.js
index 16f2906b681..754740b7a64 100644
--- a/test/spec/modules/dgkeywordRtdProvider_spec.js
+++ b/test/spec/modules/dgkeywordRtdProvider_spec.js
@@ -383,10 +383,11 @@ describe('Digital Garage Keyword Module', function () {
       }
       let moduleConfig = cloneDeep(DEF_CONFIG);
       window.localStorage.setItem('ope_fpid', uuid);
+      moduleConfig.params.enableReadFpid = true;
       dgRtd.getDgKeywordsAndSet(
         pbjs,
         () => {
-          const url = dgRtd.getProfileApiUrl(null);
+          const url = dgRtd.getProfileApiUrl(null, moduleConfig.params.enableReadFpid);
           expect(url.indexOf(uuid) > 0).to.equal(true);
           expect(url).to.equal(server.requests[0].url);
           done();
@@ -410,11 +411,10 @@ describe('Digital Garage Keyword Module', function () {
       }
       let moduleConfig = cloneDeep(DEF_CONFIG);
       window.localStorage.setItem('ope_fpid', uuid);
-      moduleConfig.params.disableReadFpid = true;
       dgRtd.getDgKeywordsAndSet(
         pbjs,
         () => {
-          const url = dgRtd.getProfileApiUrl(null, moduleConfig.params.disableReadFpid);
+          const url = dgRtd.getProfileApiUrl(null);
           expect(url.indexOf(uuid) > 0).to.equal(false);
           expect(url).to.equal(server.requests[0].url);
           done();

From e08fea6af362770bb67cf6f466c871c5d03b8c92 Mon Sep 17 00:00:00 2001
From: Jozef Bartek <31618107+jbartek25@users.noreply.github.com>
Date: Thu, 27 Oct 2022 20:58:11 +0200
Subject: [PATCH 387/569] Improve Digital adapter: publisher endpoint, addtl
 consent, syncs (#9125)

* Improve Digital adapter: publisher endpoint, addtl consent, syncs (#14)

- add bidders to sync url when extend mode enabled
- set ConsentedProvidersSettings when extend mode enabled
- dynamically generated AD_SERVER_URL when publisherId available

* Code refactored

* Minor changes

Co-authored-by: Faisal Islam <93644923+faisalvs@users.noreply.github.com>
Co-authored-by: Faisal Islam <faisal.islam@vivacomsolutions.com>
---
 modules/improvedigitalBidAdapter.js           | 59 ++++++++++---
 .../modules/improvedigitalBidAdapter_spec.js  | 86 ++++++++++++++++++-
 2 files changed, 131 insertions(+), 14 deletions(-)

diff --git a/modules/improvedigitalBidAdapter.js b/modules/improvedigitalBidAdapter.js
index cc039354878..94f50094a91 100644
--- a/modules/improvedigitalBidAdapter.js
+++ b/modules/improvedigitalBidAdapter.js
@@ -10,8 +10,9 @@ import {loadExternalScript} from '../src/adloader.js';
 const BIDDER_CODE = 'improvedigital';
 const CREATIVE_TTL = 300;
 
-const AD_SERVER_URL = 'https://ad.360yield.com/pb';
-const BASIC_ADS_URL = 'https://ad.360yield-basic.com/pb';
+const AD_SERVER_BASE_URL = 'https://ad.360yield.com';
+const BASIC_ADS_BASE_URL = 'https://ad.360yield-basic.com';
+const PB_ENDPOINT = 'pb';
 const EXTEND_URL = 'https://pbs.360yield.com/openrtb2/auction';
 const IFRAME_SYNC_URL = 'https://hb.360yield.com/prebid-universal-creative/load-cookie.html';
 
@@ -79,6 +80,13 @@ export const spec = {
     const syncs = [];
     if ((this.syncStore.extendMode || !syncOptions.pixelEnabled) && syncOptions.iframeEnabled) {
       const { gdprApplies, consentString } = gdprConsent || {};
+      const bidders = new Set();
+      if (this.syncStore.extendMode && serverResponses) {
+        serverResponses.forEach(response => {
+          if (!response?.body?.ext?.responsetimemillis) return;
+          Object.keys(response.body.ext.responsetimemillis).forEach(b => bidders.add(b))
+        })
+      }
       syncs.push({
         type: 'iframe',
         url: IFRAME_SYNC_URL +
@@ -86,7 +94,8 @@ export const spec = {
           (this.syncStore.extendMode ? '&pbs=1' : '') +
           (typeof gdprApplies === 'boolean' ? `&gdpr=${Number(gdprApplies)}` : '') +
           (consentString ? `&gdpr_consent=${consentString}` : '') +
-          (uspConsent ? `&us_privacy=${encodeURIComponent(uspConsent)}` : '')
+          (uspConsent ? `&us_privacy=${encodeURIComponent(uspConsent)}` : '') +
+          (bidders.size ? `&bidders=${[...bidders].join(',')}` : '')
       });
     } else if (syncOptions.pixelEnabled) {
       serverResponses.forEach(response => {
@@ -220,8 +229,14 @@ export const CONVERTER = ortbConverter({
     },
     request: {
       gdprAddtlConsent(setAddtlConsent, ortbRequest, bidderRequest) {
-        // override attlConsent processor to do some additional parsing, and use a different destination
-        const additionalConsent = deepAccess(bidderRequest, 'gdprConsent.addtlConsent');
+        const additionalConsent = bidderRequest?.gdprConsent?.addtlConsent;
+        if (!additionalConsent) {
+          return;
+        }
+        if (spec.syncStore.extendMode) {
+          setAddtlConsent(ortbRequest, bidderRequest);
+          return;
+        }
         if (additionalConsent && additionalConsent.indexOf('~') !== -1) {
           // Google Ad Tech Provider IDs
           const atpIds = additionalConsent.substring(additionalConsent.indexOf('~') + 1);
@@ -247,23 +262,43 @@ const ID_REQUEST = {
     const extendBids = [];
     const adServerBids = [];
 
-    function formatRequest(bidRequests, extendMode) {
+    function adServerUrl(extendMode, publisherId) {
+      if (extendMode) {
+        return EXTEND_URL;
+      }
+      const urlSegments = [];
+      urlSegments.push(hasPurpose1Consent(bidderRequest?.gdprConsent) ? AD_SERVER_BASE_URL : BASIC_ADS_BASE_URL)
+      if (publisherId) {
+        urlSegments.push(publisherId)
+      }
+      urlSegments.push(PB_ENDPOINT)
+      return urlSegments.join('/');
+    }
+
+    function formatRequest(bidRequests, publisherId, extendMode) {
       const ortbRequest = CONVERTER.toORTB({bidRequests, bidderRequest, context: {extendMode}});
-      const adServerUrl = hasPurpose1Consent(bidderRequest?.gdprConsent) ? AD_SERVER_URL : BASIC_ADS_URL;
       return {
         method: 'POST',
-        url: extendMode ? EXTEND_URL : adServerUrl,
+        url: adServerUrl(extendMode, publisherId),
         data: JSON.stringify(ortbRequest),
-        ortbRequest
+        ortbRequest,
+        bidderRequest
       }
     }
 
+    let publisherId = null;
     bidRequests.map((bidRequest) => {
+      const bidParamsPublisherId = bidRequest.params.publisherId;
       const extendModeEnabled = this.isExtendModeEnabled(globalExtendMode, bidRequest.params);
       if (singleRequestMode) {
+        if (!publisherId) {
+          publisherId = bidParamsPublisherId;
+        } else if (bidParamsPublisherId && publisherId !== bidParamsPublisherId) {
+          throw new Error(`All Improve Digital placements in a single call must have the same publisherId. Please check your 'params.publisherId' or turn off the single request mode.`);
+        }
         extendModeEnabled ? extendBids.push(bidRequest) : adServerBids.push(bidRequest);
       } else {
-        requests.push(formatRequest([bidRequest], extendModeEnabled));
+        requests.push(formatRequest([bidRequest], bidParamsPublisherId, extendModeEnabled));
       }
     });
 
@@ -272,10 +307,10 @@ const ID_REQUEST = {
     }
     // In the single request mode, split imps between those going to the ad server and those going to extend server
     if (extendBids.length) {
-      requests.push(formatRequest(extendBids, true));
+      requests.push(formatRequest(extendBids, publisherId, true));
     }
     if (adServerBids.length) {
-      requests.push(formatRequest(adServerBids, false));
+      requests.push(formatRequest(adServerBids, publisherId, false));
     }
 
     return requests;
diff --git a/test/spec/modules/improvedigitalBidAdapter_spec.js b/test/spec/modules/improvedigitalBidAdapter_spec.js
index 9190c008a9f..b3b01dc93b5 100644
--- a/test/spec/modules/improvedigitalBidAdapter_spec.js
+++ b/test/spec/modules/improvedigitalBidAdapter_spec.js
@@ -18,8 +18,11 @@ import {createEidsArray} from '../../../modules/userId/eids.js';
 
 describe('Improve Digital Adapter Tests', function () {
   const METHOD = 'POST';
-  const AD_SERVER_URL = 'https://ad.360yield.com/pb';
-  const BASIC_ADS_URL = 'https://ad.360yield-basic.com/pb';
+  const AD_SERVER_BASE_URL = 'https://ad.360yield.com';
+  const BASIC_ADS_BASE_URL = 'https://ad.360yield-basic.com';
+  const PB_ENDPOINT = 'pb';
+  const AD_SERVER_URL = `${AD_SERVER_BASE_URL}/${PB_ENDPOINT}`;
+  const BASIC_ADS_URL = `${BASIC_ADS_BASE_URL}/${PB_ENDPOINT}`;
   const EXTEND_URL = 'https://pbs.360yield.com/openrtb2/auction';
   const IFRAME_SYNC_URL = 'https://hb.360yield.com/prebid-universal-creative/load-cookie.html';
   const INSTREAM_TYPE = 1;
@@ -390,6 +393,7 @@ describe('Improve Digital Adapter Tests', function () {
       const payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequestGdpr)[0].data);
       expect(payload.regs.ext.gdpr).to.exist.and.to.equal(1);
       expect(payload.user.ext.consent).to.equal('CONSENT');
+      expect(payload.user.ext.ConsentedProvidersSettings).to.not.exist;
       expect(payload.user.ext.consented_providers_settings.consented_providers).to.exist.and.to.deep.equal([1, 35, 41, 101]);
     });
 
@@ -401,6 +405,15 @@ describe('Improve Digital Adapter Tests', function () {
       expect(payload.user.ext.consented_providers_settings).to.not.exist;
     });
 
+    it('should add ConsentedProvidersSettings when extend mode enabled', function () {
+      const bidRequest = deepClone(extendBidRequest);
+      const payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequestGdpr)[0].data);
+      expect(payload.regs.ext.gdpr).to.exist.and.to.equal(1);
+      expect(payload.user.ext.consent).to.equal('CONSENT');
+      expect(payload.user.ext.ConsentedProvidersSettings.consented_providers).to.exist.and.to.equal('1~1.35.41.101');
+      expect(payload.user.ext.consented_providers_settings).to.not.exist;
+    });
+
     it('should add CCPA consent string', function () {
       const bidRequest = Object.assign({}, simpleBidRequest);
       const request = spec.buildRequests([bidRequest], {...bidderRequest, ...{ uspConsent: '1YYY' }});
@@ -753,6 +766,64 @@ describe('Improve Digital Adapter Tests', function () {
       expect(requests[0].url).to.equal(AD_SERVER_URL);
       expect(requests[1].url).to.equal(EXTEND_URL);
     });
+
+    it('should add publisherId to request URL when available in request params', function() {
+      function formatPublisherUrl(baseUrl, publisherId) {
+        return `${baseUrl}/${publisherId}/${PB_ENDPOINT}`;
+      }
+      const bidRequest = deepClone(simpleBidRequest);
+      bidRequest.params.publisherId = 1000;
+      let request = spec.buildRequests([bidRequest], bidderRequest)[0];
+      expect(request).to.be.an('object');
+      sinon.assert.match(request, {
+        method: METHOD,
+        url: formatPublisherUrl(AD_SERVER_BASE_URL, 1000),
+        bidderRequest
+      });
+
+      const bidRequest2 = deepClone(simpleBidRequest)
+      bidRequest2.params.publisherId = 1002;
+
+      const bidRequest3 = deepClone(extendBidRequest)
+      bidRequest3.params.publisherId = 1002;
+
+      const request1 = spec.buildRequests([bidRequest, bidRequest2], bidderRequest)[0];
+      expect(request1.url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1000));
+      const request2 = spec.buildRequests([bidRequest, bidRequest2], bidderRequest)[1];
+      expect(request2.url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1002));
+      const request3 = spec.buildRequests([bidRequest, bidRequest3], bidderRequest)[1];
+      expect(request3.url).to.equal(EXTEND_URL);
+
+      // Enable single request mode
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('improvedigital.singleRequest').returns(true);
+      try {
+        spec.buildRequests([bidRequest, bidRequest2], bidderRequest)[0];
+      } catch (e) {
+        expect(e.name).to.exist.equal('Error')
+        expect(e.message).to.exist.equal(`All Improve Digital placements in a single call must have the same publisherId. Please check your 'params.publisherId' or turn off the single request mode.`)
+      }
+
+      bidRequest2.params.publisherId = null;
+      request = spec.buildRequests([bidRequest, bidRequest2], bidderRequest)[0];
+      expect(request.url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1000));
+
+      const consent = deepClone(gdprConsent);
+      deepSetValue(consent, 'vendorData.purpose.consents.1', false);
+      const bidderRequestWithConsent = deepClone(bidderRequest);
+      bidderRequestWithConsent.gdprConsent = consent;
+      request = spec.buildRequests([bidRequest], bidderRequestWithConsent)[0];
+      expect(request.url).to.equal(formatPublisherUrl(BASIC_ADS_BASE_URL, 1000));
+
+      deepSetValue(consent, 'vendorData.purpose.consents.1', true);
+      bidderRequestWithConsent.gdprConsent = consent;
+      request = spec.buildRequests([bidRequest], bidderRequestWithConsent)[0];
+      expect(request.url).to.equal(formatPublisherUrl(AD_SERVER_BASE_URL, 1000));
+
+      delete bidRequest.params.publisherId;
+      request = spec.buildRequests([bidRequest], bidderRequestWithConsent)[0];
+      expect(request.url).to.equal(AD_SERVER_URL);
+    });
   });
 
   const serverResponse = {
@@ -1285,5 +1356,16 @@ describe('Improve Digital Adapter Tests', function () {
       const syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, serverResponses);
       expect(syncs).to.deep.equal([{ type: 'iframe', url: basicIframeSyncUrl + '&pbs=1' }]);
     });
+
+    it('should add bidders to iframe user sync url', function () {
+      getConfigStub = sinon.stub(config, 'getConfig');
+      getConfigStub.withArgs('improvedigital.extend').returns(true);
+      spec.buildRequests([simpleBidRequest], {});
+      const rawResponse = deepClone(serverResponse)
+      deepSetValue(rawResponse, 'body.ext.responsetimemillis', {a: 1, b: 1, c: 1, d: 1, e: 1})
+      let syncs = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, [rawResponse]);
+      let url = basicIframeSyncUrl + '&pbs=1' + '&bidders=a,b,c,d,e'
+      expect(syncs).to.deep.equal([{ type: 'iframe', url }]);
+    });
   });
 });

From cc3f01df18a21fa163fa34723556313d76eece9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9onard=20Labat?= <le.labat@criteo.com>
Date: Thu, 27 Oct 2022 20:59:01 +0200
Subject: [PATCH 388/569] Criteo Bid Adapter : Bump Publisher Tag version
 (#9151)

---
 modules/criteoBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 622c42c9cb7..c0251ab0165 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -27,7 +27,7 @@ const LOG_PREFIX = 'Criteo: ';
   Unminified source code can be found in the privately shared repo: https://github.com/Prebid-org/prebid-js-external-js-criteo/blob/master/dist/prod.js
 */
 const FAST_BID_VERSION_PLACEHOLDER = '%FAST_BID_VERSION%';
-export const FAST_BID_VERSION_CURRENT = 130;
+export const FAST_BID_VERSION_CURRENT = 132;
 const FAST_BID_VERSION_LATEST = 'latest';
 const FAST_BID_VERSION_NONE = 'none';
 const PUBLISHER_TAG_URL_TEMPLATE = 'https://static.criteo.net/js/ld/publishertag.prebid' + FAST_BID_VERSION_PLACEHOLDER + '.js';

From 297bb486c8be55e1dafd793cb9757fcb3a38d269 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Thu, 27 Oct 2022 12:51:17 -0700
Subject: [PATCH 389/569] Prebid core: allow configurable TTL buffer (#9136)

---
 src/auction.js                        |  5 ++++
 src/prebid.js                         |  9 ++++---
 src/targeting.js                      | 12 ++++++++--
 test/spec/auctionmanager_spec.js      |  6 +++++
 test/spec/unit/core/targeting_spec.js | 34 +++++++++++++++++++++++++++
 test/spec/unit/pbjs_api_spec.js       | 12 +++++++++-
 6 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/src/auction.js b/src/auction.js
index 89b8f21d571..469cb2adcd1 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -666,6 +666,7 @@ export const callPrebidCache = hook('async', function(auctionInstance, bidRespon
  */
 function addCommonResponseProperties(bidResponse, adUnitCode, {index = auctionManager.index} = {}) {
   const bidderRequest = index.getBidderRequest(bidResponse);
+  const adUnit = index.getAdUnit(bidResponse);
   const start = (bidderRequest && bidderRequest.start) || bidResponse.requestTimestamp;
 
   Object.assign(bidResponse, {
@@ -676,6 +677,10 @@ function addCommonResponseProperties(bidResponse, adUnitCode, {index = auctionMa
     adUnitCode
   });
 
+  if (adUnit?.ttlBuffer != null) {
+    bidResponse.ttlBuffer = adUnit.ttlBuffer;
+  }
+
   bidResponse.timeToRespond = bidResponse.responseTimestamp - bidResponse.requestTimestamp;
 }
 
diff --git a/src/prebid.js b/src/prebid.js
index 7b1cfd258ec..94391343cd3 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -622,7 +622,7 @@ $$PREBID_GLOBAL$$.removeAdUnit = function (adUnitCode) {
  * @alias module:pbjs.requestBids
  */
 $$PREBID_GLOBAL$$.requestBids = (function() {
-  const delegate = hook('sync', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels, auctionId, ortb2, metrics } = {}) {
+  const delegate = hook('sync', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels, auctionId, ttlBuffer, ortb2, metrics } = {}) {
     events.emit(REQUEST_BIDS);
     const cbTimeout = timeout || config.getConfig('bidderTimeout');
     logInfo('Invoking $$PREBID_GLOBAL$$.requestBids', arguments);
@@ -630,7 +630,7 @@ $$PREBID_GLOBAL$$.requestBids = (function() {
       global: mergeDeep({}, config.getAnyConfig('ortb2') || {}, ortb2 || {}),
       bidder: Object.fromEntries(Object.entries(config.getBidderConfig()).map(([bidder, cfg]) => [bidder, cfg.ortb2]).filter(([_, ortb2]) => ortb2 != null))
     }
-    return startAuction({bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ortb2Fragments, metrics});
+    return startAuction({bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ttlBuffer, ortb2Fragments, metrics});
   }, 'requestBids');
 
   return wrapHook(delegate, function requestBids(req = {}) {
@@ -646,7 +646,7 @@ $$PREBID_GLOBAL$$.requestBids = (function() {
   });
 })();
 
-export const startAuction = hook('sync', function ({ bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ortb2Fragments, metrics } = {}) {
+export const startAuction = hook('sync', function ({ bidsBackHandler, timeout: cbTimeout, adUnits, ttlBuffer, adUnitCodes, labels, auctionId, ortb2Fragments, metrics } = {}) {
   const s2sBidders = getS2SBidderSet(config.getConfig('s2sConfig') || []);
   adUnits = useMetrics(metrics).measureTime('requestBids.validate', () => checkAdUnitSetup(adUnits));
 
@@ -688,6 +688,9 @@ export const startAuction = hook('sync', function ({ bidsBackHandler, timeout: c
 
       const tid = adUnit.ortb2Imp?.ext?.tid || generateUUID();
       adUnit.transactionId = tid;
+      if (ttlBuffer != null && !adUnit.hasOwnProperty('ttlBuffer')) {
+        adUnit.ttlBuffer = ttlBuffer;
+      }
       // Populate ortb2Imp.ext.tid with transactionId. Specifying a transaction ID per item in the ortb impression array, lets multiple transaction IDs be transmitted in a single bid request.
       deepSetValue(adUnit, 'ortb2Imp.ext.tid', tid);
 
diff --git a/src/targeting.js b/src/targeting.js
index a427867e890..a75c9a2b52f 100644
--- a/src/targeting.js
+++ b/src/targeting.js
@@ -28,7 +28,15 @@ import CONSTANTS from './constants.json';
 var pbTargetingKeys = [];
 
 const MAX_DFP_KEYLENGTH = 20;
-const TTL_BUFFER = 1000;
+let DEFAULT_TTL_BUFFER = 1;
+
+config.getConfig('ttlBuffer', (cfg) => {
+  if (typeof cfg.ttlBuffer === 'number') {
+    DEFAULT_TTL_BUFFER = cfg.ttlBuffer;
+  } else {
+    logError('Invalid value for ttlBuffer', cfg.ttlBuffer);
+  }
+})
 
 const CFG_ALLOW_TARGETING_KEYS = `targetingControls.allowTargetingKeys`;
 const CFG_ADD_TARGETING_KEYS = `targetingControls.addTargetingKeys`;
@@ -39,7 +47,7 @@ export const TARGETING_KEYS = Object.keys(CONSTANTS.TARGETING_KEYS).map(
 );
 
 // return unexpired bids
-const isBidNotExpired = (bid) => (bid.responseTimestamp + bid.ttl * 1000 - TTL_BUFFER) > timestamp();
+const isBidNotExpired = (bid) => (bid.responseTimestamp + (bid.ttl - (bid.hasOwnProperty('ttlBuffer') ? bid.ttlBuffer : DEFAULT_TTL_BUFFER)) * 1000) > timestamp();
 
 // return bids whose status is not set. Winning bids can only have a status of `rendered`.
 const isUnusedBid = (bid) => bid && ((bid.status && !includes([CONSTANTS.BID_STATUS.RENDERED], bid.status)) || !bid.status);
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index e36b2ccbb07..a48424b045c 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -955,6 +955,12 @@ describe('auctionmanager.js', function () {
         const addedBid = find(auction.getBidsReceived(), bid => bid.adUnitCode == ADUNIT_CODE);
         assert.equal(addedBid.renderer.url, 'renderer.js');
       });
+
+      it('sets bidResponse.ttlBuffer from adUnit.ttlBuffer', () => {
+        adUnits[0].ttlBuffer = 0;
+        auction.callBids();
+        expect(auction.getBidsReceived()[0].ttlBuffer).to.eql(0);
+      });
     });
 
     describe('when auction timeout is 20', function () {
diff --git a/test/spec/unit/core/targeting_spec.js b/test/spec/unit/core/targeting_spec.js
index 448f1b36e3a..f9fe2e398b0 100644
--- a/test/spec/unit/core/targeting_spec.js
+++ b/test/spec/unit/core/targeting_spec.js
@@ -269,6 +269,40 @@ describe('targeting tests', function () {
     bidCacheFilterFunction = undef;
   });
 
+  describe('isBidNotExpired', () => {
+    let clock;
+    beforeEach(() => {
+      clock = sandbox.useFakeTimers(0);
+    });
+
+    Object.entries({
+      'bid.ttlBuffer': (bid, ttlBuffer) => {
+        bid.ttlBuffer = ttlBuffer
+      },
+      'setConfig({ttlBuffer})': (_, ttlBuffer) => {
+        config.setConfig({ttlBuffer})
+      },
+    }).forEach(([t, setup]) => {
+      describe(`respects ${t}`, () => {
+        [0, 2].forEach(ttlBuffer => {
+          it(`when ttlBuffer is ${ttlBuffer}`, () => {
+            const bid = {
+              responseTimestamp: 0,
+              ttl: 10,
+            }
+            setup(bid, ttlBuffer);
+
+            expect(filters.isBidNotExpired(bid)).to.be.true;
+            clock.tick((bid.ttl - ttlBuffer) * 1000 - 100);
+            expect(filters.isBidNotExpired(bid)).to.be.true;
+            clock.tick(101);
+            expect(filters.isBidNotExpired(bid)).to.be.false;
+          });
+        });
+      });
+    });
+  });
+
   describe('getAllTargeting', function () {
     let amBidsReceivedStub;
     let amGetAdUnitsStub;
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index e83608325d8..b8b82f7ca96 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -1459,7 +1459,7 @@ describe('Unit: Prebid Module', function () {
 
   describe('requestBids', function () {
     let logMessageSpy;
-    let makeRequestsStub;
+    let makeRequestsStub, createAuctionStub;
     let adUnits;
     let clock;
     before(function () {
@@ -1670,6 +1670,16 @@ describe('Unit: Prebid Module', function () {
         })
       })
     })
+
+    it('should transfer ttlBuffer to adUnit.ttlBuffer', () => {
+      $$PREBID_GLOBAL$$.requestBids({
+        ttlBuffer: 123,
+        adUnits: [adUnits[0], {...adUnits[0], ttlBuffer: 0}]
+      });
+      sinon.assert.calledWithMatch(auctionModule.newAuction, {
+        adUnits: sinon.match((units) => units[0].ttlBuffer === 123 && units[1].ttlBuffer === 0)
+      })
+    });
   })
 
   describe('requestBids', function () {

From c39afc8d2aafcb36f88a403003a030e8f153719c Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Fri, 28 Oct 2022 12:49:37 +0000
Subject: [PATCH 390/569] Prebid 7.23.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ec0bebcd2d9..9dc01f50c8b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.23.0-pre",
+  "version": "7.23.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index c5f1b1861a0..7515b1d6248 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.23.0-pre",
+  "version": "7.23.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 3fa7e3701df9dead109526a96140657cbbd14f01 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Fri, 28 Oct 2022 12:49:37 +0000
Subject: [PATCH 391/569] Increment version to 7.24.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9dc01f50c8b..d37403f06e1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.23.0",
+  "version": "7.24.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 7515b1d6248..60586841a53 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.23.0",
+  "version": "7.24.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From efedc7454d1eb352f14db5168df766da34c71f2a Mon Sep 17 00:00:00 2001
From: Samuel Adu <samuel.adu@gmail.com>
Date: Fri, 28 Oct 2022 14:28:46 +0100
Subject: [PATCH 392/569] ConnectId User ID Module: Support Publisher-supplied
 user identifier (#9119)

* ConnectId User ID Module: Support Publisher-supplied user identifier

* Additonal tests for increased coverage

* Linting

* Linting

Co-authored-by: slimkrazy <sam@slimkrazy.com>
---
 modules/connectIdSystem.js                |  59 ++++---
 modules/connectIdSystem.md                |   5 +-
 test/spec/modules/connectIdSystem_spec.js | 180 +++++++++++++++++++++-
 3 files changed, 214 insertions(+), 30 deletions(-)

diff --git a/modules/connectIdSystem.js b/modules/connectIdSystem.js
index 4fad832302f..24ef8ad0af5 100644
--- a/modules/connectIdSystem.js
+++ b/modules/connectIdSystem.js
@@ -15,18 +15,7 @@ const VENDOR_ID = 25;
 const PLACEHOLDER = '__PIXEL_ID__';
 const UPS_ENDPOINT = `https://ups.analytics.yahoo.com/ups/${PLACEHOLDER}/fed`;
 const OVERRIDE_OPT_OUT_KEY = 'connectIdOptOut';
-
-function isEUConsentRequired(consentData) {
-  return !!(consentData && consentData.gdpr && consentData.gdpr.gdprApplies);
-}
-
-function userHasOptedOut() {
-  try {
-    return localStorage.getItem(OVERRIDE_OPT_OUT_KEY) === '1';
-  } catch {
-    return false;
-  }
-}
+const INPUT_PARAM_KEYS = ['pixelId', 'he', 'puid'];
 
 /** @type {Submodule} */
 export const connectIdSubmodule = {
@@ -45,7 +34,7 @@ export const connectIdSubmodule = {
    * @returns {{connectId: string} | undefined}
    */
   decode(value) {
-    if (userHasOptedOut()) {
+    if (connectIdSubmodule.userHasOptedOut()) {
       return undefined;
     }
     return (typeof value === 'object' && value.connectid)
@@ -59,27 +48,29 @@ export const connectIdSubmodule = {
    * @returns {IdResponse|undefined}
    */
   getId(config, consentData) {
-    if (userHasOptedOut()) {
+    if (connectIdSubmodule.userHasOptedOut()) {
       return;
     }
     const params = config.params || {};
-    if (!params || typeof params.he !== 'string' ||
-      (typeof params.pixelId === 'undefined' && typeof params.endpoint === 'undefined')) {
-      logError('The connectId submodule requires the \'he\' and \'pixelId\' parameters to be defined.');
+    if (!params || (typeof params.he !== 'string' && typeof params.puid !== 'string') ||
+        (typeof params.pixelId === 'undefined' && typeof params.endpoint === 'undefined')) {
+      logError('The connectId submodule requires the \'pixelId\' and at least one of the \'he\' ' +
+               'or \'puid\' parameters to be defined.');
       return;
     }
 
     const data = {
       '1p': includes([1, '1', true], params['1p']) ? '1' : '0',
-      he: params.he,
-      gdpr: isEUConsentRequired(consentData) ? '1' : '0',
-      gdpr_consent: isEUConsentRequired(consentData) ? consentData.gdpr.consentString : '',
+      gdpr: connectIdSubmodule.isEUConsentRequired(consentData) ? '1' : '0',
+      gdpr_consent: connectIdSubmodule.isEUConsentRequired(consentData) ? consentData.gdpr.consentString : '',
       us_privacy: consentData && consentData.uspConsent ? consentData.uspConsent : ''
     };
 
-    if (params.pixelId) {
-      data.pixelId = params.pixelId
-    }
+    INPUT_PARAM_KEYS.forEach(key => {
+      if (typeof params[key] != 'undefined') {
+        data[key] = params[key];
+      }
+    });
 
     const resp = function (callback) {
       const callbacks = {
@@ -106,6 +97,28 @@ export const connectIdSubmodule = {
     return {callback: resp};
   },
 
+  /**
+   * Utility function that returns a boolean flag indicating if the opporunity
+   * is subject to GDPR
+   * @returns {Boolean}
+   */
+  isEUConsentRequired(consentData) {
+    return !!(consentData && consentData.gdpr && consentData.gdpr.gdprApplies);
+  },
+
+  /**
+   * Utility function that returns a boolean flag indicating if the user
+   * has opeted out via the Yahoo easy-opt-out mechanism.
+   * @returns {Boolean}
+   */
+  userHasOptedOut() {
+    try {
+      return localStorage.getItem(OVERRIDE_OPT_OUT_KEY) === '1';
+    } catch {
+      return false;
+    }
+  },
+
   /**
    * Return the function used to perform XHR calls.
    * Utilised for each of testing.
diff --git a/modules/connectIdSystem.md b/modules/connectIdSystem.md
index f2153e1b6cb..c671c036b77 100644
--- a/modules/connectIdSystem.md
+++ b/modules/connectIdSystem.md
@@ -29,5 +29,6 @@ The below parameters apply only to the Yahoo ConnectID user ID Module.
 | --- | --- | --- | --- | --- |
 | name | Required | String | ID value for the Yahoo ConnectID module - `"connectId"` | `"connectId"` |
 | params | Required | Object | Data for Yahoo ConnectID initialization. | |
-| params.pixelId | Required | Number | The Yahoo supplied publisher specific pixel Id  | `8976` |
-| params.he | Required | String | The SHA-256 hashed user email address | `"529cb86de31e9547a712d9f380146e98bbd39beec"` |
+| params.pixelId | Required | Number | The Yahoo supplied publisher specific pixel Id.  | `8976` |
+| params.he | Optional | String | The SHA-256 hashed user email address. One of either the `he` parameter or the `puid` parameter must be supplied. | `"529cb86de31e9547a712d9f380146e98bbd39beec"` |
+| params.puid | Optional | String | The publisher-supplied user identifier. One of either the `he` parameter or the `puid` parameter must be supplied. | `"P-975484817"` |
diff --git a/test/spec/modules/connectIdSystem_spec.js b/test/spec/modules/connectIdSystem_spec.js
index fe3cb81c2ea..b2193f350ce 100644
--- a/test/spec/modules/connectIdSystem_spec.js
+++ b/test/spec/modules/connectIdSystem_spec.js
@@ -4,6 +4,7 @@ import {connectIdSubmodule} from 'modules/connectIdSystem.js';
 
 describe('Yahoo ConnectID Submodule', () => {
   const HASHED_EMAIL = '6bda6f2fa268bf0438b5423a9861a2cedaa5dec163c03f743cfe05c08a8397b2';
+  const PUBLISHER_USER_ID = '975484817';
   const PIXEL_ID = '1234';
   const PROD_ENDPOINT = `https://ups.analytics.yahoo.com/ups/${PIXEL_ID}/fed`;
   const OVERRIDE_ENDPOINT = 'https://foo/bar';
@@ -48,26 +49,55 @@ describe('Yahoo ConnectID Submodule', () => {
       return result;
     }
 
-    it('returns undefined if he and pixelId params are not passed', () => {
+    it('returns undefined if he, pixelId and puid params are not passed', () => {
       expect(invokeGetIdAPI({}, consentData)).to.be.undefined;
       expect(ajaxStub.callCount).to.equal(0);
     });
 
     it('returns undefined if the pixelId param is not passed', () => {
       expect(invokeGetIdAPI({
-        he: HASHED_EMAIL
+        he: HASHED_EMAIL,
+        puid: PUBLISHER_USER_ID
       }, consentData)).to.be.undefined;
       expect(ajaxStub.callCount).to.equal(0);
     });
 
-    it('returns undefined if the he param is not passed', () => {
+    it('returns undefined if the pixelId param is passed, but the he and puid param are not passed', () => {
       expect(invokeGetIdAPI({
         pixelId: PIXEL_ID
       }, consentData)).to.be.undefined;
       expect(ajaxStub.callCount).to.equal(0);
     });
 
-    it('returns an object with the callback function if the correct params are passed', () => {
+    it('returns an object with the callback function if the endpoint override param and the he params are passed', () => {
+      let result = invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        endpoint: OVERRIDE_ENDPOINT
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+    });
+
+    it('returns an object with the callback function if the endpoint override param and the puid params are passed', () => {
+      let result = invokeGetIdAPI({
+        puid: PUBLISHER_USER_ID,
+        endpoint: OVERRIDE_ENDPOINT
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+    });
+
+    it('returns an object with the callback function if the endpoint override param and the puid and he params are passed', () => {
+      let result = invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        puid: PUBLISHER_USER_ID,
+        endpoint: OVERRIDE_ENDPOINT
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+    });
+
+    it('returns an object with the callback function if the pixelId and he params are passed', () => {
       let result = invokeGetIdAPI({
         he: HASHED_EMAIL,
         pixelId: PIXEL_ID
@@ -76,6 +106,25 @@ describe('Yahoo ConnectID Submodule', () => {
       expect(result.callback).to.be.a('function');
     });
 
+    it('returns an object with the callback function if the pixelId and puid params are passed', () => {
+      let result = invokeGetIdAPI({
+        puid: PUBLISHER_USER_ID,
+        pixelId: PIXEL_ID
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+    });
+
+    it('returns an object with the callback function if the pixelId, he and puid params are passed', () => {
+      let result = invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        puid: PUBLISHER_USER_ID,
+        pixelId: PIXEL_ID
+      }, consentData);
+      expect(result).to.be.an('object').that.has.all.keys('callback');
+      expect(result.callback).to.be.a('function');
+    });
+
     it('returns an undefined if the Yahoo specific opt-out key is present in local storage', () => {
       localStorage.setItem('connectIdOptOut', '1');
       expect(invokeGetIdAPI({
@@ -96,13 +145,57 @@ describe('Yahoo ConnectID Submodule', () => {
       localStorage.removeItem('connectIdOptOut');
     });
 
-    it('Makes an ajax GET request to the production API endpoint with query params', () => {
+    it('Makes an ajax GET request to the production API endpoint with pixelId and he query params', () => {
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID
+      }, consentData);
+
+      const expectedParams = {
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+        '1p': '0',
+        gdpr: '1',
+        gdpr_consent: consentData.gdpr.consentString,
+        us_privacy: consentData.uspConsent
+      };
+      const requestQueryParams = parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+
+      expect(ajaxStub.firstCall.args[0].indexOf(`${PROD_ENDPOINT}?`)).to.equal(0);
+      expect(requestQueryParams).to.deep.equal(expectedParams);
+      expect(ajaxStub.firstCall.args[3]).to.deep.equal({method: 'GET', withCredentials: true});
+    });
+
+    it('Makes an ajax GET request to the production API endpoint with pixelId and puid query params', () => {
       invokeGetIdAPI({
+        puid: PUBLISHER_USER_ID,
+        pixelId: PIXEL_ID
+      }, consentData);
+
+      const expectedParams = {
+        puid: PUBLISHER_USER_ID,
+        pixelId: PIXEL_ID,
+        '1p': '0',
+        gdpr: '1',
+        gdpr_consent: consentData.gdpr.consentString,
+        us_privacy: consentData.uspConsent
+      };
+      const requestQueryParams = parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+
+      expect(ajaxStub.firstCall.args[0].indexOf(`${PROD_ENDPOINT}?`)).to.equal(0);
+      expect(requestQueryParams).to.deep.equal(expectedParams);
+      expect(ajaxStub.firstCall.args[3]).to.deep.equal({method: 'GET', withCredentials: true});
+    });
+
+    it('Makes an ajax GET request to the production API endpoint with pixelId, puid and he query params', () => {
+      invokeGetIdAPI({
+        puid: PUBLISHER_USER_ID,
         he: HASHED_EMAIL,
         pixelId: PIXEL_ID
       }, consentData);
 
       const expectedParams = {
+        puid: PUBLISHER_USER_ID,
         he: HASHED_EMAIL,
         pixelId: PIXEL_ID,
         '1p': '0',
@@ -185,6 +278,16 @@ describe('Yahoo ConnectID Submodule', () => {
   });
 
   describe('decode()', () => {
+    let userHasOptedOutStub;
+    beforeEach(() => {
+      userHasOptedOutStub = sinon.stub(connectIdSubmodule, 'userHasOptedOut');
+      userHasOptedOutStub.returns(false);
+    });
+
+    afterEach(() => {
+      userHasOptedOutStub.restore()
+    });
+
     const VALID_API_RESPONSES = [{
       key: 'connectid',
       expected: '4567',
@@ -205,5 +308,72 @@ describe('Yahoo ConnectID Submodule', () => {
         expect(connectIdSubmodule.decode(response)).to.be.undefined;
       });
     });
+
+    it('should return undefined if user has utilised the easy opt-out mechanism', () => {
+      userHasOptedOutStub.returns(true);
+      expect(connectIdSubmodule.decode(VALID_API_RESPONSES[0].payload)).to.be.undefined;
+    })
+  });
+
+  describe('getAjaxFn()', () => {
+    it('should return a function', () => {
+      expect(connectIdSubmodule.getAjaxFn()).to.be.a('function');
+    });
+  });
+
+  describe('isEUConsentRequired()', () => {
+    it('should return a function', () => {
+      expect(connectIdSubmodule.isEUConsentRequired).to.be.a('function');
+    });
+
+    it('should be false if consent data is empty', () => {
+      expect(connectIdSubmodule.isEUConsentRequired({})).to.be.false;
+    });
+
+    it('should be false if consent data.gdpr object is empty', () => {
+      expect(connectIdSubmodule.isEUConsentRequired({
+        gdpr: {}
+      })).to.be.false;
+    });
+
+    it('should return false if consent data.gdpr.applies is false', () => {
+      expect(connectIdSubmodule.isEUConsentRequired({
+        gdpr: {
+          gdprApplies: false
+        }
+      })).to.be.false;
+    });
+
+    it('should return true if consent data.gdpr.applies is true', () => {
+      expect(connectIdSubmodule.isEUConsentRequired({
+        gdpr: {
+          gdprApplies: true
+        }
+      })).to.be.true;
+    });
+  });
+
+  describe('userHasOptedOut()', () => {
+    afterEach(() => {
+      localStorage.removeItem('connectIdOptOut');
+    });
+
+    it('should return a function', () => {
+      expect(connectIdSubmodule.userHasOptedOut).to.be.a('function');
+    });
+
+    it('should return false when local storage key has not been set function', () => {
+      expect(connectIdSubmodule.userHasOptedOut()).to.be.false;
+    });
+
+    it('should return true when local storage key has been set to "1"', () => {
+      localStorage.setItem('connectIdOptOut', '1');
+      expect(connectIdSubmodule.userHasOptedOut()).to.be.true;
+    });
+
+    it('should return false when local storage key has not been set to "1"', () => {
+      localStorage.setItem('connectIdOptOut', 'hello');
+      expect(connectIdSubmodule.userHasOptedOut()).to.be.false;
+    });
   });
 });

From 08f61b25ba9892c2fe6f8cce3c69589fe7fcaf8f Mon Sep 17 00:00:00 2001
From: shahinrahbariasl <56240400+shahinrahbariasl@users.noreply.github.com>
Date: Sat, 29 Oct 2022 07:28:32 -0400
Subject: [PATCH 393/569] feat: increase request size limit [PB-1214] (#9168)

feat: increase request size limit [PB-1214]

feat: increase request size limit [PB-1214]

feat: increase request size limit [PB-1214]

feat: increase request size limit [PB-1214]

feat: increase request size limit [PB-1214]

feat: increase request size limit [PB-1214]

feat: increase request size limit [PB-1214]

feat: increase request size limit [PB-1214]

feat: increase request size limit [PB-1214]

Co-authored-by: shahin.rahbariasl <shahin.rahbariasl@indexexchange.com>
---
 modules/ixBidAdapter.js                |  10 ++-
 test/spec/modules/ixBidAdapter_spec.js | 100 +++++++++++++++++++++++++
 2 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 4efed90d147..a8ffc4be721 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -38,7 +38,6 @@ const BANNER_TIME_TO_LIVE = 300;
 const VIDEO_TIME_TO_LIVE = 3600; // 1hr
 const NATIVE_TIME_TO_LIVE = 3600; // Since native can have video, use ttl same as video
 const NET_REVENUE = true;
-const MAX_REQUEST_SIZE = 8000;
 const MAX_REQUEST_LIMIT = 4;
 const OUTSTREAM_MINIMUM_PLAYER_SIZE = [144, 144];
 const PRICE_TO_DOLLAR_FACTOR = {
@@ -586,6 +585,12 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
   let userEids = eidInfo.toSend;
   const pageUrl = deepAccess(bidderRequest, 'refererInfo.page');
 
+  let MAX_REQUEST_SIZE = 8000;
+  // Modify request size limit if its FT is enabeld.
+  if (FEATURE_TOGGLES.isFeatureEnabled('pbjs_use_32kb_size_limit')) {
+    MAX_REQUEST_SIZE = 32000
+  }
+
   // RTI ids will be included in the bid request if the function getIdentityInfo() is loaded
   // and if the data for the partner exist
   if (window.headertag && typeof window.headertag.getIdentityInfo === 'function') {
@@ -642,6 +647,9 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     r.ext.ixdiag.err = cachedErrors;
   }
 
+  // Add number of available imps to ixDiag.
+  r.ext.ixdiag.imps = Object.keys(impressions).length;
+
   // set source.tid to auctionId for outgoing request to Exchange.
   r.source = {
     tid: validBidRequests[0].auctionId,
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index a2698fa2cdc..ec749398019 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -1563,6 +1563,13 @@ describe('IndexexchangeAdapter', function () {
       expect(r.ext.ixdiag.tmax).to.be.undefined
     });
 
+    it('should set ixdiag.imps to number of impressions', function () {
+      const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID)[0];
+      const r = extractPayload(request);
+
+      expect(r.ext.ixdiag.imps).to.equal(1);
+    });
+
     it('should not send information that is not part of openRTB spec v2.5 using ortb2', function () {
       const ortb2 = {
         site: {
@@ -3388,6 +3395,99 @@ describe('IndexexchangeAdapter', function () {
       expect(FEATURE_TOGGLES.isFeatureEnabled('test')).to.be.undefined;
       expect(FEATURE_TOGGLES.featureToggles).to.deep.equal({});
     });
+
+    it('should set request size limit to 32KB when its feature enabled', () => {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      serverResponse.body.ext.features.pbjs_use_32kb_size_limit = {
+        activated: true
+      };
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      bid.bidderRequestId = Array(10000).join('#');
+
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+      spec.buildRequests([bid], {});
+      const lsData = JSON.parse(storage.getDataFromLocalStorage(LOCAL_STORAGE_FEATURE_TOGGLES_KEY));
+      expect(lsData.features.pbjs_use_32kb_size_limit.activated).to.be.true;
+    });
+
+    it('6 ad units should generate only 2 requests if 32kb size limit FT is enabled', function () {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      serverResponse.body.ext.features.pbjs_use_32kb_size_limit = {
+        activated: true
+      };
+      serverResponse.body.ext.features.pbjs_enable_post = {
+        activated: true
+      };
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+
+      const bid1 = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid1.mediaTypes.banner.sizes = LARGE_SET_OF_SIZES;
+      bid1.params.siteId = '121';
+      bid1.adUnitCode = 'div-gpt-1'
+      bid1.transactionId = 'tr1';
+      bid1.bidId = '2f6g5s5e';
+
+      const bid2 = utils.deepClone(bid1);
+      bid2.transactionId = 'tr2';
+
+      const bid3 = utils.deepClone(bid1);
+      bid3.transactionId = 'tr3';
+
+      const bid4 = utils.deepClone(bid1);
+      bid4.transactionId = 'tr4';
+
+      const bid5 = utils.deepClone(bid1);
+      bid5.transactionId = 'tr5';
+
+      const bid6 = utils.deepClone(bid1);
+      bid6.transactionId = 'tr6';
+
+      const requests = spec.buildRequests([bid1, bid2, bid3, bid4, bid5, bid6], DEFAULT_OPTION);
+
+      expect(requests).to.be.an('array');
+      // 32KB size limit causes only 2 requests to get generated.
+      expect(requests).to.have.lengthOf(2);
+      for (let request of requests) {
+        expect(request.method).to.equal('POST');
+      }
+    });
+
+    it('4 ad units should generate only 1 requests if 32kb size limit FT is enabled', function () {
+      sandbox.stub(storage, 'localStorageIsEnabled').returns(true);
+      serverResponse.body.ext.features.pbjs_use_32kb_size_limit = {
+        activated: true
+      };
+      serverResponse.body.ext.features.pbjs_enable_post = {
+        activated: true
+      };
+      FEATURE_TOGGLES.setFeatureToggles(serverResponse);
+
+      const bid1 = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid1.mediaTypes.banner.sizes = LARGE_SET_OF_SIZES;
+      bid1.params.siteId = '121';
+      bid1.adUnitCode = 'div-gpt-1'
+      bid1.transactionId = 'tr1';
+      bid1.bidId = '2f6g5s5e';
+
+      const bid2 = utils.deepClone(bid1);
+      bid2.transactionId = 'tr2';
+
+      const bid3 = utils.deepClone(bid1);
+      bid3.transactionId = 'tr3';
+
+      const bid4 = utils.deepClone(bid1);
+      bid4.transactionId = 'tr4';
+
+      const requests = spec.buildRequests([bid1, bid2, bid3, bid4], DEFAULT_OPTION);
+
+      expect(requests).to.be.an('array');
+      // 32KB size limit causes only 1 requests to get generated.
+      expect(requests).to.have.lengthOf(1);
+      for (let request of requests) {
+        expect(request.method).to.equal('POST');
+      }
+    });
   });
 
   describe('LocalStorage error codes', () => {

From 36e6be20f85707fc5c83b9eaac0a9798506166f5 Mon Sep 17 00:00:00 2001
From: velichkin <alexander.velichkin@mgid.com>
Date: Mon, 31 Oct 2022 10:12:27 +0200
Subject: [PATCH 394/569] Mgid RTD Module : add new RTD module (#9120)

* Mgid RTD provider

* Mgid RTD provider

* Mgid RTD provider. Fix endpoint URL

* Mgid RTD provider. Fix gdprApplies

* Mgid RTD provider. Fix warnings

* Mgid RTD provider. Remove unnecessary script

* Mgid RTD provider. Add module to .submodules.json

* Mgid RTD provider. Changes to .md doc
---
 .../gpt/mgidRtdProvider_example.html          | 143 +++++++
 modules/.submodules.json                      |   1 +
 modules/mgidRtdProvider.js                    | 190 +++++++++
 modules/mgidRtdProvider.md                    |  51 +++
 test/spec/modules/mgidRtdProvider_spec.js     | 366 ++++++++++++++++++
 5 files changed, 751 insertions(+)
 create mode 100644 integrationExamples/gpt/mgidRtdProvider_example.html
 create mode 100644 modules/mgidRtdProvider.js
 create mode 100644 modules/mgidRtdProvider.md
 create mode 100644 test/spec/modules/mgidRtdProvider_spec.js

diff --git a/integrationExamples/gpt/mgidRtdProvider_example.html b/integrationExamples/gpt/mgidRtdProvider_example.html
new file mode 100644
index 00000000000..e3e4f720586
--- /dev/null
+++ b/integrationExamples/gpt/mgidRtdProvider_example.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
+<script>
+      window.googletag = window.googletag || { cmd: [] };
+      googletag.cmd.push(function () {
+        googletag.defineSlot('/46380388/herbeauty_prebid', [[320, 100], [950, 90], [1024, 768], [120, 600], [300, 75], [970, 66], [300, 50], [300, 31], [320, 480], [750, 200], 'fluid', [250, 250], [250, 360], [120, 90], [1, 1], [292, 30], [300, 100], [768, 1024], [88, 31], [200, 200], [300, 600], [300, 1050], [960, 90], [125, 125], [180, 150], [970, 250], [168, 28], [980, 120], [120, 20], [120, 240], [480, 320], [468, 60], [120, 30], [120, 60], [750, 300], [930, 180], [728, 90], [168, 42], [980, 90], [320, 50], [750, 100], [200, 446], [336, 280], [300, 250], [580, 400], [970, 90], [160, 600]], 'div-gpt-ad-1660208650016-0').addService(googletag.pubads());
+        googletag.pubads().enableSingleRequest();
+        googletag.enableServices();
+      });
+    </script>
+<link rel="icon" type="image/png" href="/favicon.png">
+<script src="../../build/dev/prebid.js" async></script>
+<script>
+      var sizes = [
+        [300, 250]
+      ];
+      var PREBID_TIMEOUT = 1000;
+      var FAILSAFE_TIMEOUT = 3000;
+      var adUnits = [{
+        code: '/46380388/herbeauty_prebid',
+        mediaTypes: {
+          banner: {
+            sizes: [[320, 100], [950, 90], [1024, 768], [120, 600], [300, 75], [970, 66], [300, 50], [300, 31], [320, 480], [750, 200], [250, 250], [250, 360], [120, 90], [1, 1], [292, 30], [300, 100], [768, 1024], [88, 31], [200, 200], [300, 600], [300, 1050], [960, 90], [125, 125], [180, 150], [970, 250], [168, 28], [980, 120], [120, 20], [120, 240], [480, 320], [468, 60], [120, 30], [120, 60], [750, 300], [930, 180], [728, 90], [168, 42], [980, 90], [320, 50], [750, 100], [200, 446], [336, 280], [300, 250], [580, 400], [970, 90], [160, 600]]
+          }
+        },
+        bids: [{
+          bidder: 'mgid',
+          params: {
+            accountId: '219'
+          }
+        }]
+      }];
+      // ======== DO NOT EDIT BELOW THIS LINE =========== //
+      var googletag = googletag || {};
+      googletag.cmd = googletag.cmd || [];
+      googletag.cmd.push(function () {
+        googletag.pubads().disableInitialLoad();
+      });
+      var pbjs = pbjs || {};
+      pbjs.que = pbjs.que || [];
+      pbjs.que.push(function () {
+        pbjs.setConfig({ priceGranularity: 'high' })
+        pbjs.setConfig({
+          debug: true,
+          realTimeData: {
+            auctionDelay: 1000,
+            dataProviders: [{
+              name: 'mgid',
+              waitForIt: true,
+              params: {
+                clientSiteId: 1
+              }
+            }]
+          },
+          /*consentManagement: {
+            gdpr: {
+              cmpApi: 'iab',
+              timeout: 8000,
+              defaultGdprScope: true
+            }
+          }*/
+          // static data for consent management is only for test purpose - with this data we didn't get ads at the auction
+          /*consentManagement: {
+            usp: {
+              cmpApi: 'static',
+              consentData: {
+                getUSPData: {
+                  uspString: '1YNY',
+                }
+              }
+            },
+            gdpr: {
+              cmpApi: 'static',
+              consentData: {
+                getTCData: {
+                  tcString: 'COwK6gaOwK6gaFmAAAENAPCAAAAAAAAAAAAAAAAAAAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+                  gdprApplies: true,
+                  purpose: {
+                    consents: {
+                      1: true,
+                      2: true,
+                    },
+                  },
+                  vendor: {
+                    consents: {
+                      358: true,
+                    },
+                  }
+                }
+              }
+            }
+          }*/
+        });
+        pbjs.addAdUnits(adUnits);
+        pbjs.requestBids({
+          bidsBackHandler: initAdserver,
+          timeout: PREBID_TIMEOUT,
+          ortb2: {
+            site: {
+              content: {
+                language: 'en',
+              }
+            }
+          }
+        });
+      });
+
+      function initAdserver() {
+        if (pbjs.initAdserverSet) return;
+        pbjs.initAdserverSet = true;
+        googletag.cmd.push(function () {
+          pbjs.setTargetingForGPTAsync && pbjs.setTargetingForGPTAsync();
+          googletag.pubads().refresh();
+        });
+      }
+
+      // in case PBJS doesn't load
+      setTimeout(function () {
+        initAdserver();
+      }, FAILSAFE_TIMEOUT);
+
+    </script>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width">
+<title>JS Bin</title>
+</head>
+<body>
+
+<h2>Basic Prebid.js Example</h2>
+<h5>Div-1</h5>
+
+<div id='div-gpt-ad-1660208650016-0' style='min-width: 88px; min-height: 20px;'>
+<script>
+      googletag.cmd.push(function () {
+        googletag.display('div-gpt-ad-1660208650016-0');
+      });
+    </script>
+</div>
+
+</body>
+</html>
diff --git a/modules/.submodules.json b/modules/.submodules.json
index e4d09b8c9df..aad778be67b 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -64,6 +64,7 @@
       "iasRtdProvider",
       "jwplayerRtdProvider",
       "medianetRtdProvider",
+      "mgidRtdProvider",
       "oneKeyRtdProvider",
       "optimeraRtdProvider",
       "permutiveRtdProvider",
diff --git a/modules/mgidRtdProvider.js b/modules/mgidRtdProvider.js
new file mode 100644
index 00000000000..f30f14ea528
--- /dev/null
+++ b/modules/mgidRtdProvider.js
@@ -0,0 +1,190 @@
+import { submodule } from '../src/hook.js';
+import {ajax} from '../src/ajax.js';
+import {deepAccess, logError, logInfo, mergeDeep} from '../src/utils.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'mgid';
+const MGID_RTD_API_URL = 'https://servicer.mgid.com/sda';
+const MGUID_LOCAL_STORAGE_KEY = 'mguid';
+const ORTB2_NAME = 'www.mgid.com'
+
+const GVLID = 358;
+/** @type {?Object} */
+export const storage = getStorageManager({
+  gvlid: GVLID,
+  moduleName: SUBMODULE_NAME
+});
+
+function init(moduleConfig) {
+  if (!moduleConfig?.params?.clientSiteId) {
+    logError('Mgid clientSiteId is not set!');
+    return false;
+  }
+  return true;
+}
+
+function getBidRequestData(reqBidsConfigObj, onDone, moduleConfig, userConsent) {
+  let mguid;
+  try {
+    mguid = storage.getDataFromLocalStorage(MGUID_LOCAL_STORAGE_KEY);
+  } catch (e) {
+    logInfo(`Can't get mguid from localstorage`);
+  }
+
+  const params = [
+    {
+      name: 'gdprApplies',
+      data: typeof userConsent?.gdpr?.gdprApplies !== 'undefined' ? userConsent?.gdpr?.gdprApplies + '' : undefined,
+    },
+    {
+      name: 'consentData',
+      data: userConsent?.gdpr?.consentString,
+    },
+    {
+      name: 'uspString',
+      data: userConsent?.usp,
+    },
+    {
+      name: 'cxurl',
+      data: encodeURIComponent(getContextUrl()),
+    },
+    {
+      name: 'muid',
+      data: mguid,
+    },
+    {
+      name: 'clientSiteId',
+      data: moduleConfig?.params?.clientSiteId,
+    },
+    {
+      name: 'cxlang',
+      data: deepAccess(reqBidsConfigObj.ortb2Fragments.global, 'site.content.language'),
+    },
+  ];
+
+  const url = MGID_RTD_API_URL + '?' + params.filter((p) => p.data).map((p) => p.name + '=' + p.data).join('&');
+
+  let isDone = false;
+
+  ajax(url, {
+    success: (response, req) => {
+      if (req.status === 200) {
+        try {
+          const data = JSON.parse(response);
+          const ortb2 = reqBidsConfigObj?.ortb2Fragments?.global || {};
+
+          mergeDeep(ortb2, getDataForMerge(data));
+
+          if (data?.muid) {
+            try {
+              mguid = storage.setDataInLocalStorage(MGUID_LOCAL_STORAGE_KEY, data.muid);
+            } catch (e) {
+              logInfo(`Can't set mguid to localstorage`);
+            }
+          }
+
+          onDone();
+          isDone = true;
+        } catch (e) {
+          onDone();
+          isDone = true;
+
+          logError('Unable to parse Mgid RTD data', e);
+        }
+      } else {
+        onDone();
+        isDone = true;
+
+        logError('Mgid RTD wrong response status');
+      }
+    },
+    error: () => {
+      onDone();
+      isDone = true;
+
+      logError('Unable to get Mgid RTD data');
+    }
+  },
+  null, {
+    method: 'GET',
+    withCredentials: false,
+  });
+
+  setTimeout(function () {
+    if (!isDone) {
+      onDone();
+      logInfo('Mgid RTD timeout');
+      isDone = true;
+    }
+  }, moduleConfig.params.timeout || 1000);
+}
+
+function getContextUrl() {
+  const refererInfo = getRefererInfo();
+
+  let resultUrl = refererInfo.canonicalUrl || refererInfo.topmostLocation;
+
+  const metaElements = document.getElementsByTagName('meta');
+  for (let i = 0; i < metaElements.length; i++) {
+    if (metaElements[i].getAttribute('property') === 'og:url') {
+      resultUrl = metaElements[i].content;
+    }
+  }
+
+  return resultUrl;
+}
+
+function getDataForMerge(responseData) {
+  let siteData = {
+    name: ORTB2_NAME
+  };
+  let userData = {
+    name: ORTB2_NAME
+  };
+
+  if (responseData.siteSegments) {
+    siteData.segment = responseData.siteSegments.map((segmentId) => ({ id: segmentId }));
+  }
+  if (responseData.siteSegtax) {
+    siteData.ext = {
+      segtax: responseData.siteSegtax
+    }
+  }
+
+  if (responseData.userSegments) {
+    userData.segment = responseData.userSegments.map((segmentId) => ({ id: segmentId }));
+  }
+  if (responseData.userSegtax) {
+    userData.ext = {
+      segtax: responseData.userSegtax
+    }
+  }
+
+  let result = {};
+  if (siteData.segment || siteData.ext) {
+    result.site = {
+      content: {
+        data: [siteData],
+      }
+    }
+  }
+
+  if (userData.segment || userData.ext) {
+    result.user = {
+      data: [userData],
+    }
+  }
+
+  return result;
+}
+
+/** @type {RtdSubmodule} */
+export const mgidSubmodule = {
+  name: SUBMODULE_NAME,
+  init: init,
+  getBidRequestData: getBidRequestData,
+};
+
+submodule(MODULE_NAME, mgidSubmodule);
diff --git a/modules/mgidRtdProvider.md b/modules/mgidRtdProvider.md
new file mode 100644
index 00000000000..58d4564e14e
--- /dev/null
+++ b/modules/mgidRtdProvider.md
@@ -0,0 +1,51 @@
+# Overview
+
+```
+Module Name: Mgid RTD Provider
+Module Type: RTD Provider
+Maintainer: prebid@mgid.com
+```
+
+# Description
+
+Mgid RTD module allows you to enrich bid data with contextual and audience signals, based on IAB taxonomies.
+
+## Configuration
+
+This module is configured as part of the `realTimeData.dataProviders` object.
+
+{: .table .table-bordered .table-striped }
+| Name       | Scope    | Description                            | Example       | Type     |
+|------------|----------|----------------------------------------|---------------|----------|
+| `name `     | required | Real time data module name | `'mgid'`   | `string` |
+| `params`      | required |  | | `Object` |
+| `params.clientSiteId`      | required | The client site id provided by Mgid. | `'123456'` | `string` |
+| `params.timeout`      | optional | Maximum amount of milliseconds allowed for module to finish working | `1000` | `number` |
+
+#### Example
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: 'mgid',
+            params: {
+              clientSiteId: '123456'
+            }
+        }]
+    }
+});
+```
+
+## Integration
+To install the module, follow these instructions:
+
+#### Step 1: Prepare the base Prebid file
+
+- Option 1: Use Prebid [Download](/download.html) page to build the prebid package. Ensure that you do check *Mgid Realtime Module* module
+
+- Option 2: From the command line, run `gulp build --modules=mgidRtdProvider,...`
+
+#### Step 2: Set configuration
+
+Enable Mgid Real Time Module using `pbjs.setConfig`. Example is provided in Configuration section.
diff --git a/test/spec/modules/mgidRtdProvider_spec.js b/test/spec/modules/mgidRtdProvider_spec.js
new file mode 100644
index 00000000000..4f70b4d8b7c
--- /dev/null
+++ b/test/spec/modules/mgidRtdProvider_spec.js
@@ -0,0 +1,366 @@
+import { mgidSubmodule, storage } from '../../../modules/mgidRtdProvider.js';
+import {expect} from 'chai';
+import * as refererDetection from '../../../src/refererDetection';
+
+describe('Mgid RTD submodule', () => {
+  let server;
+  let clock;
+  let getRefererInfoStub;
+  let getDataFromLocalStorageStub;
+
+  beforeEach(() => {
+    server = sinon.fakeServer.create();
+
+    clock = sinon.useFakeTimers();
+
+    getRefererInfoStub = sinon.stub(refererDetection, 'getRefererInfo');
+    getRefererInfoStub.returns({
+      canonicalUrl: 'https://www.test.com/abc'
+    });
+
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').returns('qwerty654321');
+  });
+
+  afterEach(() => {
+    server.restore();
+    clock.restore();
+    getRefererInfoStub.restore();
+    getDataFromLocalStorageStub.restore();
+  });
+
+  it('init is successfull, when clientSiteId is defined', () => {
+    expect(mgidSubmodule.init({params: {clientSiteId: 123}})).to.be.true;
+  });
+
+  it('init is unsuccessfull, when clientSiteId is not defined', () => {
+    expect(mgidSubmodule.init({})).to.be.false;
+  });
+
+  it('getBidRequestData send all params to our endpoint and succesfully modifies ortb2', () => {
+    const responseObj = {
+      userSegments: ['100', '200'],
+      userSegtax: 5,
+      siteSegments: ['300', '400'],
+      siteSegtax: 7,
+      muid: 'qwerty654321',
+    };
+
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {
+          site: {
+            content: {
+              language: 'en',
+            }
+          }
+        },
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {
+        gdpr: {
+          gdprApplies: true,
+          consentString: 'testConsent',
+        },
+        usp: '1YYY',
+      }
+    );
+
+    server.requests[0].respond(
+      200,
+      {'Content-Type': 'application/json'},
+      JSON.stringify(responseObj)
+    );
+
+    const requestUrl = new URL(server.requests[0].url);
+    expect(requestUrl.host).to.be.eq('servicer.mgid.com');
+    expect(requestUrl.searchParams.get('gdprApplies')).to.be.eq('true');
+    expect(requestUrl.searchParams.get('consentData')).to.be.eq('testConsent');
+    expect(requestUrl.searchParams.get('uspString')).to.be.eq('1YYY');
+    expect(requestUrl.searchParams.get('muid')).to.be.eq('qwerty654321');
+    expect(requestUrl.searchParams.get('clientSiteId')).to.be.eq('123');
+    expect(requestUrl.searchParams.get('cxurl')).to.be.eq('https://www.test.com/abc');
+    expect(requestUrl.searchParams.get('cxlang')).to.be.eq('en');
+
+    assert.deepInclude(
+      reqBidsConfigObj.ortb2Fragments.global,
+      {
+        site: {
+          content: {
+            language: 'en',
+            data: [
+              {
+                name: 'www.mgid.com',
+                ext: {
+                  segtax: 7
+                },
+                segment: [
+                  { id: '300' },
+                  { id: '400' },
+                ]
+              }
+            ],
+          }
+        },
+        user: {
+          data: [
+            {
+              name: 'www.mgid.com',
+              ext: {
+                segtax: 5
+              },
+              segment: [
+                { id: '100' },
+                { id: '200' },
+              ]
+            }
+          ],
+        },
+      });
+  });
+
+  it('getBidRequestData doesn\'t send params (consent and cxlang), if we haven\'t received them', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {}
+    );
+
+    server.requests[0].respond(
+      200,
+      {'Content-Type': 'application/json'},
+      JSON.stringify({})
+    );
+
+    const requestUrl = new URL(server.requests[0].url);
+    expect(requestUrl.host).to.be.eq('servicer.mgid.com');
+    expect(requestUrl.searchParams.get('gdprApplies')).to.be.null;
+    expect(requestUrl.searchParams.get('consentData')).to.be.null;
+    expect(requestUrl.searchParams.get('uspString')).to.be.null;
+    expect(requestUrl.searchParams.get('muid')).to.be.eq('qwerty654321');
+    expect(requestUrl.searchParams.get('clientSiteId')).to.be.eq('123');
+    expect(requestUrl.searchParams.get('cxurl')).to.be.eq('https://www.test.com/abc');
+    expect(requestUrl.searchParams.get('cxlang')).to.be.null;
+    expect(onDone.calledOnce).to.be.true;
+  });
+
+  it('getBidRequestData send gdprApplies event if it is false', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {
+        gdpr: {
+          gdprApplies: false,
+          consentString: 'testConsent',
+        },
+        usp: '1YYY',
+      }
+    );
+
+    server.requests[0].respond(
+      200,
+      {'Content-Type': 'application/json'},
+      JSON.stringify({})
+    );
+
+    const requestUrl = new URL(server.requests[0].url);
+    expect(requestUrl.host).to.be.eq('servicer.mgid.com');
+    expect(requestUrl.searchParams.get('gdprApplies')).to.be.eq('false');
+    expect(requestUrl.searchParams.get('consentData')).to.be.eq('testConsent');
+    expect(requestUrl.searchParams.get('uspString')).to.be.eq('1YYY');
+    expect(requestUrl.searchParams.get('muid')).to.be.eq('qwerty654321');
+    expect(requestUrl.searchParams.get('clientSiteId')).to.be.eq('123');
+    expect(requestUrl.searchParams.get('cxurl')).to.be.eq('https://www.test.com/abc');
+    expect(requestUrl.searchParams.get('cxlang')).to.be.null;
+    expect(onDone.calledOnce).to.be.true;
+  });
+
+  it('getBidRequestData use og:url for cxurl, if it is available', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    let metaStub = sinon.stub(document, 'getElementsByTagName').returns([
+      { getAttribute: () => 'og:test', content: 'fake' },
+      { getAttribute: () => 'og:url', content: 'https://realOgUrl.com/' }
+    ]);
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {}
+    );
+
+    server.requests[0].respond(
+      200,
+      {'Content-Type': 'application/json'},
+      JSON.stringify({})
+    );
+
+    const requestUrl = new URL(server.requests[0].url);
+    expect(requestUrl.searchParams.get('cxurl')).to.be.eq('https://realOgUrl.com/');
+    expect(onDone.calledOnce).to.be.true;
+
+    metaStub.restore();
+  });
+
+  it('getBidRequestData use topMostLocation for cxurl, if nothing else left', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    getRefererInfoStub.returns({
+      topmostLocation: 'https://www.test.com/topMost'
+    });
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {}
+    );
+
+    server.requests[0].respond(
+      200,
+      {'Content-Type': 'application/json'},
+      JSON.stringify({})
+    );
+
+    const requestUrl = new URL(server.requests[0].url);
+    expect(requestUrl.searchParams.get('cxurl')).to.be.eq('https://www.test.com/topMost');
+    expect(onDone.calledOnce).to.be.true;
+  });
+
+  it('getBidRequestData won\'t modify ortb2 if response is broken', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {}
+    );
+
+    server.requests[0].respond(
+      200,
+      {'Content-Type': 'application/json'},
+      '{'
+    );
+
+    assert.deepEqual(reqBidsConfigObj.ortb2Fragments.global, {});
+    expect(onDone.calledOnce).to.be.true;
+  });
+
+  it('getBidRequestData won\'t modify ortb2 if response status is not 200', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {}
+    );
+
+    server.requests[0].respond(
+      204,
+      {'Content-Type': 'application/json'},
+      '{}'
+    );
+
+    assert.deepEqual(reqBidsConfigObj.ortb2Fragments.global, {});
+    expect(onDone.calledOnce).to.be.true;
+  });
+
+  it('getBidRequestData won\'t modify ortb2 if response results in error', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123}},
+      {}
+    );
+
+    server.requests[0].respond(
+      500,
+      {'Content-Type': 'application/json'},
+      '{}'
+    );
+
+    assert.deepEqual(reqBidsConfigObj.ortb2Fragments.global, {});
+    expect(onDone.calledOnce).to.be.true;
+  });
+
+  it('getBidRequestData won\'t modify ortb2 if response time hits timeout', () => {
+    let reqBidsConfigObj = {
+      ortb2Fragments: {
+        global: {},
+      }
+    };
+
+    let onDone = sinon.stub();
+
+    mgidSubmodule.getBidRequestData(
+      reqBidsConfigObj,
+      onDone,
+      {params: {clientSiteId: 123, timeout: 500}},
+      {}
+    );
+
+    clock.tick(510);
+
+    assert.deepEqual(reqBidsConfigObj.ortb2Fragments.global, {});
+    expect(onDone.calledOnce).to.be.true;
+  });
+});

From bb791e0653f41845c5fcb32576fd3ec3154b4d20 Mon Sep 17 00:00:00 2001
From: Love Sharma <sharmak.love@gmail.com>
Date: Mon, 31 Oct 2022 08:50:01 -0400
Subject: [PATCH 395/569] added support for media type specific siteIds (#9173)

Co-authored-by: Love Sharma <love.sharma@indexexchange.com>
---
 modules/ixBidAdapter.js                |  27 +++++--
 test/spec/modules/ixBidAdapter_spec.js | 103 +++++++++++++++++++++++++
 2 files changed, 124 insertions(+), 6 deletions(-)

diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index a8ffc4be721..27e6d0aee02 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -158,7 +158,7 @@ const MEDIA_TYPES = {
  * @return {object}     A impression object that will be sent to ad server.
  */
 function bidToBannerImp(bid) {
-  const imp = bidToImp(bid);
+  const imp = bidToImp(bid, BANNER);
   imp.banner = {};
   const impSize = deepAccess(bid, 'params.size');
   if (impSize) {
@@ -180,7 +180,7 @@ function bidToBannerImp(bid) {
  * @return {object}     A impression object that will be sent to ad server.
  */
 function bidToVideoImp(bid) {
-  const imp = bidToImp(bid);
+  const imp = bidToImp(bid, VIDEO);
   const videoAdUnitRef = deepAccess(bid, 'mediaTypes.video');
   const videoParamRef = deepAccess(bid, 'params.video');
   const videoParamErrors = checkVideoParams(videoAdUnitRef, videoParamRef);
@@ -248,7 +248,7 @@ function bidToVideoImp(bid) {
  * @return {object}     A impression object that will be sent to ad server.
  */
 function bidToNativeImp(bid) {
-  const imp = bidToImp(bid);
+  const imp = bidToImp(bid, NATIVE);
 
   const request = bid.nativeOrtbRequest
   request.eventtrackers = [{
@@ -275,13 +275,28 @@ function bidToNativeImp(bid) {
  * @param {object} bid   PBJS bid object
  * @returns {object}     IX impression object
  */
-function bidToImp(bid) {
+function bidToImp(bid, mediaType) {
   const imp = {};
 
   imp.id = bid.bidId;
 
   imp.ext = {};
-  imp.ext.siteID = bid.params.siteId.toString();
+
+  if (deepAccess(bid, `params.${mediaType}.siteId`) && !isNaN(Number(bid.params[mediaType].siteId))) {
+    switch (mediaType) {
+      case BANNER:
+        imp.ext.siteID = bid.params.banner.siteId.toString();
+        break;
+      case VIDEO:
+        imp.ext.siteID = bid.params.video.siteId.toString();
+        break;
+      case NATIVE:
+        imp.ext.siteID = bid.params.native.siteId.toString();
+        break;
+    }
+  } else {
+    imp.ext.siteID = bid.params.siteId.toString();
+  }
 
   // populate imp level sid
   if (bid.params.hasOwnProperty('id') && (typeof bid.params.id === 'string' || typeof bid.params.id === 'number')) {
@@ -1426,7 +1441,7 @@ export const spec = {
 
     // Step 1: Create impresssions from IX params
     validBidRequests.forEach((validBidRequest) => {
-      const adUnitMediaTypes = Object.keys(deepAccess(validBidRequest, 'mediaTypes', {}))
+      const adUnitMediaTypes = Object.keys(deepAccess(validBidRequest, 'mediaTypes', {}));
 
       for (const type in adUnitMediaTypes) {
         switch (adUnitMediaTypes[type]) {
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index ec749398019..0de300e4a32 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -402,6 +402,78 @@ describe('IndexexchangeAdapter', function () {
     }
   ];
 
+  const DEFAULT_MULTIFORMAT_VALID_BID = [
+    {
+      bidder: 'ix',
+      params: {
+        tagId: '123',
+        siteId: '456',
+        video: {
+          siteId: '1111'
+        },
+        banner: {
+          siteId: '2222'
+        },
+        native: {
+          siteId: '3333'
+        },
+        size: [300, 250]
+      },
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+          playerSize: [[300, 250]],
+          skippable: false,
+          mimes: [
+            'video/mp4',
+            'video/webm'
+          ],
+          minduration: 0,
+          maxduration: 60,
+          protocols: [1]
+        },
+        banner: {
+          sizes: [[300, 250], [300, 600]]
+        },
+        native: {
+          icon: {
+            required: false
+          },
+          title: {
+            len: 25,
+            required: true
+          },
+          body: {
+            required: true
+          },
+          image: {
+            required: true
+          },
+          sponsoredBy: {
+            required: true
+          }
+        }
+      },
+      ortb2Imp: {
+        ext: {
+          tid: '173f49a8-7549-4218-a23c-e7ba59b47230',
+          data: {
+            pbadslot: 'div-gpt-ad-1460505748562-0'
+          }
+        }
+      },
+      nativeOrtbRequest: {
+        assets: [{id: 0, required: 0, img: {type: 1}}, {id: 1, required: 1, title: {len: 140}}, {id: 2, required: 1, data: {type: 2}}, {id: 3, required: 1, img: {type: 3}}, {id: 4, required: false, video: {mimes: ['video/mp4', 'video/webm'], minduration: 0, maxduration: 120, protocols: [2, 3, 5, 6]}}]
+      },
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '273f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
   const DEFAULT_NATIVE_VALID_BID = [
     {
       bidder: 'ix',
@@ -2685,6 +2757,37 @@ describe('IndexexchangeAdapter', function () {
         expect(diagObj.adunitcode).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].adUnitCode)
       });
     });
+
+    describe('siteId overrides', function () {
+      it('should use siteId override', function () {
+        const validBids = DEFAULT_MULTIFORMAT_VALID_BID;
+        const request = spec.buildRequests(validBids, {});
+        const bannerImps = request[0].data.imp[0];
+        const videoImps = request[1].data.imp[0];
+        const nativeImps = request[2].data.imp[0];
+        expect(videoImps.ext.siteID).to.equal('1111');
+        bannerImps.banner.format.map(({ ext }) => {
+          expect(ext.siteID).to.equal('2222');
+        });
+        expect(nativeImps.ext.siteID).to.equal('3333');
+      });
+
+      it('should use default siteId if overrides are not provided', function () {
+        const validBids = DEFAULT_MULTIFORMAT_VALID_BID;
+        delete validBids[0].params.banner;
+        delete validBids[0].params.video;
+        delete validBids[0].params.native;
+        const request = spec.buildRequests(validBids, {});
+        const bannerImps = request[0].data.imp[0];
+        const videoImps = request[1].data.imp[0];
+        const nativeImps = request[2].data.imp[0];
+        expect(videoImps.ext.siteID).to.equal('456');
+        bannerImps.banner.format.map(({ ext }) => {
+          expect(ext.siteID).to.equal('456');
+        });
+        expect(nativeImps.ext.siteID).to.equal('456');
+      });
+    });
   });
 
   describe('interpretResponse', function () {

From d08baa3f4a5cfdb62fc4386695c682203589daf4 Mon Sep 17 00:00:00 2001
From: Fatih Kaya <fatih.kaya.84@gmail.com>
Date: Mon, 31 Oct 2022 17:45:31 +0300
Subject: [PATCH 396/569] Admatic Bid Adapter: initial adapter release (#9133)

* Admatic Bidder Adaptor

* Update admaticBidAdapter.md

* Update admaticBidAdapter.md
---
 modules/admaticBidAdapter.js                | 147 ++++++++++++++++++++
 modules/admaticBidAdapter.md                |  48 +++++++
 src/adloader.js                             |   1 +
 test/spec/modules/admaticBidAdapter_spec.js |  46 ++++++
 4 files changed, 242 insertions(+)
 create mode 100644 modules/admaticBidAdapter.js
 create mode 100644 modules/admaticBidAdapter.md
 create mode 100644 test/spec/modules/admaticBidAdapter_spec.js

diff --git a/modules/admaticBidAdapter.js b/modules/admaticBidAdapter.js
new file mode 100644
index 00000000000..039f27e5de0
--- /dev/null
+++ b/modules/admaticBidAdapter.js
@@ -0,0 +1,147 @@
+import { getValue, logError, deepAccess, getBidIdParameter, isArray } from '../src/utils.js';
+import { loadExternalScript } from '../src/adloader.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+
+const ENDPOINT_URL = 'https://layer.serve.admatic.com.tr/pb';
+const SYNC_URL = 'https://cdn.serve.admatic.com.tr/showad/sync.js';
+const BIDDER_CODE = 'admatic';
+
+export const spec = {
+  code: 'admatic',
+  supportedMediaTypes: ['video', 'banner'],
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function(bid) {
+    let isValid = false;
+    if (typeof bid.params !== 'undefined') {
+      let isValidNetworkId = _validateId(getValue(bid.params, 'networkId'));
+      isValid = isValidNetworkId;// && isValidTypeId;
+    }
+
+    if (!isValid) {
+      logError('AdMatic networkId parameters are required. Bid aborted.');
+    }
+    return isValid;
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} an array of bids
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const bids = validBidRequests.map(buildRequestObject);
+    const networkId = getValue(validBidRequests[0].params, 'networkId');
+    const currency = getValue(validBidRequests[0].params, 'currency') || 'TRY';
+
+    setTimeout(() => {
+      loadExternalScript(SYNC_URL, BIDDER_CODE);
+    }, bidderRequest.timeout);
+
+    const payload = {
+      'user': {
+        'ua': navigator.userAgent
+      },
+      'blacklist': [],
+      'site': {
+        'page': location.href,
+        'ref': location.origin,
+        'publisher': {
+          'name': location.hostname,
+          'publisherId': networkId
+        }
+      },
+      imp: bids,
+      ext: {
+        'cur': currency,
+        'type': 'admatic'
+      }
+    };
+
+    const payloadString = JSON.stringify(payload);
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: payloadString,
+      options: {
+        contentType: 'application/json'
+      }
+    };
+  },
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {*} serverResponse A successful response from the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: (response, request) => {
+    const body = response.body || response;
+    const bidResponses = [];
+    if (body.data.length > 0) {
+      body.data.forEach(function (bid) {
+        const resbid = {
+          requestId: bid.id,
+          cpm: bid.price,
+          width: bid.width,
+          height: bid.height,
+          currency: body.cur,
+          netRevenue: true,
+          ad: bid.party_tag,
+          creativeId: bid.creative_id,
+          meta: {
+            advertiserDomains: bid && bid.adomain ? bid.adomain : []
+          },
+          ttl: 360,
+          bidder: 'admatic',
+          timeToRespond: 1,
+          requestTimestamp: 1
+        };
+        bidResponses.push(resbid);
+      });
+    };
+    return bidResponses;
+  }
+};
+
+function buildRequestObject(bid) {
+  const reqObj = {};
+  reqObj.size = getSizes(bid);
+  reqObj.id = getBidIdParameter('bidId', bid);
+  reqObj.floor = getValue(bid.params, 'floor') || 0.01;
+  return reqObj;
+}
+
+function getSizes(bid) {
+  return concatSizes(bid);
+}
+
+function concatSizes(bid) {
+  let playerSize = deepAccess(bid, 'mediaTypes.video.playerSize');
+  let videoSizes = deepAccess(bid, 'mediaTypes.video.sizes');
+  let bannerSizes = deepAccess(bid, 'mediaTypes.banner.sizes');
+
+  if (isArray(bannerSizes) || isArray(playerSize) || isArray(videoSizes)) {
+    let mediaTypesSizes = [bannerSizes, videoSizes, playerSize];
+    return mediaTypesSizes
+      .reduce(function(acc, currSize) {
+        if (isArray(currSize)) {
+          if (isArray(currSize[0])) {
+            currSize.forEach(function (childSize) {
+              acc.push({ w: childSize[0], h: childSize[1] });
+            })
+          }
+        }
+        return acc;
+      }, []);
+  }
+}
+
+function _validateId(id) {
+  return (parseInt(id) > 0);
+}
+
+registerBidder(spec);
diff --git a/modules/admaticBidAdapter.md b/modules/admaticBidAdapter.md
new file mode 100644
index 00000000000..de84998d0af
--- /dev/null
+++ b/modules/admaticBidAdapter.md
@@ -0,0 +1,48 @@
+# Overview
+
+**Module Name**: Admatic Bidder Adapter  
+**Module Type**: Bidder Adapter  
+**Maintainer**: prebid@admatic.com.tr
+
+# Description
+
+Use `admatic` as bidder.
+
+`networkId` is required and must be integer.
+
+## AdUnits configuration example
+```
+    var adUnits = [{
+      code: 'your-slot_1-div', //use exactly the same code as your slot div id.
+      sizes: [[300, 250]],
+      bids: [{
+          bidder: 'admatic',
+          params: { 
+              networkId: 12345,
+              floor: 0.5
+          }
+      }]
+    },{
+      code: 'your-slot_2-div', //use exactly the same code as your slot div id.
+      sizes: [[600, 800]],
+      bids: [{
+          bidder: 'admatic',
+          params: { 
+              networkId: 12345,
+              floor: 0.5
+          }
+      }]
+    }];
+```
+
+## UserSync example
+
+```
+pbjs.setConfig({
+  userSync: {
+    iframeEnabled: true,
+    syncEnabled: true,
+    syncDelay: 1
+  }
+});
+```
diff --git a/src/adloader.js b/src/adloader.js
index 64408683e9f..330b52b3ed5 100644
--- a/src/adloader.js
+++ b/src/adloader.js
@@ -6,6 +6,7 @@ const _requestCache = new WeakMap();
 const _approvedLoadExternalJSList = [
   'debugging',
   'adloox',
+  'admatic',
   'criteo',
   'outstream',
   'adagio',
diff --git a/test/spec/modules/admaticBidAdapter_spec.js b/test/spec/modules/admaticBidAdapter_spec.js
new file mode 100644
index 00000000000..c7d391cfaca
--- /dev/null
+++ b/test/spec/modules/admaticBidAdapter_spec.js
@@ -0,0 +1,46 @@
+import {expect} from 'chai';
+import {spec, storage} from 'modules/admaticBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+import {getStorageManager} from 'src/storageManager';
+
+const ENDPOINT = 'https://layer.serve.admatic.com.tr/v1';
+
+describe('admaticBidAdapter', () => {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', () => {
+    it('exists and is a function', () => {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function() {
+    let bid = {
+      'bidder': 'admatic',
+      'params': {
+        'networkId': 10433394
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+      'creativeId': 'er2ee'
+    };
+
+    it('should return true when required params found', function() {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function() {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+
+      bid.params = {
+        'networkId': 0
+      };
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+});

From 1f29ef517307c2e32cec165a0138ce42e9115ed9 Mon Sep 17 00:00:00 2001
From: southern-growthcode
 <79725079+southern-growthcode@users.noreply.github.com>
Date: Mon, 31 Oct 2022 10:46:18 -0400
Subject: [PATCH 397/569] GrowthCode ID Module: update the user module to
 expire old user information (#9170)

* Initial check-in ofthe GrowthCode Adaptor

* Growthcode ID System

* Working on test module

* Tests for the growthCode Id System

* Clean up tests for GrowthCode

* Fixed the default values for shareID

* Remove Test HTML Page

* Remove file

* Updated MD file to switch client ID to partner ID

* Will now expire LocalStore data

* Remove Test Files
---
 modules/growthCodeIdSystem.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/growthCodeIdSystem.js b/modules/growthCodeIdSystem.js
index 68fe2c7e925..edd7cd33012 100644
--- a/modules/growthCodeIdSystem.js
+++ b/modules/growthCodeIdSystem.js
@@ -10,7 +10,7 @@ import {ajax} from '../src/ajax.js';
 import { submodule } from '../src/hook.js'
 import { getStorageManager } from '../src/storageManager.js';
 
-const GCID_EXPIRY = 45;
+const GCID_EXPIRY = 7;
 const MODULE_NAME = 'growthCodeId';
 const GC_DATA_KEY = '_gc_data';
 const ENDPOINT_URL = 'https://p2.gcprivacy.com/v1/pb?'
@@ -24,11 +24,15 @@ export const storage = getStorageManager({ gvlid: undefined, moduleName: MODULE_
  */
 export function readData(key) {
   try {
+    let payload
+    if (storage.cookiesAreEnabled()) {
+      payload = tryParse(storage.getCookie(key))
+    }
     if (storage.hasLocalStorage()) {
-      return storage.getDataFromLocalStorage(key);
+      payload = tryParse(storage.getDataFromLocalStorage(key))
     }
-    if (storage.cookiesAreEnabled()) {
-      return storage.getCookie(key);
+    if ((payload.expire_at !== undefined) && (payload.expire_at > (Date.now() / 1000))) {
+      return payload
     }
   } catch (error) {
     logError(error);
@@ -122,7 +126,7 @@ export const growthCodeIdSubmodule = {
     }
 
     const resp = function(callback) {
-      let gcData = tryParse(readData(GC_DATA_KEY));
+      let gcData = readData(GC_DATA_KEY);
       if (gcData) {
         callback(gcData);
       } else {

From a91e0579dc12079df93c31891f96e2cb2ae97f99 Mon Sep 17 00:00:00 2001
From: Jason Lydon <95770514+ftxmoJason@users.noreply.github.com>
Date: Mon, 31 Oct 2022 15:11:40 -0400
Subject: [PATCH 398/569] FtrackId: correcting the eid object schema (#9174)

* JDB-564: fixing the schema returned via pbjs.getUserIdsAsEids()

* JDB-564: WHY U NO LINT HAPPY?

* JDB: EIDS logic cleanup

Co-authored-by: Jason Lydon <jason.lydon@flashtalking.com>
---
 modules/userId/eids.js                   | 13 ++----
 test/spec/modules/eids_spec.js           | 17 ++++---
 test/spec/modules/ftrackIdSystem_spec.js | 56 ++++++++++++++----------
 3 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index e0a076c313f..bae5071e4b2 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -88,13 +88,13 @@ export const USER_IDS_CONFIG = {
     atype: 1,
     getValue: function(data) {
       let value = '';
-      if (data.DeviceID) {
-        value = data.DeviceID.join(',');
+      if (data && data.ext && data.ext.DeviceID) {
+        value = data.ext.DeviceID;
       }
       return value;
     },
     getUidExt: function(data) {
-      return 'DeviceID';
+      return data && data.ext;
     }
   },
 
@@ -418,13 +418,6 @@ export function createEidsArray(bidRequestUserId) {
     if (bidRequestUserId.hasOwnProperty(subModuleKey)) {
       if (subModuleKey === 'pubProvidedId') {
         eids = eids.concat(bidRequestUserId['pubProvidedId']);
-      } else if (subModuleKey === 'ftrackId') {
-        // Schema based on the return value of ftrack decode() method
-        eids.push({
-          atype: 1,
-          ext: bidRequestUserId.ftrackId.ext,
-          id: bidRequestUserId.ftrackId.uid
-        });
       } else if (Array.isArray(bidRequestUserId[subModuleKey])) {
         bidRequestUserId[subModuleKey].forEach((config, index, arr) => {
           const eid = createEidObject(config, subModuleKey);
diff --git a/test/spec/modules/eids_spec.js b/test/spec/modules/eids_spec.js
index ba9210dcb71..78c8f2b3148 100644
--- a/test/spec/modules/eids_spec.js
+++ b/test/spec/modules/eids_spec.js
@@ -461,13 +461,16 @@ describe('eids array generation for known sub-modules', function() {
           ipsum: ''
         }
       })).to.deep.equal([{
-        atype: 1,
-        id: 'test-device-id',
-        ext: {
-          DeviceID: 'test-device-id',
-          SingleDeviceID: 'test-single-device-id',
-          HHID: 'test-household-id'
-        }
+        source: 'flashtalking.com',
+        uids: [{
+          atype: 1,
+          id: 'test-device-id',
+          ext: {
+            DeviceID: 'test-device-id',
+            SingleDeviceID: 'test-single-device-id',
+            HHID: 'test-household-id'
+          }
+        }]
       }]);
     });
   });
diff --git a/test/spec/modules/ftrackIdSystem_spec.js b/test/spec/modules/ftrackIdSystem_spec.js
index 79a11845a0f..ecd610a12fb 100644
--- a/test/spec/modules/ftrackIdSystem_spec.js
+++ b/test/spec/modules/ftrackIdSystem_spec.js
@@ -450,13 +450,16 @@ describe('FTRACK ID System', () => {
         });
 
         expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
-          id: 'device_test_id',
-          atype: 1,
-          ext: {
-            HHID: 'household_test_id',
-            DeviceID: 'device_test_id',
-            SingleDeviceID: 'single_device_test_id'
-          }
+          source: 'flashtalking.com',
+          uids: [{
+            id: 'device_test_id',
+            atype: 1,
+            ext: {
+              HHID: 'household_test_id',
+              DeviceID: 'device_test_id',
+              SingleDeviceID: 'single_device_test_id'
+            }
+          }]
         }]);
       });
 
@@ -481,11 +484,14 @@ describe('FTRACK ID System', () => {
           });
 
           expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
-            id: 'device_test_id',
-            atype: 1,
-            ext: {
-              DeviceID: 'device_test_id'
-            }
+            source: 'flashtalking.com',
+            uids: [{
+              id: 'device_test_id',
+              atype: 1,
+              ext: {
+                DeviceID: 'device_test_id'
+              }
+            }]
           }]);
         });
 
@@ -509,11 +515,14 @@ describe('FTRACK ID System', () => {
           });
 
           expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
-            id: '',
-            atype: 1,
-            ext: {
-              HHID: 'household_test_id'
-            }
+            source: 'flashtalking.com',
+            uids: [{
+              id: '',
+              atype: 1,
+              ext: {
+                HHID: 'household_test_id'
+              }
+            }]
           }]);
         });
 
@@ -537,11 +546,14 @@ describe('FTRACK ID System', () => {
           });
 
           expect(getGlobal().getUserIdsAsEids()).to.deep.equal([{
-            id: '',
-            atype: 1,
-            ext: {
-              SingleDeviceID: 'single_device_test_id'
-            }
+            source: 'flashtalking.com',
+            uids: [{
+              id: '',
+              atype: 1,
+              ext: {
+                SingleDeviceID: 'single_device_test_id'
+              }
+            }]
           }]);
         });
       });

From d71173ad49f204277769d6b746aa272ab715244b Mon Sep 17 00:00:00 2001
From: pm-azhar-mulla <75726247+pm-azhar-mulla@users.noreply.github.com>
Date: Tue, 1 Nov 2022 17:02:27 +0530
Subject: [PATCH 399/569] removed sizes constraint on native assets (#9179)

Co-authored-by: pm-azhar-mulla <azhar@L1119.local>
---
 modules/pubmaticBidAdapter.js | 50 +++++++++++++++--------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index 02198042474..9e2d2bc55f8 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -392,37 +392,29 @@ function _createNativeRequest(params) {
             }
             break;
           case NATIVE_ASSETS.IMAGE.KEY:
-            if (params[key].sizes && params[key].sizes.length > 0) {
-              assetObj = {
-                id: NATIVE_ASSETS.IMAGE.ID,
-                required: params[key].required ? 1 : 0,
-                img: {
-                  type: NATIVE_ASSET_IMAGE_TYPE.IMAGE,
-                  w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
-                  h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
-                  wmin: params[key].wmin || params[key].minimumWidth || (params[key].minsizes ? params[key].minsizes[0] : UNDEFINED),
-                  hmin: params[key].hmin || params[key].minimumHeight || (params[key].minsizes ? params[key].minsizes[1] : UNDEFINED),
-                  mimes: params[key].mimes,
-                  ext: params[key].ext,
-                }
-              };
-            } else {
-              logWarn(LOG_WARN_PREFIX + 'Error: Image sizes is required for native ad: ' + JSON.stringify(params));
-            }
+            assetObj = {
+              id: NATIVE_ASSETS.IMAGE.ID,
+              required: params[key].required ? 1 : 0,
+              img: {
+                type: NATIVE_ASSET_IMAGE_TYPE.IMAGE,
+                w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
+                wmin: params[key].wmin || params[key].minimumWidth || (params[key].minsizes ? params[key].minsizes[0] : UNDEFINED),
+                hmin: params[key].hmin || params[key].minimumHeight || (params[key].minsizes ? params[key].minsizes[1] : UNDEFINED),
+                mimes: params[key].mimes,
+                ext: params[key].ext,
+              }
+            };
             break;
           case NATIVE_ASSETS.ICON.KEY:
-            if (params[key].sizes && params[key].sizes.length > 0) {
-              assetObj = {
-                id: NATIVE_ASSETS.ICON.ID,
-                required: params[key].required ? 1 : 0,
-                img: {
-                  type: NATIVE_ASSET_IMAGE_TYPE.ICON,
-                  w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
-                  h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
-                }
-              };
-            } else {
-              logWarn(LOG_WARN_PREFIX + 'Error: Icon sizes is required for native ad: ' + JSON.stringify(params));
+            assetObj = {
+              id: NATIVE_ASSETS.ICON.ID,
+              required: params[key].required ? 1 : 0,
+              img: {
+                type: NATIVE_ASSET_IMAGE_TYPE.ICON,
+                w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
+              }
             };
             break;
           case NATIVE_ASSETS.VIDEO.KEY:

From bb5ca05a8934d504ab06ba4c37078a8689a2a5f7 Mon Sep 17 00:00:00 2001
From: nllerandi3lift <75995508+nllerandi3lift@users.noreply.github.com>
Date: Tue, 1 Nov 2022 08:22:20 -0400
Subject: [PATCH 400/569] Triplelift Bid Adapter: prioritize topmostLocation
 (#9178)

* prioritize topmostlocation

* adds test for topmostlocation / referrer

* cleanup

* delete param after test
---
 modules/tripleliftBidAdapter.js                |  2 +-
 test/spec/modules/tripleliftBidAdapter_spec.js | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index 7f6ec90c7b9..3fdabcfa6d2 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -29,7 +29,7 @@ export const tripleliftAdapterSpec = {
     tlCall = tryAppendQueryString(tlCall, 'v', '$prebid.version$');
 
     if (bidderRequest && bidderRequest.refererInfo) {
-      let referrer = bidderRequest.refererInfo.page;
+      let referrer = bidderRequest?.refererInfo?.topmostLocation || bidderRequest?.refererInfo?.page;
       tlCall = tryAppendQueryString(tlCall, 'referrer', referrer);
     }
 
diff --git a/test/spec/modules/tripleliftBidAdapter_spec.js b/test/spec/modules/tripleliftBidAdapter_spec.js
index e485ae3998f..4cab8be7e09 100644
--- a/test/spec/modules/tripleliftBidAdapter_spec.js
+++ b/test/spec/modules/tripleliftBidAdapter_spec.js
@@ -979,6 +979,20 @@ describe('triplelift adapter', function () {
       expect(url).to.match(new RegExp('(?:' + prebid.version + ')'))
       expect(url).to.match(/(?:referrer)/);
     });
+    it('should prioritize topmostLocation for referrer', function () {
+      bidderRequest.refererInfo.topmostLocation = 'https://topmostlocation.com?foo=bar'
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      const url = request.url;
+      expect(url).to.match(/(\?|&)referrer=https%3A%2F%2Ftopmostlocation.com%3Ffoo%3Dbar/);
+      delete bidderRequest.refererInfo.topmostLocation
+    });
+    it('should fall back to page for referrer if topmostLocation is unavailable', function () {
+      bidderRequest.refererInfo.topmostLocation = null
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      const url = request.url;
+      expect(url).to.match(/(\?|&)referrer=https%3A%2F%2Fexamplereferer.com/);
+      delete bidderRequest.refererInfo.topmostLocation
+    });
     it('should return us_privacy param when CCPA info is available', function() {
       bidderRequest.uspConsent = '1YYY';
       const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);

From b3e7525b7f233aaa5b77f3668833ea12c92602c4 Mon Sep 17 00:00:00 2001
From: Nick Jacob <nickbjacob@gmail.com>
Date: Tue, 1 Nov 2022 12:26:58 -0400
Subject: [PATCH 401/569] Adding gvlid for amx bid adapter (#9183)

---
 modules/amxBidAdapter.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/amxBidAdapter.js b/modules/amxBidAdapter.js
index d1bd2edeee4..c7bc99b6aa6 100644
--- a/modules/amxBidAdapter.js
+++ b/modules/amxBidAdapter.js
@@ -207,6 +207,7 @@ const isTrue = (boolValue) =>
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 737,
   supportedMediaTypes: [BANNER, VIDEO],
 
   isBidRequestValid(bid) {

From de98cceb7198abbf040d3a777a705e95770fe3d1 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Wed, 2 Nov 2022 06:00:12 -0700
Subject: [PATCH 402/569] Prebid core: fix exception in rejection logic for
 bids that have invalid requestId (#9175)

---
 src/auction.js                   | 2 +-
 test/spec/auctionmanager_spec.js | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/auction.js b/src/auction.js
index 469cb2adcd1..09fb275afdb 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -475,7 +475,7 @@ export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionM
     return handleBidResponse(adUnitCode, bid, (done) => {
       // return a "NO_BID" replacement that the caller can decide to continue with
       // TODO: remove this in v8; see https://github.com/prebid/Prebid.js/issues/8956
-      const noBid = createBid(CONSTANTS.STATUS.NO_BID, bid.getIdentifiers());
+      const noBid = createBid(CONSTANTS.STATUS.NO_BID, bid.getIdentifiers?.());
       Object.assign(noBid, Object.fromEntries(Object.entries(bid).filter(([k]) => !noBid.hasOwnProperty(k) && ![
         'ad',
         'adUrl',
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index a48424b045c..47bdd4a3772 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -1641,6 +1641,15 @@ describe('auctionmanager.js', function () {
         });
       });
 
+      it('should return NO_BID replacement when rejected bid is not a "proper" bid', () => {
+        const noBid = cbs.addBidResponse.reject(AU_CODE, {});
+        sinon.assert.match(noBid, {
+          status: CONSTANTS.BID_STATUS.BID_REJECTED,
+          statusMessage: 'Bid returned empty or error response',
+          cpm: 0,
+        });
+      })
+
       it('addBidResponse hooks should not be able to reject the same bid twice', () => {
         cbs.addBidResponse(AU_CODE, bid);
         expect(auction.addBidRejected.calledOnce).to.be.true;

From b762241b59a4f9850d40f1f249608bddc490d1d7 Mon Sep 17 00:00:00 2001
From: Antonio Gargaro <38767071+AntonioGargaro@users.noreply.github.com>
Date: Wed, 2 Nov 2022 15:52:51 +0000
Subject: [PATCH 403/569] Permutive Rtd Provider: convert rubicon video
 targeting to string (#9181)

* fix(permutiveRtd): convert video targeting to string

* test(permutiveRtd): convert video targeting for Magmite to string

* docs(permutiveRtd): add `overwrites` parameter
---
 modules/permutiveRtdProvider.js               |  3 +-
 modules/permutiveRtdProvider.md               | 37 +++++++++-
 .../spec/modules/permutiveRtdProvider_spec.js | 69 +++++++++++++++++--
 3 files changed, 102 insertions(+), 7 deletions(-)

diff --git a/modules/permutiveRtdProvider.js b/modules/permutiveRtdProvider.js
index a2cd7847564..c11d1c12436 100644
--- a/modules/permutiveRtdProvider.js
+++ b/modules/permutiveRtdProvider.js
@@ -238,7 +238,8 @@ function getDefaultBidderFn (bidder) {
         deepSetValue(bid, 'params.visitor.p_standard', data.ac)
       }
       if (data.rubicon && data.rubicon.length) {
-        deepSetValue(bid, 'params.visitor.permutive', data.rubicon)
+        const rubiconCohorts = deepAccess(bid, 'params.video') ? data.rubicon.map(String) : data.rubicon
+        deepSetValue(bid, 'params.visitor.permutive', rubiconCohorts)
       }
 
       return bid
diff --git a/modules/permutiveRtdProvider.md b/modules/permutiveRtdProvider.md
index f99389f82cc..7d8f073357c 100644
--- a/modules/permutiveRtdProvider.md
+++ b/modules/permutiveRtdProvider.md
@@ -45,17 +45,52 @@ as well as enabling settings for specific use cases mentioned above (e.g. acbidd
 | params.acBidders       | String[] | An array of bidders which should receive AC cohorts.                                          | `[]`    |
 | params.maxSegs         | Integer  | Maximum number of cohorts to be included in either the `permutive` or `p_standard` key-value. | `500`   |
 | params.transformations | Object[] | An array of configurations for ORTB2 user data transformations                                |         |
+| params.overwrites      | Object   | An object specifying functions for custom targeting logic for bidders.                        | -       |
 
 ##### The `transformations` parameter
 
 This array contains configurations for transformations we'll apply to the Permutive object in the ORTB2 `user.data` array. The results of these transformations will be appended to the `user.data` array that's attached to ORTB2 bid requests.
 
-##### Supported transformations
+###### Supported transformations
 
 | Name           | ID  | Config structure                                  | Description                                                                          |
 |----------------|-----|---------------------------------------------------|--------------------------------------------------------------------------------------|
 | IAB taxonomies | iab | { segtax: number, iabIds: Object<number, number>} | Transform segment IDs from Permutive to IAB (note: alpha version, subject to change) |
 
+##### The `overwrites` parameter
+
+The keys for this object should match a bidder (e.g. `rubicon`), which then can define a function to overwrite the customer targeting logic.
+
+```javascript
+{
+  params: {
+    overwrites: {
+      rubicon: function customTargeting(bid, data, acEnabled, utils, defaultFn) {
+        if (defaultFn) {
+          bid = defaultFn(bid, data, acEnabled)
+        }
+        if (data.gam && data.gam.length) {
+          utils.deepSetValue(bid, 'params.visitor.permutive', data.gam)
+        }
+      } 
+    }
+  }
+}
+```
+
+###### `customTargeting` function parameters
+
+| Name         | Description                                                                    |
+|--------------|--------------------------------------------------------------------------------|
+| `bid`        | The bid request object.                                                        |
+| `data`       | Permutive's targeting data read from localStorage.                             |
+| `acEnabled`  | Boolean stating whether Audience Connect is enabled via `acBidders`.           |
+| `utils`      | An object of helpful utilities. `(deepSetValue, deepAccess, isFn, mergeDeep)`. |
+| `defaultFn`  | The default targeting function.                                                |
+
+
+
+
 #### Context
 
 Permutive is not listed as a TCF vendor as all data collection is on behalf of the publisher and based on consent the publisher has received from the user.
diff --git a/test/spec/modules/permutiveRtdProvider_spec.js b/test/spec/modules/permutiveRtdProvider_spec.js
index 9282ec3ac24..3f104ee1e2e 100644
--- a/test/spec/modules/permutiveRtdProvider_spec.js
+++ b/test/spec/modules/permutiveRtdProvider_spec.js
@@ -13,13 +13,13 @@ import { deepAccess, deepSetValue, mergeDeep } from '../../../src/utils.js'
 import { config } from 'src/config.js'
 
 describe('permutiveRtdProvider', function () {
-  before(function () {
+  beforeEach(function () {
     const data = getTargetingData()
     setLocalStorage(data)
     config.resetConfig()
   })
 
-  after(function () {
+  afterEach(function () {
     const data = getTargetingData()
     removeLocalStorage(data)
     config.resetConfig()
@@ -317,6 +317,7 @@ describe('permutiveRtdProvider', function () {
         })
       }
     })
+
     it('sets segment targeting for Magnite', function () {
       const data = transformedTargeting()
       const adUnits = getAdUnits()
@@ -337,6 +338,38 @@ describe('permutiveRtdProvider', function () {
         })
       }
     })
+
+    it('sets segment targeting for Magnite video', function () {
+      const targetingData = getTargetingData()
+      targetingData._prubicons.push(321)
+
+      setLocalStorage(targetingData)
+
+      const data = transformedTargeting(targetingData)
+      const config = getConfig()
+
+      const adUnits = getAdUnits().filter(adUnit => adUnit.mediaTypes.video)
+      expect(adUnits).to.have.lengthOf(1)
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback() {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'rubicon') {
+              expect(
+                deepAccess(params, 'visitor.permutive'),
+                'Should map all targeting values to a string',
+              ).to.eql(data.rubicon.map(String))
+              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac)
+            }
+          })
+        })
+      }
+    })
+
     it('sets segment targeting for Ozone', function () {
       const data = transformedTargeting()
       const adUnits = getAdUnits()
@@ -516,9 +549,7 @@ function getConfig () {
   }
 }
 
-function transformedTargeting () {
-  const data = getTargetingData()
-
+function transformedTargeting (data = getTargetingData()) {
   return {
     ac: [...data._pcrprs, ...data._ppam, ...data._psegs.filter(seg => seg >= 1000000)],
     appnexus: data._papns,
@@ -640,6 +671,34 @@ function getAdUnits () {
           }
         }
       ]
+    },
+    {
+      code: 'myVideoAdUnit',
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [640, 480],
+          mimes: ['video/mp4', 'video/x-ms-wmv'],
+          protocols: [2, 3, 5, 6],
+          api: [2],
+          maxduration: 30,
+          linearity: 1
+        }
+      },
+      bids: [{
+        bidder: 'rubicon',
+        params: {
+          accountId: '9840',
+          siteId: '123564',
+          zoneId: '583584',
+          video: {
+            language: 'en'
+          },
+          visitor: {
+            test_kv: ['true']
+          }
+        }
+      }]
     }
   ]
 }

From 41f3e0542d8485bf962de32e585f56bd81ff00ee Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Wed, 2 Nov 2022 19:05:13 -0700
Subject: [PATCH 404/569] Magnite pass along networkId (#9193)

---
 modules/magniteAnalyticsAdapter.js            |  7 ++++-
 .../modules/magniteAnalyticsAdapter_spec.js   | 26 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/modules/magniteAnalyticsAdapter.js b/modules/magniteAnalyticsAdapter.js
index dba847e1b07..44666178e46 100644
--- a/modules/magniteAnalyticsAdapter.js
+++ b/modules/magniteAnalyticsAdapter.js
@@ -254,9 +254,14 @@ export const parseBidResponse = (bid, previousBidResponse) => {
       const validAdomains = Array.isArray(adomains) && adomains.filter(domain => typeof domain === 'string');
       return validAdomains && validAdomains.length > 0 ? validAdomains.slice(0, 10) : undefined
     },
+    'networkId', () => {
+      const networkId = deepAccess(bid, 'meta.networkId');
+      // if not a valid after this, set to undefined so it gets filtered out
+      return (networkId && networkId.toString()) || undefined;
+    },
     'conversionError', conversionError => conversionError === true || undefined, // only pass if exactly true
     'ogCurrency',
-    'ogPrice'
+    'ogPrice',
   ]);
 }
 
diff --git a/test/spec/modules/magniteAnalyticsAdapter_spec.js b/test/spec/modules/magniteAnalyticsAdapter_spec.js
index eb9ba190e33..240a5aa51a2 100644
--- a/test/spec/modules/magniteAnalyticsAdapter_spec.js
+++ b/test/spec/modules/magniteAnalyticsAdapter_spec.js
@@ -602,6 +602,32 @@ describe('magnite analytics adapter', function () {
         let message = JSON.parse(server.requests[0].requestBody);
         expect(message.auctions[0].adUnits[0].bids[0].bidResponse.adomains).to.deep.equal(test.expected);
       });
+
+      // Network Id tests
+      [
+        { input: 'magnite.com', expected: 'magnite.com' },
+        { input: 12345, expected: '12345' },
+        { input: ['magnite.com', 12345], expected: 'magnite.com,12345' }
+      ].forEach((test, index) => {
+        it(`should handle networkId correctly - #${index + 1}`, function () {
+          events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+          events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+          let bidResponse = utils.deepClone(MOCK.BID_RESPONSE);
+          bidResponse.meta = {
+            networkId: test.input
+          };
+
+          events.emit(BID_RESPONSE, bidResponse);
+          events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+          events.emit(AUCTION_END, MOCK.AUCTION_END);
+          events.emit(BID_WON, MOCK.BID_WON);
+          clock.tick(rubiConf.analyticsBatchTimeout + 1000);
+
+          let message = JSON.parse(server.requests[0].requestBody);
+          expect(message.auctions[0].adUnits[0].bids[0].bidResponse.networkId).to.equal(test.expected);
+        });
+      });
     });
 
     describe('with session handling', function () {

From 454ddc868a77915c1acd5f19174f9e0caf2f4d0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Udi=20Talias=20=E2=9A=9B=EF=B8=8F?= <udi.talias@gmail.com>
Date: Thu, 3 Nov 2022 19:35:16 +0200
Subject: [PATCH 405/569] Kueezrtb Bid Adapter: New Bid Adapter (#9065)

* feat(client): initial adapter

* fix(client): change domain name

* feat(client): updated md file

* feat(module): remove gvlid

* fix(module): added support for getFloor
---
 modules/kueezRtbBidAdapter.js                | 276 +++++++++++++
 modules/kueezRtbBidAdapter.md                |  35 ++
 test/spec/modules/kueezRtbBidAdapter_spec.js | 396 +++++++++++++++++++
 3 files changed, 707 insertions(+)
 create mode 100644 modules/kueezRtbBidAdapter.js
 create mode 100644 modules/kueezRtbBidAdapter.md
 create mode 100644 test/spec/modules/kueezRtbBidAdapter_spec.js

diff --git a/modules/kueezRtbBidAdapter.js b/modules/kueezRtbBidAdapter.js
new file mode 100644
index 00000000000..55545a8092d
--- /dev/null
+++ b/modules/kueezRtbBidAdapter.js
@@ -0,0 +1,276 @@
+import { _each, deepAccess, parseSizesInput, parseUrl, uniques, isFn } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const DEFAULT_SUB_DOMAIN = 'exchange';
+const BIDDER_CODE = 'kueezrtb';
+const BIDDER_VERSION = '1.0.0';
+const CURRENCY = 'USD';
+const TTL_SECONDS = 60 * 5;
+const UNIQUE_DEAL_ID_EXPIRY = 1000 * 60 * 15;
+export const SUPPORTED_ID_SYSTEMS = {
+  'britepoolid': 1,
+  'criteoId': 1,
+  'id5id': 1,
+  'idl_env': 1,
+  'lipb': 1,
+  'netId': 1,
+  'parrableId': 1,
+  'pubcid': 1,
+  'tdid': 1,
+  'pubProvidedId': 1
+};
+const storage = getStorageManager({ gvlid: null, bidderCode: BIDDER_CODE });
+
+function getTopWindowQueryParams() {
+  try {
+    const parsedUrl = parseUrl(window.top.document.URL, { decodeSearchAsString: true });
+    return parsedUrl.search;
+  } catch (e) {
+    return '';
+  }
+}
+
+export function createDomain(subDomain = DEFAULT_SUB_DOMAIN) {
+  return `https://${subDomain}.kueezrtb.com`;
+}
+
+export function extractCID(params) {
+  return params.cId || params.CID || params.cID || params.CId || params.cid || params.ciD || params.Cid || params.CiD;
+}
+
+export function extractPID(params) {
+  return params.pId || params.PID || params.pID || params.PId || params.pid || params.piD || params.Pid || params.PiD;
+}
+
+export function extractSubDomain(params) {
+  return params.subDomain || params.SubDomain || params.Subdomain || params.subdomain || params.SUBDOMAIN || params.subDOMAIN;
+}
+
+function isBidRequestValid(bid) {
+  const params = bid.params || {};
+  return !!(extractCID(params) && extractPID(params));
+}
+
+function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
+  const { params, bidId, userId, adUnitCode, schain } = bid;
+  let { bidFloor, ext } = params;
+  const hashUrl = hashCode(topWindowUrl);
+  const uniqueDealId = getUniqueDealId(hashUrl);
+  const cId = extractCID(params);
+  const pId = extractPID(params);
+  const subDomain = extractSubDomain(params);
+
+  if (isFn(bid.getFloor)) {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*'
+    });
+
+    if (floorInfo.currency === 'USD') {
+      bidFloor = floorInfo.floor;
+    }
+  }
+
+  let data = {
+    url: encodeURIComponent(topWindowUrl),
+    uqs: getTopWindowQueryParams(),
+    cb: Date.now(),
+    bidFloor: bidFloor,
+    bidId: bidId,
+    referrer: bidderRequest.refererInfo.ref,
+    adUnitCode: adUnitCode,
+    publisherId: pId,
+    sizes: sizes,
+    uniqueDealId: uniqueDealId,
+    bidderVersion: BIDDER_VERSION,
+    prebidVersion: '$prebid.version$',
+    res: `${screen.width}x${screen.height}`,
+    schain: schain
+  };
+
+  appendUserIdsToRequestPayload(data, userId);
+
+  if (bidderRequest.gdprConsent) {
+    if (bidderRequest.gdprConsent.consentString) {
+      data.gdprConsent = bidderRequest.gdprConsent.consentString;
+    }
+    if (bidderRequest.gdprConsent.gdprApplies !== undefined) {
+      data.gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
+    }
+  }
+  if (bidderRequest.uspConsent) {
+    data.usPrivacy = bidderRequest.uspConsent;
+  }
+
+  const dto = {
+    method: 'POST',
+    url: `${createDomain(subDomain)}/prebid/multi/${cId}`,
+    data: data
+  };
+
+  _each(ext, (value, key) => {
+    dto.data['ext.' + key] = value;
+  });
+
+  return dto;
+}
+
+function appendUserIdsToRequestPayload(payloadRef, userIds) {
+  let key;
+  _each(userIds, (userId, idSystemProviderName) => {
+    if (SUPPORTED_ID_SYSTEMS[idSystemProviderName]) {
+      key = `uid.${idSystemProviderName}`;
+
+      switch (idSystemProviderName) {
+        case 'digitrustid':
+          payloadRef[key] = deepAccess(userId, 'data.id');
+          break;
+        case 'lipb':
+          payloadRef[key] = userId.lipbid;
+          break;
+        case 'parrableId':
+          payloadRef[key] = userId.eid;
+          break;
+        case 'id5id':
+          payloadRef[key] = userId.uid;
+          break;
+        default:
+          payloadRef[key] = userId;
+      }
+    }
+  });
+}
+
+function buildRequests(validBidRequests, bidderRequest) {
+  const topWindowUrl = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
+  const requests = [];
+  validBidRequests.forEach(validBidRequest => {
+    const sizes = parseSizesInput(validBidRequest.sizes);
+    const request = buildRequest(validBidRequest, topWindowUrl, sizes, bidderRequest);
+    requests.push(request);
+  });
+  return requests;
+}
+
+function interpretResponse(serverResponse, request) {
+  if (!serverResponse || !serverResponse.body) {
+    return [];
+  }
+  const { bidId } = request.data;
+  const { results } = serverResponse.body;
+
+  let output = [];
+
+  try {
+    results.forEach(result => {
+      const { creativeId, ad, price, exp, width, height, currency, advertiserDomains } = result;
+      if (!ad || !price) {
+        return;
+      }
+      output.push({
+        requestId: bidId,
+        cpm: price,
+        width: width,
+        height: height,
+        creativeId: creativeId,
+        currency: currency || CURRENCY,
+        netRevenue: true,
+        ttl: exp || TTL_SECONDS,
+        ad: ad,
+        meta: {
+          advertiserDomains: advertiserDomains || []
+        }
+      })
+    });
+    return output;
+  } catch (e) {
+    return [];
+  }
+}
+
+function getUserSyncs(syncOptions, responses, gdprConsent = {}, uspConsent = '') {
+  let syncs = [];
+  const { iframeEnabled, pixelEnabled } = syncOptions;
+  const { gdprApplies, consentString = '' } = gdprConsent;
+
+  const cidArr = responses.filter(resp => deepAccess(resp, 'body.cid')).map(resp => resp.body.cid).filter(uniques);
+  const params = `?cid=${encodeURIComponent(cidArr.join(','))}&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${encodeURIComponent(consentString || '')}&us_privacy=${encodeURIComponent(uspConsent || '')}`
+  if (iframeEnabled) {
+    syncs.push({
+      type: 'iframe',
+      url: `https://sync.kueezrtb.com/api/sync/iframe/${params}`
+    });
+  }
+  if (pixelEnabled) {
+    syncs.push({
+      type: 'image',
+      url: `https://sync.kueezrtb.com/api/sync/image/${params}`
+    });
+  }
+  return syncs;
+}
+
+export function hashCode(s, prefix = '_') {
+  const l = s.length;
+  let h = 0
+  let i = 0;
+  if (l > 0) {
+    while (i < l) { h = (h << 5) - h + s.charCodeAt(i++) | 0; }
+  }
+  return prefix + h;
+}
+
+export function getUniqueDealId(key, expiry = UNIQUE_DEAL_ID_EXPIRY) {
+  const storageKey = `u_${key}`;
+  const now = Date.now();
+  const data = getStorageItem(storageKey);
+  let uniqueId;
+
+  if (!data || !data.value || now - data.created > expiry) {
+    uniqueId = `${key}_${now.toString()}`;
+    setStorageItem(storageKey, uniqueId);
+  } else {
+    uniqueId = data.value;
+  }
+
+  return uniqueId;
+}
+
+export function getStorageItem(key) {
+  try {
+    return tryParseJSON(storage.getDataFromLocalStorage(key));
+  } catch (e) { }
+
+  return null;
+}
+
+export function setStorageItem(key, value, timestamp) {
+  try {
+    const created = timestamp || Date.now();
+    const data = JSON.stringify({ value, created });
+    storage.setDataInLocalStorage(key, data);
+  } catch (e) { }
+}
+
+export function tryParseJSON(value) {
+  try {
+    return JSON.parse(value);
+  } catch (e) {
+    return value;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: BIDDER_VERSION,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs
+};
+
+registerBidder(spec);
diff --git a/modules/kueezRtbBidAdapter.md b/modules/kueezRtbBidAdapter.md
new file mode 100644
index 00000000000..52d11aa362a
--- /dev/null
+++ b/modules/kueezRtbBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+**Module Name:** Kueez RTB Bidder Adapter
+
+**Module Type:** Bidder Adapter
+
+**Maintainer:** rtb@kueez.com
+
+# Description
+
+Module that connects to Kueez's demand sources.
+ 
+# Test Parameters
+```js
+var adUnits = [
+  {
+    code: 'test-ad',
+    sizes: [[300, 250]],
+    bids: [
+      {
+        bidder: 'kueezrtb',
+        params: {
+          cId: '562524b21b1c1f08117fc7f9',
+          pId: '59ac17c192832d0011283fe3',
+          bidFloor: 0.0001,
+          ext: {
+            param1: 'loremipsum',
+            param2: 'dolorsitamet'
+          }
+        }
+      }
+    ]
+  }
+];
+```
diff --git a/test/spec/modules/kueezRtbBidAdapter_spec.js b/test/spec/modules/kueezRtbBidAdapter_spec.js
new file mode 100644
index 00000000000..f9b2cd41a43
--- /dev/null
+++ b/test/spec/modules/kueezRtbBidAdapter_spec.js
@@ -0,0 +1,396 @@
+import {expect} from 'chai';
+import {
+  spec as adapter,
+  SUPPORTED_ID_SYSTEMS,
+  createDomain,
+  hashCode,
+  extractPID,
+  extractCID,
+  extractSubDomain,
+  getStorageItem,
+  setStorageItem,
+  tryParseJSON,
+  getUniqueDealId,
+} from 'modules/kueezRtbBidAdapter.js';
+import * as utils from 'src/utils.js';
+import {version} from 'package.json';
+import {useFakeTimers} from 'sinon';
+
+const SUB_DOMAIN = 'exchange';
+
+const BID = {
+  'bidId': '2d52001cabd527',
+  'adUnitCode': 'div-gpt-ad-12345-0',
+  'params': {
+    'subDomain': SUB_DOMAIN,
+    'cId': '59db6b3b4ffaa70004f45cdc',
+    'pId': '59ac17c192832d0011283fe3',
+    'bidFloor': 0.1,
+    'ext': {
+      'param1': 'loremipsum',
+      'param2': 'dolorsitamet'
+    }
+  },
+  'placementCode': 'div-gpt-ad-1460505748561-0',
+  'transactionId': 'c881914b-a3b5-4ecf-ad9c-1c2f37c6aabf',
+  'sizes': [[300, 250], [300, 600]],
+  'bidderRequestId': '1fdb5ff1b6eaa7',
+  'requestId': 'b0777d85-d061-450e-9bc7-260dd54bbb7a',
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc'
+};
+
+const BIDDER_REQUEST = {
+  'gdprConsent': {
+    'consentString': 'consent_string',
+    'gdprApplies': true
+  },
+  'uspConsent': 'consent_string',
+  'refererInfo': {
+    'page': 'https://www.greatsite.com',
+    'ref': 'https://www.somereferrer.com'
+  }
+};
+
+const SERVER_RESPONSE = {
+  body: {
+    cid: 'testcid123',
+    results: [{
+      'ad': '<iframe>console.log("hello world")</iframe>',
+      'price': 0.8,
+      'creativeId': '12610997325162499419',
+      'exp': 30,
+      'width': 300,
+      'height': 250,
+      'advertiserDomains': ['securepubads.g.doubleclick.net'],
+      'cookies': [{
+        'src': 'https://sync.com',
+        'type': 'iframe'
+      }, {
+        'src': 'https://sync.com',
+        'type': 'img'
+      }]
+    }]
+  }
+};
+
+const REQUEST = {
+  data: {
+    width: 300,
+    height: 250,
+    bidId: '2d52001cabd527'
+  }
+};
+
+function getTopWindowQueryParams() {
+  try {
+    const parsedUrl = utils.parseUrl(window.top.document.URL, {decodeSearchAsString: true});
+    return parsedUrl.search;
+  } catch (e) {
+    return '';
+  }
+}
+
+describe('KueezRtbBidAdapter', function () {
+  describe('validtae spec', function () {
+    it('exists and is a function', function () {
+      expect(adapter.isBidRequestValid).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.buildRequests).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.interpretResponse).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a function', function () {
+      expect(adapter.getUserSyncs).to.exist.and.to.be.a('function');
+    });
+
+    it('exists and is a string', function () {
+      expect(adapter.code).to.exist.and.to.be.a('string');
+    });
+  });
+
+  describe('validate bid requests', function () {
+    it('should require cId', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          pId: 'pid'
+        }
+      });
+      expect(isValid).to.be.false;
+    });
+
+    it('should require pId', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          cId: 'cid'
+        }
+      });
+      expect(isValid).to.be.false;
+    });
+
+    it('should validate correctly', function () {
+      const isValid = adapter.isBidRequestValid({
+        params: {
+          cId: 'cid',
+          pId: 'pid'
+        }
+      });
+      expect(isValid).to.be.true;
+    });
+  });
+
+  describe('build requests', function () {
+    let sandbox;
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        kueezrtb: {
+          storageAllowed: true
+        }
+      };
+      sandbox = sinon.sandbox.create();
+      sandbox.stub(Date, 'now').returns(1000);
+    });
+
+    it('should build request for each size', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
+      const requests = adapter.buildRequests([BID], BIDDER_REQUEST);
+      expect(requests).to.have.length(1);
+      expect(requests[0]).to.deep.equal({
+        method: 'POST',
+        url: `${createDomain(SUB_DOMAIN)}/prebid/multi/59db6b3b4ffaa70004f45cdc`,
+        data: {
+          gdprConsent: 'consent_string',
+          gdpr: 1,
+          usPrivacy: 'consent_string',
+          sizes: ['300x250', '300x600'],
+          url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
+          cb: 1000,
+          bidFloor: 0.1,
+          bidId: '2d52001cabd527',
+          adUnitCode: 'div-gpt-ad-12345-0',
+          publisherId: '59ac17c192832d0011283fe3',
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
+          bidderVersion: adapter.version,
+          prebidVersion: version,
+          schain: BID.schain,
+          res: `${window.top.screen.width}x${window.top.screen.height}`,
+          uqs: getTopWindowQueryParams(),
+          'ext.param1': 'loremipsum',
+          'ext.param2': 'dolorsitamet',
+        }
+      });
+    });
+
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+      sandbox.restore();
+    });
+  });
+  describe('getUserSyncs', function () {
+    it('should have valid user sync with iframeEnabled', function () {
+      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
+
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://sync.kueezrtb.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
+      }]);
+    });
+
+    it('should have valid user sync with cid on response', function () {
+      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
+      expect(result).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://sync.kueezrtb.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
+      }]);
+    });
+
+    it('should have valid user sync with pixelEnabled', function () {
+      const result = adapter.getUserSyncs({pixelEnabled: true}, [SERVER_RESPONSE]);
+
+      expect(result).to.deep.equal([{
+        'url': 'https://sync.kueezrtb.com/api/sync/image/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy=',
+        'type': 'image'
+      }]);
+    })
+  });
+
+  describe('interpret response', function () {
+    it('should return empty array when there is no response', function () {
+      const responses = adapter.interpretResponse(null);
+      expect(responses).to.be.empty;
+    });
+
+    it('should return empty array when there is no ad', function () {
+      const responses = adapter.interpretResponse({price: 1, ad: ''});
+      expect(responses).to.be.empty;
+    });
+
+    it('should return empty array when there is no price', function () {
+      const responses = adapter.interpretResponse({price: null, ad: 'great ad'});
+      expect(responses).to.be.empty;
+    });
+
+    it('should return an array of interpreted responses', function () {
+      const responses = adapter.interpretResponse(SERVER_RESPONSE, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0]).to.deep.equal({
+        requestId: '2d52001cabd527',
+        cpm: 0.8,
+        width: 300,
+        height: 250,
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 30,
+        ad: '<iframe>console.log("hello world")</iframe>',
+        meta: {
+          advertiserDomains: ['securepubads.g.doubleclick.net']
+        }
+      });
+    });
+
+    it('should take default TTL', function () {
+      const serverResponse = utils.deepClone(SERVER_RESPONSE);
+      delete serverResponse.body.results[0].exp;
+      const responses = adapter.interpretResponse(serverResponse, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0].ttl).to.equal(300);
+    });
+  });
+
+  describe('user id system', function () {
+    Object.keys(SUPPORTED_ID_SYSTEMS).forEach((idSystemProvider) => {
+      const id = Date.now().toString();
+      const bid = utils.deepClone(BID);
+
+      const userId = (function () {
+        switch (idSystemProvider) {
+          case 'lipb':
+            return {lipbid: id};
+          case 'parrableId':
+            return {eid: id};
+          case 'id5id':
+            return {uid: id};
+          default:
+            return id;
+        }
+      })();
+
+      bid.userId = {
+        [idSystemProvider]: userId
+      };
+
+      it(`should include 'uid.${idSystemProvider}' in request params`, function () {
+        const requests = adapter.buildRequests([bid], BIDDER_REQUEST);
+        expect(requests[0].data[`uid.${idSystemProvider}`]).to.equal(id);
+      });
+    });
+  });
+
+  describe('alternate param names extractors', function () {
+    it('should return undefined when param not supported', function () {
+      const cid = extractCID({'c_id': '1'});
+      const pid = extractPID({'p_id': '1'});
+      const subDomain = extractSubDomain({'sub_domain': 'prebid'});
+      expect(cid).to.be.undefined;
+      expect(pid).to.be.undefined;
+      expect(subDomain).to.be.undefined;
+    });
+
+    it('should return value when param supported', function () {
+      const cid = extractCID({'cID': '1'});
+      const pid = extractPID({'Pid': '2'});
+      const subDomain = extractSubDomain({'subDOMAIN': 'prebid'});
+      expect(cid).to.be.equal('1');
+      expect(pid).to.be.equal('2');
+      expect(subDomain).to.be.equal('prebid');
+    });
+  });
+
+  describe('unique deal id', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        kueezrtb: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    const key = 'myKey';
+    let uniqueDealId;
+    beforeEach(() => {
+      uniqueDealId = getUniqueDealId(key, 0);
+    })
+
+    it('should get current unique deal id', function (done) {
+      // waiting some time so `now` will become past
+      setTimeout(() => {
+        const current = getUniqueDealId(key);
+        expect(current).to.be.equal(uniqueDealId);
+        done();
+      }, 200);
+    });
+
+    it('should get new unique deal id on expiration', function (done) {
+      setTimeout(() => {
+        const current = getUniqueDealId(key, 100);
+        expect(current).to.not.be.equal(uniqueDealId);
+        done();
+      }, 200)
+    });
+  });
+
+  describe('storage utils', function () {
+    before(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {
+        kueezrtb: {
+          storageAllowed: true
+        }
+      };
+    });
+    after(function () {
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+    });
+    it('should get value from storage with create param', function () {
+      const now = Date.now();
+      const clock = useFakeTimers({
+        shouldAdvanceTime: true,
+        now
+      });
+      setStorageItem('myKey', 2020);
+      const {value, created} = getStorageItem('myKey');
+      expect(created).to.be.equal(now);
+      expect(value).to.be.equal(2020);
+      expect(typeof value).to.be.equal('number');
+      expect(typeof created).to.be.equal('number');
+      clock.restore();
+    });
+
+    it('should get external stored value', function () {
+      const value = 'superman'
+      window.localStorage.setItem('myExternalKey', value);
+      const item = getStorageItem('myExternalKey');
+      expect(item).to.be.equal(value);
+    });
+
+    it('should parse JSON value', function () {
+      const data = JSON.stringify({event: 'send'});
+      const {event} = tryParseJSON(data);
+      expect(event).to.be.equal('send');
+    });
+
+    it('should get original value on parse fail', function () {
+      const value = 21;
+      const parsed = tryParseJSON(value);
+      expect(typeof parsed).to.be.equal('number');
+      expect(parsed).to.be.equal(value);
+    });
+  });
+});

From f7bba1dfa44e3d19a04fbd377bcb38ac6599a825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Udi=20Talias=20=E2=9A=9B=EF=B8=8F?= <udi.talias@gmail.com>
Date: Thu, 3 Nov 2022 20:13:11 +0200
Subject: [PATCH 406/569] added gvlid code (#9199)

---
 modules/kueezRtbBidAdapter.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/kueezRtbBidAdapter.js b/modules/kueezRtbBidAdapter.js
index 55545a8092d..1ee3b7331cb 100644
--- a/modules/kueezRtbBidAdapter.js
+++ b/modules/kueezRtbBidAdapter.js
@@ -3,6 +3,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
 
+const GVLID = 1165;
 const DEFAULT_SUB_DOMAIN = 'exchange';
 const BIDDER_CODE = 'kueezrtb';
 const BIDDER_VERSION = '1.0.0';
@@ -21,7 +22,7 @@ export const SUPPORTED_ID_SYSTEMS = {
   'tdid': 1,
   'pubProvidedId': 1
 };
-const storage = getStorageManager({ gvlid: null, bidderCode: BIDDER_CODE });
+const storage = getStorageManager({ gvlid: GVLID, bidderCode: BIDDER_CODE });
 
 function getTopWindowQueryParams() {
   try {
@@ -266,6 +267,7 @@ export function tryParseJSON(value) {
 export const spec = {
   code: BIDDER_CODE,
   version: BIDDER_VERSION,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER],
   isBidRequestValid,
   buildRequests,

From 530017f8d293ad7ae651edf238e92c661899680c Mon Sep 17 00:00:00 2001
From: Jason Quaccia <jlquaccia@gmail.com>
Date: Thu, 3 Nov 2022 11:17:25 -0700
Subject: [PATCH 407/569] updated docs for adRenderSucceeded event (#9195)

---
 src/adRendering.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/adRendering.js b/src/adRendering.js
index a645ec77244..0a847d7cc25 100644
--- a/src/adRendering.js
+++ b/src/adRendering.js
@@ -23,7 +23,7 @@ export function emitAdRenderFail({ reason, message, bid, id }) {
 
 /**
  * Emit the AD_RENDER_SUCCEEDED event.
- *
+ * (Note: Invocation of this function indicates that the render function did not generate an error, it does not guarantee that tracking for this event has occurred yet.)
  * @param doc document object that was used to `.write` the ad. Should be `null` if unavailable (e.g. for documents in
  * a cross-origin frame).
  * @param bid bid response object for the ad that was rendered

From 338b9c671f293f07742b647135de3e352d982e5b Mon Sep 17 00:00:00 2001
From: John Ivan Bauzon <johnbauzon@gmail.com>
Date: Fri, 4 Nov 2022 02:19:33 +0800
Subject: [PATCH 408/569] gumgum Bid Adapter: support coppa config (#9192)

* ADJS-1227-add-coppa-flag-to-gumgum-adapter

* added tests for coppa config for gumgumBidAdapter

Co-authored-by: John Bauzon <john.bauzon@gumgum.com>
---
 modules/gumgumBidAdapter.js                |  4 ++++
 test/spec/modules/gumgumBidAdapter_spec.js | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/modules/gumgumBidAdapter.js b/modules/gumgumBidAdapter.js
index fe15602c0c0..93306984ab1 100644
--- a/modules/gumgumBidAdapter.js
+++ b/modules/gumgumBidAdapter.js
@@ -294,6 +294,7 @@ function buildRequests(validBidRequests, bidderRequest) {
   const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
   const uspConsent = bidderRequest && bidderRequest.uspConsent;
   const timeout = config.getConfig('bidderTimeout');
+  const coppa = config.getConfig('coppa') === true ? 1 : 0;
   const topWindowUrl = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.page;
   _each(validBidRequests, bidRequest => {
     const {
@@ -386,6 +387,9 @@ function buildRequests(validBidRequests, bidderRequest) {
     if (uspConsent) {
       data.uspConsent = uspConsent;
     }
+    if (coppa) {
+      data.coppa = coppa;
+    }
     if (schain && schain.nodes) {
       data.schain = _serializeSupplyChainObj(schain);
     }
diff --git a/test/spec/modules/gumgumBidAdapter_spec.js b/test/spec/modules/gumgumBidAdapter_spec.js
index 17fff31f132..a2dacb16b73 100644
--- a/test/spec/modules/gumgumBidAdapter_spec.js
+++ b/test/spec/modules/gumgumBidAdapter_spec.js
@@ -1,5 +1,6 @@
 import { BANNER, VIDEO } from 'src/mediaTypes.js';
 
+import { config } from 'src/config.js';
 import { expect } from 'chai';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { spec } from 'modules/gumgumBidAdapter.js';
@@ -484,6 +485,20 @@ describe('gumgumAdapter', function () {
       const bidRequest = spec.buildRequests(bidRequests, fakeBidRequest)[0];
       expect(bidRequest.data).to.not.include.any.keys('gdprConsent')
     });
+    it('should not set coppa parameter if coppa config is set to false', function () {
+      config.setConfig({
+        coppa: false
+      });
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(bidRequest.data.coppa).to.eq(undefined);
+    });
+    it('should set coppa parameter to 1 if coppa config is set to true', function () {
+      config.setConfig({
+        coppa: true
+      });
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(bidRequest.data.coppa).to.eq(1);
+    });
     it('should add uspConsent parameter if it is present in the bidderRequest', function () {
       const noUspBidRequest = spec.buildRequests(bidRequests)[0];
       const uspConsentObj = { uspConsent: '1YYY' };

From 7a46ed1e9b79224dfa28832b74349984cae9429f Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Thu, 3 Nov 2022 12:40:44 -0600
Subject: [PATCH 409/569] Dependencies : update outdated dependencies and
 automated security alerts (#9172)

* update package-lock

* Fix wdio version

Co-authored-by: Demetrio Girardi <dgirardi@prebid.org>
---
 package-lock.json | 16356 +++++++++++++++++++++++++++++---------------
 package.json      |    14 +-
 2 files changed, 10662 insertions(+), 5708 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d37403f06e1..7567271b07f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "7.23.0-pre",
+      "version": "7.24.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
@@ -26,13 +26,13 @@
       },
       "devDependencies": {
         "@babel/eslint-parser": "^7.16.5",
-        "@wdio/browserstack-service": "^7.16.0",
-        "@wdio/cli": "^7.5.2",
-        "@wdio/concise-reporter": "^7.5.2",
-        "@wdio/local-runner": "^7.5.2",
-        "@wdio/mocha-framework": "^7.5.2",
-        "@wdio/spec-reporter": "^7.19.0",
-        "@wdio/sync": "^7.5.2",
+        "@wdio/browserstack-service": "~7.16.0",
+        "@wdio/cli": "~7.5.2",
+        "@wdio/concise-reporter": "~7.5.2",
+        "@wdio/local-runner": "~7.5.2",
+        "@wdio/mocha-framework": "~7.5.2",
+        "@wdio/spec-reporter": "~7.19.0",
+        "@wdio/sync": "~7.5.2",
         "ajv": "6.12.3",
         "assert": "^2.0.0",
         "babel-loader": "^8.0.5",
@@ -115,11 +115,12 @@
       }
     },
     "node_modules/@ampproject/remapping": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
-      "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.0"
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
       },
       "engines": {
         "node": ">=6.0.0"
@@ -137,28 +138,28 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.0.tgz",
-      "integrity": "sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz",
+      "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.0.tgz",
-      "integrity": "sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ==",
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz",
+      "integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==",
       "dependencies": {
         "@ampproject/remapping": "^2.1.0",
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.0",
-        "@babel/helper-compilation-targets": "^7.19.0",
-        "@babel/helper-module-transforms": "^7.19.0",
-        "@babel/helpers": "^7.19.0",
-        "@babel/parser": "^7.19.0",
+        "@babel/generator": "^7.19.6",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helpers": "^7.19.4",
+        "@babel/parser": "^7.19.6",
         "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0",
+        "@babel/traverse": "^7.19.6",
+        "@babel/types": "^7.19.4",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -174,12 +175,12 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
-      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
+      "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
       "dev": true,
       "dependencies": {
-        "eslint-scope": "^5.1.1",
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
         "eslint-visitor-keys": "^2.1.0",
         "semver": "^6.3.0"
       },
@@ -192,11 +193,11 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
-      "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.1.tgz",
+      "integrity": "sha512-u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg==",
       "dependencies": {
-        "@babel/types": "^7.19.0",
+        "@babel/types": "^7.20.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "jsesc": "^2.5.1"
       },
@@ -204,37 +205,50 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
+      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
-      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
+      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
       "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/helper-explode-assignable-expression": "^7.18.6",
+        "@babel/types": "^7.18.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz",
-      "integrity": "sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA==",
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz",
+      "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==",
       "dependencies": {
-        "@babel/compat-data": "^7.19.0",
+        "@babel/compat-data": "^7.20.0",
         "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.20.2",
+        "browserslist": "^4.21.3",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -245,17 +259,17 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.17.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz",
-      "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-member-expression-to-functions": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7"
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-member-expression-to-functions": "^7.18.9",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/helper-replace-supers": "^7.18.9",
+        "@babel/helper-split-export-declaration": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -265,12 +279,12 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz",
-      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "regexpu-core": "^5.0.1"
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "regexpu-core": "^5.1.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -280,14 +294,12 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
-      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
+      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
+        "@babel/helper-compilation-targets": "^7.17.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "debug": "^4.1.1",
         "lodash.debounce": "^4.0.8",
         "resolve": "^1.14.2",
@@ -306,11 +318,11 @@
       }
     },
     "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
-      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
+      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -340,11 +352,11 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz",
-      "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
+      "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -362,87 +374,91 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
-      "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz",
+      "integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.18.6",
+        "@babel/helper-simple-access": "^7.19.4",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.19.1",
         "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+        "@babel/traverse": "^7.19.6",
+        "@babel/types": "^7.19.4"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
+      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz",
-      "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
+      "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
+      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-wrap-function": "^7.16.8",
-        "@babel/types": "^7.16.8"
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-wrap-function": "^7.18.9",
+        "@babel/types": "^7.18.9"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
-      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
+      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-member-expression-to-functions": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-member-expression-to-functions": "^7.18.9",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/traverse": "^7.19.1",
+        "@babel/types": "^7.19.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
-      "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
+      "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.19.4"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
-      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
+      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
       "dependencies": {
-        "@babel/types": "^7.16.0"
+        "@babel/types": "^7.20.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -460,17 +476,17 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
-      "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==",
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-      "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -484,27 +500,27 @@
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
-      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
+      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
       "dependencies": {
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.8",
-        "@babel/types": "^7.16.8"
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
-      "integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz",
+      "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==",
       "dependencies": {
         "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+        "@babel/traverse": "^7.20.1",
+        "@babel/types": "^7.20.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -524,9 +540,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz",
-      "integrity": "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.1.tgz",
+      "integrity": "sha512-hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -535,11 +551,11 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz",
-      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
+      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -549,13 +565,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
+      "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+        "@babel/plugin-proposal-optional-chaining": "^7.18.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -565,12 +581,13 @@
       }
     },
     "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz",
-      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz",
+      "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-remap-async-to-generator": "^7.18.9",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       },
       "engines": {
@@ -581,12 +598,12 @@
       }
     },
     "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz",
-      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -596,12 +613,12 @@
       }
     },
     "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.17.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz",
-      "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
+      "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.17.6",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
       "engines": {
@@ -612,11 +629,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
-      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
+      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       },
       "engines": {
@@ -627,11 +644,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz",
-      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
+      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.9",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       },
       "engines": {
@@ -642,11 +659,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz",
-      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
+      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-json-strings": "^7.8.3"
       },
       "engines": {
@@ -657,11 +674,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz",
-      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
+      "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.9",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
       "engines": {
@@ -672,11 +689,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz",
-      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       },
       "engines": {
@@ -687,11 +704,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
-      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       },
       "engines": {
@@ -702,15 +719,15 @@
       }
     },
     "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz",
-      "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==",
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz",
+      "integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==",
       "dependencies": {
-        "@babel/compat-data": "^7.17.0",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/compat-data": "^7.19.4",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-plugin-utils": "^7.19.0",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.16.7"
+        "@babel/plugin-transform-parameters": "^7.18.8"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -720,11 +737,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
-      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
+      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       },
       "engines": {
@@ -735,12 +752,12 @@
       }
     },
     "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
+      "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
@@ -751,12 +768,12 @@
       }
     },
     "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.16.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz",
-      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
+      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.16.10",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -766,13 +783,13 @@
       }
     },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz",
-      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
+      "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
@@ -783,12 +800,12 @@
       }
     },
     "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz",
-      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=4"
@@ -855,6 +872,20 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-syntax-import-assertions": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
+      "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
@@ -961,11 +992,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz",
-      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
+      "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -975,13 +1006,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
+      "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8"
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-remap-async-to-generator": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -991,11 +1022,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
-      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
+      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1005,11 +1036,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz",
-      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz",
+      "integrity": "sha512-sXOohbpHZSk7GjxK9b3dKB7CfqUD5DwOH+DggKzOQ7TXYP+RCSbRykfjQmn/zq+rBjycVRtLf9pYhAaEJA786w==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.19.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1019,17 +1050,18 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz",
-      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
+      "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-compilation-targets": "^7.19.0",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-replace-supers": "^7.18.9",
+        "@babel/helper-split-export-declaration": "^7.18.6",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1040,11 +1072,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz",
-      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
+      "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1054,11 +1086,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz",
-      "integrity": "sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==",
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz",
+      "integrity": "sha512-1dIhvZfkDVx/zn2S1aFwlruspTt4189j7fEkH0Y0VyuDM6bQt7bD6kLcz3l4IlLG+e5OReaBz9ROAbttRtUHqA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.19.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1068,12 +1100,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
-      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
+      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1083,11 +1115,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz",
-      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
+      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1097,12 +1129,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
-      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
+      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1112,11 +1144,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz",
-      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
+      "version": "7.18.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
+      "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1126,13 +1158,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
-      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
+      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-compilation-targets": "^7.18.9",
+        "@babel/helper-function-name": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.18.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1142,11 +1174,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz",
-      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
+      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1156,11 +1188,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
-      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
+      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1170,13 +1202,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz",
-      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz",
+      "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helper-plugin-utils": "^7.19.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1186,14 +1217,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz",
-      "integrity": "sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==",
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz",
+      "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-simple-access": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-simple-access": "^7.19.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1203,15 +1233,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz",
-      "integrity": "sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==",
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz",
+      "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-validator-identifier": "^7.19.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1221,12 +1250,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz",
-      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
+      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-module-transforms": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1236,11 +1265,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz",
-      "integrity": "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
+      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
+        "@babel/helper-plugin-utils": "^7.19.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1250,11 +1280,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz",
-      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
+      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1264,12 +1294,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
-      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
+      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-replace-supers": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1279,11 +1309,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz",
-      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.1.tgz",
+      "integrity": "sha512-nDvKLrAvl+kf6BOy1UJ3MGwzzfTMgppxwiD2Jb4LO3xjYyZq30oQzDNJbCQpMdG9+j2IXHoiMrw5Cm/L6ZoxXQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.19.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1293,11 +1323,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
-      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
+      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1307,11 +1337,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz",
-      "integrity": "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
+      "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
       "dependencies": {
-        "regenerator-transform": "^0.14.2"
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "regenerator-transform": "^0.15.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1321,11 +1352,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz",
-      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
+      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1335,15 +1366,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.9.tgz",
-      "integrity": "sha512-wS8uJwBt7/b/mzE13ktsJdmS4JP/j7PQSaADtnb4I2wL0zK51MQ0pmF8/Jy0wUIS96fr+fXT6S/ifiPXnvrlSg==",
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
+      "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
       "dependencies": {
         "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "babel-plugin-polyfill-corejs2": "^0.3.1",
-        "babel-plugin-polyfill-corejs3": "^0.5.2",
-        "babel-plugin-polyfill-regenerator": "^0.3.1",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "babel-plugin-polyfill-corejs2": "^0.3.3",
+        "babel-plugin-polyfill-corejs3": "^0.6.0",
+        "babel-plugin-polyfill-regenerator": "^0.4.1",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -1354,11 +1385,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
-      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
+      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1368,12 +1399,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz",
-      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
+      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1383,11 +1414,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
-      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
+      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1397,11 +1428,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz",
-      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
+      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1411,11 +1442,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz",
-      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
+      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1425,11 +1456,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
-      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
+      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1439,12 +1470,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
-      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
+      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1454,36 +1485,37 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.16.11",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
-      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz",
+      "integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==",
       "dependencies": {
-        "@babel/compat-data": "^7.16.8",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
-        "@babel/plugin-proposal-class-properties": "^7.16.7",
-        "@babel/plugin-proposal-class-static-block": "^7.16.7",
-        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
-        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
-        "@babel/plugin-proposal-json-strings": "^7.16.7",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-private-methods": "^7.16.11",
-        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
+        "@babel/compat-data": "^7.19.4",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-validator-option": "^7.18.6",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
+        "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
+        "@babel/plugin-proposal-class-properties": "^7.18.6",
+        "@babel/plugin-proposal-class-static-block": "^7.18.6",
+        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
+        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+        "@babel/plugin-proposal-json-strings": "^7.18.6",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
+        "@babel/plugin-proposal-object-rest-spread": "^7.19.4",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
+        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
+        "@babel/plugin-proposal-private-methods": "^7.18.6",
+        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.18.6",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -1493,44 +1525,44 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.16.7",
-        "@babel/plugin-transform-async-to-generator": "^7.16.8",
-        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
-        "@babel/plugin-transform-block-scoping": "^7.16.7",
-        "@babel/plugin-transform-classes": "^7.16.7",
-        "@babel/plugin-transform-computed-properties": "^7.16.7",
-        "@babel/plugin-transform-destructuring": "^7.16.7",
-        "@babel/plugin-transform-dotall-regex": "^7.16.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
-        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
-        "@babel/plugin-transform-for-of": "^7.16.7",
-        "@babel/plugin-transform-function-name": "^7.16.7",
-        "@babel/plugin-transform-literals": "^7.16.7",
-        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
-        "@babel/plugin-transform-modules-amd": "^7.16.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
-        "@babel/plugin-transform-modules-umd": "^7.16.7",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
-        "@babel/plugin-transform-new-target": "^7.16.7",
-        "@babel/plugin-transform-object-super": "^7.16.7",
-        "@babel/plugin-transform-parameters": "^7.16.7",
-        "@babel/plugin-transform-property-literals": "^7.16.7",
-        "@babel/plugin-transform-regenerator": "^7.16.7",
-        "@babel/plugin-transform-reserved-words": "^7.16.7",
-        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
-        "@babel/plugin-transform-spread": "^7.16.7",
-        "@babel/plugin-transform-sticky-regex": "^7.16.7",
-        "@babel/plugin-transform-template-literals": "^7.16.7",
-        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
-        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
-        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/plugin-transform-arrow-functions": "^7.18.6",
+        "@babel/plugin-transform-async-to-generator": "^7.18.6",
+        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
+        "@babel/plugin-transform-block-scoping": "^7.19.4",
+        "@babel/plugin-transform-classes": "^7.19.0",
+        "@babel/plugin-transform-computed-properties": "^7.18.9",
+        "@babel/plugin-transform-destructuring": "^7.19.4",
+        "@babel/plugin-transform-dotall-regex": "^7.18.6",
+        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
+        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
+        "@babel/plugin-transform-for-of": "^7.18.8",
+        "@babel/plugin-transform-function-name": "^7.18.9",
+        "@babel/plugin-transform-literals": "^7.18.9",
+        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
+        "@babel/plugin-transform-modules-amd": "^7.18.6",
+        "@babel/plugin-transform-modules-commonjs": "^7.18.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.19.0",
+        "@babel/plugin-transform-modules-umd": "^7.18.6",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
+        "@babel/plugin-transform-new-target": "^7.18.6",
+        "@babel/plugin-transform-object-super": "^7.18.6",
+        "@babel/plugin-transform-parameters": "^7.18.8",
+        "@babel/plugin-transform-property-literals": "^7.18.6",
+        "@babel/plugin-transform-regenerator": "^7.18.6",
+        "@babel/plugin-transform-reserved-words": "^7.18.6",
+        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
+        "@babel/plugin-transform-spread": "^7.19.0",
+        "@babel/plugin-transform-sticky-regex": "^7.18.6",
+        "@babel/plugin-transform-template-literals": "^7.18.9",
+        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
+        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
+        "@babel/plugin-transform-unicode-regex": "^7.18.6",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.16.8",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "core-js-compat": "^3.20.2",
+        "@babel/types": "^7.19.4",
+        "babel-plugin-polyfill-corejs2": "^0.3.3",
+        "babel-plugin-polyfill-corejs3": "^0.6.0",
+        "babel-plugin-polyfill-regenerator": "^0.4.1",
+        "core-js-compat": "^3.25.1",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -1556,20 +1588,28 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
-      "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz",
+      "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==",
       "dependencies": {
-        "regenerator-runtime": "^0.13.4"
+        "regenerator-runtime": "^0.13.10"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+    "node_modules/@babel/runtime-corejs3": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.1.tgz",
+      "integrity": "sha512-CGulbEDcg/ND1Im7fUNRZdGXmX2MTWVVZacQi/6DiKE5HNwZ3aVTm5PV4lO8HHz0B2h8WQyvKKjbX5XgTtydsg==",
+      "dev": true,
+      "dependencies": {
+        "core-js-pure": "^3.25.1",
+        "regenerator-runtime": "^0.13.10"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
     "node_modules/@babel/template": {
       "version": "7.18.10",
@@ -1585,18 +1625,18 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.0.tgz",
-      "integrity": "sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz",
+      "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==",
       "dependencies": {
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.0",
+        "@babel/generator": "^7.20.1",
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-function-name": "^7.19.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.19.0",
-        "@babel/types": "^7.19.0",
+        "@babel/parser": "^7.20.1",
+        "@babel/types": "^7.20.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1605,12 +1645,12 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
-      "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.0.tgz",
+      "integrity": "sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.18.10",
-        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/helper-string-parser": "^7.19.4",
+        "@babel/helper-validator-identifier": "^7.19.1",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -1663,9 +1703,9 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.12.1",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz",
-      "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1774,7 +1814,7 @@
     "node_modules/@gulp-sourcemaps/map-sources": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
-      "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
+      "integrity": "sha512-o/EatdaGt8+x2qpb0vFLC/2Gug/xYPRXb6a+ET1wGYKozKN3krDWC/zZFZAtrzxJHuDL12mwdfEFKcKMNvc55A==",
       "dev": true,
       "dependencies": {
         "normalize-path": "^2.0.1",
@@ -1787,7 +1827,7 @@
     "node_modules/@gulp-sourcemaps/map-sources/node_modules/normalize-path": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
       "dev": true,
       "dependencies": {
         "remove-trailing-separator": "^1.0.1"
@@ -1869,76 +1909,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
@@ -1949,19 +1919,19 @@
       }
     },
     "node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dev": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^15.0.0",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 10.14.2"
       }
     },
     "node_modules/@jest/types/node_modules/ansi-styles": {
@@ -2013,6 +1983,15 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/@jest/types/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jest/types/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -2026,22 +2005,21 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
-      "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -2064,18 +2042,41 @@
         "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
+    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.11",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
-      "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
-      "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
+      "version": "0.3.17",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
       "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-scope": "5.1.1"
       }
     },
     "node_modules/@polka/url": {
@@ -2126,19 +2127,16 @@
       }
     },
     "node_modules/@sinonjs/text-encoding": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
-      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
+      "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
       "dev": true
     },
-    "node_modules/@socket.io/base64-arraybuffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
-      "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
+      "dev": true
     },
     "node_modules/@szmarczak/http-timer": {
       "version": "4.0.6",
@@ -2153,9 +2151,9 @@
       }
     },
     "node_modules/@types/aria-query": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.0.tgz",
-      "integrity": "sha512-P+dkdFu0n08PDIvw+9nT9ByQnd+Udc8DaWPb9HKfaPwCvWvQpC5XaMRx2xLWECm9x1VKNps6vEAlirjA6+uNrQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
+      "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
       "dev": true
     },
     "node_modules/@types/cacheable-request": {
@@ -2170,12 +2168,6 @@
         "@types/responselike": "*"
       }
     },
-    "node_modules/@types/component-emitter": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
-      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==",
-      "dev": true
-    },
     "node_modules/@types/cookie": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
@@ -2210,15 +2202,15 @@
       "dev": true
     },
     "node_modules/@types/ejs": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.0.tgz",
-      "integrity": "sha512-DCg+Ka+uDQ31lJ/UtEXVlaeV3d6t81gifaVWKJy4MYVVgvJttyX/viREy+If7fz+tK/gVxTGMtyrFPnm4gjrVA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.1.tgz",
+      "integrity": "sha512-RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA==",
       "dev": true
     },
     "node_modules/@types/eslint": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
-      "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
+      "version": "8.4.9",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.9.tgz",
+      "integrity": "sha512-jFCSo4wJzlHQLCpceUhUnXdrPuCNOjGFMQ8Eg6JXxlz3QaCKOb7eGi2cephQdM4XTYsNej69P9JDJ1zqNIbncQ==",
       "dev": true,
       "dependencies": {
         "@types/estree": "*",
@@ -2226,9 +2218,9 @@
       }
     },
     "node_modules/@types/eslint-scope": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
-      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
       "dev": true,
       "dependencies": {
         "@types/eslint": "*",
@@ -2290,13 +2282,13 @@
       "dev": true
     },
     "node_modules/@types/inquirer": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.0.tgz",
-      "integrity": "sha512-BNoMetRf3gmkpAlV5we+kxyZTle7YibdOntIZbU5pyIfMdcwy784KfeZDAcuyMznkh5OLa17RVXZOGA5LTlkgQ==",
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-HhxyLejTHMfohAuhRun4csWigAMjXTmRyiJTU1Y/I1xmggikFMkOUoMQRlFm+zQcPEGHSs3io/0FAmNZf8EymQ==",
       "dev": true,
       "dependencies": {
         "@types/through": "*",
-        "rxjs": "^7.2.0"
+        "rxjs": "^6.4.0"
       }
     },
     "node_modules/@types/istanbul-lib-coverage": {
@@ -2324,54 +2316,55 @@
       }
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
       "dev": true
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
     "node_modules/@types/keyv": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz",
-      "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-4.2.0.tgz",
+      "integrity": "sha512-xoBtGl5R9jeKUhc8ZqeYaRDx04qqJ10yhhXYGmJ4Jr8qKpvMsDQQrNUvF/wUJ4klOtmJeJM+p2Xo3zp9uaC3tw==",
+      "deprecated": "This is a stub types definition. keyv provides its own type definitions, so you do not need this installed.",
       "dev": true,
       "dependencies": {
-        "@types/node": "*"
+        "keyv": "*"
       }
     },
     "node_modules/@types/lodash": {
-      "version": "4.14.179",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz",
-      "integrity": "sha512-uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w==",
+      "version": "4.14.187",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.187.tgz",
+      "integrity": "sha512-MrO/xLXCaUgZy3y96C/iOsaIqZSeupyTImKClHunL5GrmaiII2VwvWmLBu2hwa0Kp0sV19CsyjtrTc/Fx8rg/A==",
       "dev": true
     },
     "node_modules/@types/lodash.flattendeep": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.6.tgz",
-      "integrity": "sha512-uLm2MaRVlqJSGsMK0RZpP5T3KqReq+9WbYDHCUhBhp98v56hMG/Yht52bsoTSui9xz2mUvQ9NfG3LrNGDL92Ng==",
+      "version": "4.4.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.7.tgz",
+      "integrity": "sha512-1h6GW/AeZw/Wej6uxrqgmdTDZX1yFS39lRsXYkg+3kWvOWWrlGCI6H7lXxlUHOzxDT4QeYGmgPpQ3BX9XevzOg==",
       "dev": true,
       "dependencies": {
         "@types/lodash": "*"
       }
     },
     "node_modules/@types/lodash.pickby": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/@types/lodash.pickby/-/lodash.pickby-4.6.6.tgz",
-      "integrity": "sha512-NFa13XxlMd9eFi0UFZFWIztpMpXhozbijrx3Yb1viYZphT7jyopIFVoIRF4eYMjruWNEG1rnyrRmg/8ej9T8Iw==",
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.pickby/-/lodash.pickby-4.6.7.tgz",
+      "integrity": "sha512-4ebXRusuLflfscbD0PUX4eVknDHD9Yf+uMtBIvA/hrnTqeAzbuHuDjvnYriLjUrI9YrhCPVKUf4wkRSXJQ6gig==",
       "dev": true,
       "dependencies": {
         "@types/lodash": "*"
       }
     },
     "node_modules/@types/lodash.union": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz",
-      "integrity": "sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw==",
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.7.tgz",
+      "integrity": "sha512-6HXM6tsnHJzKgJE0gA/LhTGf/7AbjUk759WZ1MziVm+OBNAATHhdgj+a3KVE8g76GCLAnN4ZEQQG1EGgtBIABA==",
       "dev": true,
       "dependencies": {
         "@types/lodash": "*"
@@ -2386,16 +2379,10 @@
         "@types/unist": "*"
       }
     },
-    "node_modules/@types/mdurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
-      "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
-      "dev": true
-    },
     "node_modules/@types/mocha": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.0.tgz",
-      "integrity": "sha512-QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg==",
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.3.tgz",
+      "integrity": "sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw==",
       "dev": true
     },
     "node_modules/@types/ms": {
@@ -2405,9 +2392,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "17.0.21",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz",
-      "integrity": "sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==",
+      "version": "17.0.45",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
+      "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
       "dev": true
     },
     "node_modules/@types/normalize-package-data": {
@@ -2423,18 +2410,18 @@
       "dev": true
     },
     "node_modules/@types/puppeteer": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.5.tgz",
-      "integrity": "sha512-lxCjpDEY+DZ66+W3x5Af4oHnEmUXt0HuaRzkBGE2UZiZEp/V1d3StpLPlmNVu/ea091bdNmVPl44lu8Wy/0ZCA==",
+      "version": "5.4.7",
+      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.7.tgz",
+      "integrity": "sha512-JdGWZZYL0vKapXF4oQTC5hLVNfOgdPrqeZ1BiQnGk5cB7HeE91EWUiTdVSdQPobRN8rIcdffjiOgCYJ/S8QrnQ==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/recursive-readdir": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@types/recursive-readdir/-/recursive-readdir-2.2.0.tgz",
-      "integrity": "sha512-HGk753KRu2N4mWduovY4BLjYq4jTOL29gV2OfGdGxHcPSWGFkC5RRIdk+VTs5XmYd7MVAD+JwKrcb5+5Y7FOCg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@types/recursive-readdir/-/recursive-readdir-2.2.1.tgz",
+      "integrity": "sha512-Xd+Ptc4/F2ueInqy5yK2FI5FxtwwbX2+VZpcg+9oYsFJVen8qQKGapCr+Bi5wQtHU1cTXT8s+07lo/nKPgu8Gg==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
@@ -2514,9 +2501,9 @@
       "dev": true
     },
     "node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "version": "15.0.14",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
@@ -2529,9 +2516,9 @@
       "dev": true
     },
     "node_modules/@types/yauzl": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
-      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -2545,9 +2532,9 @@
       "dev": true
     },
     "node_modules/@videojs/http-streaming": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.14.2.tgz",
-      "integrity": "sha512-K1raSfO/pq5r8iUas3OSYni0kXOj91n8ealIpV02khghzGv9LQ6O3YUqYd/eAhJ1HIrmZWOnrYpK/P+mhUExXQ==",
+      "version": "2.14.3",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.14.3.tgz",
+      "integrity": "sha512-2tFwxCaNbcEZzQugWf8EERwNMyNtspfHnvxRGRABQs09W/5SqmkWFuGWfUAm4wQKlXGfdPyAJ1338ASl459xAA==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
@@ -2594,14 +2581,14 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.2.38",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.38.tgz",
-      "integrity": "sha512-/FsvnSu7Z+lkd/8KXMa4yYNUiqQrI22135gfsQYVGuh5tqEgOB0XqrUdb/KnCLa5+TmQLPwvyUnKMyCpu+SX3Q==",
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.41.tgz",
+      "integrity": "sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw==",
       "dev": true,
       "optional": true,
       "dependencies": {
         "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.38",
+        "@vue/shared": "3.2.41",
         "estree-walker": "^2.0.2",
         "source-map": "^0.6.1"
       }
@@ -2617,29 +2604,29 @@
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.2.38",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.38.tgz",
-      "integrity": "sha512-zqX4FgUbw56kzHlgYuEEJR8mefFiiyR3u96498+zWPsLeh1WKvgIReoNE+U7gG8bCUdvsrJ0JRmev0Ky6n2O0g==",
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz",
+      "integrity": "sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw==",
       "dev": true,
       "optional": true,
       "dependencies": {
-        "@vue/compiler-core": "3.2.38",
-        "@vue/shared": "3.2.38"
+        "@vue/compiler-core": "3.2.41",
+        "@vue/shared": "3.2.41"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.2.38",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.38.tgz",
-      "integrity": "sha512-KZjrW32KloMYtTcHAFuw3CqsyWc5X6seb8KbkANSWt3Cz9p2qA8c1GJpSkksFP9ABb6an0FLCFl46ZFXx3kKpg==",
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.41.tgz",
+      "integrity": "sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w==",
       "dev": true,
       "optional": true,
       "dependencies": {
         "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.38",
-        "@vue/compiler-dom": "3.2.38",
-        "@vue/compiler-ssr": "3.2.38",
-        "@vue/reactivity-transform": "3.2.38",
-        "@vue/shared": "3.2.38",
+        "@vue/compiler-core": "3.2.41",
+        "@vue/compiler-dom": "3.2.41",
+        "@vue/compiler-ssr": "3.2.41",
+        "@vue/reactivity-transform": "3.2.41",
+        "@vue/shared": "3.2.41",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.25.7",
         "postcss": "^8.1.10",
@@ -2657,34 +2644,34 @@
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.2.38",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.38.tgz",
-      "integrity": "sha512-bm9jOeyv1H3UskNm4S6IfueKjUNFmi2kRweFIGnqaGkkRePjwEcfCVqyS3roe7HvF4ugsEkhf4+kIvDhip6XzQ==",
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.41.tgz",
+      "integrity": "sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ==",
       "dev": true,
       "optional": true,
       "dependencies": {
-        "@vue/compiler-dom": "3.2.38",
-        "@vue/shared": "3.2.38"
+        "@vue/compiler-dom": "3.2.41",
+        "@vue/shared": "3.2.41"
       }
     },
     "node_modules/@vue/reactivity-transform": {
-      "version": "3.2.38",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.38.tgz",
-      "integrity": "sha512-3SD3Jmi1yXrDwiNJqQ6fs1x61WsDLqVk4NyKVz78mkaIRh6d3IqtRnptgRfXn+Fzf+m6B1KxBYWq1APj6h4qeA==",
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.41.tgz",
+      "integrity": "sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A==",
       "dev": true,
       "optional": true,
       "dependencies": {
         "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.38",
-        "@vue/shared": "3.2.38",
+        "@vue/compiler-core": "3.2.41",
+        "@vue/shared": "3.2.41",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.25.7"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.2.38",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.38.tgz",
-      "integrity": "sha512-dTyhTIRmGXBjxJE+skC8tTWCGLCVc4wQgRRLt8+O9p5ewBAjoBwtCAkLPrtToSr1xltoe3st21Pv953aOZ7alg==",
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.41.tgz",
+      "integrity": "sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw==",
       "dev": true,
       "optional": true
     },
@@ -2708,37 +2695,224 @@
         "@wdio/cli": "^7.0.0"
       }
     },
-    "node_modules/@wdio/cli": {
+    "node_modules/@wdio/browserstack-service/node_modules/@wdio/config": {
       "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.16.16.tgz",
-      "integrity": "sha512-Wz/e5zm1UNHB9RAIsJIM7ioDzVllUwTvhVWOrI7HR/53GmO/cIvAVjpnlglizJNgK8WlbnM/cKNVIXxqxrnFmw==",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.16.16.tgz",
+      "integrity": "sha512-K/ObPuo6Da2liz++OKOIfbdpFwI7UWiFcBylfJkCYbweuXCoW1aUqlKI6rmKPwCH9Uqr/RHWu6p8eo0zWe6xVA==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "7.16.0",
+        "@wdio/types": "7.16.14",
+        "deepmerge": "^4.0.0",
+        "glob": "^7.1.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/@wdio/protocols": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.16.7.tgz",
+      "integrity": "sha512-Wv40pNQcLiPzQ3o98Mv4A8T1EBQ6k4khglz/e2r16CTm+F3DDYh8eLMAsU5cgnmuwwDKX1EyOiFwieykBn5MCg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/@wdio/repl": {
+      "version": "7.16.14",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.16.14.tgz",
+      "integrity": "sha512-Ezih0Y+lsGkKv3H3U56hdWgZiQGA3VaAYguSLd9+g1xbQq+zMKqSmfqECD9bAy+OgCCiVTRstES6lHZxJVPhAg==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/utils": "7.16.14"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/@wdio/utils": {
+      "version": "7.16.14",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.16.14.tgz",
+      "integrity": "sha512-wwin8nVpIlhmXJkq6GJw9aDDzgLOJKgXTcEua0T2sdXjoW78u5Ly/GZrFXTjMGhacFvoZfitTrjyfyy4CxMVvw==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "7.16.0",
+        "@wdio/types": "7.16.14",
+        "p-iteration": "^1.1.8"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/devtools": {
+      "version": "7.16.16",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
+      "integrity": "sha512-M0kzkuSgfEhpqIis3gdtWsNjn/HQ+vRAmEzDnbYx/7FfjFxhSv1d+rOOT20pvd60soItMYpsOova1igACEGkGQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^17.0.4",
+        "@types/ua-parser-js": "^0.7.33",
+        "@wdio/config": "7.16.16",
+        "@wdio/logger": "7.16.0",
+        "@wdio/protocols": "7.16.7",
+        "@wdio/types": "7.16.14",
+        "@wdio/utils": "7.16.14",
+        "chrome-launcher": "^0.15.0",
+        "edge-paths": "^2.1.0",
+        "puppeteer-core": "^13.1.3",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^1.0.1",
+        "uuid": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/devtools-protocol": {
+      "version": "0.0.973690",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.973690.tgz",
+      "integrity": "sha512-myh3hSFp0YWa2GED11PmbLhV4dv9RdO7YUz27XJrbQLnP5bMbZL6dfOOILTHO57yH0kX5GfuOZBsg/4NamfPvQ==",
+      "dev": true
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/minimatch": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/ua-parser-js": {
+      "version": "1.0.32",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.32.tgz",
+      "integrity": "sha512-dXVsz3M4j+5tTiovFVyVqssXBu5HM47//YSOeZ9fQkdDKkfzv2v3PP1jmH6FUyPW+yCSn7aBVK1fGGKNhowdDA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/ua-parser-js"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/faisalman"
+        }
+      ],
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/webdriver": {
+      "version": "7.16.16",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.16.16.tgz",
+      "integrity": "sha512-x8UoG9k/P8KDrfSh1pOyNevt9tns3zexoMxp9cKnyA/7HYSErhZYTLGlgxscAXLtQG41cMH/Ba/oBmOx7Hgd8w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^17.0.4",
+        "@wdio/config": "7.16.16",
+        "@wdio/logger": "7.16.0",
+        "@wdio/protocols": "7.16.7",
+        "@wdio/types": "7.16.14",
+        "@wdio/utils": "7.16.14",
+        "got": "^11.0.2",
+        "ky": "^0.29.0",
+        "lodash.merge": "^4.6.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/browserstack-service/node_modules/webdriverio": {
+      "version": "7.16.16",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.16.16.tgz",
+      "integrity": "sha512-caPaEWyuD3Qoa7YkW4xCCQA4v9Pa9wmhFGPvNZh3ERtjMCNi8L/XXOdkekWNZmFh3tY0kFguBj7+fAwSY7HAGw==",
+      "dev": true,
+      "dependencies": {
+        "@types/aria-query": "^5.0.0",
+        "@types/node": "^17.0.4",
+        "@wdio/config": "7.16.16",
+        "@wdio/logger": "7.16.0",
+        "@wdio/protocols": "7.16.7",
+        "@wdio/repl": "7.16.14",
+        "@wdio/types": "7.16.14",
+        "@wdio/utils": "7.16.14",
+        "archiver": "^5.0.0",
+        "aria-query": "^5.0.0",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools": "7.16.16",
+        "devtools-protocol": "^0.0.973690",
+        "fs-extra": "^10.0.0",
+        "get-port": "^5.1.1",
+        "grapheme-splitter": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isobject": "^3.0.2",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^5.0.0",
+        "puppeteer-core": "^13.1.3",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^8.0.0",
+        "webdriver": "7.16.16"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/cli": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.5.7.tgz",
+      "integrity": "sha512-nOQJLskrY+UECDd3NxE7oBzb6cDA7e7x02YWQugOlOgnZ4a+PJmkFoSsO8C2uNCpdFngy5rJKGUo5vbtAHEF9Q==",
       "dev": true,
       "dependencies": {
         "@types/ejs": "^3.0.5",
         "@types/fs-extra": "^9.0.4",
-        "@types/inquirer": "^8.1.2",
+        "@types/inquirer": "^7.3.1",
         "@types/lodash.flattendeep": "^4.4.6",
         "@types/lodash.pickby": "^4.6.6",
         "@types/lodash.union": "^4.6.6",
-        "@types/node": "^17.0.4",
         "@types/recursive-readdir": "^2.2.0",
-        "@wdio/config": "7.16.16",
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
         "async-exit-hook": "^2.0.1",
         "chalk": "^4.0.0",
         "chokidar": "^3.0.0",
         "cli-spinners": "^2.1.0",
         "ejs": "^3.0.1",
         "fs-extra": "^10.0.0",
-        "inquirer": "8.1.5",
+        "inquirer": "^8.0.0",
         "lodash.flattendeep": "^4.4.0",
         "lodash.pickby": "^4.6.0",
         "lodash.union": "^4.6.0",
         "mkdirp": "^1.0.4",
         "recursive-readdir": "^2.2.2",
-        "webdriverio": "7.16.16",
+        "webdriverio": "7.5.7",
         "yargs": "^17.0.0",
         "yarn-install": "^1.0.0"
       },
@@ -2749,6 +2923,39 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/@wdio/cli/node_modules/@types/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+      "dev": true
+    },
+    "node_modules/@wdio/cli/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/@wdio/cli/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -2764,6 +2971,19 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/@wdio/cli/node_modules/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
     "node_modules/@wdio/cli/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -2780,6 +3000,32 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/@wdio/cli/node_modules/chrome-launcher": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+      "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^1.0.5",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^1.0.0",
+        "mkdirp": "^0.5.3",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/chrome-launcher/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
     "node_modules/@wdio/cli/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -2798,6 +3044,72 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/@wdio/cli/node_modules/devtools": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
+      "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "chrome-launcher": "^0.13.1",
+        "edge-paths": "^2.1.0",
+        "puppeteer-core": "^9.1.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^0.7.21",
+        "uuid": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/devtools-protocol": {
+      "version": "0.0.878340",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
+      "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
+      "dev": true
+    },
+    "node_modules/@wdio/cli/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/puppeteer-core": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
+      "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.869402",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.1.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
+      },
+      "engines": {
+        "node": ">=10.18.1"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/puppeteer-core/node_modules/devtools-protocol": {
+      "version": "0.0.869402",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+      "dev": true
+    },
     "node_modules/@wdio/cli/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -2810,13 +3122,82 @@
         "node": ">=8"
       }
     },
+    "node_modules/@wdio/cli/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/webdriverio": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
+      "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
+      "dev": true,
+      "dependencies": {
+        "@types/aria-query": "^4.2.1",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/repl": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "archiver": "^5.0.0",
+        "aria-query": "^4.2.2",
+        "atob": "^2.1.2",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools": "7.5.7",
+        "devtools-protocol": "^0.0.878340",
+        "fs-extra": "^10.0.0",
+        "get-port": "^5.1.1",
+        "grapheme-splitter": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isobject": "^3.0.2",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^3.0.4",
+        "puppeteer-core": "^9.1.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^8.0.0",
+        "webdriver": "7.5.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/cli/node_modules/ws": {
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@wdio/cli/node_modules/yargs": {
-      "version": "17.3.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz",
-      "integrity": "sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==",
+      "version": "17.6.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
+      "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
       "dev": true,
       "dependencies": {
-        "cliui": "^7.0.2",
+        "cliui": "^8.0.1",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
@@ -2829,13 +3210,13 @@
       }
     },
     "node_modules/@wdio/concise-reporter": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-7.16.14.tgz",
-      "integrity": "sha512-CR+9+skJ3mXPIdRo0AnIJTJHOArrWdKlXTnyZ/DD6M9VrNk5aiTWQyphT/IeHV5+fxjHlMNIf/KgIhj1ewschQ==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-7.5.7.tgz",
+      "integrity": "sha512-964i7eQ4sboSla2bdR8714Er82QBgS6u39GmDFX8Izy9Ge38xaE75HuF5S7mnOWGzSojCWgqtwy5k7Rfg6GE3g==",
       "dev": true,
       "dependencies": {
-        "@wdio/reporter": "7.16.14",
-        "@wdio/types": "7.16.14",
+        "@wdio/reporter": "7.5.7",
+        "@wdio/types": "7.5.3",
         "chalk": "^4.0.0",
         "pretty-ms": "^7.0.0"
       },
@@ -2846,6 +3227,18 @@
         "@wdio/cli": "^7.0.0"
       }
     },
+    "node_modules/@wdio/concise-reporter/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/@wdio/concise-reporter/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -2895,6 +3288,15 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/@wdio/concise-reporter/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@wdio/concise-reporter/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -2908,13 +3310,13 @@
       }
     },
     "node_modules/@wdio/config": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.16.16.tgz",
-      "integrity": "sha512-K/ObPuo6Da2liz++OKOIfbdpFwI7UWiFcBylfJkCYbweuXCoW1aUqlKI6rmKPwCH9Uqr/RHWu6p8eo0zWe6xVA==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.5.3.tgz",
+      "integrity": "sha512-udvVizYoilOxuWj/BmoN6y7ZCd4wPdYNlSfWznrbCezAdaLZ4/pNDOO0WRWx2C4+q1wdkXZV/VuQPUGfL0lEHQ==",
       "dev": true,
       "dependencies": {
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
         "deepmerge": "^4.0.0",
         "glob": "^7.1.2"
       },
@@ -2922,19 +3324,116 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/@wdio/config/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/config/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/config/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@wdio/local-runner": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.16.16.tgz",
-      "integrity": "sha512-AJaOyM842PWgMffrrXyHJjouVseLHoiL5U1sw2VVproi3ORWHbltl1AMnreU/lrGu9L0CVKHYT1pxu5UbSOCxQ==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.5.7.tgz",
+      "integrity": "sha512-aYc0XUV+/e3cg8Fp+CWlC4FbwSSG3mKAv1iuy/+Hwzg2kJE+aa+Rf2p2BQYc7HPRtKNW0bM8o+aCImZLAiPM+A==",
       "dev": true,
       "dependencies": {
         "@types/stream-buffers": "^3.0.3",
-        "@wdio/logger": "7.16.0",
-        "@wdio/repl": "7.16.14",
-        "@wdio/runner": "7.16.16",
-        "@wdio/types": "7.16.14",
+        "@wdio/logger": "7.5.3",
+        "@wdio/repl": "7.5.3",
+        "@wdio/runner": "7.5.7",
+        "@wdio/types": "7.5.3",
         "async-exit-hook": "^2.0.1",
-        "split2": "^4.0.0",
+        "split2": "^3.2.2",
         "stream-buffers": "^3.0.2"
       },
       "engines": {
@@ -2944,6 +3443,103 @@
         "@wdio/cli": "^7.0.0"
       }
     },
+    "node_modules/@wdio/local-runner/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/local-runner/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/local-runner/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@wdio/logger": {
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.16.0.tgz",
@@ -3008,6 +3604,15 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/@wdio/logger/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@wdio/logger/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -3021,22 +3626,58 @@
       }
     },
     "node_modules/@wdio/mocha-framework": {
-      "version": "7.16.15",
-      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.16.15.tgz",
-      "integrity": "sha512-XRya85/RYPZk4MZ7Cvl3oudTdrOo+RyO8b5Ff+dH8hD3GBCACaWgW9AjbsyhvbSTdUlF0gNLPdqOCsxV5XyM3w==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.5.3.tgz",
+      "integrity": "sha512-96QCVWsiyZxEgOZP3oTq2B2T7zne5dCdehLa2n4q/BLjk96Rj0jifidJZfd/1+vdNPKX0gWWAzpy98Znn8MVMw==",
       "dev": true,
       "dependencies": {
-        "@types/mocha": "^9.0.0",
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
-        "expect-webdriverio": "^3.0.0",
-        "mocha": "^9.0.0"
+        "@types/mocha": "^8.0.0",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "expect-webdriverio": "^2.0.0",
+        "mocha": "^8.0.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
       },
       "engines": {
         "node": ">=12.0.0"
       }
     },
+    "node_modules/@wdio/mocha-framework/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@wdio/mocha-framework/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -3074,16 +3715,36 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/@wdio/mocha-framework/node_modules/chokidar": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.5.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.1"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
       }
     },
     "node_modules/@wdio/mocha-framework/node_modules/color-convert": {
@@ -3104,6 +3765,32 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/@wdio/mocha-framework/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
     "node_modules/@wdio/mocha-framework/node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -3132,10 +3819,39 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@wdio/mocha-framework/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@wdio/mocha-framework/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
+      "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
       "dev": true,
       "dependencies": {
         "argparse": "^2.0.1"
@@ -3160,19 +3876,15 @@
       }
     },
     "node_modules/@wdio/mocha-framework/node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+      "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
       "dev": true,
       "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
+        "chalk": "^4.0.0"
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@wdio/mocha-framework/node_modules/minimatch": {
@@ -3188,32 +3900,33 @@
       }
     },
     "node_modules/@wdio/mocha-framework/node_modules/mocha": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz",
-      "integrity": "sha512-T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz",
+      "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==",
       "dev": true,
       "dependencies": {
         "@ungap/promise-all-settled": "1.1.2",
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
-        "chokidar": "3.5.3",
-        "debug": "4.3.3",
+        "chokidar": "3.5.1",
+        "debug": "4.3.1",
         "diff": "5.0.0",
         "escape-string-regexp": "4.0.0",
         "find-up": "5.0.0",
-        "glob": "7.2.0",
+        "glob": "7.1.6",
         "growl": "1.10.5",
         "he": "1.2.0",
-        "js-yaml": "4.1.0",
-        "log-symbols": "4.1.0",
+        "js-yaml": "4.0.0",
+        "log-symbols": "4.0.0",
         "minimatch": "3.0.4",
         "ms": "2.1.3",
-        "nanoid": "3.2.0",
-        "serialize-javascript": "6.0.0",
+        "nanoid": "3.1.20",
+        "serialize-javascript": "5.0.1",
         "strip-json-comments": "3.1.1",
         "supports-color": "8.1.1",
         "which": "2.0.2",
-        "workerpool": "6.2.0",
+        "wide-align": "1.1.3",
+        "workerpool": "6.1.0",
         "yargs": "16.2.0",
         "yargs-parser": "20.2.4",
         "yargs-unparser": "2.0.0"
@@ -3223,23 +3936,38 @@
         "mocha": "bin/mocha"
       },
       "engines": {
-        "node": ">= 12.0.0"
+        "node": ">= 10.12.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/mochajs"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/ms": {
+    "node_modules/@wdio/mocha-framework/node_modules/mocha/node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
+    "node_modules/@wdio/mocha-framework/node_modules/mocha/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
     "node_modules/@wdio/mocha-framework/node_modules/nanoid": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
-      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
+      "version": "3.1.20",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
+      "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
       "dev": true,
       "bin": {
         "nanoid": "bin/nanoid.cjs"
@@ -3278,13 +4006,25 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@wdio/mocha-framework/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+    "node_modules/@wdio/mocha-framework/node_modules/readdirp": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
       "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/serialize-javascript": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
       }
     },
     "node_modules/@wdio/mocha-framework/node_modules/strip-json-comments": {
@@ -3299,6 +4039,24 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@wdio/mocha-framework/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/mocha-framework/node_modules/workerpool": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
+      "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==",
+      "dev": true
+    },
     "node_modules/@wdio/mocha-framework/node_modules/yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -3327,75 +4085,347 @@
       }
     },
     "node_modules/@wdio/protocols": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.16.7.tgz",
-      "integrity": "sha512-Wv40pNQcLiPzQ3o98Mv4A8T1EBQ6k4khglz/e2r16CTm+F3DDYh8eLMAsU5cgnmuwwDKX1EyOiFwieykBn5MCg==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.5.3.tgz",
+      "integrity": "sha512-lpNaKwxYhDSL6neDtQQYXvzMAw+u4PXx65ryeMEX82mkARgzSZps5Kyrg9ub7X4T17K1NPfnY6UhZEWg6cKJCg==",
       "dev": true,
       "engines": {
         "node": ">=12.0.0"
       }
     },
     "node_modules/@wdio/repl": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.16.14.tgz",
-      "integrity": "sha512-Ezih0Y+lsGkKv3H3U56hdWgZiQGA3VaAYguSLd9+g1xbQq+zMKqSmfqECD9bAy+OgCCiVTRstES6lHZxJVPhAg==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.5.3.tgz",
+      "integrity": "sha512-jfNJwNoc2nWdnLsFoGHmOJR9zaWfDTBMWM3W1eR5kXIjevD6gAfWsB5ZoA4IdybujCXxdnhlsm4o2jIzp/6f7A==",
       "dev": true,
       "dependencies": {
-        "@wdio/utils": "7.16.14"
+        "@wdio/utils": "7.5.3"
       },
       "engines": {
         "node": ">=12.0.0"
       }
     },
     "node_modules/@wdio/reporter": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.16.14.tgz",
-      "integrity": "sha512-e/I2oGfqjx9+zI4NT/garqxm7Afnos1EcrGSNu75WmP3PNJt4i+9DKkROu4PM6XWcpUB4v2UF7Mv/NrL3TU9aA==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.5.7.tgz",
+      "integrity": "sha512-9PXqZtCXDtU6UYLNDPu9MZQ8BiABGnRlJTrlbYB3gBfZDibMkJMvwXzPderipBv2+ifDZXmGe3Njf1ao2TkbFA==",
       "dev": true,
       "dependencies": {
-        "@types/diff": "^5.0.0",
-        "@types/node": "^17.0.4",
-        "@types/object-inspect": "^1.8.0",
-        "@types/supports-color": "^8.1.0",
-        "@types/tmp": "^0.2.0",
-        "@wdio/types": "7.16.14",
-        "diff": "^5.0.0",
-        "fs-extra": "^10.0.0",
-        "object-inspect": "^1.10.3",
-        "supports-color": "8.1.1"
+        "@wdio/types": "7.5.3",
+        "fs-extra": "^10.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/reporter/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
       },
       "engines": {
         "node": ">=12.0.0"
       }
     },
     "node_modules/@wdio/runner": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.16.16.tgz",
-      "integrity": "sha512-Tt2ja6GukGPq1m98WP26yOWUGwzK1y7gPTLy6rKlamz3mOBC7koL0T9+iqcFREquUe4CMy2jWp1lqvPlwMbu7g==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.5.7.tgz",
+      "integrity": "sha512-RzVXd+xnwK/thkx1/xo9K5iscQ0Ofobgsx5dNVtwLDVMn9V7jCW/WX4dSCPAPaVSqnUCmkcQp3P5AoSBPpCZnQ==",
       "dev": true,
       "dependencies": {
-        "@wdio/config": "7.16.16",
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
         "deepmerge": "^4.0.0",
         "gaze": "^1.1.2",
-        "webdriver": "7.16.16",
-        "webdriverio": "7.16.16"
+        "webdriver": "7.5.3",
+        "webdriverio": "7.5.7"
       },
       "engines": {
         "node": ">=12.0.0"
       }
     },
-    "node_modules/@wdio/spec-reporter": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.19.1.tgz",
-      "integrity": "sha512-qnZkn3VcyBPtcorUtpyCFE8v5ubyWmR7mFETXNzyriHyvjvk+NeFCWaFcIehpXYXiAmNpAwyfnZoIY6tkKQixQ==",
+    "node_modules/@wdio/runner/node_modules/@types/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+      "dev": true
+    },
+    "node_modules/@wdio/runner/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
       "dev": true,
       "dependencies": {
-        "@types/easy-table": "^0.0.33",
-        "@wdio/reporter": "7.19.1",
-        "@wdio/types": "7.19.1",
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/chrome-launcher": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+      "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^1.0.5",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^1.0.0",
+        "mkdirp": "^0.5.3",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/runner/node_modules/devtools": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
+      "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "chrome-launcher": "^0.13.1",
+        "edge-paths": "^2.1.0",
+        "puppeteer-core": "^9.1.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^0.7.21",
+        "uuid": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/devtools-protocol": {
+      "version": "0.0.878340",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
+      "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
+      "dev": true
+    },
+    "node_modules/@wdio/runner/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/puppeteer-core": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
+      "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.869402",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.1.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
+      },
+      "engines": {
+        "node": ">=10.18.1"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/puppeteer-core/node_modules/devtools-protocol": {
+      "version": "0.0.869402",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+      "dev": true
+    },
+    "node_modules/@wdio/runner/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/webdriverio": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
+      "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
+      "dev": true,
+      "dependencies": {
+        "@types/aria-query": "^4.2.1",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/repl": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "archiver": "^5.0.0",
+        "aria-query": "^4.2.2",
+        "atob": "^2.1.2",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools": "7.5.7",
+        "devtools-protocol": "^0.0.878340",
+        "fs-extra": "^10.0.0",
+        "get-port": "^5.1.1",
+        "grapheme-splitter": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isobject": "^3.0.2",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^3.0.4",
+        "puppeteer-core": "^9.1.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^8.0.0",
+        "webdriver": "7.5.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/runner/node_modules/ws": {
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@wdio/spec-reporter": {
+      "version": "7.19.7",
+      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.19.7.tgz",
+      "integrity": "sha512-BDBZU2EK/GuC9VxtfqPtoW43FmvKxYDsvcDVDi3F7o+9fkcuGSJiWbw1AX251ZzzVQ7YP9ImTitSpdpUKXkilQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/easy-table": "^0.0.33",
+        "@wdio/reporter": "7.19.7",
+        "@wdio/types": "7.19.5",
         "chalk": "^4.0.0",
         "easy-table": "^1.1.1",
         "pretty-ms": "^7.0.0"
@@ -3408,9 +4438,9 @@
       }
     },
     "node_modules/@wdio/spec-reporter/node_modules/@wdio/reporter": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.19.1.tgz",
-      "integrity": "sha512-sWmBBV4dPCZkGk9Qq0m35T/vHGen0N10nH4osQcVP3IZJqpo2eLIH4w+X6EUbjZ2GdgOA2bLMMzb1bl9JqnGPg==",
+      "version": "7.19.7",
+      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.19.7.tgz",
+      "integrity": "sha512-Dum19gpfru66FnIq78/4HTuW87B7ceLDp6PJXwQM5kXyN7Gb7zhMgp6FZTM0FCYLyi6U/zXZSvpNUYl77caS6g==",
       "dev": true,
       "dependencies": {
         "@types/diff": "^5.0.0",
@@ -3418,7 +4448,7 @@
         "@types/object-inspect": "^1.8.0",
         "@types/supports-color": "^8.1.0",
         "@types/tmp": "^0.2.0",
-        "@wdio/types": "7.19.1",
+        "@wdio/types": "7.19.5",
         "diff": "^5.0.0",
         "fs-extra": "^10.0.0",
         "object-inspect": "^1.10.3",
@@ -3428,7 +4458,93 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/@wdio/spec-reporter/node_modules/@wdio/reporter/node_modules/supports-color": {
+    "node_modules/@wdio/spec-reporter/node_modules/@wdio/types": {
+      "version": "7.19.5",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.19.5.tgz",
+      "integrity": "sha512-S1lC0pmtEO7NVH/2nM1c7NHbkgxLZH3VVG/z6ym3Bbxdtcqi2LMsEvvawMAU/fmhyiIkMsGZCO8vxG9cRw4z4A==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^17.0.4",
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "^4.6.2"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/spec-reporter/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
@@ -3443,23 +4559,57 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/@wdio/spec-reporter/node_modules/@wdio/types": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.19.1.tgz",
-      "integrity": "sha512-mOodKlmvYxpj8P5BhjggEGpXuiRSlsyn2ClG8QqJ3lfXgOtOVEzFNfv/Ai7TkHr+lHDQNXLjllCjSqoCHhwlqg==",
+    "node_modules/@wdio/sync": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/sync/-/sync-7.5.7.tgz",
+      "integrity": "sha512-Zu/AYLjwqbFSbaOU1US7ownv3ov8JrtoGHq51JfJ4masefJDXNkHix2cZ0qEgl3IvkkWQ0ewL0G8GTXb3KOemA==",
       "dev": true,
       "dependencies": {
-        "@types/node": "^17.0.4",
-        "got": "^11.8.1"
+        "@types/fibers": "^3.1.0",
+        "@types/puppeteer": "^5.4.0",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "fibers": "^5.0.0",
+        "webdriverio": "7.5.7"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/@types/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+      "dev": true
+    },
+    "node_modules/@wdio/sync/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
         "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
       },
-      "peerDependencies": {
-        "typescript": "^4.6.2"
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/@wdio/spec-reporter/node_modules/ansi-styles": {
+    "node_modules/@wdio/sync/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
@@ -3474,7 +4624,20 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@wdio/spec-reporter/node_modules/chalk": {
+    "node_modules/@wdio/sync/node_modules/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -3490,7 +4653,21 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@wdio/spec-reporter/node_modules/color-convert": {
+    "node_modules/@wdio/sync/node_modules/chrome-launcher": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+      "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^1.0.5",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^1.0.0",
+        "mkdirp": "^0.5.3",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
@@ -3502,13 +4679,91 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/@wdio/spec-reporter/node_modules/color-name": {
+    "node_modules/@wdio/sync/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/@wdio/spec-reporter/node_modules/supports-color": {
+    "node_modules/@wdio/sync/node_modules/devtools": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
+      "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "chrome-launcher": "^0.13.1",
+        "edge-paths": "^2.1.0",
+        "puppeteer-core": "^9.1.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "ua-parser-js": "^0.7.21",
+        "uuid": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/devtools-protocol": {
+      "version": "0.0.878340",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
+      "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
+      "dev": true
+    },
+    "node_modules/@wdio/sync/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/puppeteer-core": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
+      "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.869402",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.1.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
+      },
+      "engines": {
+        "node": ">=10.18.1"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/puppeteer-core/node_modules/devtools-protocol": {
+      "version": "0.0.869402",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+      "dev": true
+    },
+    "node_modules/@wdio/sync/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
@@ -3520,21 +4775,73 @@
         "node": ">=8"
       }
     },
-    "node_modules/@wdio/sync": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/@wdio/sync/-/sync-7.16.16.tgz",
-      "integrity": "sha512-MbVFAteaAOxHLKkMiMzOnh1hzINAK2U41GDIfy1yaPumcw1pNuJIhWrBYxprNMlqt8srk++wqQWgj5XpFjCL6g==",
+    "node_modules/@wdio/sync/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/webdriverio": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
+      "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
       "dev": true,
       "dependencies": {
-        "@types/fibers": "^3.1.0",
-        "@types/puppeteer": "^5.4.0",
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "fibers": "^5.0.0",
-        "webdriverio": "7.16.16"
+        "@types/aria-query": "^4.2.1",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/repl": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "archiver": "^5.0.0",
+        "aria-query": "^4.2.2",
+        "atob": "^2.1.2",
+        "css-shorthand-properties": "^1.1.1",
+        "css-value": "^0.0.1",
+        "devtools": "7.5.7",
+        "devtools-protocol": "^0.0.878340",
+        "fs-extra": "^10.0.0",
+        "get-port": "^5.1.1",
+        "grapheme-splitter": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isobject": "^3.0.2",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.zip": "^4.2.0",
+        "minimatch": "^3.0.4",
+        "puppeteer-core": "^9.1.0",
+        "query-selector-shadow-dom": "^1.0.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.5",
+        "serialize-error": "^8.0.0",
+        "webdriver": "7.5.3"
       },
       "engines": {
-        "node": ">=12.0.0 <16"
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/sync/node_modules/ws": {
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
     "node_modules/@wdio/types": {
@@ -3551,19 +4858,115 @@
       }
     },
     "node_modules/@wdio/utils": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.16.14.tgz",
-      "integrity": "sha512-wwin8nVpIlhmXJkq6GJw9aDDzgLOJKgXTcEua0T2sdXjoW78u5Ly/GZrFXTjMGhacFvoZfitTrjyfyy4CxMVvw==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.5.3.tgz",
+      "integrity": "sha512-nlLDKr8v8abLOHCKroBwQkGPdCIxjID2MllgWX23xqkYZylM9RdwPBdL8osQt9m3rq2TxiPAT4OlbzNt2WtN6Q==",
       "dev": true,
       "dependencies": {
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "p-iteration": "^1.1.8"
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/utils/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
         "node": ">=12.0.0"
       }
     },
+    "node_modules/@wdio/utils/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@wdio/utils/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/utils/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@wdio/utils/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@wdio/utils/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@wdio/utils/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@wdio/utils/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -3711,9 +5114,9 @@
       }
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.7.6",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.6.tgz",
-      "integrity": "sha512-HHXP9hskkFQHy8QxxUXkS7946FFIhYVfGqsk0WLwllmexN9x/+R4UBLvurHEuyXRfVEObVR8APuQehykLviwSQ==",
+      "version": "0.7.8",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.8.tgz",
+      "integrity": "sha512-PrJx38EfpitFhwmILRl37jAdBlsww6AZ6rRVK4QS7T7RHLhX7mSs647sTmgr9GIxe3qjXdesmomEgbgaokrVFg==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
@@ -3734,7 +5137,7 @@
     "node_modules/abbrev": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
+      "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==",
       "dev": true
     },
     "node_modules/accepts": {
@@ -3770,6 +5173,15 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/acorn-walk": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/aes-decrypter": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.3.tgz",
@@ -3783,10 +5195,13 @@
       }
     },
     "node_modules/agent-base": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
-      "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
       "engines": {
         "node": ">= 6.0.0"
       }
@@ -3807,10 +5222,19 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
     "node_modules/amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
       "dev": true,
       "optional": true,
       "engines": {
@@ -3818,9 +5242,9 @@
       }
     },
     "node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -3856,7 +5280,7 @@
     "node_modules/ansi-gray": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+      "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==",
       "dev": true,
       "dependencies": {
         "ansi-wrap": "0.1.0"
@@ -3900,7 +5324,7 @@
     "node_modules/ansi-wrap": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+      "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -3922,7 +5346,7 @@
     "node_modules/append-buffer": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
+      "integrity": "sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==",
       "dev": true,
       "dependencies": {
         "buffer-equal": "^1.0.0"
@@ -3932,13 +5356,13 @@
       }
     },
     "node_modules/archiver": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.0.tgz",
-      "integrity": "sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz",
+      "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",
       "dev": true,
       "dependencies": {
         "archiver-utils": "^2.1.0",
-        "async": "^3.2.0",
+        "async": "^3.2.3",
         "buffer-crc32": "^0.2.1",
         "readable-stream": "^3.6.0",
         "readdir-glob": "^1.0.0",
@@ -3971,9 +5395,9 @@
       }
     },
     "node_modules/archiver/node_modules/async": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
       "dev": true
     },
     "node_modules/archiver/node_modules/readable-stream": {
@@ -3993,7 +5417,7 @@
     "node_modules/archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
       "dev": true
     },
     "node_modules/argparse": {
@@ -4006,18 +5430,31 @@
       }
     },
     "node_modules/aria-query": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
-      "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
       "dev": true,
-      "engines": {
-        "node": ">=6.0"
+      "dependencies": {
+        "deep-equal": "^2.0.5"
       }
     },
     "node_modules/arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-diff/node_modules/array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4026,7 +5463,7 @@
     "node_modules/arr-filter": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
+      "integrity": "sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA==",
       "dev": true,
       "dependencies": {
         "make-iterator": "^1.0.0"
@@ -4047,7 +5484,7 @@
     "node_modules/arr-map": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
+      "integrity": "sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw==",
       "dev": true,
       "dependencies": {
         "make-iterator": "^1.0.0"
@@ -4057,9 +5494,9 @@
       }
     },
     "node_modules/arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4068,7 +5505,7 @@
     "node_modules/array-differ": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
+      "integrity": "sha512-LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4077,7 +5514,7 @@
     "node_modules/array-each": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+      "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4086,23 +5523,23 @@
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "node_modules/array-from": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
-      "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=",
+      "integrity": "sha512-GQTc6Uupx1FCavi5mPzBvVT7nEOeWMmUA9P95wpfpW1XwMSKs+KaymD5C2Up7KAUKg/mYwbsUYzdZWcoajlNZg==",
       "dev": true
     },
     "node_modules/array-includes": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
+      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5",
         "get-intrinsic": "^1.1.1",
         "is-string": "^1.0.7"
       },
@@ -4116,7 +5553,7 @@
     "node_modules/array-initial": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
+      "integrity": "sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==",
       "dev": true,
       "dependencies": {
         "array-slice": "^1.0.0",
@@ -4182,7 +5619,7 @@
     "node_modules/array-uniq": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4191,21 +5628,22 @@
     "node_modules/array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz",
-      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4238,7 +5676,7 @@
     "node_modules/assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
       "dev": true,
       "engines": {
         "node": ">=0.8"
@@ -4256,7 +5694,7 @@
     "node_modules/assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4274,7 +5712,7 @@
     "node_modules/async": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+      "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==",
       "dev": true
     },
     "node_modules/async-done": {
@@ -4310,7 +5748,7 @@
     "node_modules/async-settle": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
+      "integrity": "sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==",
       "dev": true,
       "dependencies": {
         "async-done": "^1.2.2"
@@ -4322,7 +5760,7 @@
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
     "node_modules/atob": {
@@ -4352,7 +5790,7 @@
     "node_modules/aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
       "dev": true,
       "engines": {
         "node": "*"
@@ -4367,7 +5805,7 @@
     "node_modules/babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
       "dev": true,
       "dependencies": {
         "chalk": "^1.1.3",
@@ -4378,7 +5816,7 @@
     "node_modules/babel-code-frame/node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4387,7 +5825,7 @@
     "node_modules/babel-code-frame/node_modules/ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4396,7 +5834,7 @@
     "node_modules/babel-code-frame/node_modules/chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^2.2.1",
@@ -4412,13 +5850,13 @@
     "node_modules/babel-code-frame/node_modules/js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
       "dev": true
     },
     "node_modules/babel-code-frame/node_modules/strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "dev": true,
       "dependencies": {
         "ansi-regex": "^2.0.0"
@@ -4430,7 +5868,7 @@
     "node_modules/babel-code-frame/node_modules/supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
       "dev": true,
       "engines": {
         "node": ">=0.8.0"
@@ -4475,7 +5913,7 @@
     "node_modules/babel-core/node_modules/json5": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
       "dev": true,
       "bin": {
         "json5": "lib/cli.js"
@@ -4484,18 +5922,9 @@
     "node_modules/babel-core/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
-    "node_modules/babel-core/node_modules/slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/babel-generator": {
       "version": "6.26.1",
       "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
@@ -4512,22 +5941,10 @@
         "trim-right": "^1.0.1"
       }
     },
-    "node_modules/babel-generator/node_modules/detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-      "dev": true,
-      "dependencies": {
-        "repeating": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/babel-generator/node_modules/jsesc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+      "integrity": "sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA==",
       "dev": true,
       "bin": {
         "jsesc": "bin/jsesc"
@@ -4536,7 +5953,7 @@
     "node_modules/babel-helpers": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "integrity": "sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==",
       "dev": true,
       "dependencies": {
         "babel-runtime": "^6.22.0",
@@ -4544,13 +5961,13 @@
       }
     },
     "node_modules/babel-loader": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz",
-      "integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
+      "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
       "dev": true,
       "dependencies": {
         "find-cache-dir": "^3.3.1",
-        "loader-utils": "^1.4.0",
+        "loader-utils": "^2.0.0",
         "make-dir": "^3.1.0",
         "schema-utils": "^2.6.5"
       },
@@ -4562,49 +5979,15 @@
         "webpack": ">=2"
       }
     },
-    "node_modules/babel-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/babel-loader/node_modules/loader-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/babel-messages": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
       "dev": true,
       "dependencies": {
         "babel-runtime": "^6.22.0"
       }
     },
-    "node_modules/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dependencies": {
-        "object.assign": "^4.1.0"
-      }
-    },
     "node_modules/babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
@@ -4621,29 +6004,13 @@
         "node": ">=8"
       }
     },
-    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
-      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
-      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
+      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
       "dependencies": {
-        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "@babel/compat-data": "^7.17.7",
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
         "semver": "^6.1.1"
       },
       "peerDependencies": {
@@ -4651,23 +6018,23 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
-      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
+      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "core-js-compat": "^3.21.0"
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "core-js-compat": "^3.25.1"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
-      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
+      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1"
+        "@babel/helper-define-polyfill-provider": "^0.3.3"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
@@ -4676,7 +6043,7 @@
     "node_modules/babel-register": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
-      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "integrity": "sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A==",
       "dev": true,
       "dependencies": {
         "babel-core": "^6.26.0",
@@ -4708,19 +6075,10 @@
         "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/babel-register/node_modules/source-map-support": {
-      "version": "0.4.18",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.5.6"
-      }
-    },
     "node_modules/babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
       "dev": true,
       "dependencies": {
         "core-js": "^2.4.0",
@@ -4735,10 +6093,16 @@
       "dev": true,
       "hasInstallScript": true
     },
+    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
+    },
     "node_modules/babel-template": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
       "dev": true,
       "dependencies": {
         "babel-runtime": "^6.26.0",
@@ -4751,7 +6115,7 @@
     "node_modules/babel-traverse": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
       "dev": true,
       "dependencies": {
         "babel-code-frame": "^6.26.0",
@@ -4786,13 +6150,13 @@
     "node_modules/babel-traverse/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
     "node_modules/babel-types": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
       "dev": true,
       "dependencies": {
         "babel-runtime": "^6.26.0",
@@ -4804,7 +6168,7 @@
     "node_modules/babel-types/node_modules/to-fast-properties": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4822,7 +6186,7 @@
     "node_modules/bach": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
+      "integrity": "sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg==",
       "dev": true,
       "dependencies": {
         "arr-filter": "^1.1.1",
@@ -4876,7 +6240,7 @@
     "node_modules/base/node_modules/define-property": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
       "dev": true,
       "dependencies": {
         "is-descriptor": "^1.0.0"
@@ -4926,16 +6290,22 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/basic-auth/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
     "node_modules/batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
       "dev": true
     },
     "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
       "dependencies": {
         "tweetnacl": "^0.14.3"
@@ -4944,7 +6314,7 @@
     "node_modules/beeper": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
+      "integrity": "sha512-3vqtKL1N45I5dV0RdssXZG7X6pCqQrWPNOlBPZPrd+QkE2HEhR57Z04m0KtpbsZH73j+a3F8UD1TQnn+ExTvIA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4971,7 +6341,7 @@
     "node_modules/binary": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
+      "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==",
       "dev": true,
       "dependencies": {
         "buffers": "~0.1.1",
@@ -5040,13 +6410,13 @@
     "node_modules/bluebird": {
       "version": "3.4.7",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
-      "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
+      "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==",
       "dev": true
     },
     "node_modules/body": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-      "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+      "integrity": "sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==",
       "dev": true,
       "dependencies": {
         "continuable-cache": "^0.3.1",
@@ -5056,23 +6426,26 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dependencies": {
         "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
     "node_modules/body-parser/node_modules/debug": {
@@ -5086,18 +6459,18 @@
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/body/node_modules/bytes": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-      "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
+      "integrity": "sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==",
       "dev": true
     },
     "node_modules/body/node_modules/raw-body": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-      "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
+      "integrity": "sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg==",
       "dev": true,
       "dependencies": {
         "bytes": "1",
@@ -5110,7 +6483,7 @@
     "node_modules/body/node_modules/string_decoder": {
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
       "dev": true
     },
     "node_modules/brace-expansion": {
@@ -5142,9 +6515,9 @@
       "dev": true
     },
     "node_modules/browserslist": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
-      "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
+      "version": "4.21.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
       "funding": [
         {
           "type": "opencollective",
@@ -5156,10 +6529,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001370",
-        "electron-to-chromium": "^1.4.202",
+        "caniuse-lite": "^1.0.30001400",
+        "electron-to-chromium": "^1.4.251",
         "node-releases": "^2.0.6",
-        "update-browserslist-db": "^1.0.5"
+        "update-browserslist-db": "^1.0.9"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -5178,12 +6551,13 @@
       }
     },
     "node_modules/browserstack-local": {
-      "version": "1.4.9",
-      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.4.9.tgz",
-      "integrity": "sha512-V+q8HQwRQFr9nd32xR66ZZ3VDWa3Kct4IMMudhKgcuD7cWrvvFARZOibx71II+Rf7P5nMQpWWxl9z/3p927nbg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.5.1.tgz",
+      "integrity": "sha512-T/wxyWDzvBHbDvl7fZKpFU7mYze6nrUkBhNy+d+8bXBqgQX10HTYvajIGO0wb49oGSLCPM0CMZTV/s7e6LF0sA==",
       "dev": true,
       "dependencies": {
-        "https-proxy-agent": "^4.0.0",
+        "agent-base": "^6.0.2",
+        "https-proxy-agent": "^5.0.1",
         "is-running": "^2.1.0",
         "ps-tree": "=1.2.0",
         "temp-fs": "^0.9.9"
@@ -5224,9 +6598,9 @@
       }
     },
     "node_modules/browserstacktunnel-wrapper": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-2.0.4.tgz",
-      "integrity": "sha512-GCV599FUUxNOCFl3WgPnfc5dcqq9XTmMXoxWpqkvmk0R9TOIoqmjENNU6LY6DtgIL6WfBVbg/jmWtnM5K6UYSg==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-2.0.5.tgz",
+      "integrity": "sha512-oociT3nl+FhQnyJbAb1RM4oQ5pN7aKeXEURkTkiEVm/Rji2r0agl3Wbw5V23VFn9lCU5/fGyDejRZPtGYsEcFw==",
       "dev": true,
       "dependencies": {
         "https-proxy-agent": "^2.2.1",
@@ -5297,19 +6671,22 @@
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
       "dev": true,
       "engines": {
         "node": "*"
       }
     },
     "node_modules/buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz",
+      "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==",
       "dev": true,
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/buffer-from": {
@@ -5330,7 +6707,7 @@
     "node_modules/buffers": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
+      "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==",
       "dev": true,
       "engines": {
         "node": ">=0.2.0"
@@ -5347,7 +6724,7 @@
     "node_modules/cac": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/cac/-/cac-3.0.4.tgz",
-      "integrity": "sha1-bSTO7Dcu/lybeYgIvH9JtHJCpO8=",
+      "integrity": "sha512-hq4rxE3NT5PlaEiVV39Z45d6MoFcQZG5dsgJqtAUeOz3408LEQAElToDkf9i5IYSCOmK0If/81dLg7nKxqPR0w==",
       "dev": true,
       "dependencies": {
         "camelcase-keys": "^3.0.0",
@@ -5365,7 +6742,7 @@
     "node_modules/cac/node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -5374,38 +6751,16 @@
     "node_modules/cac/node_modules/ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cac/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/cac/node_modules/camelcase-keys": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-3.0.0.tgz",
-      "integrity": "sha1-/AxsNgNj9zd+N5O5oWvM8QcMHKQ=",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/cac/node_modules/chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^2.2.1",
@@ -5421,7 +6776,7 @@
     "node_modules/cac/node_modules/find-up": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
       "dev": true,
       "dependencies": {
         "path-exists": "^2.0.0",
@@ -5431,19 +6786,28 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/cac/node_modules/indent-string": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-      "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+    "node_modules/cac/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/cac/node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
-      "engines": {
-        "node": ">=4"
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
       }
     },
     "node_modules/cac/node_modules/path-exists": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
       "dev": true,
       "dependencies": {
         "pinkie-promise": "^2.0.0"
@@ -5455,7 +6819,7 @@
     "node_modules/cac/node_modules/read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
       "dev": true,
       "dependencies": {
         "load-json-file": "^1.0.0",
@@ -5469,7 +6833,7 @@
     "node_modules/cac/node_modules/read-pkg-up": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
       "dev": true,
       "dependencies": {
         "find-up": "^1.0.0",
@@ -5479,10 +6843,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/cac/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/cac/node_modules/strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "dev": true,
       "dependencies": {
         "ansi-regex": "^2.0.0"
@@ -5494,7 +6867,7 @@
     "node_modules/cac/node_modules/supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
       "dev": true,
       "engines": {
         "node": ">=0.8.0"
@@ -5592,6 +6965,28 @@
         "node": ">=6"
       }
     },
+    "node_modules/camelcase-keys": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-3.0.0.tgz",
+      "integrity": "sha512-U4E6A6aFyYnNW+tDt5/yIUKQURKXe3WMFPfX4FxrQFcwZ/R08AUk1xWcUtlr7oq6CV07Ji+aa69V2g7BSpblnQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^3.0.0",
+        "map-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/camelcase-keys/node_modules/camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/can-autoplay": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/can-autoplay/-/can-autoplay-3.0.2.tgz",
@@ -5599,9 +6994,9 @@
       "dev": true
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001390",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz",
-      "integrity": "sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g==",
+      "version": "1.0.30001429",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001429.tgz",
+      "integrity": "sha512-511ThLu1hF+5RRRt0zYCf2U2yRr9GPF6m5y90SBCWsvSoYoW7yAGlv/elyPaNfvGCkp6kj/KFZWU0BMA69Prsg==",
       "funding": [
         {
           "type": "opencollective",
@@ -5616,7 +7011,7 @@
     "node_modules/caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
       "dev": true
     },
     "node_modules/ccount": {
@@ -5650,7 +7045,7 @@
     "node_modules/chainsaw": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+      "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==",
       "dev": true,
       "dependencies": {
         "traverse": ">=0.3.0 <0.4"
@@ -5672,25 +7067,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/chalk/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chalk/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/character-entities": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
@@ -5730,7 +7106,7 @@
     "node_modules/check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
       "dev": true,
       "engines": {
         "node": "*"
@@ -5770,9 +7146,9 @@
       "dev": true
     },
     "node_modules/chrome-launcher": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.15.0.tgz",
-      "integrity": "sha512-ZQqX5kb9H0+jy1OqLnWampfocrtSZaGl7Ny3F9GRha85o4odbL8x55paUzh51UC7cEmZ5obp3H2Mm70uC2PpRA==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.15.1.tgz",
+      "integrity": "sha512-UugC8u59/w2AyX5sHLZUHoxBAiSiunUhZa3zZwMH6zPVis0C3dDKiRWyUGIo14tTbZHGVviWxv3PQWZ7taZ4fg==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -5823,10 +7199,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/class-utils/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/class-utils/node_modules/define-property": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
       "dependencies": {
         "is-descriptor": "^0.1.0"
@@ -5838,7 +7223,7 @@
     "node_modules/class-utils/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
       "dev": true,
       "dependencies": {
         "kind-of": "^3.0.2"
@@ -5850,7 +7235,7 @@
     "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
       "dependencies": {
         "is-buffer": "^1.1.5"
@@ -5868,7 +7253,7 @@
     "node_modules/class-utils/node_modules/is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
       "dev": true,
       "dependencies": {
         "kind-of": "^3.0.2"
@@ -5880,7 +7265,7 @@
     "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
       "dependencies": {
         "is-buffer": "^1.1.5"
@@ -5916,9 +7301,9 @@
       }
     },
     "node_modules/cli-spinners": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz",
+      "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -5937,20 +7322,23 @@
       }
     },
     "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
       "dependencies": {
         "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
+        "strip-ansi": "^6.0.1",
         "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/clone": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
       "dev": true,
       "engines": {
         "node": ">=0.8"
@@ -5959,25 +7347,28 @@
     "node_modules/clone-buffer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+      "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
       "dev": true,
       "engines": {
         "node": ">= 0.10"
       }
     },
     "node_modules/clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
+      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
       "dev": true,
       "dependencies": {
         "mimic-response": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/clone-stats": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+      "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
       "dev": true
     },
     "node_modules/cloneable-readable": {
@@ -5994,7 +7385,7 @@
     "node_modules/code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -6003,7 +7394,7 @@
     "node_modules/collection-map": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
+      "integrity": "sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==",
       "dev": true,
       "dependencies": {
         "arr-map": "^2.0.2",
@@ -6017,7 +7408,7 @@
     "node_modules/collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
       "dev": true,
       "dependencies": {
         "map-visit": "^1.0.0",
@@ -6038,7 +7429,7 @@
     "node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
     },
     "node_modules/color-support": {
       "version": "1.1.3",
@@ -6080,10 +7471,16 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
     "node_modules/commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
       "dev": true
     },
     "node_modules/component-emitter": {
@@ -6124,7 +7521,7 @@
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
     "node_modules/concat-stream": {
@@ -6193,12 +7590,51 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/connect/node_modules/finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/connect/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "node_modules/connect/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/connect/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/content-disposition": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -6210,25 +7646,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
@@ -6240,21 +7657,18 @@
     "node_modules/continuable-cache": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-      "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+      "integrity": "sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA==",
       "dev": true
     },
     "node_modules/convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
     },
     "node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -6262,12 +7676,12 @@
     "node_modules/cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "node_modules/copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -6284,10 +7698,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz",
-      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz",
+      "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -6295,31 +7708,21 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz",
-      "integrity": "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==",
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz",
+      "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==",
       "dependencies": {
-        "browserslist": "^4.19.1",
-        "semver": "7.0.0"
+        "browserslist": "^4.21.4"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/core-js-compat/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/core-js-pure": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz",
-      "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==",
-      "deprecated": "core-js-pure@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js-pure.",
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.0.tgz",
+      "integrity": "sha512-LiN6fylpVBVwT8twhhluD9TzXmZQQsr2I2eIKtWNbZI1XMfBT7CV18itaN6RA7EtQd/SDdRx/wzvAShX2HvhQA==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -6365,14 +7768,10 @@
       }
     },
     "node_modules/crc-32": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz",
-      "integrity": "sha512-Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
       "dev": true,
-      "dependencies": {
-        "exit-on-epipe": "~1.0.1",
-        "printj": "~1.3.1"
-      },
       "bin": {
         "crc32": "bin/crc32.njs"
       },
@@ -6460,7 +7859,7 @@
     "node_modules/css-value": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
-      "integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
+      "integrity": "sha512-FUV3xaJ63buRLgHrLQVlVgQnQdR4yqdLGaDu7g8CQcWjInDfM9plBTPI9FRfpahju1UBSaMckeb2/46ApS/V1Q==",
       "dev": true
     },
     "node_modules/css/node_modules/source-map": {
@@ -6475,7 +7874,7 @@
     "node_modules/custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
+      "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==",
       "dev": true
     },
     "node_modules/d": {
@@ -6491,7 +7890,7 @@
     "node_modules/dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
       "dependencies": {
         "assert-plus": "^1.0.0"
@@ -6501,9 +7900,9 @@
       }
     },
     "node_modules/date-format": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.4.tgz",
-      "integrity": "sha512-/jyf4rhB17ge328HJuJjAcmRtCsGd+NDeAtahRBTaK6vSPR6MO5HlrAit3Nn7dVjaa6sowW0WXt8yQtLyZQFRg==",
+      "version": "4.0.14",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
+      "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==",
       "dev": true,
       "engines": {
         "node": ">=4.0"
@@ -6512,7 +7911,7 @@
     "node_modules/dateformat": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
+      "integrity": "sha512-GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw==",
       "dev": true,
       "engines": {
         "node": "*"
@@ -6526,9 +7925,9 @@
       "optional": true
     },
     "node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -6562,12 +7961,15 @@
       }
     },
     "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/decode-named-character-reference": {
@@ -6586,7 +7988,7 @@
     "node_modules/decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==",
       "dev": true,
       "engines": {
         "node": ">=0.10"
@@ -6687,25 +8089,28 @@
     "node_modules/default-resolution": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
+      "integrity": "sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ==",
       "dev": true,
       "engines": {
         "node": ">= 0.10"
       }
     },
     "node_modules/defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
       "dev": true,
       "dependencies": {
         "clone": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/defaults/node_modules/clone": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
       "dev": true,
       "engines": {
         "node": ">=0.8"
@@ -6721,14 +8126,19 @@
       }
     },
     "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
       "dependencies": {
-        "object-keys": "^1.0.12"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-property": {
@@ -6747,18 +8157,18 @@
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/dequal": {
@@ -6771,23 +8181,39 @@
       }
     },
     "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
     "node_modules/detect-file": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+      "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A==",
+      "dev": true,
+      "dependencies": {
+        "repeating": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
       "dev": true,
       "bin": {
         "detect-libc": "bin/detect-libc.js"
@@ -6799,46 +8225,237 @@
     "node_modules/detect-newline": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
+      "integrity": "sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/devtools": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
-      "integrity": "sha512-M0kzkuSgfEhpqIis3gdtWsNjn/HQ+vRAmEzDnbYx/7FfjFxhSv1d+rOOT20pvd60soItMYpsOova1igACEGkGQ==",
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.25.4.tgz",
+      "integrity": "sha512-R6/S/dCqxoX4Y6PxIGM9JFAuSRZzUeV5r+CoE/frhmno6mTe7dEEgwkJlfit3LkKRoul8n4DsL2A3QtWOvq5IA==",
       "dev": true,
       "dependencies": {
-        "@types/node": "^17.0.4",
+        "@types/node": "^18.0.0",
         "@types/ua-parser-js": "^0.7.33",
-        "@wdio/config": "7.16.16",
-        "@wdio/logger": "7.16.0",
-        "@wdio/protocols": "7.16.7",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
+        "@wdio/config": "7.25.4",
+        "@wdio/logger": "7.19.0",
+        "@wdio/protocols": "7.22.0",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
         "chrome-launcher": "^0.15.0",
         "edge-paths": "^2.1.0",
         "puppeteer-core": "^13.1.3",
         "query-selector-shadow-dom": "^1.0.0",
         "ua-parser-js": "^1.0.1",
-        "uuid": "^8.0.0"
+        "uuid": "^9.0.0"
       },
       "engines": {
         "node": ">=12.0.0"
       }
     },
     "node_modules/devtools-protocol": {
-      "version": "0.0.973690",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.973690.tgz",
-      "integrity": "sha512-myh3hSFp0YWa2GED11PmbLhV4dv9RdO7YUz27XJrbQLnP5bMbZL6dfOOILTHO57yH0kX5GfuOZBsg/4NamfPvQ==",
+      "version": "0.0.1061995",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1061995.tgz",
+      "integrity": "sha512-pKZZWTjWa/IF4ENCg6GN8bu/AxSZgdhjSa26uc23wz38Blt2Tnm9icOPcSG3Cht55rMq35in1w3rWVPcZ60ArA==",
+      "dev": true
+    },
+    "node_modules/devtools/node_modules/@types/node": {
+      "version": "18.11.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
       "dev": true
     },
+    "node_modules/devtools/node_modules/@wdio/config": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.25.4.tgz",
+      "integrity": "sha512-vb0emDtD9FbFh/yqW6oNdo2iuhQp8XKj6GX9fyy9v4wZgg3B0HPMVJxhIfcoHz7LMBWlHSo9YdvhFI5EQHRLBA==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "7.19.0",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
+        "deepmerge": "^4.0.0",
+        "glob": "^8.0.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/devtools/node_modules/@wdio/logger": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.19.0.tgz",
+      "integrity": "sha512-xR7SN/kGei1QJD1aagzxs3KMuzNxdT/7LYYx+lt6BII49+fqL/SO+5X0FDCZD0Ds93AuQvvz9eGyzrBI2FFXmQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/devtools/node_modules/@wdio/protocols": {
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.22.0.tgz",
+      "integrity": "sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/devtools/node_modules/@wdio/types": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
+      "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^18.0.0",
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "^4.6.2"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/devtools/node_modules/@wdio/utils": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.25.4.tgz",
+      "integrity": "sha512-8iwQDk+foUqSzKZKfhLxjlCKOkfRJPNHaezQoevNgnrTq/t0ek+ldZCATezb9B8jprAuP4mgS9xi22akc6RkzA==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "7.19.0",
+        "@wdio/types": "7.25.4",
+        "p-iteration": "^1.1.8"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/devtools/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/devtools/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/devtools/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/devtools/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/devtools/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/devtools/node_modules/glob": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+      "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/devtools/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/devtools/node_modules/minimatch": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/devtools/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/devtools/node_modules/ua-parser-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.2.tgz",
-      "integrity": "sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg==",
+      "version": "1.0.32",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.32.tgz",
+      "integrity": "sha512-dXVsz3M4j+5tTiovFVyVqssXBu5HM47//YSOeZ9fQkdDKkfzv2v3PP1jmH6FUyPW+yCSn7aBVK1fGGKNhowdDA==",
       "dev": true,
       "funding": [
         {
@@ -6855,9 +8472,9 @@
       }
     },
     "node_modules/devtools/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
       "dev": true,
       "bin": {
         "uuid": "dist/bin/uuid"
@@ -6866,25 +8483,25 @@
     "node_modules/di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
+      "integrity": "sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==",
       "dev": true
     },
     "node_modules/diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
+      "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
       "dev": true,
       "engines": {
         "node": ">=0.3.1"
       }
     },
     "node_modules/diff-sequences": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true,
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 10.14.2"
       }
     },
     "node_modules/dlv": {
@@ -6987,9 +8604,9 @@
       }
     },
     "node_modules/documentation/node_modules/chalk": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz",
+      "integrity": "sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==",
       "dev": true,
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
@@ -6998,15 +8615,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/documentation/node_modules/diff": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
-      "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
     "node_modules/documentation/node_modules/glob": {
       "version": "8.0.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
@@ -7026,15 +8634,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/documentation/node_modules/ini": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz",
-      "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==",
-      "dev": true,
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
     "node_modules/documentation/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -7059,25 +8658,13 @@
         "node": ">=10"
       }
     },
-    "node_modules/documentation/node_modules/strip-json-comments": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
-      "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/documentation/node_modules/yargs": {
-      "version": "17.5.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+      "version": "17.6.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
+      "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
       "dev": true,
       "dependencies": {
-        "cliui": "^7.0.2",
+        "cliui": "^8.0.1",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
@@ -7092,7 +8679,7 @@
     "node_modules/dom-serialize": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
+      "integrity": "sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==",
       "dev": true,
       "dependencies": {
         "custom-event": "~1.0.0",
@@ -7122,14 +8709,38 @@
       "dev": true
     },
     "node_modules/duplexer2": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
       "dev": true,
       "dependencies": {
-        "readable-stream": "^2.0.2"
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "node_modules/duplexer2/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/duplexer2/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
       }
     },
+    "node_modules/duplexer2/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
     "node_modules/duplexify": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
@@ -7199,7 +8810,7 @@
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
       "dependencies": {
         "jsbn": "~0.1.0",
@@ -7219,7 +8830,7 @@
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/ejs": {
       "version": "3.1.8",
@@ -7237,14 +8848,14 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.243",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.243.tgz",
-      "integrity": "sha512-BgLD2gBX43OSXwlT01oYRRD5NIB4n3okTRxkzEAC6G0SZG4TTlyrWMjbOo0fajCwqwpRtMHXQNMjtRN6qpNtfw=="
+      "version": "1.4.284",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
     },
     "node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
     "node_modules/emojis-list": {
@@ -7259,7 +8870,7 @@
     "node_modules/encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -7274,9 +8885,9 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.3.tgz",
-      "integrity": "sha512-rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz",
+      "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==",
       "dev": true,
       "dependencies": {
         "@types/cookie": "^0.4.1",
@@ -7295,21 +8906,27 @@
       }
     },
     "node_modules/engine.io-parser": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz",
-      "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
+      "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==",
       "dev": true,
-      "dependencies": {
-        "@socket.io/base64-arraybuffer": "~1.0.2"
-      },
       "engines": {
         "node": ">=10.0.0"
       }
     },
+    "node_modules/engine.io/node_modules/cookie": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/enhanced-resolve": {
-      "version": "5.9.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
-      "integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
+      "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -7334,7 +8951,7 @@
     "node_modules/ent": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+      "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==",
       "dev": true
     },
     "node_modules/errno": {
@@ -7368,31 +8985,35 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
+      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
+        "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7426,6 +9047,15 @@
       "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
       "dev": true
     },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
     "node_modules/es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -7459,9 +9089,9 @@
       }
     },
     "node_modules/es5-shim": {
-      "version": "4.6.5",
-      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.6.5.tgz",
-      "integrity": "sha512-vfQ4UAai8szn0sAubCy97xnZ4sJVDD1gt/Grn736hg8D7540wemIb1YPrYZSTqlM2H69EQX1or4HU/tSwRTI3w==",
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.6.7.tgz",
+      "integrity": "sha512-jg21/dmlrNQI7JyyA2w7n+yifSxBng0ZralnSfVZjoCawgNTCnS+yBCyVM9DL5itm7SUnDGgv7hcq2XCZX4iRQ==",
       "dev": true,
       "engines": {
         "node": ">=0.4.0"
@@ -7470,7 +9100,7 @@
     "node_modules/es6-iterator": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
       "dev": true,
       "dependencies": {
         "d": "1",
@@ -7481,7 +9111,7 @@
     "node_modules/es6-object-assign": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-      "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=",
+      "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==",
       "dev": true
     },
     "node_modules/es6-promise": {
@@ -7493,7 +9123,7 @@
     "node_modules/es6-promisify": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==",
       "dev": true,
       "dependencies": {
         "es6-promise": "^4.0.3"
@@ -7532,12 +9162,12 @@
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -7545,7 +9175,7 @@
     "node_modules/escodegen": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+      "integrity": "sha512-yhi5S+mNTOuRvyW4gWlg5W1byMaQGWWSYHXsuFZ7GBo7tpyOwi2EdzMP/QWxh9hwkD2m+wDVHJsxhRIj+v/b/A==",
       "dev": true,
       "dependencies": {
         "esprima": "^2.7.1",
@@ -7567,7 +9197,7 @@
     "node_modules/escodegen/node_modules/estraverse": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-      "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+      "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -7576,7 +9206,7 @@
     "node_modules/escodegen/node_modules/levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "dev": true,
       "dependencies": {
         "prelude-ls": "~1.1.2",
@@ -7606,7 +9236,7 @@
     "node_modules/escodegen/node_modules/prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
       "dev": true,
       "engines": {
         "node": ">= 0.8.0"
@@ -7615,7 +9245,7 @@
     "node_modules/escodegen/node_modules/source-map": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-      "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
+      "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -7628,7 +9258,7 @@
     "node_modules/escodegen/node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
       "dev": true,
       "dependencies": {
         "prelude-ls": "~1.1.2"
@@ -7697,7 +9327,7 @@
     "node_modules/eslint-config-standard": {
       "version": "10.2.1",
       "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
-      "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=",
+      "integrity": "sha512-UkFojTV1o0GOe1edOEiuI5ccYLJSuNngtqSeClNzhsmG8KPJ+7mRxgtp2oYhqZAK/brlXMoCd+VgXViE0AfyKw==",
       "dev": true,
       "peerDependencies": {
         "eslint": ">=3.19.0",
@@ -7727,16 +9357,20 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
+        "debug": "^3.2.7"
       },
       "engines": {
         "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-module-utils/node_modules/debug": {
@@ -7768,9 +9402,9 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.25.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz",
-      "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==",
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.4",
@@ -7778,14 +9412,14 @@
         "debug": "^2.6.9",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.2",
+        "eslint-module-utils": "^2.7.3",
         "has": "^1.0.3",
-        "is-core-module": "^2.8.0",
+        "is-core-module": "^2.8.1",
         "is-glob": "^4.0.3",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "object.values": "^1.1.5",
-        "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.12.0"
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
       },
       "engines": {
         "node": ">=4"
@@ -7818,7 +9452,7 @@
     "node_modules/eslint-plugin-import/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
     "node_modules/eslint-plugin-node": {
@@ -7930,22 +9564,6 @@
         "@babel/highlight": "^7.10.4"
       }
     },
-    "node_modules/eslint/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
     "node_modules/eslint/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -8008,9 +9626,9 @@
       }
     },
     "node_modules/eslint/node_modules/globals": {
-      "version": "13.12.1",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz",
-      "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -8022,10 +9640,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/eslint/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -8099,7 +9726,7 @@
     "node_modules/esprima": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+      "integrity": "sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==",
       "dev": true,
       "bin": {
         "esparse": "bin/esparse.js",
@@ -8178,7 +9805,7 @@
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -8186,7 +9813,7 @@
     "node_modules/event-emitter": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
       "dev": true,
       "dependencies": {
         "d": "1",
@@ -8196,7 +9823,7 @@
     "node_modules/event-stream": {
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-      "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+      "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
       "dev": true,
       "dependencies": {
         "duplexer": "~0.1.1",
@@ -8211,7 +9838,7 @@
     "node_modules/event-stream/node_modules/map-stream": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-      "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
+      "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
       "dev": true
     },
     "node_modules/eventemitter3": {
@@ -8266,7 +9893,7 @@
     "node_modules/execa/node_modules/path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -8284,7 +9911,7 @@
     "node_modules/execa/node_modules/shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dev": true,
       "dependencies": {
         "shebang-regex": "^1.0.0"
@@ -8296,7 +9923,7 @@
     "node_modules/execa/node_modules/shebang-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -8314,19 +9941,10 @@
         "which": "bin/which"
       }
     },
-    "node_modules/exit-on-epipe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
-      "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
       "dev": true,
       "dependencies": {
         "debug": "^2.3.3",
@@ -8353,7 +9971,7 @@
     "node_modules/expand-brackets/node_modules/define-property": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
       "dependencies": {
         "is-descriptor": "^0.1.0"
@@ -8365,7 +9983,7 @@
     "node_modules/expand-brackets/node_modules/extend-shallow": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
       "dependencies": {
         "is-extendable": "^0.1.0"
@@ -8377,7 +9995,7 @@
     "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
       "dev": true,
       "dependencies": {
         "kind-of": "^3.0.2"
@@ -8389,7 +10007,7 @@
     "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
       "dependencies": {
         "is-buffer": "^1.1.5"
@@ -8407,7 +10025,7 @@
     "node_modules/expand-brackets/node_modules/is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
       "dev": true,
       "dependencies": {
         "kind-of": "^3.0.2"
@@ -8419,7 +10037,7 @@
     "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
       "dependencies": {
         "is-buffer": "^1.1.5"
@@ -8445,7 +10063,7 @@
     "node_modules/expand-brackets/node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -8454,13 +10072,13 @@
     "node_modules/expand-brackets/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
     "node_modules/expand-tilde": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
       "dev": true,
       "dependencies": {
         "homedir-polyfill": "^1.0.1"
@@ -8470,62 +10088,98 @@
       }
     },
     "node_modules/expect": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1"
+        "@jest/types": "^26.6.2",
+        "ansi-styles": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 10.14.2"
       }
     },
     "node_modules/expect-webdriverio": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-3.1.4.tgz",
-      "integrity": "sha512-65FTS3bmxcIp0cq6fLb/72TrCQXBCpwPLC7SwMWdpPlLq461mXcK1BPKJJjnIC587aXSKD+3E4hvnlCtwDmXfg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-2.0.2.tgz",
+      "integrity": "sha512-dst0tqP1aZ2p7TPmbatqoIQ+7hRTw+IeKNi830XxKhu2DNNe5vQ85i9ttf9rpXgbnUf91HxKcocn4G7A5bQxDA==",
       "dev": true,
       "dependencies": {
-        "expect": "^27.0.2",
-        "jest-matcher-utils": "^27.0.2"
+        "expect": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2"
       }
     },
+    "node_modules/expect/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/expect/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/expect/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "node_modules/express": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
-      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.2",
+        "body-parser": "1.20.1",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.2",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.9.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
         "setprototypeof": "1.2.0",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -8545,40 +10199,21 @@
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/ext": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
-      "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
+      "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
       "dev": true,
       "dependencies": {
-        "type": "^2.5.0"
+        "type": "^2.7.2"
       }
     },
     "node_modules/ext/node_modules/type": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz",
-      "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==",
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+      "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
       "dev": true
     },
     "node_modules/extend": {
@@ -8588,18 +10223,26 @@
       "dev": true
     },
     "node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
       "dev": true,
       "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+        "kind-of": "^1.1.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/extend-shallow/node_modules/kind-of": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+      "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/external-editor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
@@ -8614,18 +10257,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/external-editor/node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
     "node_modules/extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
@@ -8648,7 +10279,7 @@
     "node_modules/extglob/node_modules/define-property": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
       "dev": true,
       "dependencies": {
         "is-descriptor": "^1.0.0"
@@ -8660,7 +10291,7 @@
     "node_modules/extglob/node_modules/extend-shallow": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
       "dependencies": {
         "is-extendable": "^0.1.0"
@@ -8672,7 +10303,7 @@
     "node_modules/extglob/node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -8716,7 +10347,7 @@
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
       "dev": true,
       "engines": [
         "node >=0.6.0"
@@ -8758,13 +10389,13 @@
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
     "node_modules/faye-websocket": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "integrity": "sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ==",
       "dev": true,
       "dependencies": {
         "websocket-driver": ">=0.5.1"
@@ -8776,16 +10407,16 @@
     "node_modules/fd-slicer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
       "dev": true,
       "dependencies": {
         "pend": "~1.2.0"
       }
     },
     "node_modules/fibers": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/fibers/-/fibers-5.0.1.tgz",
-      "integrity": "sha512-VMC7Frt87Oo0AOJ6EcPFbi+tZmkQ4tD85aatwyWL6I9cYMJmm2e+pXUJsfGZ36U7MffXtjou2XIiWJMtHriErw==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/fibers/-/fibers-5.0.3.tgz",
+      "integrity": "sha512-/qYTSoZydQkM21qZpGLDLuCq8c+B8KhuCQ1kLPvnRNhxhVbvrpmH9l2+Lblf5neDuEsY4bfT7LeO553TXQDvJw==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -8872,16 +10503,16 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "engines": {
@@ -8899,7 +10530,7 @@
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/find-cache-dir": {
       "version": "3.3.2",
@@ -8919,15 +10550,16 @@
       }
     },
     "node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^2.0.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/findup-sync": {
@@ -8945,6 +10577,182 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/findup-sync/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/braces/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/fill-range/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/findup-sync/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/fined": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
@@ -9005,9 +10813,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
     "node_modules/flush-write-stream": {
@@ -9021,9 +10829,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
-      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "dev": true,
       "funding": [
         {
@@ -9040,10 +10848,19 @@
         }
       }
     },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
     "node_modules/for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -9052,7 +10869,7 @@
     "node_modules/for-own": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+      "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
       "dev": true,
       "dependencies": {
         "for-in": "^1.0.1"
@@ -9061,22 +10878,16 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-      "dev": true
-    },
     "node_modules/foreachasync": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz",
-      "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=",
+      "integrity": "sha512-J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw==",
       "dev": true
     },
     "node_modules/forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true,
       "engines": {
         "node": "*"
@@ -9085,7 +10896,7 @@
     "node_modules/fork-stream": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
-      "integrity": "sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA=",
+      "integrity": "sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==",
       "dev": true
     },
     "node_modules/form-data": {
@@ -9113,7 +10924,7 @@
     "node_modules/fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
       "dev": true,
       "dependencies": {
         "map-cache": "^0.2.2"
@@ -9125,7 +10936,7 @@
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -9133,7 +10944,7 @@
     "node_modules/from": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
+      "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==",
       "dev": true
     },
     "node_modules/fs-constants": {
@@ -9143,9 +10954,9 @@
       "dev": true
     },
     "node_modules/fs-extra": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-      "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.0",
@@ -9159,7 +10970,7 @@
     "node_modules/fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
+      "integrity": "sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.1.11",
@@ -9182,7 +10993,7 @@
     "node_modules/fs.extra": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz",
-      "integrity": "sha1-3QI/kwE77iRTHxszUUw3sg/ZM0k=",
+      "integrity": "sha512-Ig401VXtyrWrz23k9KxAx9OrnL8AHSLNhQ8YJH2wSYuH0ZUfxwBeY6zXkd/oOyVRFTlpEu/0n5gHeuZt7aqbkw==",
       "dev": true,
       "dependencies": {
         "fs-extra": "~0.6.1",
@@ -9196,7 +11007,7 @@
     "node_modules/fs.extra/node_modules/fs-extra": {
       "version": "0.6.4",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz",
-      "integrity": "sha1-9G8MdbeEH40gCzNIzU1pHVoJnRU=",
+      "integrity": "sha512-5rU898vl/Z948L+kkJedbmo/iltzmiF5bn/eEk0j/SgrPpI+Ydau9xlJPicV7Av2CHYBGz5LAlwTnBU80j1zPQ==",
       "dev": true,
       "dependencies": {
         "jsonfile": "~1.0.1",
@@ -9208,20 +11019,20 @@
     "node_modules/fs.extra/node_modules/jsonfile": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz",
-      "integrity": "sha1-6l7+QLg2kLmGZ2FKc5L8YOhCwN0=",
+      "integrity": "sha512-KbsDJNRfRPF5v49tMNf9sqyyGqGLBcz1v5kZT01kG5ns5mQSltwxCKVmUzVKtEinkUnTDtSrp6ngWpV7Xw0ZlA==",
       "dev": true
     },
     "node_modules/fs.extra/node_modules/mkdirp": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-      "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=",
+      "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
       "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
       "dev": true
     },
     "node_modules/fs.extra/node_modules/rimraf": {
       "version": "2.2.8",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-      "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=",
+      "integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
       "dev": true,
       "bin": {
         "rimraf": "bin.js"
@@ -9230,7 +11041,7 @@
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "dev": true
     },
     "node_modules/fsevents": {
@@ -9262,12 +11073,12 @@
       }
     },
     "node_modules/fstream/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.5"
+        "minimist": "^1.2.6"
       },
       "bin": {
         "mkdirp": "bin/cmd.js"
@@ -9298,12 +11109,39 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
       "dev": true
     },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/gaze": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
@@ -9336,20 +11174,20 @@
     "node_modules/get-func-name": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
       "dev": true,
       "engines": {
         "node": "*"
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
+        "has-symbols": "^1.0.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -9407,7 +11245,7 @@
     "node_modules/get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -9416,7 +11254,7 @@
     "node_modules/getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
       "dependencies": {
         "assert-plus": "^1.0.0"
@@ -9448,15 +11286,15 @@
       "dev": true
     },
     "node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.1",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
       },
@@ -9513,7 +11351,7 @@
     "node_modules/glob-stream/node_modules/is-glob": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
       "dev": true,
       "dependencies": {
         "is-extglob": "^2.1.0"
@@ -9559,7 +11397,7 @@
     "node_modules/glob-watcher/node_modules/anymatch/node_modules/normalize-path": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
       "dev": true,
       "dependencies": {
         "remove-trailing-separator": "^1.0.1"
@@ -9568,6 +11406,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/glob-watcher/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/glob-watcher/node_modules/binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -9624,7 +11471,7 @@
     "node_modules/glob-watcher/node_modules/extend-shallow": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
       "dependencies": {
         "is-extendable": "^0.1.0"
@@ -9636,7 +11483,7 @@
     "node_modules/glob-watcher/node_modules/fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
       "dev": true,
       "dependencies": {
         "extend-shallow": "^2.0.1",
@@ -9680,7 +11527,7 @@
     "node_modules/glob-watcher/node_modules/glob-parent/node_modules/is-glob": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
       "dev": true,
       "dependencies": {
         "is-extglob": "^2.1.0"
@@ -9692,7 +11539,7 @@
     "node_modules/glob-watcher/node_modules/is-binary-path": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
       "dev": true,
       "dependencies": {
         "binary-extensions": "^1.0.0"
@@ -9701,10 +11548,110 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/glob-watcher/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
     "node_modules/glob-watcher/node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-watcher/node_modules/micromatch/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -9727,7 +11674,7 @@
     "node_modules/glob-watcher/node_modules/to-regex-range": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
       "dev": true,
       "dependencies": {
         "is-number": "^3.0.0",
@@ -9764,7 +11711,7 @@
     "node_modules/global-prefix": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
       "dev": true,
       "dependencies": {
         "expand-tilde": "^2.0.2",
@@ -9777,6 +11724,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/global-prefix/node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
     "node_modules/global-prefix/node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -9804,13 +11757,13 @@
       "dev": true
     },
     "node_modules/globule": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz",
-      "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz",
+      "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==",
       "dev": true,
       "dependencies": {
         "glob": "~7.1.1",
-        "lodash": "~4.17.10",
+        "lodash": "^4.17.21",
         "minimatch": "~3.0.2"
       },
       "engines": {
@@ -9887,9 +11840,9 @@
       }
     },
     "node_modules/graceful-fs": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
       "dev": true
     },
     "node_modules/grapheme-splitter": {
@@ -9941,74 +11894,6 @@
         "node": ">=0.9"
       }
     },
-    "node_modules/gulp-clean/node_modules/arr-diff": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-      "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "array-slice": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/arr-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-      "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/array-slice": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-      "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/extend-shallow": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-      "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/kind-of": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-      "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-clean/node_modules/plugin-error": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-      "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-cyan": "^0.1.1",
-        "ansi-red": "^0.1.1",
-        "arr-diff": "^1.0.1",
-        "arr-union": "^2.0.1",
-        "extend-shallow": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/gulp-clean/node_modules/rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -10078,7 +11963,7 @@
     "node_modules/gulp-cli/node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -10087,7 +11972,7 @@
     "node_modules/gulp-cli/node_modules/camelcase": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+      "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -10096,7 +11981,7 @@
     "node_modules/gulp-cli/node_modules/cliui": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
       "dev": true,
       "dependencies": {
         "string-width": "^1.0.1",
@@ -10104,10 +11989,19 @@
         "wrap-ansi": "^2.0.0"
       }
     },
+    "node_modules/gulp-cli/node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/gulp-cli/node_modules/find-up": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
       "dev": true,
       "dependencies": {
         "path-exists": "^2.0.0",
@@ -10123,10 +12017,16 @@
       "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
       "dev": true
     },
+    "node_modules/gulp-cli/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
     "node_modules/gulp-cli/node_modules/is-fullwidth-code-point": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
       "dev": true,
       "dependencies": {
         "number-is-nan": "^1.0.0"
@@ -10135,10 +12035,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/gulp-cli/node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
     "node_modules/gulp-cli/node_modules/path-exists": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
       "dev": true,
       "dependencies": {
         "pinkie-promise": "^2.0.0"
@@ -10150,7 +12062,7 @@
     "node_modules/gulp-cli/node_modules/read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
       "dev": true,
       "dependencies": {
         "load-json-file": "^1.0.0",
@@ -10164,7 +12076,7 @@
     "node_modules/gulp-cli/node_modules/read-pkg-up": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
       "dev": true,
       "dependencies": {
         "find-up": "^1.0.0",
@@ -10174,16 +12086,19 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-cli/node_modules/require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-      "dev": true
+    "node_modules/gulp-cli/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
     },
     "node_modules/gulp-cli/node_modules/string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
       "dev": true,
       "dependencies": {
         "code-point-at": "^1.0.0",
@@ -10197,7 +12112,7 @@
     "node_modules/gulp-cli/node_modules/strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "dev": true,
       "dependencies": {
         "ansi-regex": "^2.0.0"
@@ -10206,16 +12121,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/gulp-cli/node_modules/which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true
-    },
     "node_modules/gulp-cli/node_modules/wrap-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
       "dev": true,
       "dependencies": {
         "string-width": "^1.0.1",
@@ -10265,7 +12174,7 @@
     "node_modules/gulp-concat": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
-      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
+      "integrity": "sha512-a2scActrQrDBpBbR3WUZGyGS1JEPLg5PZJdIa7/Bi3GuKAmPYDK6SFhy/NZq5R8KsKKFvtfR0fakbUCcKGCCjg==",
       "dev": true,
       "dependencies": {
         "concat-with-sourcemaps": "^1.0.0",
@@ -10324,10 +12233,25 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/gulp-connect/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/gulp-connect/node_modules/destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==",
+      "dev": true
+    },
     "node_modules/gulp-connect/node_modules/http-errors": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
       "dev": true,
       "dependencies": {
         "depd": "~1.1.2",
@@ -10342,7 +12266,7 @@
     "node_modules/gulp-connect/node_modules/inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
       "dev": true
     },
     "node_modules/gulp-connect/node_modules/mime": {
@@ -10357,9 +12281,21 @@
     "node_modules/gulp-connect/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "node_modules/gulp-connect/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/gulp-connect/node_modules/send": {
       "version": "0.16.2",
       "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
@@ -10410,6 +12346,18 @@
         "plugin-error": "^1.0.1"
       }
     },
+    "node_modules/gulp-eslint/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/ansi-regex": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
@@ -10419,6 +12367,24 @@
         "node": ">=6"
       }
     },
+    "node_modules/gulp-eslint/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-eslint/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/astral-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
@@ -10552,22 +12518,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/gulp-eslint/node_modules/eslint/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
     "node_modules/gulp-eslint/node_modules/eslint/node_modules/strip-ansi": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -10594,6 +12544,19 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/gulp-eslint/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/file-entry-cache": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -10641,6 +12604,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/gulp-eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/inquirer": {
       "version": "7.3.3",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
@@ -10756,6 +12728,21 @@
         "node": ">=4"
       }
     },
+    "node_modules/gulp-eslint/node_modules/plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/gulp-eslint/node_modules/prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -10786,18 +12773,6 @@
         "rimraf": "bin.js"
       }
     },
-    "node_modules/gulp-eslint/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
     "node_modules/gulp-eslint/node_modules/shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -10955,7 +12930,7 @@
     "node_modules/gulp-js-escape": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gulp-js-escape/-/gulp-js-escape-1.0.1.tgz",
-      "integrity": "sha1-HNRF+9AJ4Np2lZoDp/SbNWav+Gg=",
+      "integrity": "sha512-F+53crhLb78CTlG7ZZJFWzP0+/4q0vt2/pULXFkTMs6AGBo0Eh5cx+eWsqqHv8hrNIUsuTab3Se8rOOzP/6+EQ==",
       "dev": true,
       "dependencies": {
         "through2": "^0.6.3"
@@ -10964,13 +12939,13 @@
     "node_modules/gulp-js-escape/node_modules/isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
       "dev": true
     },
     "node_modules/gulp-js-escape/node_modules/readable-stream": {
       "version": "1.0.34",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
       "dev": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -10982,13 +12957,13 @@
     "node_modules/gulp-js-escape/node_modules/string_decoder": {
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
       "dev": true
     },
     "node_modules/gulp-js-escape/node_modules/through2": {
       "version": "0.6.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
       "dev": true,
       "dependencies": {
         "readable-stream": ">=1.0.33-1 <1.1.0-0",
@@ -11021,9 +12996,9 @@
       }
     },
     "node_modules/gulp-replace/node_modules/@types/node": {
-      "version": "14.18.12",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz",
-      "integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==",
+      "version": "14.18.33",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz",
+      "integrity": "sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg==",
       "dev": true
     },
     "node_modules/gulp-shell": {
@@ -11043,6 +13018,18 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/gulp-shell/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/gulp-shell/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -11058,6 +13045,24 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/gulp-shell/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/gulp-shell/node_modules/chalk": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
@@ -11089,6 +13094,43 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/gulp-shell/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gulp-shell/node_modules/plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/gulp-shell/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -11179,6 +13221,64 @@
         "node": ">=10"
       }
     },
+    "node_modules/gulp-terser/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-terser/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-terser/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-terser/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-terser/node_modules/plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/gulp-util": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
@@ -11212,7 +13312,7 @@
     "node_modules/gulp-util/node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -11221,7 +13321,7 @@
     "node_modules/gulp-util/node_modules/ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -11230,7 +13330,7 @@
     "node_modules/gulp-util/node_modules/chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^2.2.1",
@@ -11246,7 +13346,7 @@
     "node_modules/gulp-util/node_modules/clone": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
       "dev": true,
       "engines": {
         "node": ">=0.8"
@@ -11255,18 +13355,9 @@
     "node_modules/gulp-util/node_modules/clone-stats": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
+      "integrity": "sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==",
       "dev": true
     },
-    "node_modules/gulp-util/node_modules/lodash.escape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-      "dev": true,
-      "dependencies": {
-        "lodash._root": "^3.0.0"
-      }
-    },
     "node_modules/gulp-util/node_modules/lodash.template": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
@@ -11287,7 +13378,7 @@
     "node_modules/gulp-util/node_modules/lodash.templatesettings": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+      "integrity": "sha512-TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ==",
       "dev": true,
       "dependencies": {
         "lodash._reinterpolate": "^3.0.0",
@@ -11297,7 +13388,7 @@
     "node_modules/gulp-util/node_modules/object-assign": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-      "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+      "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -11306,7 +13397,7 @@
     "node_modules/gulp-util/node_modules/strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "dev": true,
       "dependencies": {
         "ansi-regex": "^2.0.0"
@@ -11318,7 +13409,7 @@
     "node_modules/gulp-util/node_modules/supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
       "dev": true,
       "engines": {
         "node": ">=0.8.0"
@@ -11337,7 +13428,7 @@
     "node_modules/gulp-util/node_modules/vinyl": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-      "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
+      "integrity": "sha512-P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA==",
       "dev": true,
       "dependencies": {
         "clone": "^1.0.0",
@@ -11351,7 +13442,7 @@
     "node_modules/gulplog": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+      "integrity": "sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==",
       "dev": true,
       "dependencies": {
         "glogg": "^1.0.0"
@@ -11408,7 +13499,7 @@
     "node_modules/har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -11428,22 +13519,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/har-validator/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
     "node_modules/has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -11458,7 +13533,7 @@
     "node_modules/has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
       "dev": true,
       "dependencies": {
         "ansi-regex": "^2.0.0"
@@ -11470,34 +13545,33 @@
     "node_modules/has-ansi/node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/has-gulplog": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
+      "integrity": "sha512-+F4GzLjwHNNDEAJW2DC1xXfEoPkRDmUdJ7CBYw4MpqtDwOnqdImJl7GWlpqx+Wko6//J8uKTnIe4wZSv7yCqmw==",
       "dev": true,
       "dependencies": {
         "sparkles": "^1.0.0"
@@ -11506,6 +13580,18 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
@@ -11535,7 +13621,7 @@
     "node_modules/has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
       "dev": true,
       "dependencies": {
         "get-value": "^2.0.6",
@@ -11549,7 +13635,7 @@
     "node_modules/has-values": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
       "dev": true,
       "dependencies": {
         "is-number": "^3.0.0",
@@ -11565,10 +13651,34 @@
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
+    "node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/has-values/node_modules/kind-of": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
       "dev": true,
       "dependencies": {
         "is-buffer": "^1.1.5"
@@ -11657,7 +13767,7 @@
     "node_modules/home-or-tmp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "integrity": "sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg==",
       "dev": true,
       "dependencies": {
         "os-homedir": "^1.0.0",
@@ -11680,10 +13790,16 @@
       }
     },
     "node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/html-escaper": {
       "version": "2.0.2",
@@ -11708,24 +13824,24 @@
       "dev": true
     },
     "node_modules/http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dependencies": {
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
+        "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/http-parser-js": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz",
-      "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==",
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
       "dev": true
     },
     "node_modules/http-proxy": {
@@ -11745,7 +13861,7 @@
     "node_modules/http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
       "dev": true,
       "dependencies": {
         "assert-plus": "^1.0.0",
@@ -11771,16 +13887,16 @@
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
-      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
       "dependencies": {
-        "agent-base": "5",
+        "agent-base": "6",
         "debug": "4"
       },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 6"
       }
     },
     "node_modules/iconv-lite": {
@@ -11851,12 +13967,21 @@
     "node_modules/imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
       "engines": {
         "node": ">=0.8.19"
       }
     },
+    "node_modules/indent-string": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+      "integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/individual": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
@@ -11866,7 +13991,7 @@
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "dev": true,
       "dependencies": {
         "once": "^1.3.0",
@@ -11879,15 +14004,18 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz",
+      "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
     },
     "node_modules/inquirer": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.5.tgz",
-      "integrity": "sha512-G6/9xUqmt/r+UvufSyrPpt84NYwhKZ9jLsgMbQzlx804XErNupor8WQdBnBRrXmBfTPpuwf1sV+ss2ovjgdXIg==",
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.5.tgz",
+      "integrity": "sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==",
       "dev": true,
       "dependencies": {
         "ansi-escapes": "^4.2.1",
@@ -11900,13 +14028,14 @@
         "mute-stream": "0.0.8",
         "ora": "^5.4.1",
         "run-async": "^2.4.0",
-        "rxjs": "^7.2.0",
+        "rxjs": "^7.5.5",
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
+        "through": "^2.3.6",
+        "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=12.0.0"
       }
     },
     "node_modules/inquirer/node_modules/ansi-styles": {
@@ -11958,6 +14087,24 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/inquirer/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inquirer/node_modules/rxjs": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
+      "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/inquirer/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -11970,6 +14117,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/inquirer/node_modules/tslib": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
+      "dev": true
+    },
     "node_modules/internal-slot": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
@@ -12005,7 +14158,7 @@
     "node_modules/invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -12072,7 +14225,7 @@
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
       "dev": true
     },
     "node_modules/is-bigint": {
@@ -12139,9 +14292,9 @@
       }
     },
     "node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -12151,9 +14304,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -12262,7 +14415,7 @@
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -12359,7 +14512,7 @@
     "node_modules/is-negated-glob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
+      "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -12378,21 +14531,18 @@
       }
     },
     "node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.12.0"
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "dev": true,
       "dependencies": {
         "has-tostringtag": "^1.0.0"
@@ -12404,24 +14554,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-number/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-plain-obj": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
@@ -12480,7 +14612,7 @@
     "node_modules/is-running": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-running/-/is-running-2.1.0.tgz",
-      "integrity": "sha1-MKc/9cw4VOT8JUkICen1q/jeCeA=",
+      "integrity": "sha512-mjJd3PujZMl7j+D395WTIO5tU5RIDBfVSRtRR4VOJou3H66E38UjbjvDGh3slJzPuolsb+yQFqwHNNdyp5jg3w==",
       "dev": true
     },
     "node_modules/is-set": {
@@ -12493,10 +14625,13 @@
       }
     },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
       "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -12513,7 +14648,7 @@
     "node_modules/is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -12550,15 +14685,15 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz",
-      "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
+      "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
       "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "es-abstract": "^1.18.5",
-        "foreach": "^2.0.5",
+        "es-abstract": "^1.20.0",
+        "for-each": "^0.3.3",
         "has-tostringtag": "^1.0.0"
       },
       "engines": {
@@ -12571,7 +14706,7 @@
     "node_modules/is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true
     },
     "node_modules/is-unc-path": {
@@ -12601,13 +14736,13 @@
     "node_modules/is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
       "dev": true
     },
     "node_modules/is-valid-glob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
+      "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -12675,9 +14810,9 @@
       "dev": true
     },
     "node_modules/isbinaryfile": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
-      "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==",
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
+      "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
       "dev": true,
       "engines": {
         "node": ">= 8.0.0"
@@ -12689,13 +14824,13 @@
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
     "node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -12704,13 +14839,13 @@
     "node_modules/isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
       "dev": true
     },
     "node_modules/istanbul": {
       "version": "0.4.5",
       "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
+      "integrity": "sha512-nMtdn4hvK0HjUlzr1DrKSUY8ychprt8dzHOgY2KXsIhHu5PuQQEOTM27gV9Xblyon7aUH/TSFIjRHEODF/FRPg==",
       "deprecated": "This module is no longer maintained, try this instead:\n  npm i nyc\nVisit https://istanbul.js.org/integrations for other alternatives.",
       "dev": true,
       "dependencies": {
@@ -12742,6 +14877,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/istanbul-lib-report": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
@@ -12756,6 +14907,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/istanbul-lib-report/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/istanbul-lib-report/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -12792,9 +14952,9 @@
       }
     },
     "node_modules/istanbul-reports": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
-      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
+      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
       "dev": true,
       "dependencies": {
         "html-escaper": "^2.0.0",
@@ -12807,7 +14967,7 @@
     "node_modules/istanbul/node_modules/glob": {
       "version": "5.0.15",
       "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+      "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
       "dev": true,
       "dependencies": {
         "inflight": "^1.0.4",
@@ -12823,19 +14983,19 @@
     "node_modules/istanbul/node_modules/has-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+      "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/istanbul/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.5"
+        "minimist": "^1.2.6"
       },
       "bin": {
         "mkdirp": "bin/cmd.js"
@@ -12844,13 +15004,13 @@
     "node_modules/istanbul/node_modules/resolve": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-      "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+      "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
       "dev": true
     },
     "node_modules/istanbul/node_modules/supports-color": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-      "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+      "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
       "dev": true,
       "dependencies": {
         "has-flag": "^1.0.0"
@@ -12960,6 +15120,15 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/jake/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jake/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -12973,18 +15142,18 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
+        "diff-sequences": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 10.14.2"
       }
     },
     "node_modules/jest-diff/node_modules/ansi-styles": {
@@ -13036,6 +15205,15 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/jest-diff/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-diff/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -13049,27 +15227,27 @@
       }
     },
     "node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
       "dev": true,
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 10.14.2"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 10.14.2"
       }
     },
     "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
@@ -13121,6 +15299,15 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/jest-matcher-utils/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/jest-matcher-utils/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -13134,23 +15321,23 @@
       }
     },
     "node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^26.6.2",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
         "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "stack-utils": "^2.0.2"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 10.14.2"
       }
     },
     "node_modules/jest-message-util/node_modules/ansi-styles": {
@@ -13202,17 +15389,22 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/jest-message-util/node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+    "node_modules/jest-message-util/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      },
       "engines": {
-        "node": ">=8.6"
+        "node": ">=8"
       }
     },
     "node_modules/jest-message-util/node_modules/supports-color": {
@@ -13227,6 +15419,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/jest-regex-util": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
     "node_modules/jest-worker": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
@@ -13241,6 +15442,30 @@
         "node": ">= 10.13.0"
       }
     },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -13275,7 +15500,7 @@
     "node_modules/jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
       "dev": true
     },
     "node_modules/jsesc": {
@@ -13295,12 +15520,6 @@
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
       "dev": true
     },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -13322,13 +15541,13 @@
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
       "dev": true
     },
     "node_modules/json5": {
@@ -13372,7 +15591,7 @@
     "node_modules/just-clone": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-1.0.2.tgz",
-      "integrity": "sha1-v7P672WqEqMWBYcSlFwyb9jwFDQ="
+      "integrity": "sha512-p93GINPwrve0w3HUzpXmpTl7MyzzWz1B5ag44KEtq/hP1mtK8lA2b9Q0VQaPlnY87352osJcE6uBmN0e8kuFMw=="
     },
     "node_modules/just-debounce": {
       "version": "1.1.0",
@@ -13387,9 +15606,9 @@
       "dev": true
     },
     "node_modules/karma": {
-      "version": "6.3.17",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.17.tgz",
-      "integrity": "sha512-2TfjHwrRExC8yHoWlPBULyaLwAFmXmxQrcuFImt/JsAsSZu1uOWTZ1ZsWjqQtWpHLiatJOHL5jFjXSJIgCd01g==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.1.tgz",
+      "integrity": "sha512-Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA==",
       "dev": true,
       "dependencies": {
         "@colors/colors": "1.5.0",
@@ -13411,7 +15630,7 @@
         "qjobs": "^1.2.0",
         "range-parser": "^1.2.1",
         "rimraf": "^3.0.2",
-        "socket.io": "^4.2.0",
+        "socket.io": "^4.4.1",
         "source-map": "^0.6.1",
         "tmp": "^0.2.1",
         "ua-parser-js": "^0.7.30",
@@ -13453,7 +15672,7 @@
     "node_modules/karma-chai": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/karma-chai/-/karma-chai-0.1.0.tgz",
-      "integrity": "sha1-vuWtQEAFF4Ea40u5RfdikJEIt5o=",
+      "integrity": "sha512-mqKCkHwzPMhgTYca10S90aCEX9+HjVjjrBFAsw36Zj7BlQNbokXXCAe6Ji04VUMsxcY5RLP7YphpfO06XOubdg==",
       "dev": true,
       "peerDependencies": {
         "chai": "*",
@@ -13461,9 +15680,9 @@
       }
     },
     "node_modules/karma-chrome-launcher": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz",
-      "integrity": "sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz",
+      "integrity": "sha512-hsIglcq1vtboGPAN+DGCISCFOxW+ZVnIqhDQcCMqqCp+4dmJ0Qpq5QAjkbA0X2L9Mi6OBkHi2Srrbmm7pUKkzQ==",
       "dev": true,
       "dependencies": {
         "which": "^1.2.1"
@@ -13591,26 +15810,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/karma-coverage/node_modules/istanbul-lib-instrument": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
-      "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/karma-es5-shim": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/karma-es5-shim/-/karma-es5-shim-0.0.4.tgz",
-      "integrity": "sha1-zdADM8znfC5M4D46yT8vjs0fuVI=",
+      "integrity": "sha512-8xU6F2/R6u6HAZ/nlyhhx3WEhj4C6hJorG7FR2REX81pgj2LSo9ADJXxCGIeXg6Qr2BGpxp4hcZcEOYGAwiumg==",
       "dev": true,
       "dependencies": {
         "es5-shim": "^4.0.5"
@@ -13629,7 +15832,7 @@
     "node_modules/karma-ie-launcher": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/karma-ie-launcher/-/karma-ie-launcher-1.0.0.tgz",
-      "integrity": "sha1-SXmGhCxJAZA0bNifVJTKmDDG1Zw=",
+      "integrity": "sha512-ts71ke8pHvw6qdRtq0+7VY3ANLoZuUNNkA8abRaWV13QRPNm7TtSOqyszjHUtuwOWKcsSz4tbUtrNICrQC+SXQ==",
       "dev": true,
       "dependencies": {
         "lodash": "^4.6.1"
@@ -13650,7 +15853,7 @@
     "node_modules/karma-mocha-reporter": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz",
-      "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=",
+      "integrity": "sha512-Hr6nhkIp0GIJJrvzY8JFeHpQZNseuIakGac4bpw8K1+5F0tLb6l7uvXRa8mt2Z+NVwYgCct4QAfp2R2QP6o00w==",
       "dev": true,
       "dependencies": {
         "chalk": "^2.1.0",
@@ -13673,7 +15876,7 @@
     "node_modules/karma-mocha-reporter/node_modules/strip-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
       "dev": true,
       "dependencies": {
         "ansi-regex": "^3.0.0"
@@ -13685,7 +15888,7 @@
     "node_modules/karma-opera-launcher": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/karma-opera-launcher/-/karma-opera-launcher-1.0.0.tgz",
-      "integrity": "sha1-+lFihTGh0L6EstjcDX7iCfyP+Ro=",
+      "integrity": "sha512-rdty4FlVIowmUhPuG08TeXKHvaRxeDSzPxGIkWguCF3A32kE0uvXZ6dXW08PuaNjai8Ip3f5Pn9Pm2HlChaxCw==",
       "dev": true,
       "peerDependencies": {
         "karma": ">=0.9"
@@ -13694,7 +15897,7 @@
     "node_modules/karma-safari-launcher": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz",
-      "integrity": "sha1-lpgqLMR9BmquccVTursoMZEVos4=",
+      "integrity": "sha512-qmypLWd6F2qrDJfAETvXDfxHvKDk+nyIjpH9xIeI3/hENr0U3nuqkxaftq73PfXZ4aOuOChA6SnLW4m4AxfRjQ==",
       "dev": true,
       "peerDependencies": {
         "karma": ">=0.9"
@@ -13703,7 +15906,7 @@
     "node_modules/karma-script-launcher": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-1.0.0.tgz",
-      "integrity": "sha1-zQF8TeXvCeWp2nkydhdhCN1LVC0=",
+      "integrity": "sha512-5NRc8KmTBjNPE3dNfpJP90BArnBohYV4//MsLFfUA1e6N+G1/A5WuWctaFBtMQ6MWRybs/oguSej0JwDr8gInA==",
       "dev": true,
       "peerDependencies": {
         "karma": ">=0.9"
@@ -13712,7 +15915,7 @@
     "node_modules/karma-sinon": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/karma-sinon/-/karma-sinon-1.0.5.tgz",
-      "integrity": "sha1-TjRD8oMP3s/2JNN0cWPxIX2qKpo=",
+      "integrity": "sha512-wrkyAxJmJbn75Dqy17L/8aILJWFm7znd1CE8gkyxTBFnjMSOe2XTJ3P30T8SkxWZHmoHX0SCaUJTDBEoXs25Og==",
       "dev": true,
       "engines": {
         "node": ">= 0.10.0"
@@ -13734,7 +15937,7 @@
     "node_modules/karma-spec-reporter": {
       "version": "0.0.32",
       "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.32.tgz",
-      "integrity": "sha1-LpxyB+pyZ3EmAln4K+y1QyCeRAo=",
+      "integrity": "sha512-ZXsYERZJMTNRR2F3QN11OWF5kgnT/K2dzhM+oY3CDyMrDI3TjIWqYGG7c15rR9wjmy9lvdC+CCshqn3YZqnNrA==",
       "dev": true,
       "dependencies": {
         "colors": "^1.1.2"
@@ -13760,13 +15963,24 @@
         "webpack": "^5.0.0"
       }
     },
+    "node_modules/karma/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
     "node_modules/karma/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.5"
+        "minimist": "^1.2.6"
       },
       "bin": {
         "mkdirp": "bin/cmd.js"
@@ -13781,6 +15995,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/karma/node_modules/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "dev": true,
+      "dependencies": {
+        "rimraf": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.17.0"
+      }
+    },
     "node_modules/karma/node_modules/yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -13815,9 +16041,9 @@
       "dev": true
     },
     "node_modules/keyv": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz",
-      "integrity": "sha512-tGv1yP6snQVDSM4X6yxrv2zzq/EvpW+oYiUz6aueW1u9CtS8RzUQYxxmFwgZlO2jSgCxQbchhxaqXXp2hnKGpQ==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.0.tgz",
+      "integrity": "sha512-2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA==",
       "dev": true,
       "dependencies": {
         "json-buffer": "3.0.1"
@@ -13866,7 +16092,7 @@
     "node_modules/last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
+      "integrity": "sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ==",
       "dev": true,
       "dependencies": {
         "default-resolution": "^2.0.0",
@@ -13891,7 +16117,7 @@
     "node_modules/lcid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==",
       "dev": true,
       "dependencies": {
         "invert-kv": "^1.0.0"
@@ -13903,7 +16129,7 @@
     "node_modules/lcov-parse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz",
-      "integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A=",
+      "integrity": "sha512-aprLII/vPzuQvYZnDRU78Fns9I2Ag3gi4Ipga/hxnVMCZC8DnR2nI7XBqrPoywGfxqIx/DgarGvDJZAD3YBTgQ==",
       "dev": true,
       "bin": {
         "lcov-parse": "bin/cli.js"
@@ -13912,7 +16138,7 @@
     "node_modules/lead": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
+      "integrity": "sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==",
       "dev": true,
       "dependencies": {
         "flush-write-stream": "^1.0.2"
@@ -13987,7 +16213,7 @@
     "node_modules/lighthouse-logger/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
     "node_modules/lines-and-columns": {
@@ -13999,7 +16225,7 @@
     "node_modules/listenercount": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
-      "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=",
+      "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==",
       "dev": true
     },
     "node_modules/live-connect-js": {
@@ -14069,25 +16295,38 @@
       }
     },
     "node_modules/loader-runner": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "dev": true,
       "engines": {
         "node": ">=6.11.5"
       }
     },
+    "node_modules/loader-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
+      "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
     "node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
       "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "^4.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/lodash": {
@@ -14099,126 +16338,135 @@
     "node_modules/lodash._basecopy": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
       "dev": true
     },
     "node_modules/lodash._basetostring": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
+      "integrity": "sha512-mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA==",
       "dev": true
     },
     "node_modules/lodash._basevalues": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
+      "integrity": "sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==",
       "dev": true
     },
     "node_modules/lodash._getnative": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
       "dev": true
     },
     "node_modules/lodash._isiterateecall": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
       "dev": true
     },
     "node_modules/lodash._reescape": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
+      "integrity": "sha512-Sjlavm5y+FUVIF3vF3B75GyXrzsfYV8Dlv3L4mEpuB9leg8N6yf/7rU06iLPx9fY0Mv3khVp9p7Dx0mGV6V5OQ==",
       "dev": true
     },
     "node_modules/lodash._reevaluate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
+      "integrity": "sha512-OrPwdDc65iJiBeUe5n/LIjd7Viy99bKwDdk7Z5ljfZg0uFRFlfQaCy9tZ4YMAag9WAZmlVpe1iZrkIMMSMHD3w==",
       "dev": true
     },
     "node_modules/lodash._reinterpolate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
       "dev": true
     },
     "node_modules/lodash._root": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
+      "integrity": "sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==",
       "dev": true
     },
     "node_modules/lodash.clone": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
-      "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=",
+      "integrity": "sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg==",
       "dev": true
     },
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
       "dev": true
     },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
     "node_modules/lodash.defaults": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
       "dev": true
     },
     "node_modules/lodash.difference": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=",
+      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
       "dev": true
     },
+    "node_modules/lodash.escape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha512-n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._root": "^3.0.0"
+      }
+    },
     "node_modules/lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
+      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
       "dev": true
     },
     "node_modules/lodash.flattendeep": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
+      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
       "dev": true
     },
     "node_modules/lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
       "dev": true
     },
     "node_modules/lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
       "dev": true
     },
     "node_modules/lodash.isarray": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
       "dev": true
     },
     "node_modules/lodash.isobject": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
+      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==",
       "dev": true
     },
     "node_modules/lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
       "dev": true
     },
     "node_modules/lodash.keys": {
@@ -14241,19 +16489,19 @@
     "node_modules/lodash.pickby": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
-      "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=",
+      "integrity": "sha512-AZV+GsS/6ckvPOVQPXSiFFacKvKB4kOQu6ynt9wz0F3LO4R9Ij4K1ddYsIytDpSgLz88JHd9P+oaLeej5/Sl7Q==",
       "dev": true
     },
     "node_modules/lodash.restparam": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+      "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
       "dev": true
     },
     "node_modules/lodash.some": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
-      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
+      "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
       "dev": true
     },
     "node_modules/lodash.template": {
@@ -14278,19 +16526,19 @@
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
       "dev": true
     },
     "node_modules/lodash.union": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
-      "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=",
+      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==",
       "dev": true
     },
     "node_modules/lodash.zip": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
-      "integrity": "sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=",
+      "integrity": "sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg==",
       "dev": true
     },
     "node_modules/log-driver": {
@@ -14315,16 +16563,16 @@
       }
     },
     "node_modules/log4js": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.2.tgz",
-      "integrity": "sha512-k80cggS2sZQLBwllpT1p06GtfvzMmSdUCkW96f0Hj83rKGJDAu2vZjt9B9ag2vx8Zz1IXzxoLgqvRJCdMKybGg==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz",
+      "integrity": "sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q==",
       "dev": true,
       "dependencies": {
-        "date-format": "^4.0.4",
-        "debug": "^4.3.3",
-        "flatted": "^3.2.5",
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "flatted": "^3.2.7",
         "rfdc": "^1.3.0",
-        "streamroller": "^3.0.4"
+        "streamroller": "^3.1.3"
       },
       "engines": {
         "node": ">=8.0"
@@ -14410,7 +16658,7 @@
     "node_modules/lru-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
+      "integrity": "sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==",
       "dev": true,
       "dependencies": {
         "es5-ext": "~0.10.2"
@@ -14476,7 +16724,7 @@
     "node_modules/map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -14494,13 +16742,13 @@
     "node_modules/map-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
+      "integrity": "sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ==",
       "dev": true
     },
     "node_modules/map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
       "dev": true,
       "dependencies": {
         "object-visit": "^1.0.0"
@@ -14520,15 +16768,15 @@
       }
     },
     "node_modules/marky": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.4.tgz",
-      "integrity": "sha512-zd2/GiSn6U3/jeFVZ0J9CA1LzQ8RfIVvXkb/U0swFHF/zT+dVohTAWjmo2DcIuofmIIIROlwTbd+shSeXmxr0w==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
+      "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
       "dev": true
     },
     "node_modules/matchdep": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
+      "integrity": "sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==",
       "dev": true,
       "dependencies": {
         "findup-sync": "^2.0.0",
@@ -14540,10 +16788,110 @@
         "node": ">= 0.10.0"
       }
     },
+    "node_modules/matchdep/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/braces/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/fill-range/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/matchdep/node_modules/findup-sync": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+      "integrity": "sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==",
       "dev": true,
       "dependencies": {
         "detect-file": "^1.0.0",
@@ -14555,10 +16903,16 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/matchdep/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
     "node_modules/matchdep/node_modules/is-glob": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+      "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
       "dev": true,
       "dependencies": {
         "is-extglob": "^2.1.0"
@@ -14567,6 +16921,76 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/matchdep/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/matchdep/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/mdast-util-definitions": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz",
@@ -14708,11 +17132,12 @@
       }
     },
     "node_modules/mdast-util-gfm-table": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.4.tgz",
-      "integrity": "sha512-aEuoPwZyP4iIMkf2cLWXxx3EQ6Bmh2yKy9MVCg4i6Sd3cX80dcLEfXO/V4ul3pGH9czBK4kp+FAl+ZHmSUt9/w==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.6.tgz",
+      "integrity": "sha512-uHR+fqFq3IvB3Rd4+kzXW8dmpxUhvgCQZep6KdjsLK4O6meK5dYZEayLtIxNus1XO3gfjfcIFe8a7L0HZRGgag==",
       "dev": true,
       "dependencies": {
+        "@types/mdast": "^3.0.0",
         "markdown-table": "^3.0.0",
         "mdast-util-from-markdown": "^1.0.0",
         "mdast-util-to-markdown": "^1.3.0"
@@ -14739,24 +17164,22 @@
     "node_modules/mdast-util-inject": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz",
-      "integrity": "sha1-2wa4tYW+lZotzS+H9HK6m3VvNnU=",
+      "integrity": "sha512-CcJ0mHa36QYumDKiZ2OIR+ClhfOM7zIzN+Wfy8tRZ1hpH9DKLCS+Mh4DyK5bCxzE9uxMWcbIpeNFWsg1zrj/2g==",
       "dev": true,
       "dependencies": {
         "mdast-util-to-string": "^1.0.0"
       }
     },
     "node_modules/mdast-util-to-hast": {
-      "version": "12.2.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.2.1.tgz",
-      "integrity": "sha512-dyindR2P7qOqXO1hQirZeGtVbiX7xlNQbw7gGaAwN4A1dh4+X8xU/JyYmRoyB8Fu1uPXzp7mlL5QwW7k+knvgA==",
+      "version": "12.2.4",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.2.4.tgz",
+      "integrity": "sha512-a21xoxSef1l8VhHxS1Dnyioz6grrJkoaCUgGzMD/7dWHvboYX3VW53esRUfB5tgTyz4Yos1n25SPcj35dJqmAg==",
       "dev": true,
       "dependencies": {
         "@types/hast": "^2.0.0",
         "@types/mdast": "^3.0.0",
-        "@types/mdurl": "^1.0.0",
         "mdast-util-definitions": "^5.0.0",
-        "mdurl": "^1.0.0",
-        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.1.0",
         "trim-lines": "^3.0.0",
         "unist-builder": "^3.0.0",
         "unist-util-generated": "^2.0.0",
@@ -14866,16 +17289,10 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
-      "dev": true
-    },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -14912,7 +17329,7 @@
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
@@ -14923,15 +17340,15 @@
     "node_modules/methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/micromark": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.0.10.tgz",
-      "integrity": "sha512-ryTDy6UUunOXy2HPjelppgJ2sNfcPz1pLlMdA6Rz9jPzhLikWXv/irpWV/I2jd68Uhmny7hHxAlAhk4+vWggpg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.1.0.tgz",
+      "integrity": "sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA==",
       "dev": true,
       "funding": [
         {
@@ -15419,9 +17836,9 @@
       }
     },
     "node_modules/micromark-util-sanitize-uri": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.0.0.tgz",
-      "integrity": "sha512-cCxvBKlmac4rxCGx6ejlIviRaMKZc0fWm5HdCHEeDWRSkn44l6NdYVRyU+0nT1XC72EQJMZV8IPHF+jTr56lAg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.1.0.tgz",
+      "integrity": "sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg==",
       "dev": true,
       "funding": [
         {
@@ -15494,118 +17911,16 @@
       ]
     },
     "node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/micromatch/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8.6"
       }
     },
     "node_modules/mime": {
@@ -15621,19 +17936,19 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.34",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
-      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dependencies": {
-        "mime-db": "1.51.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -15679,10 +17994,13 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/mixin-deep": {
       "version": "1.3.2",
@@ -15755,6 +18073,15 @@
         "url": "https://opencollective.com/mochajs"
       }
     },
+    "node_modules/mocha/node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/mocha/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -15776,15 +18103,6 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
-    "node_modules/mocha/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/mocha/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -15813,6 +18131,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/mocha/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
     "node_modules/mocha/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -15831,29 +18160,15 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/mocha/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/mocha/node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
       "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=0.3.1"
       }
     },
-    "node_modules/mocha/node_modules/debug/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/mocha/node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -15882,6 +18197,47 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/mocha/node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/mocha/node_modules/glob/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/mocha/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/mocha/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -15937,24 +18293,21 @@
         "node": ">=10"
       }
     },
+    "node_modules/mocha/node_modules/minimatch/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/mocha/node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
-    "node_modules/mocha/node_modules/nanoid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
-      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/mocha/node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -15985,15 +18338,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mocha/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/mocha/node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -16006,11 +18350,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mocha/node_modules/workerpool": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
-      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
-      "dev": true
+    "node_modules/mocha/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
     },
     "node_modules/mocha/node_modules/yargs": {
       "version": "16.2.0",
@@ -16064,21 +18417,24 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/morgan/node_modules/depd": {
+    "node_modules/morgan/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/morgan/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
       "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "node_modules/morgan/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
     "node_modules/mpd-parser": {
       "version": "0.21.1",
       "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.21.1.tgz",
@@ -16104,9 +18460,9 @@
       }
     },
     "node_modules/mrmime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.0.tgz",
-      "integrity": "sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
+      "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -16120,45 +18476,12 @@
     "node_modules/multipipe": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
+      "integrity": "sha512-7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q==",
       "dev": true,
       "dependencies": {
         "duplexer2": "0.0.2"
       }
     },
-    "node_modules/multipipe/node_modules/duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "node_modules/multipipe/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/multipipe/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/multipipe/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
     "node_modules/mute-stdout": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
@@ -16199,11 +18522,10 @@
       "optional": true
     },
     "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
       "dev": true,
-      "optional": true,
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -16233,6 +18555,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/nanomatch/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nanomatch/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/nanomatch/node_modules/kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -16245,13 +18589,13 @@
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
     "node_modules/ncp": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
-      "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=",
+      "integrity": "sha512-PfGU8jYWdRl4FqJfCy0IzbkGyFHntfWygZg46nFk/dJD/XRrk2cj0SsKSX9n5u5gE0E0YfEpKWrEkfjnlZSTXA==",
       "dev": true,
       "bin": {
         "ncp": "bin/ncp"
@@ -16309,7 +18653,7 @@
     "node_modules/nise/node_modules/isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
       "dev": true
     },
     "node_modules/nise/node_modules/lolex": {
@@ -16358,7 +18702,7 @@
     "node_modules/nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
       "dev": true,
       "dependencies": {
         "abbrev": "1"
@@ -16368,24 +18712,33 @@
       }
     },
     "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
       "dev": true,
       "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
         "validate-npm-package-license": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "bin": {
-        "semver": "bin/semver"
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/normalize-path": {
@@ -16424,7 +18777,7 @@
     "node_modules/npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
       "dev": true,
       "dependencies": {
         "path-key": "^2.0.0"
@@ -16436,7 +18789,7 @@
     "node_modules/npm-run-path/node_modules/path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -16445,7 +18798,7 @@
     "node_modules/number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -16463,7 +18816,7 @@
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -16472,7 +18825,7 @@
     "node_modules/object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
       "dev": true,
       "dependencies": {
         "copy-descriptor": "^0.1.0",
@@ -16486,7 +18839,7 @@
     "node_modules/object-copy/node_modules/define-property": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
       "dependencies": {
         "is-descriptor": "^0.1.0"
@@ -16498,7 +18851,7 @@
     "node_modules/object-copy/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
       "dev": true,
       "dependencies": {
         "kind-of": "^3.0.2"
@@ -16516,7 +18869,7 @@
     "node_modules/object-copy/node_modules/is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
       "dev": true,
       "dependencies": {
         "kind-of": "^3.0.2"
@@ -16551,7 +18904,7 @@
     "node_modules/object-copy/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
       "dependencies": {
         "is-buffer": "^1.1.5"
@@ -16561,10 +18914,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -16589,6 +18941,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -16596,7 +18949,7 @@
     "node_modules/object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
       "dev": true,
       "dependencies": {
         "isobject": "^3.0.0"
@@ -16606,13 +18959,14 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -16625,7 +18979,7 @@
     "node_modules/object.defaults": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
+      "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
       "dev": true,
       "dependencies": {
         "array-each": "^1.0.1",
@@ -16640,7 +18994,7 @@
     "node_modules/object.map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
+      "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
       "dev": true,
       "dependencies": {
         "for-own": "^1.0.0",
@@ -16653,7 +19007,7 @@
     "node_modules/object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
       "dev": true,
       "dependencies": {
         "isobject": "^3.0.1"
@@ -16665,7 +19019,7 @@
     "node_modules/object.reduce": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
+      "integrity": "sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw==",
       "dev": true,
       "dependencies": {
         "for-own": "^1.0.0",
@@ -16693,9 +19047,9 @@
       }
     },
     "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -16715,7 +19069,7 @@
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "dependencies": {
         "wrappy": "1"
@@ -16760,7 +19114,7 @@
     "node_modules/opn/node_modules/is-wsl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -16855,6 +19209,15 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
+    "node_modules/ora/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/ora/node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -16886,7 +19249,7 @@
     "node_modules/ordered-read-streams": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
+      "integrity": "sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==",
       "dev": true,
       "dependencies": {
         "readable-stream": "^2.0.1"
@@ -16895,7 +19258,7 @@
     "node_modules/os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -16904,7 +19267,7 @@
     "node_modules/os-locale": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==",
       "dev": true,
       "dependencies": {
         "lcid": "^1.0.0"
@@ -16916,7 +19279,7 @@
     "node_modules/os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -16934,7 +19297,7 @@
     "node_modules/p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -16950,36 +19313,39 @@
       }
     },
     "node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
       "dependencies": {
-        "p-try": "^1.0.0"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^1.1.0"
+        "p-limit": "^2.2.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/parent-module": {
@@ -16997,7 +19363,7 @@
     "node_modules/parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+      "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
       "dev": true,
       "dependencies": {
         "is-absolute": "^1.0.0",
@@ -17047,7 +19413,7 @@
     "node_modules/parse-passwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -17085,7 +19451,7 @@
     "node_modules/pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -17094,22 +19460,22 @@
     "node_modules/path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
       "dev": true
     },
     "node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -17132,7 +19498,7 @@
     "node_modules/path-root": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+      "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
       "dev": true,
       "dependencies": {
         "path-root-regex": "^0.1.0"
@@ -17144,7 +19510,7 @@
     "node_modules/path-root-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+      "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -17153,7 +19519,7 @@
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "node_modules/path-type": {
       "version": "1.1.0",
@@ -17190,7 +19556,7 @@
     "node_modules/pause-stream": {
       "version": "0.0.11",
       "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+      "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
       "dev": true,
       "dependencies": {
         "through": "~2.3"
@@ -17199,13 +19565,13 @@
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
       "dev": true
     },
     "node_modules/performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
       "dev": true
     },
     "node_modules/picocolors": {
@@ -17240,7 +19606,7 @@
     "node_modules/pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -17249,7 +19615,7 @@
     "node_modules/pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
       "dev": true,
       "dependencies": {
         "pinkie": "^2.0.0"
@@ -17282,98 +19648,17 @@
         "node": ">=8"
       }
     },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/plugin-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^1.0.1",
-        "arr-diff": "^4.0.0",
-        "arr-union": "^3.1.0",
-        "extend-shallow": "^3.0.2"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/plugin-error/node_modules/ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+      "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
       "dev": true,
       "dependencies": {
-        "ansi-wrap": "^0.1.0"
+        "ansi-cyan": "^0.1.1",
+        "ansi-red": "^0.1.1",
+        "arr-diff": "^1.0.1",
+        "arr-union": "^2.0.1",
+        "extend-shallow": "^1.1.2"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -17382,16 +19667,16 @@
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.16",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
-      "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
+      "version": "8.4.18",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
+      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
       "dev": true,
       "funding": [
         {
@@ -17413,6 +19698,19 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/postcss/node_modules/nanoid": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -17423,35 +19721,57 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
         "react-is": "^17.0.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">= 10"
       }
     },
     "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/pretty-format/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "node_modules/pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
+      "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
@@ -17472,18 +19792,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/printj": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz",
-      "integrity": "sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==",
-      "dev": true,
-      "bin": {
-        "printj": "bin/printj.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
@@ -17554,7 +19862,7 @@
     "node_modules/prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
       "dev": true
     },
     "node_modules/ps-tree": {
@@ -17575,13 +19883,13 @@
     "node_modules/pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
       "dev": true
     },
     "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
       "dev": true
     },
     "node_modules/pump": {
@@ -17637,16 +19945,16 @@
       }
     },
     "node_modules/puppeteer-core": {
-      "version": "13.5.1",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-13.5.1.tgz",
-      "integrity": "sha512-dobVqWjV34ilyfQHR3BBnCYaekBYTi5MgegEYBRYd3s3uFy8jUpZEEWbaFjG9ETm+LGzR5Lmr0aF6LLuHtiuCg==",
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-13.7.0.tgz",
+      "integrity": "sha512-rXja4vcnAzFAP1OVLq/5dWNfwBGuzcOARJ6qGV7oAZhnLmVRU8G5MsdeQEAOy332ZhkIOnn9jp15R89LKHyp2Q==",
       "dev": true,
       "dependencies": {
         "cross-fetch": "3.1.5",
-        "debug": "4.3.3",
-        "devtools-protocol": "0.0.969999",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.981744",
         "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.0",
+        "https-proxy-agent": "5.0.1",
         "pkg-dir": "4.2.0",
         "progress": "2.0.3",
         "proxy-from-env": "1.1.0",
@@ -17659,37 +19967,12 @@
         "node": ">=10.18.1"
       }
     },
-    "node_modules/puppeteer-core/node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
     "node_modules/puppeteer-core/node_modules/devtools-protocol": {
-      "version": "0.0.969999",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.969999.tgz",
-      "integrity": "sha512-6GfzuDWU0OFAuOvBokXpXPLxjOJ5DZ157Ue3sGQQM3LgAamb8m0R0ruSfN0DDu+XG5XJgT50i6zZ/0o8RglreQ==",
+      "version": "0.0.981744",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.981744.tgz",
+      "integrity": "sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg==",
       "dev": true
     },
-    "node_modules/puppeteer-core/node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/puppeteer-core/node_modules/ws": {
       "version": "8.5.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
@@ -17714,7 +19997,7 @@
     "node_modules/q": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
       "dev": true,
       "engines": {
         "node": ">=0.6.0",
@@ -17731,9 +20014,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
       },
@@ -17750,7 +20036,7 @@
     "node_modules/querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
       "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
       "dev": true,
       "engines": {
@@ -17793,12 +20079,12 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dependencies": {
         "bytes": "3.1.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -17941,48 +20227,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/read-pkg/node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/read-pkg/node_modules/normalize-package-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "is-core-module": "^2.5.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/read-pkg/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/read-pkg/node_modules/type-fest": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
@@ -18013,16 +20257,43 @@
     "node_modules/readable-stream/node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
     "node_modules/readdir-glob": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.1.tgz",
-      "integrity": "sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.2.tgz",
+      "integrity": "sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==",
       "dev": true,
       "dependencies": {
-        "minimatch": "^3.0.4"
+        "minimatch": "^5.1.0"
+      }
+    },
+    "node_modules/readdir-glob/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/readdir-glob/node_modules/minimatch": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/readdirp": {
@@ -18040,7 +20311,7 @@
     "node_modules/rechoir": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
       "dev": true,
       "dependencies": {
         "resolve": "^1.1.6"
@@ -18050,27 +20321,15 @@
       }
     },
     "node_modules/recursive-readdir": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
+      "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
       "dev": true,
       "dependencies": {
-        "minimatch": "3.0.4"
+        "minimatch": "^3.0.5"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/recursive-readdir/node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
+        "node": ">=6.0.0"
       }
     },
     "node_modules/regenerate": {
@@ -18079,9 +20338,9 @@
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
-      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
       "dependencies": {
         "regenerate": "^1.4.2"
       },
@@ -18090,15 +20349,14 @@
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
+      "version": "0.13.10",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
+      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
     },
     "node_modules/regenerator-transform": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
-      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
       "dependencies": {
         "@babel/runtime": "^7.8.4"
       }
@@ -18116,14 +20374,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/regex-not/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz",
-      "integrity": "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -18145,14 +20417,14 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
-      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
+      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
       "dependencies": {
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.0.1",
-        "regjsgen": "^0.6.0",
-        "regjsparser": "^0.8.2",
+        "regenerate-unicode-properties": "^10.1.0",
+        "regjsgen": "^0.7.1",
+        "regjsparser": "^0.9.1",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.0.0"
       },
@@ -18161,14 +20433,14 @@
       }
     },
     "node_modules/regjsgen": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
-      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
+      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
     },
     "node_modules/regjsparser": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
-      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
       "dependencies": {
         "jsesc": "~0.5.0"
       },
@@ -18179,7 +20451,7 @@
     "node_modules/regjsparser/node_modules/jsesc": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
       "bin": {
         "jsesc": "bin/jsesc"
       }
@@ -18315,7 +20587,7 @@
     "node_modules/remove-bom-stream": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
+      "integrity": "sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==",
       "dev": true,
       "dependencies": {
         "remove-bom-buffer": "^3.0.0",
@@ -18339,7 +20611,7 @@
     "node_modules/remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
       "dev": true
     },
     "node_modules/repeat-element": {
@@ -18354,7 +20626,7 @@
     "node_modules/repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
       "dev": true,
       "engines": {
         "node": ">=0.10"
@@ -18363,7 +20635,7 @@
     "node_modules/repeating": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
       "dev": true,
       "dependencies": {
         "is-finite": "^1.0.0"
@@ -18375,7 +20647,7 @@
     "node_modules/replace-ext": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
+      "integrity": "sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -18384,7 +20656,7 @@
     "node_modules/replace-homedir": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
+      "integrity": "sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==",
       "dev": true,
       "dependencies": {
         "homedir-polyfill": "^1.0.1",
@@ -18450,7 +20722,7 @@
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -18465,10 +20737,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==",
+      "dev": true
+    },
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
       "dev": true
     },
     "node_modules/resolve": {
@@ -18496,7 +20774,7 @@
     "node_modules/resolve-dir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
       "dev": true,
       "dependencies": {
         "expand-tilde": "^2.0.0",
@@ -18518,7 +20796,7 @@
     "node_modules/resolve-options": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
+      "integrity": "sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==",
       "dev": true,
       "dependencies": {
         "value-or-function": "^3.0.0"
@@ -18530,17 +20808,20 @@
     "node_modules/resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
       "deprecated": "https://github.com/lydell/resolve-url#deprecated",
       "dev": true
     },
     "node_modules/responselike": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
-      "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
+      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
       "dev": true,
       "dependencies": {
         "lowercase-keys": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/resq": {
@@ -18555,7 +20836,7 @@
     "node_modules/resq/node_modules/fast-deep-equal": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==",
       "dev": true
     },
     "node_modules/restore-cursor": {
@@ -18626,20 +20907,17 @@
       }
     },
     "node_modules/rxjs": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
       "dependencies": {
-        "tslib": "^2.1.0"
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
       }
     },
-    "node_modules/rxjs/node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-      "dev": true
-    },
     "node_modules/sade": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz",
@@ -18653,25 +20931,53 @@
       }
     },
     "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
     "node_modules/safe-json-parse": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
-      "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
+      "integrity": "sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A==",
       "dev": true
     },
     "node_modules/safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
       "dev": true,
       "dependencies": {
         "ret": "~0.1.10"
       }
     },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -18718,15 +21024,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/schema-utils/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
     "node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -18738,7 +21035,7 @@
     "node_modules/semver-greatest-satisfied-range": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
+      "integrity": "sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==",
       "dev": true,
       "dependencies": {
         "sver-compat": "^1.5.0"
@@ -18748,23 +21045,23 @@
       }
     },
     "node_modules/send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
         "ms": "2.1.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -18781,7 +21078,7 @@
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/send/node_modules/mime": {
       "version": "1.6.0",
@@ -18838,7 +21135,7 @@
     "node_modules/serve-index": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.4",
@@ -18862,10 +21159,19 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/serve-index/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/serve-index/node_modules/http-errors": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
       "dev": true,
       "dependencies": {
         "depd": "~1.1.2",
@@ -18880,13 +21186,13 @@
     "node_modules/serve-index/node_modules/inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
       "dev": true
     },
     "node_modules/serve-index/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
     "node_modules/serve-index/node_modules/setprototypeof": {
@@ -18895,15 +21201,24 @@
       "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
       "dev": true
     },
+    "node_modules/serve-index/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.2"
+        "send": "0.18.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -18912,7 +21227,7 @@
     "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
       "dev": true
     },
     "node_modules/set-value": {
@@ -18933,7 +21248,7 @@
     "node_modules/set-value/node_modules/extend-shallow": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
       "dependencies": {
         "is-extendable": "^0.1.0"
@@ -18945,7 +21260,7 @@
     "node_modules/set-value/node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -18966,7 +21281,7 @@
     "node_modules/setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
       "dev": true
     },
     "node_modules/setprototypeof": {
@@ -18999,7 +21314,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
@@ -19040,27 +21354,6 @@
         "node": ">=0.3.1"
       }
     },
-    "node_modules/sinon/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/sinon/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/sirv": {
       "version": "1.0.19",
       "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
@@ -19076,12 +21369,12 @@
       }
     },
     "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/slice-ansi": {
@@ -19170,7 +21463,7 @@
     "node_modules/snapdragon-node/node_modules/define-property": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
       "dev": true,
       "dependencies": {
         "is-descriptor": "^1.0.0"
@@ -19200,7 +21493,7 @@
     "node_modules/snapdragon-util/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
       "dependencies": {
         "is-buffer": "^1.1.5"
@@ -19221,7 +21514,7 @@
     "node_modules/snapdragon/node_modules/define-property": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
       "dependencies": {
         "is-descriptor": "^0.1.0"
@@ -19233,7 +21526,7 @@
     "node_modules/snapdragon/node_modules/extend-shallow": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
       "dev": true,
       "dependencies": {
         "is-extendable": "^0.1.0"
@@ -19245,7 +21538,7 @@
     "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
       "dev": true,
       "dependencies": {
         "kind-of": "^3.0.2"
@@ -19257,7 +21550,7 @@
     "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
       "dependencies": {
         "is-buffer": "^1.1.5"
@@ -19275,7 +21568,7 @@
     "node_modules/snapdragon/node_modules/is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
       "dev": true,
       "dependencies": {
         "kind-of": "^3.0.2"
@@ -19287,7 +21580,7 @@
     "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
       "dependencies": {
         "is-buffer": "^1.1.5"
@@ -19313,7 +21606,7 @@
     "node_modules/snapdragon/node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -19322,7 +21615,7 @@
     "node_modules/snapdragon/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
     "node_modules/snapdragon/node_modules/source-map-resolve": {
@@ -19340,36 +21633,35 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
-      "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz",
+      "integrity": "sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "debug": "~4.3.2",
-        "engine.io": "~6.1.0",
-        "socket.io-adapter": "~2.3.3",
-        "socket.io-parser": "~4.0.4"
+        "engine.io": "~6.2.0",
+        "socket.io-adapter": "~2.4.0",
+        "socket.io-parser": "~4.2.0"
       },
       "engines": {
         "node": ">=10.0.0"
       }
     },
     "node_modules/socket.io-adapter": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
-      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
+      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
       "dev": true
     },
     "node_modules/socket.io-parser": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
-      "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz",
+      "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==",
       "dev": true,
       "dependencies": {
-        "@types/component-emitter": "^1.2.10",
-        "component-emitter": "~1.3.0",
+        "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
       },
       "engines": {
@@ -19385,7 +21677,7 @@
     "node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -19413,22 +21705,12 @@
       }
     },
     "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
       "dev": true,
       "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "source-map": "^0.5.6"
       }
     },
     "node_modules/source-map-url": {
@@ -19491,15 +21773,15 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
-      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
+      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
       "dev": true
     },
     "node_modules/split": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-      "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+      "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
       "dev": true,
       "dependencies": {
         "through": "2"
@@ -19520,19 +21802,46 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/split-string/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/split2": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz",
-      "integrity": "sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
       "dev": true,
+      "dependencies": {
+        "readable-stream": "^3.0.0"
+      }
+    },
+    "node_modules/split2/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
       "engines": {
-        "node": ">= 10.x"
+        "node": ">= 6"
       }
     },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
     "node_modules/sshpk": {
@@ -19563,7 +21872,7 @@
     "node_modules/stack-trace": {
       "version": "0.0.10",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
       "dev": true,
       "engines": {
         "node": "*"
@@ -19593,7 +21902,7 @@
     "node_modules/static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
       "dev": true,
       "dependencies": {
         "define-property": "^0.2.5",
@@ -19606,7 +21915,7 @@
     "node_modules/static-extend/node_modules/define-property": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
       "dependencies": {
         "is-descriptor": "^0.1.0"
@@ -19618,7 +21927,7 @@
     "node_modules/static-extend/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
       "dev": true,
       "dependencies": {
         "kind-of": "^3.0.2"
@@ -19630,7 +21939,7 @@
     "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
       "dependencies": {
         "is-buffer": "^1.1.5"
@@ -19648,7 +21957,7 @@
     "node_modules/static-extend/node_modules/is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
       "dev": true,
       "dependencies": {
         "kind-of": "^3.0.2"
@@ -19660,7 +21969,7 @@
     "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
       "dependencies": {
         "is-buffer": "^1.1.5"
@@ -19684,11 +21993,11 @@
       }
     },
     "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/stream-buffers": {
@@ -19703,7 +22012,7 @@
     "node_modules/stream-combiner": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-      "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+      "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
       "dev": true,
       "dependencies": {
         "duplexer": "~0.1.1"
@@ -19722,19 +22031,51 @@
       "dev": true
     },
     "node_modules/streamroller": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.4.tgz",
-      "integrity": "sha512-GI9NzeD+D88UFuIlJkKNDH/IsuR+qIN7Qh8EsmhoRZr9bQoehTraRgwtLUkZbpcAw+hLPfHOypmppz8YyGK68w==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.3.tgz",
+      "integrity": "sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w==",
       "dev": true,
       "dependencies": {
-        "date-format": "^4.0.4",
-        "debug": "^4.3.3",
-        "fs-extra": "^10.0.1"
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "fs-extra": "^8.1.0"
       },
       "engines": {
         "node": ">=8.0"
       }
     },
+    "node_modules/streamroller/node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/streamroller/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/streamroller/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -19744,10 +22085,16 @@
         "safe-buffer": "~5.1.0"
       }
     },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
     "node_modules/string-template": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
-      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
+      "integrity": "sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==",
       "dev": true
     },
     "node_modules/string-width": {
@@ -19764,33 +22111,29 @@
         "node": ">=8"
       }
     },
-    "node_modules/string-width/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -19825,7 +22168,7 @@
     "node_modules/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -19834,7 +22177,7 @@
     "node_modules/strip-bom-string": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-      "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
+      "integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -19843,34 +22186,42 @@
     "node_modules/strip-eof": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/strip-json-comments": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
+      "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/suffix": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
-      "integrity": "sha1-zFgjFkag7xEC95R47zqSSP2chC8=",
+      "integrity": "sha512-j5uf6MJtMCfC4vBe5LFktSe4bGyNTBk7I2Kdri0jeLrcv5B9pWfxVa5JQpoxgtR8vaVB7bVxsWgnfQbX5wkhAA==",
       "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "node": ">=4"
       }
     },
     "node_modules/supports-preserve-symlinks-flag": {
@@ -19887,7 +22238,7 @@
     "node_modules/sver-compat": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
+      "integrity": "sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==",
       "dev": true,
       "dependencies": {
         "es6-iterator": "^2.0.1",
@@ -19911,9 +22262,9 @@
       }
     },
     "node_modules/table/node_modules/ajv": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz",
-      "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -19986,7 +22337,7 @@
     "node_modules/temp-fs": {
       "version": "0.9.9",
       "resolved": "https://registry.npmjs.org/temp-fs/-/temp-fs-0.9.9.tgz",
-      "integrity": "sha1-gHFzBDeHByDpQxUy/igUNk+IA9c=",
+      "integrity": "sha512-WfecDCR1xC9b0nsrzSaxPf3ZuWeWLUWblW4vlDQAa1biQaKHiImHnJfeQocQe/hXKMcolRzgkcVX/7kK4zoWbw==",
       "dev": true,
       "dependencies": {
         "rimraf": "~2.5.2"
@@ -19998,7 +22349,7 @@
     "node_modules/temp-fs/node_modules/rimraf": {
       "version": "2.5.4",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
-      "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=",
+      "integrity": "sha512-Lw7SHMjssciQb/rRz7JyPIy9+bbUshEucPoLRvWqy09vC5zQixl8Uet+Zl+SROBB/JMWHJRdCk1qdxNWHNMvlQ==",
       "dev": true,
       "dependencies": {
         "glob": "^7.0.5"
@@ -20030,9 +22381,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.14.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
-      "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
+      "version": "5.15.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz",
+      "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==",
       "dev": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.2",
@@ -20048,16 +22399,16 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz",
-      "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
+      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
       "dev": true,
       "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.14",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^5.7.2"
+        "terser": "^5.14.1"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -20097,15 +22448,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
     "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
@@ -20124,7 +22466,19 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/source-map": {
+    "node_modules/terser/node_modules/acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/terser/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
@@ -20133,24 +22487,16 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/terser/node_modules/acorn": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+    "node_modules/terser/node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
       }
     },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
     "node_modules/test-exclude": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
@@ -20168,7 +22514,7 @@
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
     "node_modules/textextensions": {
@@ -20186,7 +22532,7 @@
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
       "dev": true
     },
     "node_modules/through2": {
@@ -20235,7 +22581,7 @@
     "node_modules/time-stamp": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+      "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -20280,21 +22626,21 @@
       }
     },
     "node_modules/tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "dependencies": {
-        "rimraf": "^3.0.0"
+        "os-tmpdir": "~1.0.2"
       },
       "engines": {
-        "node": ">=8.17.0"
+        "node": ">=0.6.0"
       }
     },
     "node_modules/to-absolute-glob": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
+      "integrity": "sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==",
       "dev": true,
       "dependencies": {
         "is-absolute": "^1.0.0",
@@ -20307,7 +22653,7 @@
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "engines": {
         "node": ">=4"
       }
@@ -20315,7 +22661,7 @@
     "node_modules/to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
       "dev": true,
       "dependencies": {
         "kind-of": "^3.0.2"
@@ -20333,7 +22679,7 @@
     "node_modules/to-object-path/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
       "dependencies": {
         "is-buffer": "^1.1.5"
@@ -20369,19 +22715,23 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/to-regex-range/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+    "node_modules/to-regex/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
       "engines": {
-        "node": ">=0.12.0"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/to-through": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
+      "integrity": "sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==",
       "dev": true,
       "dependencies": {
         "through2": "^2.0.3"
@@ -20433,13 +22783,13 @@
     "node_modules/tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
       "dev": true
     },
     "node_modules/traverse": {
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-      "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
+      "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==",
       "dev": true,
       "engines": {
         "node": "*"
@@ -20458,7 +22808,7 @@
     "node_modules/trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "integrity": "sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -20475,14 +22825,14 @@
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.13.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.13.0.tgz",
-      "integrity": "sha512-nWuffZppoaYK0vQ1SQmkSsQzJoHA4s6uzdb2waRpD806x9yfq153AdVsWz4je2qZcW+pENrMQXbGQ3sMCkXuhw==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
       "dev": true,
       "dependencies": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.1",
-        "minimist": "^1.2.0",
+        "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       }
     },
@@ -20507,7 +22857,7 @@
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
@@ -20519,7 +22869,7 @@
     "node_modules/tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
       "dev": true
     },
     "node_modules/type": {
@@ -20576,7 +22926,7 @@
     "node_modules/typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
       "dev": true
     },
     "node_modules/typescript": {
@@ -20615,9 +22965,9 @@
       }
     },
     "node_modules/ua-parser-js": {
-      "version": "0.7.31",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz",
-      "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==",
+      "version": "0.7.32",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.32.tgz",
+      "integrity": "sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw==",
       "dev": true,
       "funding": [
         {
@@ -20634,9 +22984,9 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.15.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz",
-      "integrity": "sha512-peeoTk3hSwYdoc9nrdiEJk+gx1ALCtTjdYuKSXMTDqq7n1W7dHPqWDdSi+BPL0ni2YMeHD7hKUSdbj3TZauY2A==",
+      "version": "3.17.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
       "dev": true,
       "optional": true,
       "bin": {
@@ -20647,14 +22997,14 @@
       }
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
         "which-boxed-primitive": "^1.0.2"
       },
       "funding": {
@@ -20674,7 +23024,7 @@
     "node_modules/unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+      "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -20704,7 +23054,7 @@
     "node_modules/undertaker-registry": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
+      "integrity": "sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==",
       "dev": true,
       "engines": {
         "node": ">= 0.10"
@@ -20713,7 +23063,7 @@
     "node_modules/undertaker/node_modules/fast-levenshtein": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
-      "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=",
+      "integrity": "sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==",
       "dev": true
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
@@ -20745,9 +23095,9 @@
       }
     },
     "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
       "engines": {
         "node": ">=4"
       }
@@ -20786,10 +23136,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/union-value/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/union-value/node_modules/is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -20905,7 +23264,7 @@
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -20913,7 +23272,7 @@
     "node_modules/unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
       "dev": true,
       "dependencies": {
         "has-value": "^0.3.1",
@@ -20926,7 +23285,7 @@
     "node_modules/unset-value/node_modules/has-value": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
       "dev": true,
       "dependencies": {
         "get-value": "^2.0.3",
@@ -20940,7 +23299,7 @@
     "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
       "dev": true,
       "dependencies": {
         "isarray": "1.0.0"
@@ -20952,7 +23311,7 @@
     "node_modules/unset-value/node_modules/has-values": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -20961,7 +23320,7 @@
     "node_modules/unset-value/node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true
     },
     "node_modules/unzipper": {
@@ -20981,6 +23340,15 @@
         "setimmediate": "~1.0.4"
       }
     },
+    "node_modules/unzipper/node_modules/duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
     "node_modules/upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
@@ -20992,9 +23360,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz",
-      "integrity": "sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -21028,14 +23396,14 @@
     "node_modules/urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
       "deprecated": "Please see https://github.com/lydell/urix#deprecated",
       "dev": true
     },
     "node_modules/url": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
       "dev": true,
       "dependencies": {
         "punycode": "1.3.2",
@@ -21061,7 +23429,7 @@
     "node_modules/url/node_modules/punycode": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
       "dev": true
     },
     "node_modules/use": {
@@ -21074,29 +23442,28 @@
       }
     },
     "node_modules/util": {
-      "version": "0.12.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
-      "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
       "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "is-arguments": "^1.0.4",
         "is-generator-function": "^1.0.7",
         "is-typed-array": "^1.1.3",
-        "safe-buffer": "^5.1.2",
         "which-typed-array": "^1.1.2"
       }
     },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "engines": {
         "node": ">= 0.4.0"
       }
@@ -21160,7 +23527,7 @@
     "node_modules/value-or-function": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
+      "integrity": "sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==",
       "dev": true,
       "engines": {
         "node": ">= 0.10"
@@ -21169,7 +23536,7 @@
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -21177,7 +23544,7 @@
     "node_modules/verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "dev": true,
       "engines": [
         "node >=0.6.0"
@@ -21191,13 +23558,13 @@
     "node_modules/verror/node_modules/core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true
     },
     "node_modules/vfile": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.4.tgz",
-      "integrity": "sha512-KI+7cnst03KbEyN1+JE504zF5bJBZa+J+CrevLeyIMq0aPU681I2rQ5p4PlnQ6exFtWiUrg26QUdFMnAKR6PIw==",
+      "version": "5.3.5",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.5.tgz",
+      "integrity": "sha512-U1ho2ga33eZ8y8pkbQLH54uKqGhFJ6GYIHnnG5AhRpAh3OWjkrRHKa/KogbmQn8We+c0KVV3rTOgR9V/WowbXQ==",
       "dev": true,
       "dependencies": {
         "@types/unist": "^2.0.0",
@@ -21254,6 +23621,12 @@
         "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
+    "node_modules/vfile-reporter/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
     "node_modules/vfile-reporter/node_modules/string-width": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
@@ -21325,13 +23698,13 @@
       }
     },
     "node_modules/video.js": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.20.2.tgz",
-      "integrity": "sha512-hdvAHKAyaL6bCDkeu0pPtFYKi1EDaOUovm7FN1xqBDolUxgH8FKy1WIgTS+Ouuaw7R54SCTcSeXjZEizhy9ouQ==",
+      "version": "7.20.3",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.20.3.tgz",
+      "integrity": "sha512-JMspxaK74LdfWcv69XWhX4rILywz/eInOVPdKefpQiZJSMD5O8xXYueqACP2Q5yqKstycgmmEKlJzZ+kVmDciw==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
-        "@videojs/http-streaming": "2.14.2",
+        "@videojs/http-streaming": "2.14.3",
         "@videojs/vhs-utils": "^3.0.4",
         "@videojs/xhr": "2.6.0",
         "aes-decrypter": "3.1.3",
@@ -21342,7 +23715,7 @@
         "mux.js": "6.0.1",
         "safe-json-parse": "4.0.0",
         "videojs-font": "3.2.0",
-        "videojs-vtt.js": "^0.15.3"
+        "videojs-vtt.js": "^0.15.4"
       }
     },
     "node_modules/video.js/node_modules/safe-json-parse": {
@@ -21474,7 +23847,7 @@
     "node_modules/vinyl-sourcemap": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
+      "integrity": "sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==",
       "dev": true,
       "dependencies": {
         "append-buffer": "^1.0.2",
@@ -21492,7 +23865,7 @@
     "node_modules/vinyl-sourcemap/node_modules/normalize-path": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
       "dev": true,
       "dependencies": {
         "remove-trailing-separator": "^1.0.1"
@@ -21504,7 +23877,7 @@
     "node_modules/vinyl-sourcemaps-apply": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
-      "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
+      "integrity": "sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw==",
       "dev": true,
       "dependencies": {
         "source-map": "^0.5.1"
@@ -21522,16 +23895,16 @@
     "node_modules/void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+      "integrity": "sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/vue-template-compiler": {
-      "version": "2.7.10",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz",
-      "integrity": "sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ==",
+      "version": "2.7.13",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz",
+      "integrity": "sha512-jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -21549,9 +23922,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
       "dev": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
@@ -21564,54 +23937,148 @@
     "node_modules/wcwidth": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
       "dev": true,
       "dependencies": {
         "defaults": "^1.0.3"
       }
     },
     "node_modules/webdriver": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.16.16.tgz",
-      "integrity": "sha512-x8UoG9k/P8KDrfSh1pOyNevt9tns3zexoMxp9cKnyA/7HYSErhZYTLGlgxscAXLtQG41cMH/Ba/oBmOx7Hgd8w==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.5.3.tgz",
+      "integrity": "sha512-cDTn/hYj5x8BYwXxVb/WUwqGxrhCMP2rC8ttIWCfzmiVtmOnJGulC7CyxU3+p9Q5R/gIKTzdJOss16dhb+5CoA==",
       "dev": true,
       "dependencies": {
-        "@types/node": "^17.0.4",
-        "@wdio/config": "7.16.16",
-        "@wdio/logger": "7.16.0",
-        "@wdio/protocols": "7.16.7",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
         "got": "^11.0.2",
-        "ky": "^0.29.0",
         "lodash.merge": "^4.6.1"
       },
       "engines": {
         "node": ">=12.0.0"
       }
     },
+    "node_modules/webdriver/node_modules/@wdio/logger": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+      "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/webdriver/node_modules/@wdio/types": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+      "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+      "dev": true,
+      "dependencies": {
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/webdriver/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/webdriver/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/webdriver/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/webdriver/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/webdriver/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webdriver/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/webdriverio": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.16.16.tgz",
-      "integrity": "sha512-caPaEWyuD3Qoa7YkW4xCCQA4v9Pa9wmhFGPvNZh3ERtjMCNi8L/XXOdkekWNZmFh3tY0kFguBj7+fAwSY7HAGw==",
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.25.4.tgz",
+      "integrity": "sha512-agkgwn2SIk5cAJ03uue1GnGZcUZUDN3W4fUMY9/VfO8bVJrPEgWg31bPguEWPu+YhEB/aBJD8ECxJ3OEKdy4qQ==",
       "dev": true,
       "dependencies": {
         "@types/aria-query": "^5.0.0",
-        "@types/node": "^17.0.4",
-        "@wdio/config": "7.16.16",
-        "@wdio/logger": "7.16.0",
-        "@wdio/protocols": "7.16.7",
-        "@wdio/repl": "7.16.14",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
+        "@types/node": "^18.0.0",
+        "@wdio/config": "7.25.4",
+        "@wdio/logger": "7.19.0",
+        "@wdio/protocols": "7.22.0",
+        "@wdio/repl": "7.25.4",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
         "archiver": "^5.0.0",
         "aria-query": "^5.0.0",
         "css-shorthand-properties": "^1.1.1",
         "css-value": "^0.0.1",
-        "devtools": "7.16.16",
-        "devtools-protocol": "^0.0.973690",
+        "devtools": "7.25.4",
+        "devtools-protocol": "^0.0.1061995",
         "fs-extra": "^10.0.0",
-        "get-port": "^5.1.1",
         "grapheme-splitter": "^1.0.2",
         "lodash.clonedeep": "^4.5.0",
         "lodash.isobject": "^3.0.2",
@@ -21623,12 +24090,120 @@
         "resq": "^1.9.1",
         "rgb2hex": "0.2.5",
         "serialize-error": "^8.0.0",
-        "webdriver": "7.16.16"
+        "webdriver": "7.25.4"
       },
       "engines": {
         "node": ">=12.0.0"
       }
     },
+    "node_modules/webdriverio/node_modules/@types/node": {
+      "version": "18.11.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
+      "dev": true
+    },
+    "node_modules/webdriverio/node_modules/@wdio/config": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.25.4.tgz",
+      "integrity": "sha512-vb0emDtD9FbFh/yqW6oNdo2iuhQp8XKj6GX9fyy9v4wZgg3B0HPMVJxhIfcoHz7LMBWlHSo9YdvhFI5EQHRLBA==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "7.19.0",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
+        "deepmerge": "^4.0.0",
+        "glob": "^8.0.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/webdriverio/node_modules/@wdio/logger": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.19.0.tgz",
+      "integrity": "sha512-xR7SN/kGei1QJD1aagzxs3KMuzNxdT/7LYYx+lt6BII49+fqL/SO+5X0FDCZD0Ds93AuQvvz9eGyzrBI2FFXmQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "loglevel": "^1.6.0",
+        "loglevel-plugin-prefix": "^0.8.4",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/webdriverio/node_modules/@wdio/protocols": {
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.22.0.tgz",
+      "integrity": "sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/webdriverio/node_modules/@wdio/repl": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.25.4.tgz",
+      "integrity": "sha512-kYhj9gLsUk4HmlXLqkVre+gwbfvw9CcnrHjqIjrmMS4mR9D8zvBb5CItb3ZExfPf9jpFzIFREbCAYoE9x/kMwg==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/utils": "7.25.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/webdriverio/node_modules/@wdio/types": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
+      "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^18.0.0",
+        "got": "^11.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "^4.6.2"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webdriverio/node_modules/@wdio/utils": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.25.4.tgz",
+      "integrity": "sha512-8iwQDk+foUqSzKZKfhLxjlCKOkfRJPNHaezQoevNgnrTq/t0ek+ldZCATezb9B8jprAuP4mgS9xi22akc6RkzA==",
+      "dev": true,
+      "dependencies": {
+        "@wdio/logger": "7.19.0",
+        "@wdio/types": "7.25.4",
+        "p-iteration": "^1.1.8"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/webdriverio/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/webdriverio/node_modules/brace-expansion": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
@@ -21638,6 +24213,80 @@
         "balanced-match": "^1.0.0"
       }
     },
+    "node_modules/webdriverio/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/webdriverio/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/webdriverio/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/webdriverio/node_modules/glob": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+      "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/webdriverio/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webdriverio/node_modules/ky": {
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/ky/-/ky-0.30.0.tgz",
+      "integrity": "sha512-X/u76z4JtDVq10u1JA5UQfatPxgPaVDMYTrgHyiTpGN2z4TMEJkIHsoSBBSg9SWZEIXTKsi9kHgiQ9o3Y/4yog==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/ky?sponsor=1"
+      }
+    },
     "node_modules/webdriverio/node_modules/minimatch": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
@@ -21650,16 +24299,48 @@
         "node": ">=10"
       }
     },
+    "node_modules/webdriverio/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webdriverio/node_modules/webdriver": {
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.25.4.tgz",
+      "integrity": "sha512-6nVDwenh0bxbtUkHASz9B8T9mB531Fn1PcQjUGj2t5dolLPn6zuK1D7XYVX40hpn6r3SlYzcZnEBs4X0az5Txg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "^18.0.0",
+        "@wdio/config": "7.25.4",
+        "@wdio/logger": "7.19.0",
+        "@wdio/protocols": "7.22.0",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
+        "got": "^11.0.2",
+        "ky": "0.30.0",
+        "lodash.merge": "^4.6.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
       "dev": true
     },
     "node_modules/webpack": {
-      "version": "5.70.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz",
-      "integrity": "sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==",
+      "version": "5.74.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
+      "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -21667,24 +24348,24 @@
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/wasm-edit": "1.11.1",
         "@webassemblyjs/wasm-parser": "1.11.1",
-        "acorn": "^8.4.1",
+        "acorn": "^8.7.1",
         "acorn-import-assertions": "^1.7.6",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.9.2",
+        "enhanced-resolve": "^5.10.0",
         "es-module-lexer": "^0.9.0",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.2.9",
-        "json-parse-better-errors": "^1.0.2",
+        "json-parse-even-better-errors": "^2.3.1",
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
         "schema-utils": "^3.1.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.3.1",
+        "watchpack": "^2.4.0",
         "webpack-sources": "^3.2.3"
       },
       "bin": {
@@ -21704,9 +24385,9 @@
       }
     },
     "node_modules/webpack-bundle-analyzer": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz",
-      "integrity": "sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz",
+      "integrity": "sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.0.4",
@@ -21727,9 +24408,9 @@
       }
     },
     "node_modules/webpack-bundle-analyzer/node_modules/acorn": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -21738,15 +24419,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/webpack-bundle-analyzer/node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/webpack-bundle-analyzer/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -21805,6 +24477,15 @@
         "node": ">= 10"
       }
     },
+    "node_modules/webpack-bundle-analyzer/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/webpack-bundle-analyzer/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -21818,9 +24499,9 @@
       }
     },
     "node_modules/webpack-bundle-analyzer/node_modules/ws": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
-      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
       "dev": true,
       "engines": {
         "node": ">=8.3.0"
@@ -21916,10 +24597,92 @@
         "webpack": "^5.21.2"
       }
     },
+    "node_modules/webpack-stream/node_modules/ansi-colors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-wrap": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-stream/node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-stream/node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-stream/node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-stream/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webpack-stream/node_modules/plugin-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/webpack-stream/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
     "node_modules/webpack/node_modules/acorn": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -21953,15 +24716,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/webpack/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
     "node_modules/webpack/node_modules/schema-utils": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
@@ -22006,7 +24760,7 @@
     "node_modules/whatwg-url": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
       "dev": true,
       "dependencies": {
         "tr46": "~0.0.3",
@@ -22059,18 +24813,24 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==",
+      "dev": true
+    },
     "node_modules/which-typed-array": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz",
-      "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
+      "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
       "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "es-abstract": "^1.18.5",
-        "foreach": "^2.0.5",
+        "es-abstract": "^1.20.0",
+        "for-each": "^0.3.3",
         "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.7"
+        "is-typed-array": "^1.1.9"
       },
       "engines": {
         "node": ">= 0.4"
@@ -22079,6 +24839,58 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
+    "node_modules/wide-align/node_modules/ansi-regex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "dependencies": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -22091,13 +24903,13 @@
     "node_modules/wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
       "dev": true
     },
     "node_modules/workerpool": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
-      "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
       "dev": true
     },
     "node_modules/wrap-ansi": {
@@ -22153,7 +24965,7 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
     "node_modules/write": {
@@ -22228,13 +25040,13 @@
     "node_modules/yargs": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
-      "integrity": "sha1-BU3oth8i7v23IHBZ6u+da4P7kxo=",
+      "integrity": "sha512-7OGt4xXoWJQh5ulgZ78rKaqY7dNWbjfK+UKxGcIlaM2j7C4fqGchyv8CPvEWdRPrHp6Ula/YU8yGRpYGOHrI+g==",
       "dev": true
     },
     "node_modules/yargs-parser": {
-      "version": "21.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-      "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "dev": true,
       "engines": {
         "node": ">=12"
@@ -22267,18 +25079,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/yargs-unparser/node_modules/decamelize": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/yargs-unparser/node_modules/is-plain-obj": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
@@ -22291,7 +25091,7 @@
     "node_modules/yarn-install": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/yarn-install/-/yarn-install-1.0.0.tgz",
-      "integrity": "sha1-V/RQULgu/VcYKzlzxUqgXLXSUjA=",
+      "integrity": "sha512-VO1u181msinhPcGvQTVMnHVOae8zjX/NSksR17e6eXHRveDvHCF5mGjh9hkN8mzyfnCqcBe42LdTs7bScuTaeg==",
       "dev": true,
       "dependencies": {
         "cac": "^3.0.3",
@@ -22309,7 +25109,7 @@
     "node_modules/yarn-install/node_modules/ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -22318,7 +25118,7 @@
     "node_modules/yarn-install/node_modules/ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -22327,7 +25127,7 @@
     "node_modules/yarn-install/node_modules/chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
       "dev": true,
       "dependencies": {
         "ansi-styles": "^2.2.1",
@@ -22343,7 +25143,7 @@
     "node_modules/yarn-install/node_modules/cross-spawn": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
+      "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^4.0.1",
@@ -22363,7 +25163,7 @@
     "node_modules/yarn-install/node_modules/strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "dev": true,
       "dependencies": {
         "ansi-regex": "^2.0.0"
@@ -22375,7 +25175,7 @@
     "node_modules/yarn-install/node_modules/supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
       "dev": true,
       "engines": {
         "node": ">=0.8.0"
@@ -22396,13 +25196,13 @@
     "node_modules/yarn-install/node_modules/yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
     },
     "node_modules/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
       "dev": true,
       "dependencies": {
         "buffer-crc32": "~0.2.3",
@@ -22460,20 +25260,19 @@
       }
     },
     "plugins/eslint": {
-      "name": "eslint-plugin-prebid",
       "version": "1.0.0",
-      "integrity": "sha512-DH8lk8H4D+XCWtPm7C27IzzD4lkBHv49YTqOHeS/1mYCp4rn1j3NNNA1gl2q+CNYaAPSZDaS5DwRL/ErDP6O4Q==",
       "dev": true,
       "license": "Apache-2.0"
     }
   },
   "dependencies": {
     "@ampproject/remapping": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
-      "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
       "requires": {
-        "@jridgewell/trace-mapping": "^0.3.0"
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
     "@babel/code-frame": {
@@ -22485,25 +25284,25 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.0.tgz",
-      "integrity": "sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw=="
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz",
+      "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ=="
     },
     "@babel/core": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.0.tgz",
-      "integrity": "sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ==",
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz",
+      "integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==",
       "requires": {
         "@ampproject/remapping": "^2.1.0",
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.0",
-        "@babel/helper-compilation-targets": "^7.19.0",
-        "@babel/helper-module-transforms": "^7.19.0",
-        "@babel/helpers": "^7.19.0",
-        "@babel/parser": "^7.19.0",
+        "@babel/generator": "^7.19.6",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helpers": "^7.19.4",
+        "@babel/parser": "^7.19.6",
         "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0",
+        "@babel/traverse": "^7.19.6",
+        "@babel/types": "^7.19.4",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -22512,86 +25311,96 @@
       }
     },
     "@babel/eslint-parser": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
-      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
+      "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
       "dev": true,
       "requires": {
-        "eslint-scope": "^5.1.1",
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
         "eslint-visitor-keys": "^2.1.0",
         "semver": "^6.3.0"
       }
     },
     "@babel/generator": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
-      "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.1.tgz",
+      "integrity": "sha512-u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg==",
       "requires": {
-        "@babel/types": "^7.19.0",
+        "@babel/types": "^7.20.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "jsesc": "^2.5.1"
+      },
+      "dependencies": {
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        }
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
+      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
       "requires": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
-      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
+      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/helper-explode-assignable-expression": "^7.18.6",
+        "@babel/types": "^7.18.9"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz",
-      "integrity": "sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA==",
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz",
+      "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==",
       "requires": {
-        "@babel/compat-data": "^7.19.0",
+        "@babel/compat-data": "^7.20.0",
         "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.20.2",
+        "browserslist": "^4.21.3",
         "semver": "^6.3.0"
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.17.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz",
-      "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-member-expression-to-functions": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7"
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-member-expression-to-functions": "^7.18.9",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/helper-replace-supers": "^7.18.9",
+        "@babel/helper-split-export-declaration": "^7.18.6"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz",
-      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
+      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "regexpu-core": "^5.0.1"
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "regexpu-core": "^5.1.0"
       }
     },
     "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
-      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
+      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
       "requires": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
+        "@babel/helper-compilation-targets": "^7.17.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "debug": "^4.1.1",
         "lodash.debounce": "^4.0.8",
         "resolve": "^1.14.2",
@@ -22604,11 +25413,11 @@
       "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
-      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
+      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
       "requires": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       }
     },
     "@babel/helper-function-name": {
@@ -22629,11 +25438,11 @@
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz",
-      "integrity": "sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
+      "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
       "requires": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.9"
       }
     },
     "@babel/helper-module-imports": {
@@ -22645,69 +25454,70 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
-      "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz",
+      "integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.18.6",
+        "@babel/helper-simple-access": "^7.19.4",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.19.1",
         "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+        "@babel/traverse": "^7.19.6",
+        "@babel/types": "^7.19.4"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
+      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
       "requires": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.18.6"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz",
-      "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
+      "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
+      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-wrap-function": "^7.16.8",
-        "@babel/types": "^7.16.8"
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-wrap-function": "^7.18.9",
+        "@babel/types": "^7.18.9"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
-      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
+      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
       "requires": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-member-expression-to-functions": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-member-expression-to-functions": "^7.18.9",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/traverse": "^7.19.1",
+        "@babel/types": "^7.19.0"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
-      "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
+      "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.19.4"
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
-      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
+      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
       "requires": {
-        "@babel/types": "^7.16.0"
+        "@babel/types": "^7.20.0"
       }
     },
     "@babel/helper-split-export-declaration": {
@@ -22719,14 +25529,14 @@
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
-      "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
-      "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
     },
     "@babel/helper-validator-option": {
       "version": "7.18.6",
@@ -22734,24 +25544,24 @@
       "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
     },
     "@babel/helper-wrap-function": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
-      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
+      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
       "requires": {
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.8",
-        "@babel/types": "^7.16.8"
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/template": "^7.18.10",
+        "@babel/traverse": "^7.19.0",
+        "@babel/types": "^7.19.0"
       }
     },
     "@babel/helpers": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
-      "integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz",
+      "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==",
       "requires": {
         "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+        "@babel/traverse": "^7.20.1",
+        "@babel/types": "^7.20.0"
       }
     },
     "@babel/highlight": {
@@ -22765,169 +25575,170 @@
       }
     },
     "@babel/parser": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz",
-      "integrity": "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw=="
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.1.tgz",
+      "integrity": "sha512-hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz",
-      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
+      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
+      "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+        "@babel/plugin-proposal-optional-chaining": "^7.18.9"
       }
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz",
-      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz",
+      "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-remap-async-to-generator": "^7.18.9",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz",
-      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-proposal-class-static-block": {
-      "version": "7.17.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz",
-      "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
+      "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.17.6",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
-      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
+      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz",
-      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
+      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.9",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz",
-      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
+      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-json-strings": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz",
-      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
+      "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.9",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz",
-      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
-      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz",
-      "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==",
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz",
+      "integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==",
       "requires": {
-        "@babel/compat-data": "^7.17.0",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/compat-data": "^7.19.4",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-plugin-utils": "^7.19.0",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.16.7"
+        "@babel/plugin-transform-parameters": "^7.18.8"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
-      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
+      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
+      "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-private-methods": {
-      "version": "7.16.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz",
-      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
+      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.16.10",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz",
-      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
+      "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz",
-      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -22970,6 +25781,14 @@
         "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
+    "@babel/plugin-syntax-import-assertions": {
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
+      "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.19.0"
+      }
+    },
     "@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
@@ -23043,331 +25862,332 @@
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz",
-      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
+      "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
+      "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
       "requires": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8"
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-remap-async-to-generator": "^7.18.6"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
-      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
+      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz",
-      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz",
+      "integrity": "sha512-sXOohbpHZSk7GjxK9b3dKB7CfqUD5DwOH+DggKzOQ7TXYP+RCSbRykfjQmn/zq+rBjycVRtLf9pYhAaEJA786w==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.19.0"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz",
-      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
+      "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-annotate-as-pure": "^7.18.6",
+        "@babel/helper-compilation-targets": "^7.19.0",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-optimise-call-expression": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-replace-supers": "^7.18.9",
+        "@babel/helper-split-export-declaration": "^7.18.6",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz",
-      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
+      "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz",
-      "integrity": "sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==",
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz",
+      "integrity": "sha512-1dIhvZfkDVx/zn2S1aFwlruspTt4189j7fEkH0Y0VyuDM6bQt7bD6kLcz3l4IlLG+e5OReaBz9ROAbttRtUHqA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.19.0"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
-      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
+      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz",
-      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
+      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
-      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
+      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz",
-      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
+      "version": "7.18.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
+      "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
-      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
+      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
       "requires": {
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-compilation-targets": "^7.18.9",
+        "@babel/helper-function-name": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.18.9"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz",
-      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
+      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
-      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
+      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz",
-      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz",
+      "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helper-plugin-utils": "^7.19.0"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz",
-      "integrity": "sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==",
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz",
+      "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-simple-access": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-simple-access": "^7.19.4"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz",
-      "integrity": "sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==",
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz",
+      "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==",
       "requires": {
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-module-transforms": "^7.19.6",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-validator-identifier": "^7.19.1"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz",
-      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
+      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-module-transforms": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz",
-      "integrity": "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
+      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
+        "@babel/helper-plugin-utils": "^7.19.0"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz",
-      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
+      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
-      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
+      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-replace-supers": "^7.18.6"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz",
-      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.1.tgz",
+      "integrity": "sha512-nDvKLrAvl+kf6BOy1UJ3MGwzzfTMgppxwiD2Jb4LO3xjYyZq30oQzDNJbCQpMdG9+j2IXHoiMrw5Cm/L6ZoxXQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.19.0"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
-      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
+      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz",
-      "integrity": "sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
+      "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
       "requires": {
-        "regenerator-transform": "^0.14.2"
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "regenerator-transform": "^0.15.0"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz",
-      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
+      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.9.tgz",
-      "integrity": "sha512-wS8uJwBt7/b/mzE13ktsJdmS4JP/j7PQSaADtnb4I2wL0zK51MQ0pmF8/Jy0wUIS96fr+fXT6S/ifiPXnvrlSg==",
+      "version": "7.19.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
+      "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
       "requires": {
         "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "babel-plugin-polyfill-corejs2": "^0.3.1",
-        "babel-plugin-polyfill-corejs3": "^0.5.2",
-        "babel-plugin-polyfill-regenerator": "^0.3.1",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "babel-plugin-polyfill-corejs2": "^0.3.3",
+        "babel-plugin-polyfill-corejs3": "^0.6.0",
+        "babel-plugin-polyfill-regenerator": "^0.4.1",
         "semver": "^6.3.0"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
-      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
+      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz",
-      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
+      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
-      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
+      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz",
-      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
+      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz",
-      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
+      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9"
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
-      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
+      "version": "7.18.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
+      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.18.9"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
-      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
+      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
     "@babel/preset-env": {
-      "version": "7.16.11",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
-      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz",
+      "integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==",
       "requires": {
-        "@babel/compat-data": "^7.16.8",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
-        "@babel/plugin-proposal-class-properties": "^7.16.7",
-        "@babel/plugin-proposal-class-static-block": "^7.16.7",
-        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
-        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
-        "@babel/plugin-proposal-json-strings": "^7.16.7",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-private-methods": "^7.16.11",
-        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
+        "@babel/compat-data": "^7.19.4",
+        "@babel/helper-compilation-targets": "^7.19.3",
+        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-validator-option": "^7.18.6",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
+        "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
+        "@babel/plugin-proposal-class-properties": "^7.18.6",
+        "@babel/plugin-proposal-class-static-block": "^7.18.6",
+        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
+        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+        "@babel/plugin-proposal-json-strings": "^7.18.6",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
+        "@babel/plugin-proposal-object-rest-spread": "^7.19.4",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
+        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
+        "@babel/plugin-proposal-private-methods": "^7.18.6",
+        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.18.6",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -23377,44 +26197,44 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.16.7",
-        "@babel/plugin-transform-async-to-generator": "^7.16.8",
-        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
-        "@babel/plugin-transform-block-scoping": "^7.16.7",
-        "@babel/plugin-transform-classes": "^7.16.7",
-        "@babel/plugin-transform-computed-properties": "^7.16.7",
-        "@babel/plugin-transform-destructuring": "^7.16.7",
-        "@babel/plugin-transform-dotall-regex": "^7.16.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
-        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
-        "@babel/plugin-transform-for-of": "^7.16.7",
-        "@babel/plugin-transform-function-name": "^7.16.7",
-        "@babel/plugin-transform-literals": "^7.16.7",
-        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
-        "@babel/plugin-transform-modules-amd": "^7.16.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
-        "@babel/plugin-transform-modules-umd": "^7.16.7",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
-        "@babel/plugin-transform-new-target": "^7.16.7",
-        "@babel/plugin-transform-object-super": "^7.16.7",
-        "@babel/plugin-transform-parameters": "^7.16.7",
-        "@babel/plugin-transform-property-literals": "^7.16.7",
-        "@babel/plugin-transform-regenerator": "^7.16.7",
-        "@babel/plugin-transform-reserved-words": "^7.16.7",
-        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
-        "@babel/plugin-transform-spread": "^7.16.7",
-        "@babel/plugin-transform-sticky-regex": "^7.16.7",
-        "@babel/plugin-transform-template-literals": "^7.16.7",
-        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
-        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
-        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/plugin-transform-arrow-functions": "^7.18.6",
+        "@babel/plugin-transform-async-to-generator": "^7.18.6",
+        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
+        "@babel/plugin-transform-block-scoping": "^7.19.4",
+        "@babel/plugin-transform-classes": "^7.19.0",
+        "@babel/plugin-transform-computed-properties": "^7.18.9",
+        "@babel/plugin-transform-destructuring": "^7.19.4",
+        "@babel/plugin-transform-dotall-regex": "^7.18.6",
+        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
+        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
+        "@babel/plugin-transform-for-of": "^7.18.8",
+        "@babel/plugin-transform-function-name": "^7.18.9",
+        "@babel/plugin-transform-literals": "^7.18.9",
+        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
+        "@babel/plugin-transform-modules-amd": "^7.18.6",
+        "@babel/plugin-transform-modules-commonjs": "^7.18.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.19.0",
+        "@babel/plugin-transform-modules-umd": "^7.18.6",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
+        "@babel/plugin-transform-new-target": "^7.18.6",
+        "@babel/plugin-transform-object-super": "^7.18.6",
+        "@babel/plugin-transform-parameters": "^7.18.8",
+        "@babel/plugin-transform-property-literals": "^7.18.6",
+        "@babel/plugin-transform-regenerator": "^7.18.6",
+        "@babel/plugin-transform-reserved-words": "^7.18.6",
+        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
+        "@babel/plugin-transform-spread": "^7.19.0",
+        "@babel/plugin-transform-sticky-regex": "^7.18.6",
+        "@babel/plugin-transform-template-literals": "^7.18.9",
+        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
+        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
+        "@babel/plugin-transform-unicode-regex": "^7.18.6",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.16.8",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "core-js-compat": "^3.20.2",
+        "@babel/types": "^7.19.4",
+        "babel-plugin-polyfill-corejs2": "^0.3.3",
+        "babel-plugin-polyfill-corejs3": "^0.6.0",
+        "babel-plugin-polyfill-regenerator": "^0.4.1",
+        "core-js-compat": "^3.25.1",
         "semver": "^6.3.0"
       }
     },
@@ -23431,18 +26251,21 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
-      "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz",
+      "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==",
       "requires": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.13.9",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-          "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
-        }
+        "regenerator-runtime": "^0.13.10"
+      }
+    },
+    "@babel/runtime-corejs3": {
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.1.tgz",
+      "integrity": "sha512-CGulbEDcg/ND1Im7fUNRZdGXmX2MTWVVZacQi/6DiKE5HNwZ3aVTm5PV4lO8HHz0B2h8WQyvKKjbX5XgTtydsg==",
+      "dev": true,
+      "requires": {
+        "core-js-pure": "^3.25.1",
+        "regenerator-runtime": "^0.13.10"
       }
     },
     "@babel/template": {
@@ -23456,29 +26279,29 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.0.tgz",
-      "integrity": "sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz",
+      "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==",
       "requires": {
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.0",
+        "@babel/generator": "^7.20.1",
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-function-name": "^7.19.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.19.0",
-        "@babel/types": "^7.19.0",
+        "@babel/parser": "^7.20.1",
+        "@babel/types": "^7.20.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
-      "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
+      "version": "7.20.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.0.tgz",
+      "integrity": "sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==",
       "requires": {
-        "@babel/helper-string-parser": "^7.18.10",
-        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/helper-string-parser": "^7.19.4",
+        "@babel/helper-validator-identifier": "^7.19.1",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -23518,9 +26341,9 @@
           }
         },
         "globals": {
-          "version": "13.12.1",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz",
-          "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+          "version": "13.17.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+          "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -23596,7 +26419,7 @@
     "@gulp-sourcemaps/map-sources": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
-      "integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
+      "integrity": "sha512-o/EatdaGt8+x2qpb0vFLC/2Gug/xYPRXb6a+ET1wGYKozKN3krDWC/zZFZAtrzxJHuDL12mwdfEFKcKMNvc55A==",
       "dev": true,
       "requires": {
         "normalize-path": "^2.0.1",
@@ -23606,7 +26429,7 @@
         "normalize-path": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
           "dev": true,
           "requires": {
             "remove-trailing-separator": "^1.0.1"
@@ -23676,57 +26499,6 @@
         "get-package-type": "^0.1.0",
         "js-yaml": "^3.13.1",
         "resolve-from": "^5.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        }
       }
     },
     "@istanbuljs/schema": {
@@ -23736,15 +26508,15 @@
       "dev": true
     },
     "@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^15.0.0",
         "chalk": "^4.0.0"
       },
       "dependencies": {
@@ -23782,6 +26554,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -23794,19 +26572,18 @@
       }
     },
     "@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
       "requires": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
     "@jridgewell/resolve-uri": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
-      "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
     },
     "@jridgewell/set-array": {
       "version": "1.1.2",
@@ -23821,20 +26598,42 @@
       "requires": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "dependencies": {
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "dev": true,
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        }
       }
     },
     "@jridgewell/sourcemap-codec": {
-      "version": "1.4.11",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
-      "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
-      "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
+      "version": "0.3.17",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
       "requires": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
+    "@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dev": true,
+      "requires": {
+        "eslint-scope": "5.1.1"
       }
     },
     "@polka/url": {
@@ -23879,15 +26678,15 @@
       }
     },
     "@sinonjs/text-encoding": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
-      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
+      "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
       "dev": true
     },
-    "@socket.io/base64-arraybuffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
-      "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==",
+    "@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
       "dev": true
     },
     "@szmarczak/http-timer": {
@@ -23900,9 +26699,9 @@
       }
     },
     "@types/aria-query": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.0.tgz",
-      "integrity": "sha512-P+dkdFu0n08PDIvw+9nT9ByQnd+Udc8DaWPb9HKfaPwCvWvQpC5XaMRx2xLWECm9x1VKNps6vEAlirjA6+uNrQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
+      "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
       "dev": true
     },
     "@types/cacheable-request": {
@@ -23917,12 +26716,6 @@
         "@types/responselike": "*"
       }
     },
-    "@types/component-emitter": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
-      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==",
-      "dev": true
-    },
     "@types/cookie": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
@@ -23957,15 +26750,15 @@
       "dev": true
     },
     "@types/ejs": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.0.tgz",
-      "integrity": "sha512-DCg+Ka+uDQ31lJ/UtEXVlaeV3d6t81gifaVWKJy4MYVVgvJttyX/viREy+If7fz+tK/gVxTGMtyrFPnm4gjrVA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.1.tgz",
+      "integrity": "sha512-RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA==",
       "dev": true
     },
     "@types/eslint": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
-      "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
+      "version": "8.4.9",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.9.tgz",
+      "integrity": "sha512-jFCSo4wJzlHQLCpceUhUnXdrPuCNOjGFMQ8Eg6JXxlz3QaCKOb7eGi2cephQdM4XTYsNej69P9JDJ1zqNIbncQ==",
       "dev": true,
       "requires": {
         "@types/estree": "*",
@@ -23973,9 +26766,9 @@
       }
     },
     "@types/eslint-scope": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
-      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
       "dev": true,
       "requires": {
         "@types/eslint": "*",
@@ -24037,13 +26830,13 @@
       "dev": true
     },
     "@types/inquirer": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.0.tgz",
-      "integrity": "sha512-BNoMetRf3gmkpAlV5we+kxyZTle7YibdOntIZbU5pyIfMdcwy784KfeZDAcuyMznkh5OLa17RVXZOGA5LTlkgQ==",
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-HhxyLejTHMfohAuhRun4csWigAMjXTmRyiJTU1Y/I1xmggikFMkOUoMQRlFm+zQcPEGHSs3io/0FAmNZf8EymQ==",
       "dev": true,
       "requires": {
         "@types/through": "*",
-        "rxjs": "^7.2.0"
+        "rxjs": "^6.4.0"
       }
     },
     "@types/istanbul-lib-coverage": {
@@ -24071,54 +26864,54 @@
       }
     },
     "@types/json-schema": {
-      "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
       "dev": true
     },
     "@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
     "@types/keyv": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz",
-      "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-4.2.0.tgz",
+      "integrity": "sha512-xoBtGl5R9jeKUhc8ZqeYaRDx04qqJ10yhhXYGmJ4Jr8qKpvMsDQQrNUvF/wUJ4klOtmJeJM+p2Xo3zp9uaC3tw==",
       "dev": true,
       "requires": {
-        "@types/node": "*"
+        "keyv": "*"
       }
     },
     "@types/lodash": {
-      "version": "4.14.179",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz",
-      "integrity": "sha512-uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w==",
+      "version": "4.14.187",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.187.tgz",
+      "integrity": "sha512-MrO/xLXCaUgZy3y96C/iOsaIqZSeupyTImKClHunL5GrmaiII2VwvWmLBu2hwa0Kp0sV19CsyjtrTc/Fx8rg/A==",
       "dev": true
     },
     "@types/lodash.flattendeep": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.6.tgz",
-      "integrity": "sha512-uLm2MaRVlqJSGsMK0RZpP5T3KqReq+9WbYDHCUhBhp98v56hMG/Yht52bsoTSui9xz2mUvQ9NfG3LrNGDL92Ng==",
+      "version": "4.4.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.7.tgz",
+      "integrity": "sha512-1h6GW/AeZw/Wej6uxrqgmdTDZX1yFS39lRsXYkg+3kWvOWWrlGCI6H7lXxlUHOzxDT4QeYGmgPpQ3BX9XevzOg==",
       "dev": true,
       "requires": {
         "@types/lodash": "*"
       }
     },
     "@types/lodash.pickby": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/@types/lodash.pickby/-/lodash.pickby-4.6.6.tgz",
-      "integrity": "sha512-NFa13XxlMd9eFi0UFZFWIztpMpXhozbijrx3Yb1viYZphT7jyopIFVoIRF4eYMjruWNEG1rnyrRmg/8ej9T8Iw==",
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.pickby/-/lodash.pickby-4.6.7.tgz",
+      "integrity": "sha512-4ebXRusuLflfscbD0PUX4eVknDHD9Yf+uMtBIvA/hrnTqeAzbuHuDjvnYriLjUrI9YrhCPVKUf4wkRSXJQ6gig==",
       "dev": true,
       "requires": {
         "@types/lodash": "*"
       }
     },
     "@types/lodash.union": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz",
-      "integrity": "sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw==",
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.7.tgz",
+      "integrity": "sha512-6HXM6tsnHJzKgJE0gA/LhTGf/7AbjUk759WZ1MziVm+OBNAATHhdgj+a3KVE8g76GCLAnN4ZEQQG1EGgtBIABA==",
       "dev": true,
       "requires": {
         "@types/lodash": "*"
@@ -24133,16 +26926,10 @@
         "@types/unist": "*"
       }
     },
-    "@types/mdurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
-      "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
-      "dev": true
-    },
     "@types/mocha": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.0.tgz",
-      "integrity": "sha512-QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg==",
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.3.tgz",
+      "integrity": "sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw==",
       "dev": true
     },
     "@types/ms": {
@@ -24152,9 +26939,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "17.0.21",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz",
-      "integrity": "sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==",
+      "version": "17.0.45",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
+      "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
       "dev": true
     },
     "@types/normalize-package-data": {
@@ -24170,18 +26957,18 @@
       "dev": true
     },
     "@types/puppeteer": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.5.tgz",
-      "integrity": "sha512-lxCjpDEY+DZ66+W3x5Af4oHnEmUXt0HuaRzkBGE2UZiZEp/V1d3StpLPlmNVu/ea091bdNmVPl44lu8Wy/0ZCA==",
+      "version": "5.4.7",
+      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.7.tgz",
+      "integrity": "sha512-JdGWZZYL0vKapXF4oQTC5hLVNfOgdPrqeZ1BiQnGk5cB7HeE91EWUiTdVSdQPobRN8rIcdffjiOgCYJ/S8QrnQ==",
       "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
     "@types/recursive-readdir": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@types/recursive-readdir/-/recursive-readdir-2.2.0.tgz",
-      "integrity": "sha512-HGk753KRu2N4mWduovY4BLjYq4jTOL29gV2OfGdGxHcPSWGFkC5RRIdk+VTs5XmYd7MVAD+JwKrcb5+5Y7FOCg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@types/recursive-readdir/-/recursive-readdir-2.2.1.tgz",
+      "integrity": "sha512-Xd+Ptc4/F2ueInqy5yK2FI5FxtwwbX2+VZpcg+9oYsFJVen8qQKGapCr+Bi5wQtHU1cTXT8s+07lo/nKPgu8Gg==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -24261,9 +27048,9 @@
       "dev": true
     },
     "@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "version": "15.0.14",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
@@ -24276,9 +27063,9 @@
       "dev": true
     },
     "@types/yauzl": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
-      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -24292,9 +27079,9 @@
       "dev": true
     },
     "@videojs/http-streaming": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.14.2.tgz",
-      "integrity": "sha512-K1raSfO/pq5r8iUas3OSYni0kXOj91n8ealIpV02khghzGv9LQ6O3YUqYd/eAhJ1HIrmZWOnrYpK/P+mhUExXQ==",
+      "version": "2.14.3",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.14.3.tgz",
+      "integrity": "sha512-2tFwxCaNbcEZzQugWf8EERwNMyNtspfHnvxRGRABQs09W/5SqmkWFuGWfUAm4wQKlXGfdPyAJ1338ASl459xAA==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.12.5",
@@ -24330,14 +27117,14 @@
       }
     },
     "@vue/compiler-core": {
-      "version": "3.2.38",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.38.tgz",
-      "integrity": "sha512-/FsvnSu7Z+lkd/8KXMa4yYNUiqQrI22135gfsQYVGuh5tqEgOB0XqrUdb/KnCLa5+TmQLPwvyUnKMyCpu+SX3Q==",
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.41.tgz",
+      "integrity": "sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw==",
       "dev": true,
       "optional": true,
       "requires": {
         "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.38",
+        "@vue/shared": "3.2.41",
         "estree-walker": "^2.0.2",
         "source-map": "^0.6.1"
       },
@@ -24352,29 +27139,29 @@
       }
     },
     "@vue/compiler-dom": {
-      "version": "3.2.38",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.38.tgz",
-      "integrity": "sha512-zqX4FgUbw56kzHlgYuEEJR8mefFiiyR3u96498+zWPsLeh1WKvgIReoNE+U7gG8bCUdvsrJ0JRmev0Ky6n2O0g==",
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz",
+      "integrity": "sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw==",
       "dev": true,
       "optional": true,
       "requires": {
-        "@vue/compiler-core": "3.2.38",
-        "@vue/shared": "3.2.38"
+        "@vue/compiler-core": "3.2.41",
+        "@vue/shared": "3.2.41"
       }
     },
     "@vue/compiler-sfc": {
-      "version": "3.2.38",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.38.tgz",
-      "integrity": "sha512-KZjrW32KloMYtTcHAFuw3CqsyWc5X6seb8KbkANSWt3Cz9p2qA8c1GJpSkksFP9ABb6an0FLCFl46ZFXx3kKpg==",
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.41.tgz",
+      "integrity": "sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w==",
       "dev": true,
       "optional": true,
       "requires": {
         "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.38",
-        "@vue/compiler-dom": "3.2.38",
-        "@vue/compiler-ssr": "3.2.38",
-        "@vue/reactivity-transform": "3.2.38",
-        "@vue/shared": "3.2.38",
+        "@vue/compiler-core": "3.2.41",
+        "@vue/compiler-dom": "3.2.41",
+        "@vue/compiler-ssr": "3.2.41",
+        "@vue/reactivity-transform": "3.2.41",
+        "@vue/shared": "3.2.41",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.25.7",
         "postcss": "^8.1.10",
@@ -24391,34 +27178,34 @@
       }
     },
     "@vue/compiler-ssr": {
-      "version": "3.2.38",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.38.tgz",
-      "integrity": "sha512-bm9jOeyv1H3UskNm4S6IfueKjUNFmi2kRweFIGnqaGkkRePjwEcfCVqyS3roe7HvF4ugsEkhf4+kIvDhip6XzQ==",
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.41.tgz",
+      "integrity": "sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ==",
       "dev": true,
       "optional": true,
       "requires": {
-        "@vue/compiler-dom": "3.2.38",
-        "@vue/shared": "3.2.38"
+        "@vue/compiler-dom": "3.2.41",
+        "@vue/shared": "3.2.41"
       }
     },
     "@vue/reactivity-transform": {
-      "version": "3.2.38",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.38.tgz",
-      "integrity": "sha512-3SD3Jmi1yXrDwiNJqQ6fs1x61WsDLqVk4NyKVz78mkaIRh6d3IqtRnptgRfXn+Fzf+m6B1KxBYWq1APj6h4qeA==",
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.41.tgz",
+      "integrity": "sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A==",
       "dev": true,
       "optional": true,
       "requires": {
         "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.38",
-        "@vue/shared": "3.2.38",
+        "@vue/compiler-core": "3.2.41",
+        "@vue/shared": "3.2.41",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.25.7"
       }
     },
     "@vue/shared": {
-      "version": "3.2.38",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.38.tgz",
-      "integrity": "sha512-dTyhTIRmGXBjxJE+skC8tTWCGLCVc4wQgRRLt8+O9p5ewBAjoBwtCAkLPrtToSr1xltoe3st21Pv953aOZ7alg==",
+      "version": "3.2.41",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.41.tgz",
+      "integrity": "sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw==",
       "dev": true,
       "optional": true
     },
@@ -24434,43 +27221,219 @@
         "browserstack-local": "^1.4.5",
         "got": "^11.0.2",
         "webdriverio": "7.16.16"
+      },
+      "dependencies": {
+        "@wdio/config": {
+          "version": "7.16.16",
+          "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.16.16.tgz",
+          "integrity": "sha512-K/ObPuo6Da2liz++OKOIfbdpFwI7UWiFcBylfJkCYbweuXCoW1aUqlKI6rmKPwCH9Uqr/RHWu6p8eo0zWe6xVA==",
+          "dev": true,
+          "requires": {
+            "@wdio/logger": "7.16.0",
+            "@wdio/types": "7.16.14",
+            "deepmerge": "^4.0.0",
+            "glob": "^7.1.2"
+          }
+        },
+        "@wdio/protocols": {
+          "version": "7.16.7",
+          "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.16.7.tgz",
+          "integrity": "sha512-Wv40pNQcLiPzQ3o98Mv4A8T1EBQ6k4khglz/e2r16CTm+F3DDYh8eLMAsU5cgnmuwwDKX1EyOiFwieykBn5MCg==",
+          "dev": true
+        },
+        "@wdio/repl": {
+          "version": "7.16.14",
+          "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.16.14.tgz",
+          "integrity": "sha512-Ezih0Y+lsGkKv3H3U56hdWgZiQGA3VaAYguSLd9+g1xbQq+zMKqSmfqECD9bAy+OgCCiVTRstES6lHZxJVPhAg==",
+          "dev": true,
+          "requires": {
+            "@wdio/utils": "7.16.14"
+          }
+        },
+        "@wdio/utils": {
+          "version": "7.16.14",
+          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.16.14.tgz",
+          "integrity": "sha512-wwin8nVpIlhmXJkq6GJw9aDDzgLOJKgXTcEua0T2sdXjoW78u5Ly/GZrFXTjMGhacFvoZfitTrjyfyy4CxMVvw==",
+          "dev": true,
+          "requires": {
+            "@wdio/logger": "7.16.0",
+            "@wdio/types": "7.16.14",
+            "p-iteration": "^1.1.8"
+          }
+        },
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "devtools": {
+          "version": "7.16.16",
+          "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
+          "integrity": "sha512-M0kzkuSgfEhpqIis3gdtWsNjn/HQ+vRAmEzDnbYx/7FfjFxhSv1d+rOOT20pvd60soItMYpsOova1igACEGkGQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^17.0.4",
+            "@types/ua-parser-js": "^0.7.33",
+            "@wdio/config": "7.16.16",
+            "@wdio/logger": "7.16.0",
+            "@wdio/protocols": "7.16.7",
+            "@wdio/types": "7.16.14",
+            "@wdio/utils": "7.16.14",
+            "chrome-launcher": "^0.15.0",
+            "edge-paths": "^2.1.0",
+            "puppeteer-core": "^13.1.3",
+            "query-selector-shadow-dom": "^1.0.0",
+            "ua-parser-js": "^1.0.1",
+            "uuid": "^8.0.0"
+          }
+        },
+        "devtools-protocol": {
+          "version": "0.0.973690",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.973690.tgz",
+          "integrity": "sha512-myh3hSFp0YWa2GED11PmbLhV4dv9RdO7YUz27XJrbQLnP5bMbZL6dfOOILTHO57yH0kX5GfuOZBsg/4NamfPvQ==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        },
+        "ua-parser-js": {
+          "version": "1.0.32",
+          "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.32.tgz",
+          "integrity": "sha512-dXVsz3M4j+5tTiovFVyVqssXBu5HM47//YSOeZ9fQkdDKkfzv2v3PP1jmH6FUyPW+yCSn7aBVK1fGGKNhowdDA==",
+          "dev": true
+        },
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "dev": true
+        },
+        "webdriver": {
+          "version": "7.16.16",
+          "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.16.16.tgz",
+          "integrity": "sha512-x8UoG9k/P8KDrfSh1pOyNevt9tns3zexoMxp9cKnyA/7HYSErhZYTLGlgxscAXLtQG41cMH/Ba/oBmOx7Hgd8w==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^17.0.4",
+            "@wdio/config": "7.16.16",
+            "@wdio/logger": "7.16.0",
+            "@wdio/protocols": "7.16.7",
+            "@wdio/types": "7.16.14",
+            "@wdio/utils": "7.16.14",
+            "got": "^11.0.2",
+            "ky": "^0.29.0",
+            "lodash.merge": "^4.6.1"
+          }
+        },
+        "webdriverio": {
+          "version": "7.16.16",
+          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.16.16.tgz",
+          "integrity": "sha512-caPaEWyuD3Qoa7YkW4xCCQA4v9Pa9wmhFGPvNZh3ERtjMCNi8L/XXOdkekWNZmFh3tY0kFguBj7+fAwSY7HAGw==",
+          "dev": true,
+          "requires": {
+            "@types/aria-query": "^5.0.0",
+            "@types/node": "^17.0.4",
+            "@wdio/config": "7.16.16",
+            "@wdio/logger": "7.16.0",
+            "@wdio/protocols": "7.16.7",
+            "@wdio/repl": "7.16.14",
+            "@wdio/types": "7.16.14",
+            "@wdio/utils": "7.16.14",
+            "archiver": "^5.0.0",
+            "aria-query": "^5.0.0",
+            "css-shorthand-properties": "^1.1.1",
+            "css-value": "^0.0.1",
+            "devtools": "7.16.16",
+            "devtools-protocol": "^0.0.973690",
+            "fs-extra": "^10.0.0",
+            "get-port": "^5.1.1",
+            "grapheme-splitter": "^1.0.2",
+            "lodash.clonedeep": "^4.5.0",
+            "lodash.isobject": "^3.0.2",
+            "lodash.isplainobject": "^4.0.6",
+            "lodash.zip": "^4.2.0",
+            "minimatch": "^5.0.0",
+            "puppeteer-core": "^13.1.3",
+            "query-selector-shadow-dom": "^1.0.0",
+            "resq": "^1.9.1",
+            "rgb2hex": "0.2.5",
+            "serialize-error": "^8.0.0",
+            "webdriver": "7.16.16"
+          }
+        }
       }
     },
     "@wdio/cli": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.16.16.tgz",
-      "integrity": "sha512-Wz/e5zm1UNHB9RAIsJIM7ioDzVllUwTvhVWOrI7HR/53GmO/cIvAVjpnlglizJNgK8WlbnM/cKNVIXxqxrnFmw==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.5.7.tgz",
+      "integrity": "sha512-nOQJLskrY+UECDd3NxE7oBzb6cDA7e7x02YWQugOlOgnZ4a+PJmkFoSsO8C2uNCpdFngy5rJKGUo5vbtAHEF9Q==",
       "dev": true,
       "requires": {
         "@types/ejs": "^3.0.5",
         "@types/fs-extra": "^9.0.4",
-        "@types/inquirer": "^8.1.2",
+        "@types/inquirer": "^7.3.1",
         "@types/lodash.flattendeep": "^4.4.6",
         "@types/lodash.pickby": "^4.6.6",
         "@types/lodash.union": "^4.6.6",
-        "@types/node": "^17.0.4",
         "@types/recursive-readdir": "^2.2.0",
-        "@wdio/config": "7.16.16",
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
         "async-exit-hook": "^2.0.1",
         "chalk": "^4.0.0",
         "chokidar": "^3.0.0",
         "cli-spinners": "^2.1.0",
         "ejs": "^3.0.1",
         "fs-extra": "^10.0.0",
-        "inquirer": "8.1.5",
+        "inquirer": "^8.0.0",
         "lodash.flattendeep": "^4.4.0",
         "lodash.pickby": "^4.6.0",
         "lodash.union": "^4.6.0",
         "mkdirp": "^1.0.4",
         "recursive-readdir": "^2.2.2",
-        "webdriverio": "7.16.16",
+        "webdriverio": "7.5.7",
         "yargs": "^17.0.0",
         "yarn-install": "^1.0.0"
       },
       "dependencies": {
+        "@types/aria-query": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+          "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+          "dev": true
+        },
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "dev": true,
+          "requires": {
+            "got": "^11.8.1"
+          }
+        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -24480,6 +27443,16 @@
             "color-convert": "^2.0.1"
           }
         },
+        "aria-query": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+          "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.10.2",
+            "@babel/runtime-corejs3": "^7.10.2"
+          }
+        },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -24490,6 +27463,31 @@
             "supports-color": "^7.1.0"
           }
         },
+        "chrome-launcher": {
+          "version": "0.13.4",
+          "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+          "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "escape-string-regexp": "^1.0.5",
+            "is-wsl": "^2.2.0",
+            "lighthouse-logger": "^1.0.0",
+            "mkdirp": "^0.5.3",
+            "rimraf": "^3.0.2"
+          },
+          "dependencies": {
+            "mkdirp": {
+              "version": "0.5.6",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+              "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+              "dev": true,
+              "requires": {
+                "minimist": "^1.2.6"
+              }
+            }
+          }
+        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -24505,6 +27503,65 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "devtools": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
+          "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+          "dev": true,
+          "requires": {
+            "@wdio/config": "7.5.3",
+            "@wdio/logger": "7.5.3",
+            "@wdio/protocols": "7.5.3",
+            "@wdio/types": "7.5.3",
+            "@wdio/utils": "7.5.3",
+            "chrome-launcher": "^0.13.1",
+            "edge-paths": "^2.1.0",
+            "puppeteer-core": "^9.1.0",
+            "query-selector-shadow-dom": "^1.0.0",
+            "ua-parser-js": "^0.7.21",
+            "uuid": "^8.0.0"
+          }
+        },
+        "devtools-protocol": {
+          "version": "0.0.878340",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
+          "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "puppeteer-core": {
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
+          "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.1.0",
+            "devtools-protocol": "0.0.869402",
+            "extract-zip": "^2.0.0",
+            "https-proxy-agent": "^5.0.0",
+            "node-fetch": "^2.6.1",
+            "pkg-dir": "^4.2.0",
+            "progress": "^2.0.1",
+            "proxy-from-env": "^1.1.0",
+            "rimraf": "^3.0.2",
+            "tar-fs": "^2.0.0",
+            "unbzip2-stream": "^1.3.3",
+            "ws": "^7.2.3"
+          },
+          "dependencies": {
+            "devtools-protocol": {
+              "version": "0.0.869402",
+              "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+              "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+              "dev": true
+            }
+          }
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -24514,13 +27571,62 @@
             "has-flag": "^4.0.0"
           }
         },
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "dev": true
+        },
+        "webdriverio": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
+          "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
+          "dev": true,
+          "requires": {
+            "@types/aria-query": "^4.2.1",
+            "@wdio/config": "7.5.3",
+            "@wdio/logger": "7.5.3",
+            "@wdio/protocols": "7.5.3",
+            "@wdio/repl": "7.5.3",
+            "@wdio/types": "7.5.3",
+            "@wdio/utils": "7.5.3",
+            "archiver": "^5.0.0",
+            "aria-query": "^4.2.2",
+            "atob": "^2.1.2",
+            "css-shorthand-properties": "^1.1.1",
+            "css-value": "^0.0.1",
+            "devtools": "7.5.7",
+            "devtools-protocol": "^0.0.878340",
+            "fs-extra": "^10.0.0",
+            "get-port": "^5.1.1",
+            "grapheme-splitter": "^1.0.2",
+            "lodash.clonedeep": "^4.5.0",
+            "lodash.isobject": "^3.0.2",
+            "lodash.isplainobject": "^4.0.6",
+            "lodash.zip": "^4.2.0",
+            "minimatch": "^3.0.4",
+            "puppeteer-core": "^9.1.0",
+            "query-selector-shadow-dom": "^1.0.0",
+            "resq": "^1.9.1",
+            "rgb2hex": "0.2.5",
+            "serialize-error": "^8.0.0",
+            "webdriver": "7.5.3"
+          }
+        },
+        "ws": {
+          "version": "7.5.9",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+          "dev": true,
+          "requires": {}
+        },
         "yargs": {
-          "version": "17.3.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz",
-          "integrity": "sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==",
+          "version": "17.6.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
+          "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
           "dev": true,
           "requires": {
-            "cliui": "^7.0.2",
+            "cliui": "^8.0.1",
             "escalade": "^3.1.1",
             "get-caller-file": "^2.0.5",
             "require-directory": "^2.1.1",
@@ -24532,17 +27638,26 @@
       }
     },
     "@wdio/concise-reporter": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-7.16.14.tgz",
-      "integrity": "sha512-CR+9+skJ3mXPIdRo0AnIJTJHOArrWdKlXTnyZ/DD6M9VrNk5aiTWQyphT/IeHV5+fxjHlMNIf/KgIhj1ewschQ==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-7.5.7.tgz",
+      "integrity": "sha512-964i7eQ4sboSla2bdR8714Er82QBgS6u39GmDFX8Izy9Ge38xaE75HuF5S7mnOWGzSojCWgqtwy5k7Rfg6GE3g==",
       "dev": true,
       "requires": {
-        "@wdio/reporter": "7.16.14",
-        "@wdio/types": "7.16.14",
+        "@wdio/reporter": "7.5.7",
+        "@wdio/types": "7.5.3",
         "chalk": "^4.0.0",
         "pretty-ms": "^7.0.0"
       },
       "dependencies": {
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "dev": true,
+          "requires": {
+            "got": "^11.8.1"
+          }
+        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -24577,6 +27692,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -24589,31 +27710,175 @@
       }
     },
     "@wdio/config": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.16.16.tgz",
-      "integrity": "sha512-K/ObPuo6Da2liz++OKOIfbdpFwI7UWiFcBylfJkCYbweuXCoW1aUqlKI6rmKPwCH9Uqr/RHWu6p8eo0zWe6xVA==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.5.3.tgz",
+      "integrity": "sha512-udvVizYoilOxuWj/BmoN6y7ZCd4wPdYNlSfWznrbCezAdaLZ4/pNDOO0WRWx2C4+q1wdkXZV/VuQPUGfL0lEHQ==",
       "dev": true,
       "requires": {
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
         "deepmerge": "^4.0.0",
         "glob": "^7.1.2"
+      },
+      "dependencies": {
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "dev": true,
+          "requires": {
+            "got": "^11.8.1"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "@wdio/local-runner": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.16.16.tgz",
-      "integrity": "sha512-AJaOyM842PWgMffrrXyHJjouVseLHoiL5U1sw2VVproi3ORWHbltl1AMnreU/lrGu9L0CVKHYT1pxu5UbSOCxQ==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.5.7.tgz",
+      "integrity": "sha512-aYc0XUV+/e3cg8Fp+CWlC4FbwSSG3mKAv1iuy/+Hwzg2kJE+aa+Rf2p2BQYc7HPRtKNW0bM8o+aCImZLAiPM+A==",
       "dev": true,
       "requires": {
         "@types/stream-buffers": "^3.0.3",
-        "@wdio/logger": "7.16.0",
-        "@wdio/repl": "7.16.14",
-        "@wdio/runner": "7.16.16",
-        "@wdio/types": "7.16.14",
+        "@wdio/logger": "7.5.3",
+        "@wdio/repl": "7.5.3",
+        "@wdio/runner": "7.5.7",
+        "@wdio/types": "7.5.3",
         "async-exit-hook": "^2.0.1",
-        "split2": "^4.0.0",
+        "split2": "^3.2.2",
         "stream-buffers": "^3.0.2"
+      },
+      "dependencies": {
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "dev": true,
+          "requires": {
+            "got": "^11.8.1"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "@wdio/logger": {
@@ -24662,6 +27927,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -24674,19 +27945,46 @@
       }
     },
     "@wdio/mocha-framework": {
-      "version": "7.16.15",
-      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.16.15.tgz",
-      "integrity": "sha512-XRya85/RYPZk4MZ7Cvl3oudTdrOo+RyO8b5Ff+dH8hD3GBCACaWgW9AjbsyhvbSTdUlF0gNLPdqOCsxV5XyM3w==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.5.3.tgz",
+      "integrity": "sha512-96QCVWsiyZxEgOZP3oTq2B2T7zne5dCdehLa2n4q/BLjk96Rj0jifidJZfd/1+vdNPKX0gWWAzpy98Znn8MVMw==",
       "dev": true,
       "requires": {
-        "@types/mocha": "^9.0.0",
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
-        "expect-webdriverio": "^3.0.0",
-        "mocha": "^9.0.0"
+        "@types/mocha": "^8.0.0",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
+        "expect-webdriverio": "^2.0.0",
+        "mocha": "^8.0.1"
       },
       "dependencies": {
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "dev": true,
+          "requires": {
+            "got": "^11.8.1"
+          }
+        },
+        "ansi-colors": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+          "dev": true
+        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -24710,17 +28008,33 @@
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
+          }
+        },
+        "chokidar": {
+          "version": "3.5.1",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+          "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+          "dev": true,
+          "requires": {
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.3.1",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.5.0"
+          }
+        },
+        "cliui": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
           }
         },
         "color-convert": {
@@ -24738,6 +28052,21 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "diff": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+          "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+          "dev": true
+        },
         "escape-string-regexp": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -24754,10 +28083,30 @@
             "path-exists": "^4.0.0"
           }
         },
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
+          "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
           "dev": true,
           "requires": {
             "argparse": "^2.0.1"
@@ -24773,13 +28122,12 @@
           }
         },
         "log-symbols": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-          "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+          "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
           "dev": true,
           "requires": {
-            "chalk": "^4.1.0",
-            "is-unicode-supported": "^0.1.0"
+            "chalk": "^4.0.0"
           }
         },
         "minimatch": {
@@ -24792,47 +28140,59 @@
           }
         },
         "mocha": {
-          "version": "9.2.1",
-          "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.1.tgz",
-          "integrity": "sha512-T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==",
+          "version": "8.4.0",
+          "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz",
+          "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==",
           "dev": true,
           "requires": {
             "@ungap/promise-all-settled": "1.1.2",
             "ansi-colors": "4.1.1",
             "browser-stdout": "1.3.1",
-            "chokidar": "3.5.3",
-            "debug": "4.3.3",
+            "chokidar": "3.5.1",
+            "debug": "4.3.1",
             "diff": "5.0.0",
             "escape-string-regexp": "4.0.0",
             "find-up": "5.0.0",
-            "glob": "7.2.0",
+            "glob": "7.1.6",
             "growl": "1.10.5",
             "he": "1.2.0",
-            "js-yaml": "4.1.0",
-            "log-symbols": "4.1.0",
+            "js-yaml": "4.0.0",
+            "log-symbols": "4.0.0",
             "minimatch": "3.0.4",
             "ms": "2.1.3",
-            "nanoid": "3.2.0",
-            "serialize-javascript": "6.0.0",
+            "nanoid": "3.1.20",
+            "serialize-javascript": "5.0.1",
             "strip-json-comments": "3.1.1",
             "supports-color": "8.1.1",
             "which": "2.0.2",
-            "workerpool": "6.2.0",
+            "wide-align": "1.1.3",
+            "workerpool": "6.1.0",
             "yargs": "16.2.0",
             "yargs-parser": "20.2.4",
             "yargs-unparser": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.1.3",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+              "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+              "dev": true
+            },
+            "supports-color": {
+              "version": "8.1.1",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+              "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
           }
         },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        },
         "nanoid": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
-          "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
+          "version": "3.1.20",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
+          "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
           "dev": true
         },
         "p-limit": {
@@ -24853,11 +28213,23 @@
             "p-limit": "^3.0.2"
           }
         },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
+        "readdirp": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+          "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+          "dev": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        },
+        "serialize-javascript": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+          "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+          "dev": true,
+          "requires": {
+            "randombytes": "^2.1.0"
+          }
         },
         "strip-json-comments": {
           "version": "3.1.1",
@@ -24865,6 +28237,21 @@
           "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
           "dev": true
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "workerpool": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
+          "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==",
+          "dev": true
+        },
         "yargs": {
           "version": "16.2.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -24889,72 +28276,288 @@
       }
     },
     "@wdio/protocols": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.16.7.tgz",
-      "integrity": "sha512-Wv40pNQcLiPzQ3o98Mv4A8T1EBQ6k4khglz/e2r16CTm+F3DDYh8eLMAsU5cgnmuwwDKX1EyOiFwieykBn5MCg==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.5.3.tgz",
+      "integrity": "sha512-lpNaKwxYhDSL6neDtQQYXvzMAw+u4PXx65ryeMEX82mkARgzSZps5Kyrg9ub7X4T17K1NPfnY6UhZEWg6cKJCg==",
       "dev": true
     },
     "@wdio/repl": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.16.14.tgz",
-      "integrity": "sha512-Ezih0Y+lsGkKv3H3U56hdWgZiQGA3VaAYguSLd9+g1xbQq+zMKqSmfqECD9bAy+OgCCiVTRstES6lHZxJVPhAg==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.5.3.tgz",
+      "integrity": "sha512-jfNJwNoc2nWdnLsFoGHmOJR9zaWfDTBMWM3W1eR5kXIjevD6gAfWsB5ZoA4IdybujCXxdnhlsm4o2jIzp/6f7A==",
       "dev": true,
       "requires": {
-        "@wdio/utils": "7.16.14"
+        "@wdio/utils": "7.5.3"
       }
     },
     "@wdio/reporter": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.16.14.tgz",
-      "integrity": "sha512-e/I2oGfqjx9+zI4NT/garqxm7Afnos1EcrGSNu75WmP3PNJt4i+9DKkROu4PM6XWcpUB4v2UF7Mv/NrL3TU9aA==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.5.7.tgz",
+      "integrity": "sha512-9PXqZtCXDtU6UYLNDPu9MZQ8BiABGnRlJTrlbYB3gBfZDibMkJMvwXzPderipBv2+ifDZXmGe3Njf1ao2TkbFA==",
       "dev": true,
       "requires": {
-        "@types/diff": "^5.0.0",
-        "@types/node": "^17.0.4",
-        "@types/object-inspect": "^1.8.0",
-        "@types/supports-color": "^8.1.0",
-        "@types/tmp": "^0.2.0",
-        "@wdio/types": "7.16.14",
-        "diff": "^5.0.0",
-        "fs-extra": "^10.0.0",
-        "object-inspect": "^1.10.3",
-        "supports-color": "8.1.1"
+        "@wdio/types": "7.5.3",
+        "fs-extra": "^10.0.0"
+      },
+      "dependencies": {
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "dev": true,
+          "requires": {
+            "got": "^11.8.1"
+          }
+        }
       }
     },
     "@wdio/runner": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.16.16.tgz",
-      "integrity": "sha512-Tt2ja6GukGPq1m98WP26yOWUGwzK1y7gPTLy6rKlamz3mOBC7koL0T9+iqcFREquUe4CMy2jWp1lqvPlwMbu7g==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.5.7.tgz",
+      "integrity": "sha512-RzVXd+xnwK/thkx1/xo9K5iscQ0Ofobgsx5dNVtwLDVMn9V7jCW/WX4dSCPAPaVSqnUCmkcQp3P5AoSBPpCZnQ==",
       "dev": true,
       "requires": {
-        "@wdio/config": "7.16.16",
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
         "deepmerge": "^4.0.0",
         "gaze": "^1.1.2",
-        "webdriver": "7.16.16",
-        "webdriverio": "7.16.16"
+        "webdriver": "7.5.3",
+        "webdriverio": "7.5.7"
+      },
+      "dependencies": {
+        "@types/aria-query": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+          "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+          "dev": true
+        },
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "dev": true,
+          "requires": {
+            "got": "^11.8.1"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "aria-query": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+          "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.10.2",
+            "@babel/runtime-corejs3": "^7.10.2"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "chrome-launcher": {
+          "version": "0.13.4",
+          "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+          "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "escape-string-regexp": "^1.0.5",
+            "is-wsl": "^2.2.0",
+            "lighthouse-logger": "^1.0.0",
+            "mkdirp": "^0.5.3",
+            "rimraf": "^3.0.2"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "devtools": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
+          "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+          "dev": true,
+          "requires": {
+            "@wdio/config": "7.5.3",
+            "@wdio/logger": "7.5.3",
+            "@wdio/protocols": "7.5.3",
+            "@wdio/types": "7.5.3",
+            "@wdio/utils": "7.5.3",
+            "chrome-launcher": "^0.13.1",
+            "edge-paths": "^2.1.0",
+            "puppeteer-core": "^9.1.0",
+            "query-selector-shadow-dom": "^1.0.0",
+            "ua-parser-js": "^0.7.21",
+            "uuid": "^8.0.0"
+          }
+        },
+        "devtools-protocol": {
+          "version": "0.0.878340",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
+          "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.6"
+          }
+        },
+        "puppeteer-core": {
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
+          "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.1.0",
+            "devtools-protocol": "0.0.869402",
+            "extract-zip": "^2.0.0",
+            "https-proxy-agent": "^5.0.0",
+            "node-fetch": "^2.6.1",
+            "pkg-dir": "^4.2.0",
+            "progress": "^2.0.1",
+            "proxy-from-env": "^1.1.0",
+            "rimraf": "^3.0.2",
+            "tar-fs": "^2.0.0",
+            "unbzip2-stream": "^1.3.3",
+            "ws": "^7.2.3"
+          },
+          "dependencies": {
+            "devtools-protocol": {
+              "version": "0.0.869402",
+              "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+              "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+              "dev": true
+            }
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "dev": true
+        },
+        "webdriverio": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
+          "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
+          "dev": true,
+          "requires": {
+            "@types/aria-query": "^4.2.1",
+            "@wdio/config": "7.5.3",
+            "@wdio/logger": "7.5.3",
+            "@wdio/protocols": "7.5.3",
+            "@wdio/repl": "7.5.3",
+            "@wdio/types": "7.5.3",
+            "@wdio/utils": "7.5.3",
+            "archiver": "^5.0.0",
+            "aria-query": "^4.2.2",
+            "atob": "^2.1.2",
+            "css-shorthand-properties": "^1.1.1",
+            "css-value": "^0.0.1",
+            "devtools": "7.5.7",
+            "devtools-protocol": "^0.0.878340",
+            "fs-extra": "^10.0.0",
+            "get-port": "^5.1.1",
+            "grapheme-splitter": "^1.0.2",
+            "lodash.clonedeep": "^4.5.0",
+            "lodash.isobject": "^3.0.2",
+            "lodash.isplainobject": "^4.0.6",
+            "lodash.zip": "^4.2.0",
+            "minimatch": "^3.0.4",
+            "puppeteer-core": "^9.1.0",
+            "query-selector-shadow-dom": "^1.0.0",
+            "resq": "^1.9.1",
+            "rgb2hex": "0.2.5",
+            "serialize-error": "^8.0.0",
+            "webdriver": "7.5.3"
+          }
+        },
+        "ws": {
+          "version": "7.5.9",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+          "dev": true,
+          "requires": {}
+        }
       }
     },
     "@wdio/spec-reporter": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.19.1.tgz",
-      "integrity": "sha512-qnZkn3VcyBPtcorUtpyCFE8v5ubyWmR7mFETXNzyriHyvjvk+NeFCWaFcIehpXYXiAmNpAwyfnZoIY6tkKQixQ==",
+      "version": "7.19.7",
+      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.19.7.tgz",
+      "integrity": "sha512-BDBZU2EK/GuC9VxtfqPtoW43FmvKxYDsvcDVDi3F7o+9fkcuGSJiWbw1AX251ZzzVQ7YP9ImTitSpdpUKXkilQ==",
       "dev": true,
       "requires": {
         "@types/easy-table": "^0.0.33",
-        "@wdio/reporter": "7.19.1",
-        "@wdio/types": "7.19.1",
+        "@wdio/reporter": "7.19.7",
+        "@wdio/types": "7.19.5",
         "chalk": "^4.0.0",
         "easy-table": "^1.1.1",
         "pretty-ms": "^7.0.0"
       },
       "dependencies": {
         "@wdio/reporter": {
-          "version": "7.19.1",
-          "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.19.1.tgz",
-          "integrity": "sha512-sWmBBV4dPCZkGk9Qq0m35T/vHGen0N10nH4osQcVP3IZJqpo2eLIH4w+X6EUbjZ2GdgOA2bLMMzb1bl9JqnGPg==",
+          "version": "7.19.7",
+          "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.19.7.tgz",
+          "integrity": "sha512-Dum19gpfru66FnIq78/4HTuW87B7ceLDp6PJXwQM5kXyN7Gb7zhMgp6FZTM0FCYLyi6U/zXZSvpNUYl77caS6g==",
           "dev": true,
           "requires": {
             "@types/diff": "^5.0.0",
@@ -24962,17 +28565,46 @@
             "@types/object-inspect": "^1.8.0",
             "@types/supports-color": "^8.1.0",
             "@types/tmp": "^0.2.0",
-            "@wdio/types": "7.19.1",
+            "@wdio/types": "7.19.5",
             "diff": "^5.0.0",
             "fs-extra": "^10.0.0",
             "object-inspect": "^1.10.3",
             "supports-color": "8.1.1"
+          }
+        },
+        "@wdio/types": {
+          "version": "7.19.5",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.19.5.tgz",
+          "integrity": "sha512-S1lC0pmtEO7NVH/2nM1c7NHbkgxLZH3VVG/z6ym3Bbxdtcqi2LMsEvvawMAU/fmhyiIkMsGZCO8vxG9cRw4z4A==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^17.0.4",
+            "got": "^11.8.1"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           },
           "dependencies": {
             "supports-color": {
-              "version": "8.1.1",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-              "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+              "version": "7.2.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
               "dev": true,
               "requires": {
                 "has-flag": "^4.0.0"
@@ -24980,13 +28612,303 @@
             }
           }
         },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "@wdio/sync": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@wdio/sync/-/sync-7.5.7.tgz",
+      "integrity": "sha512-Zu/AYLjwqbFSbaOU1US7ownv3ov8JrtoGHq51JfJ4masefJDXNkHix2cZ0qEgl3IvkkWQ0ewL0G8GTXb3KOemA==",
+      "dev": true,
+      "requires": {
+        "@types/fibers": "^3.1.0",
+        "@types/puppeteer": "^5.4.0",
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "fibers": "^5.0.0",
+        "webdriverio": "7.5.7"
+      },
+      "dependencies": {
+        "@types/aria-query": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+          "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+          "dev": true
+        },
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "dev": true,
+          "requires": {
+            "got": "^11.8.1"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "aria-query": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+          "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+          "dev": true,
+          "requires": {
+            "@babel/runtime": "^7.10.2",
+            "@babel/runtime-corejs3": "^7.10.2"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "chrome-launcher": {
+          "version": "0.13.4",
+          "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+          "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "escape-string-regexp": "^1.0.5",
+            "is-wsl": "^2.2.0",
+            "lighthouse-logger": "^1.0.0",
+            "mkdirp": "^0.5.3",
+            "rimraf": "^3.0.2"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "devtools": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.5.7.tgz",
+          "integrity": "sha512-+kqmvFbceElhYpN35yjm1T4Rz3VbH0QaqrNWKRpeyFp657Y5W0bm1s5FyMUeIv0aTNkAgWcETtqL+EG9X9uvjQ==",
+          "dev": true,
+          "requires": {
+            "@wdio/config": "7.5.3",
+            "@wdio/logger": "7.5.3",
+            "@wdio/protocols": "7.5.3",
+            "@wdio/types": "7.5.3",
+            "@wdio/utils": "7.5.3",
+            "chrome-launcher": "^0.13.1",
+            "edge-paths": "^2.1.0",
+            "puppeteer-core": "^9.1.0",
+            "query-selector-shadow-dom": "^1.0.0",
+            "ua-parser-js": "^0.7.21",
+            "uuid": "^8.0.0"
+          }
+        },
+        "devtools-protocol": {
+          "version": "0.0.878340",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.878340.tgz",
+          "integrity": "sha512-W0q8Y02r1RNwfZtI4Jjh1/MZxRHyrIgy9FvElbJzQelZjmNH197H4mBQs7DZjlUUDA9s6Zz2jl+zUYFgLgEnzw==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.6"
+          }
+        },
+        "puppeteer-core": {
+          "version": "9.1.1",
+          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
+          "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.1.0",
+            "devtools-protocol": "0.0.869402",
+            "extract-zip": "^2.0.0",
+            "https-proxy-agent": "^5.0.0",
+            "node-fetch": "^2.6.1",
+            "pkg-dir": "^4.2.0",
+            "progress": "^2.0.1",
+            "proxy-from-env": "^1.1.0",
+            "rimraf": "^3.0.2",
+            "tar-fs": "^2.0.0",
+            "unbzip2-stream": "^1.3.3",
+            "ws": "^7.2.3"
+          },
+          "dependencies": {
+            "devtools-protocol": {
+              "version": "0.0.869402",
+              "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+              "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+              "dev": true
+            }
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "dev": true
+        },
+        "webdriverio": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.5.7.tgz",
+          "integrity": "sha512-TLluVPLo6Snn/dxEITvMz7ZuklN4qZOBddDuLb9LO3rhsfKDMNbnhcBk0SLdFsWny0aCuhWNpJ6co93702XC0A==",
+          "dev": true,
+          "requires": {
+            "@types/aria-query": "^4.2.1",
+            "@wdio/config": "7.5.3",
+            "@wdio/logger": "7.5.3",
+            "@wdio/protocols": "7.5.3",
+            "@wdio/repl": "7.5.3",
+            "@wdio/types": "7.5.3",
+            "@wdio/utils": "7.5.3",
+            "archiver": "^5.0.0",
+            "aria-query": "^4.2.2",
+            "atob": "^2.1.2",
+            "css-shorthand-properties": "^1.1.1",
+            "css-value": "^0.0.1",
+            "devtools": "7.5.7",
+            "devtools-protocol": "^0.0.878340",
+            "fs-extra": "^10.0.0",
+            "get-port": "^5.1.1",
+            "grapheme-splitter": "^1.0.2",
+            "lodash.clonedeep": "^4.5.0",
+            "lodash.isobject": "^3.0.2",
+            "lodash.isplainobject": "^4.0.6",
+            "lodash.zip": "^4.2.0",
+            "minimatch": "^3.0.4",
+            "puppeteer-core": "^9.1.0",
+            "query-selector-shadow-dom": "^1.0.0",
+            "resq": "^1.9.1",
+            "rgb2hex": "0.2.5",
+            "serialize-error": "^8.0.0",
+            "webdriver": "7.5.3"
+          }
+        },
+        "ws": {
+          "version": "7.5.9",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+          "dev": true,
+          "requires": {}
+        }
+      }
+    },
+    "@wdio/types": {
+      "version": "7.16.14",
+      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.16.14.tgz",
+      "integrity": "sha512-AyNI9iBSos9xWBmiFAF3sBs6AJXO/55VppU/eeF4HRdbZMtMarnvMuahM+jlUrA3vJSmDW+ufelG0MT//6vrnw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "^17.0.4",
+        "got": "^11.8.1"
+      }
+    },
+    "@wdio/utils": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.5.3.tgz",
+      "integrity": "sha512-nlLDKr8v8abLOHCKroBwQkGPdCIxjID2MllgWX23xqkYZylM9RdwPBdL8osQt9m3rq2TxiPAT4OlbzNt2WtN6Q==",
+      "dev": true,
+      "requires": {
+        "@wdio/logger": "7.5.3",
+        "@wdio/types": "7.5.3"
+      },
+      "dependencies": {
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
         "@wdio/types": {
-          "version": "7.19.1",
-          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.19.1.tgz",
-          "integrity": "sha512-mOodKlmvYxpj8P5BhjggEGpXuiRSlsyn2ClG8QqJ3lfXgOtOVEzFNfv/Ai7TkHr+lHDQNXLjllCjSqoCHhwlqg==",
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
           "dev": true,
           "requires": {
-            "@types/node": "^17.0.4",
             "got": "^11.8.1"
           }
         },
@@ -25024,6 +28946,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -25035,41 +28963,6 @@
         }
       }
     },
-    "@wdio/sync": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/@wdio/sync/-/sync-7.16.16.tgz",
-      "integrity": "sha512-MbVFAteaAOxHLKkMiMzOnh1hzINAK2U41GDIfy1yaPumcw1pNuJIhWrBYxprNMlqt8srk++wqQWgj5XpFjCL6g==",
-      "dev": true,
-      "requires": {
-        "@types/fibers": "^3.1.0",
-        "@types/puppeteer": "^5.4.0",
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "fibers": "^5.0.0",
-        "webdriverio": "7.16.16"
-      }
-    },
-    "@wdio/types": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.16.14.tgz",
-      "integrity": "sha512-AyNI9iBSos9xWBmiFAF3sBs6AJXO/55VppU/eeF4HRdbZMtMarnvMuahM+jlUrA3vJSmDW+ufelG0MT//6vrnw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "^17.0.4",
-        "got": "^11.8.1"
-      }
-    },
-    "@wdio/utils": {
-      "version": "7.16.14",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.16.14.tgz",
-      "integrity": "sha512-wwin8nVpIlhmXJkq6GJw9aDDzgLOJKgXTcEua0T2sdXjoW78u5Ly/GZrFXTjMGhacFvoZfitTrjyfyy4CxMVvw==",
-      "dev": true,
-      "requires": {
-        "@wdio/logger": "7.16.0",
-        "@wdio/types": "7.16.14",
-        "p-iteration": "^1.1.8"
-      }
-    },
     "@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -25217,9 +29110,9 @@
       }
     },
     "@xmldom/xmldom": {
-      "version": "0.7.6",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.6.tgz",
-      "integrity": "sha512-HHXP9hskkFQHy8QxxUXkS7946FFIhYVfGqsk0WLwllmexN9x/+R4UBLvurHEuyXRfVEObVR8APuQehykLviwSQ==",
+      "version": "0.7.8",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.8.tgz",
+      "integrity": "sha512-PrJx38EfpitFhwmILRl37jAdBlsww6AZ6rRVK4QS7T7RHLhX7mSs647sTmgr9GIxe3qjXdesmomEgbgaokrVFg==",
       "dev": true
     },
     "@xtuc/ieee754": {
@@ -25237,7 +29130,7 @@
     "abbrev": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
+      "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==",
       "dev": true
     },
     "accepts": {
@@ -25262,6 +29155,12 @@
       "dev": true,
       "requires": {}
     },
+    "acorn-walk": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "dev": true
+    },
     "aes-decrypter": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.3.tgz",
@@ -25275,10 +29174,13 @@
       }
     },
     "agent-base": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
-      "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
-      "dev": true
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "requires": {
+        "debug": "4"
+      }
     },
     "ajv": {
       "version": "6.12.3",
@@ -25292,17 +29194,24 @@
         "uri-js": "^4.2.2"
       }
     },
+    "ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "requires": {}
+    },
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
       "dev": true,
       "optional": true
     },
     "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true
     },
     "ansi-cyan": {
@@ -25326,7 +29235,7 @@
     "ansi-gray": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+      "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==",
       "dev": true,
       "requires": {
         "ansi-wrap": "0.1.0"
@@ -25358,7 +29267,7 @@
     "ansi-wrap": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
+      "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
       "dev": true
     },
     "anymatch": {
@@ -25374,20 +29283,20 @@
     "append-buffer": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
+      "integrity": "sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==",
       "dev": true,
       "requires": {
         "buffer-equal": "^1.0.0"
       }
     },
     "archiver": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.0.tgz",
-      "integrity": "sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz",
+      "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",
       "dev": true,
       "requires": {
         "archiver-utils": "^2.1.0",
-        "async": "^3.2.0",
+        "async": "^3.2.3",
         "buffer-crc32": "^0.2.1",
         "readable-stream": "^3.6.0",
         "readdir-glob": "^1.0.0",
@@ -25396,9 +29305,9 @@
       },
       "dependencies": {
         "async": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-          "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
+          "version": "3.2.4",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+          "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
           "dev": true
         },
         "readable-stream": {
@@ -25435,7 +29344,7 @@
     "archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
       "dev": true
     },
     "argparse": {
@@ -25448,21 +29357,36 @@
       }
     },
     "aria-query": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
-      "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
-      "dev": true
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+      "dev": true,
+      "requires": {
+        "deep-equal": "^2.0.5"
+      }
     },
     "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+      "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.0.1",
+        "array-slice": "^0.2.3"
+      },
+      "dependencies": {
+        "array-slice": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+          "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
+          "dev": true
+        }
+      }
     },
     "arr-filter": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
+      "integrity": "sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA==",
       "dev": true,
       "requires": {
         "make-iterator": "^1.0.0"
@@ -25477,50 +29401,50 @@
     "arr-map": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
+      "integrity": "sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw==",
       "dev": true,
       "requires": {
         "make-iterator": "^1.0.0"
       }
     },
     "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+      "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
       "dev": true
     },
     "array-differ": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
+      "integrity": "sha512-LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==",
       "dev": true
     },
     "array-each": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+      "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
       "dev": true
     },
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "array-from": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
-      "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=",
+      "integrity": "sha512-GQTc6Uupx1FCavi5mPzBvVT7nEOeWMmUA9P95wpfpW1XwMSKs+KaymD5C2Up7KAUKg/mYwbsUYzdZWcoajlNZg==",
       "dev": true
     },
     "array-includes": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
+      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5",
         "get-intrinsic": "^1.1.1",
         "is-string": "^1.0.7"
       }
@@ -25528,7 +29452,7 @@
     "array-initial": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
+      "integrity": "sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==",
       "dev": true,
       "requires": {
         "array-slice": "^1.0.0",
@@ -25580,24 +29504,25 @@
     "array-uniq": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
       "dev": true
     },
     "array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
       "dev": true
     },
     "array.prototype.flat": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz",
-      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
       }
     },
     "asn1": {
@@ -25624,7 +29549,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
       "dev": true
     },
     "assertion-error": {
@@ -25636,7 +29561,7 @@
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
       "dev": true
     },
     "astral-regex": {
@@ -25648,7 +29573,7 @@
     "async": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+      "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==",
       "dev": true
     },
     "async-done": {
@@ -25678,7 +29603,7 @@
     "async-settle": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
+      "integrity": "sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==",
       "dev": true,
       "requires": {
         "async-done": "^1.2.2"
@@ -25687,7 +29612,7 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
     "atob": {
@@ -25705,7 +29630,7 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
       "dev": true
     },
     "aws4": {
@@ -25717,7 +29642,7 @@
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
       "dev": true,
       "requires": {
         "chalk": "^1.1.3",
@@ -25728,19 +29653,19 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
           "dev": true
         },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
           "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -25753,13 +29678,13 @@
         "js-tokens": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+          "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==",
           "dev": true
         },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
           "dev": true,
           "requires": {
             "ansi-regex": "^2.0.0"
@@ -25768,7 +29693,7 @@
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
           "dev": true
         }
       }
@@ -25812,19 +29737,13 @@
         "json5": {
           "version": "0.5.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
           "dev": true
         },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "slash": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-          "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         }
       }
@@ -25845,19 +29764,10 @@
         "trim-right": "^1.0.1"
       },
       "dependencies": {
-        "detect-indent": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-          "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-          "dev": true,
-          "requires": {
-            "repeating": "^2.0.0"
-          }
-        },
         "jsesc": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-          "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+          "integrity": "sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA==",
           "dev": true
         }
       }
@@ -25865,7 +29775,7 @@
     "babel-helpers": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "integrity": "sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==",
       "dev": true,
       "requires": {
         "babel-runtime": "^6.22.0",
@@ -25873,56 +29783,26 @@
       }
     },
     "babel-loader": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz",
-      "integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
+      "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
       "dev": true,
       "requires": {
         "find-cache-dir": "^3.3.1",
-        "loader-utils": "^1.4.0",
+        "loader-utils": "^2.0.0",
         "make-dir": "^3.1.0",
         "schema-utils": "^2.6.5"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        }
       }
     },
     "babel-messages": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
       "dev": true,
       "requires": {
         "babel-runtime": "^6.22.0"
       }
     },
-    "babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "requires": {
-        "object.assign": "^4.1.0"
-      }
-    },
     "babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
@@ -25934,54 +29814,39 @@
         "@istanbuljs/schema": "^0.1.2",
         "istanbul-lib-instrument": "^5.0.4",
         "test-exclude": "^6.0.0"
-      },
-      "dependencies": {
-        "istanbul-lib-instrument": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
-          "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
-          "dev": true,
-          "requires": {
-            "@babel/core": "^7.12.3",
-            "@babel/parser": "^7.14.7",
-            "@istanbuljs/schema": "^0.1.2",
-            "istanbul-lib-coverage": "^3.2.0",
-            "semver": "^6.3.0"
-          }
-        }
       }
     },
     "babel-plugin-polyfill-corejs2": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
-      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
+      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
       "requires": {
-        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "@babel/compat-data": "^7.17.7",
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
         "semver": "^6.1.1"
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
-      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
+      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "core-js-compat": "^3.21.0"
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "core-js-compat": "^3.25.1"
       }
     },
     "babel-plugin-polyfill-regenerator": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
-      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
+      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1"
+        "@babel/helper-define-polyfill-provider": "^0.3.3"
       }
     },
     "babel-register": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
-      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "integrity": "sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A==",
       "dev": true,
       "requires": {
         "babel-core": "^6.26.0",
@@ -26007,22 +29872,13 @@
           "requires": {
             "minimist": "^1.2.6"
           }
-        },
-        "source-map-support": {
-          "version": "0.4.18",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-          "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-          "dev": true,
-          "requires": {
-            "source-map": "^0.5.6"
-          }
         }
       }
     },
     "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
       "dev": true,
       "requires": {
         "core-js": "^2.4.0",
@@ -26034,13 +29890,19 @@
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
           "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
           "dev": true
+        },
+        "regenerator-runtime": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+          "dev": true
         }
       }
     },
     "babel-template": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
       "dev": true,
       "requires": {
         "babel-runtime": "^6.26.0",
@@ -26053,7 +29915,7 @@
     "babel-traverse": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
       "dev": true,
       "requires": {
         "babel-code-frame": "^6.26.0",
@@ -26085,7 +29947,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         }
       }
@@ -26093,7 +29955,7 @@
     "babel-types": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
       "dev": true,
       "requires": {
         "babel-runtime": "^6.26.0",
@@ -26105,7 +29967,7 @@
         "to-fast-properties": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-          "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+          "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
           "dev": true
         }
       }
@@ -26119,7 +29981,7 @@
     "bach": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
+      "integrity": "sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg==",
       "dev": true,
       "requires": {
         "arr-filter": "^1.1.1",
@@ -26163,7 +30025,7 @@
         "define-property": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
           "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
@@ -26190,18 +30052,26 @@
       "dev": true,
       "requires": {
         "safe-buffer": "5.1.2"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
       }
     },
     "batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
       "dev": true
     },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
       "requires": {
         "tweetnacl": "^0.14.3"
@@ -26210,7 +30080,7 @@
     "beeper": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
+      "integrity": "sha512-3vqtKL1N45I5dV0RdssXZG7X6pCqQrWPNOlBPZPrd+QkE2HEhR57Z04m0KtpbsZH73j+a3F8UD1TQnn+ExTvIA==",
       "dev": true
     },
     "big-integer": {
@@ -26228,7 +30098,7 @@
     "binary": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
+      "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==",
       "dev": true,
       "requires": {
         "buffers": "~0.1.1",
@@ -26284,13 +30154,13 @@
     "bluebird": {
       "version": "3.4.7",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
-      "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
+      "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==",
       "dev": true
     },
     "body": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-      "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+      "integrity": "sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==",
       "dev": true,
       "requires": {
         "continuable-cache": "^0.3.1",
@@ -26302,13 +30172,13 @@
         "bytes": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-          "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
+          "integrity": "sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==",
           "dev": true
         },
         "raw-body": {
           "version": "1.1.7",
           "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-          "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
+          "integrity": "sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg==",
           "dev": true,
           "requires": {
             "bytes": "1",
@@ -26318,26 +30188,28 @@
         "string_decoder": {
           "version": "0.10.31",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
           "dev": true
         }
       }
     },
     "body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "requires": {
         "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "dependencies": {
         "debug": {
@@ -26351,7 +30223,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
@@ -26381,14 +30253,14 @@
       "dev": true
     },
     "browserslist": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
-      "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
+      "version": "4.21.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
       "requires": {
-        "caniuse-lite": "^1.0.30001370",
-        "electron-to-chromium": "^1.4.202",
+        "caniuse-lite": "^1.0.30001400",
+        "electron-to-chromium": "^1.4.251",
         "node-releases": "^2.0.6",
-        "update-browserslist-db": "^1.0.5"
+        "update-browserslist-db": "^1.0.9"
       }
     },
     "browserstack": {
@@ -26431,21 +30303,22 @@
       }
     },
     "browserstack-local": {
-      "version": "1.4.9",
-      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.4.9.tgz",
-      "integrity": "sha512-V+q8HQwRQFr9nd32xR66ZZ3VDWa3Kct4IMMudhKgcuD7cWrvvFARZOibx71II+Rf7P5nMQpWWxl9z/3p927nbg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.5.1.tgz",
+      "integrity": "sha512-T/wxyWDzvBHbDvl7fZKpFU7mYze6nrUkBhNy+d+8bXBqgQX10HTYvajIGO0wb49oGSLCPM0CMZTV/s7e6LF0sA==",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "^4.0.0",
+        "agent-base": "^6.0.2",
+        "https-proxy-agent": "^5.0.1",
         "is-running": "^2.1.0",
         "ps-tree": "=1.2.0",
         "temp-fs": "^0.9.9"
       }
     },
     "browserstacktunnel-wrapper": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-2.0.4.tgz",
-      "integrity": "sha512-GCV599FUUxNOCFl3WgPnfc5dcqq9XTmMXoxWpqkvmk0R9TOIoqmjENNU6LY6DtgIL6WfBVbg/jmWtnM5K6UYSg==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/browserstacktunnel-wrapper/-/browserstacktunnel-wrapper-2.0.5.tgz",
+      "integrity": "sha512-oociT3nl+FhQnyJbAb1RM4oQ5pN7aKeXEURkTkiEVm/Rji2r0agl3Wbw5V23VFn9lCU5/fGyDejRZPtGYsEcFw==",
       "dev": true,
       "requires": {
         "https-proxy-agent": "^2.2.1",
@@ -26495,13 +30368,13 @@
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
       "dev": true
     },
     "buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz",
+      "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==",
       "dev": true
     },
     "buffer-from": {
@@ -26519,7 +30392,7 @@
     "buffers": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
+      "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==",
       "dev": true
     },
     "bytes": {
@@ -26530,7 +30403,7 @@
     "cac": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/cac/-/cac-3.0.4.tgz",
-      "integrity": "sha1-bSTO7Dcu/lybeYgIvH9JtHJCpO8=",
+      "integrity": "sha512-hq4rxE3NT5PlaEiVV39Z45d6MoFcQZG5dsgJqtAUeOz3408LEQAElToDkf9i5IYSCOmK0If/81dLg7nKxqPR0w==",
       "dev": true,
       "requires": {
         "camelcase-keys": "^3.0.0",
@@ -26545,35 +30418,19 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
           "dev": true
         },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
           "dev": true
         },
-        "camelcase-keys": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-3.0.0.tgz",
-          "integrity": "sha1-/AxsNgNj9zd+N5O5oWvM8QcMHKQ=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^3.0.0",
-            "map-obj": "^1.0.0"
-          }
-        },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -26586,23 +30443,35 @@
         "find-up": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
           "dev": true,
           "requires": {
             "path-exists": "^2.0.0",
             "pinkie-promise": "^2.0.0"
           }
         },
-        "indent-string": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+        "hosted-git-info": {
+          "version": "2.8.9",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
           "dev": true
         },
+        "normalize-package-data": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
+          }
+        },
         "path-exists": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
           "dev": true,
           "requires": {
             "pinkie-promise": "^2.0.0"
@@ -26611,7 +30480,7 @@
         "read-pkg": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+          "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
           "dev": true,
           "requires": {
             "load-json-file": "^1.0.0",
@@ -26622,17 +30491,23 @@
         "read-pkg-up": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+          "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
           "dev": true,
           "requires": {
             "find-up": "^1.0.0",
             "read-pkg": "^1.0.0"
           }
         },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
           "dev": true,
           "requires": {
             "ansi-regex": "^2.0.0"
@@ -26641,7 +30516,7 @@
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
           "dev": true
         }
       }
@@ -26716,6 +30591,24 @@
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
+    "camelcase-keys": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-3.0.0.tgz",
+      "integrity": "sha512-U4E6A6aFyYnNW+tDt5/yIUKQURKXe3WMFPfX4FxrQFcwZ/R08AUk1xWcUtlr7oq6CV07Ji+aa69V2g7BSpblnQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^3.0.0",
+        "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
+          "dev": true
+        }
+      }
+    },
     "can-autoplay": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/can-autoplay/-/can-autoplay-3.0.2.tgz",
@@ -26723,14 +30616,14 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001390",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz",
-      "integrity": "sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g=="
+      "version": "1.0.30001429",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001429.tgz",
+      "integrity": "sha512-511ThLu1hF+5RRRt0zYCf2U2yRr9GPF6m5y90SBCWsvSoYoW7yAGlv/elyPaNfvGCkp6kj/KFZWU0BMA69Prsg=="
     },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
       "dev": true
     },
     "ccount": {
@@ -26757,7 +30650,7 @@
     "chainsaw": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+      "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==",
       "dev": true,
       "requires": {
         "traverse": ">=0.3.0 <0.4"
@@ -26771,21 +30664,6 @@
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
         "supports-color": "^5.3.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "character-entities": {
@@ -26815,7 +30693,7 @@
     "check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
       "dev": true
     },
     "chokidar": {
@@ -26841,9 +30719,9 @@
       "dev": true
     },
     "chrome-launcher": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.15.0.tgz",
-      "integrity": "sha512-ZQqX5kb9H0+jy1OqLnWampfocrtSZaGl7Ny3F9GRha85o4odbL8x55paUzh51UC7cEmZ5obp3H2Mm70uC2PpRA==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.15.1.tgz",
+      "integrity": "sha512-UugC8u59/w2AyX5sHLZUHoxBAiSiunUhZa3zZwMH6zPVis0C3dDKiRWyUGIo14tTbZHGVviWxv3PQWZ7taZ4fg==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -26878,10 +30756,16 @@
         "static-extend": "^0.1.1"
       },
       "dependencies": {
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+          "dev": true
+        },
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
           "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
@@ -26890,7 +30774,7 @@
         "is-accessor-descriptor": {
           "version": "0.1.6",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -26899,7 +30783,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -26916,7 +30800,7 @@
         "is-data-descriptor": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -26925,7 +30809,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -26956,9 +30840,9 @@
       }
     },
     "cli-spinners": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz",
+      "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==",
       "dev": true
     },
     "cli-width": {
@@ -26968,32 +30852,32 @@
       "dev": true
     },
     "cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
       "requires": {
         "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
+        "strip-ansi": "^6.0.1",
         "wrap-ansi": "^7.0.0"
       }
     },
     "clone": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
       "dev": true
     },
     "clone-buffer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+      "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
       "dev": true
     },
     "clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
+      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
       "dev": true,
       "requires": {
         "mimic-response": "^1.0.0"
@@ -27002,7 +30886,7 @@
     "clone-stats": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+      "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
       "dev": true
     },
     "cloneable-readable": {
@@ -27019,13 +30903,13 @@
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
       "dev": true
     },
     "collection-map": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
+      "integrity": "sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==",
       "dev": true,
       "requires": {
         "arr-map": "^2.0.2",
@@ -27036,7 +30920,7 @@
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
       "dev": true,
       "requires": {
         "map-visit": "^1.0.0",
@@ -27054,7 +30938,7 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
     },
     "color-support": {
       "version": "1.1.3",
@@ -27083,10 +30967,16 @@
       "integrity": "sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==",
       "dev": true
     },
+    "commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
       "dev": true
     },
     "component-emitter": {
@@ -27123,7 +31013,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
     "concat-stream": {
@@ -27176,10 +31066,40 @@
             "ms": "2.0.0"
           }
         },
+        "finalhandler": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+          "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "on-finished": "~2.3.0",
+            "parseurl": "~1.3.3",
+            "statuses": "~1.5.0",
+            "unpipe": "~1.0.0"
+          }
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+          "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+          "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
           "dev": true
         }
       }
@@ -27196,13 +31116,6 @@
       "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "requires": {
         "safe-buffer": "5.2.1"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        }
       }
     },
     "content-type": {
@@ -27213,31 +31126,28 @@
     "continuable-cache": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-      "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+      "integrity": "sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA==",
       "dev": true
     },
     "convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
     },
     "cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
     },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
       "dev": true
     },
     "copy-props": {
@@ -27251,30 +31161,22 @@
       }
     },
     "core-js": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz",
-      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz",
+      "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw=="
     },
     "core-js-compat": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz",
-      "integrity": "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==",
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz",
+      "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==",
       "requires": {
-        "browserslist": "^4.19.1",
-        "semver": "7.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
-        }
+        "browserslist": "^4.21.4"
       }
     },
     "core-js-pure": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz",
-      "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ=="
+      "version": "3.26.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.0.tgz",
+      "integrity": "sha512-LiN6fylpVBVwT8twhhluD9TzXmZQQsr2I2eIKtWNbZI1XMfBT7CV18itaN6RA7EtQd/SDdRx/wzvAShX2HvhQA=="
     },
     "core-util-is": {
       "version": "1.0.3",
@@ -27306,14 +31208,10 @@
       }
     },
     "crc-32": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz",
-      "integrity": "sha512-Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==",
-      "dev": true,
-      "requires": {
-        "exit-on-epipe": "~1.0.1",
-        "printj": "~1.3.1"
-      }
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "dev": true
     },
     "crc32-stream": {
       "version": "4.0.2",
@@ -27396,13 +31294,13 @@
     "css-value": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
-      "integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
+      "integrity": "sha512-FUV3xaJ63buRLgHrLQVlVgQnQdR4yqdLGaDu7g8CQcWjInDfM9plBTPI9FRfpahju1UBSaMckeb2/46ApS/V1Q==",
       "dev": true
     },
     "custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
+      "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==",
       "dev": true
     },
     "d": {
@@ -27418,22 +31316,22 @@
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
     },
     "date-format": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.4.tgz",
-      "integrity": "sha512-/jyf4rhB17ge328HJuJjAcmRtCsGd+NDeAtahRBTaK6vSPR6MO5HlrAit3Nn7dVjaa6sowW0WXt8yQtLyZQFRg==",
+      "version": "4.0.14",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
+      "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==",
       "dev": true
     },
     "dateformat": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
+      "integrity": "sha512-GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw==",
       "dev": true
     },
     "de-indent": {
@@ -27444,9 +31342,9 @@
       "optional": true
     },
     "debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "requires": {
         "ms": "2.1.2"
       }
@@ -27474,9 +31372,9 @@
       }
     },
     "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
       "dev": true
     },
     "decode-named-character-reference": {
@@ -27491,7 +31389,7 @@
     "decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==",
       "dev": true
     },
     "decompress-response": {
@@ -27567,13 +31465,13 @@
     "default-resolution": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
+      "integrity": "sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ==",
       "dev": true
     },
     "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
       "dev": true,
       "requires": {
         "clone": "^1.0.2"
@@ -27582,7 +31480,7 @@
         "clone": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+          "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
           "dev": true
         }
       }
@@ -27594,11 +31492,13 @@
       "dev": true
     },
     "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
       "requires": {
-        "object-keys": "^1.0.12"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       }
     },
     "define-property": {
@@ -27614,13 +31514,13 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true
     },
     "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
     },
     "dequal": {
       "version": "2.0.3",
@@ -27629,85 +31529,232 @@
       "dev": true
     },
     "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
     },
     "detect-file": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+      "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
       "dev": true
     },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A==",
+      "dev": true,
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
     "detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
       "dev": true
     },
     "detect-newline": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
+      "integrity": "sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg==",
       "dev": true
     },
     "devtools": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.16.16.tgz",
-      "integrity": "sha512-M0kzkuSgfEhpqIis3gdtWsNjn/HQ+vRAmEzDnbYx/7FfjFxhSv1d+rOOT20pvd60soItMYpsOova1igACEGkGQ==",
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.25.4.tgz",
+      "integrity": "sha512-R6/S/dCqxoX4Y6PxIGM9JFAuSRZzUeV5r+CoE/frhmno6mTe7dEEgwkJlfit3LkKRoul8n4DsL2A3QtWOvq5IA==",
       "dev": true,
       "requires": {
-        "@types/node": "^17.0.4",
+        "@types/node": "^18.0.0",
         "@types/ua-parser-js": "^0.7.33",
-        "@wdio/config": "7.16.16",
-        "@wdio/logger": "7.16.0",
-        "@wdio/protocols": "7.16.7",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
+        "@wdio/config": "7.25.4",
+        "@wdio/logger": "7.19.0",
+        "@wdio/protocols": "7.22.0",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
         "chrome-launcher": "^0.15.0",
         "edge-paths": "^2.1.0",
         "puppeteer-core": "^13.1.3",
         "query-selector-shadow-dom": "^1.0.0",
         "ua-parser-js": "^1.0.1",
-        "uuid": "^8.0.0"
+        "uuid": "^9.0.0"
       },
       "dependencies": {
+        "@types/node": {
+          "version": "18.11.9",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+          "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
+          "dev": true
+        },
+        "@wdio/config": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.25.4.tgz",
+          "integrity": "sha512-vb0emDtD9FbFh/yqW6oNdo2iuhQp8XKj6GX9fyy9v4wZgg3B0HPMVJxhIfcoHz7LMBWlHSo9YdvhFI5EQHRLBA==",
+          "dev": true,
+          "requires": {
+            "@wdio/logger": "7.19.0",
+            "@wdio/types": "7.25.4",
+            "@wdio/utils": "7.25.4",
+            "deepmerge": "^4.0.0",
+            "glob": "^8.0.3"
+          }
+        },
+        "@wdio/logger": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.19.0.tgz",
+          "integrity": "sha512-xR7SN/kGei1QJD1aagzxs3KMuzNxdT/7LYYx+lt6BII49+fqL/SO+5X0FDCZD0Ds93AuQvvz9eGyzrBI2FFXmQ==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@wdio/protocols": {
+          "version": "7.22.0",
+          "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.22.0.tgz",
+          "integrity": "sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ==",
+          "dev": true
+        },
+        "@wdio/types": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
+          "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^18.0.0",
+            "got": "^11.8.1"
+          }
+        },
+        "@wdio/utils": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.25.4.tgz",
+          "integrity": "sha512-8iwQDk+foUqSzKZKfhLxjlCKOkfRJPNHaezQoevNgnrTq/t0ek+ldZCATezb9B8jprAuP4mgS9xi22akc6RkzA==",
+          "dev": true,
+          "requires": {
+            "@wdio/logger": "7.19.0",
+            "@wdio/types": "7.25.4",
+            "p-iteration": "^1.1.8"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "glob": {
+          "version": "8.0.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+          "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^5.0.1",
+            "once": "^1.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "ua-parser-js": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.2.tgz",
-          "integrity": "sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg==",
+          "version": "1.0.32",
+          "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.32.tgz",
+          "integrity": "sha512-dXVsz3M4j+5tTiovFVyVqssXBu5HM47//YSOeZ9fQkdDKkfzv2v3PP1jmH6FUyPW+yCSn7aBVK1fGGKNhowdDA==",
           "dev": true
         },
         "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+          "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
           "dev": true
         }
       }
     },
     "devtools-protocol": {
-      "version": "0.0.973690",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.973690.tgz",
-      "integrity": "sha512-myh3hSFp0YWa2GED11PmbLhV4dv9RdO7YUz27XJrbQLnP5bMbZL6dfOOILTHO57yH0kX5GfuOZBsg/4NamfPvQ==",
+      "version": "0.0.1061995",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1061995.tgz",
+      "integrity": "sha512-pKZZWTjWa/IF4ENCg6GN8bu/AxSZgdhjSa26uc23wz38Blt2Tnm9icOPcSG3Cht55rMq35in1w3rWVPcZ60ArA==",
       "dev": true
     },
     "di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
+      "integrity": "sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==",
       "dev": true
     },
     "diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
+      "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
       "dev": true
     },
     "diff-sequences": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true
     },
     "dlv": {
@@ -27796,15 +31843,9 @@
           }
         },
         "chalk": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-          "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
-          "dev": true
-        },
-        "diff": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
-          "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.2.tgz",
+          "integrity": "sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ==",
           "dev": true
         },
         "glob": {
@@ -27820,12 +31861,6 @@
             "once": "^1.3.0"
           }
         },
-        "ini": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz",
-          "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==",
-          "dev": true
-        },
         "js-yaml": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -27844,19 +31879,13 @@
             "brace-expansion": "^2.0.1"
           }
         },
-        "strip-json-comments": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
-          "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
-          "dev": true
-        },
         "yargs": {
-          "version": "17.5.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-          "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+          "version": "17.6.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
+          "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
           "dev": true,
           "requires": {
-            "cliui": "^7.0.2",
+            "cliui": "^8.0.1",
             "escalade": "^3.1.1",
             "get-caller-file": "^2.0.5",
             "require-directory": "^2.1.1",
@@ -27870,7 +31899,7 @@
     "dom-serialize": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
+      "integrity": "sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==",
       "dev": true,
       "requires": {
         "custom-event": "~1.0.0",
@@ -27897,12 +31926,38 @@
       "dev": true
     },
     "duplexer2": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
       "dev": true,
       "requires": {
-        "readable-stream": "^2.0.2"
+        "readable-stream": "~1.1.9"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+          "dev": true
+        }
       }
     },
     "duplexify": {
@@ -27970,7 +32025,7 @@
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
       "requires": {
         "jsbn": "~0.1.0",
@@ -27990,7 +32045,7 @@
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "ejs": {
       "version": "3.1.8",
@@ -28002,14 +32057,14 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.243",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.243.tgz",
-      "integrity": "sha512-BgLD2gBX43OSXwlT01oYRRD5NIB4n3okTRxkzEAC6G0SZG4TTlyrWMjbOo0fajCwqwpRtMHXQNMjtRN6qpNtfw=="
+      "version": "1.4.284",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
     },
     "emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
     "emojis-list": {
@@ -28021,7 +32076,7 @@
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "end-of-stream": {
       "version": "1.4.4",
@@ -28033,9 +32088,9 @@
       }
     },
     "engine.io": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.3.tgz",
-      "integrity": "sha512-rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz",
+      "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==",
       "dev": true,
       "requires": {
         "@types/cookie": "^0.4.1",
@@ -28048,21 +32103,26 @@
         "debug": "~4.3.1",
         "engine.io-parser": "~5.0.3",
         "ws": "~8.2.3"
+      },
+      "dependencies": {
+        "cookie": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+          "dev": true
+        }
       }
     },
     "engine.io-parser": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz",
-      "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==",
-      "dev": true,
-      "requires": {
-        "@socket.io/base64-arraybuffer": "~1.0.2"
-      }
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
+      "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==",
+      "dev": true
     },
     "enhanced-resolve": {
-      "version": "5.9.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
-      "integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
+      "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.2.4",
@@ -28081,7 +32141,7 @@
     "ent": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+      "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==",
       "dev": true
     },
     "errno": {
@@ -28112,31 +32172,35 @@
       }
     },
     "es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
+      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
+        "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
       }
     },
     "es-get-iterator": {
@@ -28161,6 +32225,15 @@
       "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
       "dev": true
     },
+    "es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -28184,15 +32257,15 @@
       }
     },
     "es5-shim": {
-      "version": "4.6.5",
-      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.6.5.tgz",
-      "integrity": "sha512-vfQ4UAai8szn0sAubCy97xnZ4sJVDD1gt/Grn736hg8D7540wemIb1YPrYZSTqlM2H69EQX1or4HU/tSwRTI3w==",
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.6.7.tgz",
+      "integrity": "sha512-jg21/dmlrNQI7JyyA2w7n+yifSxBng0ZralnSfVZjoCawgNTCnS+yBCyVM9DL5itm7SUnDGgv7hcq2XCZX4iRQ==",
       "dev": true
     },
     "es6-iterator": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
       "dev": true,
       "requires": {
         "d": "1",
@@ -28203,7 +32276,7 @@
     "es6-object-assign": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
-      "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=",
+      "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==",
       "dev": true
     },
     "es6-promise": {
@@ -28215,7 +32288,7 @@
     "es6-promisify": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==",
       "dev": true,
       "requires": {
         "es6-promise": "^4.0.3"
@@ -28251,17 +32324,17 @@
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
     },
     "escodegen": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+      "integrity": "sha512-yhi5S+mNTOuRvyW4gWlg5W1byMaQGWWSYHXsuFZ7GBo7tpyOwi2EdzMP/QWxh9hwkD2m+wDVHJsxhRIj+v/b/A==",
       "dev": true,
       "requires": {
         "esprima": "^2.7.1",
@@ -28274,13 +32347,13 @@
         "estraverse": {
           "version": "1.9.3",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+          "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==",
           "dev": true
         },
         "levn": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-          "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+          "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
           "dev": true,
           "requires": {
             "prelude-ls": "~1.1.2",
@@ -28304,13 +32377,13 @@
         "prelude-ls": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-          "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+          "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
           "dev": true
         },
         "source-map": {
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-          "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
+          "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -28320,7 +32393,7 @@
         "type-check": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+          "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
           "dev": true,
           "requires": {
             "prelude-ls": "~1.1.2"
@@ -28385,18 +32458,6 @@
             "@babel/highlight": "^7.10.4"
           }
         },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -28438,18 +32499,24 @@
           "dev": true
         },
         "globals": {
-          "version": "13.12.1",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz",
-          "integrity": "sha512-317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw==",
+          "version": "13.17.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+          "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -28481,7 +32548,7 @@
     "eslint-config-standard": {
       "version": "10.2.1",
       "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz",
-      "integrity": "sha1-wGHk0GbzedwXzVYsZOgZtN1FRZE=",
+      "integrity": "sha512-UkFojTV1o0GOe1edOEiuI5ccYLJSuNngtqSeClNzhsmG8KPJ+7mRxgtp2oYhqZAK/brlXMoCd+VgXViE0AfyKw==",
       "dev": true,
       "requires": {}
     },
@@ -28507,13 +32574,12 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
+        "debug": "^3.2.7"
       },
       "dependencies": {
         "debug": {
@@ -28538,9 +32604,9 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.25.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz",
-      "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==",
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.4",
@@ -28548,14 +32614,14 @@
         "debug": "^2.6.9",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.2",
+        "eslint-module-utils": "^2.7.3",
         "has": "^1.0.3",
-        "is-core-module": "^2.8.0",
+        "is-core-module": "^2.8.1",
         "is-glob": "^4.0.3",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.2",
         "object.values": "^1.1.5",
-        "resolve": "^1.20.0",
-        "tsconfig-paths": "^3.12.0"
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
       },
       "dependencies": {
         "debug": {
@@ -28579,7 +32645,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         }
       }
@@ -28678,7 +32744,7 @@
     "esprima": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+      "integrity": "sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==",
       "dev": true
     },
     "esquery": {
@@ -28736,12 +32802,12 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "event-emitter": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
       "dev": true,
       "requires": {
         "d": "1",
@@ -28751,7 +32817,7 @@
     "event-stream": {
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-      "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+      "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
       "dev": true,
       "requires": {
         "duplexer": "~0.1.1",
@@ -28766,7 +32832,7 @@
         "map-stream": {
           "version": "0.1.0",
           "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-          "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
+          "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
           "dev": true
         }
       }
@@ -28814,7 +32880,7 @@
         "path-key": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+          "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
           "dev": true
         },
         "semver": {
@@ -28826,7 +32892,7 @@
         "shebang-command": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+          "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
           "dev": true,
           "requires": {
             "shebang-regex": "^1.0.0"
@@ -28835,7 +32901,7 @@
         "shebang-regex": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+          "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
           "dev": true
         },
         "which": {
@@ -28849,16 +32915,10 @@
         }
       }
     },
-    "exit-on-epipe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
-      "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==",
-      "dev": true
-    },
     "expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
       "dev": true,
       "requires": {
         "debug": "^2.3.3",
@@ -28882,7 +32942,7 @@
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
           "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
@@ -28891,7 +32951,7 @@
         "extend-shallow": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
           "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
@@ -28900,7 +32960,7 @@
         "is-accessor-descriptor": {
           "version": "0.1.6",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -28909,7 +32969,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -28926,7 +32986,7 @@
         "is-data-descriptor": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -28935,7 +32995,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -28957,13 +33017,13 @@
         "is-extendable": {
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
           "dev": true
         },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         }
       }
@@ -28971,66 +33031,95 @@
     "expand-tilde": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
       "dev": true,
       "requires": {
         "homedir-polyfill": "^1.0.1"
       }
     },
     "expect": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1"
+        "@jest/types": "^26.6.2",
+        "ansi-styles": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        }
       }
     },
     "expect-webdriverio": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-3.1.4.tgz",
-      "integrity": "sha512-65FTS3bmxcIp0cq6fLb/72TrCQXBCpwPLC7SwMWdpPlLq461mXcK1BPKJJjnIC587aXSKD+3E4hvnlCtwDmXfg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-2.0.2.tgz",
+      "integrity": "sha512-dst0tqP1aZ2p7TPmbatqoIQ+7hRTw+IeKNi830XxKhu2DNNe5vQ85i9ttf9rpXgbnUf91HxKcocn4G7A5bQxDA==",
       "dev": true,
       "requires": {
-        "expect": "^27.0.2",
-        "jest-matcher-utils": "^27.0.2"
+        "expect": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2"
       }
     },
     "express": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
-      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.2",
+        "body-parser": "1.20.1",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.2",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.9.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
         "setprototypeof": "1.2.0",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -29047,28 +33136,23 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
     "ext": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
-      "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
+      "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
       "dev": true,
       "requires": {
-        "type": "^2.5.0"
+        "type": "^2.7.2"
       },
       "dependencies": {
         "type": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz",
-          "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==",
+          "version": "2.7.2",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
+          "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
           "dev": true
         }
       }
@@ -29080,13 +33164,20 @@
       "dev": true
     },
     "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+      "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
       "dev": true,
       "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+        "kind-of": "^1.1.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+          "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
+          "dev": true
+        }
       }
     },
     "external-editor": {
@@ -29098,17 +33189,6 @@
         "chardet": "^0.7.0",
         "iconv-lite": "^0.4.24",
         "tmp": "^0.0.33"
-      },
-      "dependencies": {
-        "tmp": {
-          "version": "0.0.33",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-          "dev": true,
-          "requires": {
-            "os-tmpdir": "~1.0.2"
-          }
-        }
       }
     },
     "extglob": {
@@ -29130,7 +33210,7 @@
         "define-property": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
           "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
@@ -29139,7 +33219,7 @@
         "extend-shallow": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
           "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
@@ -29148,7 +33228,7 @@
         "is-extendable": {
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
           "dev": true
         }
       }
@@ -29179,7 +33259,7 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
       "dev": true
     },
     "faker": {
@@ -29215,13 +33295,13 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
     "faye-websocket": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "integrity": "sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ==",
       "dev": true,
       "requires": {
         "websocket-driver": ">=0.5.1"
@@ -29230,16 +33310,16 @@
     "fd-slicer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
       "dev": true,
       "requires": {
         "pend": "~1.2.0"
       }
     },
     "fibers": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/fibers/-/fibers-5.0.1.tgz",
-      "integrity": "sha512-VMC7Frt87Oo0AOJ6EcPFbi+tZmkQ4tD85aatwyWL6I9cYMJmm2e+pXUJsfGZ36U7MffXtjou2XIiWJMtHriErw==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/fibers/-/fibers-5.0.3.tgz",
+      "integrity": "sha512-/qYTSoZydQkM21qZpGLDLuCq8c+B8KhuCQ1kLPvnRNhxhVbvrpmH9l2+Lblf5neDuEsY4bfT7LeO553TXQDvJw==",
       "dev": true,
       "requires": {
         "detect-libc": "^1.0.3"
@@ -29309,16 +33389,16 @@
       }
     },
     "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "dependencies": {
@@ -29333,7 +33413,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
@@ -29349,12 +33429,13 @@
       }
     },
     "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
       "requires": {
-        "locate-path": "^2.0.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       }
     },
     "findup-sync": {
@@ -29367,6 +33448,151 @@
         "is-glob": "^4.0.0",
         "micromatch": "^3.0.4",
         "resolve-dir": "^1.0.1"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+              "dev": true
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+              "dev": true
+            }
+          }
+        },
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+          "dev": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        }
       }
     },
     "fined": {
@@ -29416,9 +33642,9 @@
       }
     },
     "flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
     "flush-write-stream": {
@@ -29432,48 +33658,51 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
-      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "dev": true
     },
+    "for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.3"
+      }
+    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
       "dev": true
     },
     "for-own": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+      "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.1"
       }
     },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-      "dev": true
-    },
     "foreachasync": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz",
-      "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=",
+      "integrity": "sha512-J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw==",
       "dev": true
     },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true
     },
     "fork-stream": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
-      "integrity": "sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA=",
+      "integrity": "sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==",
       "dev": true
     },
     "form-data": {
@@ -29495,7 +33724,7 @@
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
       "dev": true,
       "requires": {
         "map-cache": "^0.2.2"
@@ -29504,12 +33733,12 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
     },
     "from": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
+      "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==",
       "dev": true
     },
     "fs-constants": {
@@ -29519,9 +33748,9 @@
       "dev": true
     },
     "fs-extra": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-      "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.2.0",
@@ -29532,7 +33761,7 @@
     "fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
+      "integrity": "sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.11",
@@ -29554,7 +33783,7 @@
     "fs.extra": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz",
-      "integrity": "sha1-3QI/kwE77iRTHxszUUw3sg/ZM0k=",
+      "integrity": "sha512-Ig401VXtyrWrz23k9KxAx9OrnL8AHSLNhQ8YJH2wSYuH0ZUfxwBeY6zXkd/oOyVRFTlpEu/0n5gHeuZt7aqbkw==",
       "dev": true,
       "requires": {
         "fs-extra": "~0.6.1",
@@ -29565,7 +33794,7 @@
         "fs-extra": {
           "version": "0.6.4",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz",
-          "integrity": "sha1-9G8MdbeEH40gCzNIzU1pHVoJnRU=",
+          "integrity": "sha512-5rU898vl/Z948L+kkJedbmo/iltzmiF5bn/eEk0j/SgrPpI+Ydau9xlJPicV7Av2CHYBGz5LAlwTnBU80j1zPQ==",
           "dev": true,
           "requires": {
             "jsonfile": "~1.0.1",
@@ -29577,19 +33806,19 @@
         "jsonfile": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz",
-          "integrity": "sha1-6l7+QLg2kLmGZ2FKc5L8YOhCwN0=",
+          "integrity": "sha512-KbsDJNRfRPF5v49tMNf9sqyyGqGLBcz1v5kZT01kG5ns5mQSltwxCKVmUzVKtEinkUnTDtSrp6ngWpV7Xw0ZlA==",
           "dev": true
         },
         "mkdirp": {
           "version": "0.3.5",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-          "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=",
+          "integrity": "sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==",
           "dev": true
         },
         "rimraf": {
           "version": "2.2.8",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-          "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=",
+          "integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
           "dev": true
         }
       }
@@ -29597,7 +33826,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "dev": true
     },
     "fsevents": {
@@ -29619,12 +33848,12 @@
       },
       "dependencies": {
         "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.5"
+            "minimist": "^1.2.6"
           }
         },
         "rimraf": {
@@ -29651,10 +33880,28 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
+    "function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      }
+    },
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
+      "dev": true
+    },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true
     },
     "gaze": {
@@ -29680,17 +33927,17 @@
     "get-func-name": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
       "dev": true
     },
     "get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
+        "has-symbols": "^1.0.3"
       }
     },
     "get-package-type": {
@@ -29727,13 +33974,13 @@
     "get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
       "dev": true
     },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
@@ -29765,15 +34012,15 @@
       "dev": true
     },
     "glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.1",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
       }
@@ -29818,7 +34065,7 @@
         "is-glob": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
           "dev": true,
           "requires": {
             "is-extglob": "^2.1.0"
@@ -29860,7 +34107,7 @@
             "normalize-path": {
               "version": "2.1.1",
               "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
               "dev": true,
               "requires": {
                 "remove-trailing-separator": "^1.0.1"
@@ -29868,6 +34115,12 @@
             }
           }
         },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
         "binary-extensions": {
           "version": "1.13.1",
           "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -29915,7 +34168,7 @@
         "extend-shallow": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
           "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
@@ -29924,7 +34177,7 @@
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
           "dev": true,
           "requires": {
             "extend-shallow": "^2.0.1",
@@ -29957,7 +34210,7 @@
             "is-glob": {
               "version": "3.1.0",
               "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
               "dev": true,
               "requires": {
                 "is-extglob": "^2.1.0"
@@ -29968,18 +34221,99 @@
         "is-binary-path": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+          "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
           "dev": true,
           "requires": {
             "binary-extensions": "^1.0.0"
           }
         },
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "is-extendable": {
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
           "dev": true
         },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "is-plain-object": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+          "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+          "dev": true,
+          "requires": {
+            "isobject": "^3.0.1"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "3.0.2",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+              "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+              "dev": true,
+              "requires": {
+                "assign-symbols": "^1.0.0",
+                "is-extendable": "^1.0.1"
+              }
+            },
+            "is-extendable": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+              "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+              "dev": true,
+              "requires": {
+                "is-plain-object": "^2.0.4"
+              }
+            },
+            "kind-of": {
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+              "dev": true
+            }
+          }
+        },
         "readdirp": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -29994,7 +34328,7 @@
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
           "dev": true,
           "requires": {
             "is-number": "^3.0.0",
@@ -30027,7 +34361,7 @@
     "global-prefix": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
       "dev": true,
       "requires": {
         "expand-tilde": "^2.0.2",
@@ -30037,6 +34371,12 @@
         "which": "^1.2.14"
       },
       "dependencies": {
+        "ini": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+          "dev": true
+        },
         "which": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -30060,13 +34400,13 @@
       "dev": true
     },
     "globule": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz",
-      "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.4.tgz",
+      "integrity": "sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==",
       "dev": true,
       "requires": {
         "glob": "~7.1.1",
-        "lodash": "~4.17.10",
+        "lodash": "^4.17.21",
         "minimatch": "~3.0.2"
       },
       "dependencies": {
@@ -30124,9 +34464,9 @@
       }
     },
     "graceful-fs": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
       "dev": true
     },
     "grapheme-splitter": {
@@ -30166,56 +34506,6 @@
         "vinyl": "^2.1.0"
       },
       "dependencies": {
-        "arr-diff": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-          "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.0.1",
-            "array-slice": "^0.2.3"
-          }
-        },
-        "arr-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-          "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
-          "dev": true
-        },
-        "array-slice": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-          "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
-          "dev": true
-        },
-        "extend-shallow": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-          "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^1.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-          "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
-          "dev": true
-        },
-        "plugin-error": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-          "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
-          "dev": true,
-          "requires": {
-            "ansi-cyan": "^0.1.1",
-            "ansi-red": "^0.1.1",
-            "arr-diff": "^1.0.1",
-            "arr-union": "^2.0.1",
-            "extend-shallow": "^1.1.2"
-          }
-        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -30275,19 +34565,19 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
           "dev": true
         },
         "camelcase": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
           "dev": true
         },
         "cliui": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
           "dev": true,
           "requires": {
             "string-width": "^1.0.1",
@@ -30295,10 +34585,16 @@
             "wrap-ansi": "^2.0.0"
           }
         },
+        "decamelize": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+          "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+          "dev": true
+        },
         "find-up": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
           "dev": true,
           "requires": {
             "path-exists": "^2.0.0",
@@ -30311,19 +34607,37 @@
           "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
           "dev": true
         },
+        "hosted-git-info": {
+          "version": "2.8.9",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+          "dev": true
+        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
           "dev": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
         },
+        "normalize-package-data": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
+          }
+        },
         "path-exists": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
           "dev": true,
           "requires": {
             "pinkie-promise": "^2.0.0"
@@ -30332,7 +34646,7 @@
         "read-pkg": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+          "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
           "dev": true,
           "requires": {
             "load-json-file": "^1.0.0",
@@ -30343,23 +34657,23 @@
         "read-pkg-up": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+          "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
           "dev": true,
           "requires": {
             "find-up": "^1.0.0",
             "read-pkg": "^1.0.0"
           }
         },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         },
         "string-width": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
           "dev": true,
           "requires": {
             "code-point-at": "^1.0.0",
@@ -30370,22 +34684,16 @@
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
           "dev": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
         },
-        "which-module": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-          "dev": true
-        },
         "wrap-ansi": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
           "dev": true,
           "requires": {
             "string-width": "^1.0.1",
@@ -30434,7 +34742,7 @@
     "gulp-concat": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
-      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
+      "integrity": "sha512-a2scActrQrDBpBbR3WUZGyGS1JEPLg5PZJdIa7/Bi3GuKAmPYDK6SFhy/NZq5R8KsKKFvtfR0fakbUCcKGCCjg==",
       "dev": true,
       "requires": {
         "concat-with-sourcemaps": "^1.0.0",
@@ -30486,10 +34794,22 @@
             "ms": "2.0.0"
           }
         },
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+          "dev": true
+        },
+        "destroy": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+          "integrity": "sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==",
+          "dev": true
+        },
         "http-errors": {
           "version": "1.6.3",
           "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
           "dev": true,
           "requires": {
             "depd": "~1.1.2",
@@ -30501,7 +34821,7 @@
         "inherits": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
           "dev": true
         },
         "mime": {
@@ -30513,9 +34833,18 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         },
+        "on-finished": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+          "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
         "send": {
           "version": "0.16.2",
           "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
@@ -30562,12 +34891,33 @@
         "plugin-error": "^1.0.1"
       },
       "dependencies": {
+        "ansi-colors": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+          "dev": true,
+          "requires": {
+            "ansi-wrap": "^0.1.0"
+          }
+        },
         "ansi-regex": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
           "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+          "dev": true
+        },
         "astral-regex": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
@@ -30661,18 +35011,6 @@
             "v8-compile-cache": "^2.0.3"
           },
           "dependencies": {
-            "ajv": {
-              "version": "6.12.6",
-              "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-              "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-              "dev": true,
-              "requires": {
-                "fast-deep-equal": "^3.1.1",
-                "fast-json-stable-stringify": "^2.0.0",
-                "json-schema-traverse": "^0.4.1",
-                "uri-js": "^4.2.2"
-              }
-            },
             "strip-ansi": {
               "version": "5.2.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -30710,6 +35048,16 @@
             "eslint-visitor-keys": "^1.1.0"
           }
         },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
         "file-entry-cache": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -30745,6 +35093,12 @@
             "type-fest": "^0.8.1"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "inquirer": {
           "version": "7.3.3",
           "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
@@ -30832,6 +35186,18 @@
           "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
           "dev": true
         },
+        "plugin-error": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+          "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+          "dev": true,
+          "requires": {
+            "ansi-colors": "^1.0.1",
+            "arr-diff": "^4.0.0",
+            "arr-union": "^3.1.0",
+            "extend-shallow": "^3.0.2"
+          }
+        },
         "prelude-ls": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -30853,15 +35219,6 @@
             "glob": "^7.1.3"
           }
         },
-        "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
         "shebang-command": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -30989,7 +35346,7 @@
     "gulp-js-escape": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gulp-js-escape/-/gulp-js-escape-1.0.1.tgz",
-      "integrity": "sha1-HNRF+9AJ4Np2lZoDp/SbNWav+Gg=",
+      "integrity": "sha512-F+53crhLb78CTlG7ZZJFWzP0+/4q0vt2/pULXFkTMs6AGBo0Eh5cx+eWsqqHv8hrNIUsuTab3Se8rOOzP/6+EQ==",
       "dev": true,
       "requires": {
         "through2": "^0.6.3"
@@ -30998,13 +35355,13 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
           "dev": true
         },
         "readable-stream": {
           "version": "1.0.34",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -31016,13 +35373,13 @@
         "string_decoder": {
           "version": "0.10.31",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
           "dev": true
         },
         "through2": {
           "version": "0.6.5",
           "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+          "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
           "dev": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
@@ -31054,9 +35411,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "14.18.12",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz",
-          "integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==",
+          "version": "14.18.33",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz",
+          "integrity": "sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg==",
           "dev": true
         }
       }
@@ -31075,6 +35432,15 @@
         "tslib": "^1.10.0"
       },
       "dependencies": {
+        "ansi-colors": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+          "dev": true,
+          "requires": {
+            "ansi-wrap": "^0.1.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -31084,6 +35450,18 @@
             "color-convert": "^2.0.1"
           }
         },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+          "dev": true
+        },
         "chalk": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
@@ -31109,6 +35487,34 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "plugin-error": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+          "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+          "dev": true,
+          "requires": {
+            "ansi-colors": "^1.0.1",
+            "arr-diff": "^4.0.0",
+            "arr-union": "^3.1.0",
+            "extend-shallow": "^3.0.2"
+          }
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -31183,6 +35589,51 @@
         "terser": "^5.9.0",
         "through2": "^4.0.2",
         "vinyl-sourcemaps-apply": "^0.2.1"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+          "dev": true,
+          "requires": {
+            "ansi-wrap": "^0.1.0"
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+          "dev": true
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "plugin-error": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+          "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+          "dev": true,
+          "requires": {
+            "ansi-colors": "^1.0.1",
+            "arr-diff": "^4.0.0",
+            "arr-union": "^3.1.0",
+            "extend-shallow": "^3.0.2"
+          }
+        }
       }
     },
     "gulp-util": {
@@ -31214,19 +35665,19 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
           "dev": true
         },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
           "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -31239,24 +35690,15 @@
         "clone": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+          "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
           "dev": true
         },
         "clone-stats": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-          "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
+          "integrity": "sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==",
           "dev": true
         },
-        "lodash.escape": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-          "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-          "dev": true,
-          "requires": {
-            "lodash._root": "^3.0.0"
-          }
-        },
         "lodash.template": {
           "version": "3.6.2",
           "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
@@ -31277,7 +35719,7 @@
         "lodash.templatesettings": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-          "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+          "integrity": "sha512-TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ==",
           "dev": true,
           "requires": {
             "lodash._reinterpolate": "^3.0.0",
@@ -31287,13 +35729,13 @@
         "object-assign": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+          "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
           "dev": true
         },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
           "dev": true,
           "requires": {
             "ansi-regex": "^2.0.0"
@@ -31302,7 +35744,7 @@
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
           "dev": true
         },
         "through2": {
@@ -31318,7 +35760,7 @@
         "vinyl": {
           "version": "0.5.3",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
+          "integrity": "sha512-P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA==",
           "dev": true,
           "requires": {
             "clone": "^1.0.0",
@@ -31331,7 +35773,7 @@
     "gulplog": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+      "integrity": "sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==",
       "dev": true,
       "requires": {
         "glogg": "^1.0.0"
@@ -31370,7 +35812,7 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
       "dev": true
     },
     "har-validator": {
@@ -31381,20 +35823,6 @@
       "requires": {
         "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        }
       }
     },
     "has": {
@@ -31408,7 +35836,7 @@
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
       "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
@@ -31417,32 +35845,40 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
           "dev": true
         }
       }
     },
     "has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "dev": true
     },
     "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
     },
     "has-gulplog": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
+      "integrity": "sha512-+F4GzLjwHNNDEAJW2DC1xXfEoPkRDmUdJ7CBYw4MpqtDwOnqdImJl7GWlpqx+Wko6//J8uKTnIe4wZSv7yCqmw==",
       "dev": true,
       "requires": {
         "sparkles": "^1.0.0"
       }
     },
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.1"
+      }
+    },
     "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
@@ -31460,7 +35896,7 @@
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
       "dev": true,
       "requires": {
         "get-value": "^2.0.6",
@@ -31471,7 +35907,7 @@
     "has-values": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
       "dev": true,
       "requires": {
         "is-number": "^3.0.0",
@@ -31484,10 +35920,30 @@
           "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
         },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
         "kind-of": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
           "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
@@ -31553,7 +36009,7 @@
     "home-or-tmp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "integrity": "sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg==",
       "dev": true,
       "requires": {
         "os-homedir": "^1.0.0",
@@ -31570,10 +36026,13 @@
       }
     },
     "hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
     },
     "html-escaper": {
       "version": "2.0.2",
@@ -31594,21 +36053,21 @@
       "dev": true
     },
     "http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "requires": {
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
+        "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       }
     },
     "http-parser-js": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz",
-      "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==",
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
       "dev": true
     },
     "http-proxy": {
@@ -31625,7 +36084,7 @@
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
       "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
@@ -31644,12 +36103,12 @@
       }
     },
     "https-proxy-agent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
-      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
       "requires": {
-        "agent-base": "5",
+        "agent-base": "6",
         "debug": "4"
       }
     },
@@ -31694,7 +36153,13 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+      "integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==",
       "dev": true
     },
     "individual": {
@@ -31706,7 +36171,7 @@
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "dev": true,
       "requires": {
         "once": "^1.3.0",
@@ -31719,15 +36184,15 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz",
+      "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==",
       "dev": true
     },
     "inquirer": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.5.tgz",
-      "integrity": "sha512-G6/9xUqmt/r+UvufSyrPpt84NYwhKZ9jLsgMbQzlx804XErNupor8WQdBnBRrXmBfTPpuwf1sV+ss2ovjgdXIg==",
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.5.tgz",
+      "integrity": "sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==",
       "dev": true,
       "requires": {
         "ansi-escapes": "^4.2.1",
@@ -31740,10 +36205,11 @@
         "mute-stream": "0.0.8",
         "ora": "^5.4.1",
         "run-async": "^2.4.0",
-        "rxjs": "^7.2.0",
+        "rxjs": "^7.5.5",
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
+        "through": "^2.3.6",
+        "wrap-ansi": "^7.0.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -31780,6 +36246,21 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "rxjs": {
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
+          "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -31788,6 +36269,12 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "tslib": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+          "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
+          "dev": true
         }
       }
     },
@@ -31820,7 +36307,7 @@
     "invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==",
       "dev": true
     },
     "ipaddr.js": {
@@ -31868,7 +36355,7 @@
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
       "dev": true
     },
     "is-bigint": {
@@ -31906,15 +36393,15 @@
       "dev": true
     },
     "is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true
     },
     "is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
       "requires": {
         "has": "^1.0.3"
       }
@@ -31993,7 +36480,7 @@
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true
     },
     "is-finite": {
@@ -32057,7 +36544,7 @@
     "is-negated-glob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
+      "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==",
       "dev": true
     },
     "is-negative-zero": {
@@ -32067,35 +36554,15 @@
       "dev": true
     },
     "is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
     },
     "is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "dev": true,
       "requires": {
         "has-tostringtag": "^1.0.0"
@@ -32141,7 +36608,7 @@
     "is-running": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-running/-/is-running-2.1.0.tgz",
-      "integrity": "sha1-MKc/9cw4VOT8JUkICen1q/jeCeA=",
+      "integrity": "sha512-mjJd3PujZMl7j+D395WTIO5tU5RIDBfVSRtRR4VOJou3H66E38UjbjvDGh3slJzPuolsb+yQFqwHNNdyp5jg3w==",
       "dev": true
     },
     "is-set": {
@@ -32151,10 +36618,13 @@
       "dev": true
     },
     "is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
-      "dev": true
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
     },
     "is-ssh": {
       "version": "1.4.0",
@@ -32168,7 +36638,7 @@
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
       "dev": true
     },
     "is-string": {
@@ -32190,22 +36660,22 @@
       }
     },
     "is-typed-array": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.8.tgz",
-      "integrity": "sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
+      "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
       "dev": true,
       "requires": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "es-abstract": "^1.18.5",
-        "foreach": "^2.0.5",
+        "es-abstract": "^1.20.0",
+        "for-each": "^0.3.3",
         "has-tostringtag": "^1.0.0"
       }
     },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true
     },
     "is-unc-path": {
@@ -32226,13 +36696,13 @@
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
       "dev": true
     },
     "is-valid-glob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
+      "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==",
       "dev": true
     },
     "is-weakmap": {
@@ -32282,33 +36752,33 @@
       "dev": true
     },
     "isbinaryfile": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
-      "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==",
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
+      "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
       "dev": true
     },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
     "isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true
     },
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
       "dev": true
     },
     "istanbul": {
       "version": "0.4.5",
       "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
+      "integrity": "sha512-nMtdn4hvK0HjUlzr1DrKSUY8ychprt8dzHOgY2KXsIhHu5PuQQEOTM27gV9Xblyon7aUH/TSFIjRHEODF/FRPg==",
       "dev": true,
       "requires": {
         "abbrev": "1.0.x",
@@ -32330,7 +36800,7 @@
         "glob": {
           "version": "5.0.15",
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
           "dev": true,
           "requires": {
             "inflight": "^1.0.4",
@@ -32343,28 +36813,28 @@
         "has-flag": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
           "dev": true
         },
         "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.5"
+            "minimist": "^1.2.6"
           }
         },
         "resolve": {
           "version": "1.1.7",
           "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+          "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
           "dev": true
         },
         "supports-color": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
           "dev": true,
           "requires": {
             "has-flag": "^1.0.0"
@@ -32387,6 +36857,19 @@
       "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "dev": true
     },
+    "istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      }
+    },
     "istanbul-lib-report": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
@@ -32398,6 +36881,12 @@
         "supports-color": "^7.1.0"
       },
       "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -32429,9 +36918,9 @@
       }
     },
     "istanbul-reports": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
-      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
+      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
       "dev": true,
       "requires": {
         "html-escaper": "^2.0.0",
@@ -32500,6 +36989,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -32512,15 +37007,15 @@
       }
     },
     "jest-diff": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
+        "diff-sequences": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -32557,6 +37052,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -32569,21 +37070,21 @@
       }
     },
     "jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
       "dev": true
     },
     "jest-matcher-utils": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -32620,6 +37121,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -32632,20 +37139,20 @@
       }
     },
     "jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^26.6.2",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
         "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "stack-utils": "^2.0.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -32682,15 +37189,17 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "micromatch": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-          "dev": true,
-          "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.2.3"
-          }
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+          "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
@@ -32703,6 +37212,12 @@
         }
       }
     },
+    "jest-regex-util": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+      "dev": true
+    },
     "jest-worker": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
@@ -32712,6 +37227,23 @@
         "@types/node": "*",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "js-tokens": {
@@ -32740,7 +37272,7 @@
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
       "dev": true
     },
     "jsesc": {
@@ -32754,12 +37286,6 @@
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
       "dev": true
     },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
     "json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -32781,13 +37307,13 @@
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
       "dev": true
     },
     "json5": {
@@ -32820,7 +37346,7 @@
     "just-clone": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/just-clone/-/just-clone-1.0.2.tgz",
-      "integrity": "sha1-v7P672WqEqMWBYcSlFwyb9jwFDQ="
+      "integrity": "sha512-p93GINPwrve0w3HUzpXmpTl7MyzzWz1B5ag44KEtq/hP1mtK8lA2b9Q0VQaPlnY87352osJcE6uBmN0e8kuFMw=="
     },
     "just-debounce": {
       "version": "1.1.0",
@@ -32835,9 +37361,9 @@
       "dev": true
     },
     "karma": {
-      "version": "6.3.17",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.17.tgz",
-      "integrity": "sha512-2TfjHwrRExC8yHoWlPBULyaLwAFmXmxQrcuFImt/JsAsSZu1uOWTZ1ZsWjqQtWpHLiatJOHL5jFjXSJIgCd01g==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.1.tgz",
+      "integrity": "sha512-Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA==",
       "dev": true,
       "requires": {
         "@colors/colors": "1.5.0",
@@ -32859,20 +37385,31 @@
         "qjobs": "^1.2.0",
         "range-parser": "^1.2.1",
         "rimraf": "^3.0.2",
-        "socket.io": "^4.2.0",
+        "socket.io": "^4.4.1",
         "source-map": "^0.6.1",
         "tmp": "^0.2.1",
         "ua-parser-js": "^0.7.30",
         "yargs": "^16.1.1"
       },
       "dependencies": {
+        "cliui": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
         "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.5"
+            "minimist": "^1.2.6"
           }
         },
         "source-map": {
@@ -32881,6 +37418,15 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
+        "tmp": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+          "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+          "dev": true,
+          "requires": {
+            "rimraf": "^3.0.0"
+          }
+        },
         "yargs": {
           "version": "16.2.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -32925,14 +37471,14 @@
     "karma-chai": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/karma-chai/-/karma-chai-0.1.0.tgz",
-      "integrity": "sha1-vuWtQEAFF4Ea40u5RfdikJEIt5o=",
+      "integrity": "sha512-mqKCkHwzPMhgTYca10S90aCEX9+HjVjjrBFAsw36Zj7BlQNbokXXCAe6Ji04VUMsxcY5RLP7YphpfO06XOubdg==",
       "dev": true,
       "requires": {}
     },
     "karma-chrome-launcher": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz",
-      "integrity": "sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz",
+      "integrity": "sha512-hsIglcq1vtboGPAN+DGCISCFOxW+ZVnIqhDQcCMqqCp+4dmJ0Qpq5QAjkbA0X2L9Mi6OBkHi2Srrbmm7pUKkzQ==",
       "dev": true,
       "requires": {
         "which": "^1.2.1"
@@ -32961,21 +37507,6 @@
         "istanbul-lib-source-maps": "^4.0.1",
         "istanbul-reports": "^3.0.5",
         "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "istanbul-lib-instrument": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz",
-          "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==",
-          "dev": true,
-          "requires": {
-            "@babel/core": "^7.12.3",
-            "@babel/parser": "^7.14.7",
-            "@istanbuljs/schema": "^0.1.2",
-            "istanbul-lib-coverage": "^3.2.0",
-            "semver": "^6.3.0"
-          }
-        }
       }
     },
     "karma-coverage-istanbul-reporter": {
@@ -33054,7 +37585,7 @@
     "karma-es5-shim": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/karma-es5-shim/-/karma-es5-shim-0.0.4.tgz",
-      "integrity": "sha1-zdADM8znfC5M4D46yT8vjs0fuVI=",
+      "integrity": "sha512-8xU6F2/R6u6HAZ/nlyhhx3WEhj4C6hJorG7FR2REX81pgj2LSo9ADJXxCGIeXg6Qr2BGpxp4hcZcEOYGAwiumg==",
       "dev": true,
       "requires": {
         "es5-shim": "^4.0.5"
@@ -33073,7 +37604,7 @@
     "karma-ie-launcher": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/karma-ie-launcher/-/karma-ie-launcher-1.0.0.tgz",
-      "integrity": "sha1-SXmGhCxJAZA0bNifVJTKmDDG1Zw=",
+      "integrity": "sha512-ts71ke8pHvw6qdRtq0+7VY3ANLoZuUNNkA8abRaWV13QRPNm7TtSOqyszjHUtuwOWKcsSz4tbUtrNICrQC+SXQ==",
       "dev": true,
       "requires": {
         "lodash": "^4.6.1"
@@ -33091,7 +37622,7 @@
     "karma-mocha-reporter": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz",
-      "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=",
+      "integrity": "sha512-Hr6nhkIp0GIJJrvzY8JFeHpQZNseuIakGac4bpw8K1+5F0tLb6l7uvXRa8mt2Z+NVwYgCct4QAfp2R2QP6o00w==",
       "dev": true,
       "requires": {
         "chalk": "^2.1.0",
@@ -33108,7 +37639,7 @@
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
           "dev": true,
           "requires": {
             "ansi-regex": "^3.0.0"
@@ -33119,28 +37650,28 @@
     "karma-opera-launcher": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/karma-opera-launcher/-/karma-opera-launcher-1.0.0.tgz",
-      "integrity": "sha1-+lFihTGh0L6EstjcDX7iCfyP+Ro=",
+      "integrity": "sha512-rdty4FlVIowmUhPuG08TeXKHvaRxeDSzPxGIkWguCF3A32kE0uvXZ6dXW08PuaNjai8Ip3f5Pn9Pm2HlChaxCw==",
       "dev": true,
       "requires": {}
     },
     "karma-safari-launcher": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/karma-safari-launcher/-/karma-safari-launcher-1.0.0.tgz",
-      "integrity": "sha1-lpgqLMR9BmquccVTursoMZEVos4=",
+      "integrity": "sha512-qmypLWd6F2qrDJfAETvXDfxHvKDk+nyIjpH9xIeI3/hENr0U3nuqkxaftq73PfXZ4aOuOChA6SnLW4m4AxfRjQ==",
       "dev": true,
       "requires": {}
     },
     "karma-script-launcher": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/karma-script-launcher/-/karma-script-launcher-1.0.0.tgz",
-      "integrity": "sha1-zQF8TeXvCeWp2nkydhdhCN1LVC0=",
+      "integrity": "sha512-5NRc8KmTBjNPE3dNfpJP90BArnBohYV4//MsLFfUA1e6N+G1/A5WuWctaFBtMQ6MWRybs/oguSej0JwDr8gInA==",
       "dev": true,
       "requires": {}
     },
     "karma-sinon": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/karma-sinon/-/karma-sinon-1.0.5.tgz",
-      "integrity": "sha1-TjRD8oMP3s/2JNN0cWPxIX2qKpo=",
+      "integrity": "sha512-wrkyAxJmJbn75Dqy17L/8aILJWFm7znd1CE8gkyxTBFnjMSOe2XTJ3P30T8SkxWZHmoHX0SCaUJTDBEoXs25Og==",
       "dev": true,
       "requires": {}
     },
@@ -33156,7 +37687,7 @@
     "karma-spec-reporter": {
       "version": "0.0.32",
       "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.32.tgz",
-      "integrity": "sha1-LpxyB+pyZ3EmAln4K+y1QyCeRAo=",
+      "integrity": "sha512-ZXsYERZJMTNRR2F3QN11OWF5kgnT/K2dzhM+oY3CDyMrDI3TjIWqYGG7c15rR9wjmy9lvdC+CCshqn3YZqnNrA==",
       "dev": true,
       "requires": {
         "colors": "^1.1.2"
@@ -33180,9 +37711,9 @@
       "dev": true
     },
     "keyv": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz",
-      "integrity": "sha512-tGv1yP6snQVDSM4X6yxrv2zzq/EvpW+oYiUz6aueW1u9CtS8RzUQYxxmFwgZlO2jSgCxQbchhxaqXXp2hnKGpQ==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.0.tgz",
+      "integrity": "sha512-2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA==",
       "dev": true,
       "requires": {
         "json-buffer": "3.0.1"
@@ -33219,7 +37750,7 @@
     "last-run": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
+      "integrity": "sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ==",
       "dev": true,
       "requires": {
         "default-resolution": "^2.0.0",
@@ -33238,7 +37769,7 @@
     "lcid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==",
       "dev": true,
       "requires": {
         "invert-kv": "^1.0.0"
@@ -33247,13 +37778,13 @@
     "lcov-parse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz",
-      "integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A=",
+      "integrity": "sha512-aprLII/vPzuQvYZnDRU78Fns9I2Ag3gi4Ipga/hxnVMCZC8DnR2nI7XBqrPoywGfxqIx/DgarGvDJZAD3YBTgQ==",
       "dev": true
     },
     "lead": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
+      "integrity": "sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==",
       "dev": true,
       "requires": {
         "flush-write-stream": "^1.0.2"
@@ -33318,7 +37849,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         }
       }
@@ -33332,7 +37863,7 @@
     "listenercount": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
-      "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=",
+      "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==",
       "dev": true
     },
     "live-connect-js": {
@@ -33389,19 +37920,29 @@
       }
     },
     "loader-runner": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "dev": true
     },
+    "loader-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
+      "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+      "dev": true,
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      }
+    },
     "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
       "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "^4.1.0"
       }
     },
     "lodash": {
@@ -33413,126 +37954,135 @@
     "lodash._basecopy": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
       "dev": true
     },
     "lodash._basetostring": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
+      "integrity": "sha512-mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA==",
       "dev": true
     },
     "lodash._basevalues": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
+      "integrity": "sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==",
       "dev": true
     },
     "lodash._getnative": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
       "dev": true
     },
     "lodash._isiterateecall": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
       "dev": true
     },
     "lodash._reescape": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
+      "integrity": "sha512-Sjlavm5y+FUVIF3vF3B75GyXrzsfYV8Dlv3L4mEpuB9leg8N6yf/7rU06iLPx9fY0Mv3khVp9p7Dx0mGV6V5OQ==",
       "dev": true
     },
     "lodash._reevaluate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
+      "integrity": "sha512-OrPwdDc65iJiBeUe5n/LIjd7Viy99bKwDdk7Z5ljfZg0uFRFlfQaCy9tZ4YMAag9WAZmlVpe1iZrkIMMSMHD3w==",
       "dev": true
     },
     "lodash._reinterpolate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
       "dev": true
     },
     "lodash._root": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
+      "integrity": "sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==",
       "dev": true
     },
     "lodash.clone": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
-      "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=",
+      "integrity": "sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg==",
       "dev": true
     },
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
       "dev": true
     },
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
     "lodash.defaults": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
       "dev": true
     },
     "lodash.difference": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=",
+      "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
       "dev": true
     },
+    "lodash.escape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha512-n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==",
+      "dev": true,
+      "requires": {
+        "lodash._root": "^3.0.0"
+      }
+    },
     "lodash.flatten": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
+      "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
       "dev": true
     },
     "lodash.flattendeep": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
+      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
       "dev": true
     },
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
       "dev": true
     },
     "lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
       "dev": true
     },
     "lodash.isarray": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
       "dev": true
     },
     "lodash.isobject": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
+      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==",
       "dev": true
     },
     "lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
       "dev": true
     },
     "lodash.keys": {
@@ -33555,19 +38105,19 @@
     "lodash.pickby": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
-      "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=",
+      "integrity": "sha512-AZV+GsS/6ckvPOVQPXSiFFacKvKB4kOQu6ynt9wz0F3LO4R9Ij4K1ddYsIytDpSgLz88JHd9P+oaLeej5/Sl7Q==",
       "dev": true
     },
     "lodash.restparam": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+      "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
       "dev": true
     },
     "lodash.some": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
-      "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
+      "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==",
       "dev": true
     },
     "lodash.template": {
@@ -33592,19 +38142,19 @@
     "lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
       "dev": true
     },
     "lodash.union": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz",
-      "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=",
+      "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==",
       "dev": true
     },
     "lodash.zip": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
-      "integrity": "sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=",
+      "integrity": "sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg==",
       "dev": true
     },
     "log-driver": {
@@ -33623,16 +38173,16 @@
       }
     },
     "log4js": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.2.tgz",
-      "integrity": "sha512-k80cggS2sZQLBwllpT1p06GtfvzMmSdUCkW96f0Hj83rKGJDAu2vZjt9B9ag2vx8Zz1IXzxoLgqvRJCdMKybGg==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz",
+      "integrity": "sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q==",
       "dev": true,
       "requires": {
-        "date-format": "^4.0.4",
-        "debug": "^4.3.3",
-        "flatted": "^3.2.5",
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "flatted": "^3.2.7",
         "rfdc": "^1.3.0",
-        "streamroller": "^3.0.4"
+        "streamroller": "^3.1.3"
       }
     },
     "loglevel": {
@@ -33695,7 +38245,7 @@
     "lru-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
+      "integrity": "sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==",
       "dev": true,
       "requires": {
         "es5-ext": "~0.10.2"
@@ -33751,7 +38301,7 @@
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
       "dev": true
     },
     "map-obj": {
@@ -33763,13 +38313,13 @@
     "map-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
+      "integrity": "sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ==",
       "dev": true
     },
     "map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
       "dev": true,
       "requires": {
         "object-visit": "^1.0.0"
@@ -33782,15 +38332,15 @@
       "dev": true
     },
     "marky": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.4.tgz",
-      "integrity": "sha512-zd2/GiSn6U3/jeFVZ0J9CA1LzQ8RfIVvXkb/U0swFHF/zT+dVohTAWjmo2DcIuofmIIIROlwTbd+shSeXmxr0w==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
+      "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
       "dev": true
     },
     "matchdep": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
+      "integrity": "sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==",
       "dev": true,
       "requires": {
         "findup-sync": "^2.0.0",
@@ -33799,10 +38349,90 @@
         "stack-trace": "0.0.10"
       },
       "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+              "dev": true
+            }
+          }
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-extendable": {
+              "version": "0.1.1",
+              "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+              "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+              "dev": true
+            }
+          }
+        },
         "findup-sync": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-          "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+          "integrity": "sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==",
           "dev": true,
           "requires": {
             "detect-file": "^1.0.0",
@@ -33811,14 +38441,77 @@
             "resolve-dir": "^1.0.1"
           }
         },
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "is-glob": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
           "dev": true,
           "requires": {
             "is-extglob": "^2.1.0"
           }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+          "dev": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
         }
       }
     },
@@ -33929,11 +38622,12 @@
       }
     },
     "mdast-util-gfm-table": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.4.tgz",
-      "integrity": "sha512-aEuoPwZyP4iIMkf2cLWXxx3EQ6Bmh2yKy9MVCg4i6Sd3cX80dcLEfXO/V4ul3pGH9czBK4kp+FAl+ZHmSUt9/w==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.6.tgz",
+      "integrity": "sha512-uHR+fqFq3IvB3Rd4+kzXW8dmpxUhvgCQZep6KdjsLK4O6meK5dYZEayLtIxNus1XO3gfjfcIFe8a7L0HZRGgag==",
       "dev": true,
       "requires": {
+        "@types/mdast": "^3.0.0",
         "markdown-table": "^3.0.0",
         "mdast-util-from-markdown": "^1.0.0",
         "mdast-util-to-markdown": "^1.3.0"
@@ -33952,24 +38646,22 @@
     "mdast-util-inject": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz",
-      "integrity": "sha1-2wa4tYW+lZotzS+H9HK6m3VvNnU=",
+      "integrity": "sha512-CcJ0mHa36QYumDKiZ2OIR+ClhfOM7zIzN+Wfy8tRZ1hpH9DKLCS+Mh4DyK5bCxzE9uxMWcbIpeNFWsg1zrj/2g==",
       "dev": true,
       "requires": {
         "mdast-util-to-string": "^1.0.0"
       }
     },
     "mdast-util-to-hast": {
-      "version": "12.2.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.2.1.tgz",
-      "integrity": "sha512-dyindR2P7qOqXO1hQirZeGtVbiX7xlNQbw7gGaAwN4A1dh4+X8xU/JyYmRoyB8Fu1uPXzp7mlL5QwW7k+knvgA==",
+      "version": "12.2.4",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-12.2.4.tgz",
+      "integrity": "sha512-a21xoxSef1l8VhHxS1Dnyioz6grrJkoaCUgGzMD/7dWHvboYX3VW53esRUfB5tgTyz4Yos1n25SPcj35dJqmAg==",
       "dev": true,
       "requires": {
         "@types/hast": "^2.0.0",
         "@types/mdast": "^3.0.0",
-        "@types/mdurl": "^1.0.0",
         "mdast-util-definitions": "^5.0.0",
-        "mdurl": "^1.0.0",
-        "micromark-util-sanitize-uri": "^1.0.0",
+        "micromark-util-sanitize-uri": "^1.1.0",
         "trim-lines": "^3.0.0",
         "unist-builder": "^3.0.0",
         "unist-util-generated": "^2.0.0",
@@ -34051,16 +38743,10 @@
         }
       }
     },
-    "mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
-      "dev": true
-    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
     },
     "memoizee": {
       "version": "0.4.15",
@@ -34091,7 +38777,7 @@
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "merge-stream": {
       "version": "2.0.0",
@@ -34102,12 +38788,12 @@
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
     },
     "micromark": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.0.10.tgz",
-      "integrity": "sha512-ryTDy6UUunOXy2HPjelppgJ2sNfcPz1pLlMdA6Rz9jPzhLikWXv/irpWV/I2jd68Uhmny7hHxAlAhk4+vWggpg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.1.0.tgz",
+      "integrity": "sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA==",
       "dev": true,
       "requires": {
         "@types/debug": "^4.0.0",
@@ -34397,9 +39083,9 @@
       }
     },
     "micromark-util-sanitize-uri": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.0.0.tgz",
-      "integrity": "sha512-cCxvBKlmac4rxCGx6ejlIviRaMKZc0fWm5HdCHEeDWRSkn44l6NdYVRyU+0nT1XC72EQJMZV8IPHF+jTr56lAg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.1.0.tgz",
+      "integrity": "sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg==",
       "dev": true,
       "requires": {
         "micromark-util-character": "^1.0.0",
@@ -34432,100 +39118,13 @@
       "dev": true
     },
     "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-extendable": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-          "dev": true
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       }
     },
     "mime": {
@@ -34535,16 +39134,16 @@
       "dev": true
     },
     "mime-db": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
     },
     "mime-types": {
-      "version": "2.1.34",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
-      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "requires": {
-        "mime-db": "1.51.0"
+        "mime-db": "1.52.0"
       }
     },
     "mimic-fn": {
@@ -34578,9 +39177,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
       "dev": true
     },
     "mixin-deep": {
@@ -34634,6 +39233,12 @@
         "yargs-unparser": "2.0.0"
       },
       "dependencies": {
+        "ansi-colors": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+          "dev": true
+        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -34649,15 +39254,6 @@
           "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
           "dev": true
         },
-        "brace-expansion": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-          "dev": true,
-          "requires": {
-            "balanced-match": "^1.0.0"
-          }
-        },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -34679,6 +39275,17 @@
             }
           }
         },
+        "cliui": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -34694,22 +39301,11 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.1.2",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-              "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-              "dev": true
-            }
-          }
+        "diff": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+          "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+          "dev": true
         },
         "escape-string-regexp": {
           "version": "4.0.0",
@@ -34727,6 +39323,37 @@
             "path-exists": "^4.0.0"
           }
         },
+        "glob": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          },
+          "dependencies": {
+            "minimatch": {
+              "version": "3.1.2",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+              "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+              "dev": true,
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            }
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "js-yaml": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -34762,6 +39389,17 @@
           "dev": true,
           "requires": {
             "brace-expansion": "^2.0.1"
+          },
+          "dependencies": {
+            "brace-expansion": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+              "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+              "dev": true,
+              "requires": {
+                "balanced-match": "^1.0.0"
+              }
+            }
           }
         },
         "ms": {
@@ -34770,12 +39408,6 @@
           "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         },
-        "nanoid": {
-          "version": "3.3.3",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
-          "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
-          "dev": true
-        },
         "p-limit": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -34794,23 +39426,20 @@
             "p-limit": "^3.0.2"
           }
         },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
         "strip-json-comments": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
           "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
           "dev": true
         },
-        "workerpool": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
-          "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
-          "dev": true
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
         },
         "yargs": {
           "version": "16.2.0",
@@ -34857,17 +39486,20 @@
             "ms": "2.0.0"
           }
         },
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-          "dev": true
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
+        },
+        "on-finished": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+          "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
         }
       }
     },
@@ -34890,9 +39522,9 @@
       "dev": true
     },
     "mrmime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.0.tgz",
-      "integrity": "sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
+      "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
       "dev": true
     },
     "ms": {
@@ -34903,45 +39535,10 @@
     "multipipe": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
+      "integrity": "sha512-7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q==",
       "dev": true,
       "requires": {
         "duplexer2": "0.0.2"
-      },
-      "dependencies": {
-        "duplexer2": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-          "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.1.9"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
       }
     },
     "mute-stdout": {
@@ -34974,11 +39571,10 @@
       "optional": true
     },
     "nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true,
-      "optional": true
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
+      "dev": true
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -34999,6 +39595,22 @@
         "to-regex": "^3.0.1"
       },
       "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
         "kind-of": {
           "version": "6.0.3",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -35010,13 +39622,13 @@
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
     "ncp": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
-      "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=",
+      "integrity": "sha512-PfGU8jYWdRl4FqJfCy0IzbkGyFHntfWygZg46nFk/dJD/XRrk2cj0SsKSX9n5u5gE0E0YfEpKWrEkfjnlZSTXA==",
       "dev": true
     },
     "negotiator": {
@@ -35068,7 +39680,7 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
           "dev": true
         },
         "lolex": {
@@ -35108,29 +39720,32 @@
     "nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
       "dev": true,
       "requires": {
         "abbrev": "1"
       }
     },
     "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
         "validate-npm-package-license": "^3.0.1"
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
         }
       }
     },
@@ -35158,7 +39773,7 @@
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
       "dev": true,
       "requires": {
         "path-key": "^2.0.0"
@@ -35167,7 +39782,7 @@
         "path-key": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+          "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
           "dev": true
         }
       }
@@ -35175,7 +39790,7 @@
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
       "dev": true
     },
     "oauth-sign": {
@@ -35187,13 +39802,13 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true
     },
     "object-copy": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
       "dev": true,
       "requires": {
         "copy-descriptor": "^0.1.0",
@@ -35204,7 +39819,7 @@
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
           "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
@@ -35213,7 +39828,7 @@
         "is-accessor-descriptor": {
           "version": "0.1.6",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -35228,7 +39843,7 @@
         "is-data-descriptor": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -35256,7 +39871,7 @@
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
           "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
@@ -35265,10 +39880,9 @@
       }
     },
     "object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
     },
     "object-is": {
       "version": "1.1.5",
@@ -35283,32 +39897,34 @@
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
     },
     "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
       "dev": true,
       "requires": {
         "isobject": "^3.0.0"
       }
     },
     "object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
         "object-keys": "^1.1.1"
       }
     },
     "object.defaults": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
+      "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
       "dev": true,
       "requires": {
         "array-each": "^1.0.1",
@@ -35320,7 +39936,7 @@
     "object.map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
+      "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
       "dev": true,
       "requires": {
         "for-own": "^1.0.0",
@@ -35330,7 +39946,7 @@
     "object.pick": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
       "dev": true,
       "requires": {
         "isobject": "^3.0.1"
@@ -35339,7 +39955,7 @@
     "object.reduce": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
+      "integrity": "sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw==",
       "dev": true,
       "requires": {
         "for-own": "^1.0.0",
@@ -35358,9 +39974,9 @@
       }
     },
     "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "requires": {
         "ee-first": "1.1.1"
       }
@@ -35374,7 +39990,7 @@
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "requires": {
         "wrappy": "1"
@@ -35407,7 +40023,7 @@
         "is-wsl": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+          "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
           "dev": true
         }
       }
@@ -35477,6 +40093,12 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "log-symbols": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -35501,7 +40123,7 @@
     "ordered-read-streams": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
+      "integrity": "sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==",
       "dev": true,
       "requires": {
         "readable-stream": "^2.0.1"
@@ -35510,13 +40132,13 @@
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
       "dev": true
     },
     "os-locale": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==",
       "dev": true,
       "requires": {
         "lcid": "^1.0.0"
@@ -35525,7 +40147,7 @@
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
       "dev": true
     },
     "p-cancelable": {
@@ -35537,7 +40159,7 @@
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
       "dev": true
     },
     "p-iteration": {
@@ -35547,27 +40169,27 @@
       "dev": true
     },
     "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
       "requires": {
-        "p-try": "^1.0.0"
+        "p-try": "^2.0.0"
       }
     },
     "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
       "requires": {
-        "p-limit": "^1.1.0"
+        "p-limit": "^2.2.0"
       }
     },
     "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true
     },
     "parent-module": {
@@ -35582,7 +40204,7 @@
     "parse-filepath": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
+      "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
       "dev": true,
       "requires": {
         "is-absolute": "^1.0.0",
@@ -35617,7 +40239,7 @@
     "parse-passwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
       "dev": true
     },
     "parse-path": {
@@ -35649,25 +40271,25 @@
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
       "dev": true
     },
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
       "dev": true
     },
     "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true
     },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true
     },
     "path-key": {
@@ -35684,7 +40306,7 @@
     "path-root": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
+      "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
       "dev": true,
       "requires": {
         "path-root-regex": "^0.1.0"
@@ -35693,13 +40315,13 @@
     "path-root-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
+      "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
       "dev": true
     },
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "path-type": {
       "version": "1.1.0",
@@ -35729,7 +40351,7 @@
     "pause-stream": {
       "version": "0.0.11",
       "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+      "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
       "dev": true,
       "requires": {
         "through": "~2.3"
@@ -35738,13 +40360,13 @@
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
       "dev": true
     },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
       "dev": true
     },
     "picocolors": {
@@ -35767,13 +40389,13 @@
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
       "dev": true
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
       "dev": true,
       "requires": {
         "pinkie": "^2.0.0"
@@ -35795,98 +40417,46 @@
       "dev": true,
       "requires": {
         "find-up": "^4.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        }
       }
     },
     "plugin-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+      "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
       "dev": true,
       "requires": {
-        "ansi-colors": "^1.0.1",
-        "arr-diff": "^4.0.0",
-        "arr-union": "^3.1.0",
-        "extend-shallow": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-colors": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-          "dev": true,
-          "requires": {
-            "ansi-wrap": "^0.1.0"
-          }
-        }
+        "ansi-cyan": "^0.1.1",
+        "ansi-red": "^0.1.1",
+        "arr-diff": "^1.0.1",
+        "arr-union": "^2.0.1",
+        "extend-shallow": "^1.1.2"
       }
     },
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
       "dev": true
     },
     "postcss": {
-      "version": "8.4.16",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
-      "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
+      "version": "8.4.18",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
+      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
       "dev": true,
       "optional": true,
       "requires": {
         "nanoid": "^3.3.4",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
+      },
+      "dependencies": {
+        "nanoid": {
+          "version": "3.3.4",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
     "prelude-ls": {
@@ -35896,20 +40466,39 @@
       "dev": true
     },
     "pretty-format": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dev": true,
       "requires": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
         "react-is": "^17.0.1"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         }
       }
@@ -35917,7 +40506,7 @@
     "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
+      "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
       "dev": true
     },
     "pretty-ms": {
@@ -35929,12 +40518,6 @@
         "parse-ms": "^2.1.0"
       }
     },
-    "printj": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz",
-      "integrity": "sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==",
-      "dev": true
-    },
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
@@ -35989,7 +40572,7 @@
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
       "dev": true
     },
     "ps-tree": {
@@ -36004,13 +40587,13 @@
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
       "dev": true
     },
     "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
       "dev": true
     },
     "pump": {
@@ -36065,16 +40648,16 @@
       "dev": true
     },
     "puppeteer-core": {
-      "version": "13.5.1",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-13.5.1.tgz",
-      "integrity": "sha512-dobVqWjV34ilyfQHR3BBnCYaekBYTi5MgegEYBRYd3s3uFy8jUpZEEWbaFjG9ETm+LGzR5Lmr0aF6LLuHtiuCg==",
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-13.7.0.tgz",
+      "integrity": "sha512-rXja4vcnAzFAP1OVLq/5dWNfwBGuzcOARJ6qGV7oAZhnLmVRU8G5MsdeQEAOy332ZhkIOnn9jp15R89LKHyp2Q==",
       "dev": true,
       "requires": {
         "cross-fetch": "3.1.5",
-        "debug": "4.3.3",
-        "devtools-protocol": "0.0.969999",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.981744",
         "extract-zip": "2.0.1",
-        "https-proxy-agent": "5.0.0",
+        "https-proxy-agent": "5.0.1",
         "pkg-dir": "4.2.0",
         "progress": "2.0.3",
         "proxy-from-env": "1.1.0",
@@ -36084,31 +40667,12 @@
         "ws": "8.5.0"
       },
       "dependencies": {
-        "agent-base": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-          "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-          "dev": true,
-          "requires": {
-            "debug": "4"
-          }
-        },
         "devtools-protocol": {
-          "version": "0.0.969999",
-          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.969999.tgz",
-          "integrity": "sha512-6GfzuDWU0OFAuOvBokXpXPLxjOJ5DZ157Ue3sGQQM3LgAamb8m0R0ruSfN0DDu+XG5XJgT50i6zZ/0o8RglreQ==",
+          "version": "0.0.981744",
+          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.981744.tgz",
+          "integrity": "sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg==",
           "dev": true
         },
-        "https-proxy-agent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-          "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-          "dev": true,
-          "requires": {
-            "agent-base": "6",
-            "debug": "4"
-          }
-        },
         "ws": {
           "version": "8.5.0",
           "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
@@ -36121,7 +40685,7 @@
     "q": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
       "dev": true
     },
     "qjobs": {
@@ -36131,9 +40695,12 @@
       "dev": true
     },
     "qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "query-selector-shadow-dom": {
       "version": "1.0.0",
@@ -36144,7 +40711,7 @@
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
       "dev": true
     },
     "querystringify": {
@@ -36174,12 +40741,12 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "requires": {
         "bytes": "3.1.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
@@ -36202,36 +40769,6 @@
         "type-fest": "^2.0.0"
       },
       "dependencies": {
-        "hosted-git-info": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "normalize-package-data": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-          "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^4.0.1",
-            "is-core-module": "^2.5.0",
-            "semver": "^7.3.4",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
         "type-fest": {
           "version": "2.19.0",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
@@ -36326,18 +40863,44 @@
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+          "dev": true
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
           "dev": true
         }
       }
     },
     "readdir-glob": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.1.tgz",
-      "integrity": "sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.2.tgz",
+      "integrity": "sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==",
       "dev": true,
       "requires": {
-        "minimatch": "^3.0.4"
+        "minimatch": "^5.1.0"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        }
       }
     },
     "readdirp": {
@@ -36352,30 +40915,19 @@
     "rechoir": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
       "dev": true,
       "requires": {
         "resolve": "^1.1.6"
       }
     },
     "recursive-readdir": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
+      "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
       "dev": true,
       "requires": {
-        "minimatch": "3.0.4"
-      },
-      "dependencies": {
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        }
+        "minimatch": "^3.0.5"
       }
     },
     "regenerate": {
@@ -36384,23 +40936,22 @@
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "regenerate-unicode-properties": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
-      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
       "requires": {
         "regenerate": "^1.4.2"
       }
     },
     "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
+      "version": "0.13.10",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
+      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
     },
     "regenerator-transform": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
-      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
       "requires": {
         "@babel/runtime": "^7.8.4"
       }
@@ -36413,16 +40964,29 @@
       "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        }
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz",
-      "integrity": "sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
       }
     },
     "regexpp": {
@@ -36432,27 +40996,27 @@
       "dev": true
     },
     "regexpu-core": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
-      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
+      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
       "requires": {
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.0.1",
-        "regjsgen": "^0.6.0",
-        "regjsparser": "^0.8.2",
+        "regenerate-unicode-properties": "^10.1.0",
+        "regjsgen": "^0.7.1",
+        "regjsparser": "^0.9.1",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.0.0"
       }
     },
     "regjsgen": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
-      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
+      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
     },
     "regjsparser": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
-      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
       "requires": {
         "jsesc": "~0.5.0"
       },
@@ -36460,7 +41024,7 @@
         "jsesc": {
           "version": "0.5.0",
           "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
+          "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="
         }
       }
     },
@@ -36566,7 +41130,7 @@
     "remove-bom-stream": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
+      "integrity": "sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==",
       "dev": true,
       "requires": {
         "remove-bom-buffer": "^3.0.0",
@@ -36589,7 +41153,7 @@
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
       "dev": true
     },
     "repeat-element": {
@@ -36601,13 +41165,13 @@
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
       "dev": true
     },
     "repeating": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
       "dev": true,
       "requires": {
         "is-finite": "^1.0.0"
@@ -36616,13 +41180,13 @@
     "replace-ext": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
+      "integrity": "sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==",
       "dev": true
     },
     "replace-homedir": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
+      "integrity": "sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==",
       "dev": true,
       "requires": {
         "homedir-polyfill": "^1.0.1",
@@ -36680,7 +41244,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "dev": true
     },
     "require-from-string": {
@@ -36689,10 +41253,16 @@
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true
     },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==",
+      "dev": true
+    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
       "dev": true
     },
     "resolve": {
@@ -36714,7 +41284,7 @@
     "resolve-dir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
       "dev": true,
       "requires": {
         "expand-tilde": "^2.0.0",
@@ -36730,7 +41300,7 @@
     "resolve-options": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
+      "integrity": "sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==",
       "dev": true,
       "requires": {
         "value-or-function": "^3.0.0"
@@ -36739,13 +41309,13 @@
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
       "dev": true
     },
     "responselike": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
-      "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
+      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
       "dev": true,
       "requires": {
         "lowercase-keys": "^2.0.0"
@@ -36763,7 +41333,7 @@
         "fast-deep-equal": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==",
           "dev": true
         }
       }
@@ -36821,20 +41391,12 @@
       }
     },
     "rxjs": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
       "requires": {
-        "tslib": "^2.1.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-          "dev": true
-        }
+        "tslib": "^1.9.0"
       }
     },
     "sade": {
@@ -36847,25 +41409,36 @@
       }
     },
     "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
     },
     "safe-json-parse": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
-      "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
+      "integrity": "sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A==",
       "dev": true
     },
     "safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
       "dev": true,
       "requires": {
         "ret": "~0.1.10"
       }
     },
+    "safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      }
+    },
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -36899,13 +41472,6 @@
             "json-schema-traverse": "^0.4.1",
             "uri-js": "^4.2.2"
           }
-        },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
         }
       }
     },
@@ -36917,30 +41483,30 @@
     "semver-greatest-satisfied-range": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
+      "integrity": "sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==",
       "dev": true,
       "requires": {
         "sver-compat": "^1.5.0"
       }
     },
     "send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
         "ms": "2.1.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
         "debug": {
@@ -36954,7 +41520,7 @@
             "ms": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
             }
           }
         },
@@ -36999,7 +41565,7 @@
     "serve-index": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dev": true,
       "requires": {
         "accepts": "~1.3.4",
@@ -37020,10 +41586,16 @@
             "ms": "2.0.0"
           }
         },
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+          "dev": true
+        },
         "http-errors": {
           "version": "1.6.3",
           "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
           "dev": true,
           "requires": {
             "depd": "~1.1.2",
@@ -37035,13 +41607,13 @@
         "inherits": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
           "dev": true
         },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         },
         "setprototypeof": {
@@ -37049,24 +41621,30 @@
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
           "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
           "dev": true
+        },
+        "statuses": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+          "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+          "dev": true
         }
       }
     },
     "serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.2"
+        "send": "0.18.0"
       }
     },
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
       "dev": true
     },
     "set-value": {
@@ -37084,7 +41662,7 @@
         "extend-shallow": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
           "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
@@ -37093,7 +41671,7 @@
         "is-extendable": {
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
           "dev": true
         },
         "is-plain-object": {
@@ -37110,7 +41688,7 @@
     "setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
       "dev": true
     },
     "setprototypeof": {
@@ -37137,7 +41715,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
@@ -37170,21 +41747,6 @@
           "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
           "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
           "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -37200,9 +41762,9 @@
       }
     },
     "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
       "dev": true
     },
     "slice-ansi": {
@@ -37270,7 +41832,7 @@
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
           "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
@@ -37279,7 +41841,7 @@
         "extend-shallow": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
           "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
@@ -37288,7 +41850,7 @@
         "is-accessor-descriptor": {
           "version": "0.1.6",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -37297,7 +41859,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -37314,7 +41876,7 @@
         "is-data-descriptor": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -37323,7 +41885,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -37345,13 +41907,13 @@
         "is-extendable": {
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
           "dev": true
         },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         },
         "source-map-resolve": {
@@ -37383,7 +41945,7 @@
         "define-property": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
           "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
@@ -37409,7 +41971,7 @@
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
           "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
@@ -37418,33 +41980,32 @@
       }
     },
     "socket.io": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
-      "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz",
+      "integrity": "sha512-zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==",
       "dev": true,
       "requires": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "debug": "~4.3.2",
-        "engine.io": "~6.1.0",
-        "socket.io-adapter": "~2.3.3",
-        "socket.io-parser": "~4.0.4"
+        "engine.io": "~6.2.0",
+        "socket.io-adapter": "~2.4.0",
+        "socket.io-parser": "~4.2.0"
       }
     },
     "socket.io-adapter": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
-      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
+      "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
       "dev": true
     },
     "socket.io-parser": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
-      "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz",
+      "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==",
       "dev": true,
       "requires": {
-        "@types/component-emitter": "^1.2.10",
-        "component-emitter": "~1.3.0",
+        "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
       }
     },
@@ -37457,7 +42018,7 @@
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
       "dev": true
     },
     "source-map-js": {
@@ -37478,21 +42039,12 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
       "dev": true,
       "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "source-map": "^0.5.6"
       }
     },
     "source-map-url": {
@@ -37547,15 +42099,15 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
-      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
+      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
       "dev": true
     },
     "split": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-      "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+      "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
       "dev": true,
       "requires": {
         "through": "2"
@@ -37568,18 +42120,46 @@
       "dev": true,
       "requires": {
         "extend-shallow": "^3.0.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        }
       }
     },
     "split2": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz",
-      "integrity": "sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==",
-      "dev": true
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^3.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
     },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
     "sshpk": {
@@ -37602,7 +42182,7 @@
     "stack-trace": {
       "version": "0.0.10",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
       "dev": true
     },
     "stack-utils": {
@@ -37625,7 +42205,7 @@
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
       "dev": true,
       "requires": {
         "define-property": "^0.2.5",
@@ -37635,7 +42215,7 @@
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
           "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
@@ -37644,7 +42224,7 @@
         "is-accessor-descriptor": {
           "version": "0.1.6",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -37653,7 +42233,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -37670,7 +42250,7 @@
         "is-data-descriptor": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -37679,7 +42259,7 @@
             "kind-of": {
               "version": "3.2.2",
               "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
               "dev": true,
               "requires": {
                 "is-buffer": "^1.1.5"
@@ -37701,9 +42281,9 @@
       }
     },
     "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
     "stream-buffers": {
       "version": "3.0.2",
@@ -37714,7 +42294,7 @@
     "stream-combiner": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-      "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+      "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
       "dev": true,
       "requires": {
         "duplexer": "~0.1.1"
@@ -37733,14 +42313,42 @@
       "dev": true
     },
     "streamroller": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.4.tgz",
-      "integrity": "sha512-GI9NzeD+D88UFuIlJkKNDH/IsuR+qIN7Qh8EsmhoRZr9bQoehTraRgwtLUkZbpcAw+hLPfHOypmppz8YyGK68w==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.3.tgz",
+      "integrity": "sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w==",
       "dev": true,
       "requires": {
-        "date-format": "^4.0.4",
-        "debug": "^4.3.3",
-        "fs-extra": "^10.0.1"
+        "date-format": "^4.0.14",
+        "debug": "^4.3.4",
+        "fs-extra": "^8.1.0"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "universalify": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+          "dev": true
+        }
       }
     },
     "string_decoder": {
@@ -37750,12 +42358,20 @@
       "dev": true,
       "requires": {
         "safe-buffer": "~5.1.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
       }
     },
     "string-template": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
-      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
+      "integrity": "sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==",
       "dev": true
     },
     "string-width": {
@@ -37767,34 +42383,28 @@
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
         "strip-ansi": "^6.0.1"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        }
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       }
     },
     "stringify-entities": {
@@ -37819,34 +42429,39 @@
     "strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true
     },
     "strip-bom-string": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-      "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
+      "integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==",
       "dev": true
     },
     "strip-eof": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
+      "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
       "dev": true
     },
     "suffix": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/suffix/-/suffix-0.1.1.tgz",
-      "integrity": "sha1-zFgjFkag7xEC95R47zqSSP2chC8=",
+      "integrity": "sha512-j5uf6MJtMCfC4vBe5LFktSe4bGyNTBk7I2Kdri0jeLrcv5B9pWfxVa5JQpoxgtR8vaVB7bVxsWgnfQbX5wkhAA==",
       "dev": true
     },
     "supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "requires": {
-        "has-flag": "^4.0.0"
+        "has-flag": "^3.0.0"
       }
     },
     "supports-preserve-symlinks-flag": {
@@ -37857,7 +42472,7 @@
     "sver-compat": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
+      "integrity": "sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==",
       "dev": true,
       "requires": {
         "es6-iterator": "^2.0.1",
@@ -37878,9 +42493,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "8.10.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz",
-          "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==",
+          "version": "8.11.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -37944,7 +42559,7 @@
     "temp-fs": {
       "version": "0.9.9",
       "resolved": "https://registry.npmjs.org/temp-fs/-/temp-fs-0.9.9.tgz",
-      "integrity": "sha1-gHFzBDeHByDpQxUy/igUNk+IA9c=",
+      "integrity": "sha512-WfecDCR1xC9b0nsrzSaxPf3ZuWeWLUWblW4vlDQAa1biQaKHiImHnJfeQocQe/hXKMcolRzgkcVX/7kK4zoWbw==",
       "dev": true,
       "requires": {
         "rimraf": "~2.5.2"
@@ -37953,7 +42568,7 @@
         "rimraf": {
           "version": "2.5.4",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
-          "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=",
+          "integrity": "sha512-Lw7SHMjssciQb/rRz7JyPIy9+bbUshEucPoLRvWqy09vC5zQixl8Uet+Zl+SROBB/JMWHJRdCk1qdxNWHNMvlQ==",
           "dev": true,
           "requires": {
             "glob": "^7.0.5"
@@ -37986,9 +42601,9 @@
       }
     },
     "terser": {
-      "version": "5.14.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
-      "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
+      "version": "5.15.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz",
+      "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==",
       "dev": true,
       "requires": {
         "@jridgewell/source-map": "^0.3.2",
@@ -37998,30 +42613,40 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "8.7.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+          "version": "8.8.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
           "dev": true
         },
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.21",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+          "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
         }
       }
     },
     "terser-webpack-plugin": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz",
-      "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
+      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
       "dev": true,
       "requires": {
+        "@jridgewell/trace-mapping": "^0.3.14",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^5.7.2"
+        "terser": "^5.14.1"
       },
       "dependencies": {
         "ajv": {
@@ -38036,13 +42661,6 @@
             "uri-js": "^4.2.2"
           }
         },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
         "schema-utils": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
@@ -38053,12 +42671,6 @@
             "ajv": "^6.12.5",
             "ajv-keywords": "^3.5.2"
           }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
         }
       }
     },
@@ -38076,7 +42688,7 @@
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
     "textextensions": {
@@ -38088,7 +42700,7 @@
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
       "dev": true
     },
     "through2": {
@@ -38138,7 +42750,7 @@
     "time-stamp": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
+      "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
       "dev": true
     },
     "timers-ext": {
@@ -38182,18 +42794,18 @@
       }
     },
     "tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
-        "rimraf": "^3.0.0"
+        "os-tmpdir": "~1.0.2"
       }
     },
     "to-absolute-glob": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
+      "integrity": "sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==",
       "dev": true,
       "requires": {
         "is-absolute": "^1.0.0",
@@ -38203,12 +42815,12 @@
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
     },
     "to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
       "dev": true,
       "requires": {
         "kind-of": "^3.0.2"
@@ -38223,7 +42835,7 @@
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
           "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
@@ -38241,6 +42853,18 @@
         "extend-shallow": "^3.0.2",
         "regex-not": "^1.0.2",
         "safe-regex": "^1.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        }
       }
     },
     "to-regex-range": {
@@ -38250,20 +42874,12 @@
       "dev": true,
       "requires": {
         "is-number": "^7.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        }
       }
     },
     "to-through": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
+      "integrity": "sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==",
       "dev": true,
       "requires": {
         "through2": "^2.0.3"
@@ -38305,13 +42921,13 @@
     "tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
       "dev": true
     },
     "traverse": {
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-      "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
+      "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==",
       "dev": true
     },
     "trim-lines": {
@@ -38323,7 +42939,7 @@
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "integrity": "sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==",
       "dev": true
     },
     "trough": {
@@ -38333,14 +42949,14 @@
       "dev": true
     },
     "tsconfig-paths": {
-      "version": "3.13.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.13.0.tgz",
-      "integrity": "sha512-nWuffZppoaYK0vQ1SQmkSsQzJoHA4s6uzdb2waRpD806x9yfq153AdVsWz4je2qZcW+pENrMQXbGQ3sMCkXuhw==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
       "dev": true,
       "requires": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.1",
-        "minimist": "^1.2.0",
+        "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       },
       "dependencies": {
@@ -38364,7 +42980,7 @@
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
       "requires": {
         "safe-buffer": "^5.0.1"
@@ -38373,7 +42989,7 @@
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
       "dev": true
     },
     "type": {
@@ -38415,7 +43031,7 @@
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
       "dev": true
     },
     "typescript": {
@@ -38447,27 +43063,27 @@
       }
     },
     "ua-parser-js": {
-      "version": "0.7.31",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz",
-      "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==",
+      "version": "0.7.32",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.32.tgz",
+      "integrity": "sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw==",
       "dev": true
     },
     "uglify-js": {
-      "version": "3.15.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz",
-      "integrity": "sha512-peeoTk3hSwYdoc9nrdiEJk+gx1ALCtTjdYuKSXMTDqq7n1W7dHPqWDdSi+BPL0ni2YMeHD7hKUSdbj3TZauY2A==",
+      "version": "3.17.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
       "dev": true,
       "optional": true
     },
     "unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
       "requires": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
         "which-boxed-primitive": "^1.0.2"
       }
     },
@@ -38484,7 +43100,7 @@
     "unc-path-regex": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
+      "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
       "dev": true
     },
     "undertaker": {
@@ -38508,7 +43124,7 @@
         "fast-levenshtein": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
-          "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=",
+          "integrity": "sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==",
           "dev": true
         }
       }
@@ -38516,7 +43132,7 @@
     "undertaker-registry": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
+      "integrity": "sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==",
       "dev": true
     },
     "unicode-canonical-property-names-ecmascript": {
@@ -38539,9 +43155,9 @@
       "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="
     },
     "unified": {
       "version": "10.1.2",
@@ -38570,10 +43186,16 @@
         "set-value": "^2.0.1"
       },
       "dependencies": {
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+          "dev": true
+        },
         "is-extendable": {
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-          "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+          "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
           "dev": true
         }
       }
@@ -38657,12 +43279,12 @@
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
     },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
       "dev": true,
       "requires": {
         "has-value": "^0.3.1",
@@ -38672,7 +43294,7 @@
         "has-value": {
           "version": "0.3.1",
           "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
           "dev": true,
           "requires": {
             "get-value": "^2.0.3",
@@ -38683,7 +43305,7 @@
             "isobject": {
               "version": "2.1.0",
               "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
               "dev": true,
               "requires": {
                 "isarray": "1.0.0"
@@ -38694,13 +43316,13 @@
         "has-values": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
           "dev": true
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
           "dev": true
         }
       }
@@ -38720,6 +43342,17 @@
         "listenercount": "~1.0.1",
         "readable-stream": "~2.3.6",
         "setimmediate": "~1.0.4"
+      },
+      "dependencies": {
+        "duplexer2": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+          "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "^2.0.2"
+          }
+        }
       }
     },
     "upath": {
@@ -38729,9 +43362,9 @@
       "dev": true
     },
     "update-browserslist-db": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz",
-      "integrity": "sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
@@ -38749,13 +43382,13 @@
     "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
       "dev": true
     },
     "url": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
       "dev": true,
       "requires": {
         "punycode": "1.3.2",
@@ -38765,7 +43398,7 @@
         "punycode": {
           "version": "1.3.2",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
           "dev": true
         }
       }
@@ -38793,29 +43426,28 @@
       "dev": true
     },
     "util": {
-      "version": "0.12.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
-      "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.3",
         "is-arguments": "^1.0.4",
         "is-generator-function": "^1.0.7",
         "is-typed-array": "^1.1.3",
-        "safe-buffer": "^5.1.2",
         "which-typed-array": "^1.1.2"
       }
     },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
     },
     "uuid": {
       "version": "3.4.0",
@@ -38863,18 +43495,18 @@
     "value-or-function": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
+      "integrity": "sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==",
       "dev": true
     },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
     },
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
@@ -38885,15 +43517,15 @@
         "core-util-is": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+          "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
           "dev": true
         }
       }
     },
     "vfile": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.4.tgz",
-      "integrity": "sha512-KI+7cnst03KbEyN1+JE504zF5bJBZa+J+CrevLeyIMq0aPU681I2rQ5p4PlnQ6exFtWiUrg26QUdFMnAKR6PIw==",
+      "version": "5.3.5",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-5.3.5.tgz",
+      "integrity": "sha512-U1ho2ga33eZ8y8pkbQLH54uKqGhFJ6GYIHnnG5AhRpAh3OWjkrRHKa/KogbmQn8We+c0KVV3rTOgR9V/WowbXQ==",
       "dev": true,
       "requires": {
         "@types/unist": "^2.0.0",
@@ -38932,6 +43564,12 @@
           "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
           "dev": true
         },
+        "emoji-regex": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+          "dev": true
+        },
         "string-width": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
@@ -38979,13 +43617,13 @@
       }
     },
     "video.js": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.20.2.tgz",
-      "integrity": "sha512-hdvAHKAyaL6bCDkeu0pPtFYKi1EDaOUovm7FN1xqBDolUxgH8FKy1WIgTS+Ouuaw7R54SCTcSeXjZEizhy9ouQ==",
+      "version": "7.20.3",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.20.3.tgz",
+      "integrity": "sha512-JMspxaK74LdfWcv69XWhX4rILywz/eInOVPdKefpQiZJSMD5O8xXYueqACP2Q5yqKstycgmmEKlJzZ+kVmDciw==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.12.5",
-        "@videojs/http-streaming": "2.14.2",
+        "@videojs/http-streaming": "2.14.3",
         "@videojs/vhs-utils": "^3.0.4",
         "@videojs/xhr": "2.6.0",
         "aes-decrypter": "3.1.3",
@@ -38996,7 +43634,7 @@
         "mux.js": "6.0.1",
         "safe-json-parse": "4.0.0",
         "videojs-font": "3.2.0",
-        "videojs-vtt.js": "^0.15.3"
+        "videojs-vtt.js": "^0.15.4"
       },
       "dependencies": {
         "safe-json-parse": {
@@ -39121,7 +43759,7 @@
     "vinyl-sourcemap": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
+      "integrity": "sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==",
       "dev": true,
       "requires": {
         "append-buffer": "^1.0.2",
@@ -39136,7 +43774,7 @@
         "normalize-path": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
           "dev": true,
           "requires": {
             "remove-trailing-separator": "^1.0.1"
@@ -39147,7 +43785,7 @@
     "vinyl-sourcemaps-apply": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
-      "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
+      "integrity": "sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw==",
       "dev": true,
       "requires": {
         "source-map": "^0.5.1"
@@ -39156,13 +43794,13 @@
     "void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+      "integrity": "sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==",
       "dev": true
     },
     "vue-template-compiler": {
-      "version": "2.7.10",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz",
-      "integrity": "sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ==",
+      "version": "2.7.13",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz",
+      "integrity": "sha512-jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -39180,9 +43818,9 @@
       }
     },
     "watchpack": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
       "dev": true,
       "requires": {
         "glob-to-regexp": "^0.4.1",
@@ -39192,51 +43830,120 @@
     "wcwidth": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
       "dev": true,
       "requires": {
         "defaults": "^1.0.3"
       }
     },
     "webdriver": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.16.16.tgz",
-      "integrity": "sha512-x8UoG9k/P8KDrfSh1pOyNevt9tns3zexoMxp9cKnyA/7HYSErhZYTLGlgxscAXLtQG41cMH/Ba/oBmOx7Hgd8w==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.5.3.tgz",
+      "integrity": "sha512-cDTn/hYj5x8BYwXxVb/WUwqGxrhCMP2rC8ttIWCfzmiVtmOnJGulC7CyxU3+p9Q5R/gIKTzdJOss16dhb+5CoA==",
       "dev": true,
       "requires": {
-        "@types/node": "^17.0.4",
-        "@wdio/config": "7.16.16",
-        "@wdio/logger": "7.16.0",
-        "@wdio/protocols": "7.16.7",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
+        "@wdio/config": "7.5.3",
+        "@wdio/logger": "7.5.3",
+        "@wdio/protocols": "7.5.3",
+        "@wdio/types": "7.5.3",
+        "@wdio/utils": "7.5.3",
         "got": "^11.0.2",
-        "ky": "^0.29.0",
         "lodash.merge": "^4.6.1"
+      },
+      "dependencies": {
+        "@wdio/logger": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.5.3.tgz",
+          "integrity": "sha512-r9EADpm0ncS1bDQSWi/nhF9C59/WNLbdAAFlo782E9ItFCpDhNit3aQP9vETv1vFxJRjUIM8Fw/HW8zwPadkbw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@wdio/types": {
+          "version": "7.5.3",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.5.3.tgz",
+          "integrity": "sha512-jmumhKBhNDABnpmrshYLEcdE9WoP5tmynsDNbDABlb/W8FFiLySQOejukhYIL9CLys4zXerV3/edks0SCzHOiQ==",
+          "dev": true,
+          "requires": {
+            "got": "^11.8.1"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "webdriverio": {
-      "version": "7.16.16",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.16.16.tgz",
-      "integrity": "sha512-caPaEWyuD3Qoa7YkW4xCCQA4v9Pa9wmhFGPvNZh3ERtjMCNi8L/XXOdkekWNZmFh3tY0kFguBj7+fAwSY7HAGw==",
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.25.4.tgz",
+      "integrity": "sha512-agkgwn2SIk5cAJ03uue1GnGZcUZUDN3W4fUMY9/VfO8bVJrPEgWg31bPguEWPu+YhEB/aBJD8ECxJ3OEKdy4qQ==",
       "dev": true,
       "requires": {
         "@types/aria-query": "^5.0.0",
-        "@types/node": "^17.0.4",
-        "@wdio/config": "7.16.16",
-        "@wdio/logger": "7.16.0",
-        "@wdio/protocols": "7.16.7",
-        "@wdio/repl": "7.16.14",
-        "@wdio/types": "7.16.14",
-        "@wdio/utils": "7.16.14",
+        "@types/node": "^18.0.0",
+        "@wdio/config": "7.25.4",
+        "@wdio/logger": "7.19.0",
+        "@wdio/protocols": "7.22.0",
+        "@wdio/repl": "7.25.4",
+        "@wdio/types": "7.25.4",
+        "@wdio/utils": "7.25.4",
         "archiver": "^5.0.0",
         "aria-query": "^5.0.0",
         "css-shorthand-properties": "^1.1.1",
         "css-value": "^0.0.1",
-        "devtools": "7.16.16",
-        "devtools-protocol": "^0.0.973690",
+        "devtools": "7.25.4",
+        "devtools-protocol": "^0.0.1061995",
         "fs-extra": "^10.0.0",
-        "get-port": "^5.1.1",
         "grapheme-splitter": "^1.0.2",
         "lodash.clonedeep": "^4.5.0",
         "lodash.isobject": "^3.0.2",
@@ -39248,9 +43955,85 @@
         "resq": "^1.9.1",
         "rgb2hex": "0.2.5",
         "serialize-error": "^8.0.0",
-        "webdriver": "7.16.16"
+        "webdriver": "7.25.4"
       },
       "dependencies": {
+        "@types/node": {
+          "version": "18.11.9",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
+          "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
+          "dev": true
+        },
+        "@wdio/config": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.25.4.tgz",
+          "integrity": "sha512-vb0emDtD9FbFh/yqW6oNdo2iuhQp8XKj6GX9fyy9v4wZgg3B0HPMVJxhIfcoHz7LMBWlHSo9YdvhFI5EQHRLBA==",
+          "dev": true,
+          "requires": {
+            "@wdio/logger": "7.19.0",
+            "@wdio/types": "7.25.4",
+            "@wdio/utils": "7.25.4",
+            "deepmerge": "^4.0.0",
+            "glob": "^8.0.3"
+          }
+        },
+        "@wdio/logger": {
+          "version": "7.19.0",
+          "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-7.19.0.tgz",
+          "integrity": "sha512-xR7SN/kGei1QJD1aagzxs3KMuzNxdT/7LYYx+lt6BII49+fqL/SO+5X0FDCZD0Ds93AuQvvz9eGyzrBI2FFXmQ==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0",
+            "loglevel": "^1.6.0",
+            "loglevel-plugin-prefix": "^0.8.4",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "@wdio/protocols": {
+          "version": "7.22.0",
+          "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.22.0.tgz",
+          "integrity": "sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ==",
+          "dev": true
+        },
+        "@wdio/repl": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.25.4.tgz",
+          "integrity": "sha512-kYhj9gLsUk4HmlXLqkVre+gwbfvw9CcnrHjqIjrmMS4mR9D8zvBb5CItb3ZExfPf9jpFzIFREbCAYoE9x/kMwg==",
+          "dev": true,
+          "requires": {
+            "@wdio/utils": "7.25.4"
+          }
+        },
+        "@wdio/types": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.25.4.tgz",
+          "integrity": "sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^18.0.0",
+            "got": "^11.8.1"
+          }
+        },
+        "@wdio/utils": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.25.4.tgz",
+          "integrity": "sha512-8iwQDk+foUqSzKZKfhLxjlCKOkfRJPNHaezQoevNgnrTq/t0ek+ldZCATezb9B8jprAuP4mgS9xi22akc6RkzA==",
+          "dev": true,
+          "requires": {
+            "@wdio/logger": "7.19.0",
+            "@wdio/types": "7.25.4",
+            "p-iteration": "^1.1.8"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "brace-expansion": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
@@ -39260,6 +44043,56 @@
             "balanced-match": "^1.0.0"
           }
         },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "glob": {
+          "version": "8.0.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+          "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^5.0.1",
+            "once": "^1.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "ky": {
+          "version": "0.30.0",
+          "resolved": "https://registry.npmjs.org/ky/-/ky-0.30.0.tgz",
+          "integrity": "sha512-X/u76z4JtDVq10u1JA5UQfatPxgPaVDMYTrgHyiTpGN2z4TMEJkIHsoSBBSg9SWZEIXTKsi9kHgiQ9o3Y/4yog==",
+          "dev": true
+        },
         "minimatch": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
@@ -39268,19 +44101,45 @@
           "requires": {
             "brace-expansion": "^2.0.1"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "webdriver": {
+          "version": "7.25.4",
+          "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.25.4.tgz",
+          "integrity": "sha512-6nVDwenh0bxbtUkHASz9B8T9mB531Fn1PcQjUGj2t5dolLPn6zuK1D7XYVX40hpn6r3SlYzcZnEBs4X0az5Txg==",
+          "dev": true,
+          "requires": {
+            "@types/node": "^18.0.0",
+            "@wdio/config": "7.25.4",
+            "@wdio/logger": "7.19.0",
+            "@wdio/protocols": "7.22.0",
+            "@wdio/types": "7.25.4",
+            "@wdio/utils": "7.25.4",
+            "got": "^11.0.2",
+            "ky": "0.30.0",
+            "lodash.merge": "^4.6.1"
+          }
         }
       }
     },
     "webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
       "dev": true
     },
     "webpack": {
-      "version": "5.70.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz",
-      "integrity": "sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==",
+      "version": "5.74.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
+      "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
@@ -39288,31 +44147,31 @@
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/wasm-edit": "1.11.1",
         "@webassemblyjs/wasm-parser": "1.11.1",
-        "acorn": "^8.4.1",
+        "acorn": "^8.7.1",
         "acorn-import-assertions": "^1.7.6",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.9.2",
+        "enhanced-resolve": "^5.10.0",
         "es-module-lexer": "^0.9.0",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.2.9",
-        "json-parse-better-errors": "^1.0.2",
+        "json-parse-even-better-errors": "^2.3.1",
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
         "schema-utils": "^3.1.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.3.1",
+        "watchpack": "^2.4.0",
         "webpack-sources": "^3.2.3"
       },
       "dependencies": {
         "acorn": {
-          "version": "8.7.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+          "version": "8.8.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
           "dev": true
         },
         "acorn-import-assertions": {
@@ -39334,13 +44193,6 @@
             "uri-js": "^4.2.2"
           }
         },
-        "ajv-keywords": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
-        },
         "schema-utils": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
@@ -39355,9 +44207,9 @@
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz",
-      "integrity": "sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz",
+      "integrity": "sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg==",
       "dev": true,
       "requires": {
         "acorn": "^8.0.4",
@@ -39372,15 +44224,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "8.7.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-          "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-          "dev": true
-        },
-        "acorn-walk": {
-          "version": "8.2.0",
-          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-          "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+          "version": "8.8.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
           "dev": true
         },
         "ansi-styles": {
@@ -39423,6 +44269,12 @@
           "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
           "dev": true
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -39433,9 +44285,9 @@
           }
         },
         "ws": {
-          "version": "7.5.7",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
-          "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
+          "version": "7.5.9",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
           "dev": true,
           "requires": {}
         }
@@ -39498,6 +44350,66 @@
         "supports-color": "^8.1.1",
         "through": "^2.3.8",
         "vinyl": "^2.2.1"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+          "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+          "dev": true,
+          "requires": {
+            "ansi-wrap": "^0.1.0"
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+          "dev": true
+        },
+        "arr-union": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+          "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+          "dev": true
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "^1.0.0",
+            "is-extendable": "^1.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "plugin-error": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+          "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+          "dev": true,
+          "requires": {
+            "ansi-colors": "^1.0.1",
+            "arr-diff": "^4.0.0",
+            "arr-union": "^3.1.0",
+            "extend-shallow": "^3.0.2"
+          }
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "websocket-driver": {
@@ -39520,7 +44432,7 @@
     "whatwg-url": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
       "dev": true,
       "requires": {
         "tr46": "~0.0.3",
@@ -39561,18 +44473,66 @@
         "is-weakset": "^2.0.1"
       }
     },
+    "which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==",
+      "dev": true
+    },
     "which-typed-array": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.7.tgz",
-      "integrity": "sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
+      "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
       "dev": true,
       "requires": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "es-abstract": "^1.18.5",
-        "foreach": "^2.0.5",
+        "es-abstract": "^1.20.0",
+        "for-each": "^0.3.3",
         "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.7"
+        "is-typed-array": "^1.1.9"
+      }
+    },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.2 || 2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
       }
     },
     "word-wrap": {
@@ -39584,13 +44544,13 @@
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
       "dev": true
     },
     "workerpool": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
-      "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
       "dev": true
     },
     "wrap-ansi": {
@@ -39633,7 +44593,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
     "write": {
@@ -39684,13 +44644,13 @@
     "yargs": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
-      "integrity": "sha1-BU3oth8i7v23IHBZ6u+da4P7kxo=",
+      "integrity": "sha512-7OGt4xXoWJQh5ulgZ78rKaqY7dNWbjfK+UKxGcIlaM2j7C4fqGchyv8CPvEWdRPrHp6Ula/YU8yGRpYGOHrI+g==",
       "dev": true
     },
     "yargs-parser": {
-      "version": "21.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-      "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "dev": true
     },
     "yargs-unparser": {
@@ -39711,12 +44671,6 @@
           "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
           "dev": true
         },
-        "decamelize": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-          "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-          "dev": true
-        },
         "is-plain-obj": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
@@ -39728,7 +44682,7 @@
     "yarn-install": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/yarn-install/-/yarn-install-1.0.0.tgz",
-      "integrity": "sha1-V/RQULgu/VcYKzlzxUqgXLXSUjA=",
+      "integrity": "sha512-VO1u181msinhPcGvQTVMnHVOae8zjX/NSksR17e6eXHRveDvHCF5mGjh9hkN8mzyfnCqcBe42LdTs7bScuTaeg==",
       "dev": true,
       "requires": {
         "cac": "^3.0.3",
@@ -39739,19 +44693,19 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
           "dev": true
         },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
           "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -39764,7 +44718,7 @@
         "cross-spawn": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-          "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
+          "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
           "dev": true,
           "requires": {
             "lru-cache": "^4.0.1",
@@ -39784,7 +44738,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
           "dev": true,
           "requires": {
             "ansi-regex": "^2.0.0"
@@ -39793,7 +44747,7 @@
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
           "dev": true
         },
         "which": {
@@ -39808,7 +44762,7 @@
         "yallist": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
           "dev": true
         }
       }
@@ -39816,7 +44770,7 @@
     "yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
       "dev": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
diff --git a/package.json b/package.json
index 60586841a53..21b0f56d38f 100644
--- a/package.json
+++ b/package.json
@@ -35,13 +35,13 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.5",
-    "@wdio/browserstack-service": "^7.16.0",
-    "@wdio/cli": "^7.5.2",
-    "@wdio/concise-reporter": "^7.5.2",
-    "@wdio/local-runner": "^7.5.2",
-    "@wdio/mocha-framework": "^7.5.2",
-    "@wdio/spec-reporter": "^7.19.0",
-    "@wdio/sync": "^7.5.2",
+    "@wdio/browserstack-service": "~7.16.0",
+    "@wdio/cli": "~7.5.2",
+    "@wdio/concise-reporter": "~7.5.2",
+    "@wdio/local-runner": "~7.5.2",
+    "@wdio/mocha-framework": "~7.5.2",
+    "@wdio/spec-reporter": "~7.19.0",
+    "@wdio/sync": "~7.5.2",
     "ajv": "6.12.3",
     "assert": "^2.0.0",
     "babel-loader": "^8.0.5",

From bf85447707945290055a5734665666e5e5099979 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Thu, 3 Nov 2022 12:39:08 -0700
Subject: [PATCH 410/569] Prebid core: fix exception in `requestBids`
 introduced by #9106 (#9194)

* Revert "Prebid core: return a promise from `requestBids` (#9106)"

This reverts commit 64aff9b1af9bb1b2761e1012f628299f16c0eb46.

* Revert "Revert "Prebid core: return a promise from `requestBids` (#9106)""

This reverts commit bf5ee3015059fd80a415ec67e7c5f690076a2ae1.

* Prebid core: fix exception in `requestBids` introduced by #9106

* Add comments
---
 src/prebid.js                   | 162 ++++++++++++++++----------------
 test/spec/unit/pbjs_api_spec.js |  18 +++-
 2 files changed, 100 insertions(+), 80 deletions(-)

diff --git a/src/prebid.js b/src/prebid.js
index 94391343cd3..06429b13a72 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -49,6 +49,7 @@ import {default as adapterManager, gdprDataHandler, getS2SBidderSet, uspDataHand
 import CONSTANTS from './constants.json';
 import * as events from './events.js';
 import {newMetrics, useMetrics} from './utils/perfMetrics.js';
+import {defer} from './utils/promise.js';
 
 const $$PREBID_GLOBAL$$ = getGlobal();
 const { triggerUserSyncs } = userSync;
@@ -622,7 +623,7 @@ $$PREBID_GLOBAL$$.removeAdUnit = function (adUnitCode) {
  * @alias module:pbjs.requestBids
  */
 $$PREBID_GLOBAL$$.requestBids = (function() {
-  const delegate = hook('sync', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels, auctionId, ttlBuffer, ortb2, metrics } = {}) {
+  const delegate = hook('async', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels, auctionId, ttlBuffer, ortb2, metrics, defer } = {}) {
     events.emit(REQUEST_BIDS);
     const cbTimeout = timeout || config.getConfig('bidderTimeout');
     logInfo('Invoking $$PREBID_GLOBAL$$.requestBids', arguments);
@@ -630,23 +631,28 @@ $$PREBID_GLOBAL$$.requestBids = (function() {
       global: mergeDeep({}, config.getAnyConfig('ortb2') || {}, ortb2 || {}),
       bidder: Object.fromEntries(Object.entries(config.getBidderConfig()).map(([bidder, cfg]) => [bidder, cfg.ortb2]).filter(([_, ortb2]) => ortb2 != null))
     }
-    return startAuction({bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ttlBuffer, ortb2Fragments, metrics});
+    return startAuction({bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ttlBuffer, ortb2Fragments, metrics, defer});
   }, 'requestBids');
 
   return wrapHook(delegate, function requestBids(req = {}) {
-    // if the request does not specify adUnits, clone the global adUnit array - before
-    // any hook has a chance to run.
+    // unlike the main body of `delegate`, this runs before any other hook has a chance to;
+    // it's also not restricted in its return value in the way `async` hooks are.
+
+    // if the request does not specify adUnits, clone the global adUnit array;
     // otherwise, if the caller goes on to use addAdUnits/removeAdUnits, any asynchronous logic
     // in any hook might see their effects.
-    req.metrics = newMetrics();
-    req.metrics.checkpoint('requestBids');
     let adUnits = req.adUnits || $$PREBID_GLOBAL$$.adUnits;
     req.adUnits = (isArray(adUnits) ? adUnits.slice() : [adUnits]);
-    return delegate.call(this, req);
+
+    req.metrics = newMetrics();
+    req.metrics.checkpoint('requestBids');
+    req.defer = defer({promiseFactory: (r) => new Promise(r)})
+    delegate.call(this, req);
+    return req.defer.promise;
   });
 })();
 
-export const startAuction = hook('sync', function ({ bidsBackHandler, timeout: cbTimeout, adUnits, ttlBuffer, adUnitCodes, labels, auctionId, ortb2Fragments, metrics } = {}) {
+export const startAuction = hook('async', function ({ bidsBackHandler, timeout: cbTimeout, adUnits, ttlBuffer, adUnitCodes, labels, auctionId, ortb2Fragments, metrics, defer } = {}) {
   const s2sBidders = getS2SBidderSet(config.getConfig('s2sConfig') || []);
   adUnits = useMetrics(metrics).measureTime('requestBids.validate', () => checkAdUnitSetup(adUnits));
 
@@ -658,85 +664,83 @@ export const startAuction = hook('sync', function ({ bidsBackHandler, timeout: c
     adUnitCodes = adUnits && adUnits.map(unit => unit.code);
   }
 
-  return new Promise((resolve) => {
-    function auctionDone(bids, timedOut, auctionId) {
-      if (typeof bidsBackHandler === 'function') {
-        try {
-          bidsBackHandler(bids, timedOut, auctionId);
-        } catch (e) {
-          logError('Error executing bidsBackHandler', null, e);
-        }
+  function auctionDone(bids, timedOut, auctionId) {
+    if (typeof bidsBackHandler === 'function') {
+      try {
+        bidsBackHandler(bids, timedOut, auctionId);
+      } catch (e) {
+        logError('Error executing bidsBackHandler', null, e);
       }
-      resolve({bids, timedOut, auctionId});
     }
+    defer.resolve({bids, timedOut, auctionId})
+  }
+
+  /*
+   * for a given adunit which supports a set of mediaTypes
+   * and a given bidder which supports a set of mediaTypes
+   * a bidder is eligible to participate on the adunit
+   * if it supports at least one of the mediaTypes on the adunit
+   */
+  adUnits.forEach(adUnit => {
+    // get the adunit's mediaTypes, defaulting to banner if mediaTypes isn't present
+    const adUnitMediaTypes = Object.keys(adUnit.mediaTypes || { 'banner': 'banner' });
 
-    /*
-     * for a given adunit which supports a set of mediaTypes
-     * and a given bidder which supports a set of mediaTypes
-     * a bidder is eligible to participate on the adunit
-     * if it supports at least one of the mediaTypes on the adunit
-     */
-    adUnits.forEach(adUnit => {
-      // get the adunit's mediaTypes, defaulting to banner if mediaTypes isn't present
-      const adUnitMediaTypes = Object.keys(adUnit.mediaTypes || { 'banner': 'banner' });
-
-      // get the bidder's mediaTypes
-      const allBidders = adUnit.bids.map(bid => bid.bidder);
-      const bidderRegistry = adapterManager.bidderRegistry;
-
-      const bidders = allBidders.filter(bidder => !s2sBidders.has(bidder));
-
-      const tid = adUnit.ortb2Imp?.ext?.tid || generateUUID();
-      adUnit.transactionId = tid;
-      if (ttlBuffer != null && !adUnit.hasOwnProperty('ttlBuffer')) {
-        adUnit.ttlBuffer = ttlBuffer;
+    // get the bidder's mediaTypes
+    const allBidders = adUnit.bids.map(bid => bid.bidder);
+    const bidderRegistry = adapterManager.bidderRegistry;
+
+    const bidders = allBidders.filter(bidder => !s2sBidders.has(bidder));
+
+    const tid = adUnit.ortb2Imp?.ext?.tid || generateUUID();
+    adUnit.transactionId = tid;
+    if (ttlBuffer != null && !adUnit.hasOwnProperty('ttlBuffer')) {
+      adUnit.ttlBuffer = ttlBuffer;
+    }
+    // Populate ortb2Imp.ext.tid with transactionId. Specifying a transaction ID per item in the ortb impression array, lets multiple transaction IDs be transmitted in a single bid request.
+    deepSetValue(adUnit, 'ortb2Imp.ext.tid', tid);
+
+    bidders.forEach(bidder => {
+      const adapter = bidderRegistry[bidder];
+      const spec = adapter && adapter.getSpec && adapter.getSpec();
+      // banner is default if not specified in spec
+      const bidderMediaTypes = (spec && spec.supportedMediaTypes) || ['banner'];
+
+      // check if the bidder's mediaTypes are not in the adUnit's mediaTypes
+      const bidderEligible = adUnitMediaTypes.some(type => includes(bidderMediaTypes, type));
+      if (!bidderEligible) {
+        // drop the bidder from the ad unit if it's not compatible
+        logWarn(unsupportedBidderMessage(adUnit, bidder));
+        adUnit.bids = adUnit.bids.filter(bid => bid.bidder !== bidder);
+      } else {
+        adunitCounter.incrementBidderRequestsCounter(adUnit.code, bidder);
       }
-      // Populate ortb2Imp.ext.tid with transactionId. Specifying a transaction ID per item in the ortb impression array, lets multiple transaction IDs be transmitted in a single bid request.
-      deepSetValue(adUnit, 'ortb2Imp.ext.tid', tid);
-
-      bidders.forEach(bidder => {
-        const adapter = bidderRegistry[bidder];
-        const spec = adapter && adapter.getSpec && adapter.getSpec();
-        // banner is default if not specified in spec
-        const bidderMediaTypes = (spec && spec.supportedMediaTypes) || ['banner'];
-
-        // check if the bidder's mediaTypes are not in the adUnit's mediaTypes
-        const bidderEligible = adUnitMediaTypes.some(type => includes(bidderMediaTypes, type));
-        if (!bidderEligible) {
-          // drop the bidder from the ad unit if it's not compatible
-          logWarn(unsupportedBidderMessage(adUnit, bidder));
-          adUnit.bids = adUnit.bids.filter(bid => bid.bidder !== bidder);
-        } else {
-          adunitCounter.incrementBidderRequestsCounter(adUnit.code, bidder);
-        }
-      });
-      adunitCounter.incrementRequestsCounter(adUnit.code);
     });
+    adunitCounter.incrementRequestsCounter(adUnit.code);
+  });
 
-    if (!adUnits || adUnits.length === 0) {
-      logMessage('No adUnits configured. No bids requested.');
-      auctionDone();
-    } else {
-      const auction = auctionManager.createAuction({
-        adUnits,
-        adUnitCodes,
-        callback: auctionDone,
-        cbTimeout,
-        labels,
-        auctionId,
-        ortb2Fragments,
-        metrics,
-      });
-
-      let adUnitsLen = adUnits.length;
-      if (adUnitsLen > 15) {
-        logInfo(`Current auction ${auction.getAuctionId()} contains ${adUnitsLen} adUnits.`, adUnits);
-      }
+  if (!adUnits || adUnits.length === 0) {
+    logMessage('No adUnits configured. No bids requested.');
+    auctionDone();
+  } else {
+    const auction = auctionManager.createAuction({
+      adUnits,
+      adUnitCodes,
+      callback: auctionDone,
+      cbTimeout,
+      labels,
+      auctionId,
+      ortb2Fragments,
+      metrics,
+    });
 
-      adUnitCodes.forEach(code => targeting.setLatestAuctionForAdUnit(code, auction.getAuctionId()));
-      auction.callBids();
+    let adUnitsLen = adUnits.length;
+    if (adUnitsLen > 15) {
+      logInfo(`Current auction ${auction.getAuctionId()} contains ${adUnitsLen} adUnits.`, adUnits);
     }
-  });
+
+    adUnitCodes.forEach(code => targeting.setLatestAuctionForAdUnit(code, auction.getAuctionId()));
+    auction.callBids();
+  }
 }, 'startAuction');
 
 export function executeCallbacks(fn, reqBidsConfigObj) {
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index b8b82f7ca96..8e3314bd954 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -1615,6 +1615,19 @@ describe('Unit: Prebid Module', function () {
     });
 
     describe('returns a promise that resolves', () => {
+      function delayHook(next, ...args) {
+        setTimeout(() => next(...args))
+      }
+
+      beforeEach(() => {
+        // make sure the return value works correctly when hooks give up priority
+        $$PREBID_GLOBAL$$.requestBids.before(delayHook)
+      });
+
+      afterEach(() => {
+        $$PREBID_GLOBAL$$.requestBids.getHooks({hook: delayHook}).remove();
+      });
+
       Object.entries({
         'immediately, without bidsBackHandler': (req) => $$PREBID_GLOBAL$$.requestBids(req),
         'after bidsBackHandler': (() => {
@@ -1665,7 +1678,10 @@ describe('Unit: Prebid Module', function () {
               sinon.assert.match(bids[bid.adUnitCode].bids[0], bid)
               done();
             });
-            completeAuction([bid]);
+            // `completeAuction` won't work until we're out of `delayHook`
+            // and the mocked auction has been set up;
+            // setTimeout here takes us after the setTimeout in `delayHook`
+            setTimeout(() => completeAuction([bid]));
           })
         })
       })

From 0c5450b745454d04de96881f48fb0150a9cedc63 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 3 Nov 2022 19:55:36 +0000
Subject: [PATCH 411/569] Prebid 7.24.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7567271b07f..89f17ef1a63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.24.0-pre",
+  "version": "7.24.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 21b0f56d38f..75fffaa4cf1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.24.0-pre",
+  "version": "7.24.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From abf4688ce2005f342db86d7fe8e89c2fff05b518 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 3 Nov 2022 19:55:36 +0000
Subject: [PATCH 412/569] Increment version to 7.25.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 89f17ef1a63..48ef496ee8e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.24.0",
+  "version": "7.25.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 75fffaa4cf1..d98f313f4dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.24.0",
+  "version": "7.25.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 7487bfd79979b0fc10e5b39fe18f1b3fb9bd6861 Mon Sep 17 00:00:00 2001
From: Jeremy Sadwith <jeremy@kargo.com>
Date: Fri, 4 Nov 2022 11:09:47 -0400
Subject: [PATCH 413/569] Kargo Bid Adapter : add support for client hints
 (#9184)

* pageURL pull from topmostLocation

* Kargo: Support for client hints (#9)

* Starting SUA support

* Kargo: Adding support for client hints

* Adding tests for sua
---
 modules/kargoBidAdapter.js                | 22 ++++---
 test/spec/modules/kargoBidAdapter_spec.js | 80 +++++++++++++++++++++--
 2 files changed, 90 insertions(+), 12 deletions(-)

diff --git a/modules/kargoBidAdapter.js b/modules/kargoBidAdapter.js
index c0faf2490cb..15d706c0410 100644
--- a/modules/kargoBidAdapter.js
+++ b/modules/kargoBidAdapter.js
@@ -1,4 +1,4 @@
-import { _each, buildUrl, triggerPixel } from '../src/utils.js';
+import { _each, buildUrl, deepAccess, pick, triggerPixel } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
@@ -37,10 +37,9 @@ export const spec = {
       bidSizes[bid.bidId] = bid.sizes;
     });
 
-    let tdid;
-    if (validBidRequests.length > 0 && validBidRequests[0].userId && validBidRequests[0].userId.tdid) {
-      tdid = validBidRequests[0].userId.tdid;
-    }
+    const firstBidRequest = validBidRequests[0];
+
+    const tdid = deepAccess(firstBidRequest, 'userId.tdid')
 
     const transformedParams = Object.assign({}, {
       sessionId: spec._getSessionId(),
@@ -62,10 +61,17 @@ export const spec = {
       prebidRawBidRequests: validBidRequests
     }, spec._getAllMetadata(bidderRequest, tdid));
 
+    // User Agent Client Hints / SUA
+    const uaClientHints = deepAccess(firstBidRequest, 'ortb2.device.sua');
+    if (uaClientHints) {
+      transformedParams.device.sua = pick(uaClientHints, ['browsers', 'platform', 'mobile', 'model']);
+    }
+
     // Pull Social Canvas segments and embed URL
-    if (validBidRequests.length > 0 && validBidRequests[0].params.socialCanvas) {
-      transformedParams.socialCanvasSegments = validBidRequests[0].params.socialCanvas.segments;
-      transformedParams.socialEmbedURL = validBidRequests[0].params.socialCanvas.embedURL;
+    const socialCanvas = deepAccess(firstBidRequest, 'params.socialCanvas');
+    if (socialCanvas) {
+      transformedParams.socialCanvasSegments = socialCanvas.segments;
+      transformedParams.socialEmbedURL = socialCanvas.embedURL;
     }
 
     const encodedParams = encodeURIComponent(JSON.stringify(transformedParams));
diff --git a/test/spec/modules/kargoBidAdapter_spec.js b/test/spec/modules/kargoBidAdapter_spec.js
index 169ee520f33..565b83704fa 100644
--- a/test/spec/modules/kargoBidAdapter_spec.js
+++ b/test/spec/modules/kargoBidAdapter_spec.js
@@ -69,7 +69,33 @@ describe('kargo adapter tests', function () {
           userId: {
             tdid: 'fake-tdid'
           },
-          sizes: [[320, 50], [300, 250], [300, 600]]
+          sizes: [[320, 50], [300, 250], [300, 600]],
+          ortb2: {
+            device: {
+              sua: {
+                platform: {
+                  brand: 'macOS',
+                  version: [ '12', '6', '0' ]
+                },
+                browsers: [
+                  {
+                    brand: 'Chromium',
+                    version: [ '106', '0', '5249', '119' ]
+                  },
+                  {
+                    brand: 'Google Chrome',
+                    version: [ '106', '0', '5249', '119' ]
+                  },
+                  {
+                    brand: 'Not;A=Brand',
+                    version: [ '99', '0', '0', '0' ]
+                  }
+                ],
+                mobile: 0,
+                model: ''
+              }
+            }
+          }
         },
         {
           params: {
@@ -259,6 +285,28 @@ describe('kargo adapter tests', function () {
         device: {
           width: screen.width,
           height: screen.height,
+          sua: {
+            platform: {
+              brand: 'macOS',
+              version: [ '12', '6', '0' ]
+            },
+            browsers: [
+              {
+                brand: 'Chromium',
+                version: [ '106', '0', '5249', '119' ]
+              },
+              {
+                brand: 'Google Chrome',
+                version: [ '106', '0', '5249', '119' ]
+              },
+              {
+                brand: 'Not;A=Brand',
+                version: [ '99', '0', '0', '0' ]
+              }
+            ],
+            mobile: 0,
+            model: '',
+          },
         },
         userIDs: {
           kargoID: '5f108831-302d-11e7-bf6b-4595acd3bf6c',
@@ -280,13 +328,39 @@ describe('kargo adapter tests', function () {
         prebidRawBidRequests: [
           {
             bidId: 1,
+            ortb2: {
+              device: {
+                sua: {
+                  platform: {
+                    brand: 'macOS',
+                    version: [ '12', '6', '0' ]
+                  },
+                  browsers: [
+                    {
+                      brand: 'Chromium',
+                      version: [ '106', '0', '5249', '119' ]
+                    },
+                    {
+                      brand: 'Google Chrome',
+                      version: [ '106', '0', '5249', '119' ]
+                    },
+                    {
+                      brand: 'Not;A=Brand',
+                      version: [ '99', '0', '0', '0' ]
+                    }
+                  ],
+                  mobile: 0,
+                  model: ''
+                }
+              }
+            },
             params: {
               placementId: 'foo'
             },
             userId: {
               tdid: 'fake-tdid'
             },
-            sizes: [[320, 50], [300, 250], [300, 600]]
+            sizes: [[320, 50], [300, 250], [300, 600]],
           },
           {
             bidId: 2,
@@ -330,7 +404,6 @@ describe('kargo adapter tests', function () {
       var payload = {
         timeout: 200,
         uspConsent: '1---',
-        foo: 'bar',
         refererInfo: {
           page: 'https://www.prebid.org',
         },
@@ -349,7 +422,6 @@ describe('kargo adapter tests', function () {
       expect(request.method).to.equal('GET');
       expect(request.currency).to.equal('USD');
       expect(request.timeout).to.equal(200);
-      expect(request.foo).to.equal('bar');
       expect(krakenParams).to.deep.equal(expected);
       // Make sure session ID stays the same across requests simulating multiple auctions on one page load
       for (let i in sessionIds) {

From 475dcd2487f8d87942a0dcfbda408a5e2b1a37d5 Mon Sep 17 00:00:00 2001
From: vfourny <109095331+vfourny-ogury@users.noreply.github.com>
Date: Mon, 7 Nov 2022 14:51:17 +0100
Subject: [PATCH 414/569] adding timeline data to logging events (#9208)

---
 modules/oguryBidAdapter.js                |  7 +++--
 test/spec/modules/oguryBidAdapter_spec.js | 32 +++++++++++++++++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/modules/oguryBidAdapter.js b/modules/oguryBidAdapter.js
index cb082f2d9a9..da62ce5c0a1 100644
--- a/modules/oguryBidAdapter.js
+++ b/modules/oguryBidAdapter.js
@@ -11,7 +11,7 @@ const DEFAULT_TIMEOUT = 1000;
 const BID_HOST = 'https://mweb-hb.presage.io/api/header-bidding-request';
 const TIMEOUT_MONITORING_HOST = 'https://ms-ads-monitoring-events.presage.io';
 const MS_COOKIE_SYNC_DOMAIN = 'https://ms-cookie-sync.presage.io';
-const ADAPTER_VERSION = '1.3.0';
+const ADAPTER_VERSION = '1.4.0';
 
 function getClientWidth() {
   const documentElementClientWidth = window.top.document.documentElement.clientWidth
@@ -114,7 +114,10 @@ function buildRequests(validBidRequests, bidderRequest) {
         banner: {
           format: sizes
         },
-        ext: bidRequest.params
+        ext: {
+          ...bidRequest.params,
+          timeSpentOnPage: document.timeline && document.timeline.currentTime ? document.timeline.currentTime : 0
+        }
       });
     }
   });
diff --git a/test/spec/modules/oguryBidAdapter_spec.js b/test/spec/modules/oguryBidAdapter_spec.js
index b9e4b44b571..f7cdcc0d11a 100644
--- a/test/spec/modules/oguryBidAdapter_spec.js
+++ b/test/spec/modules/oguryBidAdapter_spec.js
@@ -244,12 +244,16 @@ describe('OguryBidAdapter', function () {
   describe('buildRequests', function () {
     const stubbedWidth = 200
     const stubbedHeight = 600
+    const stubbedCurrentTime = 1234567890
     const stubbedWidthMethod = sinon.stub(window.top.document.documentElement, 'clientWidth').get(function() {
       return stubbedWidth;
     });
     const stubbedHeightMethod = sinon.stub(window.top.document.documentElement, 'clientHeight').get(function() {
       return stubbedHeight;
     });
+    const stubbedCurrentTimeMethod = sinon.stub(document.timeline, 'currentTime').get(function() {
+      return stubbedCurrentTime;
+    });
 
     const defaultTimeout = 1000;
     const expectedRequestObject = {
@@ -266,7 +270,10 @@ describe('OguryBidAdapter', function () {
             h: 250
           }]
         },
-        ext: bidRequests[0].params
+        ext: {
+          ...bidRequests[0].params,
+          timeSpentOnPage: stubbedCurrentTime
+        }
       }, {
         id: bidRequests[1].bidId,
         tagid: bidRequests[1].params.adUnitId,
@@ -276,7 +283,10 @@ describe('OguryBidAdapter', function () {
             h: 500
           }]
         },
-        ext: bidRequests[1].params
+        ext: {
+          ...bidRequests[1].params,
+          timeSpentOnPage: stubbedCurrentTime
+        }
       }],
       regs: {
         ext: {
@@ -295,7 +305,7 @@ describe('OguryBidAdapter', function () {
       },
       ext: {
         prebidversion: '$prebid.version$',
-        adapterversion: '1.3.0'
+        adapterversion: '1.4.0'
       },
       device: {
         w: stubbedWidth,
@@ -306,6 +316,7 @@ describe('OguryBidAdapter', function () {
     after(function() {
       stubbedWidthMethod.restore();
       stubbedHeightMethod.restore();
+      stubbedCurrentTimeMethod.restore();
     });
 
     it('sends bid request to ENDPOINT via POST', function () {
@@ -316,6 +327,17 @@ describe('OguryBidAdapter', function () {
       expect(request.method).to.equal('POST');
     });
 
+    it('timeSpentOnpage should be 0 if timeline is undefined', function () {
+      const stubbedTimelineMethod = sinon.stub(document, 'timeline').get(function() {
+        return undefined;
+      });
+      const validBidRequests = utils.deepClone(bidRequests)
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data.imp[0].ext.timeSpentOnPage).to.equal(0);
+      stubbedTimelineMethod.restore();
+    });
+
     it('bid request object should be conform', function () {
       const validBidRequests = utils.deepClone(bidRequests)
 
@@ -675,7 +697,7 @@ describe('OguryBidAdapter', function () {
           advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[0].adomain
         },
         nurl: openRtbBidResponse.body.seatbid[0].bid[0].nurl,
-        adapterVersion: '1.3.0',
+        adapterVersion: '1.4.0',
         prebidVersion: '$prebid.version$'
       }, {
         requestId: openRtbBidResponse.body.seatbid[0].bid[1].impid,
@@ -692,7 +714,7 @@ describe('OguryBidAdapter', function () {
           advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[1].adomain
         },
         nurl: openRtbBidResponse.body.seatbid[0].bid[1].nurl,
-        adapterVersion: '1.3.0',
+        adapterVersion: '1.4.0',
         prebidVersion: '$prebid.version$'
       }]
 

From 2ec27435d338bd4d4ac41d39d250ad5325137f85 Mon Sep 17 00:00:00 2001
From: Aaron Price <67345931+AaronColbyPrice@users.noreply.github.com>
Date: Mon, 7 Nov 2022 06:36:21 -0800
Subject: [PATCH 415/569] eps_update_branding - Update Conversant branding to
 Epsilon (#9206)

---
 modules/conversantAnalyticsAdapter.md | 25 ++++++++++++-------------
 modules/conversantBidAdapter.md       |  6 +++---
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/modules/conversantAnalyticsAdapter.md b/modules/conversantAnalyticsAdapter.md
index 51db983a8bd..2f026cbcbb9 100644
--- a/modules/conversantAnalyticsAdapter.md
+++ b/modules/conversantAnalyticsAdapter.md
@@ -1,37 +1,36 @@
 # Overview
-- Module Name: Conversant Bidder Adapter
+- Module Name: Epsilon Analytics Adapter
 - Module Type: Analytics Adapter
-- Maintainer: mediapsr@conversantmedia.com
+- Maintainer: mediapsr@epsilon.com
 
 ## Description
 
-Analytics adapter for Conversant is used to track performance of Prebid auctions.  See the usage below for how to 
+Analytics adapter for Epsilon (formerly Conversant) is used to track performance of Prebid auctions.  See the usage below for how to 
 configure the adapter for your webpage. To enable analytics and gain access to the data publishers will need
- to contact their Conversant representative.
+ to contact their Epsilon representative (publishersupport@epsilon.com).
 
 ## Setup
 
-Before any analytics are recorded for your website you will need to have a Conversant representative turn
+Before any analytics are recorded for your website you will need to have an Epsilon representative turn
 on Prebid analytics for your website.  
 
-The simplest configuration to add Conversant Prebid analytics to your page is as follows:
+The simplest configuration to add Epsilon Prebid analytics to your page is as follows:
 
 ```
     pbjs.que.push(function() {
         pbjs.enableAnalytics({
             provider: 'conversant',
             options: {
-                site_id: '<YOUR_SITE_ID>'
+                site_id: <YOUR_SITE_ID>
             }
         })
     });
 ```
 
-Additionally the following options are supported:
+Additionally, the following options are supported:
 
-- **sampleRate**: Expects an integer from 0 to 100. By default only 50% (corresponds to a value of 50) of instances are enabled
-for Conversant Prebid Analytics. This field allows the publisher to override that percentage to sample
-at a higher or lower rate. '0' would completely disable sampling and '100' would capture every instance.
+- **cnvr_sampling**: Sample rate for analytics data. Value should be between 0 and 1 (inclusive), 0 == never sample, 
+1 == always sample, 0.5 == send analytics 50% of the time.
 
 ### Complete Example
 ```
@@ -39,8 +38,8 @@ at a higher or lower rate. '0' would completely disable sampling and '100' would
         pbjs.enableAnalytics({
             provider: 'conversant',
             options: {
-                site_id: '1234',
-                sampleRate: 90
+                site_id: 1234,
+                cnvr_sampling: 0.9
             }
         })
     });
diff --git a/modules/conversantBidAdapter.md b/modules/conversantBidAdapter.md
index 07d9abf918b..baf8b756aca 100644
--- a/modules/conversantBidAdapter.md
+++ b/modules/conversantBidAdapter.md
@@ -1,12 +1,12 @@
 # Overview
 
-- Module Name: Conversant Bidder Adapter
+- Module Name: Epsilon Bidder Adapter
 - Module Type: Bidder Adapter
-- Maintainer: mediapsr@conversantmedia.com
+- Maintainer: mediapsr@epsilon.com
 
 # Description
 
-Module that connects to Conversant's demand sources.  Supports banners and videos.
+Module that connects to Epsilon's (formerly Conversant) demand sources.  Supports banners and videos.
 
 # Test Parameters
 ```

From 40d3ae10fac6e71bf5811a1f9d657eb3184098a1 Mon Sep 17 00:00:00 2001
From: Mikhail Ivanchenko <mihail.ivanchenko@nextmillennium.io>
Date: Mon, 7 Nov 2022 23:54:10 +0300
Subject: [PATCH 416/569] NextMillennium Bid Adapter: set content-type to
 text/plain (#9210)

* add video support

* Changed content-type to text/plain
---
 modules/nextMillenniumBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index 25ad1f43e82..762c571f1e6 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -141,7 +141,7 @@ export const spec = {
         url: isTest ? TEST_ENDPOINT : ENDPOINT,
         data: JSON.stringify(postBody),
         options: {
-          contentType: 'application/json',
+          contentType: 'text/plain',
           withCredentials: true
         },
 

From e28494b80caddfc348ae91fa53c3e8406cc425da Mon Sep 17 00:00:00 2001
From: Robert Ray Martinez III <rrmartinez1552@gmail.com>
Date: Tue, 8 Nov 2022 06:21:26 -0800
Subject: [PATCH 417/569] default 1x1 size if no sizes on adUnit (#9211)

---
 modules/magniteAnalyticsAdapter.js            |  2 +-
 .../modules/magniteAnalyticsAdapter_spec.js   | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/modules/magniteAnalyticsAdapter.js b/modules/magniteAnalyticsAdapter.js
index 44666178e46..99f384e9eff 100644
--- a/modules/magniteAnalyticsAdapter.js
+++ b/modules/magniteAnalyticsAdapter.js
@@ -706,7 +706,7 @@ magniteAdapter.track = ({ eventType, args }) => {
           'code as adUnitCode',
           'transactionId',
           'mediaTypes', mediaTypes => Object.keys(mediaTypes),
-          'sizes as dimensions', sizes => sizes.map(sizeToDimensions),
+          'sizes as dimensions', sizes => (sizes || [[1, 1]]).map(sizeToDimensions),
         ]);
         ad.pbAdSlot = deepAccess(adUnit, 'ortb2Imp.ext.data.pbadslot');
         ad.pattern = deepAccess(adUnit, 'ortb2Imp.ext.data.aupname');
diff --git a/test/spec/modules/magniteAnalyticsAdapter_spec.js b/test/spec/modules/magniteAnalyticsAdapter_spec.js
index 240a5aa51a2..69fd7794ced 100644
--- a/test/spec/modules/magniteAnalyticsAdapter_spec.js
+++ b/test/spec/modules/magniteAnalyticsAdapter_spec.js
@@ -548,6 +548,26 @@ describe('magnite analytics adapter', function () {
       ]);
     });
 
+    it('should pass along 1x1 size if no sizes in adUnit', function () {
+      const auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+
+      delete auctionInit.adUnits[0].sizes;
+
+      events.emit(AUCTION_INIT, auctionInit);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BIDDER_DONE, MOCK.BIDDER_DONE);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      clock.tick(rubiConf.analyticsBatchTimeout + 1000);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      expect(message.auctions[0].adUnits[0].dimensions).to.deep.equal([
+        {
+          width: 1,
+          height: 1
+        }
+      ]);
+    });
+
     it('should pass along user ids', function () {
       let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
       auctionInit.bidderRequests[0].bids[0].userId = {

From e19b7f146162da624caebd03704237281235d702 Mon Sep 17 00:00:00 2001
From: Nayan Savla <nsavla@yieldmo.com>
Date: Tue, 8 Nov 2022 06:49:58 -0800
Subject: [PATCH 418/569] Yieldmo Bid Adapteer : add iab gvlid and update path
 (#9189)

* Add stage bidder service

* add stage url

* fix url

* fix string method

* clean up rebase

* Adding transaction id and auction id.

* Adding gvlid to Yieldmo Adapter

* Resolving linting errors

* Update yieldmoBidAdapter_spec.js

Co-authored-by: elber@yieldmo.com <elber@yieldmo.com>
Co-authored-by: Elber Carneiro <81249884+ym-elber@users.noreply.github.com>
---
 modules/yieldmoBidAdapter.js                | 30 +++++++++++++++------
 test/spec/modules/yieldmoBidAdapter_spec.js |  7 +++--
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/modules/yieldmoBidAdapter.js b/modules/yieldmoBidAdapter.js
index 892936ceea5..64ab8a87eea 100644
--- a/modules/yieldmoBidAdapter.js
+++ b/modules/yieldmoBidAdapter.js
@@ -20,12 +20,15 @@ import {find, includes} from '../src/polyfill.js';
 import {createEidsArray} from './userId/eids.js';
 
 const BIDDER_CODE = 'yieldmo';
+const GVLID = 173;
 const CURRENCY = 'USD';
 const TIME_TO_LIVE = 300;
 const NET_REVENUE = true;
-const BANNER_SERVER_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebid';
-const VIDEO_SERVER_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebidvideo';
 const PB_COOKIE_ASSIST_SYNC_ENDPOINT = `https://ads.yieldmo.com/pbcas`;
+const BANNER_PATH = '/exchange/prebid';
+const VIDEO_PATH = '/exchange/prebidvideo';
+const STAGE_DOMAIN = 'https://ads-stg.yieldmo.com';
+const PROD_DOMAIN = 'https://ads.yieldmo.com';
 const OUTSTREAM_VIDEO_PLAYER_URL = 'https://prebid-outstream.yieldmo.com/bundle.js';
 const OPENRTB_VIDEO_BIDPARAMS = ['mimes', 'startdelay', 'placement', 'startdelay', 'skipafter', 'protocols', 'api',
   'playbackmethod', 'maxduration', 'minduration', 'pos', 'skip', 'skippable'];
@@ -40,7 +43,7 @@ const BANNER_REQUEST_PROPERTIES_TO_REDUCE = ['description', 'title', 'pr', 'page
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
-
+  gvlid: GVLID,
   /**
    * Determines whether or not the given bid request is valid.
    * @param {object} bid, bid to validate
@@ -59,6 +62,9 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (bidRequests, bidderRequest) {
+    const stage = isStage(bidderRequest);
+    const bannerUrl = getAdserverUrl(BANNER_PATH, stage);
+    const videoUrl = getAdserverUrl(VIDEO_PATH, stage);
     const bannerBidRequests = bidRequests.filter(request => hasBannerMediaType(request));
     const videoBidRequests = bidRequests.filter(request => hasVideoMediaType(request));
     let serverRequests = [];
@@ -122,8 +128,8 @@ export const spec = {
         serverRequest.eids = JSON.stringify(eids);
       };
       // check if url exceeded max length
-      const url = `${BANNER_SERVER_ENDPOINT}?${parseQueryStringParameters(serverRequest)}`;
-      let extraCharacters = url.length - MAX_BANNER_REQUEST_URL_LENGTH;
+      const fullUrl = `${bannerUrl}?${parseQueryStringParameters(serverRequest)}`;
+      let extraCharacters = fullUrl.length - MAX_BANNER_REQUEST_URL_LENGTH;
       if (extraCharacters > 0) {
         for (let i = 0; i < BANNER_REQUEST_PROPERTIES_TO_REDUCE.length; i++) {
           extraCharacters = shortcutProperty(extraCharacters, serverRequest, BANNER_REQUEST_PROPERTIES_TO_REDUCE[i]);
@@ -136,7 +142,7 @@ export const spec = {
 
       serverRequests.push({
         method: 'GET',
-        url: BANNER_SERVER_ENDPOINT,
+        url: bannerUrl,
         data: serverRequest
       });
     }
@@ -148,7 +154,7 @@ export const spec = {
       };
       serverRequests.push({
         method: 'POST',
-        url: VIDEO_SERVER_ENDPOINT,
+        url: videoUrl,
         data: serverRequest
       });
     }
@@ -249,7 +255,6 @@ function addPlacement(request) {
   if (transactionId) {
     placementInfo.tid = transactionId;
   }
-
   if (request.auctionId) {
     placementInfo.auctionId = request.auctionId;
   }
@@ -676,3 +681,12 @@ function canAccessTopWindow() {
     return false;
   }
 }
+
+function isStage(bidderRequest) {
+  return !!bidderRequest.refererInfo?.referer?.includes('pb_force_a');
+}
+
+function getAdserverUrl(path, stage) {
+  const domain = stage ? STAGE_DOMAIN : PROD_DOMAIN;
+  return `${domain}${path}`;
+}
diff --git a/test/spec/modules/yieldmoBidAdapter_spec.js b/test/spec/modules/yieldmoBidAdapter_spec.js
index 32f0ead11f1..8a0ebf863dd 100644
--- a/test/spec/modules/yieldmoBidAdapter_spec.js
+++ b/test/spec/modules/yieldmoBidAdapter_spec.js
@@ -34,6 +34,7 @@ describe('YieldmoAdapter', function () {
     userId: {
       tdid: '8d146286-91d4-4958-aff4-7e489dd1abd6'
     },
+    transactionId: '54a58774-7a41-494e-9aaf-fa7b79164f0c',
     ...rootParams
   });
 
@@ -63,6 +64,7 @@ describe('YieldmoAdapter', function () {
         ...videoParams
       }
     },
+    transactionId: '54a58774-7a41-494e-8cbc-fa7b79164f0c',
     ...rootParams
   });
 
@@ -178,10 +180,9 @@ describe('YieldmoAdapter', function () {
         expect(buildAndGetPlacementInfo(bidArray)).to.equal(
           '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1,"auctionId":"1d1a030790a475"}]'
         );
-
         // multiple placements
         bidArray.push(mockBannerBid(
-          {adUnitCode: 'adunit-2', bidId: '123a', bidderRequestId: '321', auctionId: '222'}, {bidFloor: 0.2}));
+          {adUnitCode: 'adunit-2', bidId: '123a', bidderRequestId: '321', auctionId: '222', transactionId: '444'}, {bidFloor: 0.2}));
         expect(buildAndGetPlacementInfo(bidArray)).to.equal(
           '[{"placement_id":"adunit-code","callback_id":"30b31c1838de1e","sizes":[[300,250],[300,600]],"bidFloor":0.1,"auctionId":"1d1a030790a475"},' +
         '{"placement_id":"adunit-2","callback_id":"123a","sizes":[[300,250],[300,600]],"bidFloor":0.2,"auctionId":"222"}]'
@@ -193,7 +194,6 @@ describe('YieldmoAdapter', function () {
         let placementInfo = buildAndGetPlacementInfo(bidArray);
         expect(placementInfo).to.include('"ym_placement_id":"ym_1293871298"');
         expect(placementInfo).not.to.include('"ym_placement_id":"ym_0987654321"');
-
         bidArray.push(mockBannerBid({}, {placementId: 'ym_0987654321'}));
         placementInfo = buildAndGetPlacementInfo(bidArray);
         expect(placementInfo).to.include('"ym_placement_id":"ym_1293871298"');
@@ -507,7 +507,6 @@ describe('YieldmoAdapter', function () {
 
       it('should add auction id to video bid request', function() {
         const auctionId = '1d1a03073455';
-
         expect(buildAndGetData([mockVideoBid({})]).auctionId).to.deep.equal(auctionId);
       });
 

From 8e023b161a54726db4001b7fdd98fd71808952b1 Mon Sep 17 00:00:00 2001
From: dalmenarDevST <116064809+dalmenarDevST@users.noreply.github.com>
Date: Tue, 8 Nov 2022 16:08:04 +0100
Subject: [PATCH 419/569] add coppa param to payload (#9202)

---
 modules/seedtagBidAdapter.js                | 13 ++++--
 test/spec/modules/seedtagBidAdapter_spec.js | 44 ++++++++++++++++-----
 2 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/modules/seedtagBidAdapter.js b/modules/seedtagBidAdapter.js
index 5c4a3af866c..850ac5610f5 100644
--- a/modules/seedtagBidAdapter.js
+++ b/modules/seedtagBidAdapter.js
@@ -1,6 +1,7 @@
 import { isArray, _map, triggerPixel } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js'
 import { VIDEO, BANNER } from '../src/mediaTypes.js'
+import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'seedtag';
 const SEEDTAG_ALIAS = 'st';
@@ -177,7 +178,7 @@ function ttfb() {
   return ttfb >= 0 && ttfb <= performance.now() ? ttfb : 0;
 }
 
-export function getTimeoutUrl (data) {
+export function getTimeoutUrl(data) {
   let queryParams = '';
   if (
     isArray(data) && data[0] &&
@@ -235,7 +236,6 @@ export const spec = {
       if (gdprApplies !== undefined) payload['ga'] = gdprApplies;
       payload['cd'] = bidderRequest.gdprConsent.consentString;
     }
-
     if (bidderRequest.uspConsent) {
       payload['uspConsent'] = bidderRequest.uspConsent
     }
@@ -244,6 +244,11 @@ export const spec = {
       payload.schain = validBidRequests[0].schain;
     }
 
+    let coppa = config.getConfig('coppa')
+    if (coppa) {
+      payload.coppa = coppa
+    }
+
     const payloadString = JSON.stringify(payload)
     return {
       method: 'POST',
@@ -258,10 +263,10 @@ export const spec = {
    * @param {ServerResponse} serverResponse A successful response from the server.
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
-  interpretResponse: function(serverResponse) {
+  interpretResponse: function (serverResponse) {
     const serverBody = serverResponse.body;
     if (serverBody && serverBody.bids && isArray(serverBody.bids)) {
-      return _map(serverBody.bids, function(bid) {
+      return _map(serverBody.bids, function (bid) {
         return buildBidResponse(bid);
       });
     } else {
diff --git a/test/spec/modules/seedtagBidAdapter_spec.js b/test/spec/modules/seedtagBidAdapter_spec.js
index 05d609e8003..bd726bfe971 100644
--- a/test/spec/modules/seedtagBidAdapter_spec.js
+++ b/test/spec/modules/seedtagBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import { spec, getTimeoutUrl } from 'modules/seedtagBidAdapter.js';
 import * as utils from 'src/utils.js';
+import { config } from '../../../src/config.js';
 
 const PUBLISHER_ID = '0000-0000-01';
 const ADUNIT_ID = '000000';
@@ -357,6 +358,29 @@ describe('Seedtag Adapter', function () {
       });
     });
 
+    describe('COPPA param', function () {
+      it('should add COPPA param to payload when prebid config has parameter COPPA equal to true', function () {
+        config.setConfig({ coppa: true })
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.coppa).to.equal(true);
+      })
+
+      it('should not add COPPA param to payload when prebid config has parameter COPPA equal to false', function () {
+        config.setConfig({ coppa: false })
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.coppa).to.be.undefined;
+      })
+
+      it('should not add COPPA param to payload when prebid config has not parameter COPPA', function () {
+        const request = spec.buildRequests(validBidRequests, bidderRequest);
+        const data = JSON.parse(request.data);
+        expect(data.coppa).to.be.undefined;
+      })
+    })
     describe('schain param', function () {
       it('should add schain to payload when exposed on validBidRequest', function () {
         // https://github.com/prebid/Prebid.js/blob/master/modules/schain.md#sample-code-for-passing-the-schain-object
@@ -536,11 +560,11 @@ describe('Seedtag Adapter', function () {
       const timeoutUrl = getTimeoutUrl(timeoutData);
       expect(timeoutUrl).to.equal(
         'https://s.seedtag.com/se/hb/timeout?publisherToken=' +
-          params.publisherId +
-          '&adUnitId=' +
-          params.adUnitId +
-          '&timeout=' +
-          timeout
+        params.publisherId +
+        '&adUnitId=' +
+        params.adUnitId +
+        '&timeout=' +
+        timeout
       );
     });
 
@@ -552,11 +576,11 @@ describe('Seedtag Adapter', function () {
       expect(
         utils.triggerPixel.calledWith(
           'https://s.seedtag.com/se/hb/timeout?publisherToken=' +
-            params.publisherId +
-            '&adUnitId=' +
-            params.adUnitId +
-            '&timeout=' +
-            timeout
+          params.publisherId +
+          '&adUnitId=' +
+          params.adUnitId +
+          '&timeout=' +
+          timeout
         )
       ).to.equal(true);
     });

From 7046fc2effc22e6b21e7e78954b3f2d0f785554f Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 8 Nov 2022 07:21:01 -0800
Subject: [PATCH 420/569] Core & userId module: reload userIDs when GDPR
 consent changes (#9190)

---
 modules/userId/index.js                    | 36 +++++++++++++---------
 src/consentHandler.js                      | 24 ++++++++++++++-
 test/helpers/consentData.js                | 11 +++++--
 test/spec/modules/userId_spec.js           | 33 ++++++++++++++++++--
 test/spec/unit/core/consentHandler_spec.js | 34 ++++++++++++++++++++
 5 files changed, 118 insertions(+), 20 deletions(-)

diff --git a/modules/userId/index.js b/modules/userId/index.js
index 8fdd4319dfc..9e9eb5057bc 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -588,20 +588,28 @@ function idSystemInitializer({delay = GreedyPromise.timeout} = {}) {
     return gdprDataHandler.promise.finally(initMetrics.startTiming('userId.init.gdpr'));
   }
 
-  let done = cancelAndTry(
-    GreedyPromise.all([hooksReady, startInit.promise])
-      .then(timeGdpr)
-      .then(checkRefs((consentData) => {
-        initSubmodules(initModules, allModules, consentData);
-      }))
-      .then(() => startCallbacks.promise.finally(initMetrics.startTiming('userId.callbacks.pending')))
-      .then(checkRefs(() => {
-        const modWithCb = initModules.filter(item => isFn(item.callback));
-        if (modWithCb.length) {
-          return new GreedyPromise((resolve) => processSubmoduleCallbacks(modWithCb, resolve));
-        }
-      }))
-  );
+  let done = GreedyPromise.resolve();
+
+  function loadIds() {
+    done = cancelAndTry(
+      done.catch(() => null)
+        .then(() => GreedyPromise.all([hooksReady, startInit.promise]))
+        .then(timeGdpr)
+        .then(checkRefs((consentData) => {
+          initSubmodules(initModules, allModules, consentData);
+        }))
+        .then(() => startCallbacks.promise.finally(initMetrics.startTiming('userId.callbacks.pending')))
+        .then(checkRefs(() => {
+          const modWithCb = initModules.filter(item => isFn(item.callback));
+          if (modWithCb.length) {
+            return new GreedyPromise((resolve) => processSubmoduleCallbacks(modWithCb, resolve));
+          }
+        }))
+    );
+  }
+
+  loadIds();
+  gdprDataHandler.onConsentChange(loadIds);
 
   /**
    * with `ready` = true, starts initialization; with `refresh` = true, reinitialize submodules (optionally
diff --git a/src/consentHandler.js b/src/consentHandler.js
index 861a9894a2c..4a56cb4c402 100644
--- a/src/consentHandler.js
+++ b/src/consentHandler.js
@@ -1,11 +1,13 @@
-import {isStr, timestamp} from './utils.js';
+import {isStr, timestamp, deepEqual, logError} from './utils.js';
 import {defer, GreedyPromise} from './utils/promise.js';
 
 export class ConsentHandler {
   #enabled;
   #data;
+  #hasData = false;
   #defer;
   #ready;
+  #listeners;
   generatedTime;
 
   constructor() {
@@ -14,8 +16,19 @@ export class ConsentHandler {
 
   #resolve(data) {
     this.#ready = true;
+    const hasChanged = !this.#hasData || !deepEqual(this.#data, data);
     this.#data = data;
+    this.#hasData = true;
     this.#defer.resolve(data);
+    if (hasChanged) {
+      this.#listeners.forEach(cb => {
+        try {
+          cb(data)
+        } catch (e) {
+          logError(e);
+        }
+      })
+    }
   }
 
   /**
@@ -27,6 +40,15 @@ export class ConsentHandler {
     this.#data = null;
     this.#ready = false;
     this.generatedTime = null;
+    this.#listeners = [];
+  }
+
+  /**
+   * Register a callback to run each time consent data changes.
+   * @param {(consentData) => any} fn
+   */
+  onConsentChange(fn) {
+    this.#listeners.push(fn);
   }
 
   /**
diff --git a/test/helpers/consentData.js b/test/helpers/consentData.js
index c708e397bd6..841e19ffe52 100644
--- a/test/helpers/consentData.js
+++ b/test/helpers/consentData.js
@@ -2,9 +2,14 @@ import {gdprDataHandler} from 'src/adapterManager.js';
 import {GreedyPromise} from '../../src/utils/promise.js';
 
 export function mockGdprConsent(sandbox, getConsentData = () => null) {
-  sandbox.stub(gdprDataHandler, 'enabled').get(() => true)
-  sandbox.stub(gdprDataHandler, 'promise').get(() => GreedyPromise.resolve(getConsentData()));
-  sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(getConsentData)
+  const s1 = sandbox.stub(gdprDataHandler, 'enabled').get(() => true)
+  const s2 = sandbox.stub(gdprDataHandler, 'promise').get(() => GreedyPromise.resolve(getConsentData()));
+  const s3 = sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(getConsentData)
+  return function unMock() {
+    s1.restore();
+    s2.restore();
+    s3.restore();
+  }
 }
 
 beforeEach(() => {
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index f4abcc4b9f6..e4c6891b967 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -53,6 +53,8 @@ import {hook} from '../../../src/hook.js';
 import {mockGdprConsent} from '../../helpers/consentData.js';
 import {getPPID} from '../../../src/adserver.js';
 import {uninstall as uninstallGdprEnforcement} from 'modules/gdprEnforcement.js';
+import {gdprDataHandler} from '../../../src/adapterManager.js';
+import {GreedyPromise} from '../../../src/utils/promise.js';
 
 let assert = require('chai').assert;
 let expect = require('chai').expect;
@@ -149,6 +151,8 @@ describe('User ID', function () {
     localStorage.removeItem(PBJS_USER_ID_OPTOUT_NAME);
   });
 
+  let restoreGdprConsent;
+
   beforeEach(function () {
     // TODO: this whole suite needs to be redesigned; it is passing by accident
     // some tests do not pass if consent data is available
@@ -157,7 +161,7 @@ describe('User ID', function () {
     resetConsentData();
     sandbox = sinon.sandbox.create();
     consentData = null;
-    mockGdprConsent(sandbox, () => consentData);
+    restoreGdprConsent = mockGdprConsent(sandbox, () => consentData);
     coreStorage.setCookie(CONSENT_LOCAL_STORAGE_NAME, '', EXPIRED_COOKIE_DATE);
   });
 
@@ -985,6 +989,7 @@ describe('User ID', function () {
       let adUnits;
       let mockIdCallback;
       let auctionSpy;
+      let mockIdSystem;
 
       beforeEach(function () {
         sandbox = sinon.createSandbox();
@@ -998,7 +1003,7 @@ describe('User ID', function () {
 
         auctionSpy = sandbox.spy();
         mockIdCallback = sandbox.stub();
-        const mockIdSystem = {
+        mockIdSystem = {
           name: 'mockId',
           decode: function (value) {
             return {
@@ -1023,6 +1028,30 @@ describe('User ID', function () {
         sandbox.restore();
       });
 
+      it('waits for GDPR if it was enabled after userId', () => {
+        restoreGdprConsent();
+        mockIdSystem.getId = function (_, consent) {
+          if (consent?.given) {
+            return {id: {MOCKID: 'valid'}};
+          } else {
+            return {id: {MOCKID: 'invalid'}};
+          }
+        }
+        config.setConfig({
+          userSync: {
+            auctionDelay: 0,
+            userIds: [{
+              name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
+            }]
+          }
+        });
+        const consent = {given: true};
+        gdprDataHandler.setConsentData(consent);
+        return expectImmediateBidHook(auctionSpy, {adUnits}).then(() => {
+          expect(adUnits[0].bids[0].userId.mid).to.eql('valid');
+        })
+      })
+
       it('delays auction if auctionDelay is set, timing out at auction delay', function () {
         config.setConfig({
           userSync: {
diff --git a/test/spec/unit/core/consentHandler_spec.js b/test/spec/unit/core/consentHandler_spec.js
index 082ff34f90c..9d5170eb667 100644
--- a/test/spec/unit/core/consentHandler_spec.js
+++ b/test/spec/unit/core/consentHandler_spec.js
@@ -56,4 +56,38 @@ describe('Consent data handler', () => {
       })
     })
   });
+
+  it('should run onConsentChange listeners when consent data changes', () => {
+    handler.setConsentData({consent: 'data'});
+    const listener = sinon.stub();
+    handler.onConsentChange(listener);
+    handler.setConsentData({consent: 'data'});
+    sinon.assert.notCalled(listener);
+    const newConsent = {other: 'data'};
+    handler.setConsentData(newConsent);
+    sinon.assert.calledWith(listener, newConsent);
+  });
+
+  it('should not choke if listener throws', () => {
+    handler.onConsentChange(sinon.stub().throws(new Error()));
+    const listener = sinon.stub();
+    handler.onConsentChange(listener);
+    const consent = {consent: 'data'};
+    handler.setConsentData(consent);
+    sinon.assert.calledWith(listener, consent);
+  });
+
+  Object.entries({
+    'undefined': undefined,
+    'null': null
+  }).forEach(([t, val]) => {
+    it(`should run onConsentChange when consent is first set to ${t}`, () => {
+      const listener = sinon.stub();
+      handler.onConsentChange(listener);
+      handler.setConsentData(val);
+      handler.setConsentData(val);
+      sinon.assert.calledOnce(listener);
+      sinon.assert.calledWith(listener, val);
+    })
+  })
 })

From 152ca5202b1d3a3f3c4365038f3b7f7445dd8a44 Mon Sep 17 00:00:00 2001
From: mjaworskiccx <50406214+mjaworskiccx@users.noreply.github.com>
Date: Tue, 8 Nov 2022 16:57:28 +0100
Subject: [PATCH 421/569] Clickonometrics Bid Adapter : add gvlid (#9198)

* adomain support

* adomain support

* adomain support

* adomain support

* adomain support

* video params

* docs changes

* Clickonometrics adapter update
---
 modules/ccxBidAdapter.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/ccxBidAdapter.js b/modules/ccxBidAdapter.js
index 7c6b0411023..331bace7928 100644
--- a/modules/ccxBidAdapter.js
+++ b/modules/ccxBidAdapter.js
@@ -8,6 +8,7 @@ const BID_URL = 'https://delivery.clickonometrics.pl/ortb/prebid/bid'
 const SUPPORTED_VIDEO_PROTOCOLS = [2, 3, 5, 6]
 const SUPPORTED_VIDEO_MIMES = ['video/mp4', 'video/x-flv']
 const SUPPORTED_VIDEO_PLAYBACK_METHODS = [1, 2, 3, 4]
+const GVLID = 773;
 
 function _getDeviceObj () {
   let device = {}
@@ -19,8 +20,7 @@ function _getDeviceObj () {
 
 function _getSiteObj (bidderRequest) {
   let site = {}
-  // TODO: does the fallback to window.location make sense?
-  let url = bidderRequest?.refererInfo?.page || window.location.href
+  let url = bidderRequest?.refererInfo?.page
   if (url.length > 0) {
     url = url.split('?')[0]
   }
@@ -140,6 +140,7 @@ function _buildResponse (bid, currency, ttl) {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: ['banner', 'video'],
 
   isBidRequestValid: function (bid) {

From 6d114e83725b403fadd889202b449de225db7275 Mon Sep 17 00:00:00 2001
From: Chris Huie <phoenixtechnerd@gmail.com>
Date: Tue, 8 Nov 2022 09:24:06 -0700
Subject: [PATCH 422/569] Revert "Clickonometrics Bid Adapter : add gvlid
 (#9198)" (#9216)

This reverts commit 152ca5202b1d3a3f3c4365038f3b7f7445dd8a44.
---
 modules/ccxBidAdapter.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/ccxBidAdapter.js b/modules/ccxBidAdapter.js
index 331bace7928..7c6b0411023 100644
--- a/modules/ccxBidAdapter.js
+++ b/modules/ccxBidAdapter.js
@@ -8,7 +8,6 @@ const BID_URL = 'https://delivery.clickonometrics.pl/ortb/prebid/bid'
 const SUPPORTED_VIDEO_PROTOCOLS = [2, 3, 5, 6]
 const SUPPORTED_VIDEO_MIMES = ['video/mp4', 'video/x-flv']
 const SUPPORTED_VIDEO_PLAYBACK_METHODS = [1, 2, 3, 4]
-const GVLID = 773;
 
 function _getDeviceObj () {
   let device = {}
@@ -20,7 +19,8 @@ function _getDeviceObj () {
 
 function _getSiteObj (bidderRequest) {
   let site = {}
-  let url = bidderRequest?.refererInfo?.page
+  // TODO: does the fallback to window.location make sense?
+  let url = bidderRequest?.refererInfo?.page || window.location.href
   if (url.length > 0) {
     url = url.split('?')[0]
   }
@@ -140,7 +140,6 @@ function _buildResponse (bid, currency, ttl) {
 
 export const spec = {
   code: BIDDER_CODE,
-  gvlid: GVLID,
   supportedMediaTypes: ['banner', 'video'],
 
   isBidRequestValid: function (bid) {

From fe23164af37b647d561f03831027d9352495772f Mon Sep 17 00:00:00 2001
From: Brett Bloxom <38990705+BrettBlox@users.noreply.github.com>
Date: Tue, 8 Nov 2022 12:00:59 -0700
Subject: [PATCH 423/569] Concert Bid Adapter: Update localStorage name-spacing
 for Concert UID (#9158)

* collect EIDs for bid request

* add ad slot positioning to payload

* RPO-2012: Update local storage name-spacing for c_uid (#8)

* Updates c_uid namespacing to be more specific for concert

* fixes unit tests

* remove console.log

* RPO-2012: Add check for shared id (#9)

* Adds check for sharedId

* Updates cookie name

* remove trailing comma

Co-authored-by: antoin <antoin.campbell@voxmedia.com>
Co-authored-by: Antoin <antoinfive@gmail.com>
---
 modules/concertBidAdapter.js                | 20 ++++++++--
 test/spec/modules/concertBidAdapter_spec.js | 41 +++++++++++++--------
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/modules/concertBidAdapter.js b/modules/concertBidAdapter.js
index 620e77a5a08..dcea60d5231 100644
--- a/modules/concertBidAdapter.js
+++ b/modules/concertBidAdapter.js
@@ -1,4 +1,4 @@
-import { logWarn, logMessage, debugTurnedOn, generateUUID } from '../src/utils.js';
+import { logWarn, logMessage, debugTurnedOn, generateUUID, deepAccess } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { hasPurpose1Consent } from '../src/utils/gpdr.js';
@@ -178,7 +178,7 @@ export const spec = {
 
 registerBidder(spec);
 
-const storage = getStorageManager({bidderCode: BIDDER_CODE});
+export const storage = getStorageManager({bidderCode: BIDDER_CODE});
 
 /**
  * Check or generate a UID for the current user.
@@ -188,10 +188,24 @@ function getUid(bidderRequest) {
     return false;
   }
 
-  const CONCERT_UID_KEY = 'c_uid';
+  const sharedId = deepAccess(bidderRequest, 'userId._sharedid.id');
 
+  if (sharedId) {
+    return sharedId;
+  }
+
+  const LEGACY_CONCERT_UID_KEY = 'c_uid';
+  const CONCERT_UID_KEY = 'vmconcert_uid';
+
+  const legacyUid = storage.getDataFromLocalStorage(LEGACY_CONCERT_UID_KEY);
   let uid = storage.getDataFromLocalStorage(CONCERT_UID_KEY);
 
+  if (legacyUid) {
+    uid = legacyUid;
+    storage.setDataInLocalStorage(CONCERT_UID_KEY, uid);
+    storage.removeDataFromLocalStorage(LEGACY_CONCERT_UID_KEY);
+  }
+
   if (!uid) {
     uid = generateUUID();
     storage.setDataInLocalStorage(CONCERT_UID_KEY, uid);
diff --git a/test/spec/modules/concertBidAdapter_spec.js b/test/spec/modules/concertBidAdapter_spec.js
index 10ea997b304..00626472ecb 100644
--- a/test/spec/modules/concertBidAdapter_spec.js
+++ b/test/spec/modules/concertBidAdapter_spec.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import sinon from 'sinon';
-import { spec } from 'modules/concertBidAdapter.js';
-import { getStorageManager } from '../../../src/storageManager.js'
+import { spec, storage } from 'modules/concertBidAdapter.js';
+import { hook } from 'src/hook.js';
 
 describe('ConcertAdapter', function () {
   let bidRequests;
@@ -10,9 +10,8 @@ describe('ConcertAdapter', function () {
   let element;
   let sandbox;
 
-  afterEach(function () {
-    $$PREBID_GLOBAL$$.bidderSettings = {};
-    sandbox.restore();
+  before(function () {
+    hook.ready();
   });
 
   beforeEach(function () {
@@ -39,6 +38,7 @@ describe('ConcertAdapter', function () {
         storageAllowed: true
       }
     };
+
     bidRequests = [
       {
         bidder: 'concert',
@@ -83,6 +83,11 @@ describe('ConcertAdapter', function () {
     sandbox.stub(document, 'getElementById').withArgs('desktop_leaderboard_variable').returns(element)
   });
 
+  afterEach(function () {
+    $$PREBID_GLOBAL$$.bidderSettings = {};
+    sandbox.restore();
+  });
+
   describe('spec.isBidRequestValid', function() {
     it('should return when it recieved all the required params', function() {
       const bid = bidRequests[0];
@@ -118,7 +123,6 @@ describe('ConcertAdapter', function () {
     });
 
     it('should not generate uid if the user has opted out', function() {
-      const storage = getStorageManager();
       storage.setDataInLocalStorage('c_nap', 'true');
       const request = spec.buildRequests(bidRequests, bidRequest);
       const payload = JSON.parse(request.data);
@@ -127,7 +131,6 @@ describe('ConcertAdapter', function () {
     });
 
     it('should generate uid if the user has not opted out', function() {
-      const storage = getStorageManager();
       storage.removeDataFromLocalStorage('c_nap');
       const request = spec.buildRequests(bidRequests, bidRequest);
       const payload = JSON.parse(request.data);
@@ -135,9 +138,22 @@ describe('ConcertAdapter', function () {
       expect(payload.meta.uid).to.not.equal(false);
     });
 
-    it('should grab uid from local storage if it exists', function() {
-      const storage = getStorageManager();
-      storage.setDataInLocalStorage('c_uid', 'foo');
+    it('should use sharedid if it exists', function() {
+      storage.removeDataFromLocalStorage('c_nap');
+      const request = spec.buildRequests(bidRequests, {
+        ...bidRequest,
+        userId: {
+          _sharedid: {
+            id: '123abc'
+          }
+        }
+      });
+      const payload = JSON.parse(request.data);
+      expect(payload.meta.uid).to.equal('123abc');
+    })
+
+    it('should grab uid from local storage if it exists and sharedid does not', function() {
+      storage.setDataInLocalStorage('vmconcert_uid', 'foo');
       storage.removeDataFromLocalStorage('c_nap');
       const request = spec.buildRequests(bidRequests, bidRequest);
       const payload = JSON.parse(request.data);
@@ -211,7 +227,6 @@ describe('ConcertAdapter', function () {
       const opts = {
         iframeEnabled: true
       };
-      const storage = getStorageManager();
       storage.setDataInLocalStorage('c_nap', 'true');
 
       const sync = spec.getUserSyncs(opts, [], bidRequest.gdprConsent, bidRequest.uspConsent);
@@ -222,7 +237,6 @@ describe('ConcertAdapter', function () {
       const opts = {
         iframeEnabled: true
       };
-      const storage = getStorageManager();
       storage.removeDataFromLocalStorage('c_nap');
 
       bidRequest.gdprConsent = {
@@ -237,7 +251,6 @@ describe('ConcertAdapter', function () {
       const opts = {
         iframeEnabled: true
       };
-      const storage = getStorageManager();
       storage.removeDataFromLocalStorage('c_nap');
 
       bidRequest.gdprConsent = {
@@ -252,7 +265,6 @@ describe('ConcertAdapter', function () {
       const opts = {
         iframeEnabled: true
       };
-      const storage = getStorageManager();
       storage.removeDataFromLocalStorage('c_nap');
 
       bidRequest.gdprConsent = {
@@ -268,7 +280,6 @@ describe('ConcertAdapter', function () {
       const opts = {
         iframeEnabled: true
       };
-      const storage = getStorageManager();
       storage.removeDataFromLocalStorage('c_nap');
 
       bidRequest.gdprConsent = {

From c018b183948696e8873989b9e239134b157a8f3d Mon Sep 17 00:00:00 2001
From: Olivier <osazos@adagio.io>
Date: Wed, 9 Nov 2022 15:44:24 +0100
Subject: [PATCH 424/569] adagioBidAdapter: fix Video Ortb placement param
 validation (#9218)

---
 modules/adagioBidAdapter.js                | 2 +-
 test/spec/modules/adagioBidAdapter_spec.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index e59fd341bae..8dcd95f933b 100644
--- a/modules/adagioBidAdapter.js
+++ b/modules/adagioBidAdapter.js
@@ -59,7 +59,7 @@ export const ORTB_VIDEO_PARAMS = {
   'w': (value) => isInteger(value),
   'h': (value) => isInteger(value),
   'startdelay': (value) => isInteger(value),
-  'placement': (value) => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5].indexOf(v) !== -1),
+  'placement': (value) => [1, 2, 3, 4, 5].indexOf(value) !== -1,
   'linearity': (value) => [1, 2].indexOf(value) !== -1,
   'skip': (value) => [0, 1].indexOf(value) !== -1,
   'skipmin': (value) => isInteger(value),
diff --git a/test/spec/modules/adagioBidAdapter_spec.js b/test/spec/modules/adagioBidAdapter_spec.js
index e2fde8ff2e3..436d481c4a1 100644
--- a/test/spec/modules/adagioBidAdapter_spec.js
+++ b/test/spec/modules/adagioBidAdapter_spec.js
@@ -400,7 +400,7 @@ describe('Adagio bid adapter', () => {
             skipafter: 4,
             minduration: 10,
             maxduration: 30,
-            placement: [3],
+            placement: 3,
             protocols: [8]
           }
         }).build();
@@ -415,7 +415,7 @@ describe('Adagio bid adapter', () => {
           skipafter: 4,
           minduration: 10,
           maxduration: 30,
-          placement: [3],
+          placement: 3,
           protocols: [8],
           w: 300,
           h: 250

From 5e7ace9e3f499124181f1adddcd19a3488063f2a Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Wed, 9 Nov 2022 10:25:18 -0800
Subject: [PATCH 425/569] Revert "Core & userId module: reload userIDs when
 GDPR consent changes (#9190)" (#9225)

This reverts commit 7046fc2effc22e6b21e7e78954b3f2d0f785554f.
---
 modules/userId/index.js                    | 36 +++++++++-------------
 src/consentHandler.js                      | 24 +--------------
 test/helpers/consentData.js                | 11 ++-----
 test/spec/modules/userId_spec.js           | 33 ++------------------
 test/spec/unit/core/consentHandler_spec.js | 34 --------------------
 5 files changed, 20 insertions(+), 118 deletions(-)

diff --git a/modules/userId/index.js b/modules/userId/index.js
index 9e9eb5057bc..8fdd4319dfc 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -588,28 +588,20 @@ function idSystemInitializer({delay = GreedyPromise.timeout} = {}) {
     return gdprDataHandler.promise.finally(initMetrics.startTiming('userId.init.gdpr'));
   }
 
-  let done = GreedyPromise.resolve();
-
-  function loadIds() {
-    done = cancelAndTry(
-      done.catch(() => null)
-        .then(() => GreedyPromise.all([hooksReady, startInit.promise]))
-        .then(timeGdpr)
-        .then(checkRefs((consentData) => {
-          initSubmodules(initModules, allModules, consentData);
-        }))
-        .then(() => startCallbacks.promise.finally(initMetrics.startTiming('userId.callbacks.pending')))
-        .then(checkRefs(() => {
-          const modWithCb = initModules.filter(item => isFn(item.callback));
-          if (modWithCb.length) {
-            return new GreedyPromise((resolve) => processSubmoduleCallbacks(modWithCb, resolve));
-          }
-        }))
-    );
-  }
-
-  loadIds();
-  gdprDataHandler.onConsentChange(loadIds);
+  let done = cancelAndTry(
+    GreedyPromise.all([hooksReady, startInit.promise])
+      .then(timeGdpr)
+      .then(checkRefs((consentData) => {
+        initSubmodules(initModules, allModules, consentData);
+      }))
+      .then(() => startCallbacks.promise.finally(initMetrics.startTiming('userId.callbacks.pending')))
+      .then(checkRefs(() => {
+        const modWithCb = initModules.filter(item => isFn(item.callback));
+        if (modWithCb.length) {
+          return new GreedyPromise((resolve) => processSubmoduleCallbacks(modWithCb, resolve));
+        }
+      }))
+  );
 
   /**
    * with `ready` = true, starts initialization; with `refresh` = true, reinitialize submodules (optionally
diff --git a/src/consentHandler.js b/src/consentHandler.js
index 4a56cb4c402..861a9894a2c 100644
--- a/src/consentHandler.js
+++ b/src/consentHandler.js
@@ -1,13 +1,11 @@
-import {isStr, timestamp, deepEqual, logError} from './utils.js';
+import {isStr, timestamp} from './utils.js';
 import {defer, GreedyPromise} from './utils/promise.js';
 
 export class ConsentHandler {
   #enabled;
   #data;
-  #hasData = false;
   #defer;
   #ready;
-  #listeners;
   generatedTime;
 
   constructor() {
@@ -16,19 +14,8 @@ export class ConsentHandler {
 
   #resolve(data) {
     this.#ready = true;
-    const hasChanged = !this.#hasData || !deepEqual(this.#data, data);
     this.#data = data;
-    this.#hasData = true;
     this.#defer.resolve(data);
-    if (hasChanged) {
-      this.#listeners.forEach(cb => {
-        try {
-          cb(data)
-        } catch (e) {
-          logError(e);
-        }
-      })
-    }
   }
 
   /**
@@ -40,15 +27,6 @@ export class ConsentHandler {
     this.#data = null;
     this.#ready = false;
     this.generatedTime = null;
-    this.#listeners = [];
-  }
-
-  /**
-   * Register a callback to run each time consent data changes.
-   * @param {(consentData) => any} fn
-   */
-  onConsentChange(fn) {
-    this.#listeners.push(fn);
   }
 
   /**
diff --git a/test/helpers/consentData.js b/test/helpers/consentData.js
index 841e19ffe52..c708e397bd6 100644
--- a/test/helpers/consentData.js
+++ b/test/helpers/consentData.js
@@ -2,14 +2,9 @@ import {gdprDataHandler} from 'src/adapterManager.js';
 import {GreedyPromise} from '../../src/utils/promise.js';
 
 export function mockGdprConsent(sandbox, getConsentData = () => null) {
-  const s1 = sandbox.stub(gdprDataHandler, 'enabled').get(() => true)
-  const s2 = sandbox.stub(gdprDataHandler, 'promise').get(() => GreedyPromise.resolve(getConsentData()));
-  const s3 = sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(getConsentData)
-  return function unMock() {
-    s1.restore();
-    s2.restore();
-    s3.restore();
-  }
+  sandbox.stub(gdprDataHandler, 'enabled').get(() => true)
+  sandbox.stub(gdprDataHandler, 'promise').get(() => GreedyPromise.resolve(getConsentData()));
+  sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(getConsentData)
 }
 
 beforeEach(() => {
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index e4c6891b967..f4abcc4b9f6 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -53,8 +53,6 @@ import {hook} from '../../../src/hook.js';
 import {mockGdprConsent} from '../../helpers/consentData.js';
 import {getPPID} from '../../../src/adserver.js';
 import {uninstall as uninstallGdprEnforcement} from 'modules/gdprEnforcement.js';
-import {gdprDataHandler} from '../../../src/adapterManager.js';
-import {GreedyPromise} from '../../../src/utils/promise.js';
 
 let assert = require('chai').assert;
 let expect = require('chai').expect;
@@ -151,8 +149,6 @@ describe('User ID', function () {
     localStorage.removeItem(PBJS_USER_ID_OPTOUT_NAME);
   });
 
-  let restoreGdprConsent;
-
   beforeEach(function () {
     // TODO: this whole suite needs to be redesigned; it is passing by accident
     // some tests do not pass if consent data is available
@@ -161,7 +157,7 @@ describe('User ID', function () {
     resetConsentData();
     sandbox = sinon.sandbox.create();
     consentData = null;
-    restoreGdprConsent = mockGdprConsent(sandbox, () => consentData);
+    mockGdprConsent(sandbox, () => consentData);
     coreStorage.setCookie(CONSENT_LOCAL_STORAGE_NAME, '', EXPIRED_COOKIE_DATE);
   });
 
@@ -989,7 +985,6 @@ describe('User ID', function () {
       let adUnits;
       let mockIdCallback;
       let auctionSpy;
-      let mockIdSystem;
 
       beforeEach(function () {
         sandbox = sinon.createSandbox();
@@ -1003,7 +998,7 @@ describe('User ID', function () {
 
         auctionSpy = sandbox.spy();
         mockIdCallback = sandbox.stub();
-        mockIdSystem = {
+        const mockIdSystem = {
           name: 'mockId',
           decode: function (value) {
             return {
@@ -1028,30 +1023,6 @@ describe('User ID', function () {
         sandbox.restore();
       });
 
-      it('waits for GDPR if it was enabled after userId', () => {
-        restoreGdprConsent();
-        mockIdSystem.getId = function (_, consent) {
-          if (consent?.given) {
-            return {id: {MOCKID: 'valid'}};
-          } else {
-            return {id: {MOCKID: 'invalid'}};
-          }
-        }
-        config.setConfig({
-          userSync: {
-            auctionDelay: 0,
-            userIds: [{
-              name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
-            }]
-          }
-        });
-        const consent = {given: true};
-        gdprDataHandler.setConsentData(consent);
-        return expectImmediateBidHook(auctionSpy, {adUnits}).then(() => {
-          expect(adUnits[0].bids[0].userId.mid).to.eql('valid');
-        })
-      })
-
       it('delays auction if auctionDelay is set, timing out at auction delay', function () {
         config.setConfig({
           userSync: {
diff --git a/test/spec/unit/core/consentHandler_spec.js b/test/spec/unit/core/consentHandler_spec.js
index 9d5170eb667..082ff34f90c 100644
--- a/test/spec/unit/core/consentHandler_spec.js
+++ b/test/spec/unit/core/consentHandler_spec.js
@@ -56,38 +56,4 @@ describe('Consent data handler', () => {
       })
     })
   });
-
-  it('should run onConsentChange listeners when consent data changes', () => {
-    handler.setConsentData({consent: 'data'});
-    const listener = sinon.stub();
-    handler.onConsentChange(listener);
-    handler.setConsentData({consent: 'data'});
-    sinon.assert.notCalled(listener);
-    const newConsent = {other: 'data'};
-    handler.setConsentData(newConsent);
-    sinon.assert.calledWith(listener, newConsent);
-  });
-
-  it('should not choke if listener throws', () => {
-    handler.onConsentChange(sinon.stub().throws(new Error()));
-    const listener = sinon.stub();
-    handler.onConsentChange(listener);
-    const consent = {consent: 'data'};
-    handler.setConsentData(consent);
-    sinon.assert.calledWith(listener, consent);
-  });
-
-  Object.entries({
-    'undefined': undefined,
-    'null': null
-  }).forEach(([t, val]) => {
-    it(`should run onConsentChange when consent is first set to ${t}`, () => {
-      const listener = sinon.stub();
-      handler.onConsentChange(listener);
-      handler.setConsentData(val);
-      handler.setConsentData(val);
-      sinon.assert.calledOnce(listener);
-      sinon.assert.calledWith(listener, val);
-    })
-  })
 })

From a64c8c0a2b549ce2daeac231ecaaced85633301e Mon Sep 17 00:00:00 2001
From: pm-azhar-mulla <75726247+pm-azhar-mulla@users.noreply.github.com>
Date: Thu, 10 Nov 2022 12:52:40 +0530
Subject: [PATCH 426/569] PubMatic Bid Adapter: convert bid cpm to float
 (#9219)

* Convert cpm to float

* modified test case

Co-authored-by: pm-azhar-mulla <azhar@L1119.local>
---
 modules/pubmaticBidAdapter.js                | 2 +-
 test/spec/modules/pubmaticBidAdapter_spec.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index 9e2d2bc55f8..296a4314ac8 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -1254,7 +1254,7 @@ export const spec = {
             seatbidder.bid.forEach(bid => {
               let newBid = {
                 requestId: bid.impid,
-                cpm: (parseFloat(bid.price) || 0).toFixed(2),
+                cpm: parseFloat((bid.price || 0).toFixed(2)),
                 width: bid.w,
                 height: bid.h,
                 creativeId: bid.crid || bid.id,
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
index 13b4e31b5c7..6b240cb2d06 100644
--- a/test/spec/modules/pubmaticBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -3406,7 +3406,7 @@ describe('PubMatic adapter', function () {
         let response = spec.interpretResponse(bidResponses, request);
         expect(response).to.be.an('array').with.length.above(0);
         expect(response[0].requestId).to.equal(bidResponses.body.seatbid[0].bid[0].impid);
-        expect(response[0].cpm).to.equal((bidResponses.body.seatbid[0].bid[0].price).toFixed(2));
+        expect(response[0].cpm).to.equal(parseFloat((bidResponses.body.seatbid[0].bid[0].price).toFixed(2)));
         expect(response[0].width).to.equal(bidResponses.body.seatbid[0].bid[0].w);
         expect(response[0].height).to.equal(bidResponses.body.seatbid[0].bid[0].h);
         if (bidResponses.body.seatbid[0].bid[0].crid) {
@@ -3430,7 +3430,7 @@ describe('PubMatic adapter', function () {
         expect(response[0].partnerImpId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
 
         expect(response[1].requestId).to.equal(bidResponses.body.seatbid[1].bid[0].impid);
-        expect(response[1].cpm).to.equal((bidResponses.body.seatbid[1].bid[0].price).toFixed(2));
+        expect(response[1].cpm).to.equal(parseFloat((bidResponses.body.seatbid[1].bid[0].price).toFixed(2)));
         expect(response[1].width).to.equal(bidResponses.body.seatbid[1].bid[0].w);
         expect(response[1].height).to.equal(bidResponses.body.seatbid[1].bid[0].h);
         if (bidResponses.body.seatbid[1].bid[0].crid) {

From 4082e8ad23a99ed23f4775322988d21afca5de34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Udi=20Talias=20=E2=9A=9B=EF=B8=8F?= <udi.talias@gmail.com>
Date: Thu, 10 Nov 2022 09:51:40 +0200
Subject: [PATCH 427/569] Vidazoo Bid Adapter: cache optimizations (#9209)

* feat(module): multi size request

* fix getUserSyncs
added tests

* update(module): package-lock.json from master

* feat(module): VidazooBidAdapter - send top query params to server

* feat(module): vidazoo bid adapter - added performance optimization

Co-authored-by: roman <shmoop207@gmail.com>
Co-authored-by: Saar Amrani <89377180+saar120@users.noreply.github.com>
Co-authored-by: Saar Amrani <saar120@gmail.com>
---
 modules/vidazooBidAdapter.js                | 15 ++++++++++++++-
 test/spec/modules/vidazooBidAdapter_spec.js |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index 195851ad23a..fa44bde74f1 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -12,6 +12,7 @@ const TTL_SECONDS = 60 * 5;
 const DEAL_ID_EXPIRY = 1000 * 60 * 15;
 const UNIQUE_DEAL_ID_EXPIRY = 1000 * 60 * 60;
 const SESSION_ID_KEY = 'vidSid';
+const OPT_CACHE_KEY = 'vdzwopt';
 export const SUPPORTED_ID_SYSTEMS = {
   'britepoolid': 1,
   'criteoId': 1,
@@ -66,6 +67,7 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
   const cId = extractCID(params);
   const pId = extractPID(params);
   const subDomain = extractSubDomain(params);
+  const ptrace = getCacheOpt();
 
   let data = {
     url: encodeURIComponent(topWindowUrl),
@@ -83,7 +85,8 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
     bidderVersion: BIDDER_VERSION,
     prebidVersion: '$prebid.version$',
     res: `${screen.width}x${screen.height}`,
-    schain: schain
+    schain: schain,
+    ptrace: ptrace
   };
 
   appendUserIdsToRequestPayload(data, userId);
@@ -258,6 +261,16 @@ export function getVidazooSessionId() {
   return getStorageItem(SESSION_ID_KEY) || '';
 }
 
+export function getCacheOpt() {
+  let data = storage.getDataFromLocalStorage(OPT_CACHE_KEY);
+  if (!data) {
+    data = String(Date.now());
+    storage.setDataInLocalStorage(OPT_CACHE_KEY, data);
+  }
+
+  return data;
+}
+
 export function getStorageItem(key) {
   try {
     return tryParseJSON(storage.getDataFromLocalStorage(key));
diff --git a/test/spec/modules/vidazooBidAdapter_spec.js b/test/spec/modules/vidazooBidAdapter_spec.js
index d30b9f31417..856ceaf438d 100644
--- a/test/spec/modules/vidazooBidAdapter_spec.js
+++ b/test/spec/modules/vidazooBidAdapter_spec.js
@@ -182,6 +182,7 @@ describe('VidazooBidAdapter', function () {
           bidderVersion: adapter.version,
           prebidVersion: version,
           schain: BID.schain,
+          ptrace: '1000',
           res: `${window.top.screen.width}x${window.top.screen.height}`,
           uqs: getTopWindowQueryParams(),
           'ext.param1': 'loremipsum',

From 31b070cfb71394dd2c3a00c774af55d7f255a741 Mon Sep 17 00:00:00 2001
From: azuryo <108641852+azuryo@users.noreply.github.com>
Date: Thu, 10 Nov 2022 23:20:56 +0900
Subject: [PATCH 428/569] Microad Bid Adapter: Support Audience ID Ext and
 UID2.0 (#9157)

* Microad Bid Adapter: Support ext params

* Microad Bid Adapter: Support Unified ID 2.0

* Microad bid Adapter: Add source
---
 modules/microadBidAdapter.js                | 33 +++++++++-----
 test/spec/modules/microadBidAdapter_spec.js | 48 +++++++++++++++++++++
 2 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/modules/microadBidAdapter.js b/modules/microadBidAdapter.js
index 1b31000df43..13aea0f3f77 100644
--- a/modules/microadBidAdapter.js
+++ b/modules/microadBidAdapter.js
@@ -1,4 +1,5 @@
-import { deepAccess, isEmpty, isStr } from '../src/utils.js';
+import { deepAccess, isArray, isEmpty, isStr } from '../src/utils.js';
+import { find } from '../src/polyfill.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
@@ -24,15 +25,16 @@ const NATIVE_CODE = 2;
 const VIDEO_CODE = 4;
 
 const AUDIENCE_IDS = [
-  {type: 6, bidKey: 'userId.imuid'},
-  {type: 8, bidKey: 'userId.id5id.uid'},
-  {type: 9, bidKey: 'userId.tdid'},
-  {type: 10, bidKey: 'userId.novatiq.snowflake'},
-  {type: 11, bidKey: 'userId.parrableId.eid'},
-  {type: 12, bidKey: 'userId.dacId.id'},
-  {type: 13, bidKey: 'userId.idl_env'},
-  {type: 14, bidKey: 'userId.criteoId'},
-  {type: 15, bidKey: 'userId.pubcid'}
+  {type: 6, bidKey: 'userId.imuid', source: 'intimatemerger.com'},
+  {type: 8, bidKey: 'userId.id5id.uid', source: 'id5-sync.com'},
+  {type: 9, bidKey: 'userId.tdid', source: 'adserver.org'},
+  {type: 10, bidKey: 'userId.novatiq.snowflake', source: 'novatiq.com'},
+  {type: 11, bidKey: 'userId.parrableId.eid', source: 'parrable.com'},
+  {type: 12, bidKey: 'userId.dacId.id', source: 'dac.co.jp'},
+  {type: 13, bidKey: 'userId.idl_env', source: 'liveramp.com'},
+  {type: 14, bidKey: 'userId.criteoId', source: 'criteo.com'},
+  {type: 15, bidKey: 'userId.pubcid', source: 'pubcid.org'},
+  {type: 17, bidKey: 'userId.uid2.id', source: 'uidapi.com'}
 ];
 
 function createCBT() {
@@ -100,10 +102,19 @@ export const spec = {
       }
 
       const aidsParams = []
+      const userIdAsEids = bid.userIdAsEids;
       AUDIENCE_IDS.forEach((audienceId) => {
         const bidAudienceId = deepAccess(bid, audienceId.bidKey);
         if (!isEmpty(bidAudienceId) && isStr(bidAudienceId)) {
-          aidsParams.push({ type: audienceId.type, id: bidAudienceId });
+          const aidParam = { type: audienceId.type, id: bidAudienceId };
+          // Set ext
+          if (isArray(userIdAsEids)) {
+            const targetEid = find(userIdAsEids, (eid) => eid.source === audienceId.source) || {};
+            if (!isEmpty(deepAccess(targetEid, 'uids.0.ext'))) {
+              aidParam.ext = targetEid.uids[0].ext;
+            }
+          }
+          aidsParams.push(aidParam);
           // Set Ramp ID
           if (audienceId.type === 13) params['idl_env'] = bidAudienceId;
         }
diff --git a/test/spec/modules/microadBidAdapter_spec.js b/test/spec/modules/microadBidAdapter_spec.js
index cca337c83f2..98edfce20bc 100644
--- a/test/spec/modules/microadBidAdapter_spec.js
+++ b/test/spec/modules/microadBidAdapter_spec.js
@@ -330,6 +330,54 @@ describe('microadBidAdapter', () => {
         })
       })
     })
+
+    Object.entries({
+      'ID5 ID': {
+        userId: {id5id: {uid: 'id5id-sample'}},
+        userIdAsEids: [
+          {
+            source: 'id5-sync.com',
+            uids: [{id: 'id5id-sample', aType: 1, ext: {linkType: 2, abTestingControlGroup: false}}]
+          }
+        ],
+        expected: {
+          aids: JSON.stringify([{type: 8, id: 'id5id-sample', ext: {linkType: 2, abTestingControlGroup: false}}])
+        }
+      },
+      'Unified ID': {
+        userId: {tdid: 'unified-sample'},
+        userIdAsEids: [
+          {
+            source: 'adserver.org',
+            uids: [{id: 'unified-sample', aType: 1, ext: {rtiPartner: 'TDID'}}]
+          }
+        ],
+        expected: {aids: JSON.stringify([{type: 9, id: 'unified-sample', ext: {rtiPartner: 'TDID'}}])}
+      },
+      'not add': {
+        userId: {id5id: {uid: 'id5id-sample'}},
+        userIdAsEids: [],
+        expected: {
+          aids: JSON.stringify([{type: 8, id: 'id5id-sample'}])
+        }
+      }
+    }).forEach(([test, arg]) => {
+      it(`should ${test} ext if it is available in request parameters`, () => {
+        const bidRequestWithUserId = {
+          ...bidRequestTemplate,
+          userId: arg.userId,
+          userIdAsEids: arg.userIdAsEids
+        }
+        const requests = spec.buildRequests([bidRequestWithUserId], bidderRequest)
+        requests.forEach((request) => {
+          expect(request.data).to.deep.equal({
+            ...expectedResultTemplate,
+            cbt: request.data.cbt,
+            ...arg.expected
+          })
+        })
+      });
+    })
   });
 
   describe('interpretResponse', () => {

From db0c7f9993911d5808d348b07eb22e822d807db5 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 10 Nov 2022 21:23:46 +0000
Subject: [PATCH 429/569] Prebid 7.25.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 48ef496ee8e..7c8b7ac89b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.25.0-pre",
+  "version": "7.25.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index d98f313f4dc..685e9bd892d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.25.0-pre",
+  "version": "7.25.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 056ec5e1f7df55f412e0d040270e77f859a32ae3 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 10 Nov 2022 21:23:46 +0000
Subject: [PATCH 430/569] Increment version to 7.26.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7c8b7ac89b8..462484cb962 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.25.0",
+  "version": "7.26.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 685e9bd892d..8df1268bbd2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.25.0",
+  "version": "7.26.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 25b46f92490d5e13376632836020cebdbdd1e459 Mon Sep 17 00:00:00 2001
From: nkloeber <100145701+nkloeber@users.noreply.github.com>
Date: Fri, 11 Nov 2022 14:25:25 +0100
Subject: [PATCH 431/569] Add support for additional content signals under the
 iab_content (#9235)

---
 modules/yieldlabBidAdapter.js                |  27 ++--
 test/spec/modules/yieldlabBidAdapter_spec.js | 125 +++++++++++++++++++
 2 files changed, 144 insertions(+), 8 deletions(-)

diff --git a/modules/yieldlabBidAdapter.js b/modules/yieldlabBidAdapter.js
index e5e452b4ce0..e6758e78022 100644
--- a/modules/yieldlabBidAdapter.js
+++ b/modules/yieldlabBidAdapter.js
@@ -370,21 +370,32 @@ function getContentObject(bid) {
 }
 
 /**
- * Creates a string for iab_content object
+ * Creates a string for iab_content object by
+ * 1. flatten the iab content object
+ * 2. encoding the values
+ * 3. joining array of defined keys ('keyword', 'cat') into one value seperated with '|'
+ * 4. encoding the whole string
  * @param {Object} iabContent
  * @returns {String}
  */
 function createIabContentString(iabContent) {
   const arrKeys = ['keywords', 'cat']
   const str = []
-  for (const key in iabContent) {
-    if (iabContent.hasOwnProperty(key)) {
-      const value = (arrKeys.indexOf(key) !== -1 && Array.isArray(iabContent[key]))
-        ? iabContent[key].map(node => encodeURIComponent(node)).join('|') : encodeURIComponent(iabContent[key])
-      str.push(''.concat(key, ':', value))
+  const transformObjToParam = (obj = {}, extraKey = '') => {
+    for (const key in obj) {
+      if ((arrKeys.indexOf(key) !== -1 && Array.isArray(obj[key]))) {
+        // Array of defined keyword which have to be joined into one value from "key: [value1, value2, value3]" to "key:value1|value2|value3"
+        str.push(''.concat(key, ':', obj[key].map(node => encodeURIComponent(node)).join('|')))
+      } else if (typeof obj[key] !== 'object') {
+        str.push(''.concat(extraKey + key, ':', encodeURIComponent(obj[key])))
+      } else {
+        // Object has to be further flattened
+        transformObjToParam(obj[key], ''.concat(extraKey, key, '.'));
+      }
     }
-  }
-  return encodeURIComponent(str.join(','))
+    return str.join(',');
+  };
+  return encodeURIComponent(transformObjToParam(iabContent))
 }
 
 /**
diff --git a/test/spec/modules/yieldlabBidAdapter_spec.js b/test/spec/modules/yieldlabBidAdapter_spec.js
index 4c39fe5fe29..9155884106c 100644
--- a/test/spec/modules/yieldlabBidAdapter_spec.js
+++ b/test/spec/modules/yieldlabBidAdapter_spec.js
@@ -80,6 +80,81 @@ const NATIVE_REQUEST = () => Object.assign(DEFAULT_REQUEST(), {
   }
 })
 
+const IAB_REQUEST = () => Object.assign(DEFAULT_REQUEST(), {
+  params: {
+    adslotId: '1111',
+    supplyId: '2222',
+    iabContent: {
+      id: 'foo',
+      episode: '99',
+      title: 'bar',
+      series: 'baz',
+      season: 's01',
+      artist: 'foobar',
+      genre: 'barbaz',
+      isrc: 'CC-XXX-YY-NNNNN',
+      url: 'https://foo.test',
+      cat: ['cat1', 'cat2,ppp', 'cat3|||//'],
+      context: '2',
+      keywords: ['k1', 'k2', 'k3', 'k4'],
+      live: '0',
+      album: 'foo',
+      cattax: '3',
+      prodq: 2,
+      contentrating: 'foo',
+      userrating: 'bar',
+      qagmediarating: 2,
+      sourcerelationship: 1,
+      len: 12345,
+      language: 'en',
+      embeddable: 0,
+      producer: {
+        id: 'foo',
+        name: 'bar',
+        cattax: 532,
+        cat: [1, 'foo', true],
+        domain: 'producer.test'
+      },
+      data: {
+        id: 'foo',
+        name: 'bar',
+        segment: [{
+          name: 'foo',
+          value: 'bar',
+          ext: {
+            foo: {
+              bar: 'bar'
+            }
+          },
+        }, {
+          name: 'foo2',
+          value: 'bar2',
+          ext: {
+            test: {
+              nums: {
+                int: 123,
+                float: 123.123
+              },
+              bool: true,
+              string: 'foo2'
+            }
+          }
+        }],
+      },
+      network: {
+        id: 'foo',
+        name: 'bar',
+        domain: 'network.test'
+      },
+      channel: {
+        id: 'bar',
+        name: 'foo',
+        domain: 'channel.test'
+      }
+    }
+  }
+})
+
 const RESPONSE = {
   advertiser: 'yieldlab',
   curl: 'https://www.yieldlab.de',
@@ -251,6 +326,56 @@ describe('yieldlabBidAdapter', () => {
         const request = spec.buildRequests([{...requestWithoutIabContent, ...siteConfig}])
         expect(request.url).to.include('iab_content=id%3Aid_from_config')
       })
+
+      it('flattens the iabContent, encodes the values, joins the keywords into one value, and than encodes the iab_content request param ', () => {
+        const expectedIabContentValue = encodeURIComponent(
+          'id:foo,' +
+          'episode:99,' +
+          'title:bar,' +
+          'series:baz,' +
+          'season:s01,' +
+          'artist:foobar,' +
+          'genre:barbaz,' +
+          'isrc:CC-XXX-YY-NNNNN,' +
+          'url:https%3A%2F%2Ffoo.test,' +
+          'cat:cat1|cat2%2Cppp|cat3%7C%7C%7C%2F%2F,' +
+          'context:2,' +
+          'keywords:k1|k2|k3|k4,' +
+          'live:0,' +
+          'album:foo,' +
+          'cattax:3,' +
+          'prodq:2,' +
+          'contentrating:foo,' +
+          'userrating:bar,' +
+          'qagmediarating:2,' +
+          'sourcerelationship:1,' +
+          'len:12345,' +
+          'language:en,' +
+          'embeddable:0,' +
+          'producer.id:foo,' +
+          'producer.name:bar,' +
+          'producer.cattax:532,' +
+          'cat:1|foo|true,' +
+          'producer.domain:producer.test,' +
+          'data.id:foo,data.name:bar,' +
+          'data.segment.0.name:foo,' +
+          'data.segment.0.value:bar,' +
+          'data.segment.0.ext.foo.bar:bar,' +
+          'data.segment.1.name:foo2,' +
+          'data.segment.1.value:bar2,' +
+          'data.segment.1.ext.test.nums.int:123,' +
+          'data.segment.1.ext.test.nums.float:123.123,' +
+          'data.segment.1.ext.test.bool:true,' +
+          'data.segment.1.ext.test.string:foo2,' +
+          'network.id:foo,network.name:bar,' +
+          'network.domain:network.test,' +
+          'channel.id:bar,' +
+          'channel.name:foo,' +
+          'channel.domain:channel.test'
+        )
+        const request = spec.buildRequests([IAB_REQUEST()], REQPARAMS)
+        expect(request.url).to.include('iab_content=' + expectedIabContentValue)
+      })
     })
 
     it('passes unencoded schain string to bid request when complete == 0', () => {

From 06ce1ab1b53b38de89bdd641b4147ae146c9b785 Mon Sep 17 00:00:00 2001
From: preved-medved <kirkillbox@gmail.com>
Date: Mon, 14 Nov 2022 11:51:02 +0000
Subject: [PATCH 432/569] SmartyTech Bid Adapter : initial adapter release
 (#9196)

* Add new bid adapter for company smartytech

* change domain to prod

* update unit tests

* remove unused code

* remove unused code
---
 modules/smartytechBidAdapter.js               |  78 +++++++++
 modules/smartytechBidAdapter.md               |  44 +++++
 .../spec/modules/smartytechBidAdapter_spec.js | 162 ++++++++++++++++++
 3 files changed, 284 insertions(+)
 create mode 100644 modules/smartytechBidAdapter.js
 create mode 100644 modules/smartytechBidAdapter.md
 create mode 100644 test/spec/modules/smartytechBidAdapter_spec.js

diff --git a/modules/smartytechBidAdapter.js b/modules/smartytechBidAdapter.js
new file mode 100644
index 00000000000..231ca315de8
--- /dev/null
+++ b/modules/smartytechBidAdapter.js
@@ -0,0 +1,78 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {buildUrl} from '../src/utils.js'
+
+const BIDDER_CODE = 'smartytech';
+export const ENDPOINT_PROTOCOL = 'https';
+export const ENDPOINT_DOMAIN = 'server.smartytech.io';
+export const ENDPOINT_PATH = '/hb/bidder';
+
+export const spec = {
+  code: BIDDER_CODE,
+
+  isBidRequestValid: function (bidRequest) {
+    return !!parseInt(bidRequest.params.endpointId);
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const referer = bidderRequest?.refererInfo?.page || window.location.href;
+
+    const bidRequests = validBidRequests.map((validBidRequest) => {
+      return {
+        endpointId: validBidRequest.params.endpointId,
+        adUnitCode: validBidRequest.adUnitCode,
+        sizes: validBidRequest.sizes,
+        bidId: validBidRequest.bidId,
+        referer: referer
+      };
+    });
+
+    let adPartnerRequestUrl = buildUrl({
+      protocol: ENDPOINT_PROTOCOL,
+      hostname: ENDPOINT_DOMAIN,
+      pathname: ENDPOINT_PATH,
+    });
+
+    return {
+      method: 'POST',
+      url: adPartnerRequestUrl,
+      data: bidRequests
+    };
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    if (typeof serverResponse.body === 'undefined') {
+      return [];
+    }
+
+    const validBids = bidRequest.data;
+    const keys = Object.keys(serverResponse.body)
+    const responseBody = serverResponse.body;
+
+    return keys.filter(key => {
+      return responseBody[key].ad
+    }).map(key => {
+      return {
+        bid: validBids.find(b => b.adUnitCode === key),
+        response: responseBody[key]
+      }
+    }).map(item => spec.adResponse(item.bid.bidId, item.response));
+  },
+
+  adResponse: function (requestId, response) {
+    const bidObject = {
+      requestId,
+      ad: response.ad,
+      cpm: response.cpm,
+      width: response.width,
+      height: response.height,
+      ttl: 60,
+      creativeId: response.creativeId,
+      netRevenue: true,
+      currency: response.currency,
+    }
+    return bidObject;
+  },
+
+}
+
+registerBidder(spec);
diff --git a/modules/smartytechBidAdapter.md b/modules/smartytechBidAdapter.md
new file mode 100644
index 00000000000..dbfc2833c78
--- /dev/null
+++ b/modules/smartytechBidAdapter.md
@@ -0,0 +1,44 @@
+# Overview
+
+Module Name: SmartyTech Bidder Adapter
+
+Module Type: Bidder Adapter
+
+Maintainer: info@adpartner.pro
+
+# Description
+
+You can use this adapter to get a bid from smartytech.io.
+
+About us : https://smartytech.io
+
+# Test Parameters
+
+```javascript
+    var adUnits = [
+    {
+        code: 'div-smartytech-example',
+        sizes: [[300, 250]],
+        bids: [
+            {
+                bidder: "smartytech",
+                params: {
+                    endpointId: 14
+                }
+            }
+        ]
+    },
+    {
+        code: 'div-smartytech-example-2',
+        sizes: [[300, 250]],
+        bids: [
+            {
+                bidder: "smartytech",
+                params: {
+                    endpointId: 14
+                }
+            }
+        ]
+    }
+];
+```
diff --git a/test/spec/modules/smartytechBidAdapter_spec.js b/test/spec/modules/smartytechBidAdapter_spec.js
new file mode 100644
index 00000000000..78503d7a6f0
--- /dev/null
+++ b/test/spec/modules/smartytechBidAdapter_spec.js
@@ -0,0 +1,162 @@
+import {expect} from 'chai';
+import {spec, ENDPOINT_PROTOCOL, ENDPOINT_DOMAIN, ENDPOINT_PATH} from 'modules/smartytechBidAdapter';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'smartytech';
+
+describe('SmartyTechDSPAdapter: inherited functions', function () {
+  let adapter;
+  beforeEach(() => {
+    adapter = newBidder(spec);
+  });
+  it('exists and is a function', function () {
+    expect(adapter.callBids).to.be.exist.and.to.be.a('function');
+  });
+  it(`bidder code is ${BIDDER_CODE}`, function () {
+    expect(spec.code).to.be.equal(BIDDER_CODE);
+  })
+});
+
+describe('SmartyTechDSPAdapter: isBidRequestValid', function () {
+  it('Invalid bid request. Should return false', function () {
+    const invalidBidFixture = {
+      params: {
+        use_id: 13144375
+      }
+    }
+    expect(spec.isBidRequestValid(invalidBidFixture)).to.be.false
+  });
+  it('Valid bid request. Should return true', function () {
+    const validBidFixture = {
+      params: {
+        endpointId: 13144375
+      }
+    }
+    expect(spec.isBidRequestValid(validBidFixture)).to.be.true
+  });
+});
+
+function mockRandomSizeArray(len) {
+  return Array.apply(null, {length: len}).map(i => {
+    return [Math.floor(Math.random() * 800), Math.floor(Math.random() * 800)]
+  });
+}
+
+function mockBidRequestListData(size) {
+  return Array.apply(null, {length: size}).map((i, index) => {
+    const id = Math.floor(Math.random() * 800) * (index + 1);
+    return {
+      adUnitCode: `adUnitCode-${id}`,
+      sizes: mockRandomSizeArray(index + 1),
+      bidId: `bidId-${id}`,
+      params: {
+        endpointId: id
+      }
+    }
+  });
+}
+
+function mockRefererData() {
+  return {
+    refererInfo: {
+      page: 'https://some-test.page'
+    }
+  }
+}
+
+function mockResponseData(requestData) {
+  let data = {}
+
+  requestData.data.forEach((request, index) => {
+    const sizeArrayIndex = Math.floor(Math.random() * (request.sizes.length - 1));
+    const rndIndex = Math.floor(Math.random() * 800);
+
+    data[request.adUnitCode] = {
+      ad: `ad-${rndIndex}`,
+      width: request.sizes[sizeArrayIndex][0],
+      height: request.sizes[sizeArrayIndex][1],
+      creativeId: `creative-id-${index}`,
+      cpm: Math.floor(Math.random() * 100),
+      currency: `UAH-${rndIndex}`
+    };
+  });
+  return {
+    body: data
+  }
+};
+
+describe('SmartyTechDSPAdapter: buildRequests', () => {
+  let mockBidRequest;
+  let mockReferer;
+  beforeEach(() => {
+    mockBidRequest = mockBidRequestListData(8);
+    mockReferer = mockRefererData();
+  });
+  it('has return data', () => {
+    const request = spec.buildRequests(mockBidRequest, mockReferer);
+    expect(request).not.null;
+  });
+  it('correct request URL', () => {
+    const request = spec.buildRequests(mockBidRequest, mockReferer);
+    expect(request.url).to.be.equal(`${ENDPOINT_PROTOCOL}://${ENDPOINT_DOMAIN}${ENDPOINT_PATH}`)
+  });
+  it('correct request method', () => {
+    const request = spec.buildRequests(mockBidRequest, mockReferer);
+    expect(request.method).to.be.equal(`POST`)
+  });
+  it('correct request data', () => {
+    const data = spec.buildRequests(mockBidRequest, mockReferer).data;
+    data.forEach((request, index) => {
+      expect(request.adUnitCode).to.be.equal(mockBidRequest[index].adUnitCode);
+      expect(request.sizes).to.be.equal(mockBidRequest[index].sizes);
+      expect(request.bidId).to.be.equal(mockBidRequest[index].bidId);
+      expect(request.endpointId).to.be.equal(mockBidRequest[index].params.endpointId);
+      expect(request.referer).to.be.equal(mockReferer.refererInfo.page);
+    })
+  });
+});
+
+describe('SmartyTechDSPAdapter: interpretResponse', () => {
+  let mockBidRequest;
+  let mockReferer;
+  let request;
+  let mockResponse;
+  beforeEach(() => {
+    const brData = mockBidRequestListData(2);
+    mockReferer = mockRefererData();
+    request = spec.buildRequests(brData, mockReferer);
+    mockBidRequest = {
+      data: brData
+    }
+    mockResponse = mockResponseData(request);
+  });
+
+  it('interpretResponse: empty data request', () => {
+    delete mockResponse['body']
+    const data = spec.interpretResponse(mockResponse, mockBidRequest);
+    expect(data.length).to.be.equal(0);
+  });
+
+  it('interpretResponse: response data and convert data arrays has same length', () => {
+    const keys = Object.keys(mockResponse.body);
+    const data = spec.interpretResponse(mockResponse, mockBidRequest);
+    expect(data.length).to.be.equal(keys.length);
+  });
+
+  it('interpretResponse: convert to correct data', () => {
+    const keys = Object.keys(mockResponse.body);
+    const data = spec.interpretResponse(mockResponse, mockBidRequest);
+
+    data.forEach((responseItem, index) => {
+      expect(responseItem.ad).to.be.equal(mockResponse.body[keys[index]].ad);
+      expect(responseItem.cpm).to.be.equal(mockResponse.body[keys[index]].cpm);
+      expect(responseItem.creativeId).to.be.equal(mockResponse.body[keys[index]].creativeId);
+      expect(responseItem.currency).to.be.equal(mockResponse.body[keys[index]].currency);
+      expect(responseItem.netRevenue).to.be.true;
+      expect(responseItem.ttl).to.be.equal(60);
+      expect(responseItem.requestId).to.be.equal(mockBidRequest.data[index].bidId);
+      expect(responseItem.width).to.be.equal(mockResponse.body[keys[index]].width);
+      expect(responseItem.height).to.be.equal(mockResponse.body[keys[index]].height);
+    });
+  });
+});

From 12cad7b43f1458121ac574d2a657af49f8c96535 Mon Sep 17 00:00:00 2001
From: asurovenko-zeta <80847074+asurovenko-zeta@users.noreply.github.com>
Date: Mon, 14 Nov 2022 15:30:14 +0100
Subject: [PATCH 433/569] ZetaSppBidAdapter: provide tmax (#9240)

Co-authored-by: Surovenko Alexey <surovenko.alexey@gmail.com>
---
 modules/zeta_global_sspBidAdapter.js            |  4 ++++
 .../modules/zeta_global_sspBidAdapter_spec.js   | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/modules/zeta_global_sspBidAdapter.js b/modules/zeta_global_sspBidAdapter.js
index 4689683fbc7..6c5b9783782 100644
--- a/modules/zeta_global_sspBidAdapter.js
+++ b/modules/zeta_global_sspBidAdapter.js
@@ -129,6 +129,10 @@ export const spec = {
       deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
     }
 
+    if (bidderRequest?.timeout) {
+      payload.tmax = bidderRequest.timeout;
+    }
+
     provideEids(validBidRequests[0], payload);
     const url = params.shortname ? ENDPOINT_URL.concat('?shortname=', params.shortname) : ENDPOINT_URL;
     return {
diff --git a/test/spec/modules/zeta_global_sspBidAdapter_spec.js b/test/spec/modules/zeta_global_sspBidAdapter_spec.js
index 3bd17697f2d..d6befa0fc78 100644
--- a/test/spec/modules/zeta_global_sspBidAdapter_spec.js
+++ b/test/spec/modules/zeta_global_sspBidAdapter_spec.js
@@ -104,7 +104,8 @@ describe('Zeta Ssp Bid Adapter', function () {
     },
     uspConsent: 'someCCPAString',
     params: params,
-    userIdAsEids: eids
+    userIdAsEids: eids,
+    timeout: 500
   }];
 
   const videoRequest = [{
@@ -344,4 +345,18 @@ describe('Zeta Ssp Bid Adapter', function () {
     expect(payload.imp[1].banner.w).to.eql(600);
     expect(payload.imp[1].banner.h).to.eql(400);
   });
+
+  it('Test provide tmax', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    const payload = JSON.parse(request.data);
+
+    expect(payload.tmax).to.eql(500);
+  });
+
+  it('Test provide tmax without value', function () {
+    const request = spec.buildRequests(videoRequest, videoRequest[0]);
+    const payload = JSON.parse(request.data);
+
+    expect(payload.tmax).to.be.undefined;
+  });
 });

From 0470f7085b6267b52dd99aa1b87c386e17bbc2c9 Mon Sep 17 00:00:00 2001
From: Fatih Kaya <fatih.kaya.84@gmail.com>
Date: Mon, 14 Nov 2022 17:51:24 +0300
Subject: [PATCH 434/569] Admatic Bid Adapter: pixad alias and bid floor
 features activated (#9204)

* Admatic Bidder Adaptor

* Update admaticBidAdapter.md

* Update admaticBidAdapter.md

* remove floor parameter

* Update admaticBidAdapter.js

* Admatic Bid Adapter: alias and bid floor features activated

* Admatic adapter: host param control changed

* Alias name changed.

* Revert "Admatic adapter: host param control changed"

This reverts commit de7ac85981b1ba3ad8c5d1dc95c5dadbdf5b9895.

* added alias feature and host param

* Revert "added alias feature and host param"

This reverts commit 6ec8f4539ea6be403a0d7e08dad5c7a5228f28a1.

* Revert "Alias name changed."

This reverts commit 661c54f9b2397e8f25c257144d73161e13466281.

* Revert "Admatic Bid Adapter: alias and bid floor features activated"

This reverts commit 7a2e0e29c49e2f876b68aafe886b336fe2fe6fcb.

* Revert "Update admaticBidAdapter.js"

This reverts commit 7a845b7151bbb08addfb58ea9bd5b44167cc8a4e.

* Revert "remove floor parameter"

This reverts commit 7a23b055ccd4ea23d23e73248e82b21bc6f69d90.

* Admatic adapter: host param control && Add new Bidder

* Revert "Admatic adapter: host param control && Add new Bidder"

This reverts commit 3c797b120c8e0fe2b851381300ac5c4b1f92c6e2.

* commit new features

* Update admaticBidAdapter.js

* updated for coverage

* sync updated

* Update adloader.js
---
 modules/admaticBidAdapter.js                | 167 +++++++-----
 modules/admaticBidAdapter.md                |   4 +-
 src/adloader.js                             |   1 -
 test/spec/modules/admaticBidAdapter_spec.js | 265 +++++++++++++++++++-
 4 files changed, 372 insertions(+), 65 deletions(-)

diff --git a/modules/admaticBidAdapter.js b/modules/admaticBidAdapter.js
index 039f27e5de0..ec4401b77c9 100644
--- a/modules/admaticBidAdapter.js
+++ b/modules/admaticBidAdapter.js
@@ -1,94 +1,93 @@
 import { getValue, logError, deepAccess, getBidIdParameter, isArray } from '../src/utils.js';
-import { loadExternalScript } from '../src/adloader.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const ENDPOINT_URL = 'https://layer.serve.admatic.com.tr/pb';
-const SYNC_URL = 'https://cdn.serve.admatic.com.tr/showad/sync.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+const SYNC_URL = 'https://cdn.serve.admatic.com.tr/showad/sync.html';
 const BIDDER_CODE = 'admatic';
-
 export const spec = {
-  code: 'admatic',
-  supportedMediaTypes: ['video', 'banner'],
-  /**
-   * Determines whether or not the given bid request is valid.
-   *
-   * @param {BidRequest} bid The bid params to validate.
-   * @return boolean True if this is a valid bid, and false otherwise.
+  code: BIDDER_CODE,
+  aliases: [
+    {code: 'pixad'}
+  ],
+  supportedMediaTypes: [BANNER, VIDEO],
+  /** f
+   * @param {object} bid
+   * @return {boolean}
    */
-  isBidRequestValid: function(bid) {
+  isBidRequestValid: (bid) => {
     let isValid = false;
-    if (typeof bid.params !== 'undefined') {
-      let isValidNetworkId = _validateId(getValue(bid.params, 'networkId'));
-      isValid = isValidNetworkId;// && isValidTypeId;
+    if (bid?.params) {
+      const isValidNetworkId = _validateId(getValue(bid.params, 'networkId'));
+      const isValidHost = _validateString(getValue(bid.params, 'host'));
+      isValid = isValidNetworkId && isValidHost;
     }
 
     if (!isValid) {
-      logError('AdMatic networkId parameters are required. Bid aborted.');
+      logError(`${bid.bidder} networkId and host parameters are required. Bid aborted.`);
     }
     return isValid;
   },
+
   /**
-   * Make a server request from the list of BidRequests.
-   *
-   * @param {validBidRequests[]} an array of bids
-   * @return ServerRequest Info describing the request to the server.
+   * @param {BidRequest[]} validBidRequests
+   * @return {ServerRequest}
    */
-  buildRequests: function(validBidRequests, bidderRequest) {
+  buildRequests: (validBidRequests, bidderRequest) => {
     const bids = validBidRequests.map(buildRequestObject);
     const networkId = getValue(validBidRequests[0].params, 'networkId');
+    const host = getValue(validBidRequests[0].params, 'host');
     const currency = getValue(validBidRequests[0].params, 'currency') || 'TRY';
-
-    setTimeout(() => {
-      loadExternalScript(SYNC_URL, BIDDER_CODE);
-    }, bidderRequest.timeout);
+    const bidderName = validBidRequests[0].bidder;
 
     const payload = {
-      'user': {
-        'ua': navigator.userAgent
+      user: {
+        ua: navigator.userAgent
       },
-      'blacklist': [],
-      'site': {
-        'page': location.href,
-        'ref': location.origin,
-        'publisher': {
-          'name': location.hostname,
-          'publisherId': networkId
+      blacklist: [],
+      site: {
+        page: location.href,
+        ref: location.origin,
+        publisher: {
+          name: location.hostname,
+          publisherId: networkId
         }
       },
       imp: bids,
       ext: {
-        'cur': currency,
-        'type': 'admatic'
+        cur: currency,
+        bidder: bidderName
       }
     };
 
-    const payloadString = JSON.stringify(payload);
-    return {
-      method: 'POST',
-      url: ENDPOINT_URL,
-      data: payloadString,
-      options: {
-        contentType: 'application/json'
-      }
-    };
+    if (payload) {
+      return { method: 'POST', url: `https://${host}/pb?bidder=${bidderName}`, data: payload, options: { contentType: 'application/json' } };
+    }
+  },
+
+  getUserSyncs: function (syncOptions, responses) {
+    if (syncOptions.iframeEnabled) {
+      return [{
+        type: 'iframe',
+        url: SYNC_URL
+      }];
+    }
   },
+
   /**
-   * Unpack the response from the server into a list of bids.
-   *
-   * @param {*} serverResponse A successful response from the server.
-   * @return {Bid[]} An array of bids which were nested inside the server.
+   * @param {*} response
+   * @param {ServerRequest} request
+   * @return {Bid[]}
    */
   interpretResponse: (response, request) => {
     const body = response.body || response;
     const bidResponses = [];
-    if (body.data.length > 0) {
-      body.data.forEach(function (bid) {
+    if (body && body?.data && isArray(body.data)) {
+      body.data.forEach(bid => {
         const resbid = {
           requestId: bid.id,
           cpm: bid.price,
           width: bid.width,
           height: bid.height,
-          currency: body.cur,
+          currency: body.cur || 'TRY',
           netRevenue: true,
           ad: bid.party_tag,
           creativeId: bid.creative_id,
@@ -96,22 +95,68 @@ export const spec = {
             advertiserDomains: bid && bid.adomain ? bid.adomain : []
           },
           ttl: 360,
-          bidder: 'admatic',
-          timeToRespond: 1,
-          requestTimestamp: 1
+          bidder: bid.bidder
         };
+
         bidResponses.push(resbid);
       });
-    };
+    }
     return bidResponses;
   }
 };
 
+function enrichSlotWithFloors(slot, bidRequest) {
+  try {
+    const slotFloors = {};
+
+    if (bidRequest.getFloor) {
+      if (bidRequest.mediaTypes?.banner) {
+        slotFloors.banner = {};
+        const bannerSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'))
+        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = bidRequest.getFloor({ size: bannerSize, mediaType: BANNER }));
+      }
+
+      if (bidRequest.mediaTypes?.video) {
+        slotFloors.video = {};
+        const videoSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'))
+        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = bidRequest.getFloor({ size: videoSize, mediaType: VIDEO }));
+      }
+
+      if (Object.keys(slotFloors).length > 0) {
+        if (!slot) {
+          slot = {}
+        }
+        Object.assign(slot, {
+          floors: slotFloors
+        });
+      }
+    }
+  } catch (e) {
+    logError('Could not parse floors from Prebid: ' + e);
+  }
+}
+
+function parseSizes(sizes, parser = s => s) {
+  if (sizes == undefined) {
+    return [];
+  }
+  if (Array.isArray(sizes[0])) { // is there several sizes ? (ie. [[728,90],[200,300]])
+    return sizes.map(size => parser(size));
+  }
+  return [parser(sizes)]; // or a single one ? (ie. [728,90])
+}
+
+function parseSize(size) {
+  return size[0] + 'x' + size[1];
+}
+
 function buildRequestObject(bid) {
   const reqObj = {};
   reqObj.size = getSizes(bid);
   reqObj.id = getBidIdParameter('bidId', bid);
-  reqObj.floor = getValue(bid.params, 'floor') || 0.01;
+
+  enrichSlotWithFloors(reqObj, bid);
+
   return reqObj;
 }
 
@@ -144,4 +189,8 @@ function _validateId(id) {
   return (parseInt(id) > 0);
 }
 
+function _validateString(str) {
+  return (typeof str == 'string');
+}
+
 registerBidder(spec);
diff --git a/modules/admaticBidAdapter.md b/modules/admaticBidAdapter.md
index de84998d0af..2bf9afb3cdc 100644
--- a/modules/admaticBidAdapter.md
+++ b/modules/admaticBidAdapter.md
@@ -19,7 +19,7 @@ Use `admatic` as bidder.
           bidder: 'admatic',
           params: { 
               networkId: 12345,
-              floor: 0.5
+              host: 'layer.serve.admatic.com.tr'
           }
       }]
     },{
@@ -29,7 +29,7 @@ Use `admatic` as bidder.
           bidder: 'admatic',
           params: { 
               networkId: 12345,
-              floor: 0.5
+              host: 'layer.serve.admatic.com.tr'
           }
       }]
     }];
diff --git a/src/adloader.js b/src/adloader.js
index 330b52b3ed5..64408683e9f 100644
--- a/src/adloader.js
+++ b/src/adloader.js
@@ -6,7 +6,6 @@ const _requestCache = new WeakMap();
 const _approvedLoadExternalJSList = [
   'debugging',
   'adloox',
-  'admatic',
   'criteo',
   'outstream',
   'adagio',
diff --git a/test/spec/modules/admaticBidAdapter_spec.js b/test/spec/modules/admaticBidAdapter_spec.js
index c7d391cfaca..65a7b4111b7 100644
--- a/test/spec/modules/admaticBidAdapter_spec.js
+++ b/test/spec/modules/admaticBidAdapter_spec.js
@@ -3,7 +3,7 @@ import {spec, storage} from 'modules/admaticBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
 import {getStorageManager} from 'src/storageManager';
 
-const ENDPOINT = 'https://layer.serve.admatic.com.tr/v1';
+const ENDPOINT = 'https://layer.serve.admatic.com.tr/pb?bidder=admatic';
 
 describe('admaticBidAdapter', () => {
   const adapter = newBidder(spec);
@@ -18,7 +18,8 @@ describe('admaticBidAdapter', () => {
     let bid = {
       'bidder': 'admatic',
       'params': {
-        'networkId': 10433394
+        'networkId': 10433394,
+        'host': 'layer.serve.admatic.com.tr'
       },
       'adUnitCode': 'adunit-code',
       'sizes': [[300, 250], [300, 600]],
@@ -37,10 +38,268 @@ describe('admaticBidAdapter', () => {
       delete bid.params;
 
       bid.params = {
-        'networkId': 0
+        'networkId': 0,
+        'host': 'layer.serve.admatic.com.tr'
       };
 
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
   });
+
+  describe('buildRequests', function () {
+    it('sends bid request to ENDPOINT via POST', function () {
+      let validRequest = [ {
+        'bidder': 'admatic',
+        'params': {
+          'networkId': 10433394,
+          'host': 'layer.serve.admatic.com.tr'
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250], [728, 90]]
+          }
+        },
+        getFloor: inputParams => {
+          if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+            return {
+              currency: 'USD',
+              floor: 1.0
+            };
+          } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+            return {
+              currency: 'USD',
+              floor: 2.0
+            };
+          } else {
+            return {}
+          }
+        },
+        'user': {
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36'
+        },
+        'blacklist': [],
+        'site': {
+          'page': 'http://localhost:8888/admatic.html',
+          'ref': 'http://localhost:8888',
+          'publisher': {
+            'name': 'localhost',
+            'publisherId': 12321312
+          }
+        },
+        'imp': [
+          {
+            'size': [
+              {
+                'w': 300,
+                'h': 250
+              },
+              {
+                'w': 728,
+                'h': 90
+              }
+            ],
+            'id': '2205da7a81846b',
+            'floors': {
+              'banner': {
+                '300x250': { 'currency': 'USD', 'floor': 1 },
+                '728x90': { 'currency': 'USD', 'floor': 2 }
+              }
+            }
+          }
+        ],
+        'ext': {
+          'cur': 'USD',
+          'bidder': 'admatic'
+        }
+      } ];
+      let bidderRequest = {
+        'bidder': 'admatic',
+        'params': {
+          'networkId': 10433394,
+          'host': 'layer.serve.admatic.com.tr'
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250], [728, 90]]
+          }
+        },
+        getFloor: inputParams => {
+          if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+            return {
+              currency: 'USD',
+              floor: 1.0
+            };
+          } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+            return {
+              currency: 'USD',
+              floor: 2.0
+            };
+          } else {
+            return {}
+          }
+        },
+        'user': {
+          'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36'
+        },
+        'blacklist': [],
+        'site': {
+          'page': 'http://localhost:8888/admatic.html',
+          'ref': 'http://localhost:8888',
+          'publisher': {
+            'name': 'localhost',
+            'publisherId': 12321312
+          }
+        },
+        'imp': [
+          {
+            'size': [
+              {
+                'w': 300,
+                'h': 250
+              },
+              {
+                'w': 728,
+                'h': 90
+              }
+            ],
+            'id': '2205da7a81846b',
+            'floors': {
+              'banner': {
+                '300x250': { 'currency': 'USD', 'floor': 1 },
+                '728x90': { 'currency': 'USD', 'floor': 2 }
+              }
+            }
+          }
+        ],
+        'ext': {
+          'cur': 'USD',
+          'bidder': 'admatic'
+        }
+      };
+      const request = spec.buildRequests(validRequest, bidderRequest);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should properly build a banner request with floors', function () {
+      let bidRequests = [
+        {
+          'bidder': 'admatic',
+          'params': {
+            'networkId': 10433394,
+            'host': 'layer.serve.admatic.com.tr'
+          },
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[300, 250], [728, 90]]
+            }
+          },
+          getFloor: inputParams => {
+            if (inputParams.mediaType === BANNER && inputParams.size[0] === 300 && inputParams.size[1] === 250) {
+              return {
+                currency: 'USD',
+                floor: 1.0
+              };
+            } else if (inputParams.mediaType === BANNER && inputParams.size[0] === 728 && inputParams.size[1] === 90) {
+              return {
+                currency: 'USD',
+                floor: 2.0
+              };
+            } else {
+              return {}
+            }
+          }
+        },
+      ];
+      let bidderRequest = {
+        'bidder': 'admatic',
+        'params': {
+          'networkId': 10433394,
+          'host': 'layer.serve.admatic.com.tr'
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250], [728, 90]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+        'creativeId': 'er2ee',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250], [728, 90]]
+          }
+        }
+      };
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      request.data.imp[0].floors = {
+        'banner': {
+          '300x250': { 'currency': 'USD', 'floor': 1 },
+          '728x90': { 'currency': 'USD', 'floor': 2 }
+        }
+      };
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should get correct bid responses', function() {
+      let bids = { body: {
+        data: [
+          {
+            'id': 1,
+            'creative_id': '374',
+            'width': 300,
+            'height': 250,
+            'price': 0.01,
+            'bidder': 'admatic',
+            'adomain': ['admatic.com.tr'],
+            'party_tag': '<div></div>'
+          }
+        ],
+        'queryId': 'cdnbh24rlv0hhkpfpln0',
+        'status': true
+      }};
+
+      let expectedResponse = [
+        {
+          requestId: 1,
+          cpm: 0.01,
+          width: 300,
+          height: 250,
+          currency: 'TRY',
+          netRevenue: true,
+          ad: '<div></div>',
+          creativeId: '374',
+          meta: {
+            advertiserDomains: ['admatic.com.tr']
+          },
+          ttl: 360,
+          bidder: 'admatic'
+        }
+      ];
+      const request = {
+        ext: {
+          'cur': 'TRY',
+          'type': 'admatic'
+        }
+      };
+      let result = spec.interpretResponse(bids, {data: request});
+      expect(result).to.eql(expectedResponse);
+    });
+
+    it('handles nobid responses', function () {
+      let request = {
+        ext: {
+          'cur': 'TRY',
+          'type': 'admatic'
+        }
+      };
+      let bids = { body: {
+        data: [],
+        'queryId': 'cdnbh24rlv0hhkpfpln0',
+        'status': true
+      }};
+
+      let result = spec.interpretResponse(bids, {data: request});
+      expect(result.length).to.equal(0);
+    });
+  });
 });

From cc501e167cffb8cb4c839022ad58981acab156d0 Mon Sep 17 00:00:00 2001
From: takuhou <takuho.sanpei@gmail.com>
Date: Tue, 15 Nov 2022 09:54:03 +0900
Subject: [PATCH 435/569] YieldOne Bid Adapter: update documentation, test and
 code style (#9233)

* add parameter test

* change new_format to single_format

* fix adomain typo

* add parameter test

* add jsdoc comment and update readme

* change @return to @returns

* change param and returns

* add typeof and change param/returns

* change returns value

* change flux to 1x1

Co-authored-by: TakuhoSanpei <takuho-sanpei@dac.co.jp>
---
 modules/yieldoneBidAdapter.js                |  68 +++++++++--
 modules/yieldoneBidAdapter.md                | 118 +++++++++++++++++--
 test/spec/modules/yieldoneBidAdapter_spec.js |  36 +++++-
 3 files changed, 199 insertions(+), 23 deletions(-)

diff --git a/modules/yieldoneBidAdapter.js b/modules/yieldoneBidAdapter.js
index 4c5f1687641..d408a0595f9 100644
--- a/modules/yieldoneBidAdapter.js
+++ b/modules/yieldoneBidAdapter.js
@@ -4,6 +4,17 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { Renderer } from '../src/Renderer.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
+/**
+ * @typedef {import('../src/adapters/bidderFactory').Bid} Bid
+ * @typedef {import('../src/adapters/bidderFactory').BidRequest} BidRequest
+ * @typedef {import('../src/adapters/bidderFactory').BidderSpec} BidderSpec
+ * @typedef {import('../src/adapters/bidderFactory').ServerRequest} ServerRequest
+ * @typedef {import('../src/adapters/bidderFactory').ServerResponse} ServerResponse
+ * @typedef {import('../src/adapters/bidderFactory').SyncOptions} SyncOptions
+ * @typedef {import('../src/adapters/bidderFactory').UserSync} UserSync
+ * @typedef {import('../src/auction').BidderRequest} BidderRequest
+ */
+
 const BIDDER_CODE = 'yieldone';
 const ENDPOINT_URL = 'https://y.one.impact-ad.jp/h_bid';
 const USER_SYNC_URL = 'https://y.one.impact-ad.jp/push_sync';
@@ -13,13 +24,25 @@ const VIEWABLE_PERCENTAGE_URL = 'https://img.ak.impact-ad.jp/ic/pone/ivt/firstvi
 
 const DEFAULT_VIDEO_SIZE = {w: 640, h: 360};
 
+/** @type BidderSpec */
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['y1'],
   supportedMediaTypes: [BANNER, VIDEO],
+  /**
+   * Determines whether or not the given bid request is valid.
+   * @param {BidRequest} bid The bid params to validate.
+   * @returns {boolean} True if this is a valid bid, and false otherwise.
+   */
   isBidRequestValid: function(bid) {
     return !!(bid.params.placementId);
   },
+  /**
+   * Make a server request from the list of BidRequests.
+   * @param {Bid[]} validBidRequests - An array of bids.
+   * @param {BidderRequest} bidderRequest - bidder request object.
+   * @returns {ServerRequest|ServerRequest[]} ServerRequest Info describing the request to the server.
+   */
   buildRequests: function(validBidRequests, bidderRequest) {
     return validBidRequests.map(bidRequest => {
       const params = bidRequest.params;
@@ -96,6 +119,12 @@ export const spec = {
       };
     });
   },
+  /**
+   * Unpack the response from the server into a list of bids.
+   * @param {ServerResponse} serverResponse - A successful response from the server.
+   * @param {BidRequest} bidRequests
+   * @returns {Bid[]} - An array of bids which were nested inside the server.
+   */
   interpretResponse: function(serverResponse, bidRequest) {
     const bidResponses = [];
     const response = serverResponse.body;
@@ -188,6 +217,11 @@ export const spec = {
     }
     return bidResponses;
   },
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @returns {UserSync[]} The user syncs which should be dropped.
+   */
   getUserSyncs: function(syncOptions) {
     if (syncOptions.iframeEnabled) {
       return [{
@@ -202,7 +236,7 @@ export const spec = {
  * NOTE: server side does not yet support multiple formats.
  * @param  {Object} bidRequest -
  * @param  {boolean} [enabledOldFormat = true] - default: `true`.
- * @return {string|null} - `"banner"` or `"video"` or `null`.
+ * @returns {string|null} - `"banner"` or `"video"` or `null`.
  */
 function getMediaType(bidRequest, enabledOldFormat = true) {
   let hasBannerType = Boolean(deepAccess(bidRequest, 'mediaTypes.banner'));
@@ -239,7 +273,7 @@ function getMediaType(bidRequest, enabledOldFormat = true) {
  * @param  {Object} bidRequest.banner -
  * @param  {Array<string>} bidRequest.banner.sizes -
  * @param  {boolean} [enabledOldFormat = true] - default: `true`.
- * @return {string} - strings like `"300x250"` or `"300x250,728x90"`.
+ * @returns {string} - strings like `"300x250"` or `"300x250,728x90"`.
  */
 function getBannerSizes(bidRequest, enabledOldFormat = true) {
   let sizes = deepAccess(bidRequest, 'mediaTypes.banner.sizes');
@@ -254,10 +288,10 @@ function getBannerSizes(bidRequest, enabledOldFormat = true) {
 /**
  * @param  {Object} bidRequest -
  * @param  {boolean} [enabledOldFormat = true] - default: `true`.
- * @param  {boolean} [enabledFlux = true] - default: `true`.
- * @return {{w: number, h: number}} -
+ * @param  {boolean} [enabled1x1 = true] - default: `true`.
+ * @returns {{w: number, h: number}} -
  */
-function getVideoSize(bidRequest, enabledOldFormat = true, enabledFlux = true) {
+function getVideoSize(bidRequest, enabledOldFormat = true, enabled1x1 = true) {
   /**
    * @param  {Array<number, number> | Array<Array<number, number>>} sizes -
    * @return {{w: number, h: number} | null} -
@@ -287,10 +321,10 @@ function getVideoSize(bidRequest, enabledOldFormat = true, enabledFlux = true) {
     playerSize = playerSize || _getPlayerSize(bidRequest.sizes);
   }
 
-  if (enabledFlux) {
-    // NOTE: `video.playerSize` in Flux is always [1,1].
+  if (enabled1x1) {
+    // NOTE: `video.playerSize` in 1x1 is always [1,1].
     if (playerSize && (playerSize.w === 1 && playerSize.h === 1)) {
-      // NOTE: `params.playerSize` is a specific object to support `FLUX`.
+      // NOTE: `params.playerSize` is a specific object to support `1x1`.
       playerSize = _getPlayerSize(deepAccess(bidRequest, 'params.playerSize'));
     }
   }
@@ -298,6 +332,11 @@ function getVideoSize(bidRequest, enabledOldFormat = true, enabledFlux = true) {
   return playerSize || DEFAULT_VIDEO_SIZE;
 }
 
+/**
+ * Create render for outstream video.
+ * @param {Object} serverResponse.body -
+ * @returns {Renderer} - Prebid Renderer object
+ */
 function newRenderer(response) {
   const renderer = Renderer.install({
     id: response.uid,
@@ -314,12 +353,21 @@ function newRenderer(response) {
   return renderer;
 }
 
+/**
+ * Handles an outstream response after the library is loaded
+ * @param {Object} bid
+ */
 function outstreamRender(bid) {
   bid.renderer.push(() => {
     window.DACIVTPREBID.renderPrebid(bid);
   });
 }
 
+/**
+ * Create render for cmer outstream video.
+ * @param {Object} serverResponse.body -
+ * @returns {Renderer} - Prebid Renderer object
+ */
 function newCmerRenderer(response) {
   const renderer = Renderer.install({
     id: response.uid,
@@ -336,6 +384,10 @@ function newCmerRenderer(response) {
   return renderer;
 }
 
+/**
+ * Handles an outstream response after the library is loaded
+ * @param {Object} bid
+ */
 function cmerRender(bid) {
   bid.renderer.push(() => {
     window.CMERYONEPREBID.renderPrebid(bid);
diff --git a/modules/yieldoneBidAdapter.md b/modules/yieldoneBidAdapter.md
index 1414d4e464f..d1306a08202 100644
--- a/modules/yieldoneBidAdapter.md
+++ b/modules/yieldoneBidAdapter.md
@@ -13,8 +13,7 @@ Connect to YIELDONE for bids.
 THE YIELDONE adapter requires setup and approval from the YIELDONE team.
 Please reach out to your account team or y1s@platform-one.co.jp for more information.
 
-Note: THE YIELDONE adapter do not support "multi-format" scenario... if both
-banner and video are specified as mediatypes, YIELDONE will treat it as a video unit.
+YIELDONE adapter supports Banner, Video and Multi-Format(video, banner) currently.
 
 # Test Parameters
 ```javascript
@@ -24,13 +23,16 @@ var adUnits = [
       code: 'banner-div',
       mediaTypes: {
         banner: {
-          sizes: [[300, 250], [336, 280]]
+          sizes: [
+            [300, 250],
+            [336, 280]
+          ]
         }
       },
       bids: [{
          bidder: 'yieldone',
          params: {
-           placementId: '36891'
+           placementId: '36891'  // required
          }
        }]
    },
@@ -44,11 +46,109 @@ var adUnits = [
         },
       },
       bids: [{
-         bidder: 'yieldone',
-         params: {
-           placementId: '41993'
-         }
-       }]
+        bidder: "yieldone",
+        params: {
+          placementId: "36892",     // required
+          playerParams: {           // optional
+            wrapperWidth: "320px",  // optional
+            wrapperHeight: "180px"  // optional
+          },
+        }
+      }]
+   },
+   // Video adUnit(mediaTypes.video.playerSize: [1,1])
+   {
+      code: 'video-1x1-div',
+      mediaTypes: {
+        video: {
+          playerSize: [[1, 1]],
+          context: 'outstream'
+        },
+      },
+      bids: [{
+        bidder: 'yieldone',
+        params: {
+          placementId: "36892",     // required
+          playerSize: [640, 360],   // required
+          playerParams: {           // optional
+            wrapperWidth: "320px",  // optional
+            wrapperHeight: "180px"  // optional
+          },
+        }
+      }]
+   },
+   // Multi-Format adUnit
+   {
+      code: "multi-format-div",
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250],
+            [1, 1]
+          ]
+        },
+        video: {
+          playerSize: [640, 360],
+          context: "outstream"
+        }
+      },
+      bids: [{
+        // * "video" bid object should be placed before "banner" bid object.
+        // This bid will request a "video" media type ad.
+        bidder: "yieldone",
+        params: {
+          placementId: "36892",     // required
+          playerParams: {           // required
+            wrapperWidth: "320px",  // optional
+            wrapperHeight: "180px"  // optional
+          },
+        }
+      },
+      {
+        // This bid will request a "banner" media type ad.
+        bidder: "yieldone",
+        params: {
+          placementId: "36891"  // required
+        }
+      }
+    ]
+   },
+   // Multi-Format adUnit(mediaTypes.video.playerSize: [1,1])
+   {
+      code: "multi-format-1x1-div",
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [300, 250],
+            [1, 1]
+          ]
+        },
+        video: {
+          playerSize: [1, 1],
+          context: "outstream"
+        }
+      },
+      bids: [{
+        // * "video" bid object should be placed before "banner" bid object.
+        // This bid will request a "video" media type ad.
+        bidder: "yieldone",
+        params: {
+          placementId: "36892",     // required
+          playerSize: [640, 360],   // required
+          playerParams: {           // required
+            wrapperWidth: "320px",  // optional
+            wrapperHeight: "180px"  // optional
+          },
+        }
+      },
+      {
+        // This bid will request a "banner" media type ad.
+        bidder: "yieldone",
+        params: {
+          placementId: "36891"  // required
+        }
+      }
+    ]
    }
 ```
 
diff --git a/test/spec/modules/yieldoneBidAdapter_spec.js b/test/spec/modules/yieldoneBidAdapter_spec.js
index 59bd4a80081..a10247411db 100644
--- a/test/spec/modules/yieldoneBidAdapter_spec.js
+++ b/test/spec/modules/yieldoneBidAdapter_spec.js
@@ -140,7 +140,7 @@ describe('yieldoneBidAdapter', function() {
       });
     });
 
-    describe('New Format', function () {
+    describe('Single Format', function () {
       const bidRequests = [
         {
           params: {placementId: '0'},
@@ -206,8 +206,11 @@ describe('yieldoneBidAdapter', function() {
 
       it('width and height should be set as separate parameters on outstream requests', function () {
         expect(request[0].data).to.not.have.property('w');
+        expect(request[0].data).to.not.have.property('h');
         expect(request[1].data).to.not.have.property('w');
+        expect(request[1].data).to.not.have.property('h');
         expect(request[2].data).to.not.have.property('w');
+        expect(request[2].data).to.not.have.property('h');
         expect(request[3].data.w).to.equal(1280);
         expect(request[3].data.h).to.equal(720);
         expect(request[4].data.w).to.equal(1920);
@@ -260,12 +263,13 @@ describe('yieldoneBidAdapter', function() {
 
       it('width and height should be set as separate parameters on outstream requests', function () {
         expect(request[0].data).to.not.have.property('w');
+        expect(request[0].data).to.not.have.property('h');
         expect(request[1].data.w).to.equal(1920);
         expect(request[1].data.h).to.equal(1080);
       });
     });
 
-    describe('FLUX Format', function () {
+    describe('1x1 Format', function () {
       const bidRequests = [
         {
           // It will be treated as a banner.
@@ -326,6 +330,7 @@ describe('yieldoneBidAdapter', function() {
 
       it('width and height should be set as separate parameters on outstream requests', function () {
         expect(request[0].data).to.not.have.property('w');
+        expect(request[0].data).to.not.have.property('h');
         expect(request[1].data.w).to.equal(1920);
         expect(request[1].data.h).to.equal(1080);
         expect(request[2].data.w).to.equal(DEFAULT_VIDEO_SIZE.w);
@@ -500,9 +505,9 @@ describe('yieldoneBidAdapter', function() {
         'currency': 'JPY',
         'statusMessage': 'Bid available',
         'dealId': 'P1-FIX-7800-DSP-MON',
-        'admoain': [
+        'adomain': [
           'www.example.com'
-        ]
+        ],
       }
     };
 
@@ -528,7 +533,16 @@ describe('yieldoneBidAdapter', function() {
       }];
       let result = spec.interpretResponse(serverResponseBanner, bidRequestBanner[0]);
       expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
+      expect(result[0].requestId).to.equal(expectedResponse[0].requestId);
+      expect(result[0].cpm).to.equal(expectedResponse[0].cpm);
+      expect(result[0].width).to.equal(expectedResponse[0].width);
+      expect(result[0].height).to.equal(expectedResponse[0].height);
+      expect(result[0].creativeId).to.equal(expectedResponse[0].creativeId);
+      expect(result[0].dealId).to.equal(expectedResponse[0].dealId);
+      expect(result[0].currency).to.equal(expectedResponse[0].currency);
       expect(result[0].mediaType).to.equal(expectedResponse[0].mediaType);
+      expect(result[0].ad).to.equal(expectedResponse[0].ad);
+      expect(result[0].meta.advertiserDomains[0]).to.equal(expectedResponse[0].meta.advertiserDomains[0]);
     });
 
     let serverResponseVideo = {
@@ -537,7 +551,7 @@ describe('yieldoneBidAdapter', function() {
         'height': 360,
         'width': 640,
         'cpm': 0.0536616,
-        'dealId': 'P1-FIX-766-DSP-MON',
+        'dealId': 'P1-FIX-7800-DSP-MON',
         'crid': '2494768',
         'currency': 'JPY',
         'statusMessage': 'Bid available',
@@ -575,7 +589,7 @@ describe('yieldoneBidAdapter', function() {
         'currency': 'JPY',
         'netRevenue': true,
         'ttl': 3000,
-        'referrer': '',
+        'referrer': 'http%3A%2F%2Flocalhost%3A9876%2F%3Fid%3D74552836',
         'meta': {
           'advertiserDomains': []
         },
@@ -588,9 +602,19 @@ describe('yieldoneBidAdapter', function() {
       }];
       let result = spec.interpretResponse(serverResponseVideo, bidRequestVideo[0]);
       expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
+      expect(result[0].requestId).to.equal(expectedResponse[0].requestId);
+      expect(result[0].cpm).to.equal(expectedResponse[0].cpm);
+      expect(result[0].width).to.equal(expectedResponse[0].width);
+      expect(result[0].height).to.equal(expectedResponse[0].height);
+      expect(result[0].creativeId).to.equal(expectedResponse[0].creativeId);
+      expect(result[0].dealId).to.equal(expectedResponse[0].dealId);
+      expect(result[0].currency).to.equal(expectedResponse[0].currency);
+      expect(result[0].vastXml).to.equal(expectedResponse[0].vastXml);
       expect(result[0].mediaType).to.equal(expectedResponse[0].mediaType);
+      expect(result[0].referrer).to.equal(expectedResponse[0].referrer);
       expect(result[0].renderer.id).to.equal(expectedResponse[0].renderer.id);
       expect(result[0].renderer.url).to.equal(expectedResponse[0].renderer.url);
+      expect(result[0].meta.advertiserDomains[0]).to.equal(expectedResponse[0].meta.advertiserDomains[0]);
     });
 
     it('handles empty bid response', function () {

From 4d6c88dcb508b92467b06b0f352a60dd8dfb3e9e Mon Sep 17 00:00:00 2001
From: John Conway <john@johnconwayiv.com>
Date: Tue, 15 Nov 2022 04:52:25 -0500
Subject: [PATCH 436/569] Zeus Prime RTD Module: initial module release (#9165)

* docs(zeusPrime): added zeusPrimeRtdProvider documenation

* test: added zeusPrimeRtdProvider tests

* feat: added zeusPrime rtd submodule

* chore: fix issue with params in the initModule function

* chore: lint fixes

* chore: lint fixes for tests

* test: mock subtle since some tests run insecure

crypto.subtle is only available in secure instances on new browsers, and browserstack runs some tests not in secure mode, so crypto.subtle is undefine. This just creates a mock sublte to avoid this in the tests.

* test: try to override subtle when it doesnt exist in tests

* test: remove subtle restore

* chore: added ZeusPrime to .submodules.json
---
 modules/.submodules.json                      |   3 +-
 modules/zeusPrimeRtdProvider.js               | 357 +++++++++++++++
 modules/zeusPrimeRtdProvider.md               |  60 +++
 .../spec/modules/zeusPrimeRtdProvider_spec.js | 410 ++++++++++++++++++
 4 files changed, 829 insertions(+), 1 deletion(-)
 create mode 100644 modules/zeusPrimeRtdProvider.js
 create mode 100644 modules/zeusPrimeRtdProvider.md
 create mode 100644 test/spec/modules/zeusPrimeRtdProvider_spec.js

diff --git a/modules/.submodules.json b/modules/.submodules.json
index aad778be67b..52bbc638c79 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -71,7 +71,8 @@
       "reconciliationRtdProvider",
       "sirdataRtdProvider",
       "timeoutRtdProvider",
-      "weboramaRtdProvider"
+      "weboramaRtdProvider", 
+      "zeusPrimeRtdProvider"
     ],
     "fpdModule": [
       "enrichmentFpdModule",
diff --git a/modules/zeusPrimeRtdProvider.js b/modules/zeusPrimeRtdProvider.js
new file mode 100644
index 00000000000..28c46957c50
--- /dev/null
+++ b/modules/zeusPrimeRtdProvider.js
@@ -0,0 +1,357 @@
+/**
+ * This module adds Zeus Insights For Publishers (ZIP) provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ *
+ * This module will request the article topics for the current page and add them as page keyvalues
+ * for the ad requests.
+ *
+ * @module modules/zeusInsightsForPublishersRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+import { logInfo, logError, logWarn, logMessage } from '../src/utils.js'
+import { submodule } from '../src/hook.js'
+import { ajaxBuilder } from '../src/ajax.js'
+
+class Logger {
+  get showDebug() {
+    if (this._showDebug === true || this._showDebug === false) {
+      return this._showDebug
+    }
+
+    return window.zeusPrime?.debug || false
+  }
+  set showDebug(shouldShow) {
+    this._showDebug = shouldShow
+  }
+
+  get error() {
+    return logError.bind(this, 'zeusPrimeRtdProvider: ')
+  }
+  get warn() {
+    return logWarn.bind(this, 'zeusPrimeRtdProvider: ')
+  }
+  get info() {
+    return logInfo.bind(this, 'zeusPrimeRtdProvider: ')
+  }
+  get debug() {
+    if (this.showDebug) {
+      return logMessage.bind(this, 'zeusPrimeRtdProvider: ')
+    }
+
+    return () => {}
+  }
+}
+
+var logger = new Logger()
+
+function loadCommandQueue() {
+  window.zeusPrime = window.zeusPrime || { cmd: [] }
+  const queue = [...window.zeusPrime.cmd]
+
+  window.zeusPrime.cmd = []
+  window.zeusPrime.cmd.push = (callback) => {
+    callback(window.zeusPrime)
+  }
+
+  queue.forEach((callback) => callback(window.zeusPrime))
+}
+
+function markStatusComplete(key) {
+  const status = window?.zeusPrime?.status
+  if (status) {
+    status[key] = true
+  }
+}
+
+function createStatus() {
+  if (window.zeusPrime && !window.zeusPrime.status) {
+    Object.defineProperty(window.zeusPrime, 'status', {
+      enumerable: false,
+      value: {
+        initComplete: false,
+        primeKeyValueSet: false,
+        insightsReqSent: false,
+        insightsReqReceived: false,
+        insightsKeyValueSet: false,
+        scriptComplete: false,
+      },
+    })
+  }
+}
+
+function loadPrimeQueryParams() {
+  try {
+    const params = new URLSearchParams(window.location.search)
+    params.forEach((paramValue, paramKey) => {
+      if (!paramKey.startsWith('zeus_prime_')) {
+        return
+      }
+
+      let key = paramKey.replace('zeus_prime_', '')
+      let value = paramValue.toLowerCase()
+
+      if (value === 'true' || value === '1') {
+        value = true
+      } else if (value === 'false' || value === '0') {
+        value = false
+      }
+
+      window.zeusPrime[key] = value
+    })
+  } catch (_) {}
+}
+
+const DEFAULT_API = 'https://insights.zeustechnology.com'
+
+function init(gamId = null, options = {}) {
+  window.zeusPrime = window.zeusPrime || { cmd: [] }
+
+  window.zeusPrime.gamId = gamId || options.gamId || window.zeusPrime.gamId || undefined
+  window.zeusPrime.api = DEFAULT_API
+  window.zeusPrime.hostname = options.hostname || window.location?.hostname || ''
+  window.zeusPrime.pathname = options.pathname || window.location?.pathname || ''
+  window.zeusPrime.pageUrl = `${window.zeusPrime.hostname}${window.zeusPrime.pathname}`
+  window.zeusPrime.pageHash = options.pageHash || null
+  window.zeusPrime.debug = window.zeusPrime.debug || options.debug === true || false
+  window.zeusPrime.disabled = window.zeusPrime.disabled || options.disabled === true || false
+
+  loadPrimeQueryParams()
+
+  logger.showDebug = window.zeusPrime.debug
+
+  createStatus()
+  markStatusComplete('initComplete')
+}
+
+function setTargeting() {
+  const { gamId, hostname } = window.zeusPrime
+
+  if (typeof gamId !== 'string') {
+    throw new Error(`window.zeusPrime.gamId must be a string. Received: ${String(gamId)}`)
+  }
+
+  addKeyValueToGoogletag(`zeus_${gamId}`, hostname)
+  logger.debug(`Setting zeus_${gamId}=${hostname}`)
+  markStatusComplete('primeKeyValueSet')
+}
+
+function setPrimeAsDisabled() {
+  addKeyValueToGoogletag('zeus_prime', 'false')
+  logger.debug('Disabling prime; Setting key-value zeus_prime to false')
+}
+
+function addKeyValueToGoogletag(key, value) {
+  window.googletag = window.googletag || { cmd: [] }
+  window.googletag.cmd.push(function () {
+    window.googletag.pubads().setTargeting(key, value)
+  })
+}
+
+function isInsightsPage(pathname = '') {
+  const NOT_SECTIONS = [
+    {
+      test: /\/search/,
+      type: 'search',
+    },
+    {
+      test: /\/author/,
+      type: 'author',
+    },
+    {
+      test: /\/event/,
+      type: 'event',
+    },
+    {
+      test: /\/homepage/,
+      type: 'front',
+    },
+    {
+      test: /^\/?$/,
+      type: 'front',
+    },
+  ]
+
+  const typeObj = NOT_SECTIONS.find((pg) => pathname.match(pg.test))
+  return typeObj === undefined
+}
+
+async function getUrlHash(canonical) {
+  try {
+    const buf = await window.crypto.subtle.digest(
+      'SHA-1',
+      new TextEncoder('utf-8').encode(canonical)
+    )
+    const hashed = Array.prototype.map
+      .call(new Uint8Array(buf), (x) => `00${x.toString(16)}`.slice(-2))
+      .join('')
+
+    return hashed
+  } catch (e) {
+    logger.error('Failed to load hash', e.message)
+    logger.debug('Exception', e)
+    return ''
+  }
+}
+
+async function sendPrebidRequest(url) {
+  return new Promise((resolve, reject) => {
+    const ajax = ajaxBuilder()
+    ajax(url, {
+      success: (responseText, response) => {
+        resolve({
+          ...response,
+          status: response.status,
+          json: () => JSON.parse(responseText),
+        })
+      },
+
+      error: (responseText, response) => {
+        if (!response.status) {
+          reject(response)
+        }
+
+        let json = responseText
+        if (responseText) {
+          try {
+            json = JSON.parse(responseText)
+          } catch (_) {
+            json = null
+          }
+        }
+
+        resolve({
+          status: response.status,
+          json: () => json || null,
+          responseValue: json,
+        })
+      },
+    })
+  })
+}
+
+async function requestTopics() {
+  const { api, hostname, pageUrl } = window.zeusPrime
+
+  if (!window.zeusPrime.pageHash) {
+    window.zeusPrime.pageHash = await getUrlHash(pageUrl)
+  }
+
+  const pageHash = window.zeusPrime.pageHash
+  const zeusInsightsUrl = `${api}/${hostname}/${pageHash}?article_location=${pageUrl}`
+
+  logger.debug('Requesting topics', zeusInsightsUrl)
+  try {
+    markStatusComplete('insightsReqSent')
+    const response = await sendPrebidRequest(zeusInsightsUrl)
+    if (response.status === 200) {
+      logger.debug('topics found')
+      markStatusComplete('insightsReqReceived')
+      return await response.json()
+    } else if (
+      response.status === 204 ||
+      response.status < 200 ||
+      (response.status >= 300 && response.status <= 399)
+    ) {
+      logger.debug('no topics found')
+      markStatusComplete('insightsReqReceived')
+      return null
+    } else {
+      logger.error(`Topics request returned error: ${response.status}`)
+      markStatusComplete('insightsReqReceived')
+      return null
+    }
+  } catch (e) {
+    logger.error('failed to request topics', e)
+    return null
+  }
+}
+
+function setTopicsTargeting(topics = []) {
+  if (topics.length === 0) {
+    return
+  }
+
+  window.googletag = window.googletag || { cmd: [] }
+  window.googletag.cmd.push(function () {
+    window.googletag.pubads().setTargeting('zeus_insights', topics)
+  })
+
+  markStatusComplete('insightsKeyValueSet')
+}
+
+async function startTopicsRequest() {
+  if (isInsightsPage(window.zeusPrime.pathname)) {
+    const response = await requestTopics()
+    if (response) {
+      setTopicsTargeting(response?.topics)
+    }
+  } else {
+    logger.debug('This page is not eligible for topics, request will be skipped')
+  }
+}
+
+async function run(gamId, options = {}) {
+  logger.showDebug = options.debug || false
+
+  try {
+    init(gamId, options)
+    loadCommandQueue()
+
+    if (window.zeusPrime.disabled) {
+      setPrimeAsDisabled()
+    } else {
+      setTargeting()
+      await startTopicsRequest()
+    }
+  } catch (e) {
+    logger.error('Failed to run.', e.message || e)
+  } finally {
+    markStatusComplete('scriptComplete')
+  }
+}
+
+/**
+ * @preserve
+ * Initializes the ZeusPrime RTD Submodule. The config provides the GamID for this
+ * site that is used to configure Prime.
+ * @param {object} config The Prebid configuration for this module.
+ * @param {object} config.params The parameters for this module.
+ * @param {string} config.params.gamId The Gam ID (or Network Code) in GAM for this site.
+ */
+function initModule(config) {
+  const { params } = config || {}
+  const { gamId, ...rest } = params || {}
+  run(gamId, rest)
+}
+
+/**
+ * @preserve
+ * @type {RtdSubmodule}
+ */
+const zeusPrimeSubmodule = {
+  /**
+   * @preserve
+   * The name of the plugin.
+   * @type {string}
+   */
+  name: 'zeusPrime',
+
+  /**
+   * @preserve
+   * ZeusPrime use
+   */
+  init: initModule,
+}
+
+/**
+ * @preserve
+ * Register the Sub Module.
+ */
+function registerSubModule() {
+  submodule('realTimeData', zeusPrimeSubmodule)
+}
+
+registerSubModule()
+
+export { zeusPrimeSubmodule }
diff --git a/modules/zeusPrimeRtdProvider.md b/modules/zeusPrimeRtdProvider.md
new file mode 100644
index 00000000000..f3a6c5018d5
--- /dev/null
+++ b/modules/zeusPrimeRtdProvider.md
@@ -0,0 +1,60 @@
+# Overview
+
+Module Name: Zeus Prime RTD Provider
+Module Type: Rtd Provider
+Maintainer: support@zeustechnology.com
+
+## Description
+
+The Zeus Prime RTD Provider provides integration of Zeus Prime onto sites with Prebid. This module will request information from Zeus Prime servers to add the page level targeting required for Prime into the customer's ad setup.
+
+Zeus Prime runs as soon as the code is initialized, so it can retrieve the information required from the Zeus Prime server to create the targeting key-values. Zeus Prime will provide two page level key-values: `zeus_<yourGamId>` and `zeus_insights`. Zeus Prime provides contextual information about a pages content, and does not provide user information that could present privacy implications.
+
+For more information and help with setting up Zeus Prime, see the [onboarding documentation site](https://onboarding.zeustechnology.com).
+
+## Usage
+
+To use Zeus Prime, add `zeusPrimeRtdProvider` into your Prebid build: 
+
+```
+gulp build --modules=rtdModule,zeusPrimeRtdProvider
+```
+
+> Note that the global RTD module, `rtdModule`, is required for the Zeus Prime RTD module.
+
+Once the code is included, configure Zeus Prime in your Prebid configuration: 
+
+```javascript
+pbjs.setConfig({
+  ...,
+  realTimeData: {
+    dataProviders: [{
+      name: 'zeusPrime',
+      waitForIt: false,
+      params: {
+        gamId: '<yourGamId>'
+      }
+    }]
+  },
+  ...
+})
+```
+
+## Parameters
+
+The parameters below describe the configuration object used to configure Zeus Prime. 
+
+| Name                   | Type     | Description                                                                                   | Default |
+|------------------------|----------|-----------------------------------------------------------------------------------------------|---------|
+| name                   | String   | This will always be `zeusPrime`                                                               | -       |
+| waitForIt              | Boolean  | Should be false since Zeus Prime runs on initial load and not during the bidding cycle.       | `false` |
+| params                 | Object   |                                                                                               | -       |
+| params.gamId           | String   | The gamId or Google Ad Manager Network Code to access your Google Ad Manager instance.        | -       |
+
+### `gamId` Parameter
+
+Zeus Prime requires the gamId parameter, or the Google Ad Manager Network Code, to reference your account. See the [Google documentation](https://support.google.com/admanager/answer/7674889?hl=en) to find out where you can retrieve the Network Code.
+
+## Troubleshooting 
+
+For troubleshooting steps and guides to assist with verifying your Zeus Prime installation, see our [installation documentation](https://onboarding.zeustechnology.com/docs/installation).
\ No newline at end of file
diff --git a/test/spec/modules/zeusPrimeRtdProvider_spec.js b/test/spec/modules/zeusPrimeRtdProvider_spec.js
new file mode 100644
index 00000000000..294d98df377
--- /dev/null
+++ b/test/spec/modules/zeusPrimeRtdProvider_spec.js
@@ -0,0 +1,410 @@
+import { zeusPrimeSubmodule } from 'modules/zeusPrimeRtdProvider';
+import { server } from 'test/mocks/xhr.js';
+import * as utils from 'src/utils';
+
+async function waitForStatus(statusVar) {
+  const MAX_COUNT = 20;
+  let count = 0;
+  while (
+    count <= MAX_COUNT &&
+    window.zeusPrime.status &&
+    window.zeusPrime.status[statusVar] !== true
+  ) {
+    count += 1;
+    await new Promise((resolve) => setTimeout(resolve, 10));
+  }
+
+  if (count === MAX_COUNT) {
+    throw new Error('Timeout waiting for zeusPrimeRtdProvider to complete');
+  }
+}
+
+/**
+ * Execute all the commands in the googletag.cmd queue.
+ */
+function executeGoogletagTargeting() {
+  window.googletag.cmd.forEach((cmd) => cmd());
+}
+
+describe('Zeus Prime RTD submodule', () => {
+  let logErrorSpy;
+  let logMessageSpy;
+  let setTargetingStub;
+  let originalGtag;
+
+  beforeEach(() => {
+    logErrorSpy = sinon.spy(utils, 'logError');
+    logMessageSpy = sinon.spy(utils, 'logMessage');
+    setTargetingStub = sinon.stub();
+    window.zeusPrime = { cmd: [] };
+    originalGtag = window.googletag;
+    window.googletag = {
+      cmd: [],
+      pubads: () => ({
+        setTargeting: setTargetingStub,
+      }),
+    };
+
+    // Mock subtle since this doesnt exists in some test environments due to security in newer browsers.
+    if (typeof window.crypto.subtle === 'undefined') {
+      Object.defineProperty(crypto, 'subtle', { value: { digest: () => 'mockHash' } })
+    }
+  });
+
+  afterEach(() => {
+    logErrorSpy.restore();
+    logMessageSpy.restore();
+    window.googletag = originalGtag;
+  });
+
+  it('should init and set key-value for zeus_<gamId>', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/',
+      },
+    });
+
+    // wait for the script to finish
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.callCount(setTargetingStub, 1);
+    sinon.assert.calledWith(setTargetingStub, 'zeus_1234', 'www.example.com');
+  });
+
+  it('should init and set key-value for zeus_<gamId> from command queue', async () => {
+    window.zeusPrime.cmd.push((prime) => (prime.gamId = '9876'));
+    zeusPrimeSubmodule.init({
+      params: {
+        hostname: 'www.example.com',
+        pathname: '/',
+      },
+    });
+
+    // wait for the script to finish
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.callCount(setTargetingStub, 1);
+    sinon.assert.calledWith(setTargetingStub, 'zeus_9876', 'www.example.com');
+  });
+
+  it('should init with values from location and set key-value for zeus_<gamId>', async () => {
+    zeusPrimeSubmodule.init({ params: { gamId: '1234' } });
+
+    // wait for the script to finish
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.callCount(setTargetingStub, 1);
+    sinon.assert.calledWith(setTargetingStub, 'zeus_1234', 'localhost');
+    expect(window.zeusPrime.pathname).to.equal('/context.html');
+  });
+
+  it('should emit error when gamId is not set', async () => {
+    zeusPrimeSubmodule.init({});
+
+    // wait for the script to finish
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(window.googletag.cmd).to.have.length(0);
+    sinon.assert.callCount(setTargetingStub, 0);
+    sinon.assert.calledWith(
+      logErrorSpy,
+      'zeusPrimeRtdProvider: ',
+      'Failed to run.',
+      'window.zeusPrime.gamId must be a string. Received: undefined'
+    );
+  });
+
+  it('should not make a call to the server when url is a homepage', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/',
+      },
+    });
+
+    // wait for the script to finish
+    await waitForStatus('scriptComplete');
+
+    expect(server.requests).to.have.length(0);
+  });
+
+  it('should make a call to the server and set key-vlaue when url is an article page and returns topics', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('insightsReqReceived');
+
+    // Response
+    server.requests[0].respond(
+      200,
+      { 'Content-Type': 'application/json' },
+      '{"topics": ["bs0"]}'
+    );
+
+    // Wait for the script to process the response
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(server.requestCount).to.be.equal(1);
+    expect(window.googletag.cmd).to.have.length(2);
+    sinon.assert.calledTwice(setTargetingStub);
+    sinon.assert.calledWith(
+      setTargetingStub.firstCall,
+      'zeus_1234',
+      'www.example.com'
+    );
+    sinon.assert.calledWith(setTargetingStub.secondCall, 'zeus_insights', [
+      'bs0',
+    ]);
+    sinon.assert.notCalled(logErrorSpy);
+  });
+
+  it('should not set insights keyvalue when server returns 204', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('insightsReqReceived');
+
+    // Response
+    server.requests[0].respond(204, { 'Content-Type': 'application/json' });
+
+    // Wait for the script to process the response
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(server.requestCount).to.be.equal(1);
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.calledOnce(setTargetingStub);
+    sinon.assert.calledWith(
+      setTargetingStub.firstCall,
+      'zeus_1234',
+      'www.example.com'
+    );
+    sinon.assert.notCalled(logErrorSpy);
+  });
+
+  it('should not set insights keyvalue when server returns empty topics array', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('insightsReqReceived');
+
+    // Respond
+    server.requests[0].respond(
+      200,
+      { 'Content-Type': 'application/json' },
+      '{ "topics": [] }'
+    );
+
+    // Wait for the script to process the response
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(server.requestCount).to.be.equal(1);
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.calledOnce(setTargetingStub);
+    sinon.assert.calledWith(
+      setTargetingStub.firstCall,
+      'zeus_1234',
+      'www.example.com'
+    );
+    sinon.assert.notCalled(logErrorSpy);
+  });
+
+  it('should not set insights keyvalue and emit error when server returns error status (400)', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('insightsReqReceived');
+
+    // Response
+    server.requests[0].respond(
+      404,
+      { 'Content-Type': 'application/json' },
+      '{"message": "Not found"}'
+    );
+
+    // Wait for the script to process the response
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(server.requestCount).to.be.equal(1);
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.calledOnce(setTargetingStub);
+    sinon.assert.calledWith(
+      setTargetingStub.firstCall,
+      'zeus_1234',
+      'www.example.com'
+    );
+    sinon.assert.calledWith(
+      logErrorSpy,
+      'zeusPrimeRtdProvider: ',
+      'Topics request returned error: 404'
+    );
+  });
+
+  it('should not set insights keyvalue and emit error when response is not received (network request)', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('insightsReqReceived');
+
+    // Response
+    server.requests[0].error();
+
+    // Wait for the script to process the response
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(server.requestCount).to.be.equal(1);
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.calledOnce(setTargetingStub);
+    sinon.assert.calledWith(
+      setTargetingStub.firstCall,
+      'zeus_1234',
+      'www.example.com'
+    );
+    sinon.assert.calledWith(
+      logErrorSpy,
+      'zeusPrimeRtdProvider: ',
+      'failed to request topics'
+    );
+  });
+
+  it('fails gracefully when crypto fails', async () => {
+    const digestStub = sinon.stub(window.crypto.subtle, 'digest');
+    digestStub.throwsException('Failed to generate digest.');
+
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('scriptComplete');
+
+    sinon.assert.calledWith(
+      logErrorSpy,
+      'zeusPrimeRtdProvider: ',
+      'Failed to load hash'
+    );
+
+    digestStub.restore();
+  });
+
+  it('script should add zeus_prime key and not send request when disabled is set', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        disabled: true,
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('scriptComplete');
+
+    // execute any googletag commands added to the queue during execution
+    executeGoogletagTargeting();
+
+    expect(server.requestCount).to.be.equal(0);
+    expect(window.googletag.cmd).to.have.length(1);
+    sinon.assert.calledWith(setTargetingStub, 'zeus_prime', 'false');
+  });
+
+  it('debug true enables debug logging', async () => {
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        debug: true,
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('scriptComplete');
+
+    sinon.assert.called(logMessageSpy);
+    sinon.assert.notCalled(logErrorSpy);
+  });
+
+  it('debug false disables debug logging', async () => {
+    window.zeusPrime.disabled = false;
+    zeusPrimeSubmodule.init({
+      params: {
+        gamId: '1234',
+        hostname: 'www.example.com',
+        pathname: '/article/some-article',
+      },
+    });
+
+    // Wait for request to be sent
+    await waitForStatus('scriptComplete');
+
+    sinon.assert.notCalled(logMessageSpy);
+    sinon.assert.notCalled(logErrorSpy);
+  });
+});

From 0813039d91c91639903d5b7a92991fff2082cf79 Mon Sep 17 00:00:00 2001
From: Oleksandr Soldatov <oleksandr.soldatov@captify.co.uk>
Date: Tue, 15 Nov 2022 11:53:01 +0200
Subject: [PATCH 437/569] Captify RTD Submodule: Initial release (#9180)

* Captify Live-classification Rtd Submodule

* Fix code-review comments
---
 .../gpt/captifyRtdProvider_example.html       | 167 ++++++++++++
 modules/.submodules.json                      |   1 +
 modules/captifyRtdProvider.js                 | 146 ++++++++++
 modules/captifyRtdProvider.md                 |  68 +++++
 test/spec/modules/captifyRtdProvider_spec.js  | 253 ++++++++++++++++++
 5 files changed, 635 insertions(+)
 create mode 100644 integrationExamples/gpt/captifyRtdProvider_example.html
 create mode 100644 modules/captifyRtdProvider.js
 create mode 100644 modules/captifyRtdProvider.md
 create mode 100644 test/spec/modules/captifyRtdProvider_spec.js

diff --git a/integrationExamples/gpt/captifyRtdProvider_example.html b/integrationExamples/gpt/captifyRtdProvider_example.html
new file mode 100644
index 00000000000..955fbf8be70
--- /dev/null
+++ b/integrationExamples/gpt/captifyRtdProvider_example.html
@@ -0,0 +1,167 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name=viewport content="width=device-width, initial-scale=1">
+    <script type="text/javascript" src="https://cache.consentframework.com/js/pa/1020/c/Y1Dhs/stub" charset="utf-8"></script>
+    <script type="text/javascript" async src="https://choices.consentframework.com/js/pa/1020/c/Y1Dhs/cmp" charset="utf-8"></script>
+</head>
+<body>
+
+<script async src="https://pagead2.googlesyndication.com/tag/js/gpt.js"></script>
+<script src="prebid.js" async></script>
+
+<script>
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function() {
+        pbjs.setConfig({
+            debug: true,
+            realTimeData: {
+                auctionDelay: 1000,
+                dataProviders: [
+                    {
+                        name: "CaptifyRTDModule",
+                        waitForIt: true,
+                        params: {
+                            pubId: 11287,
+                            bidders: ['appnexus'],
+                        }
+                    }
+                ]
+            },
+            consentManagement: {
+                usp: {
+                    cmpApi: 'iab',
+                    timeout: 100 // US Privacy timeout 100ms
+                },
+                gdpr: {
+                    cmpApi: 'iab',
+                    timeout: 8000,
+                    defaultGdprScope: true,
+                    getTCData: {
+                        tcString: 'COwK6gaOwK6gaFmAAAENAPCAAAAAAAAAAAAAAAAAAAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+                        gdprApplies: true,
+                        purpose: {
+                            consents: {
+                                0: true,
+                            },
+                            legitimateInterests: {
+                                0: true,
+                            }
+                        },
+                        vendor: {
+                            consents: {
+                                00: true,
+                            },
+                            legitimateInterests: {
+                                0: true,
+                            }
+                        }
+                    },
+                    rules: [{
+                        purpose: "storage",
+                        enforcePurpose: true,
+                        enforceVendor: true,
+                        vendorExceptions: ["appnexus"] //Can work without consent for cookies
+                    },{
+                        purpose: "basicAds",
+                        enforcePurpose: true,
+                        enforceVendor: true,
+                        vendorExceptions: ["appnexus"]
+                    }]
+                },
+            }
+        });
+    });
+
+</script>
+<script>
+    var div_1_sizes = [
+        [728, 90]
+    ];
+
+    var PREBID_TIMEOUT = 3500;
+    var FAILSAFE_TIMEOUT = 4000;
+
+    var adUnits = [
+        {
+            code: '/19968336/header-bid-tag-0',
+            mediaTypes: {
+                banner: {
+                    sizes: div_1_sizes
+                }
+            },
+            bids: [{
+                bidder: 'appnexus',
+                params: {
+                    placementId: 27445767
+                }
+            }]
+        }
+    ];
+
+    // ======== DO NOT EDIT BELOW THIS LINE =========== //
+    var googletag = googletag || {};
+    googletag.cmd = googletag.cmd || [];
+    googletag.cmd.push(function() {
+        googletag.pubads().disableInitialLoad();
+    });
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function() {
+        pbjs.addAdUnits(adUnits);
+        pbjs.requestBids({
+            bidsBackHandler: initAdserver,
+            timeout: PREBID_TIMEOUT
+        });
+    });
+
+    function initAdserver() {
+        if (pbjs.initAdserverSet) return;
+        pbjs.initAdserverSet = true;
+        googletag.cmd.push(function() {
+            pbjs.que.push(function() {
+                pbjs.setTargetingForGPTAsync();
+                googletag.pubads().refresh();
+            });
+        });
+    }
+
+
+    // in case PBJS doesn't load
+    setTimeout(function() {
+        initAdserver();
+    }, FAILSAFE_TIMEOUT);
+
+    googletag.cmd.push(function() {
+        googletag.defineSlot('/19968336/header-bid-tag-0', div_1_sizes, 'div-1').addService(googletag.pubads());
+        googletag.pubads().enableSingleRequest();
+        googletag.enableServices();
+    });
+
+</script>
+
+<article>
+    <p>
+        Module will add key/value pairs in ad calls.
+        Check out for captify_segments key in the payload sent to Xandr to endpoint https://ib.adnxs.com/ut/v3/prebid : keywords.key[captify_segments] should have an array of string as value.
+        This array will have Xandr RTSS segment ids.
+    </p>
+</article>
+<h2>Basic Prebid.js Example with CaptifyRTD </h2>
+<h5>Div-1</h5>
+<div id='div-1'>
+    <script type='text/javascript'>
+        googletag.cmd.push(function() {
+            googletag.display('div-1');
+        });
+
+    </script>
+</div>
+
+</body>
+</html>
diff --git a/modules/.submodules.json b/modules/.submodules.json
index 52bbc638c79..f8c30459e1e 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -57,6 +57,7 @@
       "akamaiDapRtdProvider",
       "blueconicRtdProvider",
       "browsiRtdProvider",
+      "captifyRtdProvider",
       "dgkeywordRtdProvider",
       "geoedgeRtdProvider",
       "hadronRtdProvider",
diff --git a/modules/captifyRtdProvider.js b/modules/captifyRtdProvider.js
new file mode 100644
index 00000000000..b97aa49a48e
--- /dev/null
+++ b/modules/captifyRtdProvider.js
@@ -0,0 +1,146 @@
+/**
+ * This module adds Captify real time data provider module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch segments (page-centric) from Captify live-classification server
+ * @module modules/captifyRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import { submodule } from '../src/hook.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+import {deepAccess, isArray, isEmptyStr, isNumber, logError} from '../src/utils.js';
+import {getGlobal} from '../src/prebidGlobal.js';
+
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'CaptifyRTDModule';
+const DEFAULT_LC_URL = 'https://live-classification.cpx.to/prebid-segments';
+
+const STATUS = {
+  SUCCESS: 200,
+  ACCEPTED: 202,
+};
+
+/**
+ * Set `appnexusAuctionKeywords` that appnexus bidder will read and send in request to Xandr
+ * @param {Array<number>} segments captify segments for Appnexus(Xandr) system, in form of [id1, id2, id3]
+ *                 where id1, id2, id3 - actual Xandr segment ids with keywords enabled
+ */
+export function setAppnexusSegments(segments) {
+  config.setConfig({
+    appnexusAuctionKeywords: {
+      'captify_segments': segments,
+    },
+  })
+}
+
+/**
+ * Function returns only bidders that contained both, in moduleConfig and at least one adUnit.
+ * @param {Array<string>} bidders Contains list of bidders, to set targeting for
+ * @param {Object} data Response of live-classification service
+ */
+export function addSegmentData(bidders, data) {
+  for (const bidder of bidders) {
+    if (bidder === 'appnexus') { setAppnexusSegments(data['xandr']) }
+  }
+}
+
+/**
+ * Function returns only bidders that contained in both, moduleConfig and at least one adUnit.
+ * @param {Object} moduleConfig Config object passed to the module
+ * @param {Object} reqBidsConfigObj Config object for the bidders; each adapter has its own entry
+ */
+export function getMatchingBidders(moduleConfig, reqBidsConfigObj) {
+  const biddersFromConf = deepAccess(moduleConfig, 'params.bidders');
+
+  const adUnitBidders = reqBidsConfigObj.adUnits
+    .flatMap(({bids}) => bids.map(({bidder}) => bidder))
+    .filter((e, i, a) => a.indexOf(e) === i);
+
+  if (!isArray(adUnitBidders) || !adUnitBidders.length) {
+    logError(SUBMODULE_NAME, 'Missing parameter bidders in bidRequestConfig');
+    return [];
+  }
+
+  return biddersFromConf.filter(bidder => adUnitBidders.includes(bidder));
+}
+
+/**
+ * Main function that sets Captify targeting for various bidders
+ * @param {Object} moduleConfig Config object passed to the module
+ * @param {Function} onDone callback function that executed when everything is done
+ * @param {Object} reqBidsConfigObj Config object for the bidders; each adapter has its own entry
+ * @param {Object} gcv contains data related to user consent, if applies
+ */
+export function setCaptifyTargeting(reqBidsConfigObj, onDone, moduleConfig, gcv) {
+  const pbjsVer = getGlobal();
+  const ref = getRefererInfo().referer;
+  const url = document.URL;
+  const pubId = moduleConfig.params.pubId;
+  const bidders = getMatchingBidders(moduleConfig, reqBidsConfigObj)
+  const requestBody = {
+    pubId,
+    ref,
+    url,
+    pbjsVer,
+    gcv
+  };
+  let requestUrl = moduleConfig.params.url;
+  if (!requestUrl || isEmptyStr(requestUrl)) {
+    requestUrl = DEFAULT_LC_URL;
+  }
+
+  if (!bidders.length) {
+    logError(SUBMODULE_NAME, 'There are no matched bidders to work with');
+    return;
+  }
+
+  ajax(requestUrl, {
+    success: function (response, req) {
+      if (req.status === STATUS.SUCCESS) {
+        try {
+          const data = JSON.parse(response);
+          if (data) {
+            addSegmentData(bidders, data);
+          }
+        } catch (e) {
+          logError(SUBMODULE_NAME, 'Unable to parse live-classification data' + e);
+        }
+      }
+      onDone();
+    },
+    error: function () {
+      onDone();
+      logError(SUBMODULE_NAME, 'Unable to get live-classification data');
+    }
+  },
+  JSON.stringify(requestBody),
+  {
+    contentType: 'application/json',
+    method: 'POST',
+  });
+}
+
+export function init(moduleConfig, userConsent) {
+  // Validate bidders
+  const biddersFromConf = deepAccess(moduleConfig, 'params.bidders');
+  if (!isArray(biddersFromConf) || !biddersFromConf.length) {
+    logError(SUBMODULE_NAME, 'Missing parameter bidders in moduleConfig');
+    return false
+  }
+  const publisherId = deepAccess(moduleConfig, 'params.pubId');
+  // Publisher Id
+  if (!isNumber(publisherId)) {
+    logError(SUBMODULE_NAME, 'Missing parameter pubId in moduleConfig');
+    return false
+  }
+  return true
+}
+
+export const captifySubmodule = {
+  name: SUBMODULE_NAME,
+  init: init,
+  setCaptifyTargeting
+};
+
+submodule(MODULE_NAME, captifySubmodule);
diff --git a/modules/captifyRtdProvider.md b/modules/captifyRtdProvider.md
new file mode 100644
index 00000000000..a1a8e9c273f
--- /dev/null
+++ b/modules/captifyRtdProvider.md
@@ -0,0 +1,68 @@
+# Captify Real-Time Data Submodule
+
+# Overview
+
+    Module Name: Captify Rtd Provider
+    Module Type: Rtd Provider
+	Layout: integrationExamples/gpt/captifyRtdProvider_example.html
+    Maintainer: prebid@captify.tech
+
+# Description
+
+Captify uses publisher first-party on-site search data to power machine learning algorithms to create a suite of
+contextual based targeting solutions that activate in a cookieless environment.
+
+The RTD submodule allows bid requests to be classified by our live-classification service on the first ad call,
+maximising value for publishers by increasing scale for advertisers.
+
+Segments will be attached to bid request objects sent to different SSPs in order to optimize targeting.
+
+Contact prebid@captify.tech for information.
+
+### Publisher Usage
+
+Compile the Captify RTD module into your Prebid build:
+
+`npm ci && gulp build --modules=rtdModule,appnexusBidAdapter,captifyRtdProvider`
+
+Add the Captify RTD provider to your Prebid config.
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [
+            {
+                name: "CaptifyRTDModule",
+                waitForIt: true,
+                params: {
+                    pubId: 123456,
+                    bidders: ['appnexus'],
+                }
+            }
+        ]
+    }
+});
+```
+
+### Parameter Description
+This module is configured as part of the `realTimeData.dataProviders` object.
+
+| Name           |Type           | Description                                                         |Mandatory | Notes  |
+| :------------- | :------------ | :------------------------------------------------------------------ |:---------|:------------ |
+| name           | String        | Real time data module name                                          | yes     | Always 'CaptifyRTDModule' |
+| waitForIt      | Boolean       | Should be `true` if there's an `auctionDelay` defined (recommended) | no      | Default `false` |
+| params         | Object        | |  | |
+| params.pubId   | Integer       | Partner ID, required to get results and provided by Captify         | yes      | Use 123456 for tests and speak to your Captify account manager to receive your pubId |
+| params.bidders | Array<String> | List of bidders for which you would like data to be set             | yes      | Currently only 'appnexus' supported |
+| params.url     | String        | Captify live-classification service url                             | no       | Defaults to `https://live-classification.cpx.to/prebid-segments`
+
+### Testing
+
+To view an example of available segments returned by Captify:
+
+`gulp serve --modules=rtdModule,captifyRtdProvider,appnexusBidAdapter`
+
+and then point your browser at:
+
+`http://localhost:9999/integrationExamples/gpt/captifyRtdProvider_example.html?pbjs_debug=true`
diff --git a/test/spec/modules/captifyRtdProvider_spec.js b/test/spec/modules/captifyRtdProvider_spec.js
new file mode 100644
index 00000000000..2e1052e000f
--- /dev/null
+++ b/test/spec/modules/captifyRtdProvider_spec.js
@@ -0,0 +1,253 @@
+import {addSegmentData, captifySubmodule, getMatchingBidders, setCaptifyTargeting} from 'modules/captifyRtdProvider.js';
+import {server} from 'test/mocks/xhr.js';
+import {config} from 'src/config.js';
+import {deepAccess} from '../../../src/utils';
+
+const responseHeader = {'Content-Type': 'application/json'};
+const defaultRequestUrl = 'https://live-classification.cpx.to/prebid-segments';
+
+describe('captifyRtdProvider', function () {
+  describe('init function', function () {
+    it('successfully instantiates, when configured properly', function () {
+      const config = {
+        params: {
+          pubId: 123456,
+          bidders: ['appnexus'],
+        }
+      };
+      expect(captifySubmodule.init(config, null)).to.equal(true);
+    });
+
+    it('return false on init, when config is invalid', function () {
+      const config = {
+        params: {}
+      };
+      expect(captifySubmodule.init(config, null)).to.equal(false);
+      expect(captifySubmodule.init(null, null)).to.equal(false);
+    });
+
+    it('return false on init, when pubId is absent', function () {
+      const config = {
+        params: {
+          bidders: ['appnexus'],
+        }
+      };
+      expect(captifySubmodule.init(config, null)).to.equal(false);
+      expect(captifySubmodule.init(null, null)).to.equal(false);
+    });
+
+    it('return false on init, when bidders is empty array', function () {
+      const config = {
+        params: {
+          bidders: [],
+          pubId: 123,
+        }
+      };
+      expect(captifySubmodule.init(config, null)).to.equal(false);
+      expect(captifySubmodule.init(null, null)).to.equal(false);
+    });
+  });
+
+  describe('addSegmentData function', function () {
+    it('adds segment data', function () {
+      config.resetConfig();
+
+      let data = {
+        xandr: [111111, 222222],
+      };
+
+      addSegmentData(['appnexus'], data);
+      expect(deepAccess(config.getConfig(), 'appnexusAuctionKeywords.captify_segments')).to.eql(data['xandr']);
+    });
+  });
+
+  describe('getMatchingBidders function', function () {
+    it('returns only bidders that used within adUnits', function () {
+      const moduleConfig = {
+        params: {
+          pubId: 123,
+          bidders: ['appnexus', 'pubmatic'],
+        }
+      };
+      let reqBidsConfigObj = {
+        adUnits: [{
+          bids: [{
+            bidder: 'appnexus',
+            params: {
+              placementId: 13144370
+            }
+          }]
+        }]
+      };
+
+      let matchedBidders = getMatchingBidders(moduleConfig, reqBidsConfigObj);
+      expect(matchedBidders).to.eql(['appnexus']);
+    });
+
+    it('return empty result, when there are no bidders configured for adUnits', function () {
+      const moduleConfig = {
+        params: {
+          pubId: 123,
+          bidders: ['pubmatic'],
+        }
+      };
+      let reqBidsConfigObj = {
+        adUnits: [{
+          bids: []
+        }]
+      };
+      expect(getMatchingBidders(moduleConfig, reqBidsConfigObj)).to.be.empty;
+    });
+
+    it('return empty result, when there are no bidders matched', function () {
+      const moduleConfig = {
+        params: {
+          pubId: 123,
+          bidders: ['pubmatic'],
+        }
+      };
+      let reqBidsConfigObj = {
+        adUnits: [{
+          bids: [{
+            params: {
+              bidder: 'appnexus',
+              placementId: 13144370,
+            }
+          }]
+        }]
+      };
+      expect(getMatchingBidders(moduleConfig, reqBidsConfigObj)).to.be.empty;
+    });
+
+    it('return empty result, when there are no adUnits with bidders', function () {
+      const moduleConfig = {
+        params: {
+          pubId: 123,
+          bidders: ['pubmatic'],
+        }
+      };
+      let reqBidsConfigObj = {
+        adUnits: [{
+          bids: [{
+            params: {
+              placementId: 13144370,
+            }
+          }]
+        }]
+      };
+      expect(getMatchingBidders(moduleConfig, reqBidsConfigObj)).to.be.empty;
+    });
+  });
+
+  describe('integration test with mock live-classification response', function () {
+    const moduleConfig = {
+      params: {
+        pubId: 123456,
+        bidders: ['appnexus'],
+      }
+    };
+
+    const reqBidsConfigObj = {
+      adUnits: [{
+        bids: [{
+          bidder: 'appnexus',
+          params: {
+            placementId: 13144370
+          }
+        }, {
+          bidder: 'other'
+        }]
+      }]
+    };
+
+    const expectedUrlParam = 'http://localhost:9876/context.html';
+
+    it('gets data from async request and adds segment data', function () {
+      config.resetConfig();
+      let data = {xandr: [111111, 222222]};
+      const callbackSpy = sinon.spy();
+      setCaptifyTargeting(reqBidsConfigObj, callbackSpy, moduleConfig, {});
+      let request = server.requests[0];
+      let requestBody = JSON.parse(server.requests[0].requestBody);
+      expect(request.url).to.be.eq(defaultRequestUrl);
+      expect(requestBody['pubId']).to.eq(moduleConfig.params.pubId);
+      expect(requestBody['url']).to.eq(expectedUrlParam);
+      request.respond(200, responseHeader, JSON.stringify(data));
+      expect(deepAccess(config.getConfig(), 'appnexusAuctionKeywords.captify_segments')).to.eql(data['xandr']);
+      expect(callbackSpy.calledOnce).to.be.true;
+    });
+
+    it('do not send classification request, if no matching adUnits on page', function () {
+      config.resetConfig();
+      let reqBidsConfigObj = {
+        adUnits: [{
+          bids: [
+            {bidder: 'pubmatic'}
+          ]
+        }]
+      };
+      const callbackSpy = sinon.spy();
+      setCaptifyTargeting(reqBidsConfigObj, callbackSpy, moduleConfig, {});
+      expect(server.requests).to.be.empty;
+    });
+
+    it('gets data from async request and adds segment data, using URL from config', function () {
+      config.resetConfig();
+      let data = {xandr: [111111, 222222]};
+      const callbackSpy = sinon.spy();
+      const testUrl = 'http://my-test-server.com/path';
+      const conf = {
+        params: {
+          url: testUrl,
+          pubId: 123456,
+          bidders: ['appnexus'],
+        }
+      };
+      setCaptifyTargeting(reqBidsConfigObj, callbackSpy, conf, {});
+      let request = server.requests[0];
+      let requestBody = JSON.parse(server.requests[0].requestBody);
+      expect(request.url).to.be.eq(testUrl);
+      expect(requestBody['pubId']).to.eq(conf.params.pubId);
+      expect(requestBody['url']).to.eq(expectedUrlParam);
+      request.respond(200, responseHeader, JSON.stringify(data));
+      expect(deepAccess(config.getConfig(), 'appnexusAuctionKeywords.captify_segments')).to.eql(data['xandr']);
+      expect(callbackSpy.calledOnce).to.be.true;
+    });
+
+    it('do not set anything, in case server responded with 202', function () {
+      config.resetConfig();
+      const callbackSpy = sinon.spy();
+      setCaptifyTargeting(reqBidsConfigObj, callbackSpy, moduleConfig, {});
+      let request = server.requests[0];
+      let requestBody = JSON.parse(server.requests[0].requestBody);
+      expect(request.url).to.be.eq(defaultRequestUrl);
+      expect(requestBody['pubId']).to.eq(moduleConfig.params.pubId);
+      expect(requestBody['url']).to.eq(expectedUrlParam);
+      request.respond(202, responseHeader, '');
+      expect(deepAccess(config.getConfig(), 'appnexusAuctionKeywords.captify_segments')).to.be.undefined;
+      expect(callbackSpy.calledOnce).to.be.true;
+    });
+
+    it('do not set anything, in case server responded with error', function () {
+      config.resetConfig();
+      const callbackSpy = sinon.spy();
+      setCaptifyTargeting(reqBidsConfigObj, callbackSpy, moduleConfig, {});
+      let request = server.requests[0];
+      expect(request.url).to.be.eq(defaultRequestUrl);
+      request.respond(500, null, '');
+      expect(deepAccess(config.getConfig(), 'appnexusAuctionKeywords.captify_segments')).to.be.undefined;
+      expect(callbackSpy.calledOnce).to.be.true;
+    });
+
+    it('do not set anything, in case request error', function () {
+      config.resetConfig();
+      const callbackSpy = sinon.spy();
+      setCaptifyTargeting(reqBidsConfigObj, callbackSpy, moduleConfig, {});
+      let request = server.requests[0];
+      expect(request.url).to.be.eq(defaultRequestUrl);
+      request.abort('test error');
+      expect(deepAccess(config.getConfig(), 'appnexusAuctionKeywords.captify_segments')).to.be.undefined;
+      expect(callbackSpy.calledOnce).to.be.true;
+    });
+  });
+});

From e7b2e86412d3f4b709954aa10457557f0c37c743 Mon Sep 17 00:00:00 2001
From: Mikhail Ivanchenko <mihail.ivanchenko@nextmillennium.io>
Date: Tue, 15 Nov 2022 15:18:38 +0300
Subject: [PATCH 438/569] nextMillennium Bid Adapter: a new cookiesync URL
 (#9221)

* add video support

* Sync URL was changed
---
 modules/nextMillenniumBidAdapter.js           | 42 +++++++++----------
 .../modules/nextMillenniumBidAdapter_spec.js  |  7 ++--
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index 762c571f1e6..802a8ac25b0 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -22,7 +22,7 @@ import { getRefererInfo } from '../src/refererDetection.js';
 const BIDDER_CODE = 'nextMillennium';
 const ENDPOINT = 'https://pbs.nextmillmedia.com/openrtb2/auction';
 const TEST_ENDPOINT = 'https://test.pbs.nextmillmedia.com/openrtb2/auction';
-const SYNC_ENDPOINT = 'https://statics.nextmillmedia.com/load-cookie.html?v=4';
+const SYNC_ENDPOINT = 'https://cookies.nextmillmedia.com/sync?';
 const TIME_TO_LIVE = 360;
 const VIDEO_PARAMS = [
   'api', 'linearity', 'maxduration', 'mimes', 'minduration', 'placement',
@@ -198,28 +198,24 @@ export const spec = {
   },
 
   getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
-    if (!syncOptions.iframeEnabled) {
-      return;
-    };
-
-    let syncurl = gdprConsent && gdprConsent.gdprApplies ? `${SYNC_ENDPOINT}&gdpr=1&gdpr_consent=${gdprConsent.consentString}` : SYNC_ENDPOINT;
-
-    let bidders = [];
-    if (responses) {
-      _each(responses, (response) => {
-        if (!(response && response.body && response.body.ext && response.body.ext.responsetimemillis)) return;
-        _each(Object.keys(response.body.ext.responsetimemillis), b => bidders.push(b));
-      });
-    };
-
-    if (bidders.length) {
-      syncurl += `&bidders=${bidders.join(',')}`;
-    };
-
-    return [{
-      type: 'iframe',
-      url: syncurl
-    }];
+    const pixels = [];
+    let syncUrl = SYNC_ENDPOINT;
+
+    if (gdprConsent && gdprConsent.gdprApplies) {
+      syncUrl += 'gdpr=1&gdpr_consent=' + gdprConsent.consentString;
+    }
+    if (uspConsent) {
+      syncUrl += 'us_privacy=' + uspConsent;
+    }
+
+    if (syncOptions.iframeEnabled) {
+      pixels.push({type: 'iframe', url: syncUrl + 'type=iframe'});
+    }
+    if (syncOptions.pixelEnabled) {
+      pixels.push({type: 'image', url: syncUrl + 'type=image'});
+    }
+
+    return pixels;
   },
 };
 
diff --git a/test/spec/modules/nextMillenniumBidAdapter_spec.js b/test/spec/modules/nextMillenniumBidAdapter_spec.js
index 36920245070..2b5ae801489 100644
--- a/test/spec/modules/nextMillenniumBidAdapter_spec.js
+++ b/test/spec/modules/nextMillenniumBidAdapter_spec.js
@@ -148,14 +148,15 @@ describe('nextMillenniumBidAdapterTests', function() {
 
   it('Test getUserSyncs function', function () {
     const syncOptions = {
-      'iframeEnabled': true
+      'iframeEnabled': false,
+      'pixelEnabled': true
     }
     const userSync = spec.getUserSyncs(syncOptions);
     expect(userSync).to.be.an('array').with.lengthOf(1);
     expect(userSync[0].type).to.exist;
     expect(userSync[0].url).to.exist;
-    expect(userSync[0].type).to.be.equal('iframe');
-    expect(userSync[0].url).to.be.equal('https://statics.nextmillmedia.com/load-cookie.html?v=4');
+    expect(userSync[0].type).to.be.equal('image');
+    expect(userSync[0].url).to.be.equal('https://cookies.nextmillmedia.com/sync?type=image');
   });
 
   it('validate_response_params', function() {

From cb766ccf4da3a316bc20c0440f1577e1f5f1590a Mon Sep 17 00:00:00 2001
From: ahmadlob <109217988+ahmadlob@users.noreply.github.com>
Date: Tue, 15 Nov 2022 15:11:52 +0200
Subject: [PATCH 439/569] Taboola Bid Adapter: unsupport dynamic endpoint
 (#9237)

* create taboola adapter

* create taboola adapter md

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* update the md

* update the Maintainer email

* * update MD page
* refactor code for better readability
* small fix in UT

* * add privacy to the request builder
* add relevant Ut
* small fixes in UT

* * code refactoring + add more accurate way to get page url and referer
* add relevant Ut
* small fixes in md

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * update end point url
* update UT
* Update banner End point structure

* small fixes + update epi url

* remove the destruction from the bidResponse property

* (update the unit tests) remove the destruction from the bidResponse property

* fix tests

* fix tests - run stubs on each test

* rerun because of another adapter flaky test

* rerun because of another adapter flaky test

* fix cors issue, switch between height, width position

* update badv, bcat to be based in the ortb2 to support prebid 7 new protocols + update Ut

* retry run circleci

* retry run circleci

* pull from upstream
update md (placement + pub )

* update badv, bcat UT

* rerun build

* rerun build

* support storageAllowed restriction on unit tests for prebid 7

* create taboola adapter

* create taboola adapter md

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* taboolaBidAdapter.js - small fixes
taboolaBidAdapter_spec.js - new UT

* update the md

* update the Maintainer email

* * update MD page
* refactor code for better readability
* small fix in UT

* * add privacy to the request builder
* add relevant Ut
* small fixes in UT

* * code refactoring + add more accurate way to get page url and referer
* add relevant Ut
* small fixes in md

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * code refactoring + gte user id
* add relevant Ut
* small fixes

* * update end point url
* update UT
* Update banner End point structure

* small fixes + update epi url

* remove the destruction from the bidResponse property

* (update the unit tests) remove the destruction from the bidResponse property

* fix tests

* fix tests - run stubs on each test

* rerun because of another adapter flaky test

* rerun because of another adapter flaky test

* fix cors issue, switch between height, width position

* update badv, bcat to be based in the ortb2 to support prebid 7 new protocols + update Ut

* retry run circleci

* retry run circleci

* pull from upstream
update md (placement + pub )

* update badv, bcat UT

* rerun build

* rerun build

* support storageAllowed restriction on unit tests for prebid 7

* support storageAllowed restriction on unit tests for prebid 7

* add it also to the aftereach

* add it also to the aftereach

* change the api endpoint https protocol

* update Taboola prebid documentation:
tagId, publisherId, bidFloor.

* update bid response ttl to 60 seconds.

* update Taboola prebid documentation.

* update-ttl-passing

* Update taboolaBidAdapter_spec.js

* add fallback default value in case of null

* add semicolons

* .

* .

* .

* ..

* ...

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* support-dynamic-endpoint-url

* optional-chaining

* set netRevenue to true.

* fix bid response in case we have multiple impressions

* add test

* fix lint

* unsupport-dynamic-endpoint

Co-authored-by: Michael <michael.ziso@taboola.com>
Co-authored-by: mikiz <31058500+mikizi@users.noreply.github.com>
Co-authored-by: jenny.l <jenny.l@taboola.com>
Co-authored-by: jennylt <48404417+jennylt@users.noreply.github.com>
Co-authored-by: Shakhal Levinson <shakhal.l@taboola.com>
Co-authored-by: shakhaltb <108469576+shakhaltb@users.noreply.github.com>
---
 modules/taboolaBidAdapter.js                |  6 +-
 modules/taboolaBidAdapter.md                |  2 -
 test/spec/modules/taboolaBidAdapter_spec.js | 77 ---------------------
 3 files changed, 3 insertions(+), 82 deletions(-)

diff --git a/modules/taboolaBidAdapter.js b/modules/taboolaBidAdapter.js
index d4bf6623f9b..9bd42651796 100644
--- a/modules/taboolaBidAdapter.js
+++ b/modules/taboolaBidAdapter.js
@@ -9,7 +9,7 @@ import {getStorageManager} from '../src/storageManager.js';
 const BIDDER_CODE = 'taboola';
 const GVLID = 42;
 const CURRENCY = 'USD';
-export const END_POINT_URL = 'https://hb.bidder.taboola.com/TaboolaHBOpenRTBRequestHandlerServlet';
+export const END_POINT_URL = 'https://display.bidder.taboola.com/OpenRTB/TaboolaHB/auction';
 const USER_ID = 'user-id';
 const STORAGE_KEY = `taboola global:${USER_ID}`;
 const COOKIE_KEY = 'trc_cookie_storage';
@@ -80,7 +80,7 @@ export const spec = {
   buildRequests: (validBidRequests, bidderRequest) => {
     const [bidRequest] = validBidRequests;
     const {refererInfo, gdprConsent = {}, uspConsent} = bidderRequest;
-    const {publisherId, endpointUrl} = bidRequest.params;
+    const {publisherId} = bidRequest.params;
     const site = getSiteProperties(bidRequest.params, refererInfo);
     const device = {ua: navigator.userAgent};
     const imps = getImps(validBidRequests);
@@ -124,7 +124,7 @@ export const spec = {
       regs
     };
 
-    const url = [endpointUrl || END_POINT_URL, publisherId].join('/');
+    const url = [END_POINT_URL, publisherId].join('/');
 
     return {
       url,
diff --git a/modules/taboolaBidAdapter.md b/modules/taboolaBidAdapter.md
index d63616d23a9..79538d0d48b 100644
--- a/modules/taboolaBidAdapter.md
+++ b/modules/taboolaBidAdapter.md
@@ -31,7 +31,6 @@ The Taboola Bidding adapter requires setup before beginning. Please contact us o
       bidfloor: 0.25, // Optional - default is null
       bcat: ['IAB1-1'], // Optional - default is []
       badv: ['example.com'],  // Optional - default is []
-      endpointUrl: ['https://example.com']  // Optional
     }
   }]
 }];
@@ -46,6 +45,5 @@ The Taboola Bidding adapter requires setup before beginning. Please contact us o
 | `bcat`        | optional | List of blocked advertiser categories (IAB)             | `['IAB1-1']`               | `Array`      |
 | `badv`        | optional | Blocked Advertiser Domains                              | `'example.com'`            | `String Url` |
 | `bidfloor`    | optional | CPM bid floor                                           | `0.25`                     | `Float`      |
-| `endpointUrl` | optional | Endpoint Url (only if provided by Taboola)              | `https://example.com`      | `String`     |
 
 
diff --git a/test/spec/modules/taboolaBidAdapter_spec.js b/test/spec/modules/taboolaBidAdapter_spec.js
index 9af11363957..c0b16ac40fc 100644
--- a/test/spec/modules/taboolaBidAdapter_spec.js
+++ b/test/spec/modules/taboolaBidAdapter_spec.js
@@ -89,45 +89,6 @@ describe('Taboola Adapter', function () {
       }
       expect(spec.isBidRequestValid(bid)).to.equal(true)
     })
-
-    it('should succeed when url is null', function () {
-      const bid = {
-        bidder: 'taboola',
-        params: {
-          publisherId: 'publisherId',
-          tagId: 'below the article',
-          endpointUrl: null
-        },
-        ...displayBidRequestParams
-      }
-      expect(spec.isBidRequestValid(bid)).to.equal(true)
-    })
-
-    it('should succeed when url is empty string', function () {
-      const bid = {
-        bidder: 'taboola',
-        params: {
-          publisherId: 'publisherId',
-          tagId: 'below the article',
-          endpointUrl: ''
-        },
-        ...displayBidRequestParams
-      }
-      expect(spec.isBidRequestValid(bid)).to.equal(true)
-    })
-
-    it('should succeed when url is filled', function () {
-      const bid = {
-        bidder: 'taboola',
-        params: {
-          publisherId: 'publisherId',
-          tagId: 'below the article',
-          endpointUrl: 'https://example.com'
-        },
-        ...displayBidRequestParams
-      }
-      expect(spec.isBidRequestValid(bid)).to.equal(true)
-    })
   })
 
   describe('buildRequests', function () {
@@ -189,44 +150,6 @@ describe('Taboola Adapter', function () {
       expect(res.data).to.deep.equal(JSON.stringify(expectedData));
     });
 
-    it('should fill the url when it is passed', function () {
-      const commonBidRequestWithUrl = {
-        bidder: 'taboola',
-        params: {
-          publisherId: 'publisherId',
-          tagId: 'placement name',
-          endpointUrl: 'https://example.com'
-        },
-        bidId: 'aa43860a-4644-442a-b5e0-93f268cs4d19',
-        auctionId: '65746dca-26f3-4186-be13-dfa63469b1b7',
-      }
-      let defaultBidRequestWithUrl = {
-        ...commonBidRequestWithUrl,
-        ...displayBidRequestParams,
-      }
-      const res = spec.buildRequests([defaultBidRequestWithUrl], commonBidderRequest);
-      expect(res.url).to.equal(`${commonBidRequestWithUrl.params.endpointUrl}/${commonBidRequest.params.publisherId}`);
-    })
-
-    it('should fill default url when url param is empty string', function () {
-      const commonBidRequestWithUrl = {
-        bidder: 'taboola',
-        params: {
-          publisherId: 'publisherId',
-          tagId: 'placement name',
-          endpointUrl: ''
-        },
-        bidId: 'aa43860a-4644-442a-b5e0-93f268cs4d19',
-        auctionId: '65746dca-26f3-4186-be13-dfa63469b1b7',
-      }
-      let defaultBidRequestWithUrl = {
-        ...commonBidRequestWithUrl,
-        ...displayBidRequestParams,
-      }
-      const res = spec.buildRequests([defaultBidRequestWithUrl], commonBidderRequest);
-      expect(res.url).to.equal(`${END_POINT_URL}/${commonBidRequestWithUrl.params.publisherId}`);
-    })
-
     it('should pass optional parameters in request', function () {
       const optionalParams = {
         bidfloor: 0.25,

From e717dcdfdead403d1c0369259c63480cd3b85b7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Sok=C3=B3=C5=82?=
 <88041828+smart-adserver@users.noreply.github.com>
Date: Tue, 15 Nov 2022 14:42:50 +0100
Subject: [PATCH 440/569] Smartadserver Bid Adapter: discard bid response if ad
 and adUrl empty (#9213)

* Discard bid response if ad and adUrl empty

* Restore removeAll in U.T.

* Restore one more removeAll
---
 modules/smartadserverBidAdapter.js            |  2 +-
 .../modules/smartadserverBidAdapter_spec.js   | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/modules/smartadserverBidAdapter.js b/modules/smartadserverBidAdapter.js
index 5d64cad27b5..b1a69407df4 100644
--- a/modules/smartadserverBidAdapter.js
+++ b/modules/smartadserverBidAdapter.js
@@ -209,7 +209,7 @@ export const spec = {
     const bidResponses = [];
     let response = serverResponse.body;
     try {
-      if (response && !response.isNoAd) {
+      if (response && !response.isNoAd && (response.ad || response.adUrl)) {
         const bidRequest = JSON.parse(bidRequestString.data);
 
         let bidResponse = {
diff --git a/test/spec/modules/smartadserverBidAdapter_spec.js b/test/spec/modules/smartadserverBidAdapter_spec.js
index 727a7d7c1d6..18308481e1a 100644
--- a/test/spec/modules/smartadserverBidAdapter_spec.js
+++ b/test/spec/modules/smartadserverBidAdapter_spec.js
@@ -200,6 +200,27 @@ describe('Smart bid adapter tests', function () {
     }).to.not.throw();
   });
 
+  it('Should not nest response if ad and adUrl empty', () => {
+    const BID_RESPONSE_EMPTY = {
+      body: {
+        ad: null,
+        adUrl: null,
+        cpm: 0.92,
+        isNoAd: false
+      }
+    };
+
+    const request = spec.buildRequests(DEFAULT_PARAMS);
+    const bids = spec.interpretResponse(BID_RESPONSE_EMPTY, request[0]);
+
+    expect(bids).to.have.lengthOf(0);
+    expect(() => {
+      spec.interpretResponse(BID_RESPONSE_EMPTY, {
+        data: 'invalid Json'
+      });
+    }).to.not.throw();
+  });
+
   it('Verify parse response', function () {
     const request = spec.buildRequests(DEFAULT_PARAMS);
     const bids = spec.interpretResponse(BID_RESPONSE, request[0]);

From 39958eab94b751377ebd2dfdff5a98bb9f0b0c97 Mon Sep 17 00:00:00 2001
From: pm-azhar-mulla <75726247+pm-azhar-mulla@users.noreply.github.com>
Date: Tue, 15 Nov 2022 19:39:59 +0530
Subject: [PATCH 441/569] updated the correct variable while setting cookie
 (#9234)

Co-authored-by: pm-azhar-mulla <azhar@L1119.local>
---
 modules/userId/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/userId/index.js b/modules/userId/index.js
index 8fdd4319dfc..fe47ac5c16d 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -240,7 +240,7 @@ export function setStoredValue(submodule, value) {
     const valueStr = isPlainObject(value) ? JSON.stringify(value) : value;
     if (storage.type === COOKIE) {
       const setCookie = cookieSetter(submodule);
-      setCookie(null, value, expiresStr);
+      setCookie(null, valueStr, expiresStr);
       if (typeof storage.refreshInSeconds === 'number') {
         setCookie('_last', new Date().toUTCString(), expiresStr);
       }

From 4e6904202a00be39c67845c74b55c113f688adef Mon Sep 17 00:00:00 2001
From: Gino <53079123+Skylinar@users.noreply.github.com>
Date: Tue, 15 Nov 2022 16:34:20 +0100
Subject: [PATCH 442/569] Smartx Bid Adapter: Add Schain support (#9244)

* Add smartclipBidAdapter

* smartxBidAdapter.js - removed unused variables, removed debug, added window before the outstream related functions

* - made outstream player configurable

* remove wrong named files

* camelcase

* fix

* Out-Stream render update to SmartPlay 5.2

* ESlint fix

* ESlint fix

* ESlint fix

* adjust tests, fixes

* ESlint

* adjusted desired bitrate examples

* added bid.meta.advertiserDomains support

* bug fix for numeric elementID outstream render

* fix renderer url

* support for floors module

* bugfixes to be openRTB 2.5 compliant

* update internal renderer usage

* remove unused outstream_function logic

* bugfix outstream options for default outstream renderer configuration

* [PREB-10] fix empty title not configurable

* add pbjs version

* testing with outstream 5.3.0

* pbjs version into content.ext

* made visibilityThreshold configurable

* adjust position of pbjs version

* Merge branch 'master' of https://github.com/prebid/Prebid.js into HEAD

* update smartclip outstream player version to support outstream 6 release along with necessary config changes

* Add support for schain

* vacuuming

Co-authored-by: smartclip AdTechnology <adtech@smartclip.com>
Co-authored-by: Gino Cirlini <adtech@smartclip.tv>
Co-authored-by: smartclip-adtech <65160328+smartclip-adtech@users.noreply.github.com>
---
 modules/smartxBidAdapter.js                | 17 +++++++-----
 test/spec/modules/smartxBidAdapter_spec.js | 32 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/modules/smartxBidAdapter.js b/modules/smartxBidAdapter.js
index e5f71265e34..f8438a35000 100644
--- a/modules/smartxBidAdapter.js
+++ b/modules/smartxBidAdapter.js
@@ -67,7 +67,6 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function (bidRequests, bidderRequest) {
-    // TODO: does the fallback make sense here?
     const page = bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation;
     const isPageSecure = !!page.match(/^https:/)
 
@@ -197,6 +196,15 @@ export const spec = {
         userExt.fpc = pubcid;
       }
 
+      // Add schain object if available
+      if (bid && bid.schain) {
+        requestPayload['source'] = {
+          ext: {
+            schain: bid.schain
+          }
+        };
+      }
+
       // Only add the user object if it's not empty
       if (!isEmpty(userExt)) {
         requestPayload.user = {
@@ -204,9 +212,7 @@ export const spec = {
         };
       }
 
-      //     requestPayload.user.ext.ver = pbjs.version;
-
-      // Targeting
+      // Add targeting
       if (getBidIdParameter('data', bid.params.user)) {
         var targetingarr = [];
         for (var i = 0; i < bid.params.user.data.length; i++) {
@@ -225,8 +231,6 @@ export const spec = {
           }
         }
 
-        // Todo: USER ID MODULE
-
         requestPayload.user = {
           ext: userExt,
           data: targetingarr
@@ -269,7 +273,6 @@ export const spec = {
           }
           /**
            * Make sure currency and price are the right ones
-           * TODO: what about the pre_market_bid partners sizes?
            */
           _each(currentBidRequest.params.pre_market_bids, function (pmb) {
             if (pmb.deal_id == smartxBid.id) {
diff --git a/test/spec/modules/smartxBidAdapter_spec.js b/test/spec/modules/smartxBidAdapter_spec.js
index 58ce50efb8e..5bd08064c79 100644
--- a/test/spec/modules/smartxBidAdapter_spec.js
+++ b/test/spec/modules/smartxBidAdapter_spec.js
@@ -342,6 +342,38 @@ describe('The smartx adapter', function () {
       expect(request.data.imp[0].video.minduration).to.equal(3);
       expect(request.data.imp[0].video.maxduration).to.equal(15);
     });
+
+    it('should pass schain param', function () {
+      var request;
+
+      bid.schain = {
+        complete: 1,
+        nodes: [
+          {
+            asi: 'indirectseller.com',
+            sid: '00001',
+            hp: 1
+          }
+        ]
+      }
+
+      request = spec.buildRequests([bid], bidRequestObj)[0];
+
+      expect(request.data.source).to.deep.equal({
+        ext: {
+          schain: {
+            complete: 1,
+            nodes: [
+              {
+                asi: 'indirectseller.com',
+                sid: '00001',
+                hp: 1
+              }
+            ]
+          }
+        }
+      })
+    });
   });
 
   describe('interpretResponse', function () {

From ba3d37159214dc9915ba7e6c28b27033d6e27eb6 Mon Sep 17 00:00:00 2001
From: mmoschovas <63253416+mmoschovas@users.noreply.github.com>
Date: Tue, 15 Nov 2022 16:12:47 -0500
Subject: [PATCH 443/569] Fix to merge site fpd into payload as opposed to
 overwriting (#9247)

---
 modules/ttdBidAdapter.js                |  7 ++++---
 test/spec/modules/ttdBidAdapter_spec.js | 13 +++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/modules/ttdBidAdapter.js b/modules/ttdBidAdapter.js
index a855c07dc86..56dc44827b7 100644
--- a/modules/ttdBidAdapter.js
+++ b/modules/ttdBidAdapter.js
@@ -132,14 +132,15 @@ function getUser(bidderRequest) {
 }
 
 function getSite(bidderRequest, firstPartyData) {
-  var site = {
+  var site = utils.mergeDeep({
     page: utils.deepAccess(bidderRequest, 'refererInfo.page'),
     ref: utils.deepAccess(bidderRequest, 'refererInfo.ref'),
     publisher: {
       id: utils.deepAccess(bidderRequest, 'bids.0.params.publisherId'),
     },
-    ...firstPartyData.site
-  };
+  },
+  firstPartyData.site
+  );
 
   var publisherDomain = bidderRequest.refererInfo.domain;
   if (publisherDomain) {
diff --git a/test/spec/modules/ttdBidAdapter_spec.js b/test/spec/modules/ttdBidAdapter_spec.js
index 60c00f4e4b9..346f1ef88f6 100644
--- a/test/spec/modules/ttdBidAdapter_spec.js
+++ b/test/spec/modules/ttdBidAdapter_spec.js
@@ -310,6 +310,19 @@ describe('ttdBidAdapter', function () {
       expect(requestBody.imp[0].banner.expdir).to.equal(expdir);
     });
 
+    it('merges first party site data', function () {
+      const ortb2 = {
+        site: {
+          publisher: {
+            domain: 'https://foo.bar',
+          }
+        }
+      };
+      const requestBody = testBuildRequests(baseBannerBidRequests, {...baseBidderRequest, ortb2}).data;
+      config.resetConfig();
+      expect(requestBody.site.publisher).to.deep.equal({domain: 'https://foo.bar', id: '13144370'});
+    });
+
     it('sets keywords properly if sent', function () {
       const ortb2 = {
         site: {

From 625d2755d23187a92af0a5e7b5afe16f0c30a9d3 Mon Sep 17 00:00:00 2001
From: BaronJHYu <254878848@qq.com>
Date: Wed, 16 Nov 2022 21:00:33 +0800
Subject: [PATCH 444/569] Discovery Bid Adapter : parameter updates (#9249)

* Mediago Bid Adapter:new adapter

* remove console

* change spec file to fix CircleCI

* change spec file to fix CircleCI

* change spec file

* Update mediagoBidAdapter.js

* Update mediagoBidAdapter.js

* rerun CurcleCi

* update mediagoBidAdapter

* update discoveryBidAdapter

Co-authored-by: BaronYu <baronwei11@gmail.com>
---
 modules/discoveryBidAdapter.js                | 55 +++++++++++++------
 modules/discoveryBidAdapter.md                | 13 +++--
 test/spec/modules/discoveryBidAdapter_spec.js | 17 +++---
 3 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/modules/discoveryBidAdapter.js b/modules/discoveryBidAdapter.js
index 4f22a41cf9f..fab3920efcc 100644
--- a/modules/discoveryBidAdapter.js
+++ b/modules/discoveryBidAdapter.js
@@ -12,7 +12,8 @@ let itemMaps = {};
 const MEDIATYPE = [BANNER, NATIVE];
 
 /* ----- _ss_pp_id:start ------ */
-const COOKIE_KEY_MGUID = '_ss_pp_id';
+const COOKIE_KEY_SSPPID = '_ss_pp_id';
+const COOKIE_KEY_MGUID = '__mguid_';
 
 const NATIVERET = {
   id: 'id',
@@ -58,14 +59,20 @@ const NATIVERET = {
  * @return {string}
  */
 const getUserID = () => {
-  const i = storage.getCookie(COOKIE_KEY_MGUID);
+  let idd = storage.getCookie(COOKIE_KEY_SSPPID);
+  let idm = storage.getCookie(COOKIE_KEY_MGUID);
 
-  if (i === null) {
+  if (idd && !idm) {
+    idm = idd
+  } else if (idm && !idd) {
+    idd = idm
+  } else if (!idd && !idm) {
     const uuid = utils.generateUUID();
     storage.setCookie(COOKIE_KEY_MGUID, uuid);
+    storage.setCookie(COOKIE_KEY_SSPPID, uuid);
     return uuid;
   }
-  return i;
+  return idd;
 };
 
 /* ----- _ss_pp_id:end ------ */
@@ -80,7 +87,6 @@ function getKv(obj, ...keys) {
   let o = obj;
 
   for (let key of keys) {
-    // console.log(key, o);
     if (o && o[key]) {
       o = o[key];
     } else {
@@ -222,7 +228,7 @@ function getItems(validBidRequests, bidderRequest) {
     let id = '' + (i + 1);
 
     if (mediaTypes.native) {
-      ret = {...NATIVERET, ...{id, bidFloor}}
+      ret = { ...NATIVERET, ...{ id, bidFloor } }
     }
     // banner
     if (mediaTypes.banner) {
@@ -249,6 +255,7 @@ function getItems(validBidRequests, bidderRequest) {
           pos: 1,
         },
         ext: {},
+        tagid: globals['tagid'],
       };
     }
     itemMaps[id] = {
@@ -273,14 +280,19 @@ function getParam(validBidRequests, bidderRequest) {
   let auctionId = getKv(bidderRequest, 'auctionId');
   let items = getItems(validBidRequests, bidderRequest);
 
-  const location = utils.deepAccess(bidderRequest, 'refererInfo.referer');
-
   const timeout = bidderRequest.timeout || 2000;
 
+  const domain = utils.deepAccess(bidderRequest, 'refererInfo.domain') || document.domain;
+  const location = utils.deepAccess(bidderRequest, 'refererInfo.referer');
+  const page = utils.deepAccess(bidderRequest, 'refererInfo.page');
+  const referer = utils.deepAccess(bidderRequest, 'refererInfo.ref');
+
   if (items && items.length) {
     let c = {
       id: 'pp_hbjs_' + auctionId,
       at: 1,
+      bcat: globals['bcat'],
+      badv: globals['adv'],
       cur: ['USD'],
       device: {
         connectiontype: 0,
@@ -295,16 +307,16 @@ function getParam(validBidRequests, bidderRequest) {
       },
       tmax: timeout,
       site: {
-        name: globals['media'],
-        domain: globals['media'],
-        page: location,
-        ref: location,
+        name: domain,
+        domain: domain,
+        page: page || location,
+        ref: referer,
         mobile: isMobile,
         cat: [], // todo
         publisher: {
+          id: globals['publisher']
           // todo
-          id: globals['media'],
-          name: globals['media'],
+          // name: xxx
         },
       },
       imp: items,
@@ -329,10 +341,19 @@ export const spec = {
     if (bid.params.token) {
       globals['token'] = bid.params.token;
     }
-    if (bid.params.media) {
-      globals['media'] = bid.params.media;
+    if (bid.params.publisher) {
+      globals['publisher'] = bid.params.publisher;
+    }
+    if (bid.params.tagid) {
+      globals['tagid'] = bid.params.tagid;
+    }
+    if (bid.params.bcat) {
+      globals['bcat'] = Array.isArray(bid.params.bcat) ? bid.params.bcat : [];
+    }
+    if (bid.params.badv) {
+      globals['badv'] = Array.isArray(bid.params.badv) ? bid.params.badv : [];
     }
-    return !!(bid.params.token && bid.params.media);
+    return !!(bid.params.token && bid.params.publisher && bid.params.tagid);
   },
 
   /**
diff --git a/modules/discoveryBidAdapter.md b/modules/discoveryBidAdapter.md
index 6e7197863a5..e951b0b7448 100644
--- a/modules/discoveryBidAdapter.md
+++ b/modules/discoveryBidAdapter.md
@@ -1,15 +1,15 @@
 # Overview
 
 ```
-Module Name: DiscoveryDSP Bid Adapter
+Module Name: discovery Bid Adapter
 Module Type: Bidder Adapter
 ```
 
 # Description
 
-Module that connects to popIn's demand sources
+Module that connects to popIn's demand sources.
 
-The DiscoveryDSP Bidding adapter requires setup before beginning. Please contact us at <media-support@popin.cc>
+The discovery Bidding adapter requires setup before beginning. Please contact us at <media-support@popin.cc>
 
 # Test Parameters
 ```
@@ -32,7 +32,8 @@ The DiscoveryDSP Bidding adapter requires setup before beginning. Please contact
             bidder: "discovery",
             params: {
               token: "a1b067897e4ae093d1f94261e0ddc6c9",
-              media: 'test_media' // your media host
+              tagid: 'test_tagid',
+              publisher: 'test_publisher'
             },
           },
         ],
@@ -45,13 +46,13 @@ The DiscoveryDSP Bidding adapter requires setup before beginning. Please contact
             sizes: [[300, 250]],
           },
         },
-        // Replace this object to test a new adapter!
         bids: [
           {
             bidder: "discovery",
             params: {
               token: "d0f4902b616cc5c38cbe0a08676d0ed9",
-              media: 'test_media' // your media host
+              tagid: 'test_tagid',
+              publisher: 'test_publisher'
             },
           },
         ],
diff --git a/test/spec/modules/discoveryBidAdapter_spec.js b/test/spec/modules/discoveryBidAdapter_spec.js
index a30afd96ad1..078add73046 100644
--- a/test/spec/modules/discoveryBidAdapter_spec.js
+++ b/test/spec/modules/discoveryBidAdapter_spec.js
@@ -1,14 +1,14 @@
 import { expect } from 'chai';
 import { spec } from 'modules/discoveryBidAdapter.js';
 
-describe('DiscoveryDSP:BidAdapterTests', function () {
+describe('discovery:BidAdapterTests', function () {
   let bidRequestData = {
-    bidderCode: 'DiscoveryDSP',
+    bidderCode: 'discovery',
     auctionId: 'ff66e39e-4075-4d18-9854-56fde9b879ac',
     bidderRequestId: '4fec04e87ad785',
     bids: [
       {
-        bidder: 'DiscoveryDSP',
+        bidder: 'discovery',
         params: {
           token: 'd0f4902b616cc5c38cbe0a08676d0ed9',
         },
@@ -32,25 +32,26 @@ describe('DiscoveryDSP:BidAdapterTests', function () {
   };
   let request = [];
 
-  it('DiscoveryDSP:validate_pub_params', function () {
+  it('discovery:validate_pub_params', function () {
     expect(
       spec.isBidRequestValid({
-        bidder: 'DiscoveryDSP',
+        bidder: 'discovery',
         params: {
           token: ['d0f4902b616cc5c38cbe0a08676d0ed9'],
-          media: ['test_media']
+          tagid: ['test_tagid'],
+          publisher: ['test_publisher']
         },
       })
     ).to.equal(true);
   });
 
-  it('DiscoveryDSP:validate_generated_params', function () {
+  it('discovery:validate_generated_params', function () {
     request = spec.buildRequests(bidRequestData.bids, bidRequestData);
     let req_data = JSON.parse(request.data);
     expect(req_data.imp).to.have.lengthOf(1);
   });
 
-  it('DiscoveryDSP:validate_response_params', function () {
+  it('discovery:validate_response_params', function () {
     let tempAdm = '<link rel=\"stylesheet\" href=\"https://cdn.mediago.io/js/style/style_banner_336x280_standard.css\"><div id=\"mgcontainer-e1746bcc817beaba9d63bd4254aad533\" class=\"mediago-placement_46ee9c c336x280_standard_46ee9c mediago-placement c336x280_standard\" style=\"width:336px;height:280px;overflow:hidden\"><a class=\"mediago-placement-track_46ee9c mediago-placement-track\" title=\"秘密のしかけのネックレスをプレゼントした男性。2年後に彼女は中身に気付いて悲鳴を上げた\" href=\"https://trace.mediago.cc/api/bidder/track?tn=d0f4902b616cc5c38cbe0a08676d0ed9&price=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&evt=102&rid=3f6700b5e61e1476bed629b6ea6c7a4d&campaignid=1366258&impid=50-3663.infoseek.co.jp.336x280-1&offerid=28316825&test=0&time=1660811542&cp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&clickid=50_3f6700b5e61e1476bed629b6ea6c7a4d_50-3663.infoseek.co.jp.336x280-1&acid=1120&trackingid=e1746bcc817beaba9d63bd4254aad533&uid=7544198412013119947&jt=2&url=O7fi1nLA9qLQjcPq7rIDvxMyybMbcc2iUh-TuaqiVSD1Dj4cKrR82gRYdWy1Ao22yhq2FoY79tmyI3X_bsO3CusXggmpW8bZvwTlHPxfOxekArClcRSpWmkVorlnMSYf7yM6QBVTuTLCCP-cK8eXMZnQVR7PdOImYZGJis6q9Xx9MToxvPkWRVa13OaCtKVeqzGdglYH3G2mqo1qLP1RCCZJHE1Fq8fgCYmLJ0Xli-nLvFZjt3g0HIui_IvyZi6YtXS97p9ohgfgDJnqcGH6l053AP0cO7ZQDHtS2_9P9UqgaA47gmltDVEDkSThX7js&bm=50&la=ja&cn=jp&cid=4215873&info=x_ME1qzmB7TY6hTSn_XUw5s6N-EkBgxcE4qJ0fd9amgsJzO3-Gtm2Nja777SyGlpkF6k_tSzbcLYYecYQlHncOAAIyuNaT2rvqrhxrQPfC7opZUGQ8WMx4Rwkx8R2k0nDiBI8xnegLWYTvY-Fc99Rw&sid=38__149__12__24__144__163__47__1__99&sp=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&scp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&acu=JPY&scu=USD&sgcp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&gprice=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&gcp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&ah=&pb=m&de=infoseek.co.jp&cat=&iv=0\" target=\"_blank\"><div class=\"mediago-placement-top_46ee9c mediago-placement-top\" style=\"background-image:url(https://d2cli4kgl5uxre.cloudfront.net/ML/d8e9b4aa20fae1739d2aad8c926d3f15__scv1__306x304.png)\"></div></a><div class=\"mediago-placement-bottom_46ee9c mediago-placement-bottom\"><div class=\"mediago-middle_46ee9c mediago-middle\"><a class=\"mediago-placement-track_46ee9c mediago-placement-track\" title=\"秘密のしかけのネックレスをプレゼントした男性。2年後に彼女は中身に気付いて悲鳴を上げた\" href=\"https://trace.mediago.cc/api/bidder/track?tn=d0f4902b616cc5c38cbe0a08676d0ed9&price=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&evt=102&rid=3f6700b5e61e1476bed629b6ea6c7a4d&campaignid=1366258&impid=50-3663.infoseek.co.jp.336x280-1&offerid=28316825&test=0&time=1660811542&cp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&clickid=50_3f6700b5e61e1476bed629b6ea6c7a4d_50-3663.infoseek.co.jp.336x280-1&acid=1120&trackingid=e1746bcc817beaba9d63bd4254aad533&uid=7544198412013119947&jt=2&url=O7fi1nLA9qLQjcPq7rIDvxMyybMbcc2iUh-TuaqiVSD1Dj4cKrR82gRYdWy1Ao22yhq2FoY79tmyI3X_bsO3CusXggmpW8bZvwTlHPxfOxekArClcRSpWmkVorlnMSYf7yM6QBVTuTLCCP-cK8eXMZnQVR7PdOImYZGJis6q9Xx9MToxvPkWRVa13OaCtKVeqzGdglYH3G2mqo1qLP1RCCZJHE1Fq8fgCYmLJ0Xli-nLvFZjt3g0HIui_IvyZi6YtXS97p9ohgfgDJnqcGH6l053AP0cO7ZQDHtS2_9P9UqgaA47gmltDVEDkSThX7js&bm=50&la=ja&cn=jp&cid=4215873&info=x_ME1qzmB7TY6hTSn_XUw5s6N-EkBgxcE4qJ0fd9amgsJzO3-Gtm2Nja777SyGlpkF6k_tSzbcLYYecYQlHncOAAIyuNaT2rvqrhxrQPfC7opZUGQ8WMx4Rwkx8R2k0nDiBI8xnegLWYTvY-Fc99Rw&sid=38__149__12__24__144__163__47__1__99&sp=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&scp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&acu=JPY&scu=USD&sgcp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&gprice=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&gcp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&ah=&pb=m&de=infoseek.co.jp&cat=&iv=0\" target=\"_blank\"><div class=\"mediago-title_46ee9c mediago-title\">秘密のしかけのネックレスをプレゼントした男性。2年後に彼女は中身に気付いて悲鳴を上げた</div></a><div style=\"margin-top:10px;\"><a class=\"mediago-ad-icon_46ee9c mediago-ad-icon\" title=\"ad\" href=\"//www.mediago.io/privacy\" target=\"_blank\">AD</a> <a class=\"mediago-placement-track_46ee9c mediago-placement-track\" title=\"秘密のしかけのネックレスをプレゼントした男性。2年後に彼女は中身に気付いて悲鳴を上げた\" href=\"https://trace.mediago.cc/api/bidder/track?tn=d0f4902b616cc5c38cbe0a08676d0ed9&price=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&evt=102&rid=3f6700b5e61e1476bed629b6ea6c7a4d&campaignid=1366258&impid=50-3663.infoseek.co.jp.336x280-1&offerid=28316825&test=0&time=1660811542&cp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&clickid=50_3f6700b5e61e1476bed629b6ea6c7a4d_50-3663.infoseek.co.jp.336x280-1&acid=1120&trackingid=e1746bcc817beaba9d63bd4254aad533&uid=7544198412013119947&jt=2&url=O7fi1nLA9qLQjcPq7rIDvxMyybMbcc2iUh-TuaqiVSD1Dj4cKrR82gRYdWy1Ao22yhq2FoY79tmyI3X_bsO3CusXggmpW8bZvwTlHPxfOxekArClcRSpWmkVorlnMSYf7yM6QBVTuTLCCP-cK8eXMZnQVR7PdOImYZGJis6q9Xx9MToxvPkWRVa13OaCtKVeqzGdglYH3G2mqo1qLP1RCCZJHE1Fq8fgCYmLJ0Xli-nLvFZjt3g0HIui_IvyZi6YtXS97p9ohgfgDJnqcGH6l053AP0cO7ZQDHtS2_9P9UqgaA47gmltDVEDkSThX7js&bm=50&la=ja&cn=jp&cid=4215873&info=x_ME1qzmB7TY6hTSn_XUw5s6N-EkBgxcE4qJ0fd9amgsJzO3-Gtm2Nja777SyGlpkF6k_tSzbcLYYecYQlHncOAAIyuNaT2rvqrhxrQPfC7opZUGQ8WMx4Rwkx8R2k0nDiBI8xnegLWYTvY-Fc99Rw&sid=38__149__12__24__144__163__47__1__99&sp=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&scp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&acu=JPY&scu=USD&sgcp=mMrvLk32jGlArvPzkLzohkmMOOp6YSaVPquxpJIAub4&gprice=zM_t6HbCS8OclsiLiZUjtAqxHOGHkHjKXNZ9_buiV_s&gcp=WDWnWmVvDyEauBe8AfxyP7vfEVRzDMzzKOeztgGoSWY&ah=&pb=m&de=infoseek.co.jp&cat=&iv=0\" target=\"_blank\"><div class=\"mediago-brand-name_46ee9c mediago-brand-name\">Factable</div></a></div></div></div></div>'
     tempAdm += '%3Cscr';
     tempAdm += 'ipt%3E';

From e7b981d51636bef2a56237ccb36d79913432bccc Mon Sep 17 00:00:00 2001
From: mcourouble <117740024+mcourouble@users.noreply.github.com>
Date: Wed, 16 Nov 2022 14:10:27 +0100
Subject: [PATCH 445/569] Smartadserver Bid Adapter: add support for SDA user
 and site (#9231)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Smartadserver Bid Adapter: Add support for SDA user and site

* Smartadserver Bid Adapter: Fix SDA support getConfig and add to unit testing

Co-authored-by: Krzysztof Sokół <88041828+smart-adserver@users.noreply.github.com>
---
 modules/smartadserverBidAdapter.js            |  6 +-
 .../modules/smartadserverBidAdapter_spec.js   | 59 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/modules/smartadserverBidAdapter.js b/modules/smartadserverBidAdapter.js
index b1a69407df4..6ff0e592542 100644
--- a/modules/smartadserverBidAdapter.js
+++ b/modules/smartadserverBidAdapter.js
@@ -133,6 +133,8 @@ export const spec = {
     // use bidderRequest.bids[] to get bidder-dependent request info
 
     const adServerCurrency = config.getConfig('currency.adServerCurrency');
+    const sellerDefinedAudience = deepAccess(bidderRequest, 'ortb2.user.data', config.getAnyConfig('ortb2.user.data'));
+    const sellerDefinedContext = deepAccess(bidderRequest, 'ortb2.site.content.data', config.getAnyConfig('ortb2.site.content.data'));
 
     // pull requested transaction ID from bidderRequest.bids[].transactionId
     return validBidRequests.reduce((bidRequests, bid) => {
@@ -154,7 +156,9 @@ export const spec = {
         timeout: config.getConfig('bidderTimeout'),
         bidId: bid.bidId,
         prebidVersion: '$prebid.version$',
-        schain: spec.serializeSupplyChain(bid.schain)
+        schain: spec.serializeSupplyChain(bid.schain),
+        sda: sellerDefinedAudience,
+        sdc: sellerDefinedContext
       };
 
       if (bidderRequest && bidderRequest.gdprConsent) {
diff --git a/test/spec/modules/smartadserverBidAdapter_spec.js b/test/spec/modules/smartadserverBidAdapter_spec.js
index 18308481e1a..db61983c9c9 100644
--- a/test/spec/modules/smartadserverBidAdapter_spec.js
+++ b/test/spec/modules/smartadserverBidAdapter_spec.js
@@ -158,12 +158,44 @@ describe('Smart bid adapter tests', function () {
     }
   };
 
+  var sellerDefinedAudience = [
+    {
+      'name': 'hearst.com',
+      'ext': { 'segtax': 1 },
+      'segment': [
+        { 'id': '1001' },
+        { 'id': '1002' }
+      ]
+    }
+  ];
+
+  var sellerDefinedContext = [
+    {
+      'name': 'cnn.com',
+      'ext': { 'segtax': 2 },
+      'segment': [
+        { 'id': '2002' }
+      ]
+    }
+  ];
+
   it('Verify build request', function () {
     config.setConfig({
       'currency': {
         'adServerCurrency': 'EUR'
+      },
+      ortb2: {
+        'user': {
+          'data': sellerDefinedAudience
+        },
+        'site': {
+          'content': {
+            'data': sellerDefinedContext
+          }
+        }
       }
     });
+
     const request = spec.buildRequests(DEFAULT_PARAMS);
     expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
     expect(request[0]).to.have.property('method').and.to.equal('POST');
@@ -186,6 +218,8 @@ describe('Smart bid adapter tests', function () {
     expect(requestContent).to.have.property('buid').and.to.equal('7569');
     expect(requestContent).to.have.property('appname').and.to.equal('Mozilla');
     expect(requestContent).to.have.property('ckid').and.to.equal(42);
+    expect(requestContent).to.have.property('sda').and.to.deep.equal(sellerDefinedAudience);
+    expect(requestContent).to.have.property('sdc').and.to.deep.equal(sellerDefinedContext);
   });
 
   it('Verify parse response with no ad', function () {
@@ -358,6 +392,7 @@ describe('Smart bid adapter tests', function () {
 
   describe('gdpr tests', function () {
     afterEach(function () {
+      config.setConfig({ ortb2: undefined });
       config.resetConfig();
       $$PREBID_GLOBAL$$.requestBids.removeAll();
     });
@@ -489,6 +524,16 @@ describe('Smart bid adapter tests', function () {
       config.setConfig({
         'currency': {
           'adServerCurrency': 'EUR'
+        },
+        ortb2: {
+          'user': {
+            'data': sellerDefinedAudience
+          },
+          'site': {
+            'content': {
+              'data': sellerDefinedContext
+            }
+          }
         }
       });
       const request = spec.buildRequests(INSTREAM_DEFAULT_PARAMS);
@@ -507,6 +552,8 @@ describe('Smart bid adapter tests', function () {
       expect(requestContent).to.have.property('buid').and.to.equal('7569');
       expect(requestContent).to.have.property('appname').and.to.equal('Mozilla');
       expect(requestContent).to.have.property('ckid').and.to.equal(42);
+      expect(requestContent).to.have.property('sda').and.to.deep.equal(sellerDefinedAudience);
+      expect(requestContent).to.have.property('sdc').and.to.deep.equal(sellerDefinedContext);
       expect(requestContent).to.have.property('isVideo').and.to.equal(true);
       expect(requestContent).to.have.property('videoData');
       expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(6);
@@ -748,6 +795,16 @@ describe('Smart bid adapter tests', function () {
       config.setConfig({
         'currency': {
           'adServerCurrency': 'EUR'
+        },
+        ortb2: {
+          'user': {
+            'data': sellerDefinedAudience
+          },
+          'site': {
+            'content': {
+              'data': sellerDefinedContext
+            }
+          }
         }
       });
       const request = spec.buildRequests(OUTSTREAM_DEFAULT_PARAMS);
@@ -766,6 +823,8 @@ describe('Smart bid adapter tests', function () {
       expect(requestContent).to.have.property('buid').and.to.equal('7579');
       expect(requestContent).to.have.property('appname').and.to.equal('Mozilla');
       expect(requestContent).to.have.property('ckid').and.to.equal(43);
+      expect(requestContent).to.have.property('sda').and.to.deep.equal(sellerDefinedAudience);
+      expect(requestContent).to.have.property('sdc').and.to.deep.equal(sellerDefinedContext);
       expect(requestContent).to.have.property('isVideo').and.to.equal(false);
       expect(requestContent).to.have.property('videoData');
       expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(7);

From f5e6c61404c93b1a055c81071bebaf277b15e4c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Udi=20Talias=20=E2=9A=9B=EF=B8=8F?= <udi.talias@gmail.com>
Date: Wed, 16 Nov 2022 18:13:38 +0200
Subject: [PATCH 446/569] VidazooBidAdapter: get bid floor using `bid.getFloor`
  (#9238)

* feat(module): multi size request

* fix getUserSyncs
added tests

* update(module): package-lock.json from master

* feat(module): VidazooBidAdapter - send top query params to server

* added bid.getFloor handler

Co-authored-by: roman <shmoop207@gmail.com>
Co-authored-by: Saar Amrani <89377180+saar120@users.noreply.github.com>
Co-authored-by: Saar Amrani <saar120@gmail.com>
---
 modules/vidazooBidAdapter.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index fa44bde74f1..ac74dd18405 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -1,4 +1,4 @@
-import {_each, deepAccess, parseSizesInput, parseUrl, uniques} from '../src/utils.js';
+import { _each, deepAccess, parseSizesInput, parseUrl, uniques, isFn } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
@@ -59,7 +59,8 @@ function isBidRequestValid(bid) {
 
 function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
   const { params, bidId, userId, adUnitCode, schain } = bid;
-  const { bidFloor, ext } = params;
+  const { ext } = params;
+  let { bidFloor } = params;
   const hashUrl = hashCode(topWindowUrl);
   const dealId = getNextDealId(hashUrl);
   const uniqueDealId = getUniqueDealId(hashUrl);
@@ -69,6 +70,18 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
   const subDomain = extractSubDomain(params);
   const ptrace = getCacheOpt();
 
+  if (isFn(bid.getFloor)) {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*'
+    });
+
+    if (floorInfo.currency === 'USD') {
+      bidFloor = floorInfo.floor;
+    }
+  }
+
   let data = {
     url: encodeURIComponent(topWindowUrl),
     uqs: getTopWindowQueryParams(),

From c3f789bb64a2d298b80b747ced74feea4cd0ba57 Mon Sep 17 00:00:00 2001
From: Vladimir <muravjovv1@gmail.com>
Date: Thu, 17 Nov 2022 00:55:05 +0300
Subject: [PATCH 447/569] Viqeo Bid Adapter: initial adapter release (#8920)

* add viqeo prebid adapter

* added bid params to docs

* updated to Outstream

* updated to Outstream (tests)
---
 modules/viqeoBidAdapter.js                | 180 ++++++++++++++++++++++
 modules/viqeoBidAdapter.md                |  56 +++++++
 test/spec/modules/viqeoBidAdapter_spec.js | 124 +++++++++++++++
 3 files changed, 360 insertions(+)
 create mode 100644 modules/viqeoBidAdapter.js
 create mode 100644 modules/viqeoBidAdapter.md
 create mode 100644 test/spec/modules/viqeoBidAdapter_spec.js

diff --git a/modules/viqeoBidAdapter.js b/modules/viqeoBidAdapter.js
new file mode 100644
index 00000000000..5762a794c8e
--- /dev/null
+++ b/modules/viqeoBidAdapter.js
@@ -0,0 +1,180 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {logError, logInfo, _each, mergeDeep, isFn, isNumber, isPlainObject} from '../src/utils.js'
+import {VIDEO} from '../src/mediaTypes.js';
+import {Renderer} from '../src/Renderer.js';
+
+const BIDDER_CODE = 'viqeo';
+const DEFAULT_MIMES = ['application/javascript'];
+const VIQEO_ENDPOINT = 'https://ads.betweendigital.com/openrtb_bid';
+const RENDERER_URL = 'https://cdn.viqeo.tv/js/vq_starter.js';
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_SSPID = 44697;
+
+function getBidFloor(bid) {
+  const {floor, currency} = bid.params;
+  const curr = currency || DEFAULT_CURRENCY;
+  if (!isFn(bid.getFloor)) {
+    return {floor: isNumber(floor) ? floor : 0, currency: curr};
+  }
+  const floorInfo = bid.getFloor({currency: curr, mediaType: VIDEO, size: '*'});
+  if (isPlainObject(floorInfo) && isNumber(floorInfo.floor) && floorInfo.currency === curr) {
+    return floorInfo;
+  }
+  return {floor: floor || 0, currency: currency || DEFAULT_CURRENCY};
+}
+
+function getVideoTargetingParams({mediaTypes: {video}}) {
+  const result = {};
+  Object.keys(Object(video))
+    .forEach(key => {
+      if (key === 'playerSize') {
+        result.w = video.playerSize[0][0];
+        result.h = video.playerSize[0][1];
+      } else if (key !== 'context') {
+        result[key] = video[key];
+      }
+    })
+  return result;
+}
+
+/**
+ * @type {BidderSpec}
+ */
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [VIDEO],
+  /**
+   * @param {BidRequest} bidRequest The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: ({params}) => {
+    if (!params) {
+      logError('failed validation: params not declared');
+      return false;
+    }
+    if (!params.user && !params.user?.buyeruid) {
+      logError('failed validation: user.buyeruid not declared');
+      return false;
+    }
+    if (!params.playerOptions) {
+      logError('failed validation: playerOptions not declared');
+      return false;
+    }
+    const {profileId, videoId, playerId} = params.playerOptions;
+    if (!profileId) {
+      logError('failed validation: profileId not declared');
+      return false;
+    }
+    if (!videoId && !playerId) {
+      logError('failed validation: videoId or playerId not declared');
+      return false;
+    }
+    return true;
+  },
+  /**
+   * @param validBidRequests {BidRequest[]}
+   * @returns {ServerRequest[]}
+   */
+  buildRequests: (validBidRequests) => {
+    logInfo('validBidRequests', validBidRequests);
+    const bidRequests = [];
+    _each(validBidRequests, (bid, i) => {
+      const {
+        params: {test, sspId, endpointUrl},
+        mediaTypes: {video},
+      } = bid;
+      const ortb2 = bid.ortb2 || {};
+      const user = bid.params.user || {};
+      const device = bid.params.device || {};
+      const site = bid.params.site || {};
+      const w = window;
+      const floorInfo = getBidFloor(bid);
+      const data = {
+        id: bid.bidId,
+        test,
+        imp: [{
+          id: `${i}`,
+          tagid: bid.adUnitCode,
+          video: {
+            ...getVideoTargetingParams(bid),
+            mimes: video.mimes || DEFAULT_MIMES,
+          },
+          bidfloor: floorInfo.floor,
+          bidfloorcur: floorInfo.currency,
+          secure: 1
+        }],
+        site: test === 1 ? {
+          page: 'https://viqeo.tv',
+          domain: 'viqeo.tv'
+        } : mergeDeep({
+          domain: w.location.hostname,
+          page: w.location.href
+        }, ortb2.site, site),
+        device: mergeDeep({
+          w: w.screen.width,
+          h: w.screen.height,
+          ua: w.navigator.userAgent,
+        }, ortb2.device, device),
+        user: mergeDeep({...user}, ortb2.user),
+        app: bid.params.app,
+      };
+      bidRequests.push({
+        url: endpointUrl || `${VIQEO_ENDPOINT}/?sspId=${sspId || DEFAULT_SSPID}`,
+        method: 'POST',
+        data,
+        bids: validBidRequests,
+      });
+    });
+    return bidRequests;
+  },
+  /**
+   * @param {ServerResponse} serverResponse
+   * @param {BidRequest} bidRequests
+   * @return {Bid[]}
+   */
+  interpretResponse: (serverResponse, bidRequests) => {
+    logInfo('serverResponse', serverResponse);
+    const bidResponses = [];
+    if (!serverResponse || !serverResponse.body) {
+      logError('empty response');
+      return [];
+    }
+    try {
+      const {id, seatbid, cur} = serverResponse.body;
+      _each(seatbid, (sb) => {
+        const {bid} = sb;
+        _each(bid, (b) => {
+          const bidRequest = bidRequests.bids.find(({bidId}) => bidId === id);
+          const renderer = Renderer.install({
+            url: bidRequest?.params?.renderUrl || RENDERER_URL,
+          });
+          renderer.setRender((bid) => {
+            if (window.VIQEO) {
+              window.VIQEO.renderPrebid(bid);
+            } else {
+              logError('failed get window.VIQEO');
+            }
+          });
+          bidResponses.push({
+            requestId: id,
+            currency: cur,
+            cpm: b.price,
+            ttl: b.exp,
+            netRevenue: true,
+            creativeId: b.cid,
+            width: b.w || bidRequest?.mediaTypes[VIDEO].playerSize[0][0],
+            height: b.h || bidRequest?.mediaTypes[VIDEO].playerSize[0][1],
+            vastXml: b.adm,
+            vastUrl: b.nurl,
+            mediaType: VIDEO,
+            renderer,
+          })
+        })
+      });
+    } catch (error) {
+      logError(error);
+    }
+    return bidResponses;
+  },
+}
+registerBidder(spec);
diff --git a/modules/viqeoBidAdapter.md b/modules/viqeoBidAdapter.md
new file mode 100644
index 00000000000..b4a020bf057
--- /dev/null
+++ b/modules/viqeoBidAdapter.md
@@ -0,0 +1,56 @@
+# Overview
+
+**Module Name**: Viqeo Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: muravjovv1@gmail.com
+
+# Description
+
+Viqeo Bidder Adapter for Prebid.js. About: https://viqeo.tv/
+
+### Bid params
+
+{: .table .table-bordered .table-striped }
+| Name                        | Scope    | Description                                                                                                                | Example                  | Type      |
+|-----------------------------|----------|----------------------------------------------------------------------------------------------------------------------------|--------------------------|-----------|
+| `user`                      | required | The object containing user data (See OpenRTB spec)                                                                         | `user: {}`               | `object`  |
+| `user.buyeruid`             | required | User id                                                                                                                    | `"12345"`                | `string`  |
+| `playerOptions`             | required | The object containing Viqeo player options                                                                                 | `playerOptions: {}`      | `object`  |
+| `playerOptions.profileId`   | required | Viqeo profile id                                                                                                           | `1382`                   | `number`  |
+| `playerOptions.videId`      | optional | Viqeo video id                                                                                                             | `"ed584da454c7205ca7e4"` | `string`  |
+| `playerOptions.playerId`    | optional | Viqeo player id                                                                                                            | `1`                      | `number`  |
+| `device`                    | optional | The object containing device data (See OpenRTB spec)                                                                       | `device: {}`             | `object`  |
+| `site`                      | optional | The object containing site data (See OpenRTB spec)                                                                         | `site: {}`               | `object`  |
+| `app`                       | optional | The object containing app data (See OpenRTB spec)                                                                          | `app: {}`                | `object`  |
+| `floor`                     | optional | Bid floor price                                                                                                            | `0.5`                    | `number`  |
+| `currency`                  | optional | 3-letter ISO 4217 code defining the currency of the bid.                                                                   | `EUR`                    | `string`  |
+| `test`                      | optional | Flag which will induce a sample bid response when true; only set to true for testing purposes (1 = true, 0 = false)        | `1`                      | `integer` |
+| `sspId`                     | optional | For debug, request id                                                                                                      | `1`                      | `number`  |
+| `renderUrl`                 | optional | For debug, script player url                                                                                               | `"https://viqeo.tv"`     | `string`  |
+| `endpointUrl`               | optional | For debug, api endpoint                                                                                                    | `"https://viqeo.tv"`     | `string`  |
+
+# Test Parameters
+```
+    var adUnits = [{
+      code: 'your-slot', // use exactly the same code as your slot div id.
+      mediaTypes: {
+          video: {
+            context: 'outstream',
+            playerSize: [640, 480]  
+          }
+      },
+      bids: [{
+        bidder: 'viqeo',
+        params: { 
+            user: {
+                buyeruid: '1',
+            },
+            playerOptions: {
+                videoId: 'ed584da454c7205ca7e4',
+                profileId: 1382,
+            },
+            test: 1,
+        }
+      }]
+    }];
+```
diff --git a/test/spec/modules/viqeoBidAdapter_spec.js b/test/spec/modules/viqeoBidAdapter_spec.js
new file mode 100644
index 00000000000..8f597318af9
--- /dev/null
+++ b/test/spec/modules/viqeoBidAdapter_spec.js
@@ -0,0 +1,124 @@
+import {expect} from 'chai';
+import {spec} from 'modules/viqeoBidAdapter';
+
+describe('viqeoBidAdapter', function () {
+  it('minimal params', function () {
+    expect(spec.isBidRequestValid({
+      bidder: 'viqeo',
+      params: {
+        user: {
+          buyeruid: '1',
+        },
+        playerOptions: {
+          videoId: 'ed584da454c7205ca7e4',
+          profileId: 1382,
+        },
+      }})).to.equal(true);
+  });
+  it('minimal params no playerOptions', function () {
+    expect(spec.isBidRequestValid({
+      bidder: 'viqeo',
+      params: {
+        currency: 'EUR',
+      }})).to.equal(false);
+  });
+  it('build request check data', function () {
+    const bidRequestData = [{
+      bidId: 'id1',
+      bidder: 'viqeo',
+      params: {
+        user: {
+          buyeruid: '1',
+        },
+        currency: 'EUR',
+        floor: 0.5,
+        playerOptions: {
+          videoId: 'ed584da454c7205ca7e4',
+          profileId: 1382,
+        },
+      },
+      mediaTypes: {
+        video: { playerSize: [[240, 400]] }
+      },
+    }];
+    const request = spec.buildRequests(bidRequestData);
+    const requestData = request[0].data;
+    expect(requestData.id).to.equal('id1')
+    expect(requestData.imp[0].bidfloorcur).to.equal('EUR');
+    expect(requestData.imp[0].bidfloor).to.equal(0.5);
+    expect(requestData.imp[0].video.w).to.equal(240);
+    expect(requestData.imp[0].video.h).to.equal(400);
+    expect(requestData.user.buyeruid).to.equal('1');
+  });
+  it('build request check url', function () {
+    const bidRequestData = [{
+      bidder: 'viqeo',
+      params: {
+        playerOptions: {
+          videoId: 'ed584da454c7205ca7e4',
+          profileId: 1382,
+        },
+        sspId: 42,
+      },
+      mediaTypes: {
+        video: { playerSize: [[240, 400]] }
+      },
+    }];
+    const request = spec.buildRequests(bidRequestData);
+    expect(request[0].url).to.equal('https://ads.betweendigital.com/openrtb_bid/?sspId=42')
+  });
+  it('response_params common case', function () {
+    const bidRequestData = {
+      bids: [{
+        bidId: 'id1',
+        params: {},
+        mediaTypes: {
+          video: { playerSize: [[240, 400]] }
+        },
+      }],
+    };
+    const serverResponse = {
+      body: {
+        id: 'id1',
+        cur: 'EUR',
+        seatbid: [{
+          bid: [{
+            cpm: 0.5,
+            ttl: 3600,
+            netRevenue: true,
+            creativeId: 'test1',
+            adm: '',
+          }],
+        }],
+      }
+    };
+    const bids = spec.interpretResponse(serverResponse, bidRequestData);
+    expect(bids).to.have.lengthOf(1);
+  });
+  it('should set flooPrice to getFloor.floor value if it is greater than params.floor', function() {
+    const bidRequestData = [{
+      bidId: 'id1',
+      bidder: 'viqeo',
+      params: {
+        currency: 'EUR',
+        floor: 0.5,
+        playerOptions: {
+          videoId: 'ed584da454c7205ca7e4',
+          profileId: 1382,
+        },
+      },
+      mediaTypes: {
+        video: { playerSize: [[240, 400]] }
+      },
+      getFloor: () => {
+        return {
+          currency: 'EUR',
+          floor: 3.32
+        }
+      },
+    }];
+    const request = spec.buildRequests(bidRequestData);
+    const requestData = request[0].data;
+    expect(requestData.imp[0].bidfloor).to.equal(3.32)
+  });
+});

From c7da527e4d38819bd1d73dfcd0da75600f649391 Mon Sep 17 00:00:00 2001
From: SebRobert <sebastien.robert.run@gmail.com>
Date: Thu, 17 Nov 2022 13:14:01 +0100
Subject: [PATCH 448/569] BeOp Bid Adapter : update keywords management (#9166)

* Don't know why params are in an array in that bid object. Make it work for both if it is fixed later

* Update params reading method to adapt to arrays for all params

* Keywords have to be an array of string (#9)

* Keywords have to be an array of string

* Last check if isStr

* Fix linting errors

* Fix tests
---
 modules/beopBidAdapter.js                | 19 ++++++++-
 test/spec/modules/beopBidAdapter_spec.js | 52 ++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/modules/beopBidAdapter.js b/modules/beopBidAdapter.js
index f8a53a293de..4ee5aaec5be 100644
--- a/modules/beopBidAdapter.js
+++ b/modules/beopBidAdapter.js
@@ -1,4 +1,4 @@
-import { deepAccess, isArray, logWarn, triggerPixel, buildUrl, logInfo, getValue, getBidIdParameter } from '../src/utils.js';
+import { deepAccess, isArray, isStr, logWarn, triggerPixel, buildUrl, logInfo, getValue, getBidIdParameter } from '../src/utils.js';
 import { getRefererInfo } from '../src/refererDetection.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
@@ -40,6 +40,19 @@ export const spec = {
     const pageUrl = getPageUrl(bidderRequest.refererInfo, window);
     const gdpr = bidderRequest.gdprConsent;
     const firstSlot = slots[0];
+    const kwdsFromRequest = firstSlot.kwds;
+    let keywords = [];
+    if (kwdsFromRequest) {
+      if (isArray(kwdsFromRequest)) {
+        keywords = kwdsFromRequest;
+      } else if (isStr(kwdsFromRequest)) {
+        if (kwdsFromRequest.indexOf(',') != -1) {
+          keywords = kwdsFromRequest.split(',').map((e) => { return e.trim() });
+        } else {
+          keywords.push(kwdsFromRequest);
+        }
+      }
+    }
     const payloadObject = {
       at: new Date().toString(),
       nid: firstSlot.nid,
@@ -47,12 +60,13 @@ export const spec = {
       pid: firstSlot.pid,
       url: pageUrl,
       lang: (window.navigator.language || window.navigator.languages[0]),
-      kwds: bidderRequest.ortb2?.site?.keywords || [],
+      kwds: keywords,
       dbg: false,
       slts: slots,
       is_amp: deepAccess(bidderRequest, 'referrerInfo.isAmp'),
       tc_string: (gdpr && gdpr.gdprApplies) ? gdpr.consentString : null,
     };
+
     const payloadString = JSON.stringify(payloadObject);
     return {
       method: 'POST',
@@ -129,6 +143,7 @@ function beOpRequestSlotsMaker(bid) {
     sizes: isArray(bannerSizes) ? bannerSizes : bid.sizes,
     flr: floor,
     pid: getValue(bid.params, 'accountId'),
+    kwds: getValue(bid.params, 'keywords'),
     nid: getValue(bid.params, 'networkId'),
     nptnid: getValue(bid.params, 'networkPartnerId'),
     bid: getBidIdParameter('bidId', bid),
diff --git a/test/spec/modules/beopBidAdapter_spec.js b/test/spec/modules/beopBidAdapter_spec.js
index c6001c3ba2e..ad096fd6526 100644
--- a/test/spec/modules/beopBidAdapter_spec.js
+++ b/test/spec/modules/beopBidAdapter_spec.js
@@ -216,4 +216,56 @@ describe('BeOp Bid Adapter tests', () => {
       expect(triggerPixelStub.getCall(0).args[0]).to.exist.and.to.include('pid=5a8af500c9e77c00017e4cad');
     });
   });
+
+  describe('Ensure keywords is always array of string', function () {
+    let bidRequests = [];
+    afterEach(function () {
+      bidRequests = [];
+    });
+
+    it('should work with keywords as an array', function () {
+      let bid = Object.assign({}, validBid);
+      bid.params.keywords = ['a', 'b'];
+      bidRequests.push(bid);
+      config.setConfig({
+        currency: { adServerCurrency: 'USD' }
+      });
+      const request = spec.buildRequests(bidRequests, {});
+      const payload = JSON.parse(request.data);
+      const url = request.url;
+      expect(payload.kwds).to.exist;
+      expect(payload.kwds).to.include('a');
+      expect(payload.kwds).to.include('b');
+    });
+
+    it('should work with keywords as a string', function () {
+      let bid = Object.assign({}, validBid);
+      bid.params.keywords = 'list of keywords';
+      bidRequests.push(bid);
+      config.setConfig({
+        currency: { adServerCurrency: 'USD' }
+      });
+      const request = spec.buildRequests(bidRequests, {});
+      const payload = JSON.parse(request.data);
+      const url = request.url;
+      expect(payload.kwds).to.exist;
+      expect(payload.kwds).to.include('list of keywords');
+    });
+
+    it('should work with keywords as a string containing a comma', function () {
+      let bid = Object.assign({}, validBid);
+      bid.params.keywords = 'list, of, keywords';
+      bidRequests.push(bid);
+      config.setConfig({
+        currency: { adServerCurrency: 'USD' }
+      });
+      const request = spec.buildRequests(bidRequests, {});
+      const payload = JSON.parse(request.data);
+      const url = request.url;
+      expect(payload.kwds).to.exist;
+      expect(payload.kwds).to.include('list');
+      expect(payload.kwds).to.include('of');
+      expect(payload.kwds).to.include('keywords');
+    })
+  })
 });

From c86f41b9eabef64615211cc417291a6fa76078df Mon Sep 17 00:00:00 2001
From: TheMediaGrid <44166371+TheMediaGrid@users.noreply.github.com>
Date: Thu, 17 Nov 2022 15:33:40 +0300
Subject: [PATCH 449/569] TheMediaGrid: added withCriteo paramater to send
 criteo request with the /hbjson request (#9214)

---
 modules/gridBidAdapter.js                | 462 +++++++++++++++++++++--
 test/spec/modules/gridBidAdapter_spec.js | 290 +++++++++++++-
 2 files changed, 729 insertions(+), 23 deletions(-)

diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index 181ce0ebab2..3aaeaf73580 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -1,18 +1,38 @@
-import { isEmpty, deepAccess, logError, parseGPTSingleSizeArrayToRtbSize, generateUUID, mergeDeep, logWarn } from '../src/utils.js';
+import {
+  isEmpty,
+  deepAccess,
+  logError,
+  parseGPTSingleSizeArrayToRtbSize,
+  generateUUID,
+  mergeDeep,
+  logWarn,
+  parseUrl, isArray, isNumber
+} from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { Renderer } from '../src/Renderer.js';
 import { VIDEO, BANNER } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { find } from '../src/polyfill.js';
 
 const BIDDER_CODE = 'grid';
 const ENDPOINT_URL = 'https://grid.bidswitch.net/hbjson';
+
+const ADAPTER_VERSION_FOR_CRITEO_MODE = 34;
+const CDB_ENDPOINT = 'https://bidder.criteo.com/cdb';
+const PROFILE_ID_INLINE = 207;
+const SID_COOKIE_NAME = 'cto_sid';
+const IDCPY_COOKIE_NAME = 'cto_idcpy';
+const OPTOUT_COOKIE_NAME = 'cto_optout';
+const BUNDLE_COOKIE_NAME = 'cto_bundle';
+
 const SYNC_URL = 'https://x.bidswitch.net/sync?ssp=themediagrid';
 const TIME_TO_LIVE = 360;
 const USER_ID_KEY = 'tmguid';
 const GVLID = 686;
 const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
 export const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
+
 const LOG_ERROR_MESS = {
   noAuid: 'Bid from response has no auid parameter - ',
   noAdm: 'Bid from response has no adm parameter - ',
@@ -49,7 +69,7 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function(bid) {
-    return !!bid.params.uid;
+    return bid && Boolean(bid.params.uid || bid.params.secid);
   },
   /**
    * Make a server request from the list of BidRequests.
@@ -79,10 +99,20 @@ export const spec = {
     const imp = [];
     const bidsMap = {};
     const requests = [];
+    const criteoBidsMap = {};
+    const criteoBidRequests = [];
     const sources = [];
     const bidsArray = [];
 
     validBidRequests.forEach((bid) => {
+      const bidObject = { bid, savedPrebidBid: null };
+      if (bid.params.withCriteo && criteoSpec.isBidRequestValid(bid)) {
+        criteoBidsMap[bid.bidId] = bidObject;
+        criteoBidRequests.push(bid);
+      }
+      if (!bid.params.uid && !bid.params.secid) {
+        return;
+      }
       if (!bidderRequestId) {
         bidderRequestId = bid.bidderRequestId;
       }
@@ -100,7 +130,6 @@ export const spec = {
       }
       const { params: { uid, keywords, forceBidder, multiRequest }, mediaTypes, bidId, adUnitCode, rtd, ortb2Imp } = bid;
       const { pubdata, secid, pubid, source, content: bidParamsContent } = bid.params;
-      bidsMap[bidId] = bid;
       const bidFloor = _getFloor(mediaTypes || {}, bid);
       const jwTargeting = rtd && rtd.jwplayer && rtd.jwplayer.targeting;
       if (jwTargeting) {
@@ -201,8 +230,9 @@ export const spec = {
 
           requests.push(request);
           sources.push(source);
-          bidsArray.push(bid);
+          bidsArray.push(bidObject);
         } else {
+          bidsMap[bidId] = bidObject;
           imp.push(impObj);
         }
       }
@@ -377,6 +407,11 @@ export const spec = {
       }
     });
 
+    const criteoRequest = criteoBidRequests.length && criteoSpec.buildRequests(criteoBidRequests, bidderRequest);
+    if (criteoRequest) {
+      criteoRequest.criteoBidsMap = criteoBidsMap;
+    }
+
     return [...requests.map((req, i) => {
       let sp;
       const url = (endpoint || ENDPOINT_URL).replace(/[?&]sp=([^?&=]+)/, (i, found) => {
@@ -391,14 +426,14 @@ export const spec = {
         method: 'POST',
         url: urlWithParams,
         data: JSON.stringify(req),
-        bid: bidsArray[i],
+        bidObject: bidsArray[i],
       };
     }), ...(mainRequest ? [{
       method: 'POST',
       url: endpoint || ENDPOINT_URL,
       data: JSON.stringify(mainRequest),
       bidsMap
-    }] : [])];
+    }] : []), ...(criteoRequest ? [criteoRequest] : [])];
   },
   /**
    * Unpack the response from the server into a list of bids.
@@ -409,25 +444,33 @@ export const spec = {
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
   interpretResponse: function(serverResponse, bidRequest, RendererConst = Renderer) {
-    serverResponse = serverResponse && serverResponse.body;
-    const bidResponses = [];
+    if (bidRequest.criteoBidsMap && bidRequest.bidRequests) {
+      const criteoBids = criteoSpec.interpretResponse(serverResponse, bidRequest);
+      return criteoBids.filter((bid) => {
+        const { savedPrebidBid } = bidRequest.criteoBidsMap[bid.requestId] || {};
+        return canPublishResponse(bid.cpm, savedPrebidBid && savedPrebidBid.cpm);
+      });
+    } else {
+      serverResponse = serverResponse && serverResponse.body;
+      const bidResponses = [];
 
-    let errorMessage;
+      let errorMessage;
 
-    if (!serverResponse) errorMessage = LOG_ERROR_MESS.emptyResponse;
-    else if (serverResponse.seatbid && !serverResponse.seatbid.length) {
-      errorMessage = LOG_ERROR_MESS.hasEmptySeatbidArray;
-    }
+      if (!serverResponse) errorMessage = LOG_ERROR_MESS.emptyResponse;
+      else if (serverResponse.seatbid && !serverResponse.seatbid.length) {
+        errorMessage = LOG_ERROR_MESS.hasEmptySeatbidArray;
+      }
 
-    const bidderCode = this.forceBidderName || this.code;
+      const bidderCode = this.forceBidderName || this.code;
 
-    if (!errorMessage && serverResponse.seatbid) {
-      serverResponse.seatbid.forEach(respItem => {
-        _addBidResponse(_getBidFromResponse(respItem), bidRequest, bidResponses, RendererConst, bidderCode);
-      });
+      if (!errorMessage && serverResponse.seatbid) {
+        serverResponse.seatbid.forEach(respItem => {
+          _addBidResponse(_getBidFromResponse(respItem), bidRequest, bidResponses, RendererConst, bidderCode);
+        });
+      }
+      if (errorMessage) logError(errorMessage);
+      return bidResponses;
     }
-    if (errorMessage) logError(errorMessage);
-    return bidResponses;
   },
   getUserSyncs: function (...args) {
     const [syncOptions,, gdprConsent, uspConsent] = args;
@@ -502,8 +545,9 @@ function _addBidResponse(serverBid, bidRequest, bidResponses, RendererConst, bid
   if (!serverBid.auid) errorMessage = LOG_ERROR_MESS.noAuid + JSON.stringify(serverBid);
   if (!errorMessage && !serverBid.adm && !serverBid.nurl) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
   else {
-    const bid = bidRequest.bidsMap ? bidRequest.bidsMap[serverBid.impid] : bidRequest.bid;
-    if (bid) {
+    const bidObject = bidRequest.bidsMap ? bidRequest.bidsMap[serverBid.impid] : bidRequest.bidObject;
+    const { bid, savedPrebidBid } = bidObject || {};
+    if (bid && canPublishResponse(serverBid.price, savedPrebidBid && savedPrebidBid.cpm)) {
       const bidResponse = {
         requestId: bid.bidId, // bid.bidderRequestId
         cpm: serverBid.price,
@@ -519,6 +563,8 @@ function _addBidResponse(serverBid, bidRequest, bidResponses, RendererConst, bid
         dealId: serverBid.dealid
       };
 
+      bidObject.savedPrebidBid = bidResponse;
+
       if (serverBid.ext && serverBid.ext.bidder && serverBid.ext.bidder.grid && serverBid.ext.bidder.grid.demandSource) {
         bidResponse.adserverTargeting = { 'hb_ds': serverBid.ext.bidder.grid.demandSource };
         bidResponse.meta.demandSource = serverBid.ext.bidder.grid.demandSource;
@@ -664,6 +710,13 @@ function reformatKeywords(pageKeywords) {
   return Object.keys(formatedPageKeywords).length && formatedPageKeywords;
 }
 
+function canPublishResponse(price, savedPrice) {
+  if (isNumber(savedPrice)) {
+    return price > savedPrice || (price === savedPrice && Math.random() > 0.5);
+  }
+  return true;
+}
+
 function outstreamRender (bid) {
   bid.renderer.push(() => {
     window.ANOutstreamVideo.renderAd({
@@ -697,4 +750,369 @@ export function getSyncUrl() {
   return SYNC_URL;
 }
 
+// ================ Criteo methods ==================
+
+const criteoSpec = {
+  /** f
+   * @param {object} bid
+   * @return {boolean}
+   */
+  isBidRequestValid: (bid) => {
+    // either one of zoneId or networkId should be set
+    if (!(bid && bid.params && (bid.params.zoneId || bid.params.networkId))) {
+      return false;
+    }
+
+    // video media types requires some mandatory params
+    if (hasVideoMediaType(bid)) {
+      if (!hasValidVideoMediaType(bid)) {
+        return false;
+      }
+    }
+
+    return true;
+  },
+
+  /**
+   * @param {BidRequest[]} bidRequests
+   * @param {*} bidderRequest
+   * @return {ServerRequest}
+   */
+  buildRequests: (bidRequests, bidderRequest) => {
+    let url;
+    let data;
+    let fpd = bidderRequest.ortb2 || {};
+
+    Object.assign(bidderRequest, {
+      publisherExt: fpd.site?.ext,
+      userExt: fpd.user?.ext,
+      ceh: config.getConfig('criteo.ceh'),
+      coppa: config.getConfig('coppa')
+    });
+
+    const context = buildContext(bidRequests, bidderRequest);
+    url = buildCdbUrl(context);
+    data = buildCdbRequest(context, bidRequests, bidderRequest);
+
+    if (data) {
+      return { method: 'POST', url, data, bidRequests };
+    }
+  },
+
+  /**
+   * @param {*} response
+   * @param {ServerRequest} request
+   * @return {Bid[]}
+   */
+  interpretResponse: (response, request) => {
+    const body = response.body || response;
+    const bids = [];
+
+    if (body && body.slots && isArray(body.slots)) {
+      body.slots.forEach(slot => {
+        const bidRequest = find(request.bidRequests, b => b.adUnitCode === slot.impid && (!b.params.zoneId || parseInt(b.params.zoneId) === slot.zoneid));
+        const bidId = bidRequest.bidId;
+        const bid = {
+          requestId: bidId,
+          cpm: slot.cpm,
+          currency: slot.currency,
+          netRevenue: true,
+          ttl: slot.ttl || 60,
+          creativeId: slot.creativecode,
+          width: slot.width,
+          height: slot.height,
+          dealId: slot.dealCode,
+        };
+        if (body.ext?.paf?.transmission && slot.ext?.paf?.content_id) {
+          const pafResponseMeta = {
+            content_id: slot.ext.paf.content_id,
+            transmission: response.ext.paf.transmission
+          };
+          bid.meta = Object.assign({}, bid.meta, { paf: pafResponseMeta });
+        }
+        if (slot.adomain) {
+          bid.meta = Object.assign({}, bid.meta, { advertiserDomains: slot.adomain });
+        }
+        if (slot.video) {
+          bid.vastUrl = slot.displayurl;
+          bid.mediaType = VIDEO;
+        } else {
+          bid.ad = slot.creative;
+        }
+        bids.push(bid);
+      });
+    }
+
+    return bids;
+  }
+};
+
+function readFromAllStorages(name) {
+  const fromCookie = storage.getCookie(name);
+  const fromLocalStorage = storage.getDataFromLocalStorage(name);
+
+  return fromCookie || fromLocalStorage || undefined;
+}
+
+/**
+ * @param {BidRequest[]} bidRequests
+ * @param bidderRequest
+ */
+function buildContext(bidRequests, bidderRequest) {
+  let referrer = '';
+  if (bidderRequest && bidderRequest.refererInfo) {
+    referrer = bidderRequest.refererInfo.page;
+  }
+  const queryString = parseUrl(bidderRequest?.refererInfo?.topmostLocation).search;
+
+  const context = {
+    url: referrer,
+    debug: queryString['pbt_debug'] === '1',
+    noLog: queryString['pbt_nolog'] === '1',
+    amp: false,
+  };
+
+  bidRequests.forEach(bidRequest => {
+    if (bidRequest.params.integrationMode === 'amp') {
+      context.amp = true;
+    }
+  });
+
+  return context;
+}
+
+/**
+ * @param {CriteoContext} context
+ * @return {string}
+ */
+function buildCdbUrl(context) {
+  let url = CDB_ENDPOINT;
+  url += '?profileId=' + PROFILE_ID_INLINE;
+  url += '&av=' + String(ADAPTER_VERSION_FOR_CRITEO_MODE);
+  url += '&wv=' + encodeURIComponent('$prebid.version$');
+  url += '&cb=' + String(Math.floor(Math.random() * 99999999999));
+
+  if (storage.localStorageIsEnabled()) {
+    url += '&lsavail=1';
+  } else {
+    url += '&lsavail=0';
+  }
+
+  if (context.amp) {
+    url += '&im=1';
+  }
+  if (context.debug) {
+    url += '&debug=1';
+  }
+  if (context.noLog) {
+    url += '&nolog=1';
+  }
+
+  const bundle = readFromAllStorages(BUNDLE_COOKIE_NAME);
+  if (bundle) {
+    url += `&bundle=${bundle}`;
+  }
+
+  const optout = readFromAllStorages(OPTOUT_COOKIE_NAME);
+  if (optout) {
+    url += `&optout=1`;
+  }
+
+  const sid = readFromAllStorages(SID_COOKIE_NAME);
+  if (sid) {
+    url += `&sid=${sid}`;
+  }
+
+  const idcpy = readFromAllStorages(IDCPY_COOKIE_NAME);
+  if (idcpy) {
+    url += `&idcpy=${idcpy}`;
+  }
+
+  return url;
+}
+
+/**
+ * @param {CriteoContext} context
+ * @param {BidRequest[]} bidRequests
+ * @param bidderRequest
+ * @return {*}
+ */
+function buildCdbRequest(context, bidRequests, bidderRequest) {
+  let networkId;
+  let schain;
+  const request = {
+    publisher: {
+      url: context.url,
+      ext: bidderRequest.publisherExt,
+    },
+    regs: {
+      coppa: bidderRequest.coppa === true ? 1 : (bidderRequest.coppa === false ? 0 : undefined)
+    },
+    slots: bidRequests.map(bidRequest => {
+      networkId = bidRequest.params.networkId || networkId;
+      schain = bidRequest.schain || schain;
+      const slot = {
+        impid: bidRequest.adUnitCode,
+        transactionid: bidRequest.transactionId,
+        auctionId: bidRequest.auctionId,
+      };
+      if (bidRequest.params.zoneId) {
+        slot.zoneid = bidRequest.params.zoneId;
+      }
+      if (deepAccess(bidRequest, 'ortb2Imp.ext')) {
+        slot.ext = bidRequest.ortb2Imp.ext;
+      }
+      if (bidRequest.params.ext) {
+        slot.ext = Object.assign({}, slot.ext, bidRequest.params.ext);
+      }
+      if (bidRequest.params.publisherSubId) {
+        slot.publishersubid = bidRequest.params.publisherSubId;
+      }
+
+      if (hasBannerMediaType(bidRequest)) {
+        slot.sizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'), parseSize);
+      } else {
+        slot.sizes = [];
+      }
+
+      if (hasVideoMediaType(bidRequest)) {
+        const video = {
+          playersizes: parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'), parseSize),
+          mimes: bidRequest.mediaTypes.video.mimes,
+          protocols: bidRequest.mediaTypes.video.protocols,
+          maxduration: bidRequest.mediaTypes.video.maxduration,
+          api: bidRequest.mediaTypes.video.api,
+          skip: bidRequest.mediaTypes.video.skip,
+          placement: bidRequest.mediaTypes.video.placement,
+          minduration: bidRequest.mediaTypes.video.minduration,
+          playbackmethod: bidRequest.mediaTypes.video.playbackmethod,
+          startdelay: bidRequest.mediaTypes.video.startdelay
+        };
+        const paramsVideo = bidRequest.params.video;
+        if (paramsVideo !== undefined) {
+          video.skip = video.skip || paramsVideo.skip || 0;
+          video.placement = video.placement || paramsVideo.placement;
+          video.minduration = video.minduration || paramsVideo.minduration;
+          video.playbackmethod = video.playbackmethod || paramsVideo.playbackmethod;
+          video.startdelay = video.startdelay || paramsVideo.startdelay || 0;
+        }
+
+        slot.video = video;
+      }
+
+      enrichSlotWithFloors(slot, bidRequest);
+
+      return slot;
+    }),
+  };
+  if (networkId) {
+    request.publisher.networkid = networkId;
+  }
+  if (schain) {
+    request.source = {
+      ext: {
+        schain: schain
+      }
+    };
+  }
+  request.user = {
+    ext: bidderRequest.userExt
+  };
+  if (bidderRequest && bidderRequest.ceh) {
+    request.user.ceh = bidderRequest.ceh;
+  }
+  if (bidderRequest && bidderRequest.gdprConsent) {
+    request.gdprConsent = {};
+    if (typeof bidderRequest.gdprConsent.gdprApplies !== 'undefined') {
+      request.gdprConsent.gdprApplies = !!(bidderRequest.gdprConsent.gdprApplies);
+    }
+    request.gdprConsent.version = bidderRequest.gdprConsent.apiVersion;
+    if (typeof bidderRequest.gdprConsent.consentString !== 'undefined') {
+      request.gdprConsent.consentData = bidderRequest.gdprConsent.consentString;
+    }
+  }
+  if (bidderRequest && bidderRequest.uspConsent) {
+    request.user.uspIab = bidderRequest.uspConsent;
+  }
+  return request;
+}
+
+function parseSizes(sizes, parser = s => s) {
+  if (sizes === undefined) {
+    return [];
+  }
+  if (Array.isArray(sizes[0])) { // is there several sizes ? (ie. [[728,90],[200,300]])
+    return sizes.map(size => parser(size));
+  }
+  return [parser(sizes)]; // or a single one ? (ie. [728,90])
+}
+
+function parseSize(size) {
+  return size[0] + 'x' + size[1];
+}
+
+function hasVideoMediaType(bidRequest) {
+  return deepAccess(bidRequest, 'mediaTypes.video') !== undefined;
+}
+
+function hasBannerMediaType(bidRequest) {
+  return deepAccess(bidRequest, 'mediaTypes.banner') !== undefined;
+}
+
+function hasValidVideoMediaType(bidRequest) {
+  let isValid = true;
+
+  var requiredMediaTypesParams = ['mimes', 'playerSize', 'maxduration', 'protocols', 'api', 'skip', 'placement', 'playbackmethod'];
+
+  requiredMediaTypesParams.forEach(function (param) {
+    if (deepAccess(bidRequest, 'mediaTypes.video.' + param) === undefined && deepAccess(bidRequest, 'params.video.' + param) === undefined) {
+      isValid = false;
+      logError('TheMediaGrid Bid Adapter (withCriteo mode): mediaTypes.video.' + param + ' is required');
+    }
+  });
+
+  if (isValid) {
+    const videoPlacement = bidRequest.mediaTypes.video.placement || bidRequest.params.video.placement;
+    // We do not support long form for now, also we have to check that context & placement are consistent
+    if (bidRequest.mediaTypes.video.context === 'instream' && videoPlacement === 1) {
+      return true;
+    } else if (bidRequest.mediaTypes.video.context === 'outstream' && videoPlacement !== 1) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+function enrichSlotWithFloors(slot, bidRequest) {
+  try {
+    const slotFloors = {};
+
+    if (bidRequest.getFloor) {
+      if (bidRequest.mediaTypes?.banner) {
+        slotFloors.banner = {};
+        const bannerSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'))
+        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = bidRequest.getFloor({ size: bannerSize, mediaType: BANNER }));
+      }
+
+      if (bidRequest.mediaTypes?.video) {
+        slotFloors.video = {};
+        const videoSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'))
+        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = bidRequest.getFloor({ size: videoSize, mediaType: VIDEO }));
+      }
+
+      if (Object.keys(slotFloors).length > 0) {
+        if (!slot.ext) {
+          slot.ext = {}
+        }
+        Object.assign(slot.ext, {
+          floors: slotFloors
+        });
+      }
+    }
+  } catch (e) {
+    logError('Could not parse floors from Prebid: ' + e);
+  }
+}
+
 registerBidder(spec);
diff --git a/test/spec/modules/gridBidAdapter_spec.js b/test/spec/modules/gridBidAdapter_spec.js
index f98ca683024..4b93c287fee 100644
--- a/test/spec/modules/gridBidAdapter_spec.js
+++ b/test/spec/modules/gridBidAdapter_spec.js
@@ -44,8 +44,9 @@ describe('TheMediaGrid Adapter', function () {
       return JSON.parse(data);
     }
     const bidderRequest = {
-      refererInfo: {page: 'https://example.com'},
+      refererInfo: { page: 'https://example.com' },
       bidderRequestId: '22edbae2733bf6',
+      transactionId: '1239bd74-4511-4335-af21-e828852e25d7',
       auctionId: '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
       timeout: 3000
     };
@@ -67,6 +68,7 @@ describe('TheMediaGrid Adapter', function () {
         'bidId': '42dbe3a7168a6a',
         'bidderRequestId': '22edbae2733bf6',
         'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+        transactionId: '1239bd74-4511-4335-af21-e828852e25d7',
       },
       {
         'bidder': 'grid',
@@ -78,6 +80,7 @@ describe('TheMediaGrid Adapter', function () {
         'bidId': '30b31c1838de1e',
         'bidderRequestId': '22edbae2733bf6',
         'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+        transactionId: '1239bd74-4511-4335-af21-e828852e25d7',
       },
       {
         'bidder': 'grid',
@@ -95,6 +98,7 @@ describe('TheMediaGrid Adapter', function () {
         'bidId': '3150ccb55da321',
         'bidderRequestId': '22edbae2733bf6',
         'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+        transactionId: '1239bd74-4511-4335-af21-e828852e25d7',
       },
       {
         'bidder': 'grid',
@@ -115,6 +119,7 @@ describe('TheMediaGrid Adapter', function () {
         'bidId': '3150ccb55da321',
         'bidderRequestId': '22edbae2733bf6',
         'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+        transactionId: '1239bd74-4511-4335-af21-e828852e25d7',
       }
     ];
 
@@ -395,6 +400,158 @@ describe('TheMediaGrid Adapter', function () {
       getDataFromLocalStorageStub.restore();
     });
 
+    it('should send additional request with adUnits with withCriteo parameter', function () {
+      const fpdUserIdVal = '0b0f84a1-1596-4165-9742-2e1a7dfac57f';
+      const getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage').callsFake(
+        arg => arg === 'tmguid' ? fpdUserIdVal : null);
+
+      const bidRequestsWithCriteo = bidRequests.map((bid, i) =>
+        i % 2 ? bid : {
+          ...bid,
+          params: {
+            ...bid.params,
+            withCriteo: true,
+            networkId: 123 + i
+          },
+          mediaTypes: {
+            ...bid.mediaTypes,
+            ...(bid.mediaTypes.video && { video: {
+              ...bid.mediaTypes.video,
+              context: 'instream',
+              protocols: [1, 2, 3],
+              maxduration: 30,
+              api: [1, 2],
+              skip: 1,
+              placement: 1,
+              minduration: 0,
+              playbackmethod: 1,
+              startdelay: 0
+            }
+            })
+          }
+        });
+
+      const [request, criteoRequest] = spec.buildRequests(bidRequestsWithCriteo, bidderRequest);
+      expect(request.data).to.be.an('string');
+      expect(criteoRequest.data).to.be.an('object');
+      const payload = parseRequest(request.data);
+      const criteoPayload = criteoRequest.data;
+      expect(request.url).to.equal('https://grid.bidswitch.net/hbjson');
+      expect(criteoRequest.url.replace(/\?.*$/, ''))
+        .to.equal('https://bidder.criteo.com/cdb');
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'user': {
+          'id': fpdUserIdVal
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[1].bidId,
+          'tagid': bidRequests[1].params.uid,
+          'ext': {'divid': bidRequests[1].adUnitCode},
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[2].bidId,
+          'tagid': bidRequests[2].params.uid,
+          'ext': {'divid': bidRequests[2].adUnitCode},
+          'video': {
+            'w': 400,
+            'h': 600,
+            'protocols': [1, 2, 3],
+            'mimes': ['video/mp4', 'video/webm', 'application/javascript', 'video/ogg'],
+          }
+        }, {
+          'id': bidRequests[3].bidId,
+          'tagid': bidRequests[3].params.uid,
+          'ext': {'divid': bidRequests[3].adUnitCode},
+          'banner': {
+            'w': 728,
+            'h': 90,
+            'format': [{'w': 728, 'h': 90}]
+          },
+          'video': {
+            'w': 400,
+            'h': 600,
+            'protocols': [1, 2, 3]
+          }
+        }]
+      });
+
+      expect(criteoPayload).to.deep.equal({
+        'publisher': {
+          'ext': undefined,
+          'url': bidderRequest.refererInfo.page,
+          'networkid': 125
+        },
+        'regs': {
+          'coppa': undefined
+        },
+        'slots': [{
+          'impid': bidRequests[0].adUnitCode,
+          'transactionid': bidderRequest.transactionId,
+          'auctionId': bidderRequest.auctionId,
+          'sizes': ['300x250', '300x600']
+        }, {
+          'impid': bidRequests[2].adUnitCode,
+          'transactionid': bidderRequest.transactionId,
+          'auctionId': bidderRequest.auctionId,
+          'sizes': [],
+          'video': {
+            'api': [
+              1,
+              2
+            ],
+            'maxduration': 30,
+            'mimes': [
+              'video/mp4',
+              'video/webm',
+              'application/javascript',
+              'video/ogg',
+            ],
+            'minduration': 0,
+            'placement': 1,
+            'playbackmethod': 1,
+            'playersizes': [
+              '400x600'
+            ],
+            'protocols': [
+              1,
+              2,
+              3
+            ],
+            'skip': 1,
+            'startdelay': 0
+          }
+        }],
+        'user': {
+          'ext': undefined
+        }
+      });
+
+      getDataFromLocalStorageStub.restore();
+    });
+
     it('if gdprConsent is present payload must have gdpr params', function () {
       const gdprBidderRequest = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: true}}, bidderRequest);
       const [request] = spec.buildRequests(bidRequests, gdprBidderRequest);
@@ -1365,6 +1522,137 @@ describe('TheMediaGrid Adapter', function () {
       expect(result).to.deep.equal(expectedResponse);
     });
 
+    it('should add response with biggest price', function () {
+      const mainResponse = [
+        {'bid': [{'impid': '2164be6358b9', 'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 1, 'h': 250, 'w': 300, dealid: 11}], 'seat': '1'},
+        {'bid': [{'impid': '4e111f1b66e4', 'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 2, 'h': 600, 'w': 300, dealid: 12}], 'seat': '1'},
+      ];
+      const criteoResponse = [
+        {
+          impid: 'adunit-code-1',
+          cpm: 0.15,
+          creative: '<div>test content 3</div>',
+          creativecode: 1,
+          bidId: '2164be6358b9',
+          currency: 'USD',
+          width: 300,
+          height: 250,
+          dealCode: 11,
+          zoneid: 123,
+          ttl: 360,
+          adomain: ['criteo.com'],
+        },
+        {
+          impid: 'adunit-code-1',
+          cpm: 1,
+          creative: '<div>test content 4</div>',
+          creativecode: 2,
+          bidId: '4e111f1b66e4',
+          currency: 'USD',
+          width: 300,
+          height: 600,
+          dealCode: 12,
+          zoneid: 456,
+          ttl: 360,
+          adomain: ['criteo.com'],
+        }
+      ];
+      const bidRequests = [
+        {
+          'bidder': 'grid',
+          'params': {
+            'uid': '1',
+            'zoneId': 123,
+            'withCriteo': true
+          },
+          'adUnitCode': 'adunit-code-1',
+          'sizes': [[300, 250], [300, 600]],
+          'bidId': '2164be6358b9',
+          'bidderRequestId': '106efe3247',
+          'auctionId': '32a1f276cb87cb8',
+          'transactionId': '43534f55b213ac',
+        },
+        {
+          'bidder': 'grid',
+          'params': {
+            'uid': '2',
+            'zoneId': 456,
+            'withCriteo': true
+          },
+          'adUnitCode': 'adunit-code-1',
+          'sizes': [[300, 250], [300, 600]],
+          'bidId': '4e111f1b66e4',
+          'bidderRequestId': '106efe3247',
+          'auctionId': '32a1f276cb87cb8',
+          'transactionId': '43534f55b213ac',
+        }
+      ];
+      const bidderRequest = {
+        refererInfo: { page: 'https://example.com' },
+        bidderRequestId: '106efe3247',
+        transactionId: '43534f55b213ac',
+        auctionId: '32a1f276cb87cb8',
+        timeout: 3000
+      };
+      const [mainRequest, criteoRequest] = spec.buildRequests(bidRequests, bidderRequest);
+      const expectedMainResponse = [
+        {
+          'requestId': '2164be6358b9',
+          'cpm': 1.15,
+          'creativeId': 1,
+          'dealId': 11,
+          'width': 300,
+          'height': 250,
+          'ad': '<div>test content 1</div>',
+          'currency': 'USD',
+          'mediaType': 'banner',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
+        },
+        {
+          'requestId': '4e111f1b66e4',
+          'cpm': 0.5,
+          'creativeId': 2,
+          'dealId': 12,
+          'width': 300,
+          'height': 600,
+          'ad': '<div>test content 2</div>',
+          'currency': 'USD',
+          'mediaType': 'banner',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
+        }
+      ];
+      const expectedCriteoResponse = [
+        {
+          'requestId': '4e111f1b66e4',
+          'cpm': 1,
+          'creativeId': 2,
+          'dealId': 12,
+          'width': 300,
+          'height': 600,
+          'ad': '<div>test content 4</div>',
+          'currency': 'USD',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            advertiserDomains: ['criteo.com']
+          },
+        }
+      ];
+
+      const mainResult = spec.interpretResponse({'body': {'seatbid': mainResponse}}, mainRequest);
+      const criteoResult = spec.interpretResponse({'body': {'slots': criteoResponse}}, criteoRequest);
+      expect(mainResult).to.deep.equal(expectedMainResponse);
+      expect(criteoResult).to.deep.equal(expectedCriteoResponse);
+    });
+
     it('response with ext.bidder.grid.demandSource', function () {
       const bidRequests = [
         {

From a88c296ae95fe7c1f9a32a7fc8a23e718ba4d306 Mon Sep 17 00:00:00 2001
From: prebidtappx <77485538+prebidtappx@users.noreply.github.com>
Date: Thu, 17 Nov 2022 14:59:49 +0100
Subject: [PATCH 450/569] Tappx Bid Adapter: getting correct site page (#9187)

* Fix: creating host correctly when http or https are added from the beginning

* Fix :: Changed double quotes for single quotes

* Fix :: Getting the full page URL

* Fix :: Changed order params

* Fix :: Replaced quotes from double to simple

* Fix :: Adapting format to lint

* Remove TODO comment

* Added more controls

* camelcase fix

* Changed test

* Remove "inIframe" util

Co-authored-by: Jordi Arnau <jarnau@tappx.com>
Co-authored-by: ruben_tappx <rcaparros@tappx.com>
---
 modules/tappxBidAdapter.js | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/modules/tappxBidAdapter.js b/modules/tappxBidAdapter.js
index 11aa6c76c76..c7a54431ee9 100644
--- a/modules/tappxBidAdapter.js
+++ b/modules/tappxBidAdapter.js
@@ -11,7 +11,7 @@ const BIDDER_CODE = 'tappx';
 const GVLID_CODE = 628;
 const TTL = 360;
 const CUR = 'USD';
-const TAPPX_BIDDER_VERSION = '0.1.1005';
+const TAPPX_BIDDER_VERSION = '0.1.2';
 const TYPE_CNN = 'prebidjs';
 const LOG_PREFIX = '[TAPPX]: ';
 const VIDEO_SUPPORT = ['instream', 'outstream'];
@@ -271,12 +271,28 @@ function buildOneRequest(validBidRequests, bidderRequest) {
     api[0] = deepAccess(validBidRequests, 'params.api') ? deepAccess(validBidRequests, 'params.api') : [3, 5];
   } else {
     let bundle = _extractPageUrl(validBidRequests, bidderRequest);
-    let site = {};
+    let site = deepAccess(validBidRequests, 'params.site') || {};
     site.name = bundle;
+    site.page = bidderRequest?.refererInfo?.page || deepAccess(validBidRequests, 'params.site.page') || bidderRequest?.refererInfo?.topmostLocation || window.location.href || bundle;
     site.domain = bundle;
+    site.ref = bidderRequest?.refererInfo?.ref || window.top.document.referrer || '';
+    site.ext = {};
+    site.ext.is_amp = bidderRequest?.refererInfo?.isAmp || 0;
+    site.ext.page_da = deepAccess(validBidRequests, 'params.site.page') || '-';
+    site.ext.page_rip = bidderRequest?.refererInfo?.page || '-';
+    site.ext.page_rit = bidderRequest?.refererInfo?.topmostLocation || '-';
+    site.ext.page_wlh = window.location.href || '-';
     publisher.name = bundle;
     publisher.domain = bundle;
+    let sitename = document.getElementsByTagName('meta')['title'];
+    if (sitename && sitename.content) {
+      site.name = sitename.content;
+    }
     tagid = `${site.name}_typeAdBanVid_${getOs()}`;
+    let keywords = document.getElementsByTagName('meta')['keywords'];
+    if (keywords && keywords.content) {
+      site.keywords = keywords.content;
+    }
     payload.site = site;
   }
   // < App/Site object
@@ -295,9 +311,9 @@ function buildOneRequest(validBidRequests, bidderRequest) {
     if (
       ((bannerMediaType.sizes[0].indexOf(480) >= 0) && (bannerMediaType.sizes[0].indexOf(320) >= 0)) ||
       ((bannerMediaType.sizes[0].indexOf(768) >= 0) && (bannerMediaType.sizes[0].indexOf(1024) >= 0))) {
-      banner.pos = 7;
+      banner.pos = 0;
     } else {
-      banner.pos = 4;
+      banner.pos = 0;
     }
 
     banner.api = api;
@@ -565,8 +581,7 @@ export function _checkParamDataType(key, value, datatype) {
 }
 
 export function _extractPageUrl(validBidRequests, bidderRequest) {
-  // TODO: does the fallback make sense?
-  let url = bidderRequest?.refererInfo?.page || bidderRequest.refererInfo?.topmostLocation;
+  let url = bidderRequest?.refererInfo?.page || bidderRequest?.refererInfo?.topmostLocation;
   return parseDomain(url, {noLeadingWww: true});
 }
 

From d0c1d741bd4828c8d6d6f8170a9b4c834d64e70c Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 17 Nov 2022 15:44:44 +0000
Subject: [PATCH 451/569] Prebid 7.26.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 462484cb962..a2bf0986f9d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.26.0-pre",
+  "version": "7.26.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 8df1268bbd2..d86a2cccd1d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.26.0-pre",
+  "version": "7.26.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From e680dd34486d7f1ffec6f52fe4599537a62a12a6 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 17 Nov 2022 15:44:45 +0000
Subject: [PATCH 452/569] Increment version to 7.27.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a2bf0986f9d..0a3b01b972f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.26.0",
+  "version": "7.27.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index d86a2cccd1d..d243b650b6d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.26.0",
+  "version": "7.27.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 974e21db74dadb6cb082b2758d77f6af614c91f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Nov 2022 10:47:25 -0700
Subject: [PATCH 453/569] Bump loader-utils from 2.0.3 to 2.0.4 (#9256)

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.3 to 2.0.4.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v2.0.3...v2.0.4)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0a3b01b972f..4584231d42c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "7.24.0-pre",
+      "version": "7.27.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
@@ -16304,9 +16304,9 @@
       }
     },
     "node_modules/loader-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
-      "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
       "dependencies": {
         "big.js": "^5.2.2",
@@ -25260,6 +25260,7 @@
       }
     },
     "plugins/eslint": {
+      "name": "eslint-plugin-prebid",
       "version": "1.0.0",
       "dev": true,
       "license": "Apache-2.0"
@@ -37926,9 +37927,9 @@
       "dev": true
     },
     "loader-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
-      "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
       "requires": {
         "big.js": "^5.2.2",

From 2d46b828d37e4ab063fcb7f965188da84aed45ad Mon Sep 17 00:00:00 2001
From: Tobias von Klipstein <tobias@klpstn.com>
Date: Fri, 18 Nov 2022 15:14:40 +0100
Subject: [PATCH 454/569] glomex Bidder: expose glomex GVL id (#9262)

---
 modules/glomexBidAdapter.js                | 2 ++
 test/spec/modules/glomexBidAdapter_spec.js | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/modules/glomexBidAdapter.js b/modules/glomexBidAdapter.js
index 32c2036a748..5c9b3c1fa28 100644
--- a/modules/glomexBidAdapter.js
+++ b/modules/glomexBidAdapter.js
@@ -4,9 +4,11 @@ import {BANNER} from '../src/mediaTypes.js';
 
 const ENDPOINT = 'https://prebid.mes.glomex.cloud/request-bid'
 const BIDDER_CODE = 'glomex'
+const GVLID = 967
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER],
 
   isBidRequestValid: function (bid) {
diff --git a/test/spec/modules/glomexBidAdapter_spec.js b/test/spec/modules/glomexBidAdapter_spec.js
index 30157da858b..8c53db8d605 100644
--- a/test/spec/modules/glomexBidAdapter_spec.js
+++ b/test/spec/modules/glomexBidAdapter_spec.js
@@ -49,6 +49,10 @@ const RESPONSE = {
 describe('glomexBidAdapter', function () {
   const adapter = newBidder(spec)
 
+  it('should expose gvlid', function() {
+    expect(spec.gvlid).to.equal(967)
+  });
+
   describe('inherited functions', function () {
     it('exists and is a function', function () {
       expect(adapter.callBids).to.exist.and.to.be.a('function')

From e1661af611eb82543faedbbf4d3b95475a36191e Mon Sep 17 00:00:00 2001
From: nkloeber <100145701+nkloeber@users.noreply.github.com>
Date: Fri, 18 Nov 2022 17:42:37 +0100
Subject: [PATCH 455/569] Update Floor format to
 floor={adslotId}:{floorPriceInCents}[, ...] and fix the size which is
 submitted to the Price Floors Module (#9186)

---
 modules/yieldlabBidAdapter.js                | 14 ++--
 test/spec/modules/yieldlabBidAdapter_spec.js | 69 ++++++++++++++------
 2 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/modules/yieldlabBidAdapter.js b/modules/yieldlabBidAdapter.js
index e6758e78022..88e1494d416 100644
--- a/modules/yieldlabBidAdapter.js
+++ b/modules/yieldlabBidAdapter.js
@@ -41,6 +41,7 @@ export const spec = {
 
     const adslotIds = []
     const adslotSizes = [];
+    const adslotFloors = [];
     const timestamp = Date.now()
     const query = {
       ts: timestamp,
@@ -77,7 +78,7 @@ export const spec = {
       }
       const floor = getBidFloor(bid, sizes)
       if (floor) {
-        query.floor = floor;
+        adslotFloors.push(bid.params.adslotId + ':' + floor);
       }
     })
 
@@ -99,6 +100,11 @@ export const spec = {
     if (adslotSizes.length > 0) {
       query.sizes = adslotSizes.join(',')
     }
+
+    if (adslotFloors.length > 0) {
+      query.floor = adslotFloors.join(',')
+    }
+
     const queryString = createQueryString(query)
 
     return {
@@ -463,7 +469,7 @@ function extractSizes(bid) {
  *
  * @param {Object} bid
  * @param {string[]} sizes
- * @returns The floor CPM of a matched rule based on the rule selection process (mediaType, size and currency),
+ * @returns The floor CPM in cents of a matched rule based on the rule selection process (mediaType, size and currency),
  *          using the getFloor() inputs. Multi sizes and unsupported media types will default to '*'
  */
 function getBidFloor(bid, sizes) {
@@ -475,10 +481,10 @@ function getBidFloor(bid, sizes) {
   const floor = bid.getFloor({
     currency: CURRENCY_CODE,
     mediaType: mediaType !== undefined && spec.supportedMediaTypes.includes(mediaType) ? mediaType : '*',
-    size: sizes.length !== 1 ? '*' : extractSizes(sizes)
+    size: sizes.length !== 1 ? '*' : sizes[0].split(DIMENSION_SIGN)
   });
   if (floor.currency === CURRENCY_CODE) {
-    return floor.floor;
+    return (floor.floor * 100).toFixed(0);
   }
   return undefined;
 }
diff --git a/test/spec/modules/yieldlabBidAdapter_spec.js b/test/spec/modules/yieldlabBidAdapter_spec.js
index 9155884106c..5df0e93d34e 100644
--- a/test/spec/modules/yieldlabBidAdapter_spec.js
+++ b/test/spec/modules/yieldlabBidAdapter_spec.js
@@ -658,36 +658,65 @@ describe('yieldlabBidAdapter', () => {
   });
 
   describe('getBidFloor', function () {
-    let bidRequest, getFloor;
-
-    it('should add valid bid floor', () => {
-      getFloor = () => {
-        return {
-          currency: 'EUR',
-          floor: 1.33
-        };
-      };
+    let bidRequest, bidRequest2, currency, floor;
+    const getFloor = () => {
+      return {
+        currency: currency,
+        floor: floor
+      }
+    }
+
+    it('should add valid bid floor in the format floor={adslotId}:{floorPriceInCents}[, ...]', () => {
+      bidRequest = Object.assign(DEFAULT_REQUEST(), {
+        getFloor: () => {
+          return {
+            currency: 'EUR',
+            floor: 1.33
+          }
+        }});
+      bidRequest2 = Object.assign(DEFAULT_REQUEST(), {
+        params: {
+          adslotId: 2222
+        },
+        getFloor: () => {
+          return {
+            currency: 'EUR',
+            floor: 2.99
+          }
+        }
+      });
+      const result = spec.buildRequests([bidRequest, bidRequest2], REQPARAMS)
+      expect(result).to.have.nested.property('queryParams.floor', '1111:133,2222:299')
+    });
+
+    it('should round the floor price up', () => {
+      currency = 'EUR';
+      floor = 0.745;
       bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor})
       const result = spec.buildRequests([bidRequest], REQPARAMS)
-      expect(result).to.have.nested.property('queryParams.floor', 1.33)
+      expect(result).to.have.nested.property('queryParams.floor', '1111:75')
     });
 
-    it('should not add empty bid floor', () => {
-      getFloor = () => {
-        return {};
-      };
+    it('should round the floor price down', () => {
+      currency = 'EUR';
+      floor = 0.034;
       bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor})
       const result = spec.buildRequests([bidRequest], REQPARAMS)
+      expect(result).to.have.nested.property('queryParams.floor', '1111:3')
+    });
+
+    it('should not add empty bid floor', () => {
+      bidRequest = Object.assign(DEFAULT_REQUEST(), {
+        getFloor: () => {
+          return {};
+        }})
+      const result = spec.buildRequests([bidRequest], REQPARAMS)
       expect(result).not.to.have.nested.property('queryParams.floor')
     });
 
     it('should not add bid floor when currency is not matching', () => {
-      getFloor = (currency, mediaType, size) => {
-        return {
-          currency: 'USD',
-          floor: 1.33
-        };
-      };
+      currency = 'USD';
+      floor = 1.33;
       bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor})
       const result = spec.buildRequests([bidRequest], REQPARAMS)
       expect(result).not.to.have.nested.property('queryParams.floor')

From a1132c103e09ac6192e80b05d8786a715c0536e5 Mon Sep 17 00:00:00 2001
From: rahulgravito <105201950+rahulgravito@users.noreply.github.com>
Date: Fri, 18 Nov 2022 23:01:06 +0530
Subject: [PATCH 456/569] Gravito Id System : variable update to fix tests
 (#9259)

* gravitompId user module for integrating gravito first party cookie with prebid js

* fixed eslint issues raised by circleci

* fixed trailing spaces error raised by circleci

* Merge branch 'master' of https://github.com/GravitoLtd/Prebid.js

* minor changes to GravitoIdSystem user module to make sure that Gravito Id is visible in bid request.

* changes to Gravito User module to fix issue with Gravito Id not appearing in bid request.

* fixing issue with Gravito Id not appearing in bid request.

* modified test case to adapt changes made to the GravitoIdSystem user module

* change to spec file to fix for test failure

* changes to GravitoIdSystem spec file.

* Fix for trailing space issue in Circle CI
---
 modules/gravitoIdSystem.js                | 7 +++----
 test/spec/modules/gravitoIdSystem_spec.js | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/gravitoIdSystem.js b/modules/gravitoIdSystem.js
index 30fa3abd6d2..809263a1c68 100644
--- a/modules/gravitoIdSystem.js
+++ b/modules/gravitoIdSystem.js
@@ -39,19 +39,18 @@ export const gravitoIdSystemSubmodule = {
   * decode the stored id value for passing to bid requests
   * @function
   * @param { {gravitompId: string} } value
-  * @returns { {gravitompId: {id: string} } | undefined }
+  * @returns { {gravitompId: {string} } | undefined }
   */
   decode: function(value) {
     if (value && typeof value === 'object') {
-      const result = {};
+      var result = {};
       if (value.gravitompId) {
-        result.id = value.gravitompId
+        result = value.gravitompId
       }
       return {gravitompId: result};
     }
     return undefined;
   },
-
 }
 
 submodule('userId', gravitoIdSystemSubmodule);
diff --git a/test/spec/modules/gravitoIdSystem_spec.js b/test/spec/modules/gravitoIdSystem_spec.js
index e904355f7f1..9584f60c81d 100644
--- a/test/spec/modules/gravitoIdSystem_spec.js
+++ b/test/spec/modules/gravitoIdSystem_spec.js
@@ -40,7 +40,7 @@ describe('gravitompId module', function () {
   describe('decode()', function () {
     it('should return the gravitompId when it exists in cookie', function () {
       const decoded = gravitoIdSystemSubmodule.decode(GRAVITOID_TEST_OBJ);
-      expect(decoded).to.be.deep.equal({gravitompId: {id: GRAVITOID_TEST_VALUE}});
+      expect(decoded).to.be.deep.equal({gravitompId: GRAVITOID_TEST_VALUE});
     });
 
     it('should return the undefined when decode id is not "string"', function () {

From 1a5f5ffd04adc422d443d643f3f70bc95b4382df Mon Sep 17 00:00:00 2001
From: Fatih Kaya <fatih.kaya.84@gmail.com>
Date: Mon, 21 Nov 2022 18:52:59 +0300
Subject: [PATCH 457/569] AdMatic Bidder: added User-Snyc url for alias (#9261)

* Admatic Bidder Adaptor

* Update admaticBidAdapter.md

* Update admaticBidAdapter.md

* remove floor parameter

* Update admaticBidAdapter.js

* Admatic Bid Adapter: alias and bid floor features activated

* Admatic adapter: host param control changed

* Alias name changed.

* Revert "Admatic adapter: host param control changed"

This reverts commit de7ac85981b1ba3ad8c5d1dc95c5dadbdf5b9895.

* added alias feature and host param

* Revert "added alias feature and host param"

This reverts commit 6ec8f4539ea6be403a0d7e08dad5c7a5228f28a1.

* Revert "Alias name changed."

This reverts commit 661c54f9b2397e8f25c257144d73161e13466281.

* Revert "Admatic Bid Adapter: alias and bid floor features activated"

This reverts commit 7a2e0e29c49e2f876b68aafe886b336fe2fe6fcb.

* Revert "Update admaticBidAdapter.js"

This reverts commit 7a845b7151bbb08addfb58ea9bd5b44167cc8a4e.

* Revert "remove floor parameter"

This reverts commit 7a23b055ccd4ea23d23e73248e82b21bc6f69d90.

* Admatic adapter: host param control && Add new Bidder

* Revert "Admatic adapter: host param control && Add new Bidder"

This reverts commit 3c797b120c8e0fe2b851381300ac5c4b1f92c6e2.

* commit new features

* Update admaticBidAdapter.js

* updated for coverage

* sync updated

* Update adloader.js

* AdMatic Bidder: development of user sync url

* Update admaticBidAdapter.js
---
 modules/admaticBidAdapter.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/admaticBidAdapter.js b/modules/admaticBidAdapter.js
index ec4401b77c9..148424c0a98 100644
--- a/modules/admaticBidAdapter.js
+++ b/modules/admaticBidAdapter.js
@@ -1,7 +1,7 @@
 import { getValue, logError, deepAccess, getBidIdParameter, isArray } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
-const SYNC_URL = 'https://cdn.serve.admatic.com.tr/showad/sync.html';
+let SYNC_URL = '';
 const BIDDER_CODE = 'admatic';
 export const spec = {
   code: BIDDER_CODE,
@@ -59,6 +59,15 @@ export const spec = {
     };
 
     if (payload) {
+      switch (bidderName) {
+        case 'pixad':
+          SYNC_URL = 'https://static.pixad.com.tr/sync.html';
+          break;
+        default:
+          SYNC_URL = 'https://cdn.serve.admatic.com.tr/showad/sync.html';
+          break;
+      }
+
       return { method: 'POST', url: `https://${host}/pb?bidder=${bidderName}`, data: payload, options: { contentType: 'application/json' } };
     }
   },

From f5fdcf095ee1be64b437a2ac3e4191af2aa3d44b Mon Sep 17 00:00:00 2001
From: Omer Dotan <54346241+omerBrowsi@users.noreply.github.com>
Date: Mon, 21 Nov 2022 20:03:57 +0200
Subject: [PATCH 458/569] Browsi RTD Module: add pageview billable event
 (#9207)

* real time data module,
browsi sub module for real time data,
new hook bidsBackCallback,
fix for config unsubscribe

* change timeout&primary ad server only to auctionDelay
update docs

* support multiple providers

* change promise to callbacks
configure submodule on submodules.json

* bug fixes

* use Prebid ajax

* tests fix

* browsi real time data provider improvements

* real time data module,
browsi sub module for real time data,
new hook bidsBackCallback,
fix for config unsubscribe

* change timeout&primary ad server only to auctionDelay
update docs

* support multiple providers

* change promise to callbacks
configure submodule on submodules.json

* bug fixes

* use Prebid ajax

* tests fix

* browsi real time data provider improvements

* fire billable event according to event listener
---
 modules/browsiRtdProvider.js                | 10 ++++++----
 test/spec/modules/browsiRtdProvider_spec.js |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/browsiRtdProvider.js b/modules/browsiRtdProvider.js
index 0996fc9905b..31b2d709f35 100644
--- a/modules/browsiRtdProvider.js
+++ b/modules/browsiRtdProvider.js
@@ -59,10 +59,12 @@ export function addBrowsiTag(data) {
 
 export function sendPageviewEvent(eventType) {
   if (eventType === 'PAGEVIEW') {
-    events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
-      vendor: 'browsi',
-      type: 'pageview',
-      billingId: generateUUID()
+    window.addEventListener('browsi_pageview', () => {
+      events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+        vendor: 'browsi',
+        type: 'pageview',
+        billingId: generateUUID()
+      })
     })
   }
 }
diff --git a/test/spec/modules/browsiRtdProvider_spec.js b/test/spec/modules/browsiRtdProvider_spec.js
index 19483047827..75120aa7505 100644
--- a/test/spec/modules/browsiRtdProvider_spec.js
+++ b/test/spec/modules/browsiRtdProvider_spec.js
@@ -252,7 +252,8 @@ describe('browsi Real time  data sub module', function () {
     })
     it('should send event if type is correct', function () {
       sendPageviewEvent('PAGEVIEW')
-
+      const pageViewEvent = new CustomEvent('browsi_pageview', {});
+      window.dispatchEvent(pageViewEvent);
       const expectedCall = {
         vendor: 'browsi',
         type: 'pageview',

From d6418a04f9913ee732114f4926f490094f765c9f Mon Sep 17 00:00:00 2001
From: Piotr Jaworski <109736938+piotrj-rtbh@users.noreply.github.com>
Date: Mon, 21 Nov 2022 21:10:19 +0100
Subject: [PATCH 459/569] RTB House Bid Adapter: Process FLEDGE
 request/response (#9215)

* RTBHouse Bid Adapter: add global vendor list id

* structured user agent - browsers.brands

* fix lint errors

* Added sda into rtbhouse adapter

* spreading ortb2: user & site props

* examples reverted

* init version

* using mergedeep

* removed wrong imp array augm.; slot imp augm. with addtl check

* [SUA] merging ortb2.device into request

* fledge auctionConfig adapted to our bid response structure

* new bidder response structure for fledge

* make sure bidderRequest has proper flag turned on

* fledge endpoint hardcoded; code cleanups

* remove obsolete function

* obsolete function removed

* [RTB House] Process FLEDGE request/response (#4)

* [SDA & SUA] refactor using mergedeep

* [FLEDGE] fledge auctionConfig adapted to our bid response structure

* [FLEDGE] new bidder response structure for fledge

* [FLEDGE] make sure bidderRequest has proper flag turned on

* [FLEDGE] fledge endpoint hardcoded; code cleanups

* [FLEDGE] remove obsolete functions

* fixed lint errors

* fledge test suites; adapter: delete imp.ext.ae when no fledge (#5)

Co-authored-by: Leandro Otani <leandro.otani@rtbhouse.com>
Co-authored-by: rtbh-lotani <83652735+rtbh-lotani@users.noreply.github.com>
Co-authored-by: Tomasz Swirski <tomasz.swirski@rtbhouse.com>
---
 modules/rtbhouseBidAdapter.js                | 119 ++++++++++++++-----
 test/spec/modules/rtbhouseBidAdapter_spec.js |  79 ++++++++++++
 2 files changed, 169 insertions(+), 29 deletions(-)

diff --git a/modules/rtbhouseBidAdapter.js b/modules/rtbhouseBidAdapter.js
index fdf64483da7..9f498014a8e 100644
--- a/modules/rtbhouseBidAdapter.js
+++ b/modules/rtbhouseBidAdapter.js
@@ -1,13 +1,15 @@
-import {deepAccess, isArray, logError} from '../src/utils.js';
+import {deepAccess, mergeDeep, isArray, logError, logInfo} from '../src/utils.js';
 import { getOrigin } from '../libraries/getOrigin/index.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {includes} from '../src/polyfill.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'rtbhouse';
 const REGIONS = ['prebid-eu', 'prebid-us', 'prebid-asia'];
 const ENDPOINT_URL = 'creativecdn.com/bidder/prebid/bids';
+const FLEDGE_ENDPOINT_URL = 'creativecdn.com/bidder/prebidfledge/bids';
 const DEFAULT_CURRENCY_ARR = ['USD']; // NOTE - USD is the only supported currency right now; Hardcoded for bids
 const SUPPORTED_MEDIA_TYPES = [BANNER, NATIVE];
 const TTL = 55;
@@ -50,12 +52,13 @@ export const spec = {
 
     const request = {
       id: validBidRequests[0].auctionId,
-      imp: validBidRequests.map(slot => mapImpression(slot)),
+      imp: validBidRequests.map(slot => mapImpression(slot, bidderRequest)),
       site: mapSite(validBidRequests, bidderRequest),
       cur: DEFAULT_CURRENCY_ARR,
       test: validBidRequests[0].params.test || 0,
       source: mapSource(validBidRequests[0]),
     };
+
     if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
       const consentStr = (bidderRequest.gdprConsent.consentString)
         ? bidderRequest.gdprConsent.consentString.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '') : '';
@@ -81,37 +84,32 @@ export const spec = {
       }
     }
 
-    const ortb2Params = bidderRequest && bidderRequest.ortb2;
-    if (ortb2Params?.user) {
-      request.user = {
-        ...request.user,
-        ...(ortb2Params.user.data && {
-          data: { ...request.user?.data, ...ortb2Params.user.data },
-        }),
-        ...(ortb2Params.user.ext && {
-          ext: { ...request.user?.ext, ...ortb2Params.user.ext },
-        }),
-      };
+    const ortb2Params = bidderRequest?.ortb2 || {};
+    if (ortb2Params.site) {
+      mergeDeep(request, { site: ortb2Params.site });
+    }
+    if (ortb2Params.user) {
+      mergeDeep(request, { user: ortb2Params.user });
+    }
+    if (ortb2Params.device) {
+      mergeDeep(request, { device: ortb2Params.device });
     }
-    if (ortb2Params?.site) {
-      request.site = {
-        ...request.site,
-        ...(ortb2Params.site.content && {
-          content: { ...request.site?.content, ...ortb2Params.site.content },
-        }),
-        ...(ortb2Params.site.ext && {
-          ext: { ...request.site?.ext, ...ortb2Params.site.ext },
-        }),
-      };
+
+    let computedEndpointUrl = ENDPOINT_URL;
+
+    const fledgeConfig = config.getConfig('fledgeConfig');
+    if (bidderRequest.fledgeEnabled && fledgeConfig) {
+      mergeDeep(request, { ext: { fledge_config: fledgeConfig } });
+      computedEndpointUrl = FLEDGE_ENDPOINT_URL;
     }
 
     return {
       method: 'POST',
-      url: 'https://' + validBidRequests[0].params.region + '.' + ENDPOINT_URL,
+      url: 'https://' + validBidRequests[0].params.region + '.' + computedEndpointUrl,
       data: JSON.stringify(request)
     };
   },
-  interpretResponse: function (serverResponse, originalRequest) {
+  interpretOrtbResponse: function (serverResponse, originalRequest) {
     const responseBody = serverResponse.body;
     if (!isArray(responseBody)) {
       return [];
@@ -119,17 +117,72 @@ export const spec = {
 
     const bids = [];
     responseBody.forEach(serverBid => {
-      if (serverBid.price === 0) {
+      if (!serverBid.price) { // price may exist and is === 0 or there's no price prop at all (fledge req case)
         return;
       }
+
+      let interpretedBid;
+
       // try...catch would be risky cause JSON.parse throws SyntaxError
       if (serverBid.adm.indexOf('{') === 0) {
-        bids.push(interpretNativeBid(serverBid));
+        interpretedBid = interpretNativeBid(serverBid);
       } else {
-        bids.push(interpretBannerBid(serverBid));
+        interpretedBid = interpretBannerBid(serverBid);
       }
+      if (serverBid.ext) interpretedBid.ext = serverBid.ext;
+
+      bids.push(interpretedBid);
     });
     return bids;
+  },
+  interpretResponse: function (serverResponse, originalRequest) {
+    let bids;
+
+    const responseBody = serverResponse.body;
+    let fledgeAuctionConfigs = null;
+
+    if (responseBody.bidid && isArray(responseBody?.ext?.igbid)) {
+      // we have fledge response
+      // mimic the original response ([{},...])
+      bids = this.interpretOrtbResponse({ body: responseBody.seatbid[0]?.bid }, originalRequest);
+
+      const seller = responseBody.ext.seller;
+      const decisionLogicUrl = responseBody.ext.decisionLogicUrl;
+      const sellerTimeout = 'sellerTimeout' in responseBody.ext ? { sellerTimeout: responseBody.ext.sellerTimeout } : {};
+      responseBody.ext.igbid.forEach((igbid) => {
+        const perBuyerSignals = {};
+        igbid.igbuyer.forEach(buyerItem => {
+          perBuyerSignals[buyerItem.igdomain] = buyerItem.buyersignal
+        });
+        fledgeAuctionConfigs = fledgeAuctionConfigs || {};
+        fledgeAuctionConfigs[igbid.impid] = mergeDeep(
+          {
+            seller,
+            decisionLogicUrl,
+            interestGroupBuyers: Object.keys(perBuyerSignals),
+            perBuyerSignals,
+          },
+          sellerTimeout
+        );
+      });
+    } else {
+      bids = this.interpretOrtbResponse(serverResponse, originalRequest);
+    }
+
+    if (fledgeAuctionConfigs) {
+      fledgeAuctionConfigs = Object.entries(fledgeAuctionConfigs).map(([bidId, cfg]) => {
+        return Object.assign({
+          bidId,
+          auctionSignals: {}
+        }, cfg);
+      });
+      logInfo('Response with FLEDGE:', { bids, fledgeAuctionConfigs });
+      return {
+        bids,
+        fledgeAuctionConfigs,
+      }
+    }
+    return bids;
   }
 };
 registerBidder(spec);
@@ -154,7 +207,7 @@ function applyFloor(slot) {
  * @param {object} slot Ad Unit Params by Prebid
  * @returns {object} Imp by OpenRTB 2.5 §3.2.4
  */
-function mapImpression(slot) {
+function mapImpression(slot, bidderRequest) {
   const imp = {
     id: slot.bidId,
     banner: mapBanner(slot),
@@ -167,6 +220,14 @@ function mapImpression(slot) {
     imp.bidfloor = bidfloor;
   }
 
+  if (bidderRequest.fledgeEnabled) {
+    imp.ext = imp.ext || {};
+    imp.ext.ae = slot?.ortb2Imp?.ext?.ae
+  } else {
+    if (imp.ext?.ae) {
+      delete imp.ext.ae;
+    }
+  }
   return imp;
 }
 
diff --git a/test/spec/modules/rtbhouseBidAdapter_spec.js b/test/spec/modules/rtbhouseBidAdapter_spec.js
index f4bcb48474a..6d41df7605b 100644
--- a/test/spec/modules/rtbhouseBidAdapter_spec.js
+++ b/test/spec/modules/rtbhouseBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import { OPENRTB, spec } from 'modules/rtbhouseBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
 
 describe('RTBHouseAdapter', () => {
   const adapter = newBidder(spec);
@@ -97,6 +98,10 @@ describe('RTBHouseAdapter', () => {
       ];
     });
 
+    afterEach(function () {
+      config.resetConfig();
+    });
+
     it('should build test param into the request', () => {
       let builtTestRequest = spec.buildRequests(bidRequests, bidderRequest).data;
       expect(JSON.parse(builtTestRequest).test).to.equal(1);
@@ -263,6 +268,45 @@ describe('RTBHouseAdapter', () => {
       expect(data.source).to.not.have.property('ext');
     });
 
+    context('FLEDGE', function() {
+      afterEach(function () {
+        config.resetConfig();
+      });
+
+      it('sends bid request to FLEDGE ENDPOINT via POST', function () {
+        let bidRequest = Object.assign([], bidRequests);
+        delete bidRequest[0].params.test;
+        config.setConfig({ fledgeConfig: true });
+        const request = spec.buildRequests(bidRequest, { ...bidderRequest, fledgeEnabled: true });
+        expect(request.url).to.equal('https://prebid-eu.creativecdn.com/bidder/prebidfledge/bids');
+        expect(request.method).to.equal('POST');
+      });
+
+      it('when FLEDGE is disabled, should not send imp.ext.ae', function () {
+        let bidRequest = Object.assign([], bidRequests);
+        delete bidRequest[0].params.test;
+        bidRequest[0].ortb2Imp = {
+          ext: { ae: 2 }
+        };
+        const request = spec.buildRequests(bidRequest, { ...bidderRequest, fledgeEnabled: false });
+        let data = JSON.parse(request.data);
+        if (data.imp[0].ext) {
+          expect(data.imp[0].ext).to.not.have.property('ae');
+        }
+      });
+
+      it('when FLEDGE is enabled, should send whatever is set in ortb2imp.ext.ae in all bid requests', function () {
+        let bidRequest = Object.assign([], bidRequests);
+        delete bidRequest[0].params.test;
+        bidRequest[0].ortb2Imp = {
+          ext: { ae: 2 }
+        };
+        const request = spec.buildRequests(bidRequest, { ...bidderRequest, fledgeEnabled: true });
+        let data = JSON.parse(request.data);
+        expect(data.imp[0].ext.ae).to.equal(2);
+      });
+    });
+
     describe('native imp', () => {
       function basicRequest(extension) {
         return Object.assign({
@@ -460,6 +504,29 @@ describe('RTBHouseAdapter', () => {
       'h': 250
     }];
 
+    let fledgeResponse = {
+      'id': 'bid-identifier',
+      'ext': {
+        'igbid': [{
+          'impid': 'test-bid-id',
+          'igbuyer': [{
+            'igdomain': 'https://buyer-domain.com',
+            'buyersignal': {}
+          }]
+        }],
+        'sellerTimeout': 500,
+        'seller': 'https://seller-domain.com',
+        'decisionLogicUrl': 'https://seller-domain.com/decision-logic.js'
+      },
+      'bidid': 'bid-identifier',
+      'seatbid': [{
+        'bid': [{
+          'id': 'bid-response-id',
+          'impid': 'test-bid-id'
+        }]
+      }]
+    };
+
     it('should get correct bid response', function () {
       let expectedResponse = [
         {
@@ -488,6 +555,18 @@ describe('RTBHouseAdapter', () => {
       expect(result.length).to.equal(0);
     });
 
+    context('when the response contains FLEDGE interest groups config', function () {
+      let bidderRequest;
+      let response = spec.interpretResponse({body: fledgeResponse}, {bidderRequest});
+
+      it('should return FLEDGE auction_configs alongside bids', function () {
+        expect(response).to.have.property('bids');
+        expect(response).to.have.property('fledgeAuctionConfigs');
+        expect(response.fledgeAuctionConfigs.length).to.equal(1);
+        expect(response.fledgeAuctionConfigs[0].bidId).to.equal('test-bid-id');
+      });
+    });
+
     describe('native', () => {
       const adm = {
         native: {

From 3d1174bca579f6e01e7187cb82c9d91fff0cc7ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Nov 2022 04:35:05 -0700
Subject: [PATCH 460/569] Bump engine.io from 6.2.0 to 6.2.1 (#9270)

Bumps [engine.io](https://github.com/socketio/engine.io) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/engine.io/compare/6.2.0...6.2.1)

---
updated-dependencies:
- dependency-name: engine.io
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4584231d42c..2ed7cf9067e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8885,9 +8885,9 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz",
-      "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
       "dev": true,
       "dependencies": {
         "@types/cookie": "^0.4.1",
@@ -32089,9 +32089,9 @@
       }
     },
     "engine.io": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz",
-      "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+      "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
       "dev": true,
       "requires": {
         "@types/cookie": "^0.4.1",

From 616d957bacc18d4764a82061cf5e44696d62bc8b Mon Sep 17 00:00:00 2001
From: lasloche <62240785+lasloche@users.noreply.github.com>
Date: Tue, 22 Nov 2022 13:43:17 +0200
Subject: [PATCH 461/569] Rise readme maintenance (#9272)

---
 modules/minutemediaBidAdapter.md | 6 +++---
 modules/riseBidAdapter.md        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/minutemediaBidAdapter.md b/modules/minutemediaBidAdapter.md
index 70f106a745f..66b54adaf0e 100644
--- a/modules/minutemediaBidAdapter.md
+++ b/modules/minutemediaBidAdapter.md
@@ -20,7 +20,7 @@ The adapter supports Video(instream) & Banner.
 
 | Name | Scope | Type | Description | Example
 | ---- | ----- | ---- | ----------- | -------
-| `org` | required | String |  MinuteMedia publisher Id provided by your MinuteMedia representative  | "56f91cd4d3e3660002000033"
+| `org` | required | String |  MinuteMedia publisher Id provided by your MinuteMedia representative  | "1234567890abcdef12345678"
 | `floorPrice` | optional | Number |  Minimum price in USD. Misuse of this parameter can impact revenue | 2.00
 | `placementId` | optional | String |  A unique placement identifier  | "12345678"
 | `testMode` | optional | Boolean |  This activates the test mode  | false
@@ -43,7 +43,7 @@ var adUnits = [{
         bids: [{
             bidder: 'minutemedia',
             params: {
-                org: '56f91cd4d3e3660002000033', // Required
+                org: '1234567890abcdef12345678', // Required
                 floorPrice: 2.00, // Optional
                 placementId: 'video-test', // Optional
                 testMode: false // Optional
@@ -65,7 +65,7 @@ var adUnits = [{
         bids: [{
             bidder: 'minutemedia',
             params: {
-                org: '56f91cd4d3e3660002000033', // Required
+                org: '1234567890abcdef12345678', // Required
                 floorPrice: 2.00, // Optional
                 placementId: 'banner-test', // Optional
                 testMode: false // Optional
diff --git a/modules/riseBidAdapter.md b/modules/riseBidAdapter.md
index 2920fd28528..9dab3ec2a30 100644
--- a/modules/riseBidAdapter.md
+++ b/modules/riseBidAdapter.md
@@ -20,7 +20,7 @@ The adapter supports Video(instream).
 
 | Name | Scope | Type | Description | Example
 | ---- | ----- | ---- | ----------- | -------
-| `org` | required | String |  Rise publisher Id provided by your Rise representative  | "56f91cd4d3e3660002000033"
+| `org` | required | String |  Rise publisher Id provided by your Rise representative  | "1234567890abcdef12345678"
 | `floorPrice` | optional | Number |  Minimum price in USD. Misuse of this parameter can impact revenue | 2.00
 | `placementId` | optional | String |  A unique placement identifier  | "12345678"
 | `testMode` | optional | Boolean |  This activates the test mode  | false
@@ -41,10 +41,10 @@ var adUnits = [
         bids: [{
           bidder: 'rise',
           params: {
-            org: '56f91cd4d3e3660002000033', // Required
+            org: '1234567890abcdef12345678', // Required
             floorPrice: 2.00, // Optional
             placementId: '12345678', // Optional
-            testMode: false // Optional,
+            testMode: false, // Optional,
             rtbDomain: "www.test.com" //Optional
           }
         }]

From 3e5f08635b965cfbc5384b9735f0797757cedad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9onard=20Labat?= <le.labat@criteo.com>
Date: Tue, 22 Nov 2022 18:03:07 +0100
Subject: [PATCH 462/569] Criteo Bid Adapter : fix getFloor usage issue (#9243)

getFloor call context is loss when we reference it as a callback ; we need to make sure that it is properly mapped as getFloor function assumes that "this" is the actual bid request object
---
 modules/criteoBidAdapter.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index c0251ab0165..5567103db69 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -672,18 +672,18 @@ function enrichSlotWithFloors(slot, bidRequest) {
       if (bidRequest.mediaTypes?.banner) {
         slotFloors.banner = {};
         const bannerSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.banner.sizes'))
-        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = getFloor({ size: bannerSize, mediaType: BANNER }));
+        bannerSizes.forEach(bannerSize => slotFloors.banner[parseSize(bannerSize).toString()] = getFloor.call(bidRequest, { size: bannerSize, mediaType: BANNER }));
       }
 
       if (bidRequest.mediaTypes?.video) {
         slotFloors.video = {};
         const videoSizes = parseSizes(deepAccess(bidRequest, 'mediaTypes.video.playerSize'))
-        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = getFloor({ size: videoSize, mediaType: VIDEO }));
+        videoSizes.forEach(videoSize => slotFloors.video[parseSize(videoSize).toString()] = getFloor.call(bidRequest, { size: videoSize, mediaType: VIDEO }));
       }
 
       if (bidRequest.mediaTypes?.native) {
         slotFloors.native = {};
-        slotFloors.native['*'] = getFloor({ size: '*', mediaType: NATIVE });
+        slotFloors.native['*'] = getFloor.call(bidRequest, { size: '*', mediaType: NATIVE });
       }
 
       if (Object.keys(slotFloors).length > 0) {

From 690c0d63f7455475cd8d0fc773dbdfa7f40fa7d1 Mon Sep 17 00:00:00 2001
From: OronW <41260031+OronW@users.noreply.github.com>
Date: Tue, 22 Nov 2022 20:17:24 +0200
Subject: [PATCH 463/569] Rise Bid Adapter: add support for mimes, api,
 protocols in bid object (#9253)

* added support to mimes, api and protocols based on bid settings

* moved protocols only if object is video

* updated path for protocols property

* added unit test for api, mimes and protocols properties
---
 modules/riseBidAdapter.js                | 15 +++++++++++++++
 test/spec/modules/riseBidAdapter_spec.js | 24 ++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/modules/riseBidAdapter.js b/modules/riseBidAdapter.js
index c1360b79066..4325a699a3b 100644
--- a/modules/riseBidAdapter.js
+++ b/modules/riseBidAdapter.js
@@ -309,6 +309,16 @@ function generateBidParameters(bid, bidderRequest) {
     bidObject.placementId = placementId;
   }
 
+  const mimes = deepAccess(bid, `mediaTypes.${mediaType}.mimes`);
+  if (mimes) {
+    bidObject.mimes = mimes;
+  }
+
+  const api = deepAccess(bid, `mediaTypes.${mediaType}.api`);
+  if (api) {
+    bidObject.api = api;
+  }
+
   if (mediaType === VIDEO) {
     const playbackMethod = deepAccess(bid, `mediaTypes.video.playbackmethod`);
     let playbackMethodValue;
@@ -349,6 +359,11 @@ function generateBidParameters(bid, bidderRequest) {
     if (linearity) {
       bidObject.linearity = linearity;
     }
+
+    const protocols = deepAccess(bid, `mediaTypes.video.protocols`);
+    if (protocols) {
+      bidObject.protocols = protocols;
+    }
   }
 
   return bidObject;
diff --git a/test/spec/modules/riseBidAdapter_spec.js b/test/spec/modules/riseBidAdapter_spec.js
index 7daedb9015a..37100073407 100644
--- a/test/spec/modules/riseBidAdapter_spec.js
+++ b/test/spec/modules/riseBidAdapter_spec.js
@@ -106,6 +106,9 @@ describe('riseAdapter', function () {
       bidderCode: 'rise',
     }
     const placementId = '12345678';
+    const api = [1, 2];
+    const mimes = ['application/javascript', 'video/mp4', 'video/quicktime'];
+    const protocols = [2, 3, 5, 6];
 
     it('sends the placementId to ENDPOINT via POST', function () {
       bidRequests[0].params.placementId = placementId;
@@ -144,6 +147,27 @@ describe('riseAdapter', function () {
       expect(request.data.bids[0].bidId).to.equal('299ffc8cca0b87');
     });
 
+    it('should send the correct supported api array', function () {
+      bidRequests[0].mediaTypes.video.api = api;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].api).to.be.an('array');
+      expect(request.data.bids[0].api).to.eql([1, 2]);
+    });
+
+    it('should send the correct mimes array', function () {
+      bidRequests[1].mediaTypes.banner.mimes = mimes;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[1].mimes).to.be.an('array');
+      expect(request.data.bids[1].mimes).to.eql(['application/javascript', 'video/mp4', 'video/quicktime']);
+    });
+
+    it('should send the correct protocols array', function () {
+      bidRequests[0].mediaTypes.video.protocols = protocols;
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.bids[0].protocols).to.be.an('array');
+      expect(request.data.bids[0].protocols).to.eql([2, 3, 5, 6]);
+    });
+
     it('should send the correct sizes array', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.bids[0].sizes).to.be.an('array');

From 5b0bb17d98137a2c38b7dceb8fc1bd291ef999e8 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 22 Nov 2022 12:23:20 -0700
Subject: [PATCH 464/569] Prebid core: fix CPM to always be a  number (#9273)

---
 src/auction.js                   |  2 +-
 test/spec/auctionmanager_spec.js | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/auction.js b/src/auction.js
index 09fb275afdb..6376457c1d6 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -672,7 +672,7 @@ function addCommonResponseProperties(bidResponse, adUnitCode, {index = auctionMa
   Object.assign(bidResponse, {
     responseTimestamp: bidResponse.responseTimestamp || timestamp(),
     requestTimestamp: bidResponse.requestTimestamp || start,
-    cpm: bidResponse.cpm || parseFloat(bidResponse.cpm) || 0,
+    cpm: parseFloat(bidResponse.cpm) || 0,
     bidder: bidResponse.bidder || bidResponse.bidderCode,
     adUnitCode
   });
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index 47bdd4a3772..443147f5d20 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -1464,6 +1464,15 @@ describe('auctionmanager.js', function () {
       assert.equal(doneSpy.callCount, 1);
     });
 
+    it('should convert cpm to number', () => {
+      auction.addBidReceived = sinon.spy();
+      const cbs = auctionCallbacks(doneSpy, auction);
+      const bid = {...bids[0], cpm: '1.23'}
+      bidRequests = [mockBidRequest(bid)];
+      cbs.addBidResponse.call(bidRequests[0], ADUNIT_CODE, bid);
+      sinon.assert.calledWith(auction.addBidReceived, sinon.match({cpm: 1.23}));
+    })
+
     describe('when addBidResponse hook returns promises', () => {
       let resolvers, callbacks, bids;
 
@@ -1605,6 +1614,7 @@ describe('auctionmanager.js', function () {
         ];
         cbs = auctionCallbacks(doneSpy, auction);
         expectedRejection = sinon.match(Object.assign({}, bid, {
+          cpm: parseFloat(bid.cpm),
           rejectionReason: REJECTION_REASON,
           adUnitCode: AU_CODE
         }));

From 737646f9f77f18952fd228e1114f0ed2b6e229c2 Mon Sep 17 00:00:00 2001
From: Gabriel Chicoye <gabriel.chicoye@gmail.com>
Date: Thu, 24 Nov 2022 11:49:58 +0100
Subject: [PATCH 465/569] nexx360 Bid Adapter: new functionalities and endpoint
 update (#9229)

* bidder version v1.0

* Comments removed

* Test coverage improvement above 80%
---
 modules/nexx360BidAdapter.js                | 402 ++++++++----
 test/spec/modules/nexx360BidAdapter_spec.js | 662 +++++++++++++-------
 2 files changed, 705 insertions(+), 359 deletions(-)

diff --git a/modules/nexx360BidAdapter.js b/modules/nexx360BidAdapter.js
index ed0c0c66a7a..ff4ca77aac2 100644
--- a/modules/nexx360BidAdapter.js
+++ b/modules/nexx360BidAdapter.js
@@ -1,176 +1,302 @@
-import {ajax} from '../src/ajax.js';
 import {config} from '../src/config.js';
-import { transformBidderParamKeywords } from '../src/utils.js';
+import * as utils from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {getGlobal} from '../src/prebidGlobal.js';
 
+const VIDEO_TARGETING = ['startdelay', 'mimes', 'minduration', 'maxduration', 'delivery',
+  'startdelay', 'skip', 'playbackmethod', 'api', 'protocol', 'boxingallowed', 'maxextended',
+  'linearity', 'delivery', 'protocols', 'placement', 'minbitrate', 'maxbitrate', 'battr', 'ext'];
 const BIDDER_CODE = 'nexx360';
-const BIDDER_URL = 'https://fast.nexx360.io/prebid';
-const CACHE_URL = 'https://fast.nexx360.io/cache';
-const METRICS_TRACKER_URL = 'https://fast.nexx360.io/track-imp';
+const REQUEST_URL = 'https://fast.nexx360.io/booster';
+
+const PAGE_VIEW_ID = utils.generateUUID();
+
+const BIDDER_VERSION = '1.0';
 
 const GVLID = 965;
 
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
-  aliases: ['revenuemaker'], // short code
+  aliases: [
+    { code: 'revenuemaker' },
+    { code: 'firstid-ssp' },
+  ],
   supportedMediaTypes: [BANNER, VIDEO],
-  /**
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getUserSyncs,
+  // onBidWon,
+};
+
+registerBidder(spec);
+
+/**
          * Determines whether or not the given bid request is valid.
          *
          * @param {BidRequest} bid The bid params to validate.
          * @return boolean True if this is a valid bid, and false otherwise.
          */
-  isBidRequestValid: function(bid) {
-    if (!!bid.params.bidfloorCurrency && !['EUR', 'USD'].includes(bid.params.bidfloorCurrency)) return false;
-    if (!!bid.params.bidfloor && typeof bid.params.bidfloor !== 'number') return false;
-    if (!!bid.params.keywords && typeof bid.params.keywords !== 'object') return false;
-    return !!(bid.params.account && bid.params.tagId);
-  },
-  /**
+function isBidRequestValid(bid) {
+  return !!bid.params.tagId || !!bid.params.videoTagId;
+};
+
+/**
          * Make a server request from the list of BidRequests.
          *
          * @param {validBidRequests[]} - an array of bids
          * @return ServerRequest Info describing the request to the server.
          */
-  buildRequests: function(validBidRequests, bidderRequest) {
-    const adUnits = [];
-    const test = config.getConfig('debug') ? 1 : 0;
-    let adunitValue = null;
-    let userEids = null;
-    Object.keys(validBidRequests).forEach(key => {
-      adunitValue = validBidRequests[key];
-      const foo = {
-        account: adunitValue.params.account,
-        tagId: adunitValue.params.tagId,
-        videoExt: adunitValue.params.videoExt,
-        label: adunitValue.adUnitCode,
-        bidId: adunitValue.bidId,
-        auctionId: adunitValue.auctionId,
-        transactionId: adunitValue.transactionId,
-        mediatypes: adunitValue.mediaTypes,
-        bidfloor: adunitValue.params.bidfloor || 0,
-        bidfloorCurrency: adunitValue.params.bidfloorCurrency || 'USD',
-        keywords: adunitValue.params.keywords ? transformBidderParamKeywords(adunitValue.params.keywords) : [],
+
+function buildRequests(bids, bidderRequest) {
+  const data = getBaseRequest(bids[0], bidderRequest);
+  bids.forEach((bid) => {
+    const impObject = createImpObject(bid);
+    if (isBannerBid(bid)) impObject.banner = getBannerObject(bid);
+    if (isVideoBid(bid)) impObject.video = getVideoObject(bid);
+    data.imp.push(impObject);
+  });
+  return {
+    method: 'POST',
+    url: REQUEST_URL,
+    data,
+  }
+}
+
+function createImpObject(bid) {
+  const floor = getFloor(bid, BANNER);
+  const imp = {
+    id: bid.bidId,
+    tagid: bid.adUnitCode,
+    ext: {
+      divId: bid.adUnitCode,
+      nexx360: {
+        videoTagId: bid.params.videoTagId,
+        tagId: bid.params.tagId,
+        allBids: bid.params.allBids === true,
       }
-      adUnits.push(foo);
-      if (adunitValue.userIdAsEids) userEids = adunitValue.userIdAsEids;
+    }
+  };
+  if (bid.params.customParams) {
+    utils.deepSetValue(imp, 'ext.customParams', bid.params.customParams);
+  }
+  enrichImp(imp, bid, floor);
+  return imp;
+}
+
+function getBannerObject(bid) {
+  return {
+    format: toFormat(bid.mediaTypes.banner.sizes),
+    topframe: utils.inIframe() ? 0 : 1
+  };
+}
+
+function getVideoObject(bid) {
+  let width, height;
+  const videoParams = utils.deepAccess(bid, `mediaTypes.video`);
+  const playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
+  const context = utils.deepAccess(bid, 'mediaTypes.video.context');
+  // normalize config for video size
+  if (utils.isArray(bid.sizes) && bid.sizes.length === 2 && !utils.isArray(bid.sizes[0])) {
+    width = parseInt(bid.sizes[0], 10);
+    height = parseInt(bid.sizes[1], 10);
+  } else if (utils.isArray(bid.sizes) && utils.isArray(bid.sizes[0]) && bid.sizes[0].length === 2) {
+    width = parseInt(bid.sizes[0][0], 10);
+    height = parseInt(bid.sizes[0][1], 10);
+  } else if (utils.isArray(playerSize) && playerSize.length === 2) {
+    width = parseInt(playerSize[0], 10);
+    height = parseInt(playerSize[1], 10);
+  }
+  const video = {
+    playerSize: [height, width],
+    context,
+  };
+
+  Object.keys(videoParams)
+    .filter(param => VIDEO_TARGETING.includes(param))
+    .forEach(param => video[param] = videoParams[param]);
+  return video;
+}
+
+function isVideoBid(bid) {
+  return utils.deepAccess(bid, 'mediaTypes.video');
+}
+
+function isBannerBid(bid) {
+  return utils.deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
+}
+
+function toFormat(sizes) {
+  return sizes.map((s) => {
+    return { w: s[0], h: s[1] };
+  });
+}
+
+function getFloor(bid, mediaType) {
+  let floor = 0;
+  if (typeof bid.getFloor === 'function') {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: mediaType,
+      size: '*'
     });
-    const payload = {
-      adUnits,
-      // TODO: does the fallback make sense here?
-      href: encodeURIComponent(bidderRequest.refererInfo.page || bidderRequest.refererInfo.topmostLocation)
-    };
-    if (bidderRequest) { // modules informations (gdpr, ccpa, schain, userId)
-      if (bidderRequest.gdprConsent) {
-        payload.gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
-        payload.gdprConsent = bidderRequest.gdprConsent.consentString;
-      } else {
-        payload.gdpr = 0;
-        payload.gdprConsent = '';
-      }
-      if (bidderRequest.uspConsent) { payload.uspConsent = bidderRequest.uspConsent; }
-      if (bidderRequest.schain) { payload.schain = bidderRequest.schain; }
-      if (userEids !== null) payload.userEids = userEids;
-    };
-    if (test) payload.test = 1;
-    const payloadString = JSON.stringify(payload);
-    return {
-      method: 'POST',
-      url: BIDDER_URL,
-      data: payloadString,
-    };
-  },
-  /**
+
+    if (typeof floorInfo === 'object' &&
+      floorInfo.currency === 'USD' &&
+      !isNaN(parseFloat(floorInfo.floor))) {
+      floor = Math.max(floor, parseFloat(floorInfo.floor));
+    }
+  }
+
+  return floor;
+}
+
+function enrichImp(imp, bid, floor) {
+  if (bid.params.customParams) {
+    utils.deepSetValue(imp, 'ext.customParams', bid.params.customParams);
+  }
+  if (floor > 0) {
+    imp.bidfloor = floor;
+    imp.bidfloorcur = 'USD';
+  } else if (bid.params.customFloor) {
+    imp.bidfloor = bid.params.customFloor;
+  }
+  if (bid.ortb2Imp && bid.ortb2Imp.ext && bid.ortb2Imp.ext.data) {
+    imp.ext.data = bid.ortb2Imp.ext.data;
+  }
+}
+
+function getBaseRequest(bid, bidderRequest) {
+  let req = {
+    id: bidderRequest.auctionId,
+    imp: [],
+    cur: [config.getConfig('currency.adServerCurrency') || 'USD'],
+    at: 1,
+    tmax: config.getConfig('bidderTimeout'),
+    site: {
+      page: bidderRequest.refererInfo.topmostLocation || bidderRequest.refererInfo.page,
+      domain: bidderRequest.refererInfo.domain,
+    },
+    regs: {
+      coppa: (config.getConfig('coppa') === true || bid.params.coppa) ? 1 : 0,
+    },
+    device: {
+      dnt: (utils.getDNT() || bid.params.doNotTrack) ? 1 : 0,
+      h: screen.height,
+      w: screen.width,
+      ua: window.navigator.userAgent,
+      language: window.navigator.language.split('-').shift()
+    },
+    user: {},
+    ext: {
+      source: 'prebid.js',
+      version: '$prebid.version$',
+      pageViewId: PAGE_VIEW_ID,
+      bidderVersion: BIDDER_VERSION,
+    }
+  };
+
+  if (bid.params.platform) {
+    utils.deepSetValue(req, 'ext.platform', bid.params.platform);
+  }
+  if (bid.params.response_template_name) {
+    utils.deepSetValue(req, 'ext.response_template_name', bid.params.response_template_name);
+  }
+  req.test = config.getConfig('debug') ? 1 : 0;
+  if (bidderRequest.gdprConsent) {
+    if (bidderRequest.gdprConsent.gdprApplies !== undefined) {
+      utils.deepSetValue(req, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies === true ? 1 : 0);
+    }
+    if (bidderRequest.gdprConsent.consentString !== undefined) {
+      utils.deepSetValue(req, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+    }
+    if (bidderRequest.gdprConsent.addtlConsent !== undefined) {
+      utils.deepSetValue(req, 'user.ext.ConsentedProvidersSettings.consented_providers', bidderRequest.gdprConsent.addtlConsent);
+    }
+  }
+  if (bidderRequest.uspConsent) {
+    utils.deepSetValue(req, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+  }
+  if (bid.schain) {
+    utils.deepSetValue(req, 'source.ext.schain', bid.schain);
+  }
+  if (bid.userIdAsEids) {
+    utils.deepSetValue(req, 'user.ext.eids', bid.userIdAsEids);
+  }
+  const commonFpd = bidderRequest.ortb2 || {};
+  if (commonFpd.site) {
+    utils.mergeDeep(req, {site: commonFpd.site});
+  }
+  if (commonFpd.user) {
+    utils.mergeDeep(req, {user: commonFpd.user});
+  }
+  return req;
+}
+
+/**
          * Unpack the response from the server into a list of bids.
          *
          * @param {ServerResponse} serverResponse A successful response from the server.
          * @return {Bid[]} An array of bids which were nested inside the server.
          */
-  interpretResponse: function(serverResponse, bidRequest) {
-    const serverBody = serverResponse.body;
-    const bidResponses = [];
-    let bidResponse = null;
-    let value = null;
-    if (serverBody.hasOwnProperty('responses')) {
-      Object.keys(serverBody['responses']).forEach(key => {
-        value = serverBody['responses'][key];
-        const url = `${CACHE_URL}?uuid=${value['uuid']}`;
-        bidResponse = {
-          requestId: value['bidId'],
-          cpm: value['cpm'],
-          currency: value['currency'],
-          width: value['width'],
-          height: value['height'],
-          ttl: value['ttl'],
-          creativeId: value['creativeId'],
-          netRevenue: true,
-          nexx360: {
-            'ssp': value['bidder'],
-            'consent': value['consent'],
-            'tagId': value['tagId']
-          },
-          /*
-          meta: {
-            'advertiserDomains': value['adomain']
-          }
-          */
-        };
-        if (value.type === 'banner') bidResponse.adUrl = url;
-        if (value.type === 'video') {
-          const params = {
-            type: 'prebid',
-            mediatype: 'video',
-            ssp: value.bidder,
-            tag_id: value.tagId,
-            consent: value.consent,
-            price: value.cpm,
-          };
-          bidResponse.cpm = value.cpm;
-          bidResponse.mediaType = 'video';
-          bidResponse.vastUrl = url;
-          bidResponse.vastImpUrl = `${METRICS_TRACKER_URL}?${new URLSearchParams(params).toString()}`;
-        }
-        bidResponses.push(bidResponse);
-      });
-    }
-    return bidResponses;
-  },
+function interpretResponse(response, req) {
+  const { bidderSettings } = getGlobal();
+  const allowAlternateBidderCodes = bidderSettings && bidderSettings.standard ? bidderSettings.standard.allowAlternateBidderCodes : false;
+  const respBody = response.body;
+  if (!respBody || !Array.isArray(respBody.seatbid)) {
+    return [];
+  }
+
+  let bids = [];
+  respBody.seatbid.forEach(seatbid => {
+    bids = [...bids, ...seatbid.bid.map(bid => {
+      const response = {
+        requestId: bid.impid,
+        cpm: bid.price,
+        width: bid.w,
+        height: bid.h,
+        creativeId: bid.crid,
+        dealId: bid.dealid,
+        currency: respBody.cur || 'USD',
+        netRevenue: true,
+        ttl: 120,
+        bidderCode: allowAlternateBidderCodes ? `n360-${bid.ssp}` : 'nexx360',
+        mediaType: bid.type === 'banner' ? 'banner' : 'video',
+        meta: { advertiserDomains: bid.adomain },
+      };
+      // if (bid.dealid) response.dealid = bid.dealid;
 
-  /**
+      if (response.mediaType === 'banner') {
+        response.adUrl = bid.adUrl;
+      }
+
+      if (['instream', 'outstream'].includes(bid.type)) response.vastXml = bid.vastXml;
+
+      if (bid.ext) {
+        response.meta.networkId = bid.ext.dsp_id;
+        response.meta.advertiserId = bid.ext.buyer_id;
+        response.meta.brandId = bid.ext.brand_id;
+      }
+      return response;
+    })];
+  });
+  return bids;
+}
+
+/**
      * Register the user sync pixels which should be dropped after the auction.
      *
      * @param {SyncOptions} syncOptions Which user syncs are allowed?
      * @param {ServerResponse[]} serverResponses List of server's responses.
      * @return {UserSync[]} The user syncs which should be dropped.
      */
-  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
-    if (typeof serverResponses === 'object' && serverResponses != null && serverResponses.length > 0 && serverResponses[0].hasOwnProperty('body') &&
+function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
+  if (typeof serverResponses === 'object' && serverResponses != null && serverResponses.length > 0 && serverResponses[0].hasOwnProperty('body') &&
         serverResponses[0].body.hasOwnProperty('cookies') && typeof serverResponses[0].body.cookies === 'object') {
-      return serverResponses[0].body.cookies.slice(0, 5);
-    } else {
-      return [];
-    }
-  },
-
-  /**
-     * Register bidder specific code, which will execute if a bid from this bidder won the auction
-     * @param {Bid} The bid that won the auction
-     */
-  onBidWon: function(bid) {
-    // fires a pixel to confirm a winning bid
-    const params = { type: 'prebid', mediatype: 'banner' };
-    if (bid.hasOwnProperty('nexx360')) {
-      if (bid.nexx360.hasOwnProperty('ssp')) params.ssp = bid.nexx360.ssp;
-      if (bid.nexx360.hasOwnProperty('tagId')) params.tag_id = bid.nexx360.tagId;
-      if (bid.nexx360.hasOwnProperty('consent')) params.consent = bid.nexx360.consent;
-    };
-    params.price = bid.cpm;
-    const url = `${METRICS_TRACKER_URL}?${new URLSearchParams(params).toString()}`;
-    ajax(url, null, undefined, {method: 'GET', withCredentials: true});
-    return true;
+    return serverResponses[0].body.cookies.slice(0, 5);
+  } else {
+    return [];
   }
-
-}
-registerBidder(spec);
+};
diff --git a/test/spec/modules/nexx360BidAdapter_spec.js b/test/spec/modules/nexx360BidAdapter_spec.js
index 1a695e5f8b3..a5da8b29fbc 100644
--- a/test/spec/modules/nexx360BidAdapter_spec.js
+++ b/test/spec/modules/nexx360BidAdapter_spec.js
@@ -6,70 +6,39 @@ import * as utils from 'src/utils.js';
 import { requestBidsHook } from 'modules/consentManagement.js';
 
 describe('Nexx360 bid adapter tests', function () {
-  const DISPLAY_BID_REQUEST = [{
-    'bidder': 'nexx360',
-    'params': {
-      'account': '1067',
-      'tagId': 'luvxjvgn'
+  const DISPLAY_BID_REQUEST = {
+    'id': '77b3f21a-e0df-4495-8bce-4e8a1d2309c1',
+    'imp': [
+      {'id': '2b4d8fc1c1c7ea',
+        'tagid': 'div-1',
+        'ext': {'divId': 'div-1', 'nexx360': {'account': '1067', 'tag_id': 'luvxjvgn'}},
+        'banner': {'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}], 'topframe': 1}}, {'id': '38fc428ab96638', 'tagid': 'div-2', 'ext': {'divId': 'div-2', 'nexx360': {'account': '1067', 'tag_id': 'luvxjvgn'}}, 'banner': {'format': [{'w': 728, 'h': 90}, {'w': 970, 'h': 250}], 'topframe': 1}}],
+    'cur': ['USD'],
+    'at': 1,
+    'tmax': 3000,
+    'site': {'page': 'https://test.nexx360.io/adapter/index.html?nexx360_test=1', 'domain': 'test.nexx360.io'},
+    'regs': {'coppa': 0, 'ext': {'gdpr': 1}},
+    'device': {
+      'dnt': 0,
+      'h': 844,
+      'w': 390,
+      'ua': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1',
+      'language': 'fr'
     },
-    'userId': {
-      'id5id': {
-        'uid': 'ID5*hQ5WobYI9Od4u52qpaXVKHhxUa4DsOWRAlvaFajm8gINfI1oVAe3UK59416dT4TqDX1pj4MBJ5TYwir6x3JgBw1-avYHSnmvQDdRMbxmC2sNf3ggIRTbyQBdI1RjvHyeDYCsistnTXF_iKF1nutYeQ2BZ4P5d5muZTG7C2PXVFgNg-18io9dCiSjzJXx93KPDYRiuIwtsGGsp51rojlpFw2Fp_dUkjXl4CAblk58DvwNhobwQ27bnBP8F2-Pcs88DYcvKn4r6dm3Vi7ILttxDQ2IgZ2X44ClgjoWh-vRf6ANis8Z7uL16vO8q0P5C21eDYuc4v_KaZqN-p9YWEeEZQ2OpkbRL7n5NieVJExHM6ANkAlLZhVf2T-1906TAIHKDZFm_xMCa1jJfpBqZB2agw2TjfbK6wMtJeHiZaipSuUNlM_CSH0HVXtfMj9yfzjzDZZnltZQ9lvc4JhXye5AwA2X1f9Dhk8VURTvVdfEUlU',
-        'ext': {
-          'linkType': 2
-        }
-      }
-    },
-    'userIdAsEids': [
-      {
-        'source': 'id5-sync.com',
-        'uids': [
-          {
-            'id': 'ID5*hQ5WobYI9Od4u52qpaXVKHhxUa4DsOWRAlvaFajm8gINfI1oVAe3UK59416dT4TqDX1pj4MBJ5TYwir6x3JgBw1-avYHSnmvQDdRMbxmC2sNf3ggIRTbyQBdI1RjvHyeDYCsistnTXF_iKF1nutYeQ2BZ4P5d5muZTG7C2PXVFgNg-18io9dCiSjzJXx93KPDYRiuIwtsGGsp51rojlpFw2Fp_dUkjXl4CAblk58DvwNhobwQ27bnBP8F2-Pcs88DYcvKn4r6dm3Vi7ILttxDQ2IgZ2X44ClgjoWh-vRf6ANis8Z7uL16vO8q0P5C21eDYuc4v_KaZqN-p9YWEeEZQ2OpkbRL7n5NieVJExHM6ANkAlLZhVf2T-1906TAIHKDZFm_xMCa1jJfpBqZB2agw2TjfbK6wMtJeHiZaipSuUNlM_CSH0HVXtfMj9yfzjzDZZnltZQ9lvc4JhXye5AwA2X1f9Dhk8VURTvVdfEUlU',
+    'user': {
+      'ext': {
+        'consent': 'CPgocUAPgocUAAKAsAENCkCsAP_AAH_AAAqIJDtd_H__bW9r-f5_aft0eY1P9_r37uQzDhfNk-8F3L_W_LwX52E7NF36tq4KmR4ku1LBIUNlHMHUDUmwaokVryHsak2cpzNKJ7BEknMZOydYGF9vmxtj-QKY7_5_d3bx2D-t_9v239z3z81Xn3d53-_03LCdV5_9Dfn9fR_bc9KPt_58v8v8_____3_e__3_7994JEAEmGrcQBdmWODNoGEUCIEYVhIVQKACCgGFogMAHBwU7KwCfWECABAKAIwIgQ4AowIBAAAJAEhEAEgRYIAAARAIAAQAIhEIAGBgEFgBYGAQAAgGgYohQACBIQZEBEUpgQFQJBAa2VCCUF0hphAHWWAFBIjYqABEEgIrAAEBYOAYIkBKxYIEmKN8gBGCFAKJUK1EAAAA.YAAAAAAAAAAA',
+        'ConsentedProvidersSettings': {'consented_providers': '1~39.43.46.55.61.70.83.89.93.108.117.122.124.131.135.136.143.144.147.149.159.162.167.171.192.196.202.211.218.228.230.239.241.259.266.272.286.291.311.317.322.323.326.327.338.367.371.385.389.394.397.407.413.415.424.430.436.445.449.453.482.486.491.494.495.501.503.505.522.523.540.550.559.560.568.574.576.584.587.591.733.737.745.787.802.803.817.820.821.829.839.864.867.874.899.904.922.931.938.979.981.985.1003.1024.1027.1031.1033.1040.1046.1051.1053.1067.1085.1092.1095.1097.1099.1107.1127.1135.1143.1149.1152.1162.1166.1186.1188.1201.1205.1211.1215.1226.1227.1230.1252.1268.1270.1276.1284.1286.1290.1301.1307.1312.1345.1356.1364.1365.1375.1403.1415.1416.1419.1440.1442.1449.1455.1456.1465.1495.1512.1516.1525.1540.1548.1555.1558.1564.1570.1577.1579.1583.1584.1591.1603.1616.1638.1651.1653.1665.1667.1677.1678.1682.1697.1699.1703.1712.1716.1721.1725.1732.1745.1750.1765.1769.1782.1786.1800.1808.1810.1825.1827.1832.1838.1840.1842.1843.1845.1859.1866.1870.1878.1880.1889.1899.1917.1929.1942.1944.1962.1963.1964.1967.1968.1969.1978.2003.2007.2008.2027.2035.2039.2044.2047.2052.2056.2064.2068.2070.2072.2074.2088.2090.2103.2107.2109.2115.2124.2130.2133.2137.2140.2145.2147.2150.2156.2166.2177.2183.2186.2202.2205.2216.2219.2220.2222.2225.2234.2253.2264.2279.2282.2292.2299.2305.2309.2312.2316.2322.2325.2328.2331.2334.2335.2336.2337.2343.2354.2357.2358.2359.2370.2376.2377.2387.2392.2394.2400.2403.2405.2407.2411.2414.2416.2418.2425.2440.2447.2459.2461.2462.2465.2468.2472.2477.2481.2484.2486.2488.2493.2496.2497.2498.2499.2501.2510.2511.2517.2526.2527.2532.2534.2535.2542.2552.2563.2564.2567.2568.2569.2571.2572.2575.2577.2583.2584.2596.2601.2604.2605.2608.2609.2610.2612.2614.2621.2628.2629.2633.2634.2636.2642.2643.2645.2646.2647.2650.2651.2652.2656.2657.2658.2660.2661.2669.2670.2677.2681.2684.2686.2687.2690.2695.2698.2707.2713.2714.2729.2739.2767.2768.2770.2772.2784.2787.2791.2792.2798.2801.2805.2812.2813.2816.2817.2818.2821.2822.2827.2830.2831.2834.2838.2839.2840.2844.2846.2847.2849.2850.2852.2854.2856.2860.2862.2863.2865.2867.2869.2873.2874.2875.2876.2878.2880.2881.2882.2883.2884.2886.2887.2888.2889.2891.2893.2894.2895.2897.2898.2900.2901.2908.2909.2911.2912.2913.2914.2916.2917.2918.2919.2920.2922.2923.2924.2927.2929.2930.2931.2939.2940.2941.2947.2949.2950.2956.2961.2962.2963.2964.2965.2966.2968.2970.2973.2974.2975.2979.2980.2981.2983.2985.2986.2987.2991.2994.2995.2997.2999.3000.3002.3003.3005.3008.3009.3010.3012.3016.3017.3018.3019.3024.3025.3028.3034.3037.3038.3043.3045.3048.3052.3053.3055.3058.3059.3063.3065.3066.3068.3070.3072.3073.3074.3075.3076.3077.3078.3089.3090.3093.3094.3095.3097.3099.3104.3106.3109.3112.3117.3118.3119.3120.3124.3126.3127.3128.3130.3135.3136.3145.3149.3150.3151.3154.3155.3162.3163.3167.3172.3173.3180.3182.3183.3184.3185.3187.3188.3189.3190.3194.3196.3197.3209.3210.3211.3214.3215.3217.3219.3222.3223.3225.3226.3227.3228.3230.3231.3232.3234.3235.3236.3237.3238.3240.3241.3244.3245.3250.3251.3253.3257.3260.3268.3270.3272.3281.3288.3290.3292.3293.3295.3296.3300.3306.3307.3308.3314.3315.3316.3318.3324.3327.3328.3330'},
+        'eids': [{'source': 'id5-sync.com',
+          'uids': [{'id': 'ID5*tdrSpYbccONIbxmulXFRLEil1aozZGGVMo9eEZgydgYoYFZQRYoae3wJyY0YtmXGKGJ7uXIQByQ6f7uzcpy9Oyhj1jGRzCf0BCoI4VkkKZIoZBubolUKUXXxOIdQOz7ZKGV0E3sqi9Zut0BbOuoJAihpLbgfNgDJ0xRmQw04rDooaxn7_TIPzEX5_L5ohNkUKG01Gnh2djvcrcPigKlk7ChwnauCwHIetHYI32yYAnAocYyqoM9XkoVOHtyOTC_UKHIR0qVBVIzJ1Nn_g7kLqyhzfosadKVvf7RQCsE6QrYodtpOJKg7i72-tnMXkzgmKHjh98aEDfTQrZOkKebmAyh6GlOHtYn_sZBFjJwtWp4oe9j2QTNbzK3G0jp1PlJqKHxiu4LawFEKJ3yi5-NFUyh-YkEalJUWyl1cDlWo5NQogAy2HM8N_w0qrVQgNbrTKIHK3KzTXztH7WzBgYrk8g',
             'atype': 1,
-            'ext': {
-              'linkType': 2
-            }
-          }
-        ]
-      }
-    ],
-    'mediaTypes': {
-      'banner': {
-        'sizes': [[300, 250], [300, 600]]
-      }
-    },
-    'adUnitCode': 'banner-div',
-    'transactionId': '9ad89d90-eb73-41b9-bf5f-7a8e2eecff27',
-    'sizes': [[300, 250], [300, 600]],
-    'bidId': '4d9e29504f8af6',
-    'bidderRequestId': '3423b6bd1a922c',
-    'auctionId': '05e0a3a1-9f57-41f6-bbcb-2ba9c9e3d2d5',
-    'src': 'client',
-    'bidRequestsCount': 1,
-    'bidderRequestsCount': 1,
-    'bidderWinsCount': 0
-  }];
-
-  const DISPLAY_BID_RESPONSE = {'body': {
-    'responses': [
-      {
-        'bidId': '4d9e29504f8af6',
-        'cpm': 0.437245,
-        'width': 300,
-        'height': 250,
-        'creativeId': '98493581',
-        'currency': 'EUR',
-        'netRevenue': true,
-        'type': 'banner',
-        'ttl': 360,
-        'uuid': 'ce6d1ee3-2a05-4d7c-b97a-9e62097798ec',
-        'bidder': 'appnexus',
-        'consent': 1,
-        'tagId': 'luvxjvgn'
-      }
-    ],
-  }};
+            'ext': {'linkType': 2}}]},
+        {'source': 'domain.com', 'uids': [{'id': 'value read from cookie or local storage', 'atype': 1, 'ext': {'stype': 'ppuid'}}]}]}},
+    'ext': {
+      'source': 'prebid.js',
+      'version': '7.20.0-pre',
+      'pageViewId': '5b970aba-51e9-4e0a-8299-f3f5618c695e'
+    }}
 
   const VIDEO_BID_REQUEST = [
     {
@@ -101,26 +70,6 @@ describe('Nexx360 bid adapter tests', function () {
     }
   ]
 
-  const VIDEO_BID_RESPONSE = {'body': {
-    'responses': [
-      {
-        'bidId': '2c129e8e01859a',
-        'type': 'video',
-        'uuid': 'b8e7b2f0-c378-479f-aa4f-4f55d5d7d1d5',
-        'cpm': 4.5421,
-        'width': 1,
-        'height': 1,
-        'creativeId': '97517771',
-        'currency': 'EUR',
-        'netRevenue': true,
-        'ttl': 360,
-        'bidder': 'appnexus',
-        'consent': 1,
-        'tagId': 'yqsc1tfj'
-      }
-    ]
-  }};
-
   const DEFAULT_OPTIONS = {
     gdprConsent: {
       gdprApplies: true,
@@ -147,159 +96,430 @@ describe('Nexx360 bid adapter tests', function () {
     },
   };
 
-  it('We verify isBidRequestValid with uncorrect bidfloorCurrency', function() {
-    const bid = { params: {
-      'account': '1067',
-      'tagId': 'luvxjvgn',
-      'bidfloorCurrency': 'AAA',
-    }};
-    expect(spec.isBidRequestValid(bid)).to.be.equal(false);
-  });
+  describe('isBidRequestValid()', function() {
+    let bannerBid;
+    beforeEach(function () {
+      bannerBid = {
+        'bidder': 'nexx360',
+        'mediaTypes': {'banner': {'sizes': [[300, 250], [300, 600]]}},
+        'adUnitCode': 'div-1',
+        'transactionId': '70bdc37e-9475-4b27-8c74-4634bdc2ee66',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '4906582fc87d0c',
+        'bidderRequestId': '332fda16002dbe',
+        'auctionId': '98932591-c822-42e3-850e-4b3cf748d063',
+      }
+    });
+    it('We verify isBidRequestValid with uncorrect tagid', function() {
+      bannerBid.params = { 'tagid': 'luvxjvgn' };
+      expect(spec.isBidRequestValid(bannerBid)).to.be.equal(false);
+    });
 
-  it('We verify isBidRequestValid with uncorrect bidfloor', function() {
-    const bid = { params: {
-      'account': '1067',
-      'tagId': 'luvxjvgn',
-      'bidfloorCurrency': 'EUR',
-      'bidfloor': 'EUR',
-    }};
-    expect(spec.isBidRequestValid(bid)).to.be.equal(false);
+    it('We verify isBidRequestValid with correct tagId', function() {
+      bannerBid.params = { 'tagId': 'luvxjvgn' };
+      expect(spec.isBidRequestValid(bannerBid)).to.be.equal(true);
+    });
   });
 
-  it('We verify isBidRequestValid with uncorrect keywords', function() {
-    const bid = { params: {
-      'account': '1067',
-      'tagId': 'luvxjvgn',
-      'bidfloorCurrency': 'EUR',
-      'bidfloor': 0.8,
-      'keywords': 'test',
-    }};
-    expect(spec.isBidRequestValid(bid)).to.be.equal(false);
+  describe('when request is for a multiformat ad', function () {
+    describe('and request config uses mediaTypes video and banner', () => {
+      const multiformatBid = {
+        'bidder': 'nexx360',
+        'params': {'tagId': 'luvxjvgn'},
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250]]
+          },
+          'video': {
+            'playerSize': [300, 250]
+          }
+        },
+        'adUnitCode': 'div-1',
+        'transactionId': '70bdc37e-9475-4b27-8c74-4634bdc2ee66',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '4906582fc87d0c',
+        'bidderRequestId': '332fda16002dbe',
+        'auctionId': '98932591-c822-42e3-850e-4b3cf748d063',
+      }
+      it('should return true multisize when required params found', function () {
+        expect(spec.isBidRequestValid(multiformatBid)).to.equal(true);
+      });
+    });
   });
 
-  it('Verify banner build request', function () {
-    const request = spec.buildRequests(DISPLAY_BID_REQUEST, DEFAULT_OPTIONS);
-    expect(request).to.have.property('url').and.to.equal('https://fast.nexx360.io/prebid');
-    expect(request).to.have.property('method').and.to.equal('POST');
-    const requestContent = JSON.parse(request.data);
-    expect(requestContent.userEids.length).to.be.eql(1);
-    expect(requestContent.userEids[0]).to.have.property('source').and.to.equal('id5-sync.com');
-    expect(requestContent.userEids[0]).to.have.property('uids');
-    expect(requestContent.userEids[0].uids[0]).to.have.property('id').and.to.equal('ID5*hQ5WobYI9Od4u52qpaXVKHhxUa4DsOWRAlvaFajm8gINfI1oVAe3UK59416dT4TqDX1pj4MBJ5TYwir6x3JgBw1-avYHSnmvQDdRMbxmC2sNf3ggIRTbyQBdI1RjvHyeDYCsistnTXF_iKF1nutYeQ2BZ4P5d5muZTG7C2PXVFgNg-18io9dCiSjzJXx93KPDYRiuIwtsGGsp51rojlpFw2Fp_dUkjXl4CAblk58DvwNhobwQ27bnBP8F2-Pcs88DYcvKn4r6dm3Vi7ILttxDQ2IgZ2X44ClgjoWh-vRf6ANis8Z7uL16vO8q0P5C21eDYuc4v_KaZqN-p9YWEeEZQ2OpkbRL7n5NieVJExHM6ANkAlLZhVf2T-1906TAIHKDZFm_xMCa1jJfpBqZB2agw2TjfbK6wMtJeHiZaipSuUNlM_CSH0HVXtfMj9yfzjzDZZnltZQ9lvc4JhXye5AwA2X1f9Dhk8VURTvVdfEUlU');
-    expect(requestContent.adUnits[0]).to.have.property('account').and.to.equal('1067');
-    expect(requestContent.adUnits[0]).to.have.property('tagId').and.to.equal('luvxjvgn');
-    expect(requestContent.adUnits[0]).to.have.property('label').and.to.equal('banner-div');
-    expect(requestContent.adUnits[0]).to.have.property('bidId').and.to.equal('4d9e29504f8af6');
-    expect(requestContent.adUnits[0]).to.have.property('auctionId').and.to.equal('05e0a3a1-9f57-41f6-bbcb-2ba9c9e3d2d5');
-    expect(requestContent.adUnits[0]).to.have.property('mediatypes').exist;
-    expect(requestContent.adUnits[0].mediatypes).to.have.property('banner').exist;
-    expect(requestContent.adUnits[0]).to.have.property('bidfloor').and.to.equal(0);
-    expect(requestContent.adUnits[0]).to.have.property('bidfloorCurrency').and.to.equal('USD');
-    expect(requestContent.adUnits[0]).to.have.property('keywords');
-    expect(requestContent.adUnits[0].keywords.length).to.be.eql(0);
+  describe('when request is for a video ad', function () {
+    describe('and request config uses mediaTypes video and banner', () => {
+      const videoBid = {
+        'bidder': 'nexx360',
+        'params': {'tagId': 'luvxjvgn'},
+        'mediaTypes': {
+          'video': {
+            'playerSize': [300, 250]
+          }
+        },
+        'adUnitCode': 'div-1',
+        'transactionId': '70bdc37e-9475-4b27-8c74-4634bdc2ee66',
+        'bidId': '4906582fc87d0c',
+        'bidderRequestId': '332fda16002dbe',
+        'auctionId': '98932591-c822-42e3-850e-4b3cf748d063',
+      }
+      it('should return true multisize when required params found', function () {
+        expect(spec.isBidRequestValid(videoBid)).to.equal(true);
+      });
+    });
   });
 
-  it('We add bidfloor and keywords', function() {
-    const DISPLAY_BID_REQUEST_2 = [ ...DISPLAY_BID_REQUEST ];
-    DISPLAY_BID_REQUEST_2[0].params.keywords = { interest: 'cars' };
-    DISPLAY_BID_REQUEST_2[0].params.bidfloor = 2.1;
-    const request = spec.buildRequests(DISPLAY_BID_REQUEST, DEFAULT_OPTIONS);
-    const requestContent = JSON.parse(request.data);
-    expect(requestContent.adUnits[0]).to.have.property('bidfloor').and.to.equal(2.1);
-    expect(requestContent.adUnits[0]).to.have.property('bidfloorCurrency').and.to.equal('USD');
-    expect(requestContent.adUnits[0]).to.have.property('keywords');
-    expect(requestContent.adUnits[0].keywords.length).to.be.eql(1);
-    expect(requestContent.adUnits[0].keywords[0].key).to.be.eql('interest');
-    expect(requestContent.adUnits[0].keywords[0].value[0]).to.be.eql('cars');
-  });
+  describe('buildRequests()', function() {
+    describe('We test with a multiple display bids', function() {
+      const sampleBids = [
+        {
+          bidder: 'nexx360',
+          params: {
+            tagId: 'luvxjvgn'
+          },
+          adUnitCode: 'div-1',
+          transactionId: '469a570d-f187-488d-b1cb-48c1a2009be9',
+          sizes: [[300, 250], [300, 600]],
+          bidId: '44a2706ac3574',
+          bidderRequestId: '359bf8a3c06b2e',
+          auctionId: '2e684815-b44e-4e04-b812-56da54adbe74',
+          userIdAsEids: [
+            {
+              source: 'id5-sync.com',
+              uids: [
+                {
+                  id: 'ID5*xe3R0Pbrc5Y4WBrb5UZSWTiS1t9DU2LgQrhdZOgFdXMoglhqmjs_SfBbyHfSYGZKKIT4Gf-XOQ_anA3iqi0hJSiFyD3aICGHDJFxNS8LO84ohwTQ0EiwOexZAbBlH0chKIhbvdGBfuouNuVF_YHCoyiLQJDp3WQiH96lE9MH2T0ojRqoyR623gxAWlBCBPh7KI4bYtZlet3Vtr-gH5_xqCiSEd7aYV37wHxUTSN38Isok_0qDCHg4pKXCcVM2h6FKJSGmvw-xPm9HkfkIcbh1CiVVG4nREP142XrBecdzhQomNlcalmwdzGHsuHPjTP-KJraa15yvvZDceq-f_YfECicDllYBLEsg24oPRM-ibMonWtT9qOm5dSfWS5G_r09KJ4HMB6REICq1wleDD1mwSigXkM_nxIKa4TxRaRqEekoooWRwuKA5-euHN3xxNfIKKP19EtGhuNTs0YdCSe8_w',
+                  atype: 1,
+                  ext: {
+                    linkType: 2
+                  }
+                }
+              ]
+            },
+            {
+              source: 'domain.com',
+              uids: [
+                {
+                  id: 'value read from cookie or local storage',
+                  atype: 1,
+                  ext: {
+                    stype: 'ppuid'
+                  }
+                }
+              ]
+            }
+          ],
+        },
+        {
+          bidder: 'nexx360',
+          params: {
+            tagId: 'luvxjvgn',
+            allBids: true,
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [[728, 90], [970, 250]]
+            }
+          },
+          adUnitCode: 'div-2',
+          transactionId: '6196885d-4e76-40dc-a09c-906ed232626b',
+          sizes: [[728, 90], [970, 250]],
+          bidId: '5ba94555219a03',
+          bidderRequestId: '359bf8a3c06b2e',
+          auctionId: '2e684815-b44e-4e04-b812-56da54adbe74',
+        }
+      ]
+      const bidderRequest = {
+        bidderCode: 'nexx360',
+        auctionId: '2e684815-b44e-4e04-b812-56da54adbe74',
+        bidderRequestId: '359bf8a3c06b2e',
+        refererInfo: {
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: [
+            'https://test.nexx360.io/adapter/index.html'
+          ],
+          topmostLocation: 'https://test.nexx360.io/adapter/index.html',
+          location: 'https://test.nexx360.io/adapter/index.html',
+          canonicalUrl: null,
+          page: 'https://test.nexx360.io/adapter/index.html',
+          domain: 'test.nexx360.io',
+          ref: null,
+          legacy: {
+            reachedTop: true,
+            isAmp: false,
+            numIframes: 0,
+            stack: [
+              'https://test.nexx360.io/adapter/index.html'
+            ],
+            referer: 'https://test.nexx360.io/adapter/index.html',
+            canonicalUrl: null
+          },
+        },
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: 'CPhdLUAPhdLUAAKAsAENCmCsAP_AAE7AAAqIJFNd_H__bW9r-f5_aft0eY1P9_r37uQzDhfNk-8F3L_W_LwX52E7NF36tq4KmR4ku1LBIUNlHMHUDUmwaokVryHsak2cpzNKJ7BEknMZOydYGF9vmxtj-QKY7_5_d3bx2D-t_9v239z3z81Xn3d53-_03LCdV5_9Dfn9fR_bc9KPt_58v8v8_____3_e__3_7997BIiAaADgAJYBnwEeAJXAXmAwQBj4DtgHcgPBAeKBIgAA.YAAAAAAAAAAA',
+        }
+      };
+      it('We perform a test with 2 display adunits', function() {
+        const displayBids = [...sampleBids];
+        displayBids[0].mediaTypes = {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          }
+        };
+        const request = spec.buildRequests(displayBids, bidderRequest);
+        const requestContent = request.data;
+        expect(request).to.have.property('method').and.to.equal('POST');
+        expect(requestContent.id).to.be.eql('2e684815-b44e-4e04-b812-56da54adbe74');
+        expect(requestContent.cur[0]).to.be.eql('USD');
+        expect(requestContent.imp.length).to.be.eql(2);
+        expect(requestContent.imp[0].id).to.be.eql('44a2706ac3574');
+        expect(requestContent.imp[0].tagid).to.be.eql('div-1');
+        expect(requestContent.imp[0].ext.divId).to.be.eql('div-1');
+        expect(requestContent.imp[0].ext.nexx360.tagId).to.be.eql('luvxjvgn');
+        expect(requestContent.imp[0].ext.nexx360.allBids).to.be.eql(false);
+        expect(requestContent.imp[0].banner.format.length).to.be.eql(2);
+        expect(requestContent.imp[0].banner.format[0].w).to.be.eql(300);
+        expect(requestContent.imp[0].banner.format[0].h).to.be.eql(250);
+        expect(requestContent.imp[1].ext.nexx360.allBids).to.be.eql(true);
+        expect(requestContent.regs.ext.gdpr).to.be.eql(1);
+        expect(requestContent.user.ext.consent).to.be.eql(bidderRequest.gdprConsent.consentString);
+        expect(requestContent.user.ext.eids.length).to.be.eql(2);
+      });
 
-  it('Verify banner parse response', function () {
-    const request = spec.buildRequests(DISPLAY_BID_REQUEST, DEFAULT_OPTIONS);
-    const response = spec.interpretResponse(DISPLAY_BID_RESPONSE, request);
-    expect(response).to.have.lengthOf(1);
-    const bid = response[0];
-    expect(bid.cpm).to.equal(0.437245);
-    expect(bid.adUrl).to.equal('https://fast.nexx360.io/cache?uuid=ce6d1ee3-2a05-4d7c-b97a-9e62097798ec');
-    expect(bid.width).to.equal(300);
-    expect(bid.height).to.equal(250);
-    expect(bid.creativeId).to.equal('98493581');
-    expect(bid.currency).to.equal('EUR');
-    expect(bid.netRevenue).to.equal(true);
-    expect(bid.ttl).to.equal(360);
-    expect(bid.requestId).to.equal('4d9e29504f8af6');
-    expect(bid.nexx360).to.exist;
-    expect(bid.nexx360.ssp).to.equal('appnexus');
-  });
+      it('We perform a test with a multiformat adunit', function() {
+        const multiformatBids = [...sampleBids];
+        multiformatBids[0].mediaTypes = {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          },
+          video: {
+            context: 'outstream',
+            playerSize: [640, 480],
+            mimes: ['video/mp4'],
+            protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+            playbackmethod: [2],
+            skip: 1,
+            playback_method: ['auto_play_sound_off']
+          }
+        };
+        const request = spec.buildRequests(multiformatBids, bidderRequest);
+        const requestContent = request.data;
+        expect(requestContent.imp[0].video.context).to.be.eql('outstream');
+        expect(requestContent.imp[0].video.playbackmethod[0]).to.be.eql(2);
+      });
 
-  it('Verify video build request', function () {
-    const request = spec.buildRequests(VIDEO_BID_REQUEST, DEFAULT_OPTIONS);
-    expect(request).to.have.property('url').and.to.equal('https://fast.nexx360.io/prebid');
-    expect(request).to.have.property('method').and.to.equal('POST');
-    const requestContent = JSON.parse(request.data);
-    expect(requestContent.adUnits[0]).to.have.property('account').and.to.equal('1067');
-    expect(requestContent.adUnits[0]).to.have.property('tagId').and.to.equal('yqsc1tfj');
-    expect(requestContent.adUnits[0]).to.have.property('label').and.to.equal('video1');
-    expect(requestContent.adUnits[0]).to.have.property('bidId').and.to.equal('22f90541e576a3');
-    expect(requestContent.adUnits[0]).to.have.property('auctionId').and.to.equal('ed21b528-bcab-47e2-8605-ec9b71000c89');
-    expect(requestContent.adUnits[0]).to.have.property('mediatypes').exist;
-    expect(requestContent.adUnits[0].mediatypes).to.have.property('video').exist;
+      it('We perform a test with a video adunit', function() {
+        const videoBids = [sampleBids[0]];
+        videoBids[0].mediaTypes = {
+          video: {
+            context: 'instream',
+            playerSize: [640, 480],
+            mimes: ['video/mp4'],
+            protocols: [1, 2, 3, 4, 5, 6],
+            playbackmethod: [2],
+            skip: 1
+          }
+        };
+        const request = spec.buildRequests(videoBids, bidderRequest);
+        const requestContent = request.data;
+        expect(request).to.have.property('method').and.to.equal('POST');
+        expect(requestContent.imp[0].video.context).to.be.eql('instream');
+        expect(requestContent.imp[0].video.playbackmethod[0]).to.be.eql(2);
+      })
+    });
   });
 
-  it('Verify video parse response', function () {
-    const request = spec.buildRequests(VIDEO_BID_REQUEST, DEFAULT_OPTIONS);
-    const response = spec.interpretResponse(VIDEO_BID_RESPONSE, request);
-    expect(response).to.have.lengthOf(1);
-    const bid = response[0];
-    expect(bid.cpm).to.equal(4.5421);
-    expect(bid.vastUrl).to.equal('https://fast.nexx360.io/cache?uuid=b8e7b2f0-c378-479f-aa4f-4f55d5d7d1d5');
-    expect(bid.vastImpUrl).to.equal('https://fast.nexx360.io/track-imp?type=prebid&mediatype=video&ssp=appnexus&tag_id=yqsc1tfj&consent=1&price=4.5421');
-    expect(bid.width).to.equal(1);
-    expect(bid.height).to.equal(1);
-    expect(bid.creativeId).to.equal('97517771');
-    expect(bid.currency).to.equal('EUR');
-    expect(bid.netRevenue).to.equal(true);
-    expect(bid.ttl).to.equal(360);
-    expect(bid.requestId).to.equal('2c129e8e01859a');
-    expect(bid.nexx360).to.exist;
-    expect(bid.nexx360.ssp).to.equal('appnexus');
+  describe('interpretResponse()', function() {
+    it('banner responses', function() {
+      const response = {
+        body: {
+          'id': 'a8d3a675-a4ba-4d26-807f-c8f2fad821e0',
+          'cur': 'USD',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '4427551302944024629',
+                  'impid': '226175918ebeda',
+                  'price': 1.5,
+                  'type': 'banner',
+                  'adomain': [
+                    'http://prebid.org'
+                  ],
+                  'crid': '98493581',
+                  'ssp': 'appnexus',
+                  'h': 600,
+                  'w': 300,
+                  'cat': [
+                    'IAB3-1'
+                  ],
+                  'creativeuuid': 'fdddcebc-1edf-489d-880d-1418d8bdc493',
+                  'adUrl': 'https://fast.nexx360.io/cache?uuid=fdddcebc-1edf-489d-880d-1418d8bdc493',
+                  'ext': {
+                    'dsp_id': 'ssp1',
+                    'buyer_id': 'foo',
+                    'brand_id': 'bar'
+                  }
+                }
+              ],
+              'seat': 'appnexus'
+            }
+          ],
+          'cookies': []
+        }
+      };
+      const output = spec.interpretResponse(response);
+      expect(output[0].bidderCode).to.be.eql('nexx360');
+      expect(output[0].adUrl).to.be.eql(response.body.seatbid[0].bid[0].adUrl);
+      expect(output[0].mediaType).to.be.eql(response.body.seatbid[0].bid[0].type);
+      expect(output[0].currency).to.be.eql(response.body.cur);
+      expect(output[0].cpm).to.be.eql(response.body.seatbid[0].bid[0].price);
+      expect(output[0].meta.networkId).to.be.eql(response.body.seatbid[0].bid[0].ext.dsp_id);
+      expect(output[0].meta.advertiserId).to.be.eql(response.body.seatbid[0].bid[0].ext.buyer_id);
+      expect(output[0].meta.brandId).to.be.eql(response.body.seatbid[0].bid[0].ext.brand_id);
+    });
+    it('video responses', function() {
+      const response = {
+        body: {
+          'id': '33894759-0ea2-41f1-84b3-75132eefedb6',
+          'cur': 'USD',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '294478680080716675',
+                  'impid': '2c835a6039e65f',
+                  'price': 5,
+                  'type': 'instream',
+                  'adomain': [
+                    ''
+                  ],
+                  'crid': '97517771',
+                  'ssp': 'appnexus',
+                  'h': 1,
+                  'w': 1,
+                  'vastXml': '<VAST version="3.0">\n    <Ad>\n      <Wrapper>\n        <AdSystem>prebid.org wrapper</AdSystem>\n        <VASTAdTagURI><![CDATA[https://fast.nexx360.io/cache?uuid=9987328a-b15a-4549-974b-203cd9bbe5d3]]></VASTAdTagURI>\n        <Impression><![CDATA[https://fast.nexx360.io/track-imp?ssp=appnexus&type=booster&price=5.002000800320127&cur=EUR&user_agent=Mozilla%2F5.0+%28iPhone%3B+CPU+iPhone+OS+13_2_3+like+Mac+OS+X%29+AppleWebKit%2F605.1.15+%28KHTML%2C+like+Gecko%29+Version%2F13.0.3+Mobile%2F15E148+Safari%2F604.1&consent=1&abtest_id=0&tag_id=yqsc1tfj&mediatype=video]]></Impression>\n        <Creatives></Creatives>\n      </Wrapper>\n    </Ad>\n  </VAST>'
+                }
+              ],
+              'seat': 'appnexus'
+            }
+          ],
+          'cookies': []
+        }
+      };
+      const output = spec.interpretResponse(response);
+      expect(output[0].bidderCode).to.be.eql('nexx360');
+      expect(output[0].vastXml).to.be.eql(response.body.seatbid[0].bid[0].vastXml);
+      expect(output[0].mediaType).to.be.eql('video');
+      expect(output[0].currency).to.be.eql(response.body.cur);
+      expect(output[0].cpm).to.be.eql(response.body.seatbid[0].bid[0].price);
+    });
   });
 
-  it('Verifies bidder code', function () {
-    expect(spec.code).to.equal('nexx360');
+  describe('interpretResponse()', function() {
+    it('banner responses', function() {
+      const response = {
+        body: {
+          'id': 'a8d3a675-a4ba-4d26-807f-c8f2fad821e0',
+          'cur': 'USD',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '4427551302944024629',
+                  'impid': '226175918ebeda',
+                  'price': 1.5,
+                  'type': 'banner',
+                  'adomain': [
+                    'http://prebid.org'
+                  ],
+                  'crid': '98493581',
+                  'ssp': 'appnexus',
+                  'h': 600,
+                  'w': 300,
+                  'cat': [
+                    'IAB3-1'
+                  ],
+                  'creativeuuid': 'fdddcebc-1edf-489d-880d-1418d8bdc493',
+                  'adUrl': 'https://fast.nexx360.io/cache?uuid=fdddcebc-1edf-489d-880d-1418d8bdc493'
+                }
+              ],
+              'seat': 'appnexus'
+            }
+          ],
+          'cookies': []
+        }
+      };
+      const output = spec.interpretResponse(response);
+      expect(output[0].bidderCode).to.be.eql('nexx360');
+      expect(output[0].adUrl).to.be.eql(response.body.seatbid[0].bid[0].adUrl);
+      expect(output[0].mediaType).to.be.eql(response.body.seatbid[0].bid[0].type);
+      expect(output[0].currency).to.be.eql(response.body.cur);
+      expect(output[0].cpm).to.be.eql(response.body.seatbid[0].bid[0].price);
+    });
+    it('video responses', function() {
+      const response = {
+        body: {
+          'id': '33894759-0ea2-41f1-84b3-75132eefedb6',
+          'cur': 'USD',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'id': '294478680080716675',
+                  'impid': '2c835a6039e65f',
+                  'price': 5,
+                  'type': 'instream',
+                  'adomain': [
+                    ''
+                  ],
+                  'crid': '97517771',
+                  'ssp': 'appnexus',
+                  'h': 1,
+                  'w': 1,
+                  'vastXml': '<VAST version="3.0">\n    <Ad>\n      <Wrapper>\n        <AdSystem>prebid.org wrapper</AdSystem>\n        <VASTAdTagURI><![CDATA[https://fast.nexx360.io/cache?uuid=9987328a-b15a-4549-974b-203cd9bbe5d3]]></VASTAdTagURI>\n        <Impression><![CDATA[https://fast.nexx360.io/track-imp?ssp=appnexus&type=booster&price=5.002000800320127&cur=EUR&user_agent=Mozilla%2F5.0+%28iPhone%3B+CPU+iPhone+OS+13_2_3+like+Mac+OS+X%29+AppleWebKit%2F605.1.15+%28KHTML%2C+like+Gecko%29+Version%2F13.0.3+Mobile%2F15E148+Safari%2F604.1&consent=1&abtest_id=0&tag_id=yqsc1tfj&mediatype=video]]></Impression>\n        <Creatives></Creatives>\n      </Wrapper>\n    </Ad>\n  </VAST>'
+                }
+              ],
+              'seat': 'appnexus'
+            }
+          ],
+          'cookies': []
+        }
+      };
+      const output = spec.interpretResponse(response);
+      expect(output[0].bidderCode).to.be.eql('nexx360');
+      expect(output[0].vastXml).to.be.eql(response.body.seatbid[0].bid[0].vastXml);
+      expect(output[0].mediaType).to.be.eql('video');
+      expect(output[0].currency).to.be.eql(response.body.cur);
+      expect(output[0].cpm).to.be.eql(response.body.seatbid[0].bid[0].price);
+    });
   });
 
-  it('Verifies bidder aliases', function () {
-    expect(spec.aliases).to.have.lengthOf(1);
-    expect(spec.aliases[0]).to.equal('revenuemaker');
-  });
-  it('Verifies if bid request valid', function () {
-    expect(spec.isBidRequestValid(DISPLAY_BID_REQUEST[0])).to.equal(true);
-  });
-  it('Verifies bid won', function () {
-    const request = spec.buildRequests(DISPLAY_BID_REQUEST, DEFAULT_OPTIONS);
-    const response = spec.interpretResponse(DISPLAY_BID_RESPONSE, request);
-    const won = spec.onBidWon(response[0]);
-    expect(won).to.equal(true);
-  });
-  it('Verifies user sync without cookie in bid response', function () {
-    var syncs = spec.getUserSyncs({}, [DISPLAY_BID_RESPONSE], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
-    expect(syncs).to.have.lengthOf(0);
-  });
-  it('Verifies user sync with cookies in bid response', function () {
-    DISPLAY_BID_RESPONSE.body.cookies = [{'type': 'image', 'url': 'http://www.cookie.sync.org/'}];
-    var syncs = spec.getUserSyncs({}, [DISPLAY_BID_RESPONSE], DEFAULT_OPTIONS.gdprConsent);
-    expect(syncs).to.have.lengthOf(1);
-    expect(syncs[0]).to.have.property('type').and.to.equal('image');
-    expect(syncs[0]).to.have.property('url').and.to.equal('http://www.cookie.sync.org/');
-  });
-  it('Verifies user sync with no bid response', function() {
-    var syncs = spec.getUserSyncs({}, null, DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
-    expect(syncs).to.have.lengthOf(0);
-  });
-  it('Verifies user sync with no bid body response', function() {
-    var syncs = spec.getUserSyncs({}, [], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
-    expect(syncs).to.have.lengthOf(0);
-    var syncs = spec.getUserSyncs({}, [{}], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
-    expect(syncs).to.have.lengthOf(0);
+  describe('getUserSyncs()', function() {
+    const response = { body: { cookies: [] } };
+    it('Verifies user sync without cookie in bid response', function () {
+      var syncs = spec.getUserSyncs({}, [response], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+      expect(syncs).to.have.lengthOf(0);
+    });
+    it('Verifies user sync with cookies in bid response', function () {
+      response.body.cookies = [{'type': 'image', 'url': 'http://www.cookie.sync.org/'}];
+      var syncs = spec.getUserSyncs({}, [response], DEFAULT_OPTIONS.gdprConsent);
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0]).to.have.property('type').and.to.equal('image');
+      expect(syncs[0]).to.have.property('url').and.to.equal('http://www.cookie.sync.org/');
+    });
+    it('Verifies user sync with no bid response', function() {
+      var syncs = spec.getUserSyncs({}, null, DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+      expect(syncs).to.have.lengthOf(0);
+    });
+    it('Verifies user sync with no bid body response', function() {
+      var syncs = spec.getUserSyncs({}, [], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+      expect(syncs).to.have.lengthOf(0);
+      var syncs = spec.getUserSyncs({}, [{}], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+      expect(syncs).to.have.lengthOf(0);
+    });
   });
 });

From e32be9098829fa6f7a7d6f8dcbe3d8f10e05099c Mon Sep 17 00:00:00 2001
From: fndigrazia <digrazia.nicolas@gmail.com>
Date: Sun, 27 Nov 2022 01:56:49 -0300
Subject: [PATCH 466/569] ePlanning Bid Adapter : fix support for video auction
 (#9283)

* Fix ad vast

* fix lint spaces in tests

* fix lint spaces in tests

* fix lint spaces in tests
---
 modules/eplanningBidAdapter.js                | 8 ++------
 test/spec/modules/eplanningBidAdapter_spec.js | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/eplanningBidAdapter.js b/modules/eplanningBidAdapter.js
index b60c3571d47..e230858487f 100644
--- a/modules/eplanningBidAdapter.js
+++ b/modules/eplanningBidAdapter.js
@@ -128,9 +128,9 @@ export const spec = {
                 advertiserDomains: ad.adom
               };
             }
-            if (isVastResponse(ad)) {
+            if (request && request.data && request.data.vv) {
               bidResponse.vastXml = ad.adm;
-              bidResponse.mediaTypes = VIDEO;
+              bidResponse.mediaType = VIDEO;
             } else {
               bidResponse.ad = ad.adm;
             }
@@ -504,8 +504,4 @@ function registerAuction(storageID) {
   return true;
 }
 
-function isVastResponse(bid) {
-  return bid.adm.match(/^(<VAST)|(<VideoAdServingTemplate)/gmi);
-}
-
 registerBidder(spec);
diff --git a/test/spec/modules/eplanningBidAdapter_spec.js b/test/spec/modules/eplanningBidAdapter_spec.js
index a356c9cee95..cb8393a29b8 100644
--- a/test/spec/modules/eplanningBidAdapter_spec.js
+++ b/test/spec/modules/eplanningBidAdapter_spec.js
@@ -840,7 +840,7 @@ describe('E-Planning Adapter', function () {
     });
 
     it('should correctly map the parameters in the response vast', function () {
-      const bidResponse = spec.interpretResponse(responseVast, { adUnitToBidId: { [CLEAN_ADUNIT_CODE_VAST]: BID_ID } })[0];
+      const bidResponse = spec.interpretResponse(responseVast, { adUnitToBidId: { [CLEAN_ADUNIT_CODE_VAST]: BID_ID }, data: { vv: 2 } })[0];
       const expectedResponse = {
         requestId: BID_ID,
         cpm: CPM,
@@ -851,13 +851,13 @@ describe('E-Planning Adapter', function () {
         netRevenue: true,
         currency: 'USD',
         vastXml: ADM_VAST,
-        mediaTypes: VIDEO
+        mediaType: VIDEO
       };
       expect(bidResponse).to.deep.equal(expectedResponse);
     });
 
     it('should correctly map the parameters in the response vast vv 1', function () {
-      const bidResponse = spec.interpretResponse(responseVastVV1, { adUnitToBidId: { [CLEAN_ADUNIT_CODE_VAST]: BID_ID } })[0];
+      const bidResponse = spec.interpretResponse(responseVastVV1, { adUnitToBidId: { [CLEAN_ADUNIT_CODE_VAST]: BID_ID }, data: { vv: 1 } })[0];
       const expectedResponse = {
         requestId: BID_ID,
         cpm: CPM,
@@ -868,7 +868,7 @@ describe('E-Planning Adapter', function () {
         netRevenue: true,
         currency: 'USD',
         vastXml: ADM_VAST_VV_1,
-        mediaTypes: VIDEO
+        mediaType: VIDEO
       };
       expect(bidResponse).to.deep.equal(expectedResponse);
     });

From 149d76baed363a7646c68dfb03d14162e9b93794 Mon Sep 17 00:00:00 2001
From: AdmixerTech <35560933+AdmixerTech@users.noreply.github.com>
Date: Mon, 28 Nov 2022 16:04:09 +0200
Subject: [PATCH 467/569] add smn alias (#9290)

---
 modules/admixerBidAdapter.js |  2 +-
 modules/smnBidAdapter.md     | 52 ++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 modules/smnBidAdapter.md

diff --git a/modules/admixerBidAdapter.js b/modules/admixerBidAdapter.js
index 8fcee60f9f9..90031ed7f5d 100644
--- a/modules/admixerBidAdapter.js
+++ b/modules/admixerBidAdapter.js
@@ -5,7 +5,7 @@ import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
 const BIDDER_CODE = 'admixer';
-const ALIASES = ['go2net', 'adblender', 'adsyield', 'futureads'];
+const ALIASES = ['go2net', 'adblender', 'adsyield', 'futureads', 'smn'];
 const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.2.aspx';
 export const spec = {
   code: BIDDER_CODE,
diff --git a/modules/smnBidAdapter.md b/modules/smnBidAdapter.md
new file mode 100644
index 00000000000..c9cb777e743
--- /dev/null
+++ b/modules/smnBidAdapter.md
@@ -0,0 +1,52 @@
+# Overview
+
+Module Name: SMN Bidder Adapter  
+Module Type: Bidder Adapter  
+Maintainer: smnoffice.belgrade@gmail.com
+
+# Description
+
+Connects to SMN demand source to fetch bids.  
+Banner and Video formats are supported.  
+Please use ```smn``` as the bidder code.  
+
+# Test Parameters
+```
+    var adUnits = [
+           {
+               code: 'desktop-banner-ad-div',
+               sizes: [[300, 250]],  // a display size
+               bids: [
+                   {
+                       bidder: "smn",
+                       params: {
+                           zone: '2eb6bd58-865c-47ce-af7f-a918108c3fd2'
+                       }
+                   }
+               ]
+           },{
+               code: 'mobile-banner-ad-div',
+               sizes: [[300, 50]],   // a mobile size
+               bids: [
+                   {
+                       bidder: "smn",
+                       params: {
+                           zone: '62211486-c50b-4356-9f0f-411778d31fcc'
+                       }
+                   }
+               ]
+           },{
+               code: 'video-ad',
+               sizes: [[300, 50]],
+               mediaType: 'video',
+               bids: [
+                   {
+                       bidder: "smn",
+                       params: {
+                           zone: 'ebeb1e79-8cb4-4473-b2d0-2e24b7ff47fd'
+                       }
+                   }
+               ]
+           },
+       ];
+```

From 4ba48bb0d8b594959290934cbf1a2c4256f0f297 Mon Sep 17 00:00:00 2001
From: Gino <53079123+Skylinar@users.noreply.github.com>
Date: Mon, 28 Nov 2022 15:36:50 +0100
Subject: [PATCH 468/569] Smartx Bid Adapter: update custom header (#9291)

* Add smartclipBidAdapter

* smartxBidAdapter.js - removed unused variables, removed debug, added window before the outstream related functions

* - made outstream player configurable

* remove wrong named files

* camelcase

* fix

* Out-Stream render update to SmartPlay 5.2

* ESlint fix

* ESlint fix

* ESlint fix

* adjust tests, fixes

* ESlint

* adjusted desired bitrate examples

* added bid.meta.advertiserDomains support

* bug fix for numeric elementID outstream render

* fix renderer url

* support for floors module

* bugfixes to be openRTB 2.5 compliant

* update internal renderer usage

* remove unused outstream_function logic

* bugfix outstream options for default outstream renderer configuration

* [PREB-10] fix empty title not configurable

* add pbjs version

* testing with outstream 5.3.0

* pbjs version into content.ext

* made visibilityThreshold configurable

* adjust position of pbjs version

* Merge branch 'master' of https://github.com/prebid/Prebid.js into HEAD

* update smartclip outstream player version to support outstream 6 release along with necessary config changes

* Add support for schain

* vacuuming

* update custom header x-openrtb-version to 2.5

Co-authored-by: smartclip AdTechnology <adtech@smartclip.com>
Co-authored-by: Gino Cirlini <adtech@smartclip.tv>
Co-authored-by: smartclip-adtech <65160328+smartclip-adtech@users.noreply.github.com>
---
 modules/smartxBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/smartxBidAdapter.js b/modules/smartxBidAdapter.js
index f8438a35000..452aaafb09b 100644
--- a/modules/smartxBidAdapter.js
+++ b/modules/smartxBidAdapter.js
@@ -245,7 +245,7 @@ export const spec = {
         options: {
           contentType: 'application/json',
           customHeaders: {
-            'x-openrtb-version': '2.3'
+            'x-openrtb-version': '2.5'
           }
         }
       };

From 2ac1e70863ba170eb862d06a428bf858fba2515c Mon Sep 17 00:00:00 2001
From: Alexander Pykhteyev <alex.pykhteyev@gmail.com>
Date: Mon, 28 Nov 2022 22:55:58 +0700
Subject: [PATCH 469/569] LimeLight Bid Adapter : add IionAds alias (#9285)

* User sync improvements

* User sync improvements

* Code review fixes

* Pass supply chain to limelightDigitalBidAdapter.js

* Add alias for iionads

Co-authored-by: apykhteyev <alex@project-limelight.com>
Co-authored-by: EngineeringProjectLimeLight <45598299+EngineeringProjectLimeLight@users.noreply.github.com>
---
 modules/limelightDigitalBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/limelightDigitalBidAdapter.js b/modules/limelightDigitalBidAdapter.js
index c39fd36e597..87cf6e4fe21 100644
--- a/modules/limelightDigitalBidAdapter.js
+++ b/modules/limelightDigitalBidAdapter.js
@@ -26,7 +26,7 @@ function isBidResponseValid(bid) {
 
 export const spec = {
   code: BIDDER_CODE,
-  aliases: ['pll'],
+  aliases: ['pll', 'iionads'],
   supportedMediaTypes: [BANNER, VIDEO],
 
   /**

From a833997b7da47fff9259fcef7b5be760f659c4fc Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Mon, 28 Nov 2022 09:20:10 -0700
Subject: [PATCH 470/569] Generic Analytics Adapter: initial release (#9134)

* New module: generic analytics adapter

* Use special gvlid value instead of `isVendorless` flag for vendorless consent checks

* Mark generic analytics as vendorless for gdpr enforcement

* Allow analytics adapters to define dynamic gvlids

* Add gvlid option

* Gdpr enforcement softVendorExceptions
---
 modules/gdprEnforcement.js                    |  50 +--
 modules/genericAnalyticsAdapter.js            | 157 ++++++++++
 modules/pubCommonId.js                        |   3 +-
 modules/pubProvidedIdSystem.js                |   2 +
 modules/sharedIdSystem.js                     |   4 +-
 src/consentHandler.js                         |   8 +
 src/storageManager.js                         |   9 +-
 test/spec/modules/gdprEnforcement_spec.js     | 183 ++++++-----
 .../modules/genericAnalyticsAdapter_spec.js   | 284 ++++++++++++++++++
 test/spec/unit/core/storageManager_spec.js    |   3 +-
 10 files changed, 605 insertions(+), 98 deletions(-)
 create mode 100644 modules/genericAnalyticsAdapter.js
 create mode 100644 test/spec/modules/genericAnalyticsAdapter_spec.js

diff --git a/modules/gdprEnforcement.js b/modules/gdprEnforcement.js
index b7035c509b6..9553ad0586a 100644
--- a/modules/gdprEnforcement.js
+++ b/modules/gdprEnforcement.js
@@ -2,7 +2,7 @@
  * This module gives publishers extra set of features to enforce individual purposes of TCF v2
  */
 
-import {deepAccess, hasDeviceAccess, isArray, logWarn} from '../src/utils.js';
+import {deepAccess, hasDeviceAccess, isArray, logError, logWarn} from '../src/utils.js';
 import {config} from '../src/config.js';
 import adapterManager, {gdprDataHandler} from '../src/adapterManager.js';
 import {find, includes} from '../src/polyfill.js';
@@ -11,13 +11,7 @@ import {getHook} from '../src/hook.js';
 import {validateStorageEnforcement} from '../src/storageManager.js';
 import * as events from '../src/events.js';
 import CONSTANTS from '../src/constants.json';
-
-// modules for which vendor consent is not needed (see https://github.com/prebid/Prebid.js/issues/8161)
-const VENDORLESS_MODULES = new Set([
-  'sharedId',
-  'pubCommonId',
-  'pubProvidedId',
-]);
+import {VENDORLESS_GVLID} from '../src/consentHandler.js';
 
 export const STRICT_STORAGE_ENFORCEMENT = 'strictStorageEnforcement';
 
@@ -71,7 +65,7 @@ export const internal = {
  * @param {{string|Object}} - module
  * @return {number} - GVL ID
  */
-export function getGvlid(module) {
+export function getGvlid(module, ...args) {
   let gvlid = null;
   if (module) {
     // Check user defined GVL Mapping in pbjs.setConfig()
@@ -86,7 +80,7 @@ export function getGvlid(module) {
       return gvlid;
     }
 
-    gvlid = internal.getGvlidForBidAdapter(moduleCode) || internal.getGvlidForUserIdModule(module) || internal.getGvlidForAnalyticsAdapter(moduleCode);
+    gvlid = internal.getGvlidForBidAdapter(moduleCode) || internal.getGvlidForUserIdModule(module) || internal.getGvlidForAnalyticsAdapter(moduleCode, ...args);
   }
   return gvlid;
 }
@@ -120,10 +114,19 @@ function getGvlidForUserIdModule(userIdModule) {
 /**
  * Returns GVL ID for an analytics adapter. If an analytics adapter does not have an associated GVL ID, it returns 'null'.
  * @param {string} code - 'provider' property on the analytics adapter config
+ * @param {{}} config - analytics configuration object
  * @return {number} GVL ID
  */
-function getGvlidForAnalyticsAdapter(code) {
-  return adapterManager.getAnalyticsAdapter(code) && (adapterManager.getAnalyticsAdapter(code).gvlid || null);
+function getGvlidForAnalyticsAdapter(code, config) {
+  const adapter = adapterManager.getAnalyticsAdapter(code);
+  return adapter?.gvlid || ((gvlid) => {
+    if (typeof gvlid !== 'function') return gvlid;
+    try {
+      return gvlid.call(adapter.adapter, config);
+    } catch (e) {
+      logError(`Error invoking ${code} adapter.gvlid()`, e)
+    }
+  })(adapter?.adapter?.gvlid)
 }
 
 export function shouldEnforce(consentData, purpose, name) {
@@ -145,20 +148,20 @@ export function shouldEnforce(consentData, purpose, name) {
  * @param {Object} consentData - gdpr consent data
  * @param {string=} currentModule - Bidder code of the current module
  * @param {number=} gvlId - GVL ID for the module
- * @param vendorlessModule a predicate function that takes a module name, and returns true if the module does not need vendor consent
  * @returns {boolean}
  */
-export function validateRules(rule, consentData, currentModule, gvlId, vendorlessModule = VENDORLESS_MODULES.has.bind(VENDORLESS_MODULES)) {
+export function validateRules(rule, consentData, currentModule, gvlId) {
   const purposeId = TCF2[Object.keys(TCF2).filter(purposeName => TCF2[purposeName].name === rule.purpose)[0]].id;
 
   // return 'true' if vendor present in 'vendorExceptions'
-  if (includes(rule.vendorExceptions || [], currentModule)) {
+  if ((rule.vendorExceptions || []).includes(currentModule)) {
     return true;
   }
+  const vendorConsentRequred = !((gvlId === VENDORLESS_GVLID || (rule.softVendorExceptions || []).includes(currentModule)))
 
   // get data from the consent string
   const purposeConsent = deepAccess(consentData, `vendorData.purpose.consents.${purposeId}`);
-  const vendorConsent = deepAccess(consentData, `vendorData.vendor.consents.${gvlId}`);
+  const vendorConsent = vendorConsentRequred ? deepAccess(consentData, `vendorData.vendor.consents.${gvlId}`) : true;
   const liTransparency = deepAccess(consentData, `vendorData.purpose.legitimateInterests.${purposeId}`);
 
   /*
@@ -166,7 +169,7 @@ export function validateRules(rule, consentData, currentModule, gvlId, vendorles
     or the user has consented. Similar with vendors.
   */
   const purposeAllowed = rule.enforcePurpose === false || purposeConsent === true;
-  const vendorAllowed = vendorlessModule(currentModule) || rule.enforceVendor === false || vendorConsent === true;
+  const vendorAllowed = rule.enforceVendor === false || vendorConsent === true;
 
   /*
     Few if any vendors should be declaring Legitimate Interest for Device Access (Purpose 1), but some are claiming
@@ -183,19 +186,18 @@ export function validateRules(rule, consentData, currentModule, gvlId, vendorles
 /**
  * This hook checks whether module has permission to access device or not. Device access include cookie and local storage
  * @param {Function} fn reference to original function (used by hook logic)
- * @param isVendorless if true, do not require vendor consent (for e.g. core modules)
  * @param {Number=} gvlid gvlid of the module
  * @param {string=} moduleName name of the module
  * @param result
  */
-export function deviceAccessHook(fn, isVendorless, gvlid, moduleName, result, {validate = validateRules} = {}) {
+export function deviceAccessHook(fn, gvlid, moduleName, result, {validate = validateRules} = {}) {
   result = Object.assign({}, {
     hasEnforcementHook: true
   });
   if (!hasDeviceAccess()) {
     logWarn('Device access is disabled by Publisher');
     result.valid = false;
-  } else if (isVendorless && !strictStorageEnforcement) {
+  } else if (gvlid === VENDORLESS_GVLID && !strictStorageEnforcement) {
     // for vendorless (core) storage, do not enforce rules unless strictStorageEnforcement is set
     result.valid = true;
   } else {
@@ -203,13 +205,13 @@ export function deviceAccessHook(fn, isVendorless, gvlid, moduleName, result, {v
     if (shouldEnforce(consentData, 1, moduleName)) {
       const curBidder = config.getCurrentBidder();
       // Bidders have a copy of storage object with bidder code binded. Aliases will also pass the same bidder code when invoking storage functions and hence if alias tries to access device we will try to grab the gvl id for alias instead of original bidder
-      if (curBidder && (curBidder != moduleName) && adapterManager.aliasRegistry[curBidder] === moduleName) {
+      if (curBidder && (curBidder !== moduleName) && adapterManager.aliasRegistry[curBidder] === moduleName) {
         gvlid = getGvlid(curBidder);
       } else {
         gvlid = getGvlid(moduleName) || gvlid;
       }
       const curModule = moduleName || curBidder;
-      let isAllowed = validate(purpose1Rule, consentData, curModule, gvlid, isVendorless ? () => true : undefined);
+      let isAllowed = validate(purpose1Rule, consentData, curModule, gvlid,);
       if (isAllowed) {
         result.valid = true;
       } else {
@@ -221,7 +223,7 @@ export function deviceAccessHook(fn, isVendorless, gvlid, moduleName, result, {v
       result.valid = true;
     }
   }
-  fn.call(this, isVendorless, gvlid, moduleName, result);
+  fn.call(this, gvlid, moduleName, result);
 }
 
 /**
@@ -314,7 +316,7 @@ export function enableAnalyticsHook(fn, config) {
     }
     config = config.filter(conf => {
       const analyticsAdapterCode = conf.provider;
-      const gvlid = getGvlid(analyticsAdapterCode);
+      const gvlid = getGvlid(analyticsAdapterCode, conf);
       const isAllowed = !!validateRules(purpose7Rule, consentData, analyticsAdapterCode, gvlid);
       if (!isAllowed) {
         analyticsBlocked.push(analyticsAdapterCode);
diff --git a/modules/genericAnalyticsAdapter.js b/modules/genericAnalyticsAdapter.js
new file mode 100644
index 00000000000..4909745e72b
--- /dev/null
+++ b/modules/genericAnalyticsAdapter.js
@@ -0,0 +1,157 @@
+import AnalyticsAdapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import {prefixLog, isPlainObject} from '../src/utils.js';
+import * as CONSTANTS from '../src/constants.json';
+import adapterManager from '../src/adapterManager.js';
+import {ajaxBuilder} from '../src/ajax.js';
+
+const DEFAULTS = {
+  batchSize: 1,
+  batchDelay: 100,
+  method: 'POST'
+}
+
+const TYPES = {
+  handler: 'function',
+  batchSize: 'number',
+  batchDelay: 'number',
+  gvlid: 'number',
+}
+
+const MAX_CALL_DEPTH = 20;
+
+export function GenericAnalytics() {
+  const parent = AnalyticsAdapter({analyticsType: 'endpoint'});
+  const {logError, logWarn} = prefixLog('Generic analytics:');
+  let batch = [];
+  let callDepth = 0;
+  let options, handler, timer, translate;
+
+  function optionsAreValid(options) {
+    if (!options.url && !options.handler) {
+      logError('options must specify either `url` or `handler`')
+      return false;
+    }
+    if (options.hasOwnProperty('method') && !['GET', 'POST'].includes(options.method)) {
+      logError('options.method must be GET or POST');
+      return false;
+    }
+    for (const [field, type] of Object.entries(TYPES)) {
+      // eslint-disable-next-line valid-typeof
+      if (options.hasOwnProperty(field) && typeof options[field] !== type) {
+        logError(`options.${field} must be a ${type}`);
+        return false;
+      }
+    }
+    if (options.hasOwnProperty('events')) {
+      if (!isPlainObject(options.events)) {
+        logError('options.events must be an object');
+        return false;
+      }
+      for (const [event, handler] of Object.entries(options.events)) {
+        if (!CONSTANTS.EVENTS.hasOwnProperty(event)) {
+          logWarn(`options.events.${event} does not match any known Prebid event`);
+          if (typeof handler !== 'function') {
+            logError(`options.events.${event} must be a function`);
+            return false;
+          }
+        }
+      }
+    }
+    return true;
+  }
+
+  function processBatch() {
+    const currentBatch = batch;
+    batch = [];
+    callDepth++;
+    try {
+      // the pub-provided handler may inadvertently cause an infinite chain of events;
+      // even just logging an exception from it may cause an AUCTION_DEBUG event, that
+      // gets back to the handler, that throws another exception etc.
+      // to avoid the issue, put a cap on recursion
+      if (callDepth === MAX_CALL_DEPTH) {
+        logError('detected probable infinite recursion, discarding events', currentBatch);
+      }
+      if (callDepth >= MAX_CALL_DEPTH) {
+        return;
+      }
+      try {
+        handler(currentBatch);
+      } catch (e) {
+        logError('error executing options.handler', e);
+      }
+    } finally {
+      callDepth--;
+    }
+  }
+
+  function translator(eventHandlers) {
+    if (!eventHandlers) {
+      return (data) => data;
+    }
+    return function ({eventType, args}) {
+      if (eventHandlers.hasOwnProperty(eventType)) {
+        try {
+          return eventHandlers[eventType](args);
+        } catch (e) {
+          logError(`error executing options.events.${eventType}`, e);
+        }
+      }
+    }
+  }
+
+  return Object.assign(
+    Object.create(parent),
+    {
+      gvlid(config) {
+        return config?.options?.gvlid
+      },
+      enableAnalytics(config) {
+        if (optionsAreValid(config?.options || {})) {
+          options = Object.assign({}, DEFAULTS, config.options);
+          handler = options.handler || defaultHandler(options);
+          translate = translator(options.events);
+          parent.enableAnalytics.call(this, config);
+        }
+      },
+      track(event) {
+        if (event.eventType === CONSTANTS.EVENTS.AUCTION_INIT && event.args.hasOwnProperty('config')) {
+          // clean up auctionInit event
+          // TODO: remove this special case in v8
+          delete event.args.config;
+        }
+        const datum = translate(event);
+        if (datum != null) {
+          batch.push(datum);
+          if (timer != null) {
+            clearTimeout(timer);
+            timer = null;
+          }
+          if (batch.length >= options.batchSize) {
+            processBatch();
+          } else {
+            timer = setTimeout(processBatch, options.batchDelay);
+          }
+        }
+      }
+    }
+  )
+}
+
+export function defaultHandler({url, method, batchSize, ajax = ajaxBuilder()}) {
+  const callbacks = {
+    success() {},
+    error() {}
+  }
+  const extract = batchSize > 1 ? (events) => events : (events) => events[0];
+  const serialize = method === 'GET' ? (data) => ({data: JSON.stringify(data)}) : (data) => JSON.stringify(data);
+
+  return function (events) {
+    ajax(url, callbacks, serialize(extract(events)), {method})
+  }
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: GenericAnalytics(),
+  code: 'generic',
+});
diff --git a/modules/pubCommonId.js b/modules/pubCommonId.js
index 5cadd522af2..1fde8f8db5b 100644
--- a/modules/pubCommonId.js
+++ b/modules/pubCommonId.js
@@ -9,8 +9,9 @@ import * as events from '../src/events.js';
 import CONSTANTS from '../src/constants.json';
 import { getStorageManager } from '../src/storageManager.js';
 import {timedAuctionHook} from '../src/utils/perfMetrics.js';
+import {VENDORLESS_GVLID} from '../src/consentHandler.js';
 
-const storage = getStorageManager({moduleName: 'pubCommonId'});
+const storage = getStorageManager({moduleName: 'pubCommonId', gvlid: VENDORLESS_GVLID});
 
 const ID_NAME = '_pubcid';
 const OPTOUT_NAME = '_pubcid_optout';
diff --git a/modules/pubProvidedIdSystem.js b/modules/pubProvidedIdSystem.js
index 669d223c57f..baffd997443 100644
--- a/modules/pubProvidedIdSystem.js
+++ b/modules/pubProvidedIdSystem.js
@@ -7,6 +7,7 @@
 
 import {submodule} from '../src/hook.js';
 import { logInfo, isArray } from '../src/utils.js';
+import {VENDORLESS_GVLID} from '../src/consentHandler.js';
 
 const MODULE_NAME = 'pubProvidedId';
 
@@ -18,6 +19,7 @@ export const pubProvidedIdSubmodule = {
    * @type {string}
    */
   name: MODULE_NAME,
+  gvlid: VENDORLESS_GVLID,
 
   /**
    * decode the stored id value for passing to bid request
diff --git a/modules/sharedIdSystem.js b/modules/sharedIdSystem.js
index 99a34ae17f4..7562b472047 100644
--- a/modules/sharedIdSystem.js
+++ b/modules/sharedIdSystem.js
@@ -9,8 +9,9 @@ import { parseUrl, buildUrl, triggerPixel, logInfo, hasDeviceAccess, generateUUI
 import {submodule} from '../src/hook.js';
 import { coppaDataHandler } from '../src/adapterManager.js';
 import {getStorageManager} from '../src/storageManager.js';
+import {VENDORLESS_GVLID} from '../src/consentHandler.js';
 
-export const storage = getStorageManager({moduleName: 'pubCommonId'});
+export const storage = getStorageManager({moduleName: 'pubCommonId', gvlid: VENDORLESS_GVLID});
 const COOKIE = 'cookie';
 const LOCAL_STORAGE = 'html5';
 const OPTOUT_NAME = '_pubcid_optout';
@@ -73,6 +74,7 @@ export const sharedIdSystemSubmodule = {
    */
   name: 'sharedId',
   aliasName: 'pubCommonId',
+  gvlid: VENDORLESS_GVLID,
 
   /**
    * decode the stored id value for passing to bid requests
diff --git a/src/consentHandler.js b/src/consentHandler.js
index 861a9894a2c..01470a4b38c 100644
--- a/src/consentHandler.js
+++ b/src/consentHandler.js
@@ -1,6 +1,14 @@
 import {isStr, timestamp} from './utils.js';
 import {defer, GreedyPromise} from './utils/promise.js';
 
+/**
+ * Placeholder gvlid for when vendor consent is not required. When this value is used as gvlid, the gdpr
+ * enforcement module will take it to mean "vendor consent was given".
+ *
+ * see https://github.com/prebid/Prebid.js/issues/8161
+ */
+export const VENDORLESS_GVLID = Object.freeze({});
+
 export class ConsentHandler {
   #enabled;
   #data;
diff --git a/src/storageManager.js b/src/storageManager.js
index 4ab224f8d9b..eaf35603c60 100644
--- a/src/storageManager.js
+++ b/src/storageManager.js
@@ -1,6 +1,7 @@
 import {hook} from './hook.js';
 import {hasDeviceAccess, checkCookieSupport, logError, logInfo, isPlainObject} from './utils.js';
 import {bidderSettings as defaultBidderSettings} from './bidderSettings.js';
+import {VENDORLESS_GVLID} from './consentHandler.js';
 
 const moduleTypeWhiteList = ['core', 'prebid-module'];
 
@@ -33,7 +34,9 @@ export function newStorageManager({gvlid, moduleName, bidderCode, moduleType} =
     return storageAllowed == null ? false : storageAllowed;
   }
 
-  const isVendorless = moduleTypeWhiteList.includes(moduleType);
+  if (moduleTypeWhiteList.includes(moduleType)) {
+    gvlid = gvlid || VENDORLESS_GVLID;
+  }
 
   function isValid(cb) {
     if (!isBidderAllowed()) {
@@ -45,7 +48,7 @@ export function newStorageManager({gvlid, moduleName, bidderCode, moduleType} =
       let hookDetails = {
         hasEnforcementHook: false
       }
-      validateStorageEnforcement(isVendorless, gvlid, bidderCode || moduleName, hookDetails, function(result) {
+      validateStorageEnforcement(gvlid, bidderCode || moduleName, hookDetails, function(result) {
         if (result && result.hasEnforcementHook) {
           value = cb(result);
         } else {
@@ -296,7 +299,7 @@ export function newStorageManager({gvlid, moduleName, bidderCode, moduleType} =
 /**
  * This hook validates the storage enforcement if gdprEnforcement module is included
  */
-export const validateStorageEnforcement = hook('async', function(isVendorless, gvlid, moduleName, hookDetails, callback) {
+export const validateStorageEnforcement = hook('async', function(gvlid, moduleName, hookDetails, callback) {
   callback(hookDetails);
 }, 'validateStorageEnforcement');
 
diff --git a/test/spec/modules/gdprEnforcement_spec.js b/test/spec/modules/gdprEnforcement_spec.js
index ddd522decab..8d58990bb66 100644
--- a/test/spec/modules/gdprEnforcement_spec.js
+++ b/test/spec/modules/gdprEnforcement_spec.js
@@ -20,6 +20,7 @@ import * as events from 'src/events.js';
 import 'modules/appnexusBidAdapter.js'; // some tests expect this to be in the adapter registry
 import 'src/prebid.js'
 import {hook} from '../../../src/hook.js';
+import {VENDORLESS_GVLID} from '../../../src/consentHandler.js';
 
 describe('gdpr enforcement', function () {
   let nextFnSpy;
@@ -150,13 +151,13 @@ describe('gdpr enforcement', function () {
         }
       });
 
-      deviceAccessHook(nextFnSpy, false);
+      deviceAccessHook(nextFnSpy);
       expect(nextFnSpy.calledOnce).to.equal(true);
       let result = {
         hasEnforcementHook: true,
         valid: false
       }
-      sinon.assert.calledWith(nextFnSpy, false, undefined, undefined, result);
+      sinon.assert.calledWith(nextFnSpy, undefined, undefined, result);
     });
 
     it('should only check for consent for vendor exceptions when enforcePurpose and enforceVendor are false', function () {
@@ -178,8 +179,8 @@ describe('gdpr enforcement', function () {
       consentData.apiVersion = 2;
       gdprDataHandlerStub.returns(consentData);
 
-      deviceAccessHook(nextFnSpy, false, 1, 'appnexus');
-      deviceAccessHook(nextFnSpy, false, 5, 'rubicon');
+      deviceAccessHook(nextFnSpy, 1, 'appnexus');
+      deviceAccessHook(nextFnSpy, 5, 'rubicon');
       expect(logWarnSpy.callCount).to.equal(0);
     });
 
@@ -201,8 +202,8 @@ describe('gdpr enforcement', function () {
       consentData.apiVersion = 2;
       gdprDataHandlerStub.returns(consentData);
 
-      deviceAccessHook(nextFnSpy, false, 1, 'appnexus');
-      deviceAccessHook(nextFnSpy, false, 3, 'rubicon');
+      deviceAccessHook(nextFnSpy, 1, 'appnexus');
+      deviceAccessHook(nextFnSpy, 3, 'rubicon');
       expect(logWarnSpy.callCount).to.equal(1);
     });
 
@@ -224,13 +225,13 @@ describe('gdpr enforcement', function () {
       consentData.apiVersion = 2;
       gdprDataHandlerStub.returns(consentData);
 
-      deviceAccessHook(nextFnSpy, false, 1, 'appnexus');
+      deviceAccessHook(nextFnSpy, 1, 'appnexus');
       expect(nextFnSpy.calledOnce).to.equal(true);
       let result = {
         hasEnforcementHook: true,
         valid: true
       }
-      sinon.assert.calledWith(nextFnSpy, false, 1, 'appnexus', result);
+      sinon.assert.calledWith(nextFnSpy, 1, 'appnexus', result);
     });
 
     it('should use gvlMapping set by publisher', function() {
@@ -255,13 +256,13 @@ describe('gdpr enforcement', function () {
       consentData.apiVersion = 2;
       gdprDataHandlerStub.returns(consentData);
 
-      deviceAccessHook(nextFnSpy, false, 1, 'appnexus');
+      deviceAccessHook(nextFnSpy, 1, 'appnexus');
       expect(nextFnSpy.calledOnce).to.equal(true);
       let result = {
         hasEnforcementHook: true,
         valid: true
       }
-      sinon.assert.calledWith(nextFnSpy, false, 4, 'appnexus', result);
+      sinon.assert.calledWith(nextFnSpy, 4, 'appnexus', result);
       config.resetConfig();
     });
 
@@ -290,31 +291,17 @@ describe('gdpr enforcement', function () {
       consentData.apiVersion = 2;
       gdprDataHandlerStub.returns(consentData);
 
-      deviceAccessHook(nextFnSpy, false, 1, 'appnexus');
+      deviceAccessHook(nextFnSpy, 1, 'appnexus');
       expect(nextFnSpy.calledOnce).to.equal(true);
       let result = {
         hasEnforcementHook: true,
         valid: true
       }
-      sinon.assert.calledWith(nextFnSpy, false, 4, 'appnexus', result);
+      sinon.assert.calledWith(nextFnSpy, 4, 'appnexus', result);
       config.resetConfig();
       curBidderStub.restore();
     });
 
-    it(`should mark module as vendorless for rule validation when isVendorless = true and ${STRICT_STORAGE_ENFORCEMENT} is set`, () => {
-      setEnforcementConfig({
-        [STRICT_STORAGE_ENFORCEMENT]: true
-      });
-      let consentData = {
-        vendorData: staticConfig.consentData.getTCData,
-        gdprApplies: true
-      }
-      gdprDataHandlerStub.returns(consentData);
-      const validate = sinon.stub().callsFake(() => true);
-      deviceAccessHook(nextFnSpy, true, 123, 'mockModule', undefined, {validate});
-      expect(validate.args[0][4]('mockModule')).to.be.true;
-    });
-
     it(`should not enforce consent for vendorless modules if ${STRICT_STORAGE_ENFORCEMENT} is not set`, () => {
       setEnforcementConfig({});
       let consentData = {
@@ -323,9 +310,9 @@ describe('gdpr enforcement', function () {
       }
       gdprDataHandlerStub.returns(consentData);
       const validate = sinon.stub().callsFake(() => false);
-      deviceAccessHook(nextFnSpy, true, 123, 'mockModule', undefined, {validate});
+      deviceAccessHook(nextFnSpy, VENDORLESS_GVLID, 'mockModule', undefined, {validate});
       sinon.assert.callCount(validate, 0);
-      sinon.assert.calledWith(nextFnSpy, true, 123, 'mockModule', {hasEnforcementHook: true, valid: true});
+      sinon.assert.calledWith(nextFnSpy, VENDORLESS_GVLID, 'mockModule', {hasEnforcementHook: true, valid: true});
     })
   });
 
@@ -804,11 +791,12 @@ describe('gdpr enforcement', function () {
   });
 
   describe('validateRules', function () {
-    const createGdprRule = (purposeName = 'storage', enforcePurpose = true, enforceVendor = true, vendorExceptions = []) => ({
+    const createGdprRule = (purposeName = 'storage', enforcePurpose = true, enforceVendor = true, vendorExceptions = [], softVendorExceptions = []) => ({
       purpose: purposeName,
-      enforcePurpose: enforcePurpose,
-      enforceVendor: enforceVendor,
-      vendorExceptions: vendorExceptions
+      enforcePurpose,
+      enforceVendor,
+      vendorExceptions,
+      softVendorExceptions,
     });
 
     const consentData = {
@@ -922,6 +910,19 @@ describe('gdpr enforcement', function () {
       expect(isAllowed).to.equal(true);
     });
 
+    describe('when the vendor has a softVendorException', () => {
+      const gdprRule = createGdprRule('storage', true, true, [], [vendorBlockedModule]);
+
+      it('should return false if general consent was not given', () => {
+        const isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.be.false;
+      })
+      it('should return true if general consent was given', () => {
+        const isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.be.true;
+      })
+    })
+
     describe('when module does not need vendor consent', () => {
       Object.entries({
         'storage': 1,
@@ -937,11 +938,9 @@ describe('gdpr enforcement', function () {
             it(`should be ${t} when purpose is ${t}`, () => {
               const consent = utils.deepClone(consentData);
               consent.vendorData.purpose.consents[purposeNo] = consentGiven;
-              // vendor consent (and gvlid) should be ignored
-              consent.vendorData.vendor.consents[123] = !consentGiven;
               // take legitimate interest out of the picture for this test
               consent.vendorData.purpose.legitimateInterests = {};
-              const actual = validateRules(rule, consent, 'mockModule', 123, () => true);
+              const actual = validateRules(rule, consent, 'mockModule', VENDORLESS_GVLID);
               expect(actual).to.equal(consentGiven);
             })
           })
@@ -1131,56 +1130,104 @@ describe('gdpr enforcement', function () {
     })
   });
 
-  describe('getGvlid', function() {
+  describe('gvlid resolution', () => {
     let sandbox;
-    let getGvlidForBidAdapterStub;
-    let getGvlidForUserIdModuleStub;
-    let getGvlidForAnalyticsAdapterStub;
     beforeEach(function() {
       sandbox = sinon.createSandbox();
-      getGvlidForBidAdapterStub = sandbox.stub(internal, 'getGvlidForBidAdapter');
-      getGvlidForUserIdModuleStub = sandbox.stub(internal, 'getGvlidForUserIdModule');
-      getGvlidForAnalyticsAdapterStub = sandbox.stub(internal, 'getGvlidForAnalyticsAdapter');
     });
+
     afterEach(function() {
       sandbox.restore();
       config.resetConfig();
     });
 
-    it('should return "null" if called without passing any argument', function() {
-      const gvlid = getGvlid();
-      expect(gvlid).to.equal(null);
-    });
+    describe('getGvlid', function() {
+      let getGvlidForBidAdapterStub;
+      let getGvlidForUserIdModuleStub;
+      let getGvlidForAnalyticsAdapterStub;
+      beforeEach(function() {
+        getGvlidForBidAdapterStub = sandbox.stub(internal, 'getGvlidForBidAdapter');
+        getGvlidForUserIdModuleStub = sandbox.stub(internal, 'getGvlidForUserIdModule');
+        getGvlidForAnalyticsAdapterStub = sandbox.stub(internal, 'getGvlidForAnalyticsAdapter');
+      });
 
-    it('should return "null" if GVL ID is not defined for any of these modules: Bid adapter, UserId submodule and Analytics adapter', function() {
-      getGvlidForBidAdapterStub.withArgs('moduleA').returns(null);
-      getGvlidForUserIdModuleStub.withArgs('moduleA').returns(null);
-      getGvlidForAnalyticsAdapterStub.withArgs('moduleA').returns(null);
+      it('should return "null" if called without passing any argument', function() {
+        const gvlid = getGvlid();
+        expect(gvlid).to.equal(null);
+      });
 
-      const gvlid = getGvlid('moduleA');
-      expect(gvlid).to.equal(null);
-    });
+      it('should return "null" if GVL ID is not defined for any of these modules: Bid adapter, UserId submodule and Analytics adapter', function() {
+        getGvlidForBidAdapterStub.withArgs('moduleA').returns(null);
+        getGvlidForUserIdModuleStub.withArgs('moduleA').returns(null);
+        getGvlidForAnalyticsAdapterStub.withArgs('moduleA').returns(null);
 
-    it('should return the GVL ID from gvlMapping if it is defined in setConfig', function() {
-      config.setConfig({
-        gvlMapping: {
-          moduleA: 1
-        }
+        const gvlid = getGvlid('moduleA');
+        expect(gvlid).to.equal(null);
+      });
+
+      it('should return the GVL ID from gvlMapping if it is defined in setConfig', function() {
+        config.setConfig({
+          gvlMapping: {
+            moduleA: 1
+          }
+        });
+
+        // Actual GVL ID for moduleA is 2, as defined on its the bidAdapter.js file.
+        getGvlidForBidAdapterStub.withArgs('moduleA').returns(2);
+
+        const gvlid = getGvlid('moduleA');
+        expect(gvlid).to.equal(1);
       });
 
-      // Actual GVL ID for moduleA is 2, as defined on its the bidAdapter.js file.
-      getGvlidForBidAdapterStub.withArgs('moduleA').returns(2);
+      it('should return the GVL ID by calling getGvlidForBidAdapter -> getGvlidForUserIdModule -> getGvlidForAnalyticsAdapter in sequence', function() {
+        getGvlidForBidAdapterStub.withArgs('moduleA').returns(null);
+        getGvlidForUserIdModuleStub.withArgs('moduleA').returns(null);
+        getGvlidForAnalyticsAdapterStub.withArgs('moduleA').returns(7);
+
+        expect(getGvlid('moduleA')).to.equal(7);
+      });
 
-      const gvlid = getGvlid('moduleA');
-      expect(gvlid).to.equal(1);
+      it('should pass extra arguments to analytics\' getGvlid', () => {
+        getGvlidForAnalyticsAdapterStub.withArgs('analytics').returns(321);
+        const cfg = {some: 'args'};
+        getGvlid('analytics', cfg);
+        sinon.assert.calledWith(getGvlidForAnalyticsAdapterStub, 'analytics', cfg);
+      });
     });
 
-    it('should return the GVL ID by calling getGvlidForBidAdapter -> getGvlidForUserIdModule -> getGvlidForAnalyticsAdapter in sequence', function() {
-      getGvlidForBidAdapterStub.withArgs('moduleA').returns(null);
-      getGvlidForUserIdModuleStub.withArgs('moduleA').returns(null);
-      getGvlidForAnalyticsAdapterStub.withArgs('moduleA').returns(7);
+    describe('getGvlidForAnalyticsAdapter', () => {
+      let getAnalyticsAdapter, adapter, adapterEntry;
+
+      beforeEach(() => {
+        adapter = {};
+        adapterEntry = {
+          adapter
+        };
+        getAnalyticsAdapter = sandbox.stub(adapterManager, 'getAnalyticsAdapter');
+        getAnalyticsAdapter.withArgs('analytics').returns(adapterEntry);
+      });
+
+      it('should return gvlid from adapterManager if defined', () => {
+        adapterEntry.gvlid = 123;
+        adapter.gvlid = 321
+        expect(internal.getGvlidForAnalyticsAdapter('analytics')).to.equal(123);
+      });
+
+      it('should return gvlid from adapter if defined', () => {
+        adapter.gvlid = 321;
+        expect(internal.getGvlidForAnalyticsAdapter('analytics')).to.equal(321);
+      });
 
-      expect(getGvlid('moduleA')).to.equal(7);
+      it('should invoke adapter.gvlid if it\'s a function', () => {
+        adapter.gvlid = (cfg) => cfg.k
+        const cfg = {k: 231};
+        expect(internal.getGvlidForAnalyticsAdapter('analytics', cfg)).to.eql(231);
+      });
+
+      it('should not choke if adapter gvlid fn throws', () => {
+        adapter.gvlid = () => { throw new Error(); };
+        expect(internal.getGvlidForAnalyticsAdapter('analytics')).to.not.be.ok;
+      });
     });
-  });
+  })
 });
diff --git a/test/spec/modules/genericAnalyticsAdapter_spec.js b/test/spec/modules/genericAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..a5a6074c425
--- /dev/null
+++ b/test/spec/modules/genericAnalyticsAdapter_spec.js
@@ -0,0 +1,284 @@
+import {defaultHandler, GenericAnalytics} from '../../../modules/genericAnalyticsAdapter.js';
+import * as events from 'src/events.js';
+import * as CONSTANTS from 'src/constants.json';
+
+const {AUCTION_INIT, BID_RESPONSE} = CONSTANTS.EVENTS;
+
+describe('Generic analytics', () => {
+  describe('adapter', () => {
+    let adapter, sandbox, clock;
+    beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+      sandbox.stub(events, 'getEvents').returns([]);
+      clock = sandbox.useFakeTimers();
+      adapter = new GenericAnalytics();
+    });
+
+    afterEach(() => {
+      adapter.disableAnalytics();
+      sandbox.restore();
+    });
+
+    describe('configuration', () => {
+      it('should be accepted if valid', () => {
+        adapter.enableAnalytics({
+          options: {
+            url: 'mock',
+            method: 'GET',
+            batchSize: 123,
+            batchDelay: 321
+          }
+        });
+        expect(adapter.enabled).to.be.true;
+      });
+
+      describe('should not work if', () => {
+        afterEach(function() {
+          expect(adapter.enabled).to.equal(false, this.currentTest.title);
+        });
+
+        it('neither handler nor url are specified', () => {
+          adapter.enableAnalytics({});
+        });
+
+        ['batchSize', 'batchDelay', 'handler'].forEach(option => {
+          it(`${option} is not valid`, () => {
+            adapter.enableAnalytics({
+              options: {
+                url: 'mock',
+                [option]: false
+              }
+            });
+          });
+        });
+
+        it('method is not GET or POST', () => {
+          adapter.enableAnalytics({
+            options: {
+              url: 'mock',
+              method: 'PATCH'
+            }
+          });
+        });
+
+        it('events is not an object', () => {
+          adapter.enableAnalytics({
+            options: {
+              url: 'mock',
+              events: null
+            }
+          });
+        });
+
+        it('events\' properties are not functions', () => {
+          adapter.enableAnalytics({
+            options: {
+              url: 'mock',
+              events: {
+                bidResponse: null
+              }
+            }
+          });
+        });
+      });
+    });
+
+    describe('when handler is specified', () => {
+      let handler;
+      beforeEach(() => {
+        handler = sinon.stub();
+      });
+
+      it('should collect events in batches, and call handler', () => {
+        adapter.enableAnalytics({
+          options: {
+            handler,
+            batchSize: 2
+          }
+        });
+        events.emit(AUCTION_INIT, {i: 0});
+        sinon.assert.notCalled(handler);
+        events.emit(BID_RESPONSE, {i: 0});
+        sinon.assert.calledWith(handler, sinon.match((arg) => {
+          return sinon.match({eventType: AUCTION_INIT, args: {i: 0}}).test(arg[0]) &&
+            sinon.match({eventType: BID_RESPONSE, args: {i: 0}}).test(arg[1]);
+        }));
+      });
+
+      it('should not choke if handler throws', () => {
+        adapter.enableAnalytics({
+          options: {
+            handler,
+            batchSize: 1
+          }
+        });
+        handler.throws(new Error());
+        events.emit(AUCTION_INIT, {i: 0});
+        let recv;
+        handler.reset();
+        handler.callsFake((arg) => {
+          recv = arg;
+        });
+        events.emit(BID_RESPONSE, {i: 1});
+        expect(recv).to.eql([{eventType: BID_RESPONSE, args: {i: 1}}]);
+      });
+
+      it('should not cause infinite recursion, if handler triggers more events', () => {
+        let i = 0;
+        handler.callsFake(() => {
+          if (i <= 100) {
+            i++;
+            events.emit(BID_RESPONSE, {});
+          }
+        });
+        adapter.enableAnalytics({
+          options: {
+            handler,
+          }
+        });
+        events.emit(AUCTION_INIT, {});
+        expect(i >= 100).to.be.false;
+      });
+
+      it('should send incomplete batch after batchDelay', () => {
+        adapter.enableAnalytics({
+          options: {
+            batchDelay: 100,
+            batchSize: 2,
+            handler
+          }
+        });
+        [0, 1, 2].forEach(i => events.emit(BID_RESPONSE, {i}));
+        sinon.assert.calledOnce(handler);
+        clock.tick(100);
+        sinon.assert.calledTwice(handler);
+      });
+
+      it('does not send empty batches', () => {
+        adapter.enableAnalytics({
+          options: {
+            batchDelay: 100,
+            batchSize: 2,
+            handler
+          }
+        });
+        [0, 1, 2].forEach(i => events.emit(BID_RESPONSE, {i}));
+        sinon.assert.calledOnce(handler);
+        clock.tick(50);
+        events.emit(BID_RESPONSE, {i: 3});
+        sinon.assert.calledTwice(handler);
+        clock.tick(100);
+        sinon.assert.calledTwice(handler);
+      });
+
+      describe('and options.events is specified', () => {
+        it('filters out other events', () => {
+          adapter.enableAnalytics({
+            options: {
+              handler,
+              events: {
+                bidResponse(bid) {
+                  return bid;
+                }
+              }
+            }
+          });
+          events.emit(AUCTION_INIT, {});
+          sinon.assert.notCalled(handler);
+        });
+
+        it('transforms event data', () => {
+          adapter.enableAnalytics({
+            options: {
+              handler,
+              events: {
+                bidResponse(bid) {
+                  return {
+                    extra: 'data',
+                    prop: bid.prop
+                  }
+                }
+              }
+            }
+          });
+          events.emit(BID_RESPONSE, {prop: 'value', i: 0});
+          sinon.assert.calledWith(handler, sinon.match(data => sinon.match({extra: 'data', prop: 'value'}).test(data[0])));
+        });
+
+        it('does not choke if an event handler throws', () => {
+          adapter.enableAnalytics({
+            options: {
+              handler,
+              events: {
+                bidResponse(bid) {
+                  return bid;
+                },
+                auctionInit(auction) {
+                  throw new Error();
+                }
+              }
+            }
+          });
+          events.emit(AUCTION_INIT, {});
+          events.emit(BID_RESPONSE, {i: 0});
+          sinon.assert.calledOnce(handler);
+          sinon.assert.calledWith(handler, sinon.match(data => sinon.match({i: 0}).test(data[0])));
+        });
+
+        it('filters out events when their handler returns undefined', () => {
+          adapter.enableAnalytics({
+            options: {
+              handler,
+              events: {
+                auctionInit(auction) {
+                  return auction;
+                },
+                bidResponse(bid) {}
+              }
+            }
+          });
+          events.emit(AUCTION_INIT, {i: 0});
+          events.emit(BID_RESPONSE, {i: 1});
+          sinon.assert.calledOnce(handler);
+          sinon.assert.calledWith(handler, sinon.match(data => sinon.match({i: 0}).test(data[0])));
+        });
+      });
+    });
+  });
+
+  describe('default handler', () => {
+    const url = 'mock-url';
+
+    let ajax;
+    beforeEach(() => {
+      ajax = sinon.stub();
+    });
+
+    Object.entries({
+      'GET': (data) => JSON.parse(data.data),
+      'POST': (data) => JSON.parse(data)
+    }).forEach(([method, parse]) => {
+      describe(`when HTTP method is ${method}`, () => {
+        it('should send single event when batchSize is 1', () => {
+          const handler = defaultHandler({url, method, batchSize: 1, ajax});
+          const payload = {i: 0};
+          handler([payload, {}]);
+          sinon.assert.calledWith(ajax, url, sinon.match.any,
+            sinon.match(data => sinon.match(payload).test(parse(data))),
+            {method}
+          );
+        });
+
+        it('should send multiple events when batchSize is greater than 1', () => {
+          const handler = defaultHandler({url, method, batchSize: 10, ajax});
+          const payload = [{i: 0}, {i: 1}];
+          handler(payload);
+          sinon.assert.calledWith(ajax, url, sinon.match.any,
+            sinon.match(data => sinon.match(payload).test(parse(data))),
+            {method}
+          );
+        });
+      });
+    });
+  });
+});
diff --git a/test/spec/unit/core/storageManager_spec.js b/test/spec/unit/core/storageManager_spec.js
index cb38aed9e47..58bf8c9eb25 100644
--- a/test/spec/unit/core/storageManager_spec.js
+++ b/test/spec/unit/core/storageManager_spec.js
@@ -8,6 +8,7 @@ import {
 import { config } from 'src/config.js';
 import * as utils from 'src/utils.js';
 import {hook} from '../../../../src/hook.js';
+import {VENDORLESS_GVLID} from '../../../../src/consentHandler.js';
 
 describe('storage manager', function() {
   before(() => {
@@ -73,7 +74,7 @@ describe('storage manager', function() {
 
     it('should respect (vendorless) consent enforcement', () => {
       storage.localStorageIsEnabled();
-      expect(validateHook.args[0][1]).to.eql(true); // isVendorless should be set to true
+      expect(validateHook.args[0][1]).to.equal(VENDORLESS_GVLID); // gvlid should be set to VENDORLESS_GVLID
     });
 
     it('should respect the deviceAccess flag', () => {

From b0413b2225801317d0eb20040fc57c1cc25c9eaa Mon Sep 17 00:00:00 2001
From: southern-growthcode
 <79725079+southern-growthcode@users.noreply.github.com>
Date: Mon, 28 Nov 2022 11:22:00 -0500
Subject: [PATCH 471/569] GrowthCode Analytics Adaptor Module: initial module
 release (#9021)

* Initial check-in ofthe GrowthCode Adaptor

* Growthcode ID System

* Working on test module

* Tests for the growthCode Id System

* Clean up tests for GrowthCode

* Fixed the default values for shareID

* New Analyics package

* Growthcode Analyics Adapter

* Backout growthcode User ID module
---
 integrationExamples/gpt/growthcode.html       | 134 +++++++++++++
 modules/growthCodeAnalyticsAdapter.js         | 176 ++++++++++++++++++
 modules/growthCodeAnalyticsAdapter.md         |  41 ++++
 .../growthCodeAnalyticsAdapter_spec.js        |  70 +++++++
 4 files changed, 421 insertions(+)
 create mode 100644 integrationExamples/gpt/growthcode.html
 create mode 100644 modules/growthCodeAnalyticsAdapter.js
 create mode 100644 modules/growthCodeAnalyticsAdapter.md
 create mode 100644 test/spec/modules/growthCodeAnalyticsAdapter_spec.js

diff --git a/integrationExamples/gpt/growthcode.html b/integrationExamples/gpt/growthcode.html
new file mode 100644
index 00000000000..ede51d2d869
--- /dev/null
+++ b/integrationExamples/gpt/growthcode.html
@@ -0,0 +1,134 @@
+<!--
+  GrowthCode Setup Example contact support@growthcode.io for more information.
+-->
+
+<html>
+<head>
+  <script async src="../../build/dev/prebid.js"></script>
+  <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+  <script>
+    var FAILSAFE_TIMEOUT = 3300;
+    var PREBID_TIMEOUT = 1000;
+
+    var adUnits = [{
+      code: 'div-gpt-ad-1460505748561-0',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300,600]],
+        }
+      },
+      // Replace this object to test a new Adapter!
+      bids: [{
+        bidder: 'appnexus',
+        params: {
+          placementId: 13144370
+        }
+      }],
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+  </script>
+
+  <script>
+    var googletag = googletag || {};
+    googletag.cmd = googletag.cmd || [];
+    googletag.cmd.push(function() {
+      googletag.pubads().disableInitialLoad();
+    });
+
+    pbjs.que.push(function() {
+      pbjs.addAdUnits(adUnits);
+      pbjs.requestBids({
+        bidsBackHandler: sendAdserverRequest,
+        timeout: PREBID_TIMEOUT
+      });
+      pbjs.enableAnalytics({
+        provider: 'growthCodeAnalytics',
+        options: {
+          pid: 'TEST01',
+          trackEvents: [
+            'auctionInit',
+            'auctionEnd',
+            'bidAdjustment',
+            'bidTimeout',
+            'bidTimeout',
+            'bidRequested',
+            'bidResponse',
+            'setTargeting',
+            'requestBids',
+            'addAdUnits',
+            'noBid',
+            'bidWon',
+            'bidderDone']
+        }
+      });
+      pbjs.setConfig({
+        debugging: {
+          enabled: true,
+          bids: [{
+            bidder: 'appnexus',
+            adUnitCode: '/19968336/header-bid-tag-0',
+            cpm: 1.5,
+            adId: '111111',
+            ad: '<html><body><img src="https://files.prebid.org/creatives/prebid300x250.png"></body></html>'
+          }]
+        },
+        userSync: {
+          userIds: [{
+            name: "sharedId",
+            storage: {
+              type: "html5",
+              name: "_sharedID",         // create a cookie with this name
+              expires: 365             // expires in 1 years
+            }
+          },{
+            name: 'growthCodeId',
+            params: {
+              pid: 'TEST01',
+              publisher_id: '_sharedID',
+              publisher_id_storage: 'html5',
+            }
+          }]
+        }
+      });
+    });
+
+    function sendAdserverRequest() {
+      if (pbjs.adserverRequestSent) return;
+      pbjs.adserverRequestSent = true;
+      googletag.cmd.push(function() {
+        pbjs.que.push(function() {
+          pbjs.setTargetingForGPTAsync();
+          googletag.pubads().refresh();
+        });
+      });
+    }
+
+    setTimeout(function() {
+      sendAdserverRequest();
+    }, FAILSAFE_TIMEOUT);
+
+  </script>
+
+  <script>
+    googletag.cmd.push(function () {
+      googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
+
+      googletag.pubads().enableSingleRequest();
+      googletag.enableServices();
+    });
+  </script>
+</head>
+
+<body>
+<h2>Prebid.js Test</h2>
+<h5>Div-1</h5>
+<div id='div-gpt-ad-1460505748561-0'>
+  <script type='text/javascript'>
+    googletag.cmd.push(function() { googletag.display('div-gpt-ad-1460505748561-0'); });
+  </script>
+</div>
+</body>
+</html>
diff --git a/modules/growthCodeAnalyticsAdapter.js b/modules/growthCodeAnalyticsAdapter.js
new file mode 100644
index 00000000000..1f11b891139
--- /dev/null
+++ b/modules/growthCodeAnalyticsAdapter.js
@@ -0,0 +1,176 @@
+/**
+ * growthCodeAnalyticsAdapter.js - GrowthCode Analytics Adapter
+ */
+import { ajax } from '../src/ajax.js';
+import adapter from '../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import * as utils from '../src/utils.js';
+import CONSTANTS from '../src/constants.json';
+import { getStorageManager } from '../src/storageManager.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {logError, logInfo} from '../src/utils.js';
+
+const MODULE_NAME = 'growthCodeAnalytics';
+const DEFAULT_PID = 'INVALID_PID'
+const ENDPOINT_URL = 'https://p2.gcprivacy.com/v1/pb/analytics'
+
+export const storage = getStorageManager();
+
+let sessionId = utils.generateUUID();
+
+let trackEvents = [];
+let pid = DEFAULT_PID;
+let url = ENDPOINT_URL;
+
+let eventQueue = [];
+
+let startAuction = 0;
+let bidRequestTimeout = 0;
+let analyticsType = 'endpoint';
+
+let growthCodeAnalyticsAdapter = Object.assign(adapter({url: url, analyticsType}), {
+  track({eventType, eventData}) {
+    eventData = eventData ? JSON.parse(JSON.stringify(eventData)) : {};
+    let data = {};
+    if (!trackEvents.includes(eventType)) return;
+    switch (eventType) {
+      case CONSTANTS.EVENTS.AUCTION_INIT: {
+        data = eventData;
+        startAuction = data.timestamp;
+        bidRequestTimeout = data.timeout;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.AUCTION_END: {
+        data = eventData;
+        data.start = startAuction;
+        data.end = Date.now();
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_ADJUSTMENT: {
+        data.bidders = eventData;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_TIMEOUT: {
+        data.bidders = eventData;
+        data.duration = bidRequestTimeout;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_REQUESTED: {
+        data = eventData;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_RESPONSE: {
+        data = eventData;
+        delete data.ad;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BID_WON: {
+        data = eventData;
+        delete data.ad;
+        delete data.adUrl;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.BIDDER_DONE: {
+        data = eventData;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.SET_TARGETING: {
+        data.targetings = eventData;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.REQUEST_BIDS: {
+        data = eventData;
+        break;
+      }
+
+      case CONSTANTS.EVENTS.ADD_AD_UNITS: {
+        data = eventData;
+        break;
+      }
+
+      default:
+        return;
+    }
+
+    data.eventType = eventType;
+    data.timestamp = data.timestamp || Date.now();
+
+    sendEvent(data);
+  }
+});
+
+growthCodeAnalyticsAdapter.originEnableAnalytics = growthCodeAnalyticsAdapter.enableAnalytics;
+
+growthCodeAnalyticsAdapter.enableAnalytics = function(conf = {}) {
+  if (typeof conf.options === 'object') {
+    if (conf.options.pid) {
+      pid = conf.options.pid;
+      url = conf.options.url ? conf.options.url : ENDPOINT_URL;
+    } else {
+      logError(MODULE_NAME + ' Not a valid PartnerID')
+      return
+    }
+    if (conf.options.trackEvents) {
+      trackEvents = conf.options.trackEvents;
+    }
+  } else {
+    logError(MODULE_NAME + ' Invalid configuration');
+    return;
+  }
+
+  growthCodeAnalyticsAdapter.originEnableAnalytics(conf);
+};
+
+function logToServer() {
+  if (pid === DEFAULT_PID) return;
+  if (eventQueue.length > 1) {
+    let data = {
+      session: sessionId,
+      pid: pid,
+      timestamp: Date.now(),
+      timezoneoffset: new Date().getTimezoneOffset(),
+      url: getRefererInfo().page,
+      referer: document.referrer,
+      events: eventQueue
+    };
+
+    ajax(url, {
+      success: response => {
+        logInfo(MODULE_NAME + ' Send Data to Server')
+      },
+      error: error => {
+        logInfo(MODULE_NAME + ' Problem Send Data to Server: ' + error)
+      }
+    }, JSON.stringify(data), {method: 'POST', withCredentials: true})
+
+    eventQueue = [
+    ];
+  }
+}
+
+function sendEvent(event) {
+  eventQueue.push(event);
+  logInfo(MODULE_NAME + 'Analytics Event: ' + event);
+
+  if (event.eventType === CONSTANTS.EVENTS.AUCTION_END) {
+    logToServer();
+  }
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: growthCodeAnalyticsAdapter,
+  code: 'growthCodeAnalytics'
+});
+
+growthCodeAnalyticsAdapter.logToServer = logToServer;
+
+export default growthCodeAnalyticsAdapter;
diff --git a/modules/growthCodeAnalyticsAdapter.md b/modules/growthCodeAnalyticsAdapter.md
new file mode 100644
index 00000000000..e45cb2e9c62
--- /dev/null
+++ b/modules/growthCodeAnalyticsAdapter.md
@@ -0,0 +1,41 @@
+## GrowthCode Analytics Adapter
+
+[GrowthCode](https://growthcode.io) offers scaled infrastructure-as-a-service to 
+empower independent publishers to harness data and take control of identity and 
+audience while rapidly aligning to industry changes and margin pressure.
+
+## Building Prebid with GrowthCode Support
+
+First, make sure to add the GrowthCode submodule to your Prebid.js package with:
+
+```
+gulp build --modules=growthCodeIdSystem,growthCodeAnalyticsAdapter,userId
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.enableAnalytics({
+  provider: 'growthCodeAnalytics',
+  options: {
+    pid: '<Contact GrowthCode>',
+    trackEvents: [
+      'auctionEnd',
+      'bidAdjustment',
+      'bidTimeout',
+      'bidRequested',
+      'bidResponse',
+      'noBid',
+      'bidWon',
+      'bidderDone']
+  }
+});
+```
+
+| Param enableAnalytics | Scope    | Type   | Description                                                 | Example                  |
+|-----------------------|----------|--------|-------------------------------------------------------------|--------------------------|
+| provider              | Required | String | The name of this Adapter.                                   | `"growthCodeAnalytics"`  |
+| params                | Required | Object | Details of module params.                                   |                          |
+| params.pid            | Required | String | This is the Customer ID value obtained via Intimate Merger. | `"<Contact GrowthCode>"` |
+| params.url            | Optional | String | Custom URL for server                                       |                          |
+| params.trackEvents    | Required | String | Name if the variable that holds your publisher ID           |                          |
diff --git a/test/spec/modules/growthCodeAnalyticsAdapter_spec.js b/test/spec/modules/growthCodeAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..e542a2641e8
--- /dev/null
+++ b/test/spec/modules/growthCodeAnalyticsAdapter_spec.js
@@ -0,0 +1,70 @@
+import adapterManager from '../../../src/adapterManager.js';
+import growthCodeAnalyticsAdapter from '../../../modules/growthCodeAnalyticsAdapter.js';
+import { expect } from 'chai';
+import * as events from '../../../src/events.js';
+import constants from '../../../src/constants.json';
+import { generateUUID } from '../../../src/utils.js';
+import { server } from 'test/mocks/xhr.js';
+
+describe('growthCode analytics adapter', () => {
+  beforeEach(() => {
+    growthCodeAnalyticsAdapter.enableAnalytics({
+      provider: 'growthCodeAnalytics',
+      options: {
+        pid: 'TEST01',
+        trackEvents: [
+          'auctionInit',
+          'auctionEnd',
+          'bidAdjustment',
+          'bidTimeout',
+          'bidTimeout',
+          'bidRequested',
+          'bidResponse',
+          'setTargeting',
+          'requestBids',
+          'addAdUnits',
+          'noBid',
+          'bidWon',
+          'bidderDone']
+      }
+    });
+  });
+
+  afterEach(() => {
+    growthCodeAnalyticsAdapter.disableAnalytics();
+  });
+
+  it('registers itself with the adapter manager', () => {
+    const adapter = adapterManager.getAnalyticsAdapter('growthCodeAnalytics');
+    expect(adapter).to.exist;
+    expect(adapter.adapter).to.equal(growthCodeAnalyticsAdapter);
+  });
+
+  it('tolerates undefined or empty config', () => {
+    growthCodeAnalyticsAdapter.enableAnalytics(undefined);
+    growthCodeAnalyticsAdapter.enableAnalytics({});
+  });
+
+  it('sends auction end events to the backend', () => {
+    const auction = {
+      auctionId: generateUUID(),
+      adUnits: [{
+        code: 'usr1234',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600], [728, 90]]
+          }
+        },
+        adUnitCodes: ['usr1234']
+      }],
+    };
+    events.emit(constants.EVENTS.AUCTION_END, auction);
+    assert(server.requests.length > 0)
+    const body = JSON.parse(server.requests[0].requestBody);
+    var eventTypes = [];
+    body.events.forEach(e => eventTypes.push(e.eventType));
+    assert(eventTypes.length > 0)
+    assert(eventTypes.indexOf(constants.EVENTS.AUCTION_END) > -1);
+    growthCodeAnalyticsAdapter.disableAnalytics();
+  });
+});

From b87ebac3d855c08312f579e53180069fe2469695 Mon Sep 17 00:00:00 2001
From: yieldlift <61510052+yieldlift@users.noreply.github.com>
Date: Mon, 28 Nov 2022 17:49:00 +0100
Subject: [PATCH 472/569] Yieldlift  Bid Adapter: update ttl (#9232)

* Updating TTL, changing endpoint

* Test fixed

Co-authored-by: Danijel Predarski <danijel.p@whitecitysoft.com>
---
 modules/yieldliftBidAdapter.js                | 6 +++---
 test/spec/modules/yieldliftBidAdapter_spec.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/yieldliftBidAdapter.js b/modules/yieldliftBidAdapter.js
index 160d7e9a009..6e4bce15187 100644
--- a/modules/yieldliftBidAdapter.js
+++ b/modules/yieldliftBidAdapter.js
@@ -2,9 +2,9 @@ import {deepSetValue, logInfo, deepAccess} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 
-const ENDPOINT_URL = 'https://x.yieldlift.com/auction';
+const ENDPOINT_URL = 'https://x.yieldlift.com/pbjs';
 
-const DEFAULT_BID_TTL = 30;
+const DEFAULT_BID_TTL = 300;
 const DEFAULT_CURRENCY = 'USD';
 const DEFAULT_NET_REVENUE = true;
 
@@ -98,7 +98,7 @@ export const spec = {
           width: bid.w,
           height: bid.h,
           ad: bid.adm,
-          ttl: DEFAULT_BID_TTL,
+          ttl: typeof bid.exp === 'number' ? bid.exp : DEFAULT_BID_TTL,
           creativeId: bid.crid,
           netRevenue: DEFAULT_NET_REVENUE,
           currency: DEFAULT_CURRENCY,
diff --git a/test/spec/modules/yieldliftBidAdapter_spec.js b/test/spec/modules/yieldliftBidAdapter_spec.js
index c2379ed7778..0cabdb594fe 100644
--- a/test/spec/modules/yieldliftBidAdapter_spec.js
+++ b/test/spec/modules/yieldliftBidAdapter_spec.js
@@ -229,7 +229,7 @@ describe('YieldLift', function () {
         expect(bids[index]).to.have.property('ad', RESPONSE.body.seatbid[0].bid[index].adm);
         expect(bids[index]).to.have.property('creativeId', RESPONSE.body.seatbid[0].bid[index].crid);
         expect(bids[index].meta).to.have.property('advertiserDomains', RESPONSE.body.seatbid[0].bid[index].advertiserDomains);
-        expect(bids[index]).to.have.property('ttl', 30);
+        expect(bids[index]).to.have.property('ttl', 300);
         expect(bids[index]).to.have.property('netRevenue', true);
       }
     });

From 638691fe83a354631f0ec866095e8df02a89ab8a Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Mon, 28 Nov 2022 09:52:31 -0700
Subject: [PATCH 473/569] Multiple analytics modules: allow pub-defined event
 filters; do not block auction for analytics (#9113)

* Multiple analytics modules: allow pub-defined event filters for analytics

* AnalyticsAdapter: make event handling non-blocking

* Fix infinite recursion on nested events

* Exclude AUCTION_DEBUG by default

* Use a default whitelist intead of default blacklist

* Try to detect and break out of infinite loops caused by events triggering other events
---
 .../analyticsAdapter/AnalyticsAdapter.js      | 197 +++++++--------
 src/events.js                                 |   4 +
 test/helpers/analytics.js                     |  34 +++
 test/mocks/analyticsStub.js                   |   4 +-
 test/spec/AnalyticsAdapter_spec.js            | 235 +++++++++---------
 .../modules/adWMGAnalyticsAdapter_spec.js     |  18 +-
 .../modules/adagioAnalyticsAdapter_spec.js    |  43 ++--
 .../modules/bidwatchAnalyticsAdapter_spec.js  |   2 -
 .../modules/concertAnalyticsAdapter_spec.js   |   6 +-
 .../modules/eplanningAnalyticsAdapter_spec.js |   3 -
 .../modules/invisiblyAnalyticsAdapter_spec.js |  44 ++--
 .../modules/konduitAnalyticsAdapter_spec.js   |   2 -
 .../liveIntentAnalyticsAdapter_spec.js        |   9 +-
 .../modules/medianetAnalyticsAdapter_spec.js  |   8 +-
 .../modules/optimonAnalyticsAdapter_spec.js   |  14 +-
 .../modules/pianoDmpAnalyticsAdapter_spec.js  |  15 +-
 .../prebidmanagerAnalyticsAdapter_spec.js     |  15 +-
 .../modules/pubperfAnalyticsAdapter_spec.js   |  25 +-
 .../modules/pubstackAnalyticsAdapter_spec.js  |  20 +-
 .../modules/pubwiseAnalyticsAdapter_spec.js   |  32 +--
 .../modules/sigmoidAnalyticsAdapter_spec.js   |  12 +-
 .../modules/sovrnAnalyticsAdapter_spec.js     |  24 +-
 .../modules/yieldoneAnalyticsAdapter_spec.js  |   7 +-
 23 files changed, 359 insertions(+), 414 deletions(-)
 create mode 100644 test/helpers/analytics.js

diff --git a/libraries/analyticsAdapter/AnalyticsAdapter.js b/libraries/analyticsAdapter/AnalyticsAdapter.js
index 277a1455a75..b6e270b3c3c 100644
--- a/libraries/analyticsAdapter/AnalyticsAdapter.js
+++ b/libraries/analyticsAdapter/AnalyticsAdapter.js
@@ -1,47 +1,68 @@
 import CONSTANTS from '../../src/constants.json';
-import { ajax } from '../../src/ajax.js';
-import { logMessage, _each } from '../../src/utils.js';
-import * as events from '../../src/events.js'
+import {ajax} from '../../src/ajax.js';
+import {logError, logMessage} from '../../src/utils.js';
+import * as events from '../../src/events.js';
 
 export const _internal = {
   ajax
 };
-
-const {
-  EVENTS: {
-    AUCTION_INIT,
-    AUCTION_END,
-    REQUEST_BIDS,
-    BID_REQUESTED,
-    BID_TIMEOUT,
-    BID_RESPONSE,
-    NO_BID,
-    BID_WON,
-    BID_ADJUSTMENT,
-    BIDDER_DONE,
-    SET_TARGETING,
-    AD_RENDER_FAILED,
-    AD_RENDER_SUCCEEDED,
-    AUCTION_DEBUG,
-    ADD_AD_UNITS,
-    BILLABLE_EVENT
-  }
-} = CONSTANTS;
-
 const ENDPOINT = 'endpoint';
 const BUNDLE = 'bundle';
 
+export const DEFAULT_INCLUDE_EVENTS = Object.values(CONSTANTS.EVENTS)
+  .filter(ev => ev !== CONSTANTS.EVENTS.AUCTION_DEBUG);
+
+let debounceDelay = 100;
+
+export function setDebounceDelay(delay) {
+  debounceDelay = delay;
+}
+
 export default function AnalyticsAdapter({ url, analyticsType, global, handler }) {
-  const _queue = [];
-  let _eventCount = 0;
-  let _enableCheck = true;
-  let _handlers;
-  let _enabled = false;
-  let _sampled = true;
-
-  if (analyticsType === ENDPOINT || BUNDLE) {
-    _emptyQueue();
-  }
+  const queue = [];
+  let handlers;
+  let enabled = false;
+  let sampled = true;
+  let provider;
+
+  const emptyQueue = (() => {
+    let running = false;
+    let timer;
+    const clearQueue = () => {
+      if (!running) {
+        running = true; // needed to avoid recursive re-processing when analytics event handlers trigger other events
+        try {
+          let i = 0;
+          let notDecreasing = 0;
+          while (queue.length > 0) {
+            i++;
+            const len = queue.length;
+            queue.shift()();
+            if (queue.length >= len) {
+              notDecreasing++;
+            } else {
+              notDecreasing = 0
+            }
+            if (notDecreasing >= 10) {
+              logError('Detected probable infinite loop, discarding events', queue)
+              queue.length = 0;
+              return;
+            }
+          }
+          logMessage(`${provider} analytics: processed ${i} events`);
+        } finally {
+          running = false;
+        }
+      }
+    };
+    return function () {
+      if (timer != null) {
+        clearTimeout(timer);
+        timer = null;
+      }
+      debounceDelay === 0 ? clearQueue() : timer = setTimeout(clearQueue, debounceDelay);
+    }
+  })();
 
   return Object.defineProperties({
     track: _track,
@@ -54,7 +75,7 @@ export default function AnalyticsAdapter({ url, analyticsType, global, handler }
     getUrl: () => url
   }, {
     enabled: {
-      get: () => _enabled
+      get: () => enabled
     }
   });
 
@@ -72,69 +93,58 @@ export default function AnalyticsAdapter({ url, analyticsType, global, handler }
     _internal.ajax(url, callback, JSON.stringify({ eventType, args }));
   }
 
-  function _enqueue({ eventType, args }) {
-    const _this = this;
-
-    if (global && window[global] && eventType && args) {
-      this.track({ eventType, args });
-    } else {
-      _queue.push(function () {
-        _eventCount++;
-        _this.track({ eventType, args });
-      });
-    }
+  function _enqueue({eventType, args}) {
+    queue.push(() => {
+      this.track({eventType, args});
+    });
+    emptyQueue();
   }
 
   function _enable(config) {
+    provider = config?.provider;
     var _this = this;
 
     if (typeof config === 'object' && typeof config.options === 'object') {
-      _sampled = typeof config.options.sampling === 'undefined' || Math.random() < parseFloat(config.options.sampling);
+      sampled = typeof config.options.sampling === 'undefined' || Math.random() < parseFloat(config.options.sampling);
     } else {
-      _sampled = true;
+      sampled = true;
     }
 
-    if (_sampled) {
+    if (sampled) {
+      const trackedEvents = (() => {
+        const {includeEvents = DEFAULT_INCLUDE_EVENTS, excludeEvents = []} = (config || {});
+        return new Set(
+          Object.values(CONSTANTS.EVENTS)
+            .filter(ev => includeEvents.includes(ev))
+            .filter(ev => !excludeEvents.includes(ev))
+        );
+      })();
+
       // first send all events fired before enableAnalytics called
       events.getEvents().forEach(event => {
-        if (!event) {
+        if (!event || !trackedEvents.has(event.eventType)) {
           return;
         }
 
         const { eventType, args } = event;
-
-        if (eventType !== BID_TIMEOUT) {
-          _enqueue.call(_this, { eventType, args });
-        }
+        _enqueue.call(_this, { eventType, args });
       });
 
       // Next register event listeners to send data immediately
-
-      _handlers = {
-        [REQUEST_BIDS]: args => this.enqueue({ eventType: REQUEST_BIDS, args }),
-        [BID_REQUESTED]: args => this.enqueue({ eventType: BID_REQUESTED, args }),
-        [BID_RESPONSE]: args => this.enqueue({ eventType: BID_RESPONSE, args }),
-        [NO_BID]: args => this.enqueue({ eventType: NO_BID, args }),
-        [BID_TIMEOUT]: args => this.enqueue({ eventType: BID_TIMEOUT, args }),
-        [BID_WON]: args => this.enqueue({ eventType: BID_WON, args }),
-        [BID_ADJUSTMENT]: args => this.enqueue({ eventType: BID_ADJUSTMENT, args }),
-        [BIDDER_DONE]: args => this.enqueue({ eventType: BIDDER_DONE, args }),
-        [SET_TARGETING]: args => this.enqueue({ eventType: SET_TARGETING, args }),
-        [AUCTION_END]: args => this.enqueue({ eventType: AUCTION_END, args }),
-        [AD_RENDER_FAILED]: args => this.enqueue({ eventType: AD_RENDER_FAILED, args }),
-        [AD_RENDER_SUCCEEDED]: args => this.enqueue({ eventType: AD_RENDER_SUCCEEDED, args }),
-        [AUCTION_DEBUG]: args => this.enqueue({ eventType: AUCTION_DEBUG, args }),
-        [ADD_AD_UNITS]: args => this.enqueue({ eventType: ADD_AD_UNITS, args }),
-        [BILLABLE_EVENT]: args => this.enqueue({ eventType: BILLABLE_EVENT, args }),
-        [AUCTION_INIT]: args => {
-          args.config = typeof config === 'object' ? config.options || {} : {}; // enableAnaltyics configuration object
-          this.enqueue({ eventType: AUCTION_INIT, args });
-        }
-      };
-
-      _each(_handlers, (handler, event) => {
-        events.on(event, handler);
-      });
+      handlers = Object.fromEntries(
+        Array.from(trackedEvents)
+          .map((ev) => {
+            const handler = ev === CONSTANTS.EVENTS.AUCTION_INIT
+              ? (args) => {
+                // TODO: remove this special case in v8
+                args.config = typeof config === 'object' ? config.options || {} : {};
+                this.enqueue({eventType: ev, args});
+              }
+              : (args) => this.enqueue({eventType: ev, args});
+            events.on(ev, handler);
+            return [ev, handler];
+          })
+      )
     } else {
       logMessage(`Analytics adapter for "${global}" disabled by sampling`);
     }
@@ -144,31 +154,14 @@ export default function AnalyticsAdapter({ url, analyticsType, global, handler }
     this.enableAnalytics = function _enable() {
       return logMessage(`Analytics adapter for "${global}" already enabled, unnecessary call to \`enableAnalytics\`.`);
     };
-    _enabled = true;
+    enabled = true;
   }
 
   function _disable() {
-    _each(_handlers, (handler, event) => {
+    Object.entries(handlers || {}).forEach(([event, handler]) => {
       events.off(event, handler);
-    });
+    })
     this.enableAnalytics = this._oldEnable ? this._oldEnable : _enable;
-    _enabled = false;
-  }
-
-  function _emptyQueue() {
-    if (_enableCheck) {
-      for (var i = 0; i < _queue.length; i++) {
-        _queue[i]();
-      }
-
-      // override push to execute the command immediately from now on
-      _queue.push = function (fn) {
-        fn();
-      };
-
-      _enableCheck = false;
-    }
-
-    logMessage(`event count sent to ${global}: ${_eventCount}`);
+    enabled = false;
   }
 }
diff --git a/src/events.js b/src/events.js
index 8e6117c3abf..62f8c070deb 100644
--- a/src/events.js
+++ b/src/events.js
@@ -157,3 +157,7 @@ const _public = (function () {
 utils._setEventEmitter(_public.emit.bind(_public));
 
 export const {on, off, get, getEvents, emit, addEvents} = _public;
+
+export function clearEvents() {
+  eventsFired.length = 0;
+}
diff --git a/test/helpers/analytics.js b/test/helpers/analytics.js
new file mode 100644
index 00000000000..b376118dc6f
--- /dev/null
+++ b/test/helpers/analytics.js
@@ -0,0 +1,34 @@
+import * as pbEvents from 'src/events.js';
+import constants from '../../src/constants.json';
+
+export function fireEvents(events = [
+  constants.EVENTS.AUCTION_INIT,
+  constants.EVENTS.AUCTION_END,
+  constants.EVENTS.BID_REQUESTED,
+  constants.EVENTS.BID_RESPONSE,
+  constants.EVENTS.BID_WON
+]) {
+  return events.map((ev, i) => {
+    ev = Array.isArray(ev) ? ev : [ev, {i: i}];
+    pbEvents.emit.apply(null, ev)
+    return ev;
+  });
+}
+
+export function expectEvents(events) {
+  events = fireEvents(events);
+  return {
+    to: {
+      beTrackedBy(trackFn) {
+        events.forEach(([eventType, args]) => {
+          sinon.assert.calledWithMatch(trackFn, sinon.match({eventType, args}));
+        });
+      },
+      beBundledTo(bundleFn) {
+        events.forEach(([eventType, args]) => {
+          sinon.assert.calledWithMatch(bundleFn, sinon.match.any, eventType, sinon.match(args))
+        });
+      },
+    },
+  };
+}
diff --git a/test/mocks/analyticsStub.js b/test/mocks/analyticsStub.js
index 8507c5a6275..98e0f56688f 100644
--- a/test/mocks/analyticsStub.js
+++ b/test/mocks/analyticsStub.js
@@ -1,8 +1,10 @@
-import {_internal} from '../../libraries/analyticsAdapter/AnalyticsAdapter.js';
+import {_internal, setDebounceDelay} from '../../libraries/analyticsAdapter/AnalyticsAdapter.js';
 
 before(() => {
   // stub out analytics networking to avoid random events polluting the global xhr mock
   disableAjaxForAnalytics();
+  // make analytics event handling synchronous
+  setDebounceDelay(0);
 })
 
 export function disableAjaxForAnalytics() {
diff --git a/test/spec/AnalyticsAdapter_spec.js b/test/spec/AnalyticsAdapter_spec.js
index 06ab8838985..62c00e04403 100644
--- a/test/spec/AnalyticsAdapter_spec.js
+++ b/test/spec/AnalyticsAdapter_spec.js
@@ -1,18 +1,17 @@
-import { expect } from 'chai';
+import {expect} from 'chai';
 import * as events from 'src/events.js';
 import CONSTANTS from 'src/constants.json';
-import { server } from 'test/mocks/xhr.js';
+import {server} from 'test/mocks/xhr.js';
 import {disableAjaxForAnalytics, enableAjaxForAnalytics} from '../mocks/analyticsStub.js';
+import {clearEvents} from 'src/events.js';
+import {
+  DEFAULT_EXCLUDE_EVENTS,
+  DEFAULT_INCLUDE_EVENTS,
+  setDebounceDelay
+} from '../../libraries/analyticsAdapter/AnalyticsAdapter.js';
 
-const REQUEST_BIDS = CONSTANTS.EVENTS.REQUEST_BIDS;
-const BID_REQUESTED = CONSTANTS.EVENTS.BID_REQUESTED;
-const BID_RESPONSE = CONSTANTS.EVENTS.BID_RESPONSE;
 const BID_WON = CONSTANTS.EVENTS.BID_WON;
-const BID_TIMEOUT = CONSTANTS.EVENTS.BID_TIMEOUT;
-const AD_RENDER_FAILED = CONSTANTS.EVENTS.AD_RENDER_FAILED;
-const AD_RENDER_SUCCEEDED = CONSTANTS.EVENTS.AD_RENDER_SUCCEEDED;
-const AUCTION_DEBUG = CONSTANTS.EVENTS.AUCTION_DEBUG;
-const ADD_AD_UNITS = CONSTANTS.EVENTS.ADD_AD_UNITS;
+const NO_BID = CONSTANTS.EVENTS.NO_BID;
 
 const AnalyticsAdapter = require('libraries/analyticsAdapter/AnalyticsAdapter.js').default;
 const config = {
@@ -35,6 +34,7 @@ FEATURE: Analytics Adapters API
 
   afterEach(function () {
     adapter.disableAnalytics();
+    clearEvents();
   });
 
   it('should track enable status in `enabled`', () => {
@@ -43,21 +43,21 @@ FEATURE: Analytics Adapters API
     expect(adapter.enabled).to.equal(true);
     adapter.disableAnalytics();
     expect(adapter.enabled).to.equal(false);
-  })
+  });
 
   it(`SHOULD call the endpoint WHEN an event occurs that is to be tracked`, function () {
-    const eventType = BID_REQUESTED;
-    const args = { some: 'data' };
+    const eventType = BID_WON;
+    const args = {some: 'data'};
 
-    adapter.track({ eventType, args });
+    adapter.track({eventType, args});
 
     let result = JSON.parse(server.requests[0].requestBody);
-    expect(result).to.deep.equal({args: {some: 'data'}, eventType: 'bidRequested'});
+    expect(result).to.deep.equal({args: {some: 'data'}, eventType});
   });
 
   it(`SHOULD queue the event first and then track it WHEN an event occurs before tracking library is available`, function () {
-    const eventType = BID_RESPONSE;
-    const args = { wat: 'wot' };
+    const eventType = BID_WON;
+    const args = {wat: 'wot'};
 
     events.emit(eventType, args);
     adapter.enableAnalytics();
@@ -65,9 +65,58 @@ FEATURE: Analytics Adapters API
     // As now AUCTION_DEBUG is triggered for WARNINGS too, the BID_RESPONSE goes last in the array
     const index = server.requests.length - 1;
     let result = JSON.parse(server.requests[index].requestBody);
-    expect(result).to.deep.equal({eventType: 'bidResponse', args: {wat: 'wot'}});
+    expect(result).to.deep.equal({eventType, args: {wat: 'wot'}});
   });
 
+  describe('event filters', () => {
+    function fireEvents() {
+      events.emit(BID_WON, {});
+      events.emit(NO_BID, {});
+    }
+    function getEvents(ev) {
+      return server.requests
+        .map(r => JSON.parse(r.requestBody))
+        .filter(r => r.eventType === ev)
+    }
+
+    Object.entries({
+      'whitelist includeEvents': {
+        includeEvents: [BID_WON]
+      },
+      'blacklist excludeEvents': {
+        excludeEvents: [NO_BID]
+      },
+      'give precedence to exclude over include': {
+        includeEvents: [BID_WON, NO_BID],
+        excludeEvents: [NO_BID]
+      }
+    }).forEach(([t, config]) => {
+      it(`should ${t}`, () => {
+        fireEvents();
+        adapter.enableAnalytics(config);
+        expect(getEvents(BID_WON).length).to.eql(1);
+        expect(getEvents(NO_BID).length).to.eql(0);
+        fireEvents();
+        expect(getEvents(BID_WON).length).to.eql(2);
+        expect(getEvents(NO_BID).length).to.eql(0);
+      })
+    })
+  })
+
+  it('should prevent infinite loops when track triggers other events', () => {
+    let i = 0;
+    adapter.track = ((orig) => {
+      return function (event) {
+        i++;
+        orig.call(this, event);
+        events.emit(BID_WON, {})
+      }
+    })(adapter.track);
+    adapter.enableAnalytics(config);
+    events.emit(BID_WON, {});
+    expect(i >= 100).to.eql(false);
+  })
+
   describe(`WHEN an event occurs after enable analytics\n`, function () {
     beforeEach(function () {
       sinon.stub(events, 'getEvents').returns([]); // these tests shouldn't be affected by previous tests
@@ -77,108 +126,26 @@ FEATURE: Analytics Adapters API
       events.getEvents.restore();
     });
 
-    it('SHOULD call global when a bidWon event occurs', function () {
-      const eventType = BID_WON;
-      const args = { more: 'info' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
-
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {more: 'info'}, eventType: 'bidWon'});
-    });
-
-    it('SHOULD call global when a adRenderFailed event occurs', function () {
-      const eventType = AD_RENDER_FAILED;
-      const args = { call: 'adRenderFailed' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
-
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'adRenderFailed'}, eventType: 'adRenderFailed'});
-    });
-
-    it('SHOULD call global when a adRenderSucceeded event occurs', function () {
-      const eventType = AD_RENDER_SUCCEEDED;
-      const args = { call: 'adRenderSucceeded' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
-
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'adRenderSucceeded'}, eventType: 'adRenderSucceeded'});
-    });
-
-    it('SHOULD call global when an auction debug event occurs', function () {
-      const eventType = AUCTION_DEBUG;
-      const args = { call: 'auctionDebug' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
-
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'auctionDebug'}, eventType: 'auctionDebug'});
-    });
-
-    it('SHOULD call global when an addAdUnits event occurs', function () {
-      const eventType = ADD_AD_UNITS;
-      const args = { call: 'addAdUnits' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
-
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'addAdUnits'}, eventType: 'addAdUnits'});
-    });
-
-    it('SHOULD call global when a requestBids event occurs', function () {
-      const eventType = REQUEST_BIDS;
-      const args = { call: 'request' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
-
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'request'}, eventType: 'requestBids'});
-    });
-
-    it('SHOULD call global when a bidRequest event occurs', function () {
-      const eventType = BID_REQUESTED;
-      const args = { call: 'request' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
-
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'request'}, eventType: 'bidRequested'});
-    });
-
-    it('SHOULD call global when a bidResponse event occurs', function () {
-      const eventType = BID_RESPONSE;
-      const args = { call: 'response' };
-
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
-
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'response'}, eventType: 'bidResponse'});
-    });
-
-    it('SHOULD call global when a bidTimeout event occurs', function () {
-      const eventType = BID_TIMEOUT;
-      const args = { call: 'timeout' };
+    Object.values(DEFAULT_INCLUDE_EVENTS).forEach(eventType => {
+      it(`SHOULD call global when a ${eventType} event occurs`, () => {
+        const args = {more: 'info'};
 
-      adapter.enableAnalytics();
-      events.emit(eventType, args);
+        adapter.enableAnalytics();
+        events.emit(eventType, args);
 
-      let result = JSON.parse(server.requests[0].requestBody);
-      expect(result).to.deep.equal({args: {call: 'timeout'}, eventType: 'bidTimeout'});
+        let result = JSON.parse(server.requests[server.requests.length - 1].requestBody);
+        sinon.assert.match(result, {
+          eventType,
+          args: {
+            more: 'info'
+          },
+        });
+      });
     });
 
     it('SHOULD NOT call global again when adapter.enableAnalytics is called with previous timeout', function () {
-      const eventType = BID_TIMEOUT;
-      const args = { call: 'timeout' };
+      const eventType = BID_WON;
+      const args = {call: 'timeout'};
 
       events.emit(eventType, args);
       adapter.enableAnalytics();
@@ -189,7 +156,7 @@ FEATURE: Analytics Adapters API
 
     describe(`AND sampling is enabled\n`, function () {
       const eventType = BID_WON;
-      const args = { more: 'info' };
+      const args = {more: 'info'};
 
       beforeEach(function () {
         sinon.stub(Math, 'random').returns(0.5);
@@ -225,3 +192,39 @@ FEATURE: Analytics Adapters API
     });
   });
 });
+
+describe('Analytics asynchronous event tracking', () => {
+  before(() => {
+    setDebounceDelay(100);
+  });
+  after(() => {
+    setDebounceDelay(0);
+  });
+
+  let adapter, clock;
+
+  beforeEach(() => {
+    clock = sinon.useFakeTimers();
+    adapter = new AnalyticsAdapter(config);
+    adapter.track = sinon.stub();
+    adapter.enableAnalytics({});
+  });
+
+  afterEach(() => {
+    clock.restore();
+  })
+
+  it('does not call track as long as events are coming', () => {
+    events.emit(BID_WON, {i: 0});
+    sinon.assert.notCalled(adapter.track);
+    clock.tick(10);
+    events.emit(BID_WON, {i: 1});
+    sinon.assert.notCalled(adapter.track);
+    clock.tick(10);
+    sinon.assert.notCalled(adapter.track);
+    clock.tick(100);
+    sinon.assert.calledTwice(adapter.track);
+    sinon.assert.calledWith(adapter.track.firstCall, {eventType: BID_WON, args: {i: 0}});
+    sinon.assert.calledWith(adapter.track.secondCall, {eventType: BID_WON, args: {i: 1}});
+  });
+})
diff --git a/test/spec/modules/adWMGAnalyticsAdapter_spec.js b/test/spec/modules/adWMGAnalyticsAdapter_spec.js
index ab8336c7126..1e0da1bb3c8 100644
--- a/test/spec/modules/adWMGAnalyticsAdapter_spec.js
+++ b/test/spec/modules/adWMGAnalyticsAdapter_spec.js
@@ -1,6 +1,7 @@
 import adWMGAnalyticsAdapter from 'modules/adWMGAnalyticsAdapter.js';
 import { expect } from 'chai';
 import { server } from 'test/mocks/xhr.js';
+import {expectEvents} from '../../helpers/analytics.js';
 let adapterManager = require('src/adapterManager').default;
 let events = require('src/events');
 let constants = require('src/constants.json');
@@ -140,14 +141,15 @@ describe('adWMG Analytics', function () {
         }
       });
 
-      events.emit(constants.EVENTS.AUCTION_INIT, {timestamp, auctionId, timeout, adUnits});
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
-      events.emit(constants.EVENTS.NO_BID, {});
-      events.emit(constants.EVENTS.BID_TIMEOUT, bidTimeoutArgs);
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_WON, wonRequest);
-      sinon.assert.callCount(adWMGAnalyticsAdapter.track, 7);
+      expectEvents([
+        [constants.EVENTS.AUCTION_INIT, {timestamp, auctionId, timeout, adUnits}],
+        [constants.EVENTS.BID_REQUESTED, {}],
+        [constants.EVENTS.BID_RESPONSE, bidResponse],
+        [constants.EVENTS.NO_BID, {}],
+        [constants.EVENTS.BID_TIMEOUT, bidTimeoutArgs],
+        [constants.EVENTS.AUCTION_END, {}],
+        [constants.EVENTS.BID_WON, wonRequest],
+      ]).to.beTrackedBy(adWMGAnalyticsAdapter.track);
     });
 
     it('should be two xhr requests', function () {
diff --git a/test/spec/modules/adagioAnalyticsAdapter_spec.js b/test/spec/modules/adagioAnalyticsAdapter_spec.js
index aee85412104..581f3cb1b87 100644
--- a/test/spec/modules/adagioAnalyticsAdapter_spec.js
+++ b/test/spec/modules/adagioAnalyticsAdapter_spec.js
@@ -83,34 +83,27 @@ describe('adagio analytics adapter', () => {
         timeToRespond: 132,
       };
 
-      // Step 1: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, bidRequest);
+      const testEvents = {
+        [constants.EVENTS.BID_REQUESTED]: bidRequest,
+        [constants.EVENTS.BID_RESPONSE]: bidResponse,
+        [constants.EVENTS.AUCTION_END]: {}
+      };
 
-      // Step 2: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, bidResponse);
+      // Step 1-3: Send events
+      Object.entries(testEvents).forEach(([ev, payload]) => events.emit(ev, payload));
 
-      // Step 3: Send auction end event
-      events.emit(constants.EVENTS.AUCTION_END, {});
+      function eventItem(eventName, args) {
+        return sinon.match({
+          action: 'pb-analytics-event',
+          ts: sinon.match((val) => val !== undefined),
+          data: {
+            eventName,
+            args
+          }
+        })
+      }
 
-      sandbox.assert.callCount(adagioQueuePushSpy, 3);
-
-      const call0 = adagioQueuePushSpy.getCall(0);
-      expect(call0.args[0].action).to.equal('pb-analytics-event');
-      expect(call0.args[0].ts).to.not.be.undefined;
-      expect(call0.args[0].data).to.not.be.undefined;
-      expect(call0.args[0].data).to.deep.equal({eventName: constants.EVENTS.BID_REQUESTED, args: bidRequest});
-
-      const call1 = adagioQueuePushSpy.getCall(1);
-      expect(call1.args[0].action).to.equal('pb-analytics-event');
-      expect(call1.args[0].ts).to.not.be.undefined;
-      expect(call1.args[0].data).to.not.be.undefined;
-      expect(call1.args[0].data).to.deep.equal({eventName: constants.EVENTS.BID_RESPONSE, args: bidResponse});
-
-      const call2 = adagioQueuePushSpy.getCall(2);
-      expect(call2.args[0].action).to.equal('pb-analytics-event');
-      expect(call2.args[0].ts).to.not.be.undefined;
-      expect(call2.args[0].data).to.not.be.undefined;
-      expect(call2.args[0].data).to.deep.equal({eventName: constants.EVENTS.AUCTION_END, args: {}});
+      Object.entries(testEvents).forEach(([ev, payload]) => sinon.assert.calledWith(adagioQueuePushSpy, eventItem(ev, payload)));
     });
   });
 
diff --git a/test/spec/modules/bidwatchAnalyticsAdapter_spec.js b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
index 9e9d7dbe156..a72bb012fa1 100644
--- a/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
+++ b/test/spec/modules/bidwatchAnalyticsAdapter_spec.js
@@ -297,7 +297,6 @@ describe('BidWatch Analytics', function () {
       expect(message.auctionEnd[0]).to.have.property('bidderRequests').and.to.have.lengthOf(1);
       expect(message.auctionEnd[0].bidderRequests[0]).to.have.property('gdprConsent');
       expect(message.auctionEnd[0].bidderRequests[0].gdprConsent).not.to.have.property('vendorData');
-      sinon.assert.callCount(bidwatchAnalytics.track, 4);
     });
 
     it('test bidWon', function() {
@@ -318,7 +317,6 @@ describe('BidWatch Analytics', function () {
       expect(message).not.to.have.property('ad');
       expect(message).to.have.property('adId')
       expect(message).to.have.property('cpmIncrement').and.to.equal(27.4276);
-      sinon.assert.callCount(bidwatchAnalytics.track, 1);
     });
   });
 });
diff --git a/test/spec/modules/concertAnalyticsAdapter_spec.js b/test/spec/modules/concertAnalyticsAdapter_spec.js
index d130aea6043..1df73ae04fe 100644
--- a/test/spec/modules/concertAnalyticsAdapter_spec.js
+++ b/test/spec/modules/concertAnalyticsAdapter_spec.js
@@ -1,5 +1,6 @@
 import concertAnalytics from 'modules/concertAnalyticsAdapter.js';
 import { expect } from 'chai';
+import {expectEvents} from '../../helpers/analytics.js';
 const sinon = require('sinon');
 let adapterManager = require('src/adapterManager').default;
 let events = require('src/events');
@@ -46,10 +47,7 @@ describe('ConcertAnalyticsAdapter', function() {
 
     it('should catch all events', function() {
       sandbox.spy(concertAnalytics, 'track');
-
-      fireBidEvents(events);
-      // 5 Concert events + 1 Clean.io event
-      sandbox.assert.callCount(concertAnalytics.track, 6);
+      expectEvents().to.beTrackedBy(concertAnalytics.track);
     });
 
     it('should report data for BID_RESPONSE, BID_WON events', function() {
diff --git a/test/spec/modules/eplanningAnalyticsAdapter_spec.js b/test/spec/modules/eplanningAnalyticsAdapter_spec.js
index bb9e6c4fb86..419181de983 100644
--- a/test/spec/modules/eplanningAnalyticsAdapter_spec.js
+++ b/test/spec/modules/eplanningAnalyticsAdapter_spec.js
@@ -152,9 +152,6 @@ describe('eplanning analytics adapter', function () {
 
       // Step 10 check that the host to send the ajax request is configurable via options
       expect(eplAnalyticsAdapter.context.host).to.equal(initOptions.host);
-
-      // Step 11 verify that we received 7 events (6 E-Planning events + 1 Clean.io event)
-      sinon.assert.callCount(eplAnalyticsAdapter.track, 7);
     });
   });
 });
diff --git a/test/spec/modules/invisiblyAnalyticsAdapter_spec.js b/test/spec/modules/invisiblyAnalyticsAdapter_spec.js
index d97b0925713..3b3542d43b0 100644
--- a/test/spec/modules/invisiblyAnalyticsAdapter_spec.js
+++ b/test/spec/modules/invisiblyAnalyticsAdapter_spec.js
@@ -1,5 +1,6 @@
 import invisiblyAdapter from 'modules/invisiblyAnalyticsAdapter.js';
 import { expect } from 'chai';
+import {expectEvents} from '../../helpers/analytics.js';
 let events = require('src/events');
 let constants = require('src/constants.json');
 
@@ -197,14 +198,8 @@ describe('Invisibly Analytics Adapter test suite', function () {
               account: 'invisibly',
             },
           });
-          events.emit(constants.EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT);
-          events.emit(constants.EVENTS.AUCTION_END, MOCK.AUCTION_END);
-          events.emit(constants.EVENTS.BID_REQUESTED, MOCK.BID_REQUESTED);
-          events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE);
-          events.emit(constants.EVENTS.BID_WON, MOCK.BID_WON);
 
-          // 5 Invisibly events + 1 Clean.io event
-          sinon.assert.callCount(invisiblyAdapter.track, 6);
+          expectEvents().to.beTrackedBy(invisiblyAdapter.track);
         });
 
         it('should not catch events triggered without invisibly account config', function () {
@@ -382,9 +377,6 @@ describe('Invisibly Analytics Adapter test suite', function () {
         expect(invisiblyEvents.event_data.pageViewId).to.exist;
         expect(invisiblyEvents.event_data.ver).to.equal(1);
         expect(invisiblyEvents.event_type).to.equal('PREBID_bidWon');
-
-        // 1 Invisibly event + 1 Clean.io event
-        sinon.assert.callCount(invisiblyAdapter.track, 2);
       });
 
       // spec for bidder done event
@@ -522,7 +514,6 @@ describe('Invisibly Analytics Adapter test suite', function () {
         expect(invisiblyEvents.event_data.auctionId).to.equal(
           MOCK.AUCTION_END.auctionId
         );
-        sinon.assert.callCount(invisiblyAdapter.track, 1);
       });
 
       // should not call sendEvent for events not supported by the adapter
@@ -541,22 +532,21 @@ describe('Invisibly Analytics Adapter test suite', function () {
       it('track all event without errors', function () {
         invisiblyAdapter.enableAnalytics(MOCK.config);
 
-        events.emit(constants.EVENTS.AUCTION_INIT, MOCK.AUCTION_INIT);
-        events.emit(constants.EVENTS.AUCTION_END, MOCK.AUCTION_END);
-        events.emit(constants.EVENTS.BID_ADJUSTMENT, MOCK.BID_ADJUSTMENT);
-        events.emit(constants.EVENTS.BID_TIMEOUT, MOCK.BID_TIMEOUT);
-        events.emit(constants.EVENTS.BID_REQUESTED, MOCK.BID_REQUESTED);
-        events.emit(constants.EVENTS.BID_RESPONSE, MOCK.BID_RESPONSE);
-        events.emit(constants.EVENTS.NO_BID, MOCK.NO_BID);
-        events.emit(constants.EVENTS.BID_WON, MOCK.BID_WON);
-        events.emit(constants.EVENTS.BIDDER_DONE, MOCK.BIDDER_DONE);
-        events.emit(constants.EVENTS.SET_TARGETING, MOCK.SET_TARGETING);
-        events.emit(constants.EVENTS.REQUEST_BIDS, MOCK.REQUEST_BIDS);
-        events.emit(constants.EVENTS.ADD_AD_UNITS, MOCK.ADD_AD_UNITS);
-        events.emit(constants.EVENTS.AD_RENDER_FAILED, MOCK.AD_RENDER_FAILED);
-
-        // 13 Invisibly events + 1 Clean.io event
-        sinon.assert.callCount(invisiblyAdapter.track, 14);
+        expectEvents([
+          constants.EVENTS.AUCTION_INIT,
+          constants.EVENTS.AUCTION_END,
+          constants.EVENTS.BID_ADJUSTMENT,
+          constants.EVENTS.BID_TIMEOUT,
+          constants.EVENTS.BID_REQUESTED,
+          constants.EVENTS.BID_RESPONSE,
+          constants.EVENTS.NO_BID,
+          constants.EVENTS.BID_WON,
+          constants.EVENTS.BIDDER_DONE,
+          constants.EVENTS.SET_TARGETING,
+          constants.EVENTS.REQUEST_BIDS,
+          constants.EVENTS.ADD_AD_UNITS,
+          constants.EVENTS.AD_RENDER_FAILED
+        ]).to.beTrackedBy(invisiblyAdapter.track);
       });
     });
 
diff --git a/test/spec/modules/konduitAnalyticsAdapter_spec.js b/test/spec/modules/konduitAnalyticsAdapter_spec.js
index 1612138cde4..e79ae2feeeb 100644
--- a/test/spec/modules/konduitAnalyticsAdapter_spec.js
+++ b/test/spec/modules/konduitAnalyticsAdapter_spec.js
@@ -121,7 +121,5 @@ describe(`Konduit Analytics Adapter`, () => {
     expect(requestBody.konduitId).to.be.equal(konduitId);
     expect(requestBody.prebidVersion).to.be.equal('$prebid.version$');
     expect(requestBody.environment).to.be.an('object');
-    // 6 Konduit events + 1 Clean.io event
-    sinon.assert.callCount(konduitAnalyticsAdapter.track, 7);
   });
 });
diff --git a/test/spec/modules/liveIntentAnalyticsAdapter_spec.js b/test/spec/modules/liveIntentAnalyticsAdapter_spec.js
index b3a452e5ece..fa4c5cd8cad 100644
--- a/test/spec/modules/liveIntentAnalyticsAdapter_spec.js
+++ b/test/spec/modules/liveIntentAnalyticsAdapter_spec.js
@@ -2,6 +2,7 @@ import liAnalytics from 'modules/liveIntentAnalyticsAdapter';
 import { expect } from 'chai';
 import { server } from 'test/mocks/xhr.js';
 import { auctionManager } from 'src/auctionManager.js';
+import {expectEvents} from '../../helpers/analytics.js';
 
 let utils = require('src/utils');
 let refererDetection = require('src/refererDetection');
@@ -286,12 +287,8 @@ describe('LiveIntent Analytics Adapter ', () => {
   });
 
   it('track is called', () => {
-    liAnalytics.enableAnalytics(config);
     sandbox.stub(liAnalytics, 'track');
-    events.emit(constants.EVENTS.AUCTION_END, args);
-    events.emit(constants.EVENTS.AUCTION_END, args);
-    events.emit(constants.EVENTS.AUCTION_END, args);
-    clock.tick(6000);
-    sinon.assert.callCount(liAnalytics.track, 3)
+    liAnalytics.enableAnalytics(config);
+    expectEvents().to.beTrackedBy(liAnalytics.track);
   })
 });
diff --git a/test/spec/modules/medianetAnalyticsAdapter_spec.js b/test/spec/modules/medianetAnalyticsAdapter_spec.js
index b75437f2ccd..c408f23c4f4 100644
--- a/test/spec/modules/medianetAnalyticsAdapter_spec.js
+++ b/test/spec/modules/medianetAnalyticsAdapter_spec.js
@@ -3,6 +3,7 @@ import medianetAnalytics from 'modules/medianetAnalyticsAdapter.js';
 import * as utils from 'src/utils.js';
 import CONSTANTS from 'src/constants.json';
 import * as events from 'src/events.js';
+import {clearEvents} from 'src/events.js';
 
 const {
   EVENTS: { AUCTION_INIT, BID_REQUESTED, BID_RESPONSE, NO_BID, BID_TIMEOUT, AUCTION_END, SET_TARGETING, BID_WON }
@@ -127,7 +128,12 @@ describe('Media.net Analytics Adapter', function() {
     options: {
       cid: CUSTOMER_ID
     }
-  };
+  }
+
+  before(() => {
+    clearEvents();
+  });
+
   beforeEach(function () {
     sandbox = sinon.sandbox.create();
   });
diff --git a/test/spec/modules/optimonAnalyticsAdapter_spec.js b/test/spec/modules/optimonAnalyticsAdapter_spec.js
index 406e9cb75c4..f1aa00334b5 100644
--- a/test/spec/modules/optimonAnalyticsAdapter_spec.js
+++ b/test/spec/modules/optimonAnalyticsAdapter_spec.js
@@ -4,6 +4,7 @@ import optimonAnalyticsAdapter from '../../../modules/optimonAnalyticsAdapter.js
 import adapterManager from 'src/adapterManager';
 import * as events from 'src/events';
 import constants from 'src/constants.json'
+import {expectEvents} from '../../helpers/analytics.js';
 
 const AD_UNIT_CODE = 'demo-adunit-1';
 const PUBLISHER_CONFIG = {
@@ -14,14 +15,12 @@ const PUBLISHER_CONFIG = {
 
 describe('Optimon Analytics Adapter', () => {
   const optmn_currentWindow = utils.getWindowSelf();
-  let optmn_queue = [];
 
   beforeEach(() => {
-    optmn_currentWindow.OptimonAnalyticsAdapter = (...optmn_args) => optmn_queue.push(optmn_args);
+    optmn_currentWindow.OptimonAnalyticsAdapter = sinon.stub()
     adapterManager.enableAnalytics({
       provider: 'optimon'
     });
-    optmn_queue = []
   });
 
   afterEach(() => {
@@ -29,13 +28,6 @@ describe('Optimon Analytics Adapter', () => {
   });
 
   it('should forward all events to the queue', () => {
-    const optmn_arguments = [AD_UNIT_CODE, PUBLISHER_CONFIG];
-
-    events.emit(constants.EVENTS.AUCTION_END, optmn_arguments)
-    events.emit(constants.EVENTS.BID_TIMEOUT, optmn_arguments)
-    events.emit(constants.EVENTS.BID_WON, optmn_arguments)
-
-    // 3 Optimon events + 1 Clean.io event
-    expect(optmn_queue.length).to.eql(4);
+    expectEvents().to.beBundledTo(optmn_currentWindow.OptimonAnalyticsAdapter);
   });
 });
diff --git a/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js b/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js
index 49b048f1fe6..0c4949264a7 100644
--- a/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pianoDmpAnalyticsAdapter_spec.js
@@ -52,19 +52,12 @@ describe('Piano DMP Analytics Adapter', () => {
 
       // Then
       const callQueue = (window.cX || {}).callQueue;
-      const billableEventIndex = callQueue.findIndex(([, params]) => params.eventType === constants.EVENTS.BILLABLE_EVENT);
-      if (billableEventIndex > -1) {
-        callQueue.splice(billableEventIndex, 1);
-      }
 
-      expect(callQueue).to.be.an('array');
-      expect(callQueue.length).to.equal(testEvents.length);
-
-      callQueue.forEach(([method, params], index) => {
+      testEvents.forEach(({event, args}) => {
+        const [method, params] = callQueue.filter(item => item[1].eventType === event)[0];
         expect(method).to.equal('prebid');
-        expect(params.eventType).to.equal(testEvents[index].event);
-        expect(params.params).to.deep.equal(testEvents[index].args);
-      });
+        expect(params.params).to.deep.equal(args);
+      })
     });
   });
 });
diff --git a/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js b/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
index 2e1bf4df062..522a78627d7 100644
--- a/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
+++ b/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
@@ -1,9 +1,8 @@
-import prebidmanagerAnalytics, {
-  storage
-} from 'modules/prebidmanagerAnalyticsAdapter.js';
+import prebidmanagerAnalytics, {storage} from 'modules/prebidmanagerAnalyticsAdapter.js';
 import {expect} from 'chai';
 import {server} from 'test/mocks/xhr.js';
 import * as utils from 'src/utils.js';
+import {expectEvents} from '../../helpers/analytics.js';
 
 let events = require('src/events');
 let constants = require('src/constants.json');
@@ -95,15 +94,7 @@ describe('Prebid Manager Analytics Adapter', function () {
         }
       });
 
-      events.emit(constants.EVENTS.AUCTION_INIT, {});
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, {});
-      events.emit(constants.EVENTS.BID_WON, {});
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_TIMEOUT, {});
-
-      // 6 Prebid Manager events + 1 Clean.io event
-      sinon.assert.callCount(prebidmanagerAnalytics.track, 7);
+      expectEvents().to.beTrackedBy(prebidmanagerAnalytics.track);
     });
   });
 
diff --git a/test/spec/modules/pubperfAnalyticsAdapter_spec.js b/test/spec/modules/pubperfAnalyticsAdapter_spec.js
index 160529125d3..9949d87a2bc 100644
--- a/test/spec/modules/pubperfAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubperfAnalyticsAdapter_spec.js
@@ -1,9 +1,10 @@
 import pubperfAnalytics from 'modules/pubperfAnalyticsAdapter.js';
-import { expect } from 'chai';
-import { server } from 'test/mocks/xhr.js';
+import {expect} from 'chai';
+import {server} from 'test/mocks/xhr.js';
+import {expectEvents, fireEvents} from '../../helpers/analytics.js';
+
 let events = require('src/events');
 let utils = require('src/utils.js');
-let constants = require('src/constants.json');
 
 describe('Pubperf Analytics Adapter', function() {
   describe('Prebid Manager Analytic tests', function() {
@@ -22,13 +23,7 @@ describe('Pubperf Analytics Adapter', function() {
         provider: 'pubperf'
       });
 
-      events.emit(constants.EVENTS.AUCTION_INIT, {});
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, {});
-      events.emit(constants.EVENTS.BID_WON, {});
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_TIMEOUT, {});
-
+      fireEvents();
       expect(server.requests.length).to.equal(0);
       expect(utils.logError.called).to.equal(true);
     });
@@ -42,15 +37,7 @@ describe('Pubperf Analytics Adapter', function() {
         provider: 'pubperf'
       });
 
-      events.emit(constants.EVENTS.AUCTION_INIT, {});
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, {});
-      events.emit(constants.EVENTS.BID_WON, {});
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_TIMEOUT, {});
-
-      // 6 Pubperf events + 1 Clean.io event
-      sinon.assert.callCount(pubperfAnalytics.track, 7);
+      expectEvents().to.beTrackedBy(pubperfAnalytics.track);
     });
   });
 });
diff --git a/test/spec/modules/pubstackAnalyticsAdapter_spec.js b/test/spec/modules/pubstackAnalyticsAdapter_spec.js
index 3d01a0bb506..fe7441e91e5 100644
--- a/test/spec/modules/pubstackAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubstackAnalyticsAdapter_spec.js
@@ -3,17 +3,16 @@ import pubstackAnalytics from '../../../modules/pubstackAnalyticsAdapter.js';
 import adapterManager from 'src/adapterManager';
 import * as events from 'src/events';
 import constants from 'src/constants.json'
+import {expectEvents} from '../../helpers/analytics.js';
 
 describe('Pubstack Analytics Adapter', () => {
   const scope = utils.getWindowSelf();
-  let queue = [];
 
   beforeEach(() => {
-    scope.PubstackAnalytics = (...args) => queue.push(args);
+    scope.PubstackAnalytics = sinon.stub();
     adapterManager.enableAnalytics({
       provider: 'pubstack'
     });
-    queue = []
   });
 
   afterEach(() => {
@@ -21,19 +20,6 @@ describe('Pubstack Analytics Adapter', () => {
   });
 
   it('should forward all events to the queue', () => {
-    // Given
-    const args = 'any-args'
-
-    // When
-    events.emit(constants.EVENTS.AUCTION_END, args)
-    events.emit(constants.EVENTS.BID_REQUESTED, args)
-    events.emit(constants.EVENTS.BID_ADJUSTMENT, args)
-    events.emit(constants.EVENTS.BID_RESPONSE, args)
-    events.emit(constants.EVENTS.BID_WON, args)
-    events.emit(constants.EVENTS.NO_BID, args)
-
-    // Then
-    // 6 Pubstack events + 1 Clean.io event
-    expect(queue.length).to.eql(7);
+    expectEvents().to.beBundledTo(scope.PubstackAnalytics);
   });
 });
diff --git a/test/spec/modules/pubwiseAnalyticsAdapter_spec.js b/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
index dd5c223b767..e14582edc39 100644
--- a/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
@@ -1,6 +1,7 @@
-import { expect } from 'chai';
+import {expect} from 'chai';
 import pubwiseAnalytics from 'modules/pubwiseAnalyticsAdapter.js';
-import {server} from 'test/mocks/xhr.js';
+import {expectEvents} from '../../helpers/analytics.js';
+
 let events = require('src/events');
 let adapterManager = require('src/adapterManager').default;
 let constants = require('src/constants.json');
@@ -58,23 +59,16 @@ describe('PubWise Prebid Analytics', function () {
 
       sandbox.spy(pubwiseAnalytics, 'track');
 
-      // sent
-      events.emit(constants.EVENTS.AUCTION_INIT, mock.AUCTION_INIT);
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, {});
-      events.emit(constants.EVENTS.BID_WON, {});
-      events.emit(constants.EVENTS.AD_RENDER_FAILED, {});
-      events.emit(constants.EVENTS.TCF2_ENFORCEMENT, {});
-      events.emit(constants.EVENTS.BID_TIMEOUT, {});
-
-      // forces flush
-      events.emit(constants.EVENTS.AUCTION_END, {});
-
-      // eslint-disable-next-line
-      //console.log(requests);
-
-      /* testing for 6 calls, including the 2 we're not currently tracking */
-      sandbox.assert.callCount(pubwiseAnalytics.track, 8);
+      expectEvents([
+        constants.EVENTS.AUCTION_INIT,
+        constants.EVENTS.BID_REQUESTED,
+        constants.EVENTS.BID_RESPONSE,
+        constants.EVENTS.BID_WON,
+        constants.EVENTS.AD_RENDER_FAILED,
+        constants.EVENTS.TCF2_ENFORCEMENT,
+        constants.EVENTS.BID_TIMEOUT,
+        constants.EVENTS.AUCTION_END,
+      ]).to.beTrackedBy(pubwiseAnalytics.track);
     });
 
     it('should initialize the auction properly', function () {
diff --git a/test/spec/modules/sigmoidAnalyticsAdapter_spec.js b/test/spec/modules/sigmoidAnalyticsAdapter_spec.js
index 6d772de02eb..6cdc3c448b9 100644
--- a/test/spec/modules/sigmoidAnalyticsAdapter_spec.js
+++ b/test/spec/modules/sigmoidAnalyticsAdapter_spec.js
@@ -1,5 +1,7 @@
 import sigmoidAnalytic from 'modules/sigmoidAnalyticsAdapter.js';
-import { expect } from 'chai';
+import {expect} from 'chai';
+import {expectEvents} from '../../helpers/analytics.js';
+
 let events = require('src/events');
 let adapterManager = require('src/adapterManager').default;
 let constants = require('src/constants.json');
@@ -32,13 +34,7 @@ describe('sigmoid Prebid Analytic', function () {
         }
       });
 
-      events.emit(constants.EVENTS.AUCTION_INIT, {});
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, {});
-      events.emit(constants.EVENTS.BID_WON, {});
-
-      sinon.assert.callCount(sigmoidAnalytic.track, 8);
+      expectEvents().to.beTrackedBy(sigmoidAnalytic.track);
     });
   });
   describe('build utm tag data', function () {
diff --git a/test/spec/modules/sovrnAnalyticsAdapter_spec.js b/test/spec/modules/sovrnAnalyticsAdapter_spec.js
index 8284bb54e9b..68552eb3d8a 100644
--- a/test/spec/modules/sovrnAnalyticsAdapter_spec.js
+++ b/test/spec/modules/sovrnAnalyticsAdapter_spec.js
@@ -1,8 +1,10 @@
 import sovrnAnalyticsAdapter from '../../../modules/sovrnAnalyticsAdapter.js';
-import { expect } from 'chai';
+import {expect} from 'chai';
 import {config} from 'src/config.js';
 import adaptermanager from 'src/adapterManager.js';
-import { server } from 'test/mocks/xhr.js';
+import {server} from 'test/mocks/xhr.js';
+import {expectEvents, fireEvents} from '../../helpers/analytics.js';
+
 var assert = require('assert');
 
 let events = require('src/events');
@@ -195,15 +197,7 @@ describe('Sovrn Analytics Adapter', function () {
           sovrnId: 123
         }
       });
-
-      events.emit(constants.EVENTS.AUCTION_INIT, {});
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, {});
-      events.emit(constants.EVENTS.BID_WON, {});
-
-      // 5 SovrnAnalytics events + 1 Clean.io event
-      sinon.assert.callCount(sovrnAnalyticsAdapter.track, 6);
+      expectEvents().to.beTrackedBy(sovrnAnalyticsAdapter.track);
     });
 
     it('should catch no events if no affiliate id', function () {
@@ -212,13 +206,7 @@ describe('Sovrn Analytics Adapter', function () {
         options: {
         }
       });
-
-      events.emit(constants.EVENTS.AUCTION_INIT, {});
-      events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_REQUESTED, {});
-      events.emit(constants.EVENTS.BID_RESPONSE, {});
-      events.emit(constants.EVENTS.BID_WON, {});
-
+      fireEvents();
       sinon.assert.callCount(sovrnAnalyticsAdapter.track, 0);
     });
   });
diff --git a/test/spec/modules/yieldoneAnalyticsAdapter_spec.js b/test/spec/modules/yieldoneAnalyticsAdapter_spec.js
index f55577913a5..ea52f89773e 100644
--- a/test/spec/modules/yieldoneAnalyticsAdapter_spec.js
+++ b/test/spec/modules/yieldoneAnalyticsAdapter_spec.js
@@ -1,6 +1,7 @@
 import yieldoneAnalytics from 'modules/yieldoneAnalyticsAdapter.js';
 import { targeting } from 'src/targeting.js';
 import { expect } from 'chai';
+import _ from 'lodash';
 let events = require('src/events');
 let adapterManager = require('src/adapterManager').default;
 let constants = require('src/constants.json');
@@ -225,7 +226,9 @@ describe('Yieldone Prebid Analytic', function () {
         pubId: initOptions.pubId,
         page: {url: testReferrer},
         wrapper_version: '$prebid.version$',
-        events: expectedEvents
+        events: sinon.match(evs => {
+          return !expectedEvents.some((expectedEvent) => evs.find(ev => _.isEqual(ev, expectedEvent)) === -1)
+        })
       };
 
       const preparedWinnerParams = Object.assign({adServerTargeting: fakeTargeting}, winner);
@@ -262,7 +265,7 @@ describe('Yieldone Prebid Analytic', function () {
 
       events.emit(constants.EVENTS.AUCTION_END, auctionEnd);
 
-      expect(yieldoneAnalytics.eventsStorage[auctionId]).to.deep.equal(expectedResult);
+      sinon.assert.match(yieldoneAnalytics.eventsStorage[auctionId], expectedResult);
 
       delete yieldoneAnalytics.eventsStorage[auctionId];
 

From 54d225674f26446fddee1a85103e179fd98e4bc4 Mon Sep 17 00:00:00 2001
From: Karim Mourra <karim@jwplayer.com>
Date: Mon, 28 Nov 2022 11:53:43 -0500
Subject: [PATCH 474/569] JW Player RTD Module: prefer segment.id to
 segment.value (#9153)

* removes id

* updates docs

* Revert "updates docs"

This reverts commit 926a06dd9581868e6fd9e682e68b48592aebbd3e.

* Revert "removes id"

This reverts commit c3a1be70e7274451b6b60381c036385b579eb23b.

* drop segment.value
---
 modules/gridBidAdapter.js                     | 2 +-
 modules/gridNMBidAdapter.js                   | 2 +-
 modules/jwplayerRtdProvider.js                | 3 +--
 test/spec/modules/jwplayerRtdProvider_spec.js | 6 +++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index 3aaeaf73580..b300c5c58c0 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -652,7 +652,7 @@ function getUserIdFromFPDStorage() {
 function segmentProcessing(segment, forceSegName) {
   return segment
     .map((seg) => {
-      const value = seg && (seg.value || seg.id || seg);
+      const value = seg && (seg.id || seg);
       if (typeof value === 'string' || typeof value === 'number') {
         return {
           value: value.toString(),
diff --git a/modules/gridNMBidAdapter.js b/modules/gridNMBidAdapter.js
index 6f8eaba43d3..c49b7619c07 100644
--- a/modules/gridNMBidAdapter.js
+++ b/modules/gridNMBidAdapter.js
@@ -432,7 +432,7 @@ export function getSyncUrl() {
 function segmentProcessing(segment, forceSegName) {
   return segment
     .map((seg) => {
-      const value = seg && (seg.value || seg.id || seg);
+      const value = seg && (seg.id || seg);
       if (typeof value === 'string' || typeof value === 'number') {
         return {
           value: value.toString(),
diff --git a/modules/jwplayerRtdProvider.js b/modules/jwplayerRtdProvider.js
index 342531ba26e..b79843dccfd 100644
--- a/modules/jwplayerRtdProvider.js
+++ b/modules/jwplayerRtdProvider.js
@@ -274,8 +274,7 @@ export function getContentSegments(segments) {
 
   const formattedSegments = segments.reduce((convertedSegments, rawSegment) => {
     convertedSegments.push({
-      id: rawSegment,
-      value: rawSegment
+      id: rawSegment
     });
     return convertedSegments;
   }, []);
diff --git a/test/spec/modules/jwplayerRtdProvider_spec.js b/test/spec/modules/jwplayerRtdProvider_spec.js
index 77c8ce58442..5a38a971e09 100644
--- a/test/spec/modules/jwplayerRtdProvider_spec.js
+++ b/test/spec/modules/jwplayerRtdProvider_spec.js
@@ -659,9 +659,9 @@ describe('jwplayerRtdProvider', function() {
       const segment2 = 'segment2';
       const segment3 = 'segment3';
       const contentSegments = getContentSegments([segment1, segment2, segment3]);
-      expect(contentSegments[0]).to.deep.equal({ id: segment1, value: segment1 });
-      expect(contentSegments[1]).to.deep.equal({ id: segment2, value: segment2 });
-      expect(contentSegments[2]).to.deep.equal({ id: segment3, value: segment3 });
+      expect(contentSegments[0]).to.deep.equal({ id: segment1 });
+      expect(contentSegments[1]).to.deep.equal({ id: segment2 });
+      expect(contentSegments[2]).to.deep.equal({ id: segment3 });
     });
   });
 

From 4f21a5bc9e2e4ace066a4d26ca1c9c637c46a477 Mon Sep 17 00:00:00 2001
From: AcuityAdsIntegrations
 <72594990+AcuityAdsIntegrations@users.noreply.github.com>
Date: Mon, 28 Nov 2022 18:56:39 +0200
Subject: [PATCH 475/569] AcuityAds adapter: fix issue with download (#9164)

* add prebid.js adapter

* changes

* changes

* changes

* changes

* fix downolad
---
 modules/{acuityAdsBidAdapter.js => acuityadsBidAdapter.js}      | 0
 modules/{acuityAdsBidAdapter.md => acuityadsBidAdapter.md}      | 0
 ...{acuityAdsBidAdapter_spec.js => acuityadsBidAdapter_spec.js} | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename modules/{acuityAdsBidAdapter.js => acuityadsBidAdapter.js} (100%)
 rename modules/{acuityAdsBidAdapter.md => acuityadsBidAdapter.md} (100%)
 rename test/spec/modules/{acuityAdsBidAdapter_spec.js => acuityadsBidAdapter_spec.js} (99%)

diff --git a/modules/acuityAdsBidAdapter.js b/modules/acuityadsBidAdapter.js
similarity index 100%
rename from modules/acuityAdsBidAdapter.js
rename to modules/acuityadsBidAdapter.js
diff --git a/modules/acuityAdsBidAdapter.md b/modules/acuityadsBidAdapter.md
similarity index 100%
rename from modules/acuityAdsBidAdapter.md
rename to modules/acuityadsBidAdapter.md
diff --git a/test/spec/modules/acuityAdsBidAdapter_spec.js b/test/spec/modules/acuityadsBidAdapter_spec.js
similarity index 99%
rename from test/spec/modules/acuityAdsBidAdapter_spec.js
rename to test/spec/modules/acuityadsBidAdapter_spec.js
index 18ea574c1ce..2497b435a19 100644
--- a/test/spec/modules/acuityAdsBidAdapter_spec.js
+++ b/test/spec/modules/acuityadsBidAdapter_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { spec } from '../../../modules/acuityAdsBidAdapter';
+import { spec } from '../../../modules/acuityadsBidAdapter';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 

From ebf6272f175160688fbccb5213a0fad98324723c Mon Sep 17 00:00:00 2001
From: Giovanni Sollazzo <gs@aidem.com>
Date: Mon, 28 Nov 2022 18:00:59 +0100
Subject: [PATCH 476/569] AIDEM Bid Adapter: initial adapter release (#9222)

* AIDEM Bid Adapter

* Added _spec.js

* update

* Fix Navigator in _spec.js

* Removed timeout handler.

* Added publisherId as required bidder params

* moved publisherId into site publisher object

Co-authored-by: darkstar <canazza@wazabit.it>
---
 modules/aidemBidAdapter.js                | 492 ++++++++++++++++
 modules/aidemBidAdapter.md                | 187 ++++++
 test/spec/modules/aidemBidAdapter_spec.js | 664 ++++++++++++++++++++++
 3 files changed, 1343 insertions(+)
 create mode 100644 modules/aidemBidAdapter.js
 create mode 100644 modules/aidemBidAdapter.md
 create mode 100644 test/spec/modules/aidemBidAdapter_spec.js

diff --git a/modules/aidemBidAdapter.js b/modules/aidemBidAdapter.js
new file mode 100644
index 00000000000..41bf680db1c
--- /dev/null
+++ b/modules/aidemBidAdapter.js
@@ -0,0 +1,492 @@
+import {_each, contains, deepAccess, deepSetValue, getDNT, isBoolean, isStr, logError, logInfo} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {getRefererInfo} from '../src/refererDetection.js';
+import {ajax} from '../src/ajax.js';
+
+const BIDDER_CODE = 'aidem';
+const BASE_URL = 'https://zero.aidemsrv.com';
+const LOCAL_BASE_URL = 'http://127.0.0.1:8787';
+
+const AVAILABLE_CURRENCIES = ['USD'];
+const DEFAULT_CURRENCY = ['USD']; // NOTE - USD is the only supported currency right now; Hardcoded for bids
+const SUPPORTED_MEDIA_TYPES = [BANNER, VIDEO];
+const REQUIRED_VIDEO_PARAMS = [ 'mimes', 'protocols', 'context' ];
+
+export const ERROR_CODES = {
+  BID_SIZE_INVALID_FORMAT: 1,
+  BID_SIZE_NOT_INCLUDED: 2,
+  PROPERTY_NOT_INCLUDED: 3,
+  SITE_ID_INVALID_VALUE: 4,
+  MEDIA_TYPE_NOT_SUPPORTED: 5,
+  PUBLISHER_ID_INVALID_VALUE: 6,
+};
+
+const endpoints = {
+  request: `${BASE_URL}/bid/request`,
+  notice: {
+    win: `${BASE_URL}/notice/win`,
+    timeout: `${BASE_URL}/notice/timeout`,
+    error: `${BASE_URL}/notice/error`,
+  }
+}
+
+export function setEndPoints(env = null, path = '', mediaType = BANNER) {
+  switch (env) {
+    case 'local':
+      endpoints.request = mediaType === BANNER ? `${LOCAL_BASE_URL}${path}/bid/request` : `${LOCAL_BASE_URL}${path}/bid/videorequest`
+      endpoints.notice.win = `${LOCAL_BASE_URL}${path}/notice/win`
+      endpoints.notice.error = `${LOCAL_BASE_URL}${path}/notice/error`
+      endpoints.notice.timeout = `${LOCAL_BASE_URL}${path}/notice/timeout`
+      break;
+    case 'main':
+      endpoints.request = mediaType === BANNER ? `${BASE_URL}${path}/bid/request` : `${BASE_URL}${path}/bid/videorequest`
+      endpoints.notice.win = `${BASE_URL}${path}/notice/win`
+      endpoints.notice.error = `${BASE_URL}${path}/notice/error`
+      endpoints.notice.timeout = `${BASE_URL}${path}/notice/timeout`
+      break;
+  }
+  return endpoints
+}
+
+config.getConfig('aidem', function (config) {
+  if (config.aidem.env) { setEndPoints(config.aidem.env, config.aidem.path, config.aidem.mediaType) }
+})
+
+// AIDEM Custom FN
+function recur(obj) {
+  var result = {}; var _tmp;
+  for (var i in obj) {
+    // enabledPlugin is too nested, also skip functions
+    if (!(i === 'enabledPlugin' || typeof obj[i] === 'function')) {
+      if (typeof obj[i] === 'object' && obj[i] !== null) {
+        // get props recursively
+        _tmp = recur(obj[i]);
+        // if object is not {}
+        if (Object.keys(_tmp).length) {
+          result[i] = _tmp;
+        }
+      } else {
+        // string, number or boolean
+        result[i] = obj[i];
+      }
+    }
+  }
+  return result;
+}
+
+// =================================================================================
+function getConnectionType() {
+  const connection = navigator.connection || navigator.webkitConnection;
+  if (!connection) {
+    return 0;
+  }
+  switch (connection.type) {
+    case 'ethernet':
+      return 1;
+    case 'wifi':
+      return 2;
+    case 'cellular':
+      switch (connection.effectiveType) {
+        case 'slow-2g':
+          return 4;
+        case '2g':
+          return 4;
+        case '3g':
+          return 5;
+        case '4g':
+          return 6;
+        case '5g':
+          return 7;
+        default:
+          return 3;
+      }
+    default:
+      return 0;
+  }
+}
+
+function getDevice() {
+  const language = navigator.language || navigator.browserLanguage || navigator.userLanguage || navigator.systemLanguage;
+  return {
+    ua: navigator.userAgent,
+    dnt: !!getDNT(),
+    language: language,
+    connectiontype: getConnectionType(),
+    screen_width: screen.width,
+    screen_height: screen.height
+  };
+}
+
+function getRegs() {
+  let regs = {};
+  const consentManagement = config.getConfig('consentManagement')
+  const coppa = config.getConfig('coppa')
+  if (consentManagement && !!(consentManagement.gdpr)) {
+    deepSetValue(regs, 'gdpr_applies', !!consentManagement.gdpr);
+  } else {
+    deepSetValue(regs, 'gdpr_applies', false);
+  }
+  if (consentManagement && deepAccess(consentManagement, 'usp.cmpApi') === 'static') {
+    deepSetValue(regs, 'usp_applies', !!deepAccess(consentManagement, 'usp'));
+    deepSetValue(regs, 'us_privacy', deepAccess(consentManagement, 'usp.consentData.getUSPData.uspString'));
+  } else {
+    deepSetValue(regs, 'usp_applies', false);
+  }
+
+  if (isBoolean(coppa)) {
+    deepSetValue(regs, 'coppa_applies', !!coppa);
+  } else {
+    deepSetValue(regs, 'coppa_applies', false);
+  }
+
+  return regs;
+}
+
+function getPageUrl(bidderRequest) {
+  return bidderRequest?.refererInfo?.page
+}
+
+function buildWinNotice(bid) {
+  return {
+    burl: deepAccess(bid, 'meta.burl'),
+    cpm: bid.cpm,
+    currency: bid.currency,
+    impid: deepAccess(bid, 'meta.impid'),
+    dsp_id: deepAccess(bid, 'meta.dsp_id'),
+    adUnitCode: bid.adUnitCode,
+    auctionId: bid.auctionId,
+    transactionId: bid.transactionId,
+    ttl: bid.ttl,
+    requestTimestamp: bid.requestTimestamp,
+    responseTimestamp: bid.responseTimestamp,
+  }
+}
+
+function buildErrorNotice(prebidErrorResponse) {
+  return {
+    message: `Prebid.js: Server call for ${prebidErrorResponse.bidderCode} failed.`,
+    url: encodeURIComponent(getPageUrl(prebidErrorResponse)),
+    auctionId: prebidErrorResponse.auctionId,
+    bidderRequestId: prebidErrorResponse.bidderRequestId,
+    metrics: {}
+  }
+}
+
+function hasValidFloor(obj) {
+  if (!obj) return false
+  const hasValue = !isNaN(Number(obj.value))
+  const hasCurrency = contains(AVAILABLE_CURRENCIES, obj.currency)
+  return hasValue && hasCurrency
+}
+
+function getMediaType(bidRequest) {
+  if ((bidRequest.mediaTypes && bidRequest.mediaTypes.hasOwnProperty('video')) || bidRequest.params.hasOwnProperty('video')) { return VIDEO }
+  return BANNER
+}
+
+function getPrebidRequestFields(bidderRequest, bidRequests) {
+  const payload = {}
+  // Base Payload Data
+  deepSetValue(payload, 'id', bidderRequest.auctionId);
+  // Impressions
+  setPrebidImpressionObject(bidRequests, payload)
+  // Device
+  deepSetValue(payload, 'device', getDevice())
+  // Timeout
+  deepSetValue(payload, 'tmax', bidderRequest.timeout);
+  // Currency
+  deepSetValue(payload, 'cur', DEFAULT_CURRENCY);
+  // Timezone
+  deepSetValue(payload, 'tz', new Date().getTimezoneOffset());
+  // Privacy Regs
+  deepSetValue(payload, 'regs', getRegs());
+  // Site
+  setPrebidSiteObject(bidderRequest, payload)
+  // Environment
+  setPrebidRequestEnvironment(payload)
+  // AT auction type
+  deepSetValue(payload, 'at', 1);
+
+  return payload
+}
+
+function setPrebidImpressionObject(bidRequests, payload) {
+  payload.imp = [];
+  _each(bidRequests, function (bidRequest) {
+    const impressionObject = {};
+    // Placement or ad tag used to initiate the auction
+    deepSetValue(impressionObject, 'id', bidRequest.bidId);
+    // Transaction id
+    deepSetValue(impressionObject, 'tid', deepAccess(bidRequest, 'transactionId'));
+    // Publisher id
+    deepSetValue(payload, 'site.publisher.id', deepAccess(bidRequest, 'params.publisherId'));
+    // Site id
+    deepSetValue(payload, 'site.id', deepAccess(bidRequest, 'params.siteId'));
+    const mediaType = getMediaType(bidRequest)
+    switch (mediaType) {
+      case 'banner':
+        setPrebidImpressionObjectBanner(bidRequest, impressionObject)
+        break;
+      case 'video':
+        setPrebidImpressionObjectVideo(bidRequest, impressionObject)
+        break;
+    }
+
+    // Floor (optional)
+    setPrebidImpressionObjectFloor(bidRequest, impressionObject)
+
+    impressionObject.imp_ext = {};
+
+    payload.imp.push(impressionObject);
+  });
+}
+
+function setPrebidSiteObject(bidderRequest, payload) {
+  deepSetValue(payload, 'site.domain', deepAccess(bidderRequest, 'refererInfo.domain'));
+  deepSetValue(payload, 'site.page', deepAccess(bidderRequest, 'refererInfo.page'));
+  deepSetValue(payload, 'site.referer', deepAccess(bidderRequest, 'refererInfo.ref'));
+  deepSetValue(payload, 'site.cat', deepAccess(bidderRequest, 'ortb2.site.cat'));
+  deepSetValue(payload, 'site.sectioncat', deepAccess(bidderRequest, 'ortb2.site.sectioncat'));
+  deepSetValue(payload, 'site.keywords', deepAccess(bidderRequest, 'ortb2.site.keywords'));
+  deepSetValue(payload, 'site.site_ext', deepAccess(bidderRequest, 'ortb2.site.ext')); // see https://docs.prebid.org/features/firstPartyData.html
+}
+
+function setPrebidRequestEnvironment(payload) {
+  const __navigator = JSON.parse(JSON.stringify(recur(navigator)));
+  delete __navigator.plugins;
+  deepSetValue(payload, 'environment.ri', getRefererInfo());
+  deepSetValue(payload, 'environment.hl', window.history.length);
+  deepSetValue(payload, 'environment.nav', __navigator);
+  deepSetValue(payload, 'environment.inp.euc', window.encodeURIComponent.name === 'encodeURIComponent' && typeof window.encodeURIComponent.prototype === 'undefined');
+  deepSetValue(payload, 'environment.inp.eu', window.encodeURI.name === 'encodeURI' && typeof window.encodeURI.prototype === 'undefined');
+  deepSetValue(payload, 'environment.inp.js', window.JSON.stringify.name === 'stringify' && typeof window.JSON.stringify.prototype === 'undefined');
+  deepSetValue(payload, 'environment.inp.jp', window.JSON.parse.name === 'parse' && typeof window.JSON.parse.prototype === 'undefined');
+  deepSetValue(payload, 'environment.inp.ofe', window.Object.fromEntries.name === 'fromEntries' && typeof window.Object.fromEntries.prototype === 'undefined');
+  deepSetValue(payload, 'environment.inp.oa', window.Object.assign.name === 'assign' && typeof window.Object.assign.prototype === 'undefined');
+}
+
+function setPrebidImpressionObjectFloor(bidRequest, impressionObject) {
+  const floor = deepAccess(bidRequest, 'params.floor')
+  if (hasValidFloor(floor)) {
+    deepSetValue(impressionObject, 'floor.value', floor.value)
+    deepSetValue(impressionObject, 'floor.currency', floor.currency)
+  }
+}
+
+function setPrebidImpressionObjectBanner(bidRequest, impressionObject) {
+  deepSetValue(impressionObject, 'mediatype', BANNER);
+  deepSetValue(impressionObject, 'banner.topframe', 1);
+  deepSetValue(impressionObject, 'banner.format', []);
+  _each(bidRequest.mediaTypes.banner.sizes, function (bannerFormat) {
+    const format = {};
+    deepSetValue(format, 'w', bannerFormat[0]);
+    deepSetValue(format, 'h', bannerFormat[1]);
+    deepSetValue(format, 'format_ext', {});
+    impressionObject.banner.format.push(format);
+  });
+}
+
+function setPrebidImpressionObjectVideo(bidRequest, impressionObject) {
+  deepSetValue(impressionObject, 'mediatype', VIDEO);
+  deepSetValue(impressionObject, 'video.format', []);
+  deepSetValue(impressionObject, 'video.mimes', bidRequest.mediaTypes.video.mimes);
+  deepSetValue(impressionObject, 'video.minDuration', bidRequest.mediaTypes.video.minduration);
+  deepSetValue(impressionObject, 'video.maxDuration', bidRequest.mediaTypes.video.maxduration);
+  deepSetValue(impressionObject, 'video.protocols', bidRequest.mediaTypes.video.protocols);
+  deepSetValue(impressionObject, 'video.context', bidRequest.mediaTypes.video.context);
+  deepSetValue(impressionObject, 'video.playbackmethod', bidRequest.mediaTypes.video.playbackmethod);
+  deepSetValue(impressionObject, 'skip', bidRequest.mediaTypes.video.skip);
+  deepSetValue(impressionObject, 'skipafter', bidRequest.mediaTypes.video.skipafter);
+  deepSetValue(impressionObject, 'video.pos', bidRequest.mediaTypes.video.pos);
+  _each(bidRequest.mediaTypes.video.playerSize, function (videoPlayerSize) {
+    const format = {};
+    deepSetValue(format, 'w', videoPlayerSize[0]);
+    deepSetValue(format, 'h', videoPlayerSize[1]);
+    deepSetValue(format, 'format_ext', {});
+    impressionObject.video.format.push(format);
+  });
+}
+
+function getPrebidResponseBidObject(openRTBResponseBidObject) {
+  const prebidResponseBidObject = {};
+  // Common properties
+  deepSetValue(prebidResponseBidObject, 'requestId', openRTBResponseBidObject.impid);
+  deepSetValue(prebidResponseBidObject, 'cpm', parseFloat(openRTBResponseBidObject.price));
+  deepSetValue(prebidResponseBidObject, 'creativeId', openRTBResponseBidObject.crid);
+  deepSetValue(prebidResponseBidObject, 'currency', openRTBResponseBidObject.cur ? openRTBResponseBidObject.cur.toUpperCase() : DEFAULT_CURRENCY);
+  deepSetValue(prebidResponseBidObject, 'width', openRTBResponseBidObject.w);
+  deepSetValue(prebidResponseBidObject, 'height', openRTBResponseBidObject.h);
+  deepSetValue(prebidResponseBidObject, 'dealId', openRTBResponseBidObject.dealid)
+  deepSetValue(prebidResponseBidObject, 'netRevenue', true);
+  deepSetValue(prebidResponseBidObject, 'ttl', 60000);
+
+  if (openRTBResponseBidObject.mediatype === VIDEO) {
+    logInfo('bidObject.mediatype == VIDEO');
+    deepSetValue(prebidResponseBidObject, 'mediaType', VIDEO);
+    deepSetValue(prebidResponseBidObject, 'vastUrl', openRTBResponseBidObject.adm);
+  } else {
+    logInfo('bidObject.mediatype == BANNER');
+    deepSetValue(prebidResponseBidObject, 'mediaType', BANNER);
+    deepSetValue(prebidResponseBidObject, 'ad', openRTBResponseBidObject.adm);
+  }
+  setPrebidResponseBidObjectMeta(prebidResponseBidObject, openRTBResponseBidObject)
+  return prebidResponseBidObject
+}
+
+function setPrebidResponseBidObjectMeta(prebidResponseBidObject, openRTBResponseBidObject) {
+  logInfo('AIDEM Bid Adapter meta', openRTBResponseBidObject);
+  deepSetValue(prebidResponseBidObject, 'meta.advertiserDomains', openRTBResponseBidObject.adomain);
+  if (openRTBResponseBidObject.cat && Array.isArray(openRTBResponseBidObject.cat)) {
+    const primaryCatId = openRTBResponseBidObject.cat.shift();
+    deepSetValue(prebidResponseBidObject, 'meta.primaryCatId', primaryCatId);
+    deepSetValue(prebidResponseBidObject, 'meta.secondaryCatIds', openRTBResponseBidObject.cat);
+  }
+  deepSetValue(prebidResponseBidObject, 'meta.id', openRTBResponseBidObject.id);
+  deepSetValue(prebidResponseBidObject, 'meta.dsp_id', openRTBResponseBidObject.dsp_id);
+  deepSetValue(prebidResponseBidObject, 'meta.adid', openRTBResponseBidObject.adid);
+  deepSetValue(prebidResponseBidObject, 'meta.burl', openRTBResponseBidObject.burl);
+  deepSetValue(prebidResponseBidObject, 'meta.impid', openRTBResponseBidObject.impid);
+  deepSetValue(prebidResponseBidObject, 'meta.cat', openRTBResponseBidObject.cat);
+  deepSetValue(prebidResponseBidObject, 'meta.cid', openRTBResponseBidObject.cid);
+}
+
+function hasValidMediaType(bidRequest) {
+  const supported = hasBannerMediaType(bidRequest) || hasVideoMediaType(bidRequest)
+  if (!supported) {
+    logError('AIDEM Bid Adapter: media type not supported', { bidder: BIDDER_CODE, code: ERROR_CODES.MEDIA_TYPE_NOT_SUPPORTED });
+  }
+  return supported
+}
+
+function hasBannerMediaType(bidRequest) {
+  return !!deepAccess(bidRequest, 'mediaTypes.banner')
+}
+
+function hasVideoMediaType(bidRequest) {
+  return !!deepAccess(bidRequest, 'mediaTypes.video')
+}
+
+function hasValidBannerMediaType(bidRequest) {
+  const sizes = deepAccess(bidRequest, 'mediaTypes.banner.sizes')
+  if (!sizes) {
+    logError('AIDEM Bid Adapter: media type sizes missing', { bidder: BIDDER_CODE, code: ERROR_CODES.PROPERTY_NOT_INCLUDED });
+    return false;
+  }
+  return true
+}
+
+function hasValidVideoMediaType(bidRequest) {
+  const sizes = deepAccess(bidRequest, 'mediaTypes.video.playerSize');
+  if (!sizes) {
+    logError('AIDEM Bid Adapter: media type playerSize missing', { bidder: BIDDER_CODE, code: ERROR_CODES.PROPERTY_NOT_INCLUDED });
+    return false;
+  }
+  return true
+}
+
+function hasValidVideoParameters(bidRequest) {
+  let valid = true
+  const adUnitsParameters = deepAccess(bidRequest, 'mediaTypes.video');
+  const bidderParameter = deepAccess(bidRequest, 'params.video');
+  for (let property of REQUIRED_VIDEO_PARAMS) {
+    const hasAdUnitParameter = adUnitsParameters.hasOwnProperty(property)
+    const hasBidderParameter = bidderParameter && bidderParameter.hasOwnProperty(property)
+    if (!hasAdUnitParameter && !hasBidderParameter) {
+      logError(`AIDEM Bid Adapter: ${property} is not included in either the adunit or params level`, { bidder: BIDDER_CODE, code: ERROR_CODES.PROPERTY_NOT_INCLUDED });
+      valid = false
+    }
+  }
+
+  return valid
+}
+
+function hasValidParameters(bidRequest) {
+  // Assigned from AIDEM to a publisher website
+  const siteId = deepAccess(bidRequest, 'params.siteId');
+  const publisherId = deepAccess(bidRequest, 'params.publisherId');
+
+  if (!isStr(siteId)) {
+    logError('AIDEM Bid Adapter: siteId must valid string', { bidder: BIDDER_CODE, code: ERROR_CODES.SITE_ID_INVALID_VALUE });
+    return false;
+  }
+
+  if (!isStr(publisherId)) {
+    logError('AIDEM Bid Adapter: publisherId must valid string', { bidder: BIDDER_CODE, code: ERROR_CODES.PUBLISHER_ID_INVALID_VALUE });
+    return false;
+  }
+
+  return true
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
+  isBidRequestValid: function(bidRequest) {
+    logInfo('bid: ', bidRequest);
+
+    // check if request has valid mediaTypes
+    if (!hasValidMediaType(bidRequest)) return false
+
+    // check if request has valid media type parameters at adUnit level
+    if (hasBannerMediaType(bidRequest) && !hasValidBannerMediaType(bidRequest)) {
+      return false
+    }
+
+    if (hasVideoMediaType(bidRequest) && !hasValidVideoMediaType(bidRequest)) {
+      return false
+    }
+
+    if (hasVideoMediaType(bidRequest) && !hasValidVideoParameters(bidRequest)) {
+      return false
+    }
+
+    return hasValidParameters(bidRequest)
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    logInfo('validBidRequests: ', validBidRequests);
+    logInfo('bidderRequest: ', bidderRequest);
+    const prebidRequest = getPrebidRequestFields(bidderRequest, validBidRequests)
+    const payloadString = JSON.stringify(prebidRequest);
+
+    return {
+      method: 'POST',
+      url: endpoints.request,
+      data: payloadString,
+      options: {
+        withCredentials: true
+      }
+    };
+  },
+
+  interpretResponse: function (serverResponse) {
+    const bids = [];
+    logInfo('serverResponse: ', serverResponse);
+    _each(serverResponse.body.bid, function (bidObject) {
+      logInfo('bidObject: ', bidObject);
+      if (!bidObject.price || !bidObject.adm) {
+        return;
+      }
+      logInfo('CPM OK');
+      const bid = getPrebidResponseBidObject(bidObject)
+      bids.push(bid);
+    });
+    return bids;
+  },
+
+  onBidWon: function(bid) {
+    // Bidder specific code
+    logInfo('onBidWon bid: ', bid);
+    const notice = buildWinNotice(bid)
+    ajax(endpoints.notice.win, null, JSON.stringify(notice), { method: 'POST', withCredentials: true });
+  },
+
+  onBidderError: function({ bidderRequest }) {
+    // Bidder specific code
+    const notice = buildErrorNotice(bidderRequest)
+    ajax(endpoints.notice.error, null, JSON.stringify(notice), { method: 'POST', withCredentials: true });
+  },
+}
+registerBidder(spec);
diff --git a/modules/aidemBidAdapter.md b/modules/aidemBidAdapter.md
new file mode 100644
index 00000000000..a5beca97d10
--- /dev/null
+++ b/modules/aidemBidAdapter.md
@@ -0,0 +1,187 @@
+# Overview
+
+```
+name: AIDEM Adapter
+type: Bidder Adapter
+support: prebid@aidem.com
+biddercode: aidem
+```
+
+# Description
+This module connects publishers to AIDEM demand.
+
+This module is GDPR and CCPA compliant, and no 3rd party userIds are allowed.
+
+
+## Global Bid Params
+| Name          | Scope    | Description         | Example       | Type     |
+|---------------|----------|---------------------|---------------|----------|
+| `siteId`      | required | Unique site ID      | `'ABCDEF'`    | `String` |
+| `publisherId` | required | Unique publisher ID | `'ABCDEF'`    | `String` |
+
+
+### Banner Bid Params
+| Name       | Scope    | Description              | Example                   | Type    |
+|------------|----------|--------------------------|---------------------------|---------|
+| `sizes`    | required | List of the sizes wanted | `[[300, 250], [300,600]]` | `Array` |
+
+
+### Video Bid Params
+| Name          | Scope    | Description                             | Example         | Type      |
+|---------------|----------|-----------------------------------------|-----------------|-----------|
+| `context`     | required | One of instream, outstream, adpod       | `'instream'`    | `String`  |
+| `playerSize`  | required | Width and height of the player          | `'[640, 480]'`  | `Array`   |
+| `maxduration` | required | Maximum video ad duration, in seconds   | `30`            | `Integer` |
+| `minduration` | required | Minimum video ad duration, in seconds   | `5`             | `Integer` |
+| `mimes`       | required | List of the content MIME types supported by the player    | `["video/mp4"]` | `Array`   |
+| `protocols`   | required | An array of supported video protocols. At least one supported protocol must be specified, where: `2` = VAST 2.0 `3` = VAST 3.0 `5` = VAST 2.0 wrapper `6` = VAST 3.0 wrapper | `2`             | `Array`   |
+
+
+### Additional Config
+| Name                | Scope    | Description                                             | Example | Type      |
+|---------------------|----------|---------------------------------------------------------|---------|-----------|
+| `coppa`             | optional | Child Online Privacy Protection Act                     | `true`  | `Boolean` |
+| `consentManagement` | optional | [Consent Management Object](#consent-management-object) | `{}`    | `Object`  |
+
+
+### Consent Management Object
+| Name   | Scope    | Description                                                                                      | Example | Type     |
+|--------|----------|--------------------------------------------------------------------------------------------------|---------|----------|
+| `gdpr` | optional | GDPR Object see [Prebid.js doc](https://docs.prebid.org/dev-docs/modules/consentManagement.html) | `{}`    | `Object` |
+| `usp`  | optional | USP Object see [Prebid.js doc](https://docs.prebid.org/dev-docs/modules/consentManagementUsp.html)                                                                     | `{}`    | `Object` |
+
+
+### Example Banner ad unit
+```javascript
+var adUnits = [{
+    code: 'banner-prebid-test-site',
+    mediaTypes: {
+        banner: {
+            sizes: [
+                [300, 600],
+                [300, 250]
+            ]
+        }
+    },
+    bids: [{
+          bidder: 'aidem',
+          params: {
+            siteId: 'prebid-test-site',
+          },
+    }]
+}];
+```
+
+### Example Video ad unit
+```javascript
+var adUnits = [{
+    code: 'video-prebid-test-site',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        maxduration: 30,
+        minduration: 5,
+        mimes: ["video/mp4"],
+        protocols: 2
+      }
+    },
+    bids: [{
+          bidder: 'aidem',
+          params: {
+            siteId: 'prebid-test-site',
+          },
+    }]
+}];
+```
+
+### Example GDPR Consent Management
+```javascript
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+pbjs.que.push(function (){
+  pbjs.setConfig({
+    consentManagement: {
+      gdpr:{
+        cmpApi: 'iab'
+      }
+    }
+  });
+})
+```
+
+
+### Example USP Consent Management
+```javascript
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+pbjs.que.push(function (){
+  pbjs.setConfig({
+    consentManagement: {
+      usp:{
+        cmpApi: 'static',
+        consentData:{
+          getUSPData:{
+            uspString: '1YYY'
+          }
+        }
+      }
+    }
+  });
+})
+```
+
+
+### Setting First Party Data (FPD)
+```javascript
+var pbjs = pbjs || {};
+pbjs.que = pbjs.que || [];
+
+pbjs.que.push(function (){
+  pbjs.setConfig({
+    ortb2: {
+      site: {
+        cat: ['IAB2'],
+        sectioncat: ['IAB2-2'],
+        keywords: 'power tools, drills'
+      },
+    }
+  });
+})
+```
+
+### Supported Media Types
+| Type   | Support                                                            |
+|--------|--------------------------------------------------------------------|
+| Banner | Support all [AIDEM Sizes](https://kb.aidem.com/ssp/lists/adsizes/) | 
+| Video  | Support all [AIDEM Sizes](https://kb.aidem.com/ssp/lists/adsizes/) | 
+
+
+# Setup / Dev Guide
+```shell
+nvm use
+
+npm install
+
+gulp build --modules=aidemBidAdapter
+
+gulp serve --modules=aidemBidAdapter
+
+# Open a chrome browser with no ad blockers enabled, and paste in this URL. The `pbjs_debug=true` is needed if you want to enable `loggerInfo` output on the `console` tab of Chrome Developer Tools.
+http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true
+```
+
+If you need to run the tests suite but do *not* want to have to build the full adapter and serve it, simply run:
+```shell
+gulp test --file "test/spec/modules/aidemBidAdapter_spec.js"
+```
+
+
+For video: gulp serve --modules=aidemBidAdapter,dfpAdServerVideo
+
+# FAQs
+### How do I view AIDEM bid request?
+Navigate to a page where AIDEM is setup to bid. In the network tab,
+search for requests to `zero.aidemsrv.com/bid/request`.
diff --git a/test/spec/modules/aidemBidAdapter_spec.js b/test/spec/modules/aidemBidAdapter_spec.js
new file mode 100644
index 00000000000..472b226ab8a
--- /dev/null
+++ b/test/spec/modules/aidemBidAdapter_spec.js
@@ -0,0 +1,664 @@
+import {expect} from 'chai';
+import {setEndPoints, spec} from 'modules/aidemBidAdapter.js';
+import * as utils from '../../../src/utils';
+import {deepSetValue} from '../../../src/utils';
+import {server} from '../../mocks/xhr';
+import {config} from '../../../src/config';
+import {NATIVE} from '../../../src/mediaTypes.js';
+
+// Full banner + Full Video + Basic Banner + Basic Video
+const VALID_BIDS = [
+  {
+    bidder: 'aidem',
+    params: {
+      siteId: '301491',
+      publisherId: '3021491',
+      placementId: 13144370,
+    },
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]],
+      }
+    },
+  },
+  {
+    bidder: 'aidem',
+    params: {
+      siteId: '301491',
+      publisherId: '3021491',
+      placementId: 13144370,
+    },
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        minduration: 7,
+        maxduration: 30,
+        playerSize: [640, 480],
+        mimes: ['video/mp4'],
+        protocols: [2]
+      }
+    },
+  },
+]
+
+const INVALID_BIDS = [
+  {
+    bidder: 'aidem',
+    params: {
+      siteId: '3014912'
+    }
+  },
+  {
+    bidder: 'aidem',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]],
+      }
+    },
+    params: {
+      siteId: '3014912',
+    }
+  },
+  {
+    bidder: 'aidem',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]],
+      }
+    },
+    params: {
+      publisherId: '3014912',
+    }
+  },
+  {
+    bidder: 'aidem',
+    params: {
+      siteId: '3014912',
+      member: '301e4912'
+    }
+  },
+  {
+    bidder: 'aidem',
+    params: {
+      siteId: '3014912',
+      invCode: '3014912'
+    }
+  },
+  {
+    bidder: 'aidem',
+    mediaType: NATIVE,
+    params: {
+      siteId: '3014912'
+    }
+  },
+  {
+    bidder: 'aidem',
+    mediaTypes: {
+      banner: {}
+    },
+  },
+  {
+    bidder: 'aidem',
+    mediaTypes: {
+      video: {
+        placement: 1,
+        minduration: 7,
+        maxduration: 30,
+        mimes: ['video/mp4'],
+        protocols: [2]
+      }
+    },
+    params: {
+      siteId: '301491',
+      placementId: 13144370,
+    },
+  },
+  {
+    bidder: 'aidem',
+    mediaTypes: {
+      video: {
+        minduration: 7,
+        maxduration: 30,
+        playerSize: [640, 480],
+        mimes: ['video/mp4'],
+        protocols: [2]
+      }
+    },
+    params: {
+      siteId: '301491',
+      placementId: 13144370,
+    },
+  },
+  {
+    bidder: 'aidem',
+    mediaTypes: {
+      video: {
+        minduration: 7,
+        maxduration: 30,
+        playerSize: [640, 480],
+        mimes: ['video/mp4'],
+        protocols: [2],
+        placement: 1
+      }
+    },
+    params: {
+      siteId: '301491',
+      placementId: 13144370,
+      video: {
+        size: [480, 40]
+      }
+    },
+  },
+]
+
+const DEFAULT_VALID_BANNER_REQUESTS = [
+  {
+    adUnitCode: 'test-div',
+    auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+    bidId: '22c4871113f461',
+    bidder: 'aidem',
+    bidderRequestId: '15246a574e859f',
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [ 300, 250 ],
+          [ 300, 600 ]
+        ]
+      }
+    },
+    params: {
+      siteId: 1,
+      placementId: 13144370
+    },
+    src: 'client',
+    transactionId: '54a58774-7a41-494e-9aaf-fa7b79164f0c'
+  }
+];
+
+const DEFAULT_VALID_VIDEO_REQUESTS = [
+  {
+    adUnitCode: 'test-div',
+    auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+    bidId: '22c4871113f461',
+    bidder: 'aidem',
+    bidderRequestId: '15246a574e859f',
+    mediaTypes: {
+      video: {
+        minduration: 7,
+        maxduration: 30,
+        playerSize: [640, 480],
+        mimes: ['video/mp4'],
+        protocols: [2]
+      }
+    },
+    params: {
+      siteId: 1,
+      placementId: 13144370
+    },
+    src: 'client',
+    transactionId: '54a58774-7a41-494e-9aaf-fa7b79164f0c'
+  }
+];
+
+const VALID_BIDDER_REQUEST = {
+  auctionId: '6e9b46c3-65a8-46ea-89f4-c5071110c85c',
+  bidderCode: 'aidem',
+  bidderRequestId: '170ea5d2b1d073',
+  refererInfo: {
+    page: 'test-page',
+    domain: 'test-domain',
+    ref: 'test-referer'
+  },
+}
+
+// Add mediatype
+const SERVER_RESPONSE_BANNER = {
+  body: {
+    id: 'efa1930a-bc3e-4fd0-8368-08bc40236b4f',
+    bid: [
+      // BANNER
+      {
+        'id': '2e614be960ee1d',
+        'impid': '2e614be960ee1d',
+        'price': 7.91,
+        'mediatype': 'banner',
+        'adid': '24277955',
+        'adm': 'creativity_banner',
+        'adomain': [
+          'aidem.com'
+        ],
+        'iurl': 'http://www.aidem.com',
+        'cat': [],
+        'cid': '4193561',
+        'crid': '24277955',
+        'w': 300,
+        'h': 250,
+        'ext': {
+          'dspid': 85,
+          'advbrandid': 1246,
+          'advbrand': 'AIDEM'
+        }
+      },
+    ],
+    cur: 'USD'
+  },
+}
+
+const SERVER_RESPONSE_VIDEO = {
+  body: {
+    id: 'efa1930a-bc3e-4fd0-8368-08bc40236b4f',
+    bid: [
+      // VIDEO
+      {
+        'id': '2876a29392a47c',
+        'impid': '2876a29392a47c',
+        'price': 7.93,
+        'mediatype': 'video',
+        'adid': '24277955',
+        'adm': 'https://hermes.aidemsrv.com/vast-tag/cl9mzhhd502uq09l720uegb02?auction_id={{AUCTION_ID}}&cachebuster={{CACHEBUSTER}}',
+        'adomain': [
+          'aidem.com'
+        ],
+        'iurl': 'http://www.aidem.com',
+        'cat': [],
+        'cid': '4193561',
+        'crid': '24277955',
+        'w': 640,
+        'h': 480,
+        'ext': {
+          'dspid': 85,
+          'advbrandid': 1246,
+          'advbrand': 'AIDEM'
+        }
+      }
+    ],
+    cur: 'USD'
+  },
+}
+
+const WIN_NOTICE = {
+  'adId': '3a20ee5dc78c1e',
+  'adUnitCode': 'div-gpt-ad-1460505748561-0',
+  'creativeId': '24277955',
+  'cpm': 1,
+  'netRevenue': false,
+  'adserverTargeting': {
+    'hb_bidder': 'aidem',
+    'hb_adid': '3a20ee5dc78c1e',
+    'hb_pb': '1.00',
+    'hb_size': '300x250',
+    'hb_source': 'client',
+    'hb_format': 'banner',
+    'hb_adomain': 'tenutabene.it'
+  },
+  'auctionId': '85864730-6cbc-4e56-bc3c-a4a6596dca5b',
+  'currency': [
+    'USD'
+  ],
+  'mediaType': 'banner',
+  'size': '300x250',
+  'width': 300,
+  'height': 250,
+  'status': 'rendered',
+  'transactionId': 'ce089116-4251-45c3-bdbb-3a03cb13816b',
+  'ttl': 300,
+  'requestTimestamp': 1666796241007,
+  'responseTimestamp': 1666796241021,
+  metrics: {
+    getMetrics() {
+      return {
+
+      }
+    }
+  }
+}
+
+const ERROR_NOTICE = {
+  'message': 'Prebid.js: Server call for aidem failed.',
+  'url': 'http%3A%2F%2Flocalhost%3A9999%2FintegrationExamples%2Fgpt%2Fhello_world.html%3Fpbjs_debug%3Dtrue',
+  'auctionId': 'b57faab7-23f7-4b63-90db-67b259d20db7',
+  'bidderRequestId': '1c53857d1ce616',
+  'timeout': 1000,
+  'bidderCode': 'aidem',
+  metrics: {
+    getMetrics() {
+      return {
+
+      }
+    }
+  }
+}
+
+describe('Aidem adapter', () => {
+  describe('isBidRequestValid', () => {
+    it('should return true for each valid bid requests', function () {
+      // spec.isBidRequestValid()
+      VALID_BIDS.forEach((value, index) => {
+        expect(spec.isBidRequestValid(value)).to.be.true
+      })
+    });
+
+    it('should return false for each invalid bid requests', function () {
+      // spec.isBidRequestValid()
+      INVALID_BIDS.forEach((value, index) => {
+        expect(spec.isBidRequestValid(value)).to.be.false
+      })
+    });
+
+    it('should return true if valid banner sizes are specified in params as single array', function () {
+      // spec.isBidRequestValid()
+      const validBannerRequest = utils.deepClone(VALID_BIDS[0])
+      deepSetValue(validBannerRequest.params, 'banner.size', [300, 250])
+      expect(spec.isBidRequestValid(validBannerRequest)).to.be.true
+    });
+
+    it('should return true if valid banner sizes are specified in params as array of array', function () {
+      // spec.isBidRequestValid()
+      const validBannerRequest = utils.deepClone(VALID_BIDS[0])
+      deepSetValue(validBannerRequest.params, 'banner.size', [[300, 600]])
+      expect(spec.isBidRequestValid(validBannerRequest)).to.be.true
+    });
+
+    it('should return true if valid video sizes are specified in params as single array', function () {
+      // spec.isBidRequestValid()
+      const validVideoRequest = utils.deepClone(VALID_BIDS[1])
+      deepSetValue(validVideoRequest.params, 'video.size', [640, 480])
+      expect(spec.isBidRequestValid(validVideoRequest)).to.be.true
+    });
+  });
+
+  describe('buildRequests', () => {
+    it('should match server requirements', () => {
+      const requests = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      expect(requests).to.be.an('object');
+      expect(requests.method).to.be.a('string')
+      expect(requests.data).to.be.a('string')
+      expect(requests.options).to.be.an('object').that.have.a.property('withCredentials')
+    });
+
+    it('should have a well formatted banner payload', () => {
+      const requests = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const payload = JSON.parse(requests.data)
+      expect(payload).to.be.a('object').that.has.all.keys(
+        'id', 'imp', 'device', 'cur', 'tz', 'regs', 'site', 'environment', 'at'
+      )
+      expect(payload.imp).to.be.a('array').that.has.lengthOf(DEFAULT_VALID_BANNER_REQUESTS.length)
+
+      expect(payload.imp[0]).to.be.a('object').that.has.all.keys(
+        'banner', 'id', 'mediatype', 'imp_ext', 'tid'
+      )
+      expect(payload.imp[0].banner).to.be.a('object').that.has.all.keys(
+        'format', 'topframe'
+      )
+    });
+
+    it('should have a well formatted video payload', () => {
+      const requests = spec.buildRequests(DEFAULT_VALID_VIDEO_REQUESTS, VALID_BIDDER_REQUEST);
+      const payload = JSON.parse(requests.data)
+      expect(payload).to.be.a('object').that.has.all.keys(
+        'id', 'imp', 'device', 'cur', 'tz', 'regs', 'site', 'environment', 'at'
+      )
+      expect(payload.imp).to.be.a('array').that.has.lengthOf(DEFAULT_VALID_VIDEO_REQUESTS.length)
+
+      expect(payload.imp[0]).to.be.a('object').that.has.all.keys(
+        'video', 'id', 'mediatype', 'imp_ext', 'tid'
+      )
+      expect(payload.imp[0].video).to.be.a('object').that.has.all.keys(
+        'format', 'mimes', 'minDuration', 'maxDuration', 'protocols'
+      )
+    });
+
+    it('should have a well formatted bid floor payload if configured', () => {
+      const validBannerRequests = utils.deepClone(DEFAULT_VALID_BANNER_REQUESTS)
+      validBannerRequests[0].params.floor = {
+        value: 1.98,
+        currency: 'USD'
+      }
+      const requests = spec.buildRequests(validBannerRequests, VALID_BIDDER_REQUEST);
+      const payload = JSON.parse(requests.data)
+      const { floor } = payload.imp[0]
+      expect(floor).to.be.a('object').that.has.all.keys(
+        'value', 'currency'
+      )
+    });
+  })
+
+  describe('interpretResponse', () => {
+    it('should return a valid bid array with a banner bid', () => {
+      const response = utils.deepClone(SERVER_RESPONSE_BANNER)
+      const interpreted = spec.interpretResponse(response)
+      expect(interpreted).to.be.a('array').that.has.lengthOf(1)
+      interpreted.forEach(value => {
+        expect(value).to.be.a('object').that.has.all.keys(
+          'ad', 'cpm', 'creativeId', 'currency', 'height', 'mediaType', 'meta', 'netRevenue', 'requestId', 'ttl', 'width', 'dealId'
+        )
+      })
+    });
+
+    it('should return a valid bid array with a banner bid', () => {
+      const response = utils.deepClone(SERVER_RESPONSE_VIDEO)
+      const interpreted = spec.interpretResponse(response)
+      expect(interpreted).to.be.a('array').that.has.lengthOf(1)
+      interpreted.forEach(value => {
+        expect(value).to.be.a('object').that.has.all.keys(
+          'vastUrl', 'cpm', 'creativeId', 'currency', 'height', 'mediaType', 'meta', 'netRevenue', 'requestId', 'ttl', 'width', 'dealId'
+        )
+      })
+    });
+
+    it('should return a valid bid array with netRevenue', () => {
+      const response = utils.deepClone(SERVER_RESPONSE_BANNER)
+      response.body.bid[0].isNet = true
+      const interpreted = spec.interpretResponse(response)
+      expect(interpreted).to.be.a('array').that.has.lengthOf(1)
+      expect(interpreted[0].netRevenue).to.be.true
+    });
+
+    it('should return an empty bid array if one of seatbid entry is missing price property', () => {
+      const response = utils.deepClone(SERVER_RESPONSE_BANNER)
+      delete response.body.bid[0].price
+      const interpreted = spec.interpretResponse(response)
+      expect(interpreted).to.be.a('array').that.has.lengthOf(0)
+    });
+
+    it('should return an empty bid array if one of seatbid entry is missing adm property', () => {
+      const response = utils.deepClone(SERVER_RESPONSE_BANNER)
+      delete response.body.bid[0].adm
+      const interpreted = spec.interpretResponse(response)
+      expect(interpreted).to.be.a('array').that.has.lengthOf(0)
+    });
+  })
+
+  describe('onBidWon', () => {
+    it(`should exists and type function`, function () {
+      expect(spec.onBidWon).to.exist.and.to.be.a('function')
+    });
+
+    it(`should send a valid bid won notice`, function () {
+      spec.onBidWon(WIN_NOTICE);
+      // server.respondWith('POST', WIN_EVENT_URL, [
+      //   400, {'Content-Type': 'application/json'}, )
+      // ]);
+      expect(server.requests.length).to.equal(1);
+    });
+  });
+
+  describe('onBidderError', () => {
+    it(`should exists and type function`, function () {
+      expect(spec.onBidderError).to.exist.and.to.be.a('function')
+    });
+
+    it(`should send a valid error notice`, function () {
+      spec.onBidderError({ bidderRequest: ERROR_NOTICE })
+      expect(server.requests.length).to.equal(1);
+      const body = JSON.parse(server.requests[0].requestBody)
+      expect(body).to.be.a('object').that.has.all.keys('message', 'auctionId', 'bidderRequestId', 'url', 'metrics')
+      // const { bids } = JSON.parse(server.requests[0].requestBody)
+      // expect(bids).to.be.a('array').that.has.lengthOf(1)
+      // _each(bids, (bid) => {
+      //   expect(bid).to.be.a('object').that.has.all.keys('adUnitCode', 'auctionId', 'bidId', 'bidderRequestId', 'transactionId', 'metrics')
+      // })
+    });
+  });
+
+  describe('setEndPoints', () => {
+    it(`should exists and type function`, function () {
+      expect(setEndPoints).to.exist.and.to.be.a('function')
+    });
+
+    it(`should not modify default endpoints`, function () {
+      const endpoints = setEndPoints()
+      const requestURL = new URL(endpoints.request)
+      const winNoticeURL = new URL(endpoints.notice.win)
+      const timeoutNoticeURL = new URL(endpoints.notice.timeout)
+      const errorNoticeURL = new URL(endpoints.notice.error)
+
+      expect(requestURL.host).to.equal('zero.aidemsrv.com')
+      expect(winNoticeURL.host).to.equal('zero.aidemsrv.com')
+      expect(timeoutNoticeURL.host).to.equal('zero.aidemsrv.com')
+      expect(errorNoticeURL.host).to.equal('zero.aidemsrv.com')
+
+      expect(decodeURIComponent(requestURL.pathname)).to.equal('/bid/request')
+      expect(decodeURIComponent(winNoticeURL.pathname)).to.equal('/notice/win')
+      expect(decodeURIComponent(timeoutNoticeURL.pathname)).to.equal('/notice/timeout')
+      expect(decodeURIComponent(errorNoticeURL.pathname)).to.equal('/notice/error')
+    });
+
+    it(`should not change request endpoint`, function () {
+      const endpoints = setEndPoints('default')
+      const requestURL = new URL(endpoints.request)
+      expect(decodeURIComponent(requestURL.pathname)).to.equal('/bid/request')
+    });
+
+    it(`should change to local env`, function () {
+      const endpoints = setEndPoints('local')
+      const requestURL = new URL(endpoints.request)
+      const winNoticeURL = new URL(endpoints.notice.win)
+      const timeoutNoticeURL = new URL(endpoints.notice.timeout)
+      const errorNoticeURL = new URL(endpoints.notice.error)
+
+      expect(requestURL.host).to.equal('127.0.0.1:8787')
+      expect(winNoticeURL.host).to.equal('127.0.0.1:8787')
+      expect(timeoutNoticeURL.host).to.equal('127.0.0.1:8787')
+      expect(errorNoticeURL.host).to.equal('127.0.0.1:8787')
+    });
+
+    it(`should add a path prefix`, function () {
+      const endpoints = setEndPoints('local', '/path')
+      const requestURL = new URL(endpoints.request)
+      const winNoticeURL = new URL(endpoints.notice.win)
+      const timeoutNoticeURL = new URL(endpoints.notice.timeout)
+      const errorNoticeURL = new URL(endpoints.notice.error)
+
+      expect(decodeURIComponent(requestURL.pathname)).to.equal('/path/bid/request')
+      expect(decodeURIComponent(winNoticeURL.pathname)).to.equal('/path/notice/win')
+      expect(decodeURIComponent(timeoutNoticeURL.pathname)).to.equal('/path/notice/timeout')
+      expect(decodeURIComponent(errorNoticeURL.pathname)).to.equal('/path/notice/error')
+    });
+
+    it(`should add a path prefix and change request endpoint`, function () {
+      const endpoints = setEndPoints('local', '/path')
+      const requestURL = new URL(endpoints.request)
+      const winNoticeURL = new URL(endpoints.notice.win)
+      const timeoutNoticeURL = new URL(endpoints.notice.timeout)
+      const errorNoticeURL = new URL(endpoints.notice.error)
+
+      expect(decodeURIComponent(requestURL.pathname)).to.equal('/path/bid/request')
+      expect(decodeURIComponent(winNoticeURL.pathname)).to.equal('/path/notice/win')
+      expect(decodeURIComponent(timeoutNoticeURL.pathname)).to.equal('/path/notice/timeout')
+      expect(decodeURIComponent(errorNoticeURL.pathname)).to.equal('/path/notice/error')
+    });
+  });
+
+  describe('config', () => {
+    beforeEach(() => {
+      config.setConfig({
+        aidem: {
+          env: 'main'
+        }
+      });
+    })
+
+    it(`should not override default endpoints`, function () {
+      config.setConfig({
+        aidem: {
+          env: 'unknown',
+          path: '/test'
+        }
+      });
+      const { url } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const requestURL = new URL(url)
+      expect(requestURL.host).to.equal('zero.aidemsrv.com')
+    });
+
+    it(`should set local endpoints`, function () {
+      config.setConfig({
+        aidem: {
+          env: 'local',
+          path: '/test'
+        }
+      });
+      const { url } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const requestURL = new URL(url)
+      expect(requestURL.host).to.equal('127.0.0.1:8787')
+    });
+
+    it(`should set coppa`, function () {
+      config.setConfig({
+        coppa: true
+      });
+      const { data } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const request = JSON.parse(data)
+      expect(request.regs.coppa_applies).to.equal(true)
+    });
+
+    it(`should set gdpr to true`, function () {
+      config.setConfig({
+        consentManagement: {
+          gdpr: {
+            // any data here set gdpr to true
+          },
+        }
+      });
+      const { data } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const request = JSON.parse(data)
+      expect(request.regs.gdpr_applies).to.equal(true)
+    });
+
+    it(`should set usp_consent string`, function () {
+      config.setConfig({
+        consentManagement: {
+          usp: {
+            cmpApi: 'static',
+            consentData: {
+              getUSPData: {
+                uspString: '1YYY'
+              }
+            }
+          }
+        }
+      });
+      const { data } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const request = JSON.parse(data)
+      expect(request.regs.us_privacy).to.equal('1YYY')
+    });
+
+    it(`should not set usp_consent string`, function () {
+      config.setConfig({
+        consentManagement: {
+          usp: {
+            cmpApi: 'iab',
+            consentData: {
+              getUSPData: {
+                uspString: '1YYY'
+              }
+            }
+          }
+        }
+      });
+      const { data } = spec.buildRequests(DEFAULT_VALID_BANNER_REQUESTS, VALID_BIDDER_REQUEST);
+      const request = JSON.parse(data)
+      expect(request.regs.us_privacy).to.undefined
+    });
+  });
+});

From 22bf423e28b74674ecd89e7fc3f48473487f33dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Kok=C5=82owski?=
 <38455696+skoklowski@users.noreply.github.com>
Date: Mon, 28 Nov 2022 18:06:31 +0100
Subject: [PATCH 477/569] Ringier Axel Springer Bidder Adapter (#9239)

- New parameter `customParams`

Co-authored-by: skoklowski <slawomir.koklowski@ringieraxelspringer.pl>
---
 modules/rasBidAdapter.js                | 11 ++++++---
 modules/rasBidAdapter.md                | 31 +++++++++++++------------
 test/spec/modules/rasBidAdapter_spec.js |  6 ++++-
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/modules/rasBidAdapter.js b/modules/rasBidAdapter.js
index 7bc3cf66b0d..f8ca260d490 100644
--- a/modules/rasBidAdapter.js
+++ b/modules/rasBidAdapter.js
@@ -1,4 +1,3 @@
-import * as utils from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { isEmpty, getAdUnitSizes, parseSizesInput, deepAccess } from '../src/utils.js';
@@ -12,9 +11,15 @@ const getEndpoint = (network) => {
 
 function parseParams(params, bidderRequest) {
   const newParams = {};
+  if (params.customParams && typeof params.customParams === 'object') {
+    for (const param in params.customParams) {
+      if (params.customParams.hasOwnProperty(param)) {
+        newParams[param] = params.customParams[param];
+      }
+    }
+  }
   const du = deepAccess(bidderRequest, 'refererInfo.page');
   const dr = deepAccess(bidderRequest, 'refererInfo.ref');
-
   if (du) {
     newParams.du = du;
   }
@@ -93,7 +98,7 @@ const getSlots = (bidRequests) => {
   const batchSize = bidRequests.length;
   for (let i = 0; i < batchSize; i++) {
     const adunit = bidRequests[i];
-    const slotSequence = utils.deepAccess(adunit, 'params.slotSequence');
+    const slotSequence = deepAccess(adunit, 'params.slotSequence');
 
     const sizes = parseSizesInput(getAdUnitSizes(adunit)).join(',');
 
diff --git a/modules/rasBidAdapter.md b/modules/rasBidAdapter.md
index 384ba0b611f..e8a61974130 100644
--- a/modules/rasBidAdapter.md
+++ b/modules/rasBidAdapter.md
@@ -34,18 +34,19 @@ var adUnits = [{
 
 # Parameters
 
-| Name | Scope | Type | Description                                                                                                                                                                                                                                                               | Example
-| --- | --- | --- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| ---
-| network | required | String | Specific identifier provided by RAS                                                                                                                                                                                                                                       | `"4178463"`
-| site | required | String | Specific identifier name (case-insensitive) that is associated with this ad unit and provided by RAS                                                                                                                                                                      | `"example_com"`
-| area | required | String | Ad unit category name; only case-insensitive alphanumeric with underscores and hyphens are allowed                                                                                                                                                                        | `"sport"`
-| slot | required | String | Ad unit placement name (case-insensitive) provided by RAS                                                                                                                                                                                                                 | `"slot"`
-| slotSequence  | optional | Number | Ad unit sequence position provided by RAS                                                                                                                                                                                                                            | `1`
-| pageContext | optional | Object | Web page context data                                                                                                                                                                                                                                                     | `{}`
-| pageContext.dr | optional | String | Document referrer URL address                                                                                                                                                                                                                                             | `"https://example.com/"`
-| pageContext.du | optional | String | Document URL address                                                                                                                                                                                                                                                      | `"https://example.com/sport/football/article.html?id=932016a5-02fc-4d5c-b643-fafc2f270f06"`
-| pageContext.dv | optional | String | Document virtual address as slash-separated path that may consist of any number of parts (case-insensitive alphanumeric with underscores and hyphens); first part should be the same as `site` value and second as `area` value; next parts may reflect website navigation | `"example_com/sport/football"`
-| pageContext.keyWords | optional | String[] | List of keywords associated with this ad unit; only case-insensitive alphanumeric with underscores and hyphens are allowed                                                                                                                                                | `["euro", "lewandowski"]`
-| pageContext.keyValues | optional | Object | Key-values associated with this ad unit (case-insensitive); following characters are not allowed in the values: `" ' = ! + # * ~ ; ^ ( ) < > [ ] & @`                                                                                                                     | `{}`
-| pageContext.keyValues.ci | optional | String | Content unique identifier                                                                                                                                                                                                                                                 | `"932016a5-02fc-4d5c-b643-fafc2f270f06"`
-| pageContext.keyValues.adunit | optional | String | Ad unit name                                                                                                                                                                                                                                                              | `"example_com/sport"`
+| Name                         | Scope    | Type     | Description                                                                                                                                                                                                                                                                | Example                                                                                     |
+|------------------------------|----------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------|
+| network                      | required | String   | Specific identifier provided by RAS                                                                                                                                                                                                                                        | `"4178463"`                                                                                 |
+| site                         | required | String   | Specific identifier name (case-insensitive) that is associated with this ad unit and provided by RAS                                                                                                                                                                       | `"example_com"`                                                                             |
+| area                         | required | String   | Ad unit category name; only case-insensitive alphanumeric with underscores and hyphens are allowed                                                                                                                                                                         | `"sport"`                                                                                   |
+| slot                         | required | String   | Ad unit placement name (case-insensitive) provided by RAS                                                                                                                                                                                                                  | `"slot"`                                                                                    |
+| slotSequence                 | optional | Number   | Ad unit sequence position provided by RAS                                                                                                                                                                                                                                  | `1`                                                                                         |
+| pageContext                  | optional | Object   | Web page context data                                                                                                                                                                                                                                                      | `{}`                                                                                        |
+| pageContext.dr               | optional | String   | Document referrer URL address                                                                                                                                                                                                                                              | `"https://example.com/"`                                                                    |
+| pageContext.du               | optional | String   | Document URL address                                                                                                                                                                                                                                                       | `"https://example.com/sport/football/article.html?id=932016a5-02fc-4d5c-b643-fafc2f270f06"` |
+| pageContext.dv               | optional | String   | Document virtual address as slash-separated path that may consist of any number of parts (case-insensitive alphanumeric with underscores and hyphens); first part should be the same as `site` value and second as `area` value; next parts may reflect website navigation | `"example_com/sport/football"`                                                              |
+| pageContext.keyWords         | optional | String[] | List of keywords associated with this ad unit; only case-insensitive alphanumeric with underscores and hyphens are allowed                                                                                                                                                 | `["euro", "lewandowski"]`                                                                   |
+| pageContext.keyValues        | optional | Object   | Key-values associated with this ad unit (case-insensitive); following characters are not allowed in the values: `" ' = ! + # * ~ ; ^ ( ) < > [ ] & @`                                                                                                                      | `{}`                                                                                        |
+| pageContext.keyValues.ci     | optional | String   | Content unique identifier                                                                                                                                                                                                                                                  | `"932016a5-02fc-4d5c-b643-fafc2f270f06"`                                                    |
+| pageContext.keyValues.adunit | optional | String   | Ad unit name                                                                                                                                                                                                                                                               | `"example_com/sport"`                                                                       |
+| customParams                 | optional | Object   | Custom request params                                                                                                                                                                                                                                                      | `{}`                                                                                        |
\ No newline at end of file
diff --git a/test/spec/modules/rasBidAdapter_spec.js b/test/spec/modules/rasBidAdapter_spec.js
index 8c378aaa416..bfa72a2510e 100644
--- a/test/spec/modules/rasBidAdapter_spec.js
+++ b/test/spec/modules/rasBidAdapter_spec.js
@@ -59,7 +59,10 @@ describe('rasBidAdapter', function () {
         area: 'areatest',
         site: 'test',
         slotSequence: '0',
-        network: '4178463'
+        network: '4178463',
+        customParams: {
+          test: 'name=value'
+        }
       }
     };
     const bid2 = {
@@ -98,6 +101,7 @@ describe('rasBidAdapter', function () {
       expect(requests[0].url).to.have.string('euconsent=some-consent-string');
       expect(requests[0].url).to.have.string('du=https%3A%2F%2Fexample.com%2F');
       expect(requests[0].url).to.have.string('dr=https%3A%2F%2Fexample.org%2F');
+      expect(requests[0].url).to.have.string('test=name%3Dvalue');
     });
 
     it('should return empty consent string when undefined', function () {

From 54b6e7fb9ef2da399b3c95a03891db4b4e51f8fd Mon Sep 17 00:00:00 2001
From: Jason Quaccia <jlquaccia@gmail.com>
Date: Mon, 28 Nov 2022 09:09:16 -0800
Subject: [PATCH 478/569] updated ref info page logic (#9241)

---
 src/refererDetection.js                       |  7 ++-
 test/spec/modules/enrichmentFpdModule_spec.js |  5 +-
 test/spec/modules/fpdModule_spec.js           |  2 +-
 test/spec/refererDetection_spec.js            | 52 ++++++++++++++++---
 4 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/src/refererDetection.js b/src/refererDetection.js
index 15c080f5c69..e0cb15522cc 100644
--- a/src/refererDetection.js
+++ b/src/refererDetection.js
@@ -120,6 +120,7 @@ export function detectReferer(win) {
     const stack = [];
     const ancestors = getAncestorOrigins(win);
     const maxNestedIframes = config.getConfig('maxNestedIframes');
+
     let currentWindow;
     let bestLocation;
     let bestCanonicalUrl;
@@ -226,7 +227,11 @@ export function detectReferer(win) {
 
     const location = reachedTop || hasTopLocation ? bestLocation : null;
     const canonicalUrl = config.getConfig('pageUrl') || bestCanonicalUrl || null;
-    const page = ensureProtocol(canonicalUrl, win) || location;
+    let page = config.getConfig('pageUrl') || location || ensureProtocol(canonicalUrl, win);
+
+    if (location && location.indexOf('?') > -1 && page.indexOf('?') === -1) {
+      page = `${page}${location.substring(location.indexOf('?'))}`;
+    }
 
     return {
       reachedTop,
diff --git a/test/spec/modules/enrichmentFpdModule_spec.js b/test/spec/modules/enrichmentFpdModule_spec.js
index 1c6cab5afec..38853f1528c 100644
--- a/test/spec/modules/enrichmentFpdModule_spec.js
+++ b/test/spec/modules/enrichmentFpdModule_spec.js
@@ -1,4 +1,5 @@
 import { expect } from 'chai';
+import {config} from 'src/config.js';
 import { getRefererInfo } from 'src/refererDetection.js';
 import {processFpd, coreStorage, resetEnrichments} from 'modules/enrichmentFpdModule.js';
 import * as enrichmentModule from 'modules/enrichmentFpdModule.js';
@@ -77,10 +78,10 @@ describe('the first party data enrichment module', function() {
     expect(validated.site.keywords).to.be.undefined;
   });
 
-  it('adds page domain values if canonical url exists', function() {
+  it('adds page domain values if pageUrl url exists', function() {
+    config.setConfig({'pageUrl': 'https://www.subdomain.domain.co.uk/path?query=12345'});
     width = 800;
     height = 500;
-    canonical.href = 'https://www.subdomain.domain.co.uk/path?query=12345';
 
     let validated = syncProcessFpd({}, {}).global;
 
diff --git a/test/spec/modules/fpdModule_spec.js b/test/spec/modules/fpdModule_spec.js
index 8e95f462830..7d41fbb55e1 100644
--- a/test/spec/modules/fpdModule_spec.js
+++ b/test/spec/modules/fpdModule_spec.js
@@ -130,7 +130,7 @@ describe('the first party data module', function () {
         }
       };
 
-      canonical.href = 'https://www.domain.com/path?query=12345';
+      config.setConfig({'pageUrl': 'https://www.domain.com/path?query=12345'});
       width = 1120;
       height = 750;
 
diff --git a/test/spec/refererDetection_spec.js b/test/spec/refererDetection_spec.js
index 3f33d1646a1..f8166a27d85 100644
--- a/test/spec/refererDetection_spec.js
+++ b/test/spec/refererDetection_spec.js
@@ -128,11 +128,49 @@ describe('Referer detection', () => {
           numIframes: 0,
           stack: ['https://example.com/some/page'],
           canonicalUrl: 'https://example.com/canonical/page',
-          page: 'https://example.com/canonical/page',
+          page: 'https://example.com/some/page',
           ref: 'https://othersite.com/',
           domain: 'example.com'
         });
       });
+
+      it('Should set page and canonical to pageUrl value set in config if present, even if canonical url is also present in head', () => {
+        config.setConfig({'pageUrl': 'https://www.set-from-config.com/path'});
+        const testWindow = buildWindowTree(['https://example.com/some/page'], 'https://othersite.com/', 'https://example.com/canonical/page'),
+          result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          topmostLocation: 'https://example.com/some/page',
+          location: 'https://example.com/some/page',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: ['https://example.com/some/page'],
+          canonicalUrl: 'https://www.set-from-config.com/path',
+          page: 'https://www.set-from-config.com/path',
+          ref: 'https://othersite.com/',
+          domain: 'www.set-from-config.com'
+        });
+      });
+
+      it('Should set page with query params if canonical url is present without query params but the current page does have them', () => {
+        config.setConfig({'pageUrl': 'https://www.set-from-config.com/path'});
+        const testWindow = buildWindowTree(['https://example.com/some/page?query1=123&query2=456'], 'https://othersite.com/', 'https://example.com/canonical/page'),
+          result = detectReferer(testWindow)();
+
+        sinon.assert.match(result, {
+          topmostLocation: 'https://example.com/some/page?query1=123&query2=456',
+          location: 'https://example.com/some/page?query1=123&query2=456',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: ['https://example.com/some/page?query1=123&query2=456'],
+          canonicalUrl: 'https://www.set-from-config.com/path',
+          page: 'https://www.set-from-config.com/path?query1=123&query2=456',
+          ref: 'https://othersite.com/',
+          domain: 'www.set-from-config.com'
+        });
+      });
     });
 
     describe('Friendly iframes', () => {
@@ -174,7 +212,7 @@ describe('Referer detection', () => {
             'https://example.com/third/page'
           ],
           canonicalUrl: 'https://example.com/canonical/page',
-          page: 'https://example.com/canonical/page',
+          page: 'https://example.com/some/page',
           ref: 'https://othersite.com/',
           domain: 'example.com'
         });
@@ -317,7 +355,7 @@ describe('Referer detection', () => {
           'https://ad-iframe.ampproject.org/ad'
         ],
         canonicalUrl: 'https://example.com/some/page/',
-        page: 'https://example.com/some/page/',
+        page: 'https://example.com/some/page/amp/',
         ref: null,
         domain: 'example.com'
       });
@@ -344,7 +382,7 @@ describe('Referer detection', () => {
           'https://ad-iframe.ampproject.org/ad'
         ],
         canonicalUrl: 'https://example.com/some/page/',
-        page: 'https://example.com/some/page/',
+        page: 'https://example.com/some/page/amp/',
         ref: null,
         domain: 'example.com'
       });
@@ -384,7 +422,7 @@ describe('Referer detection', () => {
             'https://ad-iframe.ampproject.org/ad'
           ],
           canonicalUrl: 'https://example.com/some/page/',
-          page: 'https://example.com/some/page/',
+          page: 'https://example.com/some/page/amp/',
           ref: null,
           domain: 'example.com',
         });
@@ -412,7 +450,7 @@ describe('Referer detection', () => {
             'https://ad-iframe.ampproject.org/ad'
           ],
           canonicalUrl: 'https://example.com/some/page/',
-          page: 'https://example.com/some/page/',
+          page: 'https://example.com/some/page/amp/',
           ref: null,
           domain: 'example.com'
         });
@@ -441,7 +479,7 @@ describe('Referer detection', () => {
             'https://ad-iframe.ampproject.org/ad'
           ],
           canonicalUrl: 'https://example.com/some/page/',
-          page: 'https://example.com/some/page/',
+          page: 'https://example.com/some/page/amp/',
           ref: null,
           domain: 'example.com',
         });

From 5a9aaa8ca5bb47393ddfb08b00d1c4e0af5fd850 Mon Sep 17 00:00:00 2001
From: Elad Yosifon <elad-yosifon@users.noreply.github.com>
Date: Mon, 28 Nov 2022 19:10:23 +0200
Subject: [PATCH 479/569] fix for broken download bundle
 https://github.com/prebid/prebid.github.io/issues/4177 (#9289)

---
 modules/{kueezRtbBidAdapter.js => kueezrtbBidAdapter.js}        | 0
 modules/{kueezRtbBidAdapter.md => kueezrtbBidAdapter.md}        | 0
 .../{kueezRtbBidAdapter_spec.js => kueezrtbBidAdapter_spec.js}  | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename modules/{kueezRtbBidAdapter.js => kueezrtbBidAdapter.js} (100%)
 rename modules/{kueezRtbBidAdapter.md => kueezrtbBidAdapter.md} (100%)
 rename test/spec/modules/{kueezRtbBidAdapter_spec.js => kueezrtbBidAdapter_spec.js} (99%)

diff --git a/modules/kueezRtbBidAdapter.js b/modules/kueezrtbBidAdapter.js
similarity index 100%
rename from modules/kueezRtbBidAdapter.js
rename to modules/kueezrtbBidAdapter.js
diff --git a/modules/kueezRtbBidAdapter.md b/modules/kueezrtbBidAdapter.md
similarity index 100%
rename from modules/kueezRtbBidAdapter.md
rename to modules/kueezrtbBidAdapter.md
diff --git a/test/spec/modules/kueezRtbBidAdapter_spec.js b/test/spec/modules/kueezrtbBidAdapter_spec.js
similarity index 99%
rename from test/spec/modules/kueezRtbBidAdapter_spec.js
rename to test/spec/modules/kueezrtbBidAdapter_spec.js
index f9b2cd41a43..70ece966651 100644
--- a/test/spec/modules/kueezRtbBidAdapter_spec.js
+++ b/test/spec/modules/kueezrtbBidAdapter_spec.js
@@ -11,7 +11,7 @@ import {
   setStorageItem,
   tryParseJSON,
   getUniqueDealId,
-} from 'modules/kueezRtbBidAdapter.js';
+} from 'modules/kueezrtbBidAdapter.js';
 import * as utils from 'src/utils.js';
 import {version} from 'package.json';
 import {useFakeTimers} from 'sinon';

From 34fd9fbe0c19c94a2b62e2c49f2f16453d36c79e Mon Sep 17 00:00:00 2001
From: Saveliev Taras <t.savelev@gmail.com>
Date: Mon, 28 Nov 2022 18:21:55 +0100
Subject: [PATCH 480/569] Yandex Bid Adapter: (#9280)

* refactoring;
* added banner.format to payload;
* added tmax support;
* fixed nurl sending;
* added support for the block identifier format in the Yandex Ad system;

Co-authored-by: Taras Saveliev <t-saveliev@yandex-team.ru>
---
 modules/yandexBidAdapter.js                | 104 +++++++++++++++++----
 modules/yandexBidAdapter.md                |  14 +--
 test/spec/modules/yandexBidAdapter_spec.js |  35 ++++---
 3 files changed, 114 insertions(+), 39 deletions(-)

diff --git a/modules/yandexBidAdapter.js b/modules/yandexBidAdapter.js
index af465453c22..f73b4369869 100644
--- a/modules/yandexBidAdapter.js
+++ b/modules/yandexBidAdapter.js
@@ -1,5 +1,6 @@
-import { formatQS, deepAccess, triggerPixel } from '../src/utils.js';
+import { formatQS, deepAccess, triggerPixel, isArray, isNumber } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js'
 
 const BIDDER_CODE = 'yandex';
 const BIDDER_URL = 'https://bs.yandex.ru/metadsp';
@@ -10,9 +11,19 @@ const SSP_ID = 10500;
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['ya'], // short code
+  supportedMediaTypes: [ BANNER ],
 
   isBidRequestValid: function(bid) {
-    return !!(bid.params && bid.params.pageId && bid.params.impId);
+    const { params } = bid;
+    if (!params) {
+      return false;
+    }
+    const { pageId, impId } = extractPlacementIds(params);
+    if (!(pageId && impId)) {
+      return false;
+    }
+    const sizes = bid.mediaTypes?.banner?.sizes;
+    return isArray(sizes) && isArray(sizes[0]) && isNumber(sizes[0][0]) && isNumber(sizes[0][1]);
   },
 
   buildRequests: function(validBidRequests, bidderRequest) {
@@ -29,9 +40,19 @@ export const spec = {
       page = bidderRequest.refererInfo.page;
     }
 
+    let timeout = null;
+    if (bidderRequest) {
+      timeout = bidderRequest.timeout;
+    }
+
     return validBidRequests.map((bidRequest) => {
       const { params } = bidRequest;
-      const { pageId, impId, targetRef, withCredentials = true } = params;
+      const { targetRef, withCredentials = true } = params;
+      const sizes = bidRequest.mediaTypes.banner.sizes;
+      const size = sizes[0];
+      const [ w, h ] = size;
+
+      const { pageId, impId } = extractPlacementIds(params);
 
       const queryParams = {
         'imp-id': impId,
@@ -43,24 +64,23 @@ export const spec = {
         queryParams['tcf-consent'] = consentString;
       }
 
-      const floorInfo = bidRequest.getFloor ? bidRequest.getFloor({
-        currency: DEFAULT_CURRENCY
-      }) : {};
-      const bidfloor = floorInfo.floor;
-      const bidfloorcur = floorInfo.currency;
-
       const imp = {
         id: impId,
-        bidfloor,
-        bidfloorcur,
-      };
-      const bannerParams = deepAccess(bidRequest, 'mediaTypes.banner');
-      if (bannerParams) {
-        const [ w, h ] = bannerParams.sizes[0];
-        imp.banner = {
+        banner: {
+          format: sizes,
           w,
           h,
-        };
+        }
+      };
+
+      if (bidRequest.getFloor) {
+        const floorInfo = bidRequest.getFloor({
+          currency: DEFAULT_CURRENCY,
+          size
+        });
+
+        imp.bidfloor = floorInfo.floor;
+        imp.bidfloorcur = floorInfo.currency;
       }
 
       const queryParamsString = formatQS(queryParams);
@@ -74,6 +94,7 @@ export const spec = {
             ref_url: referrer,
             page_url: page,
           },
+          tmax: timeout,
         },
         options: {
           withCredentials,
@@ -102,6 +123,7 @@ export const spec = {
         width: rtbBid.w,
         height: rtbBid.h,
         creativeId: rtbBid.adid,
+        nurl: rtbBid.nurl,
 
         netRevenue: true,
         ttl: DEFAULT_TTL,
@@ -118,13 +140,57 @@ export const spec = {
   },
 
   onBidWon: function (bid) {
-    const nurl = bid['nurl'];
-
+    let nurl = bid['nurl'];
     if (!nurl) {
       return;
     }
+
+    const cpm = deepAccess(bid, 'adserverTargeting.hb_pb') || '';
+    const curr = (bid.hasOwnProperty('originalCurrency') && bid.hasOwnProperty('originalCpm'))
+      ? bid.originalCurrency
+      : bid.currency;
+
+    nurl = nurl
+      .replace(/\${AUCTION_PRICE}/, cpm)
+      .replace(/\${AUCTION_CURRENCY}/, curr)
+    ;
+
     triggerPixel(nurl);
   }
 }
 
+function extractPlacementIds(bidRequestParams) {
+  const { placementId } = bidRequestParams;
+  const result = { pageId: null, impId: null };
+
+  let pageId, impId;
+  if (placementId) {
+    /*
+     * Possible formats
+     * R-I-123456-2
+     * R-123456-1
+     * 123456-789
+     */
+    const num = placementId.lastIndexOf('-');
+    if (num === -1) {
+      return result;
+    }
+    const num2 = placementId.lastIndexOf('-', num - 1);
+    pageId = placementId.slice(num2 + 1, num);
+    impId = placementId.slice(num + 1);
+  } else {
+    pageId = bidRequestParams.pageId;
+    impId = bidRequestParams.impId;
+  }
+
+  if (!parseInt(pageId, 10) || !parseInt(impId, 10)) {
+    return result;
+  }
+
+  result.pageId = pageId;
+  result.impId = impId;
+
+  return result;
+}
+
 registerBidder(spec);
diff --git a/modules/yandexBidAdapter.md b/modules/yandexBidAdapter.md
index 7a51d7bc5fb..aee51bca249 100644
--- a/modules/yandexBidAdapter.md
+++ b/modules/yandexBidAdapter.md
@@ -12,10 +12,11 @@ Yandex Bidder Adapter for Prebid.js.
 
 # Parameters
 
-| Name          | Scope    | Description             | Example   | Type      |
-|---------------|----------|-------------------------|-----------|-----------|
-| `pageId`      | required | Page ID                 | `123`     | `Integer` |
-| `impId`       | required | Block ID                | `1`       | `Integer` |
+| Name          | Required?                                  | Description | Example | Type      |
+|---------------|--------------------------------------------|-------------|---------|-----------|
+| `placementId` | Yes                                        | Block ID    | `123-1` | `String`  |
+| `pageId`      | No<br>Deprecated. Please use `placementId` | Page ID     | `123`   | `Integer` |
+| `impId`       | No<br>Deprecated. Please use `placementId` | Imp ID      | `1`     | `Integer` |
 
 # Test Parameters
 
@@ -24,15 +25,14 @@ var adUnits = [{
   code: 'banner-1',
   mediaTypes: {
     banner: {
-      sizes: [[240, 400]],
+      sizes: [[240, 400], [300, 600]],
     }
   },
   bids: [{
     {
       bidder: 'yandex',
       params: {
-        pageId: 346580,
-        impId: 143,
+        placementId: '346580-1'
       },
     }
   }]
diff --git a/test/spec/modules/yandexBidAdapter_spec.js b/test/spec/modules/yandexBidAdapter_spec.js
index eee53771a80..df91100b966 100644
--- a/test/spec/modules/yandexBidAdapter_spec.js
+++ b/test/spec/modules/yandexBidAdapter_spec.js
@@ -1,15 +1,14 @@
-import {assert, expect} from 'chai';
-import {spec} from 'modules/yandexBidAdapter.js';
-import {parseUrl} from 'src/utils.js';
-import {BANNER} from '../../../src/mediaTypes';
+import { assert, expect } from 'chai';
+import { spec } from 'modules/yandexBidAdapter.js';
+import { parseUrl } from 'src/utils.js';
+import { BANNER } from '../../../src/mediaTypes';
 
 describe('Yandex adapter', function () {
   function getBidConfig() {
     return {
       bidder: 'yandex',
       params: {
-        pageId: 123,
-        impId: 1,
+        placementId: '123-1',
       },
     };
   }
@@ -32,7 +31,7 @@ describe('Yandex adapter', function () {
 
   describe('isBidRequestValid', function () {
     it('should return true when required params found', function () {
-      const bid = getBidConfig();
+      const bid = getBidRequest();
       assert(spec.isBidRequestValid(bid));
     });
 
@@ -40,18 +39,28 @@ describe('Yandex adapter', function () {
       expect(spec.isBidRequestValid({})).to.be.false;
     });
 
-    it('should return false when required params.pageId are not passed', function () {
+    it('should return false when required params.placementId are not passed', function () {
+      const bid = getBidConfig();
+      delete bid.params.placementId;
+
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+
+    it('should return false when required params.placementId are not valid', function () {
       const bid = getBidConfig();
-      delete bid.params.pageId;
+      bid.params.placementId = '123';
 
-      expect(spec.isBidRequestValid(bid)).to.be.false
+      expect(spec.isBidRequestValid(bid)).to.be.false;
     });
 
-    it('should return false when required params.impId are not passed', function () {
+    it('should return true when passed deprecated placement config', function () {
       const bid = getBidConfig();
-      delete bid.params.impId;
+      delete bid.params.placementId;
+
+      bid.params.pageId = 123;
+      bid.params.impId = 1;
 
-      expect(spec.isBidRequestValid(bid)).to.be.false
+      expect(spec.isBidRequestValid(bid));
     });
   });
 

From 78aa883107e519980a87e298d0c8d8b6bac46029 Mon Sep 17 00:00:00 2001
From: Yoko OYAMA <yowcow@gmail.com>
Date: Tue, 29 Nov 2022 02:41:19 +0900
Subject: [PATCH 481/569] Fluct Bid Adapter: add schain support (#9266)

* add schain to req

* run circleci

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/fluctBidAdapter.js                |  5 +++
 test/spec/modules/fluctBidAdapter_spec.js | 38 ++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/modules/fluctBidAdapter.js b/modules/fluctBidAdapter.js
index ea634027dbe..004d44e6737 100644
--- a/modules/fluctBidAdapter.js
+++ b/modules/fluctBidAdapter.js
@@ -62,6 +62,11 @@ export const spec = {
       });
 
       data.params = request.params;
+
+      if (request.schain) {
+        data.schain = request.schain;
+      }
+
       const searchParams = new URLSearchParams({
         dfpUnitCode: request.params.dfpUnitCode,
         tagId: request.params.tagId,
diff --git a/test/spec/modules/fluctBidAdapter_spec.js b/test/spec/modules/fluctBidAdapter_spec.js
index 8ef99727ce7..92a4b42f6f8 100644
--- a/test/spec/modules/fluctBidAdapter_spec.js
+++ b/test/spec/modules/fluctBidAdapter_spec.js
@@ -94,7 +94,12 @@ describe('fluctAdapter', function () {
       expect(request.data.params.kv).to.eql(undefined);
     });
 
-    it('includes filtered user.eids if any exists', function () {
+    it('includes no data.schain by default', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data.schain).to.eql(undefined);
+    });
+
+    it('includes filtered user.eids if any exist', function () {
       const bidRequests2 = bidRequests.map(
         (bidReq) => Object.assign(bidReq, {
           userIdAsEids: [
@@ -175,6 +180,37 @@ describe('fluctAdapter', function () {
         imsids: ['imsid1', 'imsid2']
       });
     });
+
+    it('includes data.schain if any exists', function () {
+      // this should be done by schain.js
+      const bidRequests2 = bidRequests.map(
+        (bidReq) => Object.assign(bidReq, {
+          schain: {
+            ver: '1.0',
+            complete: 1,
+            nodes: [
+              {
+                asi: 'example.com',
+                sid: 'publisher-id',
+                hp: 1
+              }
+            ]
+          }
+        })
+      );
+      const request = spec.buildRequests(bidRequests2, bidderRequest)[0];
+      expect(request.data.schain).to.eql({
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            asi: 'example.com',
+            sid: 'publisher-id',
+            hp: 1
+          }
+        ]
+      });
+    });
   });
 
   describe('interpretResponse', function() {

From 3261b061678ef9f565107de96b8457b35d763cd2 Mon Sep 17 00:00:00 2001
From: ssorleti <100858633+ssorleti@users.noreply.github.com>
Date: Mon, 28 Nov 2022 18:44:55 +0100
Subject: [PATCH 482/569] Update bucksense adapter - new server endpoint
 (#9292)

---
 modules/bucksenseBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/bucksenseBidAdapter.js b/modules/bucksenseBidAdapter.js
index fcf99179993..7b6c3911ea1 100644
--- a/modules/bucksenseBidAdapter.js
+++ b/modules/bucksenseBidAdapter.js
@@ -4,7 +4,7 @@ import { BANNER } from '../src/mediaTypes.js';
 
 const WHO = 'BKSHBID-005';
 const BIDDER_CODE = 'bucksense';
-const URL = 'https://prebid.bksn.se/prebidjs/';
+const URL = 'https://directo.prebidserving.com/prebidjs/';
 
 export const spec = {
   code: BIDDER_CODE,

From b50716816925f8c4865a21ad3969eaad20942a35 Mon Sep 17 00:00:00 2001
From: Yohan Boutin <yohan@seedtag.com>
Date: Mon, 28 Nov 2022 18:45:35 +0100
Subject: [PATCH 483/569] Seedtag Bid Adapter : add support for inBanner and
 inStream (#9230)

* use inBanner and inStream for video

* remove duplicate video params, now use only params from adunit level

* lint

* improve unit test

* fix adapter for instream support, and fix unit test

* use inStream placement for instream context

* use ALLOWED_DISPLAY_PLACEMENTS

* fix lint error

* empty commit to relaunch CI
---
 modules/seedtagBidAdapter.js                | 123 ++++++++-------
 modules/seedtagBidAdapter.md                |  60 ++++++++
 test/spec/modules/seedtagBidAdapter_spec.js | 157 ++++++++------------
 3 files changed, 192 insertions(+), 148 deletions(-)

diff --git a/modules/seedtagBidAdapter.js b/modules/seedtagBidAdapter.js
index 850ac5610f5..1a4f903789b 100644
--- a/modules/seedtagBidAdapter.js
+++ b/modules/seedtagBidAdapter.js
@@ -1,19 +1,18 @@
 import { isArray, _map, triggerPixel } from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js'
-import { VIDEO, BANNER } from '../src/mediaTypes.js'
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { VIDEO, BANNER } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'seedtag';
 const SEEDTAG_ALIAS = 'st';
 const SEEDTAG_SSP_ENDPOINT = 'https://s.seedtag.com/c/hb/bid';
 const SEEDTAG_SSP_ONTIMEOUT_ENDPOINT = 'https://s.seedtag.com/se/hb/timeout';
-const ALLOWED_PLACEMENTS = {
-  inImage: true,
-  inScreen: true,
-  inArticle: true,
-  banner: true,
-  video: true
-}
+const ALLOWED_DISPLAY_PLACEMENTS = [
+  'inScreen',
+  'inImage',
+  'inArticle',
+  'inBanner',
+];
 
 // Global Vendor List Id
 // https://iabeurope.eu/vendor-list-tcf-v2-0/
@@ -21,27 +20,33 @@ const GVLID = 157;
 
 const mediaTypesMap = {
   [BANNER]: 'display',
-  [VIDEO]: 'video'
+  [VIDEO]: 'video',
 };
 
 const deviceConnection = {
   FIXED: 'fixed',
   MOBILE: 'mobile',
-  UNKNOWN: 'unknown'
+  UNKNOWN: 'unknown',
 };
 
 const getConnectionType = () => {
-  const connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection || {}
+  const connection =
+    navigator.connection ||
+    navigator.mozConnection ||
+    navigator.webkitConnection ||
+    {};
   switch (connection.type || connection.effectiveType) {
     case 'wifi':
     case 'ethernet':
-      return deviceConnection.FIXED
+      return deviceConnection.FIXED;
     case 'cellular':
     case 'wimax':
-      return deviceConnection.MOBILE
+      return deviceConnection.MOBILE;
     default:
-      const isMobile = /iPad|iPhone|iPod/.test(navigator.userAgent) || /android/i.test(navigator.userAgent)
-      return isMobile ? deviceConnection.UNKNOWN : deviceConnection.FIXED
+      const isMobile =
+        /iPad|iPhone|iPod/.test(navigator.userAgent) ||
+        /android/i.test(navigator.userAgent);
+      return isMobile ? deviceConnection.UNKNOWN : deviceConnection.FIXED;
   }
 };
 
@@ -52,24 +57,32 @@ function mapMediaType(seedtagMediaType) {
 }
 
 function hasVideoMediaType(bid) {
-  return (!!bid.mediaTypes && !!bid.mediaTypes.video) || (!!bid.params && !!bid.params.video)
+  return !!bid.mediaTypes && !!bid.mediaTypes.video;
 }
 
-function hasMandatoryParams(params) {
+function hasMandatoryDisplayParams(bid) {
+  const p = bid.params;
   return (
-    !!params.publisherId &&
-    !!params.adUnitId &&
-    !!params.placement &&
-    !!ALLOWED_PLACEMENTS[params.placement]
+    !!p.publisherId &&
+    !!p.adUnitId &&
+    ALLOWED_DISPLAY_PLACEMENTS.indexOf(p.placement) > -1
   );
 }
 
 function hasMandatoryVideoParams(bid) {
-  const videoParams = getVideoParams(bid)
+  const videoParams = getVideoParams(bid);
 
-  return hasVideoMediaType(bid) && !!videoParams.playerSize &&
+  return (
+    !!bid.params.publisherId &&
+    !!bid.params.adUnitId &&
+    hasVideoMediaType(bid) &&
+    !!videoParams.playerSize &&
     isArray(videoParams.playerSize) &&
-    videoParams.playerSize.length > 0;
+    videoParams.playerSize.length > 0 &&
+    // only instream is supported for video
+    videoParams.context === 'instream' &&
+    bid.params.placement === 'inStream'
+  );
 }
 
 function buildBidRequest(validBidRequest) {
@@ -89,15 +102,11 @@ function buildBidRequest(validBidRequest) {
     adUnitId: params.adUnitId,
     adUnitCode: validBidRequest.adUnitCode,
     placement: params.placement,
-    requestCount: validBidRequest.bidderRequestsCount || 1 // FIXME : in unit test the parameter bidderRequestsCount is undefined
+    requestCount: validBidRequest.bidderRequestsCount || 1, // FIXME : in unit test the parameter bidderRequestsCount is undefined
   };
 
-  if (params.adPosition) {
-    bidRequest.adPosition = params.adPosition;
-  }
-
   if (hasVideoMediaType(validBidRequest)) {
-    bidRequest.videoParams = getVideoParams(validBidRequest)
+    bidRequest.videoParams = getVideoParams(validBidRequest);
   }
 
   return bidRequest;
@@ -113,13 +122,7 @@ function getVideoParams(validBidRequest) {
     videoParams.h = videoParams.playerSize[0][1];
   }
 
-  const bidderVideoParams = (validBidRequest.params && validBidRequest.params.video) || {}
-  // override video params from seedtag bidder params
-  Object.keys(bidderVideoParams).forEach(key => {
-    videoParams[key] = validBidRequest.params.video[key]
-  })
-
-  return videoParams
+  return videoParams;
 }
 
 function buildBidResponse(seedtagBid) {
@@ -136,8 +139,11 @@ function buildBidResponse(seedtagBid) {
     ttl: seedtagBid.ttl,
     nurl: seedtagBid.nurl,
     meta: {
-      advertiserDomains: seedtagBid && seedtagBid.adomain && seedtagBid.adomain.length > 0 ? seedtagBid.adomain : []
-    }
+      advertiserDomains:
+        seedtagBid && seedtagBid.adomain && seedtagBid.adomain.length > 0
+          ? seedtagBid.adomain
+          : [],
+    },
   };
 
   if (mediaType === VIDEO) {
@@ -181,16 +187,21 @@ function ttfb() {
 export function getTimeoutUrl(data) {
   let queryParams = '';
   if (
-    isArray(data) && data[0] &&
-    isArray(data[0].params) && data[0].params[0]
+    isArray(data) &&
+    data[0] &&
+    isArray(data[0].params) &&
+    data[0].params[0]
   ) {
     const params = data[0].params[0];
-    const timeout = data[0].timeout
+    const timeout = data[0].timeout;
 
     queryParams =
-      '?publisherToken=' + params.publisherId +
-      '&adUnitId=' + params.adUnitId +
-      '&timeout=' + timeout;
+      '?publisherToken=' +
+      params.publisherId +
+      '&adUnitId=' +
+      params.adUnitId +
+      '&timeout=' +
+      timeout;
   }
   return SEEDTAG_SSP_ONTIMEOUT_ENDPOINT + queryParams;
 }
@@ -208,8 +219,8 @@ export const spec = {
    */
   isBidRequestValid(bid) {
     return hasVideoMediaType(bid)
-      ? hasMandatoryParams(bid.params) && hasMandatoryVideoParams(bid)
-      : hasMandatoryParams(bid.params);
+      ? hasMandatoryVideoParams(bid)
+      : hasMandatoryDisplayParams(bid);
   },
 
   /**
@@ -237,24 +248,24 @@ export const spec = {
       payload['cd'] = bidderRequest.gdprConsent.consentString;
     }
     if (bidderRequest.uspConsent) {
-      payload['uspConsent'] = bidderRequest.uspConsent
+      payload['uspConsent'] = bidderRequest.uspConsent;
     }
 
     if (validBidRequests[0].schain) {
       payload.schain = validBidRequests[0].schain;
     }
 
-    let coppa = config.getConfig('coppa')
+    let coppa = config.getConfig('coppa');
     if (coppa) {
-      payload.coppa = coppa
+      payload.coppa = coppa;
     }
 
-    const payloadString = JSON.stringify(payload)
+    const payloadString = JSON.stringify(payload);
     return {
       method: 'POST',
       url: SEEDTAG_SSP_ENDPOINT,
-      data: payloadString
-    }
+      data: payloadString,
+    };
   },
 
   /**
@@ -308,6 +319,6 @@ export const spec = {
     if (bid && bid.nurl) {
       triggerPixel(bid.nurl);
     }
-  }
-}
+  },
+};
 registerBidder(spec);
diff --git a/modules/seedtagBidAdapter.md b/modules/seedtagBidAdapter.md
index 061a254c5fa..8ccfcfb701e 100644
--- a/modules/seedtagBidAdapter.md
+++ b/modules/seedtagBidAdapter.md
@@ -59,3 +59,63 @@ const adUnits = [
   }
 ]
 ```
+
+## InBanner
+```js
+const adUnits = [
+  {
+    code: '/21804003197/prebid_test_300x250',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      }
+    },
+    bids: [
+      {
+        bidder: 'seedtag',
+        params: {
+          publisherId: '0000-0000-01',      // required
+          adUnitId: '0000',                 // required
+          placement: 'inBanner',              // required
+        }
+      }
+    ]
+  }
+]
+```
+
+## inStream Video
+```js
+var adUnits = [{
+  code: 'video',
+  mediaTypes: {
+    video: {
+      context: 'instream',   // required
+      playerSize: [640, 360], // required
+      // Video object as specified in OpenRTB 2.5
+      mimes: ['video/mp4'], // recommended
+      minduration: 5,       // optional
+      maxduration: 60,      // optional
+      boxingallowed: 1,     // optional
+      skip: 1,              // optional
+      startdelay: 1,        // optional
+      linearity: 1,         // optional
+      battr: [1, 2],        // optional
+      maxbitrate: 10,       // optional
+      playbackmethod: [1],  // optional
+      delivery: [1],        // optional
+      placement: 1,         // optional
+    }
+  },
+  bids: [
+    {
+      bidder: 'seedtag',
+      params: {
+        publisherId: '0000-0000-01',    // required
+        adUnitId: '0000',               // required
+        placement: 'inStream',          // required
+      }
+    }
+  ]
+}];
+```
diff --git a/test/spec/modules/seedtagBidAdapter_spec.js b/test/spec/modules/seedtagBidAdapter_spec.js
index bd726bfe971..d0efd5f1f75 100644
--- a/test/spec/modules/seedtagBidAdapter_spec.js
+++ b/test/spec/modules/seedtagBidAdapter_spec.js
@@ -25,11 +25,11 @@ function getSlotConfigs(mediaTypes, params) {
   };
 }
 
-function createVideoSlotConfig(mediaType) {
+function createInStreamSlotConfig(mediaType) {
   return getSlotConfigs(mediaType, {
     publisherId: PUBLISHER_ID,
     adUnitId: ADUNIT_ID,
-    placement: 'video',
+    placement: 'inStream',
   });
 }
 
@@ -48,13 +48,7 @@ describe('Seedtag Adapter', function () {
               }
             );
           };
-          const placements = [
-            'banner',
-            'video',
-            'inImage',
-            'inScreen',
-            'inArticle',
-          ];
+          const placements = ['inBanner', 'inImage', 'inScreen', 'inArticle'];
           placements.forEach((placement) => {
             it('should be ' + placement, function () {
               const isBidRequestValid = spec.isBidRequestValid(
@@ -67,39 +61,41 @@ describe('Seedtag Adapter', function () {
       });
       describe('when video slot has all mandatory params', function () {
         it('should return true, when video context is instream', function () {
-          const slotConfig = getSlotConfigs(
-            {
-              video: {
-                context: 'instream',
-                playerSize: [[600, 200]],
-              },
+          const slotConfig = createInStreamSlotConfig({
+            video: {
+              context: 'instream',
+              playerSize: [[600, 200]],
             },
-            {
-              publisherId: PUBLISHER_ID,
-              adUnitId: ADUNIT_ID,
-              placement: 'video',
-            }
-          );
+          });
           const isBidRequestValid = spec.isBidRequestValid(slotConfig);
           expect(isBidRequestValid).to.equal(true);
         });
-
-        it('should return true, when video context is outstream', function () {
+        it('should return true, when video context is instream, but placement is not inStream', function () {
           const slotConfig = getSlotConfigs(
             {
               video: {
-                context: 'outstream',
+                context: 'instream',
                 playerSize: [[600, 200]],
               },
             },
             {
               publisherId: PUBLISHER_ID,
               adUnitId: ADUNIT_ID,
-              placement: 'video',
+              placement: 'inBanner',
             }
           );
           const isBidRequestValid = spec.isBidRequestValid(slotConfig);
-          expect(isBidRequestValid).to.equal(true);
+          expect(isBidRequestValid).to.equal(false);
+        });
+        it('should return false, when video context is outstream', function () {
+          const slotConfig = createInStreamSlotConfig({
+            video: {
+              context: 'outstream',
+              playerSize: [[600, 200]],
+            },
+          });
+          const isBidRequestValid = spec.isBidRequestValid(slotConfig);
+          expect(isBidRequestValid).to.equal(false);
         });
       });
     });
@@ -112,7 +108,7 @@ describe('Seedtag Adapter', function () {
           const isBidRequestValid = spec.isBidRequestValid(
             createSlotConfig({
               adUnitId: ADUNIT_ID,
-              placement: 'banner',
+              placement: 'inBanner',
             })
           );
           expect(isBidRequestValid).to.equal(false);
@@ -121,7 +117,7 @@ describe('Seedtag Adapter', function () {
           const isBidRequestValid = spec.isBidRequestValid(
             createSlotConfig({
               publisherId: PUBLISHER_ID,
-              placement: 'banner',
+              placement: 'inBanner',
             })
           );
           expect(isBidRequestValid).to.equal(false);
@@ -146,47 +142,41 @@ describe('Seedtag Adapter', function () {
           expect(isBidRequestValid).to.equal(false);
         });
       });
+
       describe('when video mediaType object is not correct', function () {
-        function createVideoSlotconfig(mediaType) {
-          return getSlotConfigs(mediaType, {
-            publisherId: PUBLISHER_ID,
-            adUnitId: ADUNIT_ID,
-            placement: 'video',
-          });
-        }
         it('is a void object', function () {
           const isBidRequestValid = spec.isBidRequestValid(
-            createVideoSlotConfig({ video: {} })
+            createInStreamSlotConfig({ video: {} })
           );
           expect(isBidRequestValid).to.equal(false);
         });
         it('does not have playerSize.', function () {
           const isBidRequestValid = spec.isBidRequestValid(
-            createVideoSlotConfig({ video: { context: 'instream' } })
+            createInStreamSlotConfig({ video: { context: 'instream' } })
           );
           expect(isBidRequestValid).to.equal(false);
         });
         it('is outstream ', function () {
           const isBidRequestValid = spec.isBidRequestValid(
-            createVideoSlotConfig({
+            createInStreamSlotConfig({
               video: {
                 context: 'outstream',
                 playerSize: [[600, 200]],
               },
             })
           );
-          expect(isBidRequestValid).to.equal(true);
+          expect(isBidRequestValid).to.equal(false);
         });
         describe('order does not matter', function () {
           it('when video is not the first slot', function () {
             const isBidRequestValid = spec.isBidRequestValid(
-              createVideoSlotConfig({ banner: {}, video: {} })
+              createInStreamSlotConfig({ banner: {}, video: {} })
             );
             expect(isBidRequestValid).to.equal(false);
           });
           it('when video is the first slot', function () {
             const isBidRequestValid = spec.isBidRequestValid(
-              createVideoSlotConfig({ video: {}, banner: {} })
+              createInStreamSlotConfig({ video: {}, banner: {} })
             );
             expect(isBidRequestValid).to.equal(false);
           });
@@ -200,21 +190,27 @@ describe('Seedtag Adapter', function () {
       refererInfo: { page: 'referer' },
       timeout: 1000,
     };
-    const mandatoryParams = {
+    const mandatoryDisplayParams = {
       publisherId: PUBLISHER_ID,
       adUnitId: ADUNIT_ID,
-      placement: 'banner',
+      placement: 'inBanner',
+    };
+    const mandatoryVideoParams = {
+      publisherId: PUBLISHER_ID,
+      adUnitId: ADUNIT_ID,
+      placement: 'inStream',
     };
-    const inStreamParams = Object.assign({}, mandatoryParams, {
-      video: {
-        mimes: 'mp4',
-      },
-    });
     const validBidRequests = [
-      getSlotConfigs({ banner: {} }, mandatoryParams),
+      getSlotConfigs({ banner: {} }, mandatoryDisplayParams),
       getSlotConfigs(
-        { video: { context: 'instream', playerSize: [[300, 200]] } },
-        inStreamParams
+        {
+          video: {
+            context: 'instream',
+            playerSize: [[300, 200]],
+            mimes: ['video/mp4'],
+          },
+        },
+        mandatoryVideoParams
       ),
     ];
     it('Url params should be correct ', function () {
@@ -239,26 +235,6 @@ describe('Seedtag Adapter', function () {
       expect(data.bidRequests[0].adUnitCode).to.equal('adunit-code');
     });
 
-    describe('adPosition param', function () {
-      it('should sended when publisher set adPosition param', function () {
-        const params = Object.assign({}, mandatoryParams, {
-          adPosition: 1,
-        });
-        const validBidRequests = [getSlotConfigs({ banner: {} }, params)];
-        const request = spec.buildRequests(validBidRequests, bidderRequest);
-        const data = JSON.parse(request.data);
-        expect(data.bidRequests[0].adPosition).to.equal(1);
-      });
-      it('should not sended when publisher has not set adPosition param', function () {
-        const validBidRequests = [
-          getSlotConfigs({ banner: {} }, mandatoryParams),
-        ];
-        const request = spec.buildRequests(validBidRequests, bidderRequest);
-        const data = JSON.parse(request.data);
-        expect(data.bidRequests[0].adPosition).to.equal(undefined);
-      });
-    });
-
     describe('GDPR params', function () {
       describe('when there arent consent management platform', function () {
         it('cmp should be false', function () {
@@ -310,10 +286,7 @@ describe('Seedtag Adapter', function () {
 
           bidderRequest['uspConsent'] = uspConsent;
 
-          const request = spec.buildRequests(
-            validBidRequests,
-            bidderRequest
-          );
+          const request = spec.buildRequests(validBidRequests, bidderRequest);
           const payload = JSON.parse(request.data);
 
           expect(payload.uspConsent).to.not.exist;
@@ -347,7 +320,7 @@ describe('Seedtag Adapter', function () {
         );
         expect(videoBid.supplyTypes[0]).to.equal('video');
         expect(videoBid.adUnitId).to.equal('000000');
-        expect(videoBid.videoParams.mimes).to.equal('mp4');
+        expect(videoBid.videoParams.mimes).to.eql(['video/mp4']);
         expect(videoBid.videoParams.w).to.equal(300);
         expect(videoBid.videoParams.h).to.equal(200);
         expect(videoBid.sizes[0][0]).to.equal(300);
@@ -360,27 +333,27 @@ describe('Seedtag Adapter', function () {
 
     describe('COPPA param', function () {
       it('should add COPPA param to payload when prebid config has parameter COPPA equal to true', function () {
-        config.setConfig({ coppa: true })
+        config.setConfig({ coppa: true });
 
         const request = spec.buildRequests(validBidRequests, bidderRequest);
         const data = JSON.parse(request.data);
         expect(data.coppa).to.equal(true);
-      })
+      });
 
       it('should not add COPPA param to payload when prebid config has parameter COPPA equal to false', function () {
-        config.setConfig({ coppa: false })
+        config.setConfig({ coppa: false });
 
         const request = spec.buildRequests(validBidRequests, bidderRequest);
         const data = JSON.parse(request.data);
         expect(data.coppa).to.be.undefined;
-      })
+      });
 
       it('should not add COPPA param to payload when prebid config has not parameter COPPA', function () {
         const request = spec.buildRequests(validBidRequests, bidderRequest);
         const data = JSON.parse(request.data);
         expect(data.coppa).to.be.undefined;
-      })
-    })
+      });
+    });
     describe('schain param', function () {
       it('should add schain to payload when exposed on validBidRequest', function () {
         // https://github.com/prebid/Prebid.js/blob/master/modules/schain.md#sample-code-for-passing-the-schain-object
@@ -560,11 +533,11 @@ describe('Seedtag Adapter', function () {
       const timeoutUrl = getTimeoutUrl(timeoutData);
       expect(timeoutUrl).to.equal(
         'https://s.seedtag.com/se/hb/timeout?publisherToken=' +
-        params.publisherId +
-        '&adUnitId=' +
-        params.adUnitId +
-        '&timeout=' +
-        timeout
+          params.publisherId +
+          '&adUnitId=' +
+          params.adUnitId +
+          '&timeout=' +
+          timeout
       );
     });
 
@@ -576,11 +549,11 @@ describe('Seedtag Adapter', function () {
       expect(
         utils.triggerPixel.calledWith(
           'https://s.seedtag.com/se/hb/timeout?publisherToken=' +
-          params.publisherId +
-          '&adUnitId=' +
-          params.adUnitId +
-          '&timeout=' +
-          timeout
+            params.publisherId +
+            '&adUnitId=' +
+            params.adUnitId +
+            '&timeout=' +
+            timeout
         )
       ).to.equal(true);
     });

From fe652b47deecf0eab3d16bfa02d1bbaa5b032c2b Mon Sep 17 00:00:00 2001
From: GeoEdge-r-and-d <72186958+GeoEdge-r-and-d@users.noreply.github.com>
Date: Mon, 28 Nov 2022 20:22:03 +0200
Subject: [PATCH 484/569] Geoedge RTD module: support billing events (#9267)

* Add billable events for applicable winning bids

* Update test for billable events

* Add meta bid advertiser domains collection

* Revert "Add meta bid advertiser domains collection"

This reverts commit 09c19c90b4dc9d234f282de8adb40850cce31101.

* Add meta bid advertiser domains collection

* Update geoedgeRtdProvider_spec.js

Force circleci

Co-authored-by: daniel manan <mmndaniel@gmail.com>
Co-authored-by: Patrick McCann <patmmccann@gmail.com>
---
 modules/geoedgeRtdProvider.js                | 22 ++++++++++++++++++++
 test/spec/modules/geoedgeRtdProvider_spec.js | 15 +++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/modules/geoedgeRtdProvider.js b/modules/geoedgeRtdProvider.js
index 001ef67b66a..6f910632fbc 100644
--- a/modules/geoedgeRtdProvider.js
+++ b/modules/geoedgeRtdProvider.js
@@ -18,6 +18,8 @@
 import { submodule } from '../src/hook.js';
 import { ajax } from '../src/ajax.js';
 import { generateUUID, insertElement, isEmpty, logError } from '../src/utils.js';
+import * as events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
 
 /** @type {string} */
 const SUBMODULE_NAME = 'geoedge';
@@ -105,6 +107,7 @@ function getMacros(bid, key) {
     '%%PATTERN:hb_bidder%%': bid.bidderCode,
     '%_isHb!': true,
     '%_hbcid!': bid.creativeId || '',
+    '%_hbadomains': bid.meta && bid.meta.advertiserDomains,
     '%%PATTERN:hb_pb%%': bid.pbHg,
     '%%SITE%%': location.hostname,
     '%_pimp%': PV_ID
@@ -184,6 +187,24 @@ function conditionallyWrap(bidResponse, config, userConsent) {
   }
 }
 
+/**
+ * Fire billable events for applicable bids
+ */
+function fireBillableEventsForApplicableBids(params) {
+  events.on(CONSTANTS.EVENTS.BID_WON, function (winningBid) {
+    if (shouldWrap(winningBid, params)) {
+      events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+        vendor: SUBMODULE_NAME,
+        billingId: generateUUID(),
+        type: 'impression',
+        transactionId: winningBid.transactionId,
+        auctionId: winningBid.auctionId,
+        bidId: winningBid.requestId
+      });
+    }
+  });
+}
+
 function init(config, userConsent) {
   let params = config.params;
   if (!params || !params.key) {
@@ -191,6 +212,7 @@ function init(config, userConsent) {
     return false;
   }
   preloadClient(params.key);
+  fireBillableEventsForApplicableBids(params);
   return true;
 }
 
diff --git a/test/spec/modules/geoedgeRtdProvider_spec.js b/test/spec/modules/geoedgeRtdProvider_spec.js
index cf4e0b53fde..eec1feff87a 100644
--- a/test/spec/modules/geoedgeRtdProvider_spec.js
+++ b/test/spec/modules/geoedgeRtdProvider_spec.js
@@ -2,6 +2,8 @@ import * as utils from '../../../src/utils.js';
 import * as hook from '../../../src/hook.js'
 import { beforeInit, geoedgeSubmodule, setWrapper, wrapper, htmlPlaceholder, WRAPPER_URL, getClientUrl } from '../../../modules/geoedgeRtdProvider.js';
 import { server } from '../../../test/mocks/xhr.js';
+import * as events from '../../../src/events.js';
+import CONSTANTS from '../../../src/constants.json';
 
 let key = '123123123';
 function makeConfig() {
@@ -88,6 +90,19 @@ describe('Geoedge RTD module', function () {
         let isLinkPreloadAsScript = arg => arg.tagName === 'LINK' && arg.rel === 'preload' && arg.as === 'script' && arg.href === getClientUrl(key);
         expect(insertElementStub.calledWith(sinon.match(isLinkPreloadAsScript))).to.equal(true);
       });
+      it('should emit billable events with applicable winning bids', function () {
+        let applicableBid = mockBid('bidderA');
+        let nonApplicableBid = mockBid('bidderB');
+        let counter = 0;
+        events.on(CONSTANTS.EVENTS.BILLABLE_EVENT, function (event) {
+          if (event.vendor === 'geoedge' && event.type === 'impression') {
+            counter += 1;
+          }
+        });
+        events.emit(CONSTANTS.EVENTS.BID_WON, applicableBid);
+        events.emit(CONSTANTS.EVENTS.BID_WON, nonApplicableBid);
+        expect(counter).to.equal(1);
+      });
     });
     describe('onBidResponseEvent', function () {
       let bidFromA = mockBid('bidderA');

From ad595cc7e54b81ebbece381c9df9bb36d526ddb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Udi=20Talias=20=E2=9A=9B=EF=B8=8F?= <udi.talias@gmail.com>
Date: Tue, 29 Nov 2022 16:43:26 +0200
Subject: [PATCH 485/569] Vidazoo Bid Adapter: added bid request params (gpid,
 cat, pagecat) (#9293)

* feat(module): multi size request

* fix getUserSyncs
added tests

* update(module): package-lock.json from master

* feat(module): VidazooBidAdapter - send top query params to server

* added bid request params

* making the linter happy :)

Co-authored-by: roman <shmoop207@gmail.com>
Co-authored-by: Saar Amrani <89377180+saar120@users.noreply.github.com>
Co-authored-by: Saar Amrani <saar120@gmail.com>
---
 modules/vidazooBidAdapter.js                |  9 ++-
 test/spec/modules/vidazooBidAdapter_spec.js | 62 +++++++++++++--------
 2 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index ac74dd18405..39c407ae8a6 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -70,6 +70,10 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
   const subDomain = extractSubDomain(params);
   const ptrace = getCacheOpt();
 
+  const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid', deepAccess(bid, 'ortb2Imp.ext.data.pbadslot', ''));
+  const cat = deepAccess(bidderRequest, 'ortb2.site.cat', []);
+  const pagecat = deepAccess(bidderRequest, 'ortb2.site.pagecat', []);
+
   if (isFn(bid.getFloor)) {
     const floorInfo = bid.getFloor({
       currency: 'USD',
@@ -99,7 +103,10 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
     prebidVersion: '$prebid.version$',
     res: `${screen.width}x${screen.height}`,
     schain: schain,
-    ptrace: ptrace
+    ptrace: ptrace,
+    gpid: gpid,
+    cat: cat,
+    pagecat: pagecat
   };
 
   appendUserIdsToRequestPayload(data, userId);
diff --git a/test/spec/modules/vidazooBidAdapter_spec.js b/test/spec/modules/vidazooBidAdapter_spec.js
index 856ceaf438d..7c7f27a830b 100644
--- a/test/spec/modules/vidazooBidAdapter_spec.js
+++ b/test/spec/modules/vidazooBidAdapter_spec.js
@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import { expect } from 'chai';
 import {
   spec as adapter,
   SUPPORTED_ID_SYSTEMS,
@@ -15,8 +15,8 @@ import {
   getVidazooSessionId,
 } from 'modules/vidazooBidAdapter.js';
 import * as utils from 'src/utils.js';
-import {version} from 'package.json';
-import {useFakeTimers} from 'sinon';
+import { version } from 'package.json';
+import { useFakeTimers } from 'sinon';
 
 const SUB_DOMAIN = 'openrtb';
 
@@ -38,7 +38,12 @@ const BID = {
   'sizes': [[300, 250], [300, 600]],
   'bidderRequestId': '1fdb5ff1b6eaa7',
   'requestId': 'b0777d85-d061-450e-9bc7-260dd54bbb7a',
-  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc'
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'ortb2Imp': {
+    'ext': {
+      'gpid': '1234567890'
+    }
+  }
 };
 
 const BIDDER_REQUEST = {
@@ -50,7 +55,13 @@ const BIDDER_REQUEST = {
   'refererInfo': {
     'page': 'https://www.greatsite.com',
     'ref': 'https://www.somereferrer.com'
-  }
+  },
+  'ortb2': {
+    'site': {
+      'cat': ['IAB2'],
+      'pagecat': ['IAB2-2']
+    }
+  },
 };
 
 const SERVER_RESPONSE = {
@@ -85,7 +96,7 @@ const REQUEST = {
 
 function getTopWindowQueryParams() {
   try {
-    const parsedUrl = utils.parseUrl(window.top.document.URL, {decodeSearchAsString: true});
+    const parsedUrl = utils.parseUrl(window.top.document.URL, { decodeSearchAsString: true });
     return parsedUrl.search;
   } catch (e) {
     return '';
@@ -150,7 +161,7 @@ describe('VidazooBidAdapter', function () {
     before(function () {
       $$PREBID_GLOBAL$$.bidderSettings = {
         vidazoo: {
-          storageAllowed: true
+          storageAllowed: true,
         }
       };
       sandbox = sinon.sandbox.create();
@@ -187,6 +198,9 @@ describe('VidazooBidAdapter', function () {
           uqs: getTopWindowQueryParams(),
           'ext.param1': 'loremipsum',
           'ext.param2': 'dolorsitamet',
+          gpid: '1234567890',
+          cat: ['IAB2'],
+          pagecat: ['IAB2-2']
         }
       });
     });
@@ -198,7 +212,7 @@ describe('VidazooBidAdapter', function () {
   });
   describe('getUserSyncs', function () {
     it('should have valid user sync with iframeEnabled', function () {
-      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
+      const result = adapter.getUserSyncs({ iframeEnabled: true }, [SERVER_RESPONSE]);
 
       expect(result).to.deep.equal([{
         type: 'iframe',
@@ -207,7 +221,7 @@ describe('VidazooBidAdapter', function () {
     });
 
     it('should have valid user sync with cid on response', function () {
-      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
+      const result = adapter.getUserSyncs({ iframeEnabled: true }, [SERVER_RESPONSE]);
       expect(result).to.deep.equal([{
         type: 'iframe',
         url: 'https://sync.cootlogix.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
@@ -215,7 +229,7 @@ describe('VidazooBidAdapter', function () {
     });
 
     it('should have valid user sync with pixelEnabled', function () {
-      const result = adapter.getUserSyncs({pixelEnabled: true}, [SERVER_RESPONSE]);
+      const result = adapter.getUserSyncs({ pixelEnabled: true }, [SERVER_RESPONSE]);
 
       expect(result).to.deep.equal([{
         'url': 'https://sync.cootlogix.com/api/sync/image/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy=',
@@ -231,12 +245,12 @@ describe('VidazooBidAdapter', function () {
     });
 
     it('should return empty array when there is no ad', function () {
-      const responses = adapter.interpretResponse({price: 1, ad: ''});
+      const responses = adapter.interpretResponse({ price: 1, ad: '' });
       expect(responses).to.be.empty;
     });
 
     it('should return empty array when there is no price', function () {
-      const responses = adapter.interpretResponse({price: null, ad: 'great ad'});
+      const responses = adapter.interpretResponse({ price: null, ad: 'great ad' });
       expect(responses).to.be.empty;
     });
 
@@ -276,11 +290,11 @@ describe('VidazooBidAdapter', function () {
       const userId = (function () {
         switch (idSystemProvider) {
           case 'lipb':
-            return {lipbid: id};
+            return { lipbid: id };
           case 'parrableId':
-            return {eid: id};
+            return { eid: id };
           case 'id5id':
-            return {uid: id};
+            return { uid: id };
           default:
             return id;
         }
@@ -299,18 +313,18 @@ describe('VidazooBidAdapter', function () {
 
   describe('alternate param names extractors', function () {
     it('should return undefined when param not supported', function () {
-      const cid = extractCID({'c_id': '1'});
-      const pid = extractPID({'p_id': '1'});
-      const subDomain = extractSubDomain({'sub_domain': 'prebid'});
+      const cid = extractCID({ 'c_id': '1' });
+      const pid = extractPID({ 'p_id': '1' });
+      const subDomain = extractSubDomain({ 'sub_domain': 'prebid' });
       expect(cid).to.be.undefined;
       expect(pid).to.be.undefined;
       expect(subDomain).to.be.undefined;
     });
 
     it('should return value when param supported', function () {
-      const cid = extractCID({'cID': '1'});
-      const pid = extractPID({'Pid': '2'});
-      const subDomain = extractSubDomain({'subDOMAIN': 'prebid'});
+      const cid = extractCID({ 'cID': '1' });
+      const pid = extractPID({ 'Pid': '2' });
+      const subDomain = extractSubDomain({ 'subDOMAIN': 'prebid' });
       expect(cid).to.be.equal('1');
       expect(pid).to.be.equal('2');
       expect(subDomain).to.be.equal('prebid');
@@ -423,7 +437,7 @@ describe('VidazooBidAdapter', function () {
         now
       });
       setStorageItem('myKey', 2020);
-      const {value, created} = getStorageItem('myKey');
+      const { value, created } = getStorageItem('myKey');
       expect(created).to.be.equal(now);
       expect(value).to.be.equal(2020);
       expect(typeof value).to.be.equal('number');
@@ -439,8 +453,8 @@ describe('VidazooBidAdapter', function () {
     });
 
     it('should parse JSON value', function () {
-      const data = JSON.stringify({event: 'send'});
-      const {event} = tryParseJSON(data);
+      const data = JSON.stringify({ event: 'send' });
+      const { event } = tryParseJSON(data);
       expect(event).to.be.equal('send');
     });
 

From 64e557abfa36f9387678e7ddeb784091cb4419a7 Mon Sep 17 00:00:00 2001
From: JulieLorin <julie@hubvisor.io>
Date: Tue, 29 Nov 2022 16:32:01 +0100
Subject: [PATCH 486/569] PBjs Core : send native targetings for ortb response
 (#9252)

* PBjs Core : send native targetings for ortb response

* Add legacy native properties regardless of response mediaType

* add a test for addLegacyFieldsIfNeeded

* fix lint for test

Co-authored-by: Demetrio Girardi <dgirardi@prebid.org>
---
 src/auction.js                   |  20 ++++-
 src/native.js                    |  51 ++++++++-----
 test/spec/auctionmanager_spec.js |  76 +++++++++++++++++++
 test/spec/native_spec.js         | 124 +++++++++++++++++--------------
 4 files changed, 193 insertions(+), 78 deletions(-)

diff --git a/src/auction.js b/src/auction.js
index 6376457c1d6..563eb85e788 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -76,7 +76,7 @@ import {
   timestamp
 } from './utils.js';
 import {getPriceBucketString} from './cpmBucketManager.js';
-import {getNativeTargeting} from './native.js';
+import {getNativeTargeting, toLegacyResponse} from './native.js';
 import {getCacheUrl, store} from './videoCache.js';
 import {Renderer} from './Renderer.js';
 import {config} from './config.js';
@@ -462,9 +462,14 @@ export function auctionCallbacks(auctionDone, auctionInstance, {index = auctionM
     handleBidResponse(adUnitCode, bid, (done) => {
       let bidResponse = getPreparedBidForAuction(bid);
 
-      if (bidResponse.mediaType === 'video') {
+      if (bidResponse.mediaType === VIDEO) {
         tryAddVideoBid(auctionInstance, bidResponse, done);
       } else {
+        if (FEATURES.NATIVE && bidResponse.native != null && typeof bidResponse.native === 'object') {
+          // NOTE: augment bidResponse.native even if bidResponse.mediaType !== NATIVE; it's possible
+          // to treat banner responses as native
+          addLegacyFieldsIfNeeded(bidResponse);
+        }
         addBidToAuction(auctionInstance, bidResponse);
         done();
       }
@@ -593,6 +598,17 @@ function tryAddVideoBid(auctionInstance, bidResponse, afterBidAdded, {index = au
   }
 }
 
+// Native bid response might be in ortb2 format - adds legacy field for backward compatibility
+const addLegacyFieldsIfNeeded = (bidResponse) => {
+  const nativeOrtbRequest = auctionManager.index.getAdUnit(bidResponse)?.nativeOrtbRequest;
+  const nativeOrtbResponse = bidResponse.native?.ortb
+
+  if (nativeOrtbRequest && nativeOrtbResponse) {
+    const legacyResponse = toLegacyResponse(nativeOrtbResponse, nativeOrtbRequest);
+    Object.assign(bidResponse.native, legacyResponse);
+  }
+}
+
 const storeInCache = (batch) => {
   store(batch.map(entry => entry.bidResponse), function (error, cacheIds) {
     cacheIds.forEach((cacheId, i) => {
diff --git a/src/native.js b/src/native.js
index 022ece457f5..25f8c38cb30 100644
--- a/src/native.js
+++ b/src/native.js
@@ -23,7 +23,7 @@ export const NATIVE_TARGETING_KEYS = Object.keys(CONSTANTS.NATIVE_KEYS).map(
   key => CONSTANTS.NATIVE_KEYS[key]
 );
 
-const IMAGE = {
+export const IMAGE = {
   ortb: {
     ver: '1.2',
     assets: [
@@ -385,26 +385,14 @@ export function getNativeTargeting(bid, {index = auctionManager.index} = {}) {
   return keyValues;
 }
 
-const getNativeRequest = (bidResponse) => auctionManager.index.getAdUnit(bidResponse)?.nativeOrtbRequest;
-
-function assetsMessage(data, adObject, keys, {getNativeReq = getNativeRequest} = {}) {
+function assetsMessage(data, adObject, keys) {
   const message = {
     message: 'assetResponse',
     adId: data.adId,
   };
 
-  // Pass to Prebid Universal Creative all assets, the legacy ones + the ortb ones (under ortb property)
-  const ortbRequest = getNativeReq(adObject);
   let nativeResp = adObject.native;
-  const ortbResponse = adObject.native?.ortb;
-  let legacyResponse = {};
-  if (ortbRequest && ortbResponse) {
-    legacyResponse = toLegacyResponse(ortbResponse, ortbRequest);
-    nativeResp = {
-      ...adObject.native,
-      ...legacyResponse
-    };
-  }
+
   if (adObject.native.ortb) {
     message.ortb = adObject.native.ortb;
   }
@@ -435,13 +423,13 @@ function assetsMessage(data, adObject, keys, {getNativeReq = getNativeRequest} =
  * Constructs a message object containing asset values for each of the
  * requested data keys.
  */
-export function getAssetMessage(data, adObject, {getNativeReq = getNativeRequest} = {}) {
+export function getAssetMessage(data, adObject) {
   const keys = data.assets.map((k) => getKeyByValue(CONSTANTS.NATIVE_KEYS, k));
-  return assetsMessage(data, adObject, keys, {getNativeReq});
+  return assetsMessage(data, adObject, keys);
 }
 
-export function getAllAssetsMessage(data, adObject, {getNativeReq = getNativeRequest} = {}) {
-  return assetsMessage(data, adObject, null, {getNativeReq});
+export function getAllAssetsMessage(data, adObject) {
+  return assetsMessage(data, adObject, null);
 }
 
 /**
@@ -749,7 +737,7 @@ export function toOrtbNativeResponse(legacyResponse, ortbRequest) {
  * @param {*} ortbRequest the ortb request, useful to match ids.
  * @returns an object containing the response in legacy native format: { title: "this is a title", image: ... }
  */
-function toLegacyResponse(ortbResponse, ortbRequest) {
+export function toLegacyResponse(ortbResponse, ortbRequest) {
   const legacyResponse = {};
   const requestAssets = ortbRequest?.assets || [];
   legacyResponse.clickUrl = ortbResponse.link.url;
@@ -764,6 +752,29 @@ function toLegacyResponse(ortbResponse, ortbRequest) {
       legacyResponse[PREBID_NATIVE_DATA_KEYS_TO_ORTB_INVERSE[NATIVE_ASSET_TYPES_INVERSE[requestAsset.data.type]]] = asset.data.value;
     }
   }
+
+  // Handle trackers
+  legacyResponse.impressionTrackers = [];
+  let jsTrackers = [];
+
+  if (ortbRequest?.imptrackers) {
+    legacyResponse.impressionTrackers.push(...ortbRequest.imptrackers);
+  }
+  for (const eventTracker of ortbResponse?.eventtrackers || []) {
+    if (eventTracker.event === TRACKER_EVENTS.impression && eventTracker.method === TRACKER_METHODS.img) {
+      legacyResponse.impressionTrackers.push(eventTracker.url);
+    }
+    if (eventTracker.event === TRACKER_EVENTS.impression && eventTracker.method === TRACKER_METHODS.js) {
+      jsTrackers.push(eventTracker.url);
+    }
+  }
+
+  jsTrackers = jsTrackers.map(url => `<script async src="${url}"></script>`);
+  if (ortbResponse?.jstracker) { jsTrackers.push(ortbResponse.jstracker); }
+  if (jsTrackers.length) {
+    legacyResponse.javascriptTrackers = jsTrackers.join('\n');
+  }
+
   return legacyResponse;
 }
 
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index 443147f5d20..46350895050 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -22,6 +22,7 @@ import 'modules/debugging/index.js' // some tests look for debugging side effect
 import {AuctionIndex} from '../../src/auctionIndex.js';
 import {expect} from 'chai';
 import {deepClone} from '../../src/utils.js';
+import { IMAGE as ortbNativeRequest } from 'src/native.js';
 
 var assert = require('assert');
 
@@ -1276,6 +1277,81 @@ describe('auctionmanager.js', function () {
     });
   });
 
+  if (FEATURES.NATIVE) {
+    describe('addBidResponse native', function () {
+      let makeRequestsStub;
+      let ajaxStub;
+      let spec;
+      let auction;
+
+      beforeEach(function () {
+        makeRequestsStub = sinon.stub(adapterManager, 'makeBidRequests');
+        ajaxStub = sinon.stub(ajaxLib, 'ajaxBuilder').callsFake(mockAjaxBuilder);
+
+        const adUnits = [{
+          code: ADUNIT_CODE,
+          transactionId: ADUNIT_CODE,
+          bids: [
+            {bidder: BIDDER_CODE, params: {placementId: 'id'}},
+          ],
+          nativeOrtbRequest: ortbNativeRequest.ortb,
+          mediaTypes: { native: { type: 'image' } }
+        }];
+        auction = auctionModule.newAuction({adUnits, adUnitCodes: [ADUNIT_CODE], callback: function() {}, cbTimeout: 3000});
+        indexAuctions = [auction];
+        const createAuctionStub = sinon.stub(auctionModule, 'newAuction');
+        createAuctionStub.returns(auction);
+
+        spec = mockBidder(BIDDER_CODE);
+        registerBidder(spec);
+      });
+
+      afterEach(function () {
+        ajaxStub.restore();
+        auctionModule.newAuction.restore();
+        adapterManager.makeBidRequests.restore();
+      });
+
+      it('should add legacy fields to native response', function () {
+        let nativeBid = mockBid();
+        nativeBid.mediaType = 'native';
+        nativeBid.native = {
+          ortb: {
+            ver: '1.2',
+            assets: [
+              { id: 2, title: { text: 'Sample title' } },
+              { id: 4, data: { value: 'Sample body' } },
+              { id: 3, data: { value: 'Sample sponsoredBy' } },
+              { id: 1, img: { url: 'https://www.example.com/image.png', w: 200, h: 200 } },
+              { id: 5, img: { url: 'https://www.example.com/icon.png', w: 32, h: 32 } }
+            ],
+            link: { url: 'http://www.click.com' },
+            eventtrackers: [
+              { event: 1, method: 1, url: 'http://www.imptracker.com' },
+              { event: 1, method: 2, url: 'http://www.jstracker.com/file.js' }
+            ]
+          }
+        }
+
+        let bidRequest = mockBidRequest(nativeBid, { mediaType: { native: ortbNativeRequest } });
+        makeRequestsStub.returns([bidRequest]);
+
+        spec.interpretResponse.returns(nativeBid);
+        auction.callBids();
+
+        const addedBid = auction.getBidsReceived().pop();
+        assert.equal(addedBid.native.body, 'Sample body')
+        assert.equal(addedBid.native.title, 'Sample title')
+        assert.equal(addedBid.native.sponsoredBy, 'Sample sponsoredBy')
+        assert.equal(addedBid.native.clickUrl, 'http://www.click.com')
+        assert.equal(addedBid.native.image, 'https://www.example.com/image.png')
+        assert.equal(addedBid.native.icon, 'https://www.example.com/icon.png')
+        assert.equal(addedBid.native.impressionTrackers[0], 'http://www.imptracker.com')
+        assert.equal(addedBid.native.javascriptTrackers, '<script async src="http://www.jstracker.com/file.js"></script>')
+      });
+    });
+  }
+
   describe('getMediaTypeGranularity', function () {
     it('video', function () {
       let mediaTypes = { video: {id: '1'} };
diff --git a/test/spec/native_spec.js b/test/spec/native_spec.js
index 23350781a3d..2b7c2b88449 100644
--- a/test/spec/native_spec.js
+++ b/test/spec/native_spec.js
@@ -5,6 +5,7 @@ import {
   nativeBidIsValid,
   getAssetMessage,
   getAllAssetsMessage,
+  toLegacyResponse,
   decorateAdUnitsWithNativeParams,
   isOpenRTBBidRequestValid,
   isNativeOpenRTBBidValid,
@@ -37,6 +38,7 @@ const bid = {
     clickTrackers: ['https://tracker.example'],
     impressionTrackers: ['https://impression.example'],
     javascriptTrackers: '<script src="http://www.foobar.js"></script>',
+    privacyLink: 'https://privacy-link.example',
     ext: {
       foo: 'foo-value',
       baz: 'baz-value',
@@ -98,9 +100,18 @@ const ortbBid = {
       privacy: 'https://privacy-link.example',
       ver: '1.2'
     }
-  },
+  }
 };
 
+const completeNativeBid = {
+  adId: '123',
+  transactionId: 'au',
+  native: {
+    ...bid.native,
+    ...ortbBid.native
+  }
+}
+
 const ortbRequest = {
   assets: [
     {
@@ -224,6 +235,14 @@ describe('native.js', function () {
     expect(targeting.hb_native_baz).to.equal('hb_native_baz:123');
   });
 
+  it('sends placeholdes targetings with ortb native response', function () {
+    const targeting = getNativeTargeting(completeNativeBid);
+
+    expect(targeting[CONSTANTS.NATIVE_KEYS.title]).to.equal('Native Creative');
+    expect(targeting[CONSTANTS.NATIVE_KEYS.body]).to.equal('Cool description great stuff');
+    expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal('https://www.link.example');
+  });
+
   it('should only include native targeting keys with values', function () {
     const adUnit = {
       transactionId: 'au',
@@ -302,6 +321,10 @@ describe('native.js', function () {
           required: false,
           sendTargetingKeys: false,
         },
+        privacyLink: {
+          required: false,
+          sendTargetingKeys: false,
+        },
         ext: {
           foo: {
             required: false,
@@ -348,6 +371,7 @@ describe('native.js', function () {
       CONSTANTS.NATIVE_KEYS.icon,
       CONSTANTS.NATIVE_KEYS.sponsoredBy,
       CONSTANTS.NATIVE_KEYS.clickUrl,
+      CONSTANTS.NATIVE_KEYS.privacyLink,
       CONSTANTS.NATIVE_KEYS.rendererUrl,
     ]);
 
@@ -380,6 +404,7 @@ describe('native.js', function () {
       CONSTANTS.NATIVE_KEYS.icon,
       CONSTANTS.NATIVE_KEYS.sponsoredBy,
       CONSTANTS.NATIVE_KEYS.clickUrl,
+      CONSTANTS.NATIVE_KEYS.privacyLink,
     ]);
 
     expect(bid.native.adTemplate).to.deep.equal(
@@ -437,9 +462,9 @@ describe('native.js', function () {
       adId: '123',
     };
 
-    const message = getAllAssetsMessage(messageRequest, bid, {getNativeReq: () => null});
+    const message = getAllAssetsMessage(messageRequest, bid);
 
-    expect(message.assets.length).to.equal(9);
+    expect(message.assets.length).to.equal(10);
     expect(message.assets).to.deep.include({
       key: 'body',
       value: bid.native.body,
@@ -485,7 +510,7 @@ describe('native.js', function () {
       adId: '123',
     };
 
-    const message = getAllAssetsMessage(messageRequest, bidWithUndefinedFields, {getNativeReq: () => null});
+    const message = getAllAssetsMessage(messageRequest, bidWithUndefinedFields);
 
     expect(message.assets.length).to.equal(4);
     expect(message.assets).to.deep.include({
@@ -506,16 +531,16 @@ describe('native.js', function () {
     });
   });
 
-  it('creates native all asset message with OpenRTB format', function () {
+  it('creates native all asset message with complete format', function () {
     const messageRequest = {
       message: 'Prebid Native',
       action: 'allAssetRequest',
       adId: '123',
     };
 
-    const message = getAllAssetsMessage(messageRequest, ortbBid, {getNativeReq: () => ortbRequest});
+    const message = getAllAssetsMessage(messageRequest, completeNativeBid);
 
-    expect(message.assets.length).to.equal(8);
+    expect(message.assets.length).to.equal(10);
     expect(message.assets).to.deep.include({
       key: 'body',
       value: bid.native.body,
@@ -548,6 +573,14 @@ describe('native.js', function () {
       key: 'privacyLink',
       value: ortbBid.native.ortb.privacy,
     });
+    expect(message.assets).to.deep.include({
+      key: 'foo',
+      value: bid.native.ext.foo,
+    });
+    expect(message.assets).to.deep.include({
+      key: 'baz',
+      value: bid.native.ext.baz,
+    });
   });
 
   const SAMPLE_ORTB_REQUEST = toOrtbNativeRequest({
@@ -555,60 +588,39 @@ describe('native.js', function () {
     body: 'vbody'
   });
   const SAMPLE_ORTB_RESPONSE = {
-    native: {
-      ortb: {
-        link: {
-          url: 'url'
-        },
-        assets: [
-          {
-            id: 0,
-            title: {
-              text: 'vtitle'
-            }
-          },
-          {
-            id: 1,
-            data: {
-              value: 'vbody'
-            }
-          }
-        ]
+    link: {
+      url: 'url'
+    },
+    assets: [
+      {
+        id: 0,
+        title: {
+          text: 'vtitle'
+        }
+      },
+      {
+        id: 1,
+        data: {
+          value: 'vbody'
+        }
       }
-    }
+    ],
+    eventtrackers: [
+      { event: 1, method: 1, url: 'https://sampleurl.com' },
+      { event: 1, method: 2, url: 'https://sampleurljs.com' }
+    ]
   }
-  describe('getAllAssetsMessage', () => {
+  describe('toLegacyResponse', () => {
     it('returns assets in legacy format for ortb responses', () => {
-      const actual = getAllAssetsMessage({}, SAMPLE_ORTB_RESPONSE, {getNativeReq: () => SAMPLE_ORTB_REQUEST});
-      expect(actual.assets).to.eql([
-        {
-          key: 'clickUrl',
-          value: 'url'
-        },
-        {
-          key: 'title',
-          value: 'vtitle'
-        },
-        {
-          key: 'body',
-          value: 'vbody'
-        },
-      ])
+      const actual = toLegacyResponse(SAMPLE_ORTB_RESPONSE, SAMPLE_ORTB_REQUEST);
+      expect(actual.body).to.equal('vbody');
+      expect(actual.title).to.equal('vtitle');
+      expect(actual.clickUrl).to.equal('url');
+      expect(actual.javascriptTrackers).to.equal('<script async src="https://sampleurljs.com"></script>');
+      expect(actual.impressionTrackers.length).to.equal(1);
+      expect(actual.impressionTrackers[0]).to.equal('https://sampleurl.com');
     });
   });
-  describe('getAssetsMessage', () => {
-    Object.entries({
-      'hb_native_title': {key: 'title', value: 'vtitle'},
-      'hb_native_body': {key: 'body', value: 'vbody'}
-    }).forEach(([tkey, assetVal]) => {
-      it(`returns ${tkey} asset in legacy format for ortb responses`, () => {
-        const actual = getAssetMessage({
-          assets: [tkey]
-        }, SAMPLE_ORTB_RESPONSE, {getNativeReq: () => SAMPLE_ORTB_REQUEST})
-        expect(actual.assets).to.eql([assetVal])
-      })
-    })
-  })
 });
 
 describe('validate native openRTB', function () {

From dd7d8a642598045b620c80236e6a568b3f14d9ba Mon Sep 17 00:00:00 2001
From: Thomas <thomas.dseao@gmail.com>
Date: Tue, 29 Nov 2022 19:23:29 +0100
Subject: [PATCH 487/569] Impactify Bid Adapter: add support for BidFloor
 (#9277)

* Add support of getFloor function

* Add support of getFloor function

* Add support of getFloor function

* Add support of getFloor function

* Add unit test for bid floor

* Add unit test for bid floor

Co-authored-by: Thomas De Stefano <thomas.destefano@impactify.io>
---
 modules/impactifyBidAdapter.js                | 20 ++++++++++++++++++-
 test/spec/modules/impactifyBidAdapter_spec.js | 13 ++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/modules/impactifyBidAdapter.js b/modules/impactifyBidAdapter.js
index 0717cf43741..04f34bdc7d9 100644
--- a/modules/impactifyBidAdapter.js
+++ b/modules/impactifyBidAdapter.js
@@ -1,7 +1,7 @@
 import { deepAccess, deepSetValue, generateUUID } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
-import {ajax} from '../src/ajax.js';
+import { ajax } from '../src/ajax.js';
 import { createEidsArray } from './userId/eids.js';
 
 const BIDDER_CODE = 'impactify';
@@ -27,6 +27,18 @@ const getDeviceType = () => {
   return 2;
 };
 
+const getFloor = (bid) => {
+  const floorInfo = bid.getFloor({
+    currency: DEFAULT_CURRENCY,
+    mediaType: '*',
+    size: '*'
+  });
+  if (typeof floorInfo === 'object' && floorInfo.currency === DEFAULT_CURRENCY && !isNaN(parseFloat(floorInfo.floor))) {
+    return parseFloat(floorInfo.floor);
+  }
+  return null;
+}
+
 const createOpenRtbRequest = (validBidRequests, bidderRequest) => {
   // Create request and set imp bids inside
   let request = {
@@ -114,6 +126,12 @@ const createOpenRtbRequest = (validBidRequests, bidderRequest) => {
     if (bid.params.container) {
       imp.ext.impactify.container = bid.params.container;
     }
+    if (typeof bid.getFloor === 'function') {
+      const floor = getFloor(bid);
+      if (floor) {
+        imp.bidfloor = floor;
+      }
+    }
     request.imp.push(imp);
   });
 
diff --git a/test/spec/modules/impactifyBidAdapter_spec.js b/test/spec/modules/impactifyBidAdapter_spec.js
index 8bb2d089ad8..215972ff450 100644
--- a/test/spec/modules/impactifyBidAdapter_spec.js
+++ b/test/spec/modules/impactifyBidAdapter_spec.js
@@ -166,6 +166,19 @@ describe('ImpactifyAdapter', function () {
       }
     };
 
+    it('should pass bidfloor', function () {
+      videoBidRequests[0].getFloor = function() {
+        return {
+          currency: 'USD',
+          floor: 1.23,
+        }
+      }
+
+      const res = spec.buildRequests(videoBidRequests, videoBidderRequest)
+      const resData = JSON.parse(res.data)
+      expect(resData.imp[0].bidfloor).to.equal(1.23)
+    });
+
     it('sends video bid request to ENDPOINT via POST', function () {
       const request = spec.buildRequests(videoBidRequests, videoBidderRequest);
       expect(request.url).to.equal(ORIGIN + AUCTIONURI);

From 29c0d82898c6dbd171fe61814322d6188d91ef86 Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Tue, 29 Nov 2022 14:18:57 -0500
Subject: [PATCH 488/569] TTD Bid Adapter: add support for regs.gpp (#9274)

* Update ttdBidAdapter.js

* Update ttdBidAdapter.js

* Update ttdBidAdapter_spec.js

* Update ttdBidAdapter_spec.js

* Update ttdBidAdapter_spec.js

* fix linting

* Update ttdBidAdapter_spec.js

* Update ttdBidAdapter_spec.js

* Update ttdBidAdapter.js

* Update ttdBidAdapter_spec.js

* Update ttdBidAdapter.js

* Update ttdBidAdapter.js

* Update ttdBidAdapter.js

* Update ttdBidAdapter.js

* Update ttdBidAdapter.js

* Update ttdBidAdapter.js

* Update ttdBidAdapter.js

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/ttdBidAdapter.js                |  4 ++++
 test/spec/modules/ttdBidAdapter_spec.js | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/modules/ttdBidAdapter.js b/modules/ttdBidAdapter.js
index 56dc44827b7..884c43c438a 100644
--- a/modules/ttdBidAdapter.js
+++ b/modules/ttdBidAdapter.js
@@ -38,6 +38,10 @@ function getRegs(bidderRequest) {
   if (config.getConfig('coppa') === true) {
     regs.coppa = 1;
   }
+  if (bidderRequest.ortb2?.regs) {
+    utils.mergeDeep(regs, bidderRequest.ortb2.regs);
+  }
+
   return regs;
 }
 
diff --git a/test/spec/modules/ttdBidAdapter_spec.js b/test/spec/modules/ttdBidAdapter_spec.js
index 346f1ef88f6..f45872faec9 100644
--- a/test/spec/modules/ttdBidAdapter_spec.js
+++ b/test/spec/modules/ttdBidAdapter_spec.js
@@ -400,6 +400,20 @@ describe('ttdBidAdapter', function () {
       expect(requestBody.regs.coppa).to.equal(1);
     });
 
+    it('adds gpp consent info to the request', function () {
+      const ortb2 = {
+        regs: {
+          gpp: 'somegppstring',
+          gpp_sid: [6, 7]
+        }
+      };
+      let clonedBidderRequest = {...deepClone(baseBidderRequest), ortb2};
+      const requestBody = testBuildRequests(baseBannerBidRequests, clonedBidderRequest).data;
+      config.resetConfig();
+      expect(requestBody.regs.gpp).to.equal('somegppstring');
+      expect(requestBody.regs.gpp_sid).to.eql([6, 7]);
+    });
+
     it('adds schain info to the request', function () {
       const schain = {
         'ver': '1.0',

From fa3b66548b91187c837f7112c87bcbcf29e15917 Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Tue, 29 Nov 2022 15:58:40 -0500
Subject: [PATCH 489/569] Revert "fix for broken download bundle
 https://github.com/prebid/prebid.github.io/issues/4177 (#9289)" (#9298)

This reverts commit 5a9aaa8ca5bb47393ddfb08b00d1c4e0af5fd850.
---
 modules/{kueezrtbBidAdapter.js => kueezRtbBidAdapter.js}        | 0
 modules/{kueezrtbBidAdapter.md => kueezRtbBidAdapter.md}        | 0
 .../{kueezrtbBidAdapter_spec.js => kueezRtbBidAdapter_spec.js}  | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename modules/{kueezrtbBidAdapter.js => kueezRtbBidAdapter.js} (100%)
 rename modules/{kueezrtbBidAdapter.md => kueezRtbBidAdapter.md} (100%)
 rename test/spec/modules/{kueezrtbBidAdapter_spec.js => kueezRtbBidAdapter_spec.js} (99%)

diff --git a/modules/kueezrtbBidAdapter.js b/modules/kueezRtbBidAdapter.js
similarity index 100%
rename from modules/kueezrtbBidAdapter.js
rename to modules/kueezRtbBidAdapter.js
diff --git a/modules/kueezrtbBidAdapter.md b/modules/kueezRtbBidAdapter.md
similarity index 100%
rename from modules/kueezrtbBidAdapter.md
rename to modules/kueezRtbBidAdapter.md
diff --git a/test/spec/modules/kueezrtbBidAdapter_spec.js b/test/spec/modules/kueezRtbBidAdapter_spec.js
similarity index 99%
rename from test/spec/modules/kueezrtbBidAdapter_spec.js
rename to test/spec/modules/kueezRtbBidAdapter_spec.js
index 70ece966651..f9b2cd41a43 100644
--- a/test/spec/modules/kueezrtbBidAdapter_spec.js
+++ b/test/spec/modules/kueezRtbBidAdapter_spec.js
@@ -11,7 +11,7 @@ import {
   setStorageItem,
   tryParseJSON,
   getUniqueDealId,
-} from 'modules/kueezrtbBidAdapter.js';
+} from 'modules/kueezRtbBidAdapter.js';
 import * as utils from 'src/utils.js';
 import {version} from 'package.json';
 import {useFakeTimers} from 'sinon';

From 4656aa2af869c7556178e23a7229bf8c21cebd36 Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Tue, 29 Nov 2022 16:03:10 -0500
Subject: [PATCH 490/569] Revert "AcuityAds adapter: fix issue with download
 (#9164)" (#9299)

This reverts commit 4f21a5bc9e2e4ace066a4d26ca1c9c637c46a477.
---
 modules/{acuityadsBidAdapter.js => acuityAdsBidAdapter.js}      | 0
 modules/{acuityadsBidAdapter.md => acuityAdsBidAdapter.md}      | 0
 ...{acuityadsBidAdapter_spec.js => acuityAdsBidAdapter_spec.js} | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename modules/{acuityadsBidAdapter.js => acuityAdsBidAdapter.js} (100%)
 rename modules/{acuityadsBidAdapter.md => acuityAdsBidAdapter.md} (100%)
 rename test/spec/modules/{acuityadsBidAdapter_spec.js => acuityAdsBidAdapter_spec.js} (99%)

diff --git a/modules/acuityadsBidAdapter.js b/modules/acuityAdsBidAdapter.js
similarity index 100%
rename from modules/acuityadsBidAdapter.js
rename to modules/acuityAdsBidAdapter.js
diff --git a/modules/acuityadsBidAdapter.md b/modules/acuityAdsBidAdapter.md
similarity index 100%
rename from modules/acuityadsBidAdapter.md
rename to modules/acuityAdsBidAdapter.md
diff --git a/test/spec/modules/acuityadsBidAdapter_spec.js b/test/spec/modules/acuityAdsBidAdapter_spec.js
similarity index 99%
rename from test/spec/modules/acuityadsBidAdapter_spec.js
rename to test/spec/modules/acuityAdsBidAdapter_spec.js
index 2497b435a19..18ea574c1ce 100644
--- a/test/spec/modules/acuityadsBidAdapter_spec.js
+++ b/test/spec/modules/acuityAdsBidAdapter_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { spec } from '../../../modules/acuityadsBidAdapter';
+import { spec } from '../../../modules/acuityAdsBidAdapter';
 import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
 import { getUniqueIdentifierStr } from '../../../src/utils.js';
 

From 4f55dbc8c515378a709d1f7bcc34ba2e2d500542 Mon Sep 17 00:00:00 2001
From: kkho339 <119444562+kkho339@users.noreply.github.com>
Date: Tue, 29 Nov 2022 13:52:05 -0800
Subject: [PATCH 491/569] Add new size 192x160 (ID: 622) in Rubicon Adapter
 (#9297)

---
 modules/rubiconBidAdapter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index 254799b995d..bd53e9d5104 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -134,7 +134,8 @@ var sizeMap = {
   574: '620x891',
   576: '610x877',
   578: '980x552',
-  580: '505x656'
+  580: '505x656',
+  622: '192x160'
 };
 _each(sizeMap, (item, key) => sizeMap[item] = key);
 

From de18e7ccab23bfa294f25bb4f691a8aaf6636ae0 Mon Sep 17 00:00:00 2001
From: redtram-tech <84892722+redtram-tech@users.noreply.github.com>
Date: Wed, 30 Nov 2022 19:10:51 +0200
Subject: [PATCH 492/569] Redtram Bid Adapter : initial adapter release (#9260)

* Add Redtram Bid Adapter

* add on bidWon test

* extend tests

* remove convertOrtbRequestToProprietaryNative 9260#pullrequestreview-1196218534

Co-authored-by: Oleh Naimushyn <ncm.net@gmail.com>
---
 modules/redtramBidAdapter.js                | 155 ++++++++++++
 modules/redtramBidAdapter.md                |  33 +++
 test/spec/modules/redtramBidAdapter_spec.js | 256 ++++++++++++++++++++
 3 files changed, 444 insertions(+)
 create mode 100644 modules/redtramBidAdapter.js
 create mode 100644 modules/redtramBidAdapter.md
 create mode 100644 test/spec/modules/redtramBidAdapter_spec.js

diff --git a/modules/redtramBidAdapter.js b/modules/redtramBidAdapter.js
new file mode 100644
index 00000000000..e1dc0e2a148
--- /dev/null
+++ b/modules/redtramBidAdapter.js
@@ -0,0 +1,155 @@
+import {
+  isFn,
+  isStr,
+  deepAccess,
+  getWindowTop,
+  triggerPixel
+} from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'redtram';
+const AD_URL = 'https://prebid.redtram.com/pbjs';
+const SYNC_URL = 'https://prebid.redtram.com/sync';
+
+function isBidResponseValid(bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId ||
+    !bid.ttl || !bid.currency || !bid.meta) {
+    return false;
+  }
+
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    default:
+      return false;
+  }
+}
+
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return deepAccess(bid, 'params.bidFloor', 0);
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*',
+    });
+    return bidFloor.floor;
+  } catch (_) {
+    return 0
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.bidId && bid.params && bid.params.placementId);
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest) => {
+    const winTop = getWindowTop();
+    const location = winTop.location;
+    const placements = [];
+
+    const request = {
+      deviceWidth: winTop.screen.width,
+      deviceHeight: winTop.screen.height,
+      language: (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
+      host: location.host,
+      page: location.pathname,
+      placements: placements
+    };
+
+    if (bidderRequest) {
+      if (bidderRequest.uspConsent) {
+        request.ccpa = bidderRequest.uspConsent;
+      }
+      if (bidderRequest.gdprConsent) {
+        request.gdpr = bidderRequest.gdprConsent;
+      }
+    }
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      const placement = {
+        placementId: bid.params.placementId,
+        bidId: bid.bidId,
+        schain: bid.schain || {},
+        bidfloor: getBidFloor(bid)
+      };
+
+      if (typeof bid.userId !== 'undefined') {
+        placement.userId = bid.userId;
+      }
+
+      const mediaType = bid.mediaTypes;
+
+      if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
+        placement.sizes = mediaType[BANNER].sizes;
+        placement.adFormat = BANNER;
+      }
+
+      placements.push(placement);
+    }
+
+    return {
+      method: 'POST',
+      url: AD_URL,
+      data: request
+    };
+  },
+
+  interpretResponse: (serverResponse) => {
+    let response = [];
+    for (let i = 0; i < serverResponse.body.length; i++) {
+      let resItem = serverResponse.body[i];
+      if (isBidResponseValid(resItem)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  },
+
+  onBidWon: (bid) => {
+    const cpm = deepAccess(bid, 'adserverTargeting.hb_pb') || '';
+    if (isStr(bid.nurl) && bid.nurl !== '') {
+      bid.nurl = bid.nurl.replace(/\${AUCTION_PRICE}/, cpm);
+      triggerPixel(bid.nurl);
+    }
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/redtramBidAdapter.md b/modules/redtramBidAdapter.md
new file mode 100644
index 00000000000..39115502aa7
--- /dev/null
+++ b/modules/redtramBidAdapter.md
@@ -0,0 +1,33 @@
+# Overview
+
+```
+Module Name: redtram Bidder Adapter
+Module Type: redtram Bidder Adapter
+Maintainer: support@redtram.com
+```
+
+# Description
+
+Module that connects to redtram demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'div-prebid',
+            mediaTypes:{
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+            bids:[
+                {
+                    bidder: 'redtram',
+                    params: {
+                        placementId: '23611' //test, please replace after test 
+                    }
+                }
+            ]
+        },
+    ];
+```
\ No newline at end of file
diff --git a/test/spec/modules/redtramBidAdapter_spec.js b/test/spec/modules/redtramBidAdapter_spec.js
new file mode 100644
index 00000000000..e136c37962b
--- /dev/null
+++ b/test/spec/modules/redtramBidAdapter_spec.js
@@ -0,0 +1,256 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/redtramBidAdapter.js';
+import { BANNER } from '../../../src/mediaTypes.js';
+import * as utils from '../../../src/utils.js';
+
+describe('RedtramBidAdapter', function () {
+  const bid = {
+    bidId: '23dc19818e5293',
+    bidder: 'redtram',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      placementId: 23611,
+    }
+  };
+
+  const bidderRequest = {
+    refererInfo: {
+      referer: 'test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      delete bid.params.placementId;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests([bid], bidderRequest);
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://prebid.redtram.com/pbjs');
+    });
+    it('Returns valid data if array of bids is valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'host', 'page', 'placements');
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.gdpr).to.not.exist;
+      expect(data.ccpa).to.not.exist;
+      let placement = data['placements'][0];
+      expect(placement).to.have.keys('placementId', 'bidId', 'adFormat', 'sizes', 'schain', 'bidfloor');
+      expect(placement.placementId).to.equal(23611);
+      expect(placement.bidId).to.equal('23dc19818e5293');
+      expect(placement.adFormat).to.equal(BANNER);
+      expect(placement.schain).to.be.an('object');
+      expect(placement.sizes).to.be.an('array');
+      expect(placement.bidfloor).to.exist.and.to.equal(0);
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      bidderRequest.gdprConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = 'test';
+      serverRequest = spec.buildRequests([bid], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      serverRequest = spec.buildRequests([]);
+      let data = serverRequest.data;
+      expect(data.placements).to.be.an('array').that.is.empty;
+    });
+  });
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23dc19818e5293',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {}
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23dc19818e5293');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.width).to.equal(300);
+      expect(dataItem.height).to.equal(250);
+      expect(dataItem.ad).to.equal('Test');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23dc19818e5293',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should do nothing on getUserSyncs', function () {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://prebid.redtram.com/sync/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+  });
+
+  describe('on bidWon', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+    it('should replace nurl for banner', function () {
+      const nurl = 'nurl/?ap=${' + 'AUCTION_PRICE}';
+      const bid = {
+        'bidderCode': 'redtram',
+        'width': 300,
+        'height': 250,
+        'statusMessage': 'Bid available',
+        'adId': '5691dd18ba6ab6',
+        'requestId': '23dc19818e5293',
+        'transactionId': '948c716b-bf64-4303-bcf4-395c2f6a9770',
+        'auctionId': 'a6b7c61f-15a9-481b-8f64-e859787e9c07',
+        'mediaType': 'banner',
+        'source': 'client',
+        'ad': "<div class=\"r23611\"></div>\n<script type=\"text/javascript\">\n(function() {\nvar tag = (function() {\nvar informers = document.getElementsByClassName('r23611'),\nlen = informers.length;\nreturn len ? informers[len - 1] : null;\n})(),\nidn = (function() {\nvar i, num, idn = '', chars = \"abcdefghiklmnopqrstuvwxyz\",\nlen = Math.floor((Math.random() * 2) + 4);\nfor (i = 0; i < len; i++) {\nnum = Math.floor(Math.random() * chars.length);\nidn += chars.substring(num, num + 1);\n}\nreturn idn;\n})();\nvar container = document.createElement('div');\ncontainer.id = idn;\ntag.appendChild(container);\nvar script = document.createElement('script');\nscript.className = 's23611';\nscript.src = 'https://goods.redtram.com/j/23611/?v=1';\nscript.charset = 'utf-8';\nscript.dataset.idn = idn;\ntag.parentNode.insertBefore(script, tag);\n})();\n</script>",
+        'cpm': 0.68,
+        'nurl': nurl,
+        'creativeId': 'test',
+        'currency': 'USD',
+        'dealId': '',
+        'meta': {
+          'advertiserDomains': [],
+          'dchain': {
+            'ver': '1.0',
+            'complete': 0,
+            'nodes': [
+              {
+                'name': 'redtram'
+              }
+            ]
+          }
+        },
+        'netRevenue': true,
+        'ttl': 120,
+        'metrics': {},
+        'adapterCode': 'redtram',
+        'originalCpm': 0.68,
+        'originalCurrency': 'USD',
+        'responseTimestamp': 1668162732297,
+        'requestTimestamp': 1668162732292,
+        'bidder': 'redtram',
+        'adUnitCode': 'div-prebid',
+        'timeToRespond': 5,
+        'pbLg': '0.50',
+        'pbMg': '0.60',
+        'pbHg': '0.68',
+        'pbAg': '0.65',
+        'pbDg': '0.68',
+        'pbCg': '',
+        'size': '300x250',
+        'adserverTargeting': {
+          'hb_bidder': 'redtram',
+          'hb_adid': '5691dd18ba6ab6',
+          'hb_pb': '0.68',
+          'hb_size': '300x250',
+          'hb_source': 'client',
+          'hb_format': 'banner',
+          'hb_adomain': ''
+        },
+        'status': 'rendered',
+        'params': [
+          {
+            'placementId': 23611
+          }
+        ]
+      };
+      spec.onBidWon(bid);
+      expect(bid.nurl).to.deep.equal('nurl/?ap=0.68');
+    });
+  });
+});

From 5b13b541ff40cd704e81f630288a89585461fcb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Udi=20Talias=20=E2=9A=9B=EF=B8=8F?= <udi.talias@gmail.com>
Date: Wed, 30 Nov 2022 19:11:23 +0200
Subject: [PATCH 493/569] VidazooBidAdapter: sending storageAllowed flag with
 request params (#9294)

* feat(module): multi size request

* fix getUserSyncs
added tests

* update(module): package-lock.json from master

* feat(module): VidazooBidAdapter - send top query params to server

* added bid params to request

Co-authored-by: roman <shmoop207@gmail.com>
Co-authored-by: Saar Amrani <89377180+saar120@users.noreply.github.com>
Co-authored-by: Saar Amrani <saar120@gmail.com>
---
 modules/vidazooBidAdapter.js                | 3 +++
 test/spec/modules/vidazooBidAdapter_spec.js | 1 +
 2 files changed, 4 insertions(+)

diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index 39c407ae8a6..e79835b39c0 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -2,6 +2,7 @@ import { _each, deepAccess, parseSizesInput, parseUrl, uniques, isFn } from '../
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { bidderSettings } from '../src/bidderSettings.js';
 
 const GVLID = 744;
 const DEFAULT_SUB_DOMAIN = 'prebid';
@@ -69,6 +70,7 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
   const pId = extractPID(params);
   const subDomain = extractSubDomain(params);
   const ptrace = getCacheOpt();
+  const isStorageAllowed = bidderSettings.get(BIDDER_CODE, 'storageAllowed');
 
   const gpid = deepAccess(bid, 'ortb2Imp.ext.gpid', deepAccess(bid, 'ortb2Imp.ext.data.pbadslot', ''));
   const cat = deepAccess(bidderRequest, 'ortb2.site.cat', []);
@@ -104,6 +106,7 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
     res: `${screen.width}x${screen.height}`,
     schain: schain,
     ptrace: ptrace,
+    isStorageAllowed: isStorageAllowed,
     gpid: gpid,
     cat: cat,
     pagecat: pagecat
diff --git a/test/spec/modules/vidazooBidAdapter_spec.js b/test/spec/modules/vidazooBidAdapter_spec.js
index 7c7f27a830b..9c22b41968f 100644
--- a/test/spec/modules/vidazooBidAdapter_spec.js
+++ b/test/spec/modules/vidazooBidAdapter_spec.js
@@ -198,6 +198,7 @@ describe('VidazooBidAdapter', function () {
           uqs: getTopWindowQueryParams(),
           'ext.param1': 'loremipsum',
           'ext.param2': 'dolorsitamet',
+          isStorageAllowed: true,
           gpid: '1234567890',
           cat: ['IAB2'],
           pagecat: ['IAB2-2']

From 164e374b030f6f8f110ca22f419dccabf8170b1a Mon Sep 17 00:00:00 2001
From: Patrick Loughrey <ploughrey@triplelift.com>
Date: Wed, 30 Nov 2022 12:13:54 -0500
Subject: [PATCH 494/569] Triplelift Adapter: Update referrer logic  (#9304)

* prioritize topmostlocation

* adds test for topmostlocation / referrer

* cleanup

* delete param after test

* TL-32803: Update referrer logic

* TL-32803: Update referrer logic

Co-authored-by: Nick Llerandi <nllerandi@triplelift.com>
Co-authored-by: nllerandi3lift <75995508+nllerandi3lift@users.noreply.github.com>
---
 modules/tripleliftBidAdapter.js                |  2 +-
 test/spec/modules/tripleliftBidAdapter_spec.js | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index 3fdabcfa6d2..7f6ec90c7b9 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -29,7 +29,7 @@ export const tripleliftAdapterSpec = {
     tlCall = tryAppendQueryString(tlCall, 'v', '$prebid.version$');
 
     if (bidderRequest && bidderRequest.refererInfo) {
-      let referrer = bidderRequest?.refererInfo?.topmostLocation || bidderRequest?.refererInfo?.page;
+      let referrer = bidderRequest.refererInfo.page;
       tlCall = tryAppendQueryString(tlCall, 'referrer', referrer);
     }
 
diff --git a/test/spec/modules/tripleliftBidAdapter_spec.js b/test/spec/modules/tripleliftBidAdapter_spec.js
index 4cab8be7e09..5cfa64184f9 100644
--- a/test/spec/modules/tripleliftBidAdapter_spec.js
+++ b/test/spec/modules/tripleliftBidAdapter_spec.js
@@ -979,19 +979,12 @@ describe('triplelift adapter', function () {
       expect(url).to.match(new RegExp('(?:' + prebid.version + ')'))
       expect(url).to.match(/(?:referrer)/);
     });
-    it('should prioritize topmostLocation for referrer', function () {
-      bidderRequest.refererInfo.topmostLocation = 'https://topmostlocation.com?foo=bar'
+    it('should use refererInfo.page for referrer', function () {
+      bidderRequest.refererInfo.page = 'https://topmostlocation.com?foo=bar'
       const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
       const url = request.url;
       expect(url).to.match(/(\?|&)referrer=https%3A%2F%2Ftopmostlocation.com%3Ffoo%3Dbar/);
-      delete bidderRequest.refererInfo.topmostLocation
-    });
-    it('should fall back to page for referrer if topmostLocation is unavailable', function () {
-      bidderRequest.refererInfo.topmostLocation = null
-      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
-      const url = request.url;
-      expect(url).to.match(/(\?|&)referrer=https%3A%2F%2Fexamplereferer.com/);
-      delete bidderRequest.refererInfo.topmostLocation
+      delete bidderRequest.refererInfo.page
     });
     it('should return us_privacy param when CCPA info is available', function() {
       bidderRequest.uspConsent = '1YYY';

From f8976951c1a2f3384c4c6a7cfb04c622017d13e4 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Wed, 30 Nov 2022 18:00:41 +0000
Subject: [PATCH 495/569] Prebid 7.27.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2ed7cf9067e..15582191fc2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.27.0-pre",
+  "version": "7.27.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index d243b650b6d..142dd2d1cdf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.27.0-pre",
+  "version": "7.27.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 1b4a5a356e74b6c0891e0e4d356f83b1be755d79 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Wed, 30 Nov 2022 18:00:42 +0000
Subject: [PATCH 496/569] Increment version to 7.28.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 15582191fc2..8f5fd96e92a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.27.0",
+  "version": "7.28.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 142dd2d1cdf..bf52a74513a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.27.0",
+  "version": "7.28.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 0c71ee25e701b61c8c0e69fda282649350700f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Ricardo=20Gielow?= <andre.gielow@gmail.com>
Date: Wed, 30 Nov 2022 14:35:55 -0500
Subject: [PATCH 497/569] ttd Bid Adapter: add regression test topmost domain
 (#9300)

* TTD Adapter use topmost location when available

* TTD add use top most location regression test

Co-authored-by: Andre Gielow <andre.gielow@thetradedesk.com>
---
 test/helpers/refererDetectionHelper.js  | 88 ++++++++++++++++++++++++
 test/spec/modules/ttdBidAdapter_spec.js | 45 ++++++++++---
 test/spec/refererDetection_spec.js      | 89 +------------------------
 3 files changed, 125 insertions(+), 97 deletions(-)
 create mode 100644 test/helpers/refererDetectionHelper.js

diff --git a/test/helpers/refererDetectionHelper.js b/test/helpers/refererDetectionHelper.js
new file mode 100644
index 00000000000..bdbfb205cdb
--- /dev/null
+++ b/test/helpers/refererDetectionHelper.js
@@ -0,0 +1,88 @@
+/**
+ * Build a walkable linked list of window-like objects for testing.
+ *
+ * @param {Array} urls Array of URL strings starting from the top window.
+ * @param {string} [topReferrer]
+ * @param {string} [canonicalUrl]
+ * @param {boolean} [ancestorOrigins]
+ * @returns {Object}
+ */
+export function buildWindowTree(urls, topReferrer = null, canonicalUrl = null, ancestorOrigins = false) {
+  /**
+   * Find the origin from a given fully-qualified URL.
+   *
+   * @param {string} url The fully qualified URL
+   * @returns {string|null}
+   */
+  function getOrigin(url) {
+    const originRegex = new RegExp('^(https?://[^/]+/?)');
+
+    const result = originRegex.exec(url);
+
+    if (result && result[0]) {
+      return result[0];
+    }
+
+    return null;
+  }
+
+  const inaccessibles = [];
+
+  let previousWindow, topWindow;
+  const topOrigin = getOrigin(urls[0]);
+
+  const windowList = urls.map((url, index) => {
+    const thisOrigin = getOrigin(url),
+      sameOriginAsPrevious = index === 0 ? true : (getOrigin(urls[index - 1]) === thisOrigin),
+      sameOriginAsTop = thisOrigin === topOrigin;
+
+    const win = {
+      location: {
+        href: url,
+      },
+      document: {
+        referrer: index === 0 ? topReferrer : urls[index - 1]
+      }
+    };
+
+    if (topWindow == null) {
+      topWindow = win;
+      win.document.querySelector = function (selector) {
+        if (selector === 'link[rel=\'canonical\']') {
+          return {
+            href: canonicalUrl
+          };
+        }
+        return null;
+      };
+    }
+
+    if (sameOriginAsPrevious) {
+      win.parent = previousWindow;
+    } else {
+      win.parent = inaccessibles[inaccessibles.length - 1];
+    }
+    if (ancestorOrigins) {
+      win.location.ancestorOrigins = urls.slice(0, index).reverse().map(getOrigin);
+    }
+    win.top = sameOriginAsTop ? topWindow : inaccessibles[0];
+
+    const inWin = {parent: inaccessibles[inaccessibles.length - 1], top: inaccessibles[0]};
+    if (index === 0) {
+      inWin.top = inWin;
+    }
+    ['document', 'location'].forEach((prop) => {
+      Object.defineProperty(inWin, prop, {
+        get: function () {
+          throw new Error('cross-origin access');
+        }
+      });
+    });
+    inaccessibles.push(inWin);
+    previousWindow = win;
+
+    return win;
+  });
+
+  return windowList[windowList.length - 1];
+}
diff --git a/test/spec/modules/ttdBidAdapter_spec.js b/test/spec/modules/ttdBidAdapter_spec.js
index f45872faec9..9869d072657 100644
--- a/test/spec/modules/ttdBidAdapter_spec.js
+++ b/test/spec/modules/ttdBidAdapter_spec.js
@@ -2,6 +2,9 @@ import { expect } from 'chai';
 import { spec } from 'modules/ttdBidAdapter';
 import { deepClone } from 'src/utils.js';
 import { config } from 'src/config';
+import { detectReferer } from 'src/refererDetection.js';
+
+import { buildWindowTree } from '../../helpers/refererDetectionHelper';
 
 describe('ttdBidAdapter', function () {
   function testBuildRequests(bidRequests, bidderRequestBase) {
@@ -200,20 +203,15 @@ describe('ttdBidAdapter', function () {
       'bidRequestsCount': 1
     }];
 
+    const testWindow = buildWindowTree(['https://www.example.com/test', 'https://www.example.com/other/page', 'https://www.example.com/third/page'], 'https://othersite.com/', 'https://example.com/canonical/page');
+    const baseBidderRequestReferer = detectReferer(testWindow)();
     const baseBidderRequest = {
       'bidderCode': 'ttd',
       'auctionId': 'e7b34fa3-8654-424e-8c49-03e509e53d8c',
       'bidderRequestId': '18084284054531',
       'auctionStart': 1540945362095,
       'timeout': 3000,
-      'refererInfo': {
-        'page': 'https://www.example.com/test',
-        'reachedTop': true,
-        'numIframes': 0,
-        'stack': [
-          'https://www.example.com/test'
-        ]
-      },
+      'refererInfo': baseBidderRequestReferer,
       'start': 1540945362099,
       'doneCbCallCount': 0
     };
@@ -291,6 +289,11 @@ describe('ttdBidAdapter', function () {
       expect(requestBody.site.page).to.equal('https://www.example.com/test');
     });
 
+    it('ensure top most location is used', function () {
+      const requestBody = testBuildRequests(baseBannerBidRequests, baseBidderRequest).data;
+      expect(requestBody.site.page).to.equal('https://www.example.com/test');
+    });
+
     it('sets the banner pos correctly if sent', function () {
       let clonedBannerRequests = deepClone(baseBannerBidRequests);
       clonedBannerRequests[0].mediaTypes.banner.pos = 1;
@@ -318,11 +321,35 @@ describe('ttdBidAdapter', function () {
           }
         }
       };
-      const requestBody = testBuildRequests(baseBannerBidRequests, {...baseBidderRequest, ortb2}).data;
+      const baseBidderRequestWithoutRefererDomain = {
+        ...baseBidderRequest,
+        refererInfo: {
+          ...baseBannerBidRequests.referer,
+          domain: null
+        }
+      }
+      const requestBody = testBuildRequests(
+        baseBannerBidRequests, {...baseBidderRequestWithoutRefererDomain, ortb2}
+      ).data;
       config.resetConfig();
       expect(requestBody.site.publisher).to.deep.equal({domain: 'https://foo.bar', id: '13144370'});
     });
 
+    it('referer domain overrides first party site data publisher domain', function () {
+      const ortb2 = {
+        site: {
+          publisher: {
+            domain: 'https://foo.bar',
+          }
+        }
+      };
+      const requestBody = testBuildRequests(
+        baseBannerBidRequests, {...baseBidderRequest, ortb2}
+      ).data;
+      config.resetConfig();
+      expect(requestBody.site.publisher.domain).to.equal(baseBidderRequest.refererInfo.domain);
+    });
+
     it('sets keywords properly if sent', function () {
       const ortb2 = {
         site: {
diff --git a/test/spec/refererDetection_spec.js b/test/spec/refererDetection_spec.js
index f8166a27d85..a0ffc3eddbe 100644
--- a/test/spec/refererDetection_spec.js
+++ b/test/spec/refererDetection_spec.js
@@ -2,94 +2,7 @@ import {detectReferer, ensureProtocol, parseDomain} from 'src/refererDetection.j
 import {config} from 'src/config.js';
 import {expect} from 'chai';
 
-/**
- * Build a walkable linked list of window-like objects for testing.
- *
- * @param {Array} urls Array of URL strings starting from the top window.
- * @param {string} [topReferrer]
- * @param {string} [canonicalUrl]
- * @param {boolean} [ancestorOrigins]
- * @returns {Object}
- */
-function buildWindowTree(urls, topReferrer = null, canonicalUrl = null, ancestorOrigins = false) {
-  /**
-   * Find the origin from a given fully-qualified URL.
-   *
-   * @param {string} url The fully qualified URL
-   * @returns {string|null}
-   */
-  function getOrigin(url) {
-    const originRegex = new RegExp('^(https?://[^/]+/?)');
-
-    const result = originRegex.exec(url);
-
-    if (result && result[0]) {
-      return result[0];
-    }
-
-    return null;
-  }
-
-  const inaccessibles = [];
-
-  let previousWindow, topWindow;
-  const topOrigin = getOrigin(urls[0]);
-
-  const windowList = urls.map((url, index) => {
-    const thisOrigin = getOrigin(url),
-      sameOriginAsPrevious = index === 0 ? true : (getOrigin(urls[index - 1]) === thisOrigin),
-      sameOriginAsTop = thisOrigin === topOrigin;
-
-    const win = {
-      location: {
-        href: url,
-      },
-      document: {
-        referrer: index === 0 ? topReferrer : urls[index - 1]
-      }
-    };
-
-    if (topWindow == null) {
-      topWindow = win;
-      win.document.querySelector = function (selector) {
-        if (selector === 'link[rel=\'canonical\']') {
-          return {
-            href: canonicalUrl
-          };
-        }
-        return null;
-      };
-    }
-
-    if (sameOriginAsPrevious) {
-      win.parent = previousWindow;
-    } else {
-      win.parent = inaccessibles[inaccessibles.length - 1];
-    }
-    if (ancestorOrigins) {
-      win.location.ancestorOrigins = urls.slice(0, index).reverse().map(getOrigin);
-    }
-    win.top = sameOriginAsTop ? topWindow : inaccessibles[0];
-
-    const inWin = {parent: inaccessibles[inaccessibles.length - 1], top: inaccessibles[0]};
-    if (index === 0) {
-      inWin.top = inWin;
-    }
-    ['document', 'location'].forEach((prop) => {
-      Object.defineProperty(inWin, prop, {
-        get: function () {
-          throw new Error('cross-origin access');
-        }
-      });
-    });
-    inaccessibles.push(inWin);
-    previousWindow = win;
-
-    return win;
-  });
-
-  return windowList[windowList.length - 1];
-}
+import { buildWindowTree } from '../helpers/refererDetectionHelper';
 
 describe('Referer detection', () => {
   afterEach(function () {

From 0725ba87275d0f88e534a94d8d4e0489b02c2d29 Mon Sep 17 00:00:00 2001
From: Jeremy Sadwith <jeremy@kargo.com>
Date: Wed, 30 Nov 2022 17:39:15 -0500
Subject: [PATCH 498/569] Kargo Adapter: Update referrer logic (#9305)

* pageURL pull from topmostLocation

* Kargo: Support for client hints (#9)

* Starting SUA support

* Kargo: Adding support for client hints

* Adding tests for sua

* Kargo: Update referer logic
---
 modules/kargoBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/kargoBidAdapter.js b/modules/kargoBidAdapter.js
index 15d706c0410..2c33c3f61d1 100644
--- a/modules/kargoBidAdapter.js
+++ b/modules/kargoBidAdapter.js
@@ -231,7 +231,7 @@ export const spec = {
   _getAllMetadata(bidderRequest, tdid) {
     return {
       userIDs: spec._getUserIds(tdid, bidderRequest.uspConsent, bidderRequest.gdprConsent),
-      pageURL: bidderRequest?.refererInfo?.topmostLocation || bidderRequest?.refererInfo?.page,
+      pageURL: bidderRequest?.refererInfo?.page,
       rawCRB: storage.getCookie('krg_crb'),
       rawCRBLocalStorage: spec._getLocalStorageSafely('krg_crb')
     };

From b95f26e523b6ec252aa05c0cb0f820a4c13bb903 Mon Sep 17 00:00:00 2001
From: BaronJHYu <254878848@qq.com>
Date: Thu, 1 Dec 2022 23:44:47 +0800
Subject: [PATCH 499/569] Discovery Bid Adapter & Mediago Bid Adapter: add
 support for test request param (#9302)

* Mediago Bid Adapter:new adapter

* remove console

* change spec file to fix CircleCI

* change spec file to fix CircleCI

* change spec file

* Update mediagoBidAdapter.js

* Update mediagoBidAdapter.js

* rerun CurcleCi

* update mediagoBidAdapter

* update discoveryBidAdapter

* Discovery Bid Adapter : parameter updates

* Mediago Bid Adapter : parameter updates

* Mediago Bid Adapter : code style format

* rerun circleci

* rerun circleci

* rerun circleci

* rerun circleci

Co-authored-by: BaronYu <baronwei11@gmail.com>
---
 modules/discoveryBidAdapter.js | 3 +++
 modules/mediagoBidAdapter.js   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/discoveryBidAdapter.js b/modules/discoveryBidAdapter.js
index fab3920efcc..0c536892716 100644
--- a/modules/discoveryBidAdapter.js
+++ b/modules/discoveryBidAdapter.js
@@ -277,6 +277,8 @@ function getItems(validBidRequests, bidderRequest) {
 function getParam(validBidRequests, bidderRequest) {
   const pubcid = utils.deepAccess(validBidRequests[0], 'crumbs.pubcid');
   let isMobile = getDevice() ? 1 : 0;
+  // input test status by Publisher. more frequently for test true req
+  let isTest = validBidRequests[0].params.test || 0;
   let auctionId = getKv(bidderRequest, 'auctionId');
   let items = getItems(validBidRequests, bidderRequest);
 
@@ -290,6 +292,7 @@ function getParam(validBidRequests, bidderRequest) {
   if (items && items.length) {
     let c = {
       id: 'pp_hbjs_' + auctionId,
+      test: +isTest,
       at: 1,
       bcat: globals['bcat'],
       badv: globals['adv'],
diff --git a/modules/mediagoBidAdapter.js b/modules/mediagoBidAdapter.js
index 514c56061df..16460b195f5 100644
--- a/modules/mediagoBidAdapter.js
+++ b/modules/mediagoBidAdapter.js
@@ -297,7 +297,8 @@ function getParam(validBidRequests, bidderRequest) {
     utils.deepAccess(validBidRequests[0], 'userId.sharedid.id') ||
     utils.deepAccess(validBidRequests[0], 'userId.pubcid');
   let isMobile = isMobileAndTablet() ? 1 : 0;
-  let isTest = 0;
+  // input test status by Publisher. more frequently for test true req
+  let isTest = validBidRequests[0].params.test || 0;
   let auctionId = getProperty(bidderRequest, 'auctionId');
   let items = getItems(validBidRequests, bidderRequest);
 

From 6b61f97333c24845a4ba187ae5d9c6c8d9b6774c Mon Sep 17 00:00:00 2001
From: Marcin Wrobel <marcin.wrobel@openx.com>
Date: Thu, 1 Dec 2022 18:14:38 +0100
Subject: [PATCH 500/569] OpenX Bid Adapter: update documentation about
 deprecated platform and hint for using floor module (#9308)

---
 modules/openxBidAdapter.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/openxBidAdapter.md b/modules/openxBidAdapter.md
index 28dba424fb2..5ce5a786f7b 100644
--- a/modules/openxBidAdapter.md
+++ b/modules/openxBidAdapter.md
@@ -15,14 +15,15 @@ Publishers are welcome to test the other adapter and give feedback. Please note
 # Bid Parameters
 ## Banner
 
-| Name | Scope | Type | Description | Example
-| ---- | ----- | ---- | ----------- | -------
-| `delDomain` or `platform` | required | String | OpenX delivery domain or platform id provided by your OpenX representative.  | "PUBLISHER-d.openx.net" or "555not5a-real-plat-form-id0123456789"
-| `unit` | required | String | OpenX ad unit ID provided by your OpenX representative. | "1611023122"
-| `customParams` | optional | Object | User-defined targeting key-value pairs. customParams applies to a specific unit. | `{key1: "v1", key2: ["v2","v3"]}`
-| `customFloor` | optional | Number | Minimum price in USD. customFloor applies to a specific unit. For example, use the following value to set a $1.50 floor: 1.50 <br/><br/> **WARNING:**<br/> Misuse of this parameter can impact revenue | 1.50
-| `doNotTrack` | optional | Boolean | Prevents advertiser from using data for this user. <br/><br/> **WARNING:**<br/> Request-level setting.  May impact revenue. | true
-| `coppa` | optional | Boolean | Enables Child's Online Privacy Protection Act (COPPA) regulations. | true
+| Name                            | Scope | Type | Description                                                                                                                                                                                                                                                                                                                                                                                                                        | Example
+|---------------------------------| ----- | ---- |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -------
+| `delDomain` ~~or `platform`~~** | required | String | OpenX delivery domain provided by your OpenX representative.                                                                                                                                                                                                                                                                                                                                                                       | "PUBLISHER-d.openx.net"
+| `unit`                          | required | String | OpenX ad unit ID provided by your OpenX representative.                                                                                                                                                                                                                                                                                                                                                                            | "1611023122"
+| `customParams`                  | optional | Object | User-defined targeting key-value pairs. customParams applies to a specific unit.                                                                                                                                                                                                                                                                                                                                                   | `{key1: "v1", key2: ["v2","v3"]}`
+| `customFloor`                   | optional | Number | Minimum price in USD. customFloor applies to a specific unit. For example, use the following value to set a $1.50 floor: 1.50 <br/><br/> **WARNING:**<br/> Misuse of this parameter can impact revenue<br/><br/>Note: OpenX suggests using the [Price Floor Module](https://docs.prebid.org/dev-docs/modules/floors.html) instead of customFloor. The Price Floor Module will be prioritized over customFloor if both are present. | 1.50
+| `doNotTrack`                    | optional | Boolean | Prevents advertiser from using data for this user. <br/><br/> **WARNING:**<br/> Request-level setting.  May impact revenue.                                                                                                                                                                                                                                                                                                        | true
+| `coppa`                         | optional | Boolean | Enables Child's Online Privacy Protection Act (COPPA) regulations.                                                                                                                                                                                                                                                                                                                                                                 | true
+** platform is deprecated. Please use delDomain instead. If you have any questions please contact your representative. 
 
 ## Video
 

From 8894d1cd1a55076f2c8feae621fb3f5ad7d2e97b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 22:22:08 -0500
Subject: [PATCH 501/569] Bump decode-uri-component from 0.2.0 to 0.2.2 (#9311)

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8f5fd96e92a..f0b0b45a844 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "7.27.0-pre",
+      "version": "7.28.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
@@ -7986,9 +7986,9 @@
       }
     },
     "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10"
@@ -31388,9 +31388,9 @@
       }
     },
     "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true
     },
     "decompress-response": {

From a4b4f7be8eb8d52764a32793cc0ef3eeae11d8c9 Mon Sep 17 00:00:00 2001
From: Marcin Wrobel <marcin.wrobel@openx.com>
Date: Fri, 2 Dec 2022 04:23:03 +0100
Subject: [PATCH 502/569] OpenX Bid Adapter: fix bid parameters table in
 documentation (#9310)

---
 modules/openxBidAdapter.md | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/openxBidAdapter.md b/modules/openxBidAdapter.md
index 5ce5a786f7b..0690bf6b4fc 100644
--- a/modules/openxBidAdapter.md
+++ b/modules/openxBidAdapter.md
@@ -15,24 +15,24 @@ Publishers are welcome to test the other adapter and give feedback. Please note
 # Bid Parameters
 ## Banner
 
-| Name                            | Scope | Type | Description                                                                                                                                                                                                                                                                                                                                                                                                                        | Example
-|---------------------------------| ----- | ---- |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -------
-| `delDomain` ~~or `platform`~~** | required | String | OpenX delivery domain provided by your OpenX representative.                                                                                                                                                                                                                                                                                                                                                                       | "PUBLISHER-d.openx.net"
-| `unit`                          | required | String | OpenX ad unit ID provided by your OpenX representative.                                                                                                                                                                                                                                                                                                                                                                            | "1611023122"
-| `customParams`                  | optional | Object | User-defined targeting key-value pairs. customParams applies to a specific unit.                                                                                                                                                                                                                                                                                                                                                   | `{key1: "v1", key2: ["v2","v3"]}`
-| `customFloor`                   | optional | Number | Minimum price in USD. customFloor applies to a specific unit. For example, use the following value to set a $1.50 floor: 1.50 <br/><br/> **WARNING:**<br/> Misuse of this parameter can impact revenue<br/><br/>Note: OpenX suggests using the [Price Floor Module](https://docs.prebid.org/dev-docs/modules/floors.html) instead of customFloor. The Price Floor Module will be prioritized over customFloor if both are present. | 1.50
-| `doNotTrack`                    | optional | Boolean | Prevents advertiser from using data for this user. <br/><br/> **WARNING:**<br/> Request-level setting.  May impact revenue.                                                                                                                                                                                                                                                                                                        | true
-| `coppa`                         | optional | Boolean | Enables Child's Online Privacy Protection Act (COPPA) regulations.                                                                                                                                                                                                                                                                                                                                                                 | true
+| Name                            | Scope    | Type    | Description                                                                                                                                                                                                                                                                                                                                                                                                                   | Example                           |
+|---------------------------------|----------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------|
+| `delDomain` ~~or `platform`~~** | required | String  | OpenX delivery domain provided by your OpenX representative.                                                                                                                                                                                                                                                                                                                                                                  | "PUBLISHER-d.openx.net"           |
+| `unit`                          | required | String  | OpenX ad unit ID provided by your OpenX representative.                                                                                                                                                                                                                                                                                                                                                                       | "1611023122"                      |
+| `customParams`                  | optional | Object  | User-defined targeting key-value pairs. customParams applies to a specific unit.                                                                                                                                                                                                                                                                                                                                              | `{key1: "v1", key2: ["v2","v3"]}` |
+| `customFloor`                   | optional | Number  | Minimum price in USD. customFloor applies to a specific unit. For example, use the following value to set a $1.50 floor: 1.50 <br/><br/> **WARNING:**<br/> Misuse of this parameter can impact revenue<br/><br/>Note: OpenX suggests using the [Price Floor Module](https://docs.prebid.org/dev-docs/modules/floors.html) instead of customFloor. The Price Floor Module is prioritized over customFloor if both are present. | 1.50                              |
+| `doNotTrack`                    | optional | Boolean | Prevents advertiser from using data for this user. <br/><br/> **WARNING:**<br/> Request-level setting.  May impact revenue.                                                                                                                                                                                                                                                                                                   | true                              |
+| `coppa`                         | optional | Boolean | Enables Child's Online Privacy Protection Act (COPPA) regulations.                                                                                                                                                                                                                                                                                                                                                            | true                              |
+
 ** platform is deprecated. Please use delDomain instead. If you have any questions please contact your representative. 
 
 ## Video
 
-| Name | Scope | Type | Description | Example
-| ---- | ----- | ---- | ----------- | -------
-| `unit` | required | String | OpenX ad unit ID provided by your OpenX representative. | "1611023122"
-| `delDomain` | required | String |  OpenX delivery domain provided by your OpenX representative.  | "PUBLISHER-d.openx.net"
-| `openrtb` | optional | OpenRTB Impression | An OpenRtb Impression with Video subtype properties | `{ imp: [{ video: {mimes: ['video/x-ms-wmv, video/mp4']} }] }`
-
+| Name        | Scope    | Type               | Description                                                  | Example                                                        |
+|-------------|----------|--------------------|--------------------------------------------------------------|----------------------------------------------------------------|
+| `unit`      | required | String             | OpenX ad unit ID provided by your OpenX representative.      | "1611023122"                                                   |
+| `delDomain` | required | String             | OpenX delivery domain provided by your OpenX representative. | "PUBLISHER-d.openx.net"                                        |
+| `openrtb`   | optional | OpenRTB Impression | An OpenRtb Impression with Video subtype properties          | `{ imp: [{ video: {mimes: ['video/x-ms-wmv, video/mp4']} }] }` |
 
 # Example
 ```javascript

From a0cc68db28632f8bcc5e695105b697dcc6128e99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 07:27:35 -0700
Subject: [PATCH 503/569] Bump tibdex/github-app-token from 1.6.0 to 1.7.0
 (#9316)

Bumps [tibdex/github-app-token](https://github.com/tibdex/github-app-token) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/tibdex/github-app-token/releases)
- [Commits](https://github.com/tibdex/github-app-token/compare/f717b5ecd4534d3c4df4ce9b5c1c2214f0f7cd06...021a2405c7f990db57f5eae5397423dcc554159c)

---
updated-dependencies:
- dependency-name: tibdex/github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/issue_tracker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/issue_tracker.yml b/.github/workflows/issue_tracker.yml
index 05d08b2b0d7..4a9502e38c1 100644
--- a/.github/workflows/issue_tracker.yml
+++ b/.github/workflows/issue_tracker.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@f717b5ecd4534d3c4df4ce9b5c1c2214f0f7cd06
+        uses: tibdex/github-app-token@021a2405c7f990db57f5eae5397423dcc554159c
         with:
           app_id: ${{ secrets.ISSUE_APP_ID }}
           private_key: ${{ secrets.ISSUE_APP_PEM }}

From 1c63ed92a1435244a2fd08fa491ba22c636165ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Udi=20Talias=20=E2=9A=9B=EF=B8=8F?= <udi.talias@gmail.com>
Date: Tue, 6 Dec 2022 18:06:14 +0200
Subject: [PATCH 504/569] Vidazoo Bid Adapter: support for Video MediaTypes
 (#9284)

* feat(module): multi size request

* fix getUserSyncs
added tests

* update(module): package-lock.json from master

* feat(client): added VIDEO media type

* feat(client): send mediaTypes to the server

* feat(client): added vastXml support

* fix(client): vidazoo adapter tests

* fix tests

* remove console.log from test file

* added video tests

Co-authored-by: roman <shmoop207@gmail.com>
---
 modules/vidazooBidAdapter.js                |  27 +++-
 test/spec/modules/vidazooBidAdapter_spec.js | 136 +++++++++++++++++++-
 2 files changed, 153 insertions(+), 10 deletions(-)

diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index e79835b39c0..bb3e4abd838 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -1,6 +1,6 @@
 import { _each, deepAccess, parseSizesInput, parseUrl, uniques, isFn } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { bidderSettings } from '../src/bidderSettings.js';
 
@@ -59,7 +59,7 @@ function isBidRequestValid(bid) {
 }
 
 function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
-  const { params, bidId, userId, adUnitCode, schain } = bid;
+  const { params, bidId, userId, adUnitCode, schain, mediaTypes } = bid;
   const { ext } = params;
   let { bidFloor } = params;
   const hashUrl = hashCode(topWindowUrl);
@@ -105,6 +105,7 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
     prebidVersion: '$prebid.version$',
     res: `${screen.width}x${screen.height}`,
     schain: schain,
+    mediaTypes: mediaTypes,
     ptrace: ptrace,
     isStorageAllowed: isStorageAllowed,
     gpid: gpid,
@@ -188,11 +189,12 @@ function interpretResponse(serverResponse, request) {
 
   try {
     results.forEach(result => {
-      const { creativeId, ad, price, exp, width, height, currency, advertiserDomains } = result;
+      const { creativeId, ad, price, exp, width, height, currency, advertiserDomains, mediaType = BANNER } = result;
       if (!ad || !price) {
         return;
       }
-      output.push({
+
+      const response = {
         requestId: bidId,
         cpm: price,
         width: width,
@@ -201,11 +203,22 @@ function interpretResponse(serverResponse, request) {
         currency: currency || CURRENCY,
         netRevenue: true,
         ttl: exp || TTL_SECONDS,
-        ad: ad,
         meta: {
           advertiserDomains: advertiserDomains || []
         }
-      })
+      };
+
+      if (mediaType === BANNER) {
+        Object.assign(response, {
+          ad: ad,
+        });
+      } else {
+        Object.assign(response, {
+          vastXml: ad,
+          mediaType: VIDEO
+        });
+      }
+      output.push(response);
     });
     return output;
   } catch (e) {
@@ -322,7 +335,7 @@ export const spec = {
   code: BIDDER_CODE,
   version: BIDDER_VERSION,
   gvlid: GVLID,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid,
   buildRequests,
   interpretResponse,
diff --git a/test/spec/modules/vidazooBidAdapter_spec.js b/test/spec/modules/vidazooBidAdapter_spec.js
index 9c22b41968f..40aa7641330 100644
--- a/test/spec/modules/vidazooBidAdapter_spec.js
+++ b/test/spec/modules/vidazooBidAdapter_spec.js
@@ -17,6 +17,7 @@ import {
 import * as utils from 'src/utils.js';
 import { version } from 'package.json';
 import { useFakeTimers } from 'sinon';
+import { BANNER, VIDEO } from '../../../src/mediaTypes';
 
 const SUB_DOMAIN = 'openrtb';
 
@@ -39,6 +40,7 @@ const BID = {
   'bidderRequestId': '1fdb5ff1b6eaa7',
   'requestId': 'b0777d85-d061-450e-9bc7-260dd54bbb7a',
   'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'mediaTypes': [BANNER],
   'ortb2Imp': {
     'ext': {
       'gpid': '1234567890'
@@ -46,6 +48,38 @@ const BID = {
   }
 };
 
+const VIDEO_BID = {
+  'bidId': '2d52001cabd527',
+  'adUnitCode': '63550ad1ff6642d368cba59dh5884270560',
+  'bidderRequestId': '12a8ae9ada9c13',
+  'transactionId': '56e184c6-bde9-497b-b9b9-cf47a61381ee',
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'params': {
+    'subDomain': SUB_DOMAIN,
+    'cId': '635509f7ff6642d368cb9837',
+    'pId': '59ac17c192832d0011283fe3',
+    'bidFloor': 0.1
+  },
+  'sizes': [[545, 307]],
+  'mediaTypes': {
+    'video': {
+      'playerSize': [[545, 307]],
+      'context': 'instream',
+      'mimes': [
+        'video/mp4',
+        'application/javascript'
+      ],
+      'protocols': [2, 3, 5, 6],
+      'maxduration': 60,
+      'minduration': 0,
+      'startdelay': 0,
+      'linearity': 1,
+      'api': [2],
+      'placement': 1
+    }
+  }
+}
+
 const BIDDER_REQUEST = {
   'gdprConsent': {
     'consentString': 'consent_string',
@@ -86,6 +120,23 @@ const SERVER_RESPONSE = {
   }
 };
 
+const VIDEO_SERVER_RESPONSE = {
+  body: {
+    'cid': '635509f7ff6642d368cb9837',
+    'results': [{
+      'ad': '<VAST version=\"3.0\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"></VAST>',
+      'advertiserDomains': ['vidazoo.com'],
+      'exp': 60,
+      'width': 545,
+      'height': 307,
+      'mediaType': 'video',
+      'creativeId': '12610997325162499419',
+      'price': 2,
+      'cookies': []
+    }]
+  }
+}
+
 const REQUEST = {
   data: {
     width: 300,
@@ -124,6 +175,11 @@ describe('VidazooBidAdapter', function () {
     it('exists and is a string', function () {
       expect(adapter.code).to.exist.and.to.be.a('string');
     });
+
+    it('exists and contains media types', function () {
+      expect(adapter.supportedMediaTypes).to.exist.and.to.be.an('array').with.length(2);
+      expect(adapter.supportedMediaTypes).to.contain.members([BANNER, VIDEO]);
+    });
   });
 
   describe('validate bid requests', function () {
@@ -168,7 +224,59 @@ describe('VidazooBidAdapter', function () {
       sandbox.stub(Date, 'now').returns(1000);
     });
 
-    it('should build request for each size', function () {
+    it('should build video request', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
+      const requests = adapter.buildRequests([VIDEO_BID], BIDDER_REQUEST);
+      expect(requests).to.have.length(1);
+      expect(requests[0]).to.deep.equal({
+        method: 'POST',
+        url: `${createDomain(SUB_DOMAIN)}/prebid/multi/635509f7ff6642d368cb9837`,
+        data: {
+          adUnitCode: '63550ad1ff6642d368cba59dh5884270560',
+          bidFloor: 0.1,
+          bidId: '2d52001cabd527',
+          bidderVersion: adapter.version,
+          cat: ['IAB2'],
+          pagecat: ['IAB2-2'],
+          cb: 1000,
+          dealId: 1,
+          gdpr: 1,
+          gdprConsent: 'consent_string',
+          usPrivacy: 'consent_string',
+          gpid: '',
+          prebidVersion: version,
+          ptrace: '1000',
+          publisherId: '59ac17c192832d0011283fe3',
+          url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
+          res: `${window.top.screen.width}x${window.top.screen.height}`,
+          schain: VIDEO_BID.schain,
+          sessionId: '',
+          sizes: ['545x307'],
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
+          uqs: getTopWindowQueryParams(),
+          mediaTypes: {
+            video: {
+              api: [2],
+              context: 'instream',
+              linearity: 1,
+              maxduration: 60,
+              mimes: [
+                'video/mp4',
+                'application/javascript'
+              ],
+              minduration: 0,
+              placement: 1,
+              playerSize: [[545, 307]],
+              protocols: [2, 3, 5, 6],
+              startdelay: 0
+            }
+          }
+        }
+      });
+    });
+
+    it('should build banner request for each size', function () {
       const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
       const requests = adapter.buildRequests([BID], BIDDER_REQUEST);
       expect(requests).to.have.length(1);
@@ -187,7 +295,7 @@ describe('VidazooBidAdapter', function () {
           bidId: '2d52001cabd527',
           adUnitCode: 'div-gpt-ad-12345-0',
           publisherId: '59ac17c192832d0011283fe3',
-          dealId: 1,
+          dealId: 2,
           sessionId: '',
           uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
           bidderVersion: adapter.version,
@@ -195,6 +303,7 @@ describe('VidazooBidAdapter', function () {
           schain: BID.schain,
           ptrace: '1000',
           res: `${window.top.screen.width}x${window.top.screen.height}`,
+          mediaTypes: [BANNER],
           uqs: getTopWindowQueryParams(),
           'ext.param1': 'loremipsum',
           'ext.param2': 'dolorsitamet',
@@ -211,6 +320,7 @@ describe('VidazooBidAdapter', function () {
       sandbox.restore();
     });
   });
+
   describe('getUserSyncs', function () {
     it('should have valid user sync with iframeEnabled', function () {
       const result = adapter.getUserSyncs({ iframeEnabled: true }, [SERVER_RESPONSE]);
@@ -255,7 +365,7 @@ describe('VidazooBidAdapter', function () {
       expect(responses).to.be.empty;
     });
 
-    it('should return an array of interpreted responses', function () {
+    it('should return an array of interpreted banner responses', function () {
       const responses = adapter.interpretResponse(SERVER_RESPONSE, REQUEST);
       expect(responses).to.have.length(1);
       expect(responses[0]).to.deep.equal({
@@ -274,6 +384,26 @@ describe('VidazooBidAdapter', function () {
       });
     });
 
+    it('should return an array of interpreted video responses', function () {
+      const responses = adapter.interpretResponse(VIDEO_SERVER_RESPONSE, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0]).to.deep.equal({
+        requestId: '2d52001cabd527',
+        cpm: 2,
+        width: 545,
+        height: 307,
+        mediaType: 'video',
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 60,
+        vastXml: '<VAST version=\"3.0\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"></VAST>',
+        meta: {
+          advertiserDomains: ['vidazoo.com']
+        }
+      });
+    });
+
     it('should take default TTL', function () {
       const serverResponse = utils.deepClone(SERVER_RESPONSE);
       delete serverResponse.body.results[0].exp;

From a0e6e6bec2e14a1e7c0bae4fb0b13913ef70fed1 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 6 Dec 2022 11:37:47 -0700
Subject: [PATCH 505/569] Vidazoo bid adapter: fix failing test (#9318)

---
 test/spec/modules/vidazooBidAdapter_spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/spec/modules/vidazooBidAdapter_spec.js b/test/spec/modules/vidazooBidAdapter_spec.js
index 40aa7641330..2ddb65469af 100644
--- a/test/spec/modules/vidazooBidAdapter_spec.js
+++ b/test/spec/modules/vidazooBidAdapter_spec.js
@@ -255,6 +255,7 @@ describe('VidazooBidAdapter', function () {
           sizes: ['545x307'],
           uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
           uqs: getTopWindowQueryParams(),
+          isStorageAllowed: true,
           mediaTypes: {
             video: {
               api: [2],

From 4515eb343d2ff348fc3965d064ebdd63f40a2061 Mon Sep 17 00:00:00 2001
From: Wiem Zine El Abidine <welabidine@liveintent.com>
Date: Tue, 6 Dec 2022 22:12:55 +0100
Subject: [PATCH 506/569] Live Intent User ID Submodule: Bump live-connect
 version (#9317)

* update with live-connect last change

* set globalVarName

* not use globalVarName

* use live-connect proper version

* comment

* use yalc version and adjust the initializer

* adjust getInitializer

* use a proper lc version
---
 modules/liveIntentIdSystem.js |  3 +--
 package-lock.json             | 14 +++++++-------
 package.json                  |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/modules/liveIntentIdSystem.js b/modules/liveIntentIdSystem.js
index 724bf5ece6a..de70b0eaccd 100644
--- a/modules/liveIntentIdSystem.js
+++ b/modules/liveIntentIdSystem.js
@@ -10,7 +10,6 @@ import { submodule } from '../src/hook.js';
 import { LiveConnect } from 'live-connect-js/esm/initializer.js';
 import { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js';
 import { getStorageManager } from '../src/storageManager.js';
-import { MinimalLiveConnect } from 'live-connect-js/esm/minimal-live-connect.js';
 
 const MODULE_NAME = 'liveIntentId';
 export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME});
@@ -140,7 +139,7 @@ export const liveIntentIdSubmodule = {
     this.moduleMode = mode
   },
   getInitializer() {
-    return this.moduleMode === 'minimal' ? MinimalLiveConnect : LiveConnect
+    return (liveConnectConfig, storage, calls) => LiveConnect(liveConnectConfig, storage, calls, this.moduleMode)
   },
 
   /**
diff --git a/package-lock.json b/package-lock.json
index f0b0b45a844..f73e700aa42 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
         "express": "^4.15.4",
         "fun-hooks": "^0.9.9",
         "just-clone": "^1.0.2",
-        "live-connect-js": "2.4.0"
+        "live-connect-js": "3.0.1"
       },
       "devDependencies": {
         "@babel/eslint-parser": "^7.16.5",
@@ -16229,9 +16229,9 @@
       "dev": true
     },
     "node_modules/live-connect-js": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-2.4.0.tgz",
-      "integrity": "sha512-MSBLKfnXoxH+pqwji/Mf8yZu3VZMq4tnNfwMw7NTWN5a+TBM6f0RWgwui1YMA3nHmMhX/nzxxsso0SkyKcF0fA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.1.tgz",
+      "integrity": "sha512-rwB0IQfuKPJM+I96nLyq8Utr3LkQ7Z/iuq/xKlWDckQRJLYyWkk7F7yaavf/VsjazzLK2dpJeXGijoDkK4Vz8g==",
       "dependencies": {
         "tiny-hashes": "1.0.1"
       },
@@ -37868,9 +37868,9 @@
       "dev": true
     },
     "live-connect-js": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-2.4.0.tgz",
-      "integrity": "sha512-MSBLKfnXoxH+pqwji/Mf8yZu3VZMq4tnNfwMw7NTWN5a+TBM6f0RWgwui1YMA3nHmMhX/nzxxsso0SkyKcF0fA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-3.0.1.tgz",
+      "integrity": "sha512-rwB0IQfuKPJM+I96nLyq8Utr3LkQ7Z/iuq/xKlWDckQRJLYyWkk7F7yaavf/VsjazzLK2dpJeXGijoDkK4Vz8g==",
       "requires": {
         "tiny-hashes": "1.0.1"
       }
diff --git a/package.json b/package.json
index bf52a74513a..7bbe18037b4 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "express": "^4.15.4",
     "fun-hooks": "^0.9.9",
     "just-clone": "^1.0.2",
-    "live-connect-js": "2.4.0"
+    "live-connect-js": "3.0.1"
   },
   "optionalDependencies": {
     "fsevents": "^2.3.2"

From a247abc624f0acd3a5bc6af9ebb785d8555f0ab2 Mon Sep 17 00:00:00 2001
From: Vic R <103455651+victorlassomarketing@users.noreply.github.com>
Date: Wed, 7 Dec 2022 12:16:37 -0800
Subject: [PATCH 507/569] ox update (#9309)

---
 modules/lassoBidAdapter.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/lassoBidAdapter.js b/modules/lassoBidAdapter.js
index da48bc460c7..fafaa4dd9dc 100644
--- a/modules/lassoBidAdapter.js
+++ b/modules/lassoBidAdapter.js
@@ -54,7 +54,7 @@ export const spec = {
 
       return {
         method: 'GET',
-        url: getBidRequestUrl(aimXR),
+        url: getBidRequestUrl(aimXR, bidRequest.params),
         data: payload,
         options: {
           withCredentials: true
@@ -113,11 +113,15 @@ export const spec = {
   supportedMediaTypes: [BANNER]
 }
 
-function getBidRequestUrl(aimXR) {
+function getBidRequestUrl(aimXR, params) {
+  let path = '/request';
+  if (params && params.dtc) {
+    path = '/dtc-request';
+  }
   if (!aimXR) {
-    return GET_IUD_URL + ENDPOINT_URL + '/request';
+    return GET_IUD_URL + ENDPOINT_URL + path;
   }
-  return ENDPOINT_URL + '/request'
+  return ENDPOINT_URL + path;
 }
 
 function getDeviceData() {

From 2a90f5165b19b6a5e8ab01be76b2e19da69f97cc Mon Sep 17 00:00:00 2001
From: Damyan <damyan.stanchev@gmail.com>
Date: Thu, 8 Dec 2022 10:26:56 +0200
Subject: [PATCH 508/569] AdHash bid adapter: update to support latest version
 (#9286)

* AdHash Bidder Adapter: minor changes

We're operating on a com TLD now.
Added publisher in URL for easier routing.

* Implemented brand safety

Implemented brand safety checks

* Fix for GDPR consent

Removing the extra information as request data becomes too big and is sometimes truncated

* Ad fraud prevention formula changed

Ad fraud prevention formula changed to support negative values as well as linear distribution of article length

* AdHash brand safety additions

Adding starts-with and ends-with rules that will help us with languages such as German where a single word can be written in multiple ways depending on the gender and grammatical case.

* AdHash brand safety updates

Added support for Cyrillic characters.
Added support for bidderURL parameter.
Fixed score multiplier from 500 to 1000.

* AdHash Analytics adapter

* Support for recent ads

Support for recent ads which gives us the option to do frequency and recency capping.

* Fix for timestamp

* PUB-222

Added logic for measuring the fill rate (fallbacks) for Prebid impressions

* Unit tests for the analytics adapter

Added unit tests for the analytics adapter

* Removed export causing errors

Removed an unneeded export of a const that was causing errors with the analytics adapter

* Added globalScript parameter

* PUB-227

Support for non-latin and non-cyrillic symbols

* GEN-964

- Brand safety now checks the page URL for bad words. No ad is shown if there is at least one match.
- Repeating code is optimized and moved to helper function
- Multi-language support for brand safety

* GEN-1025

Sending the needed ad density data to the bidder

* Removing the analytics adaptor

* Fix for regexp match

* Version change

* MINOR

Code review changes

Co-authored-by: NikolayMGeorgiev <nikolay@adhash.org>
Co-authored-by: Ventsislav Saraminev <v.saraminev@abv.bg>
Co-authored-by: Dimitar Kalenderov <mitko.kalenderov@gmail.com>
---
 modules/adhashBidAdapter.js                | 145 ++++++++++++++++-----
 modules/adhashBidAdapter.md                |   4 +-
 test/spec/modules/adhashBidAdapter_spec.js |  76 +++++++++--
 3 files changed, 181 insertions(+), 44 deletions(-)

diff --git a/modules/adhashBidAdapter.js b/modules/adhashBidAdapter.js
index 977d161b214..33a85a81525 100644
--- a/modules/adhashBidAdapter.js
+++ b/modules/adhashBidAdapter.js
@@ -1,10 +1,12 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {includes} from '../src/polyfill.js';
-import {BANNER} from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { includes } from '../src/polyfill.js';
+import { BANNER } from '../src/mediaTypes.js';
 
-const VERSION = '1.0';
+const VERSION = '3.2';
 const BAD_WORD_STEP = 0.1;
 const BAD_WORD_MIN = 0.2;
+const ADHASH_BIDDER_CODE = 'adhash';
 
 /**
  * Function that checks the page where the ads are being served for brand safety.
@@ -54,43 +56,92 @@ function brandSafety(badWords, maxScore) {
     return positive ? result : -result;
   };
 
+  /**
+   * Checks what rule will match in the given array with words
+   * @param {string} rule rule type (full, partial, starts, ends, regexp)
+   * @param {string} decodedWord decoded word
+   * @param {array} wordsToMatch array to find a match
+   * @returns {object|boolean} matched rule and occurances. If nothing is matched returns false
+   */
+  const wordsMatchedWithRule = function (rule, decodedWord, wordsToMatch) {
+    if (rule === 'full' && wordsToMatch && wordsToMatch.includes(decodedWord)) {
+      return { rule, occurances: wordsToMatch.filter(element => element === decodedWord).length };
+    } else if (rule === 'partial' && wordsToMatch && wordsToMatch.some(element => element.indexOf(decodedWord) > -1)) {
+      return { rule, occurances: wordsToMatch.filter(element => element.indexOf(decodedWord) > -1).length };
+    } else if (rule === 'starts' && wordsToMatch && wordsToMatch.some(word => word.startsWith(decodedWord))) {
+      return { rule, occurances: wordsToMatch.filter(element => element.startsWith(decodedWord)).length };
+    } else if (rule === 'ends' && wordsToMatch && wordsToMatch.some(word => word.endsWith(decodedWord))) {
+      return { rule, occurances: wordsToMatch.filter(element => element.endsWith(decodedWord)).length };
+    } else if (rule === 'regexp' && wordsToMatch && wordsToMatch.some(element => element.match(new RegExp(decodedWord, 'i')))) {
+      return { rule, occurances: wordsToMatch.filter(element => element.match(new RegExp(decodedWord, 'i'))).length };
+    }
+    return false;
+  };
+
   // Default parameters if the bidder is unable to send some of them
   badWords = badWords || [];
   maxScore = parseInt(maxScore) || 10;
 
   try {
     let score = 0;
+    const decodedUrl = decodeURI(window.top.location.href.substring(window.top.location.origin.length));
+    const wordsAndNumbersInUrl = decodedUrl
+      .replaceAll(/[-,\._/\?=&#%]/g, ' ')
+      .replaceAll(/\s\s+/g, ' ')
+      .toLowerCase()
+      .trim();
     const content = window.top.document.body.innerText.toLowerCase();
-    const words = content.trim().split(/\s+/).length;
+    const contentWords = content.trim().split(/\s+/).length;
+    // \p{L} matches a single unicode code point in the category 'letter'. Matches any kind of letter from any language.
+    const regexp = new RegExp('[\\p{L}]+', 'gu');
+    const words = content.match(regexp);
+    const wordsInUrl = wordsAndNumbersInUrl.match(regexp);
+
     for (const [word, rule, points] of badWords) {
-      if (rule === 'full' && new RegExp('\\b' + rot13(word) + '\\b', 'i').test(content)) {
-        const occurances = content.match(new RegExp('\\b' + rot13(word) + '\\b', 'g')).length;
-        score += scoreCalculator(points, occurances);
-      } else if (rule === 'partial' && content.indexOf(rot13(word.toLowerCase())) > -1) {
-        const occurances = content.match(new RegExp(rot13(word), 'g')).length;
-        score += scoreCalculator(points, occurances);
+      const decodedWord = rot13(word.toLowerCase());
+
+      // Checks the words in the url of the page only for negative words. Don't serve any ad when at least one match is found
+      if (points > 0) {
+        const matchedRuleInUrl = wordsMatchedWithRule(rule, decodedWord, wordsInUrl);
+        if (matchedRuleInUrl.rule) {
+          return false;
+        }
+      }
+
+      // Check if site content's words match any of our brand safety rules
+      const matchedRule = wordsMatchedWithRule(rule, decodedWord, words);
+      if (matchedRule.rule === 'full') {
+        score += scoreCalculator(points, matchedRule.occurances);
+      } else if (matchedRule.rule === 'partial') {
+        score += scoreCalculator(points, matchedRule.occurances);
+      } else if (matchedRule.rule === 'starts') {
+        score += scoreCalculator(points, matchedRule.occurances);
+      } else if (matchedRule.rule === 'ends') {
+        score += scoreCalculator(points, matchedRule.occurances);
+      } else if (matchedRule.rule === 'regexp') {
+        score += scoreCalculator(points, matchedRule.occurances);
       }
     }
-    return score < maxScore * words / 500;
+    return score < (maxScore * contentWords) / 1000;
   } catch (e) {
     return true;
   }
 }
 
 export const spec = {
-  code: 'adhash',
-  url: 'https://bidder.adhash.com/rtb?version=' + VERSION + '&prebid=true',
+  code: ADHASH_BIDDER_CODE,
   supportedMediaTypes: [ BANNER ],
 
   isBidRequestValid: (bid) => {
     try {
-      const { publisherId, platformURL } = bid.params;
+      const { publisherId, platformURL, bidderURL } = bid.params;
       return (
         includes(Object.keys(bid.mediaTypes), BANNER) &&
         typeof publisherId === 'string' &&
         publisherId.length === 42 &&
         typeof platformURL === 'string' &&
-        platformURL.length >= 13
+        platformURL.length >= 13 &&
+        (!bidderURL || bidderURL.indexOf('https://') === 0)
       );
     } catch (error) {
       return false;
@@ -98,24 +149,51 @@ export const spec = {
   },
 
   buildRequests: (validBidRequests, bidderRequest) => {
+    const storage = getStorageManager({ bidderCode: ADHASH_BIDDER_CODE });
     const { gdprConsent } = bidderRequest;
-    const { url } = spec;
     const bidRequests = [];
-    let referrer = '';
-    if (bidderRequest && bidderRequest.refererInfo) {
-      // TODO: is 'page' the right value here?
-      referrer = bidderRequest.refererInfo.page;
-    }
-    for (var i = 0; i < validBidRequests.length; i++) {
-      var index = Math.floor(Math.random() * validBidRequests[i].sizes.length);
-      var size = validBidRequests[i].sizes[index].join('x');
+    const body = document.body;
+    const html = document.documentElement;
+    const pageHeight = Math.max(
+      body.scrollHeight,
+      body.offsetHeight,
+      html.clientHeight,
+      html.scrollHeight,
+      html.offsetHeight
+    );
+    const pageWidth = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth);
+
+    for (let i = 0; i < validBidRequests.length; i++) {
+      const bidderURL = validBidRequests[i].params.bidderURL || 'https://bidder.adhash.com';
+      const url = `${bidderURL}/rtb?version=${VERSION}&prebid=true`;
+      const index = Math.floor(Math.random() * validBidRequests[i].sizes.length);
+      const size = validBidRequests[i].sizes[index].join('x');
+
+      let recentAds = [];
+      if (storage.localStorageIsEnabled()) {
+        const prefix = validBidRequests[i].params.prefix || 'adHash';
+        recentAds = JSON.parse(storage.getDataFromLocalStorage(prefix + 'recentAds') || '[]');
+      }
+
+      // Needed for the ad density calculation
+      var adHeight = validBidRequests[i].sizes[index][1];
+      var adWidth = validBidRequests[i].sizes[index][0];
+      if (!window.adsCount) {
+        window.adsCount = 0;
+      }
+      if (!window.adsTotalSurface) {
+        window.adsTotalSurface = 0;
+      }
+      window.adsTotalSurface += adHeight * adWidth;
+      window.adsCount++;
+
       bidRequests.push({
         method: 'POST',
         url: url + '&publisher=' + validBidRequests[i].params.publisherId,
         bidRequest: validBidRequests[i],
         data: {
           timezone: new Date().getTimezoneOffset() / 60,
-          location: referrer,
+          location: bidderRequest.refererInfo ? bidderRequest.refererInfo.topmostLocation : '',
           publisherId: validBidRequests[i].params.publisherId,
           size: {
             screenWidth: window.screen.width,
@@ -131,10 +209,14 @@ export const spec = {
             position: validBidRequests[i].adUnitCode
           }],
           blockedCreatives: [],
-          currentTimestamp: new Date().getTime(),
-          recentAds: [],
+          currentTimestamp: (new Date().getTime() / 1000) | 0,
+          recentAds: recentAds,
           GDPRApplies: gdprConsent ? gdprConsent.gdprApplies : null,
-          GDPR: gdprConsent ? gdprConsent.consentString : null
+          GDPR: gdprConsent ? gdprConsent.consentString : null,
+          servedAdsCount: window.adsCount,
+          adsTotalSurface: window.adsTotalSurface,
+          pageHeight: pageHeight,
+          pageWidth: pageWidth
         },
         options: {
           withCredentials: false,
@@ -157,7 +239,11 @@ export const spec = {
     }
 
     const publisherURL = JSON.stringify(request.bidRequest.params.platformURL);
+    const bidderURL = request.bidRequest.params.bidderURL || 'https://bidder.adhash.com';
     const oneTimeId = request.bidRequest.adUnitCode + Math.random().toFixed(16).replace('0.', '.');
+    const globalScript = !request.bidRequest.params.globalScript
+      ? `<script src="${bidderURL}/static/scripts/creative.min.js"></script>`
+      : '';
     const bidderResponse = JSON.stringify({ responseText: JSON.stringify(responseBody) });
     const requestData = JSON.stringify(request.data);
 
@@ -165,8 +251,7 @@ export const spec = {
       requestId: request.bidRequest.bidId,
       cpm: responseBody.creatives[0].costEUR,
       ad:
-        `<div id="${oneTimeId}"></div>
-        <script src="https://bidder.adhash.com/static/scripts/creative.min.js"></script>
+        `<div id="${oneTimeId}"></div>${globalScript}
         <script>callAdvertiser(${bidderResponse},['${oneTimeId}'],${requestData},${publisherURL})</script>`,
       width: request.bidRequest.sizes[0][0],
       height: request.bidRequest.sizes[0][1],
diff --git a/modules/adhashBidAdapter.md b/modules/adhashBidAdapter.md
index 4ee6ed3dc83..acca5a1e651 100644
--- a/modules/adhashBidAdapter.md
+++ b/modules/adhashBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name: AdHash Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: damyan@adhash.org
+Maintainer: damyan@adhash.com
 ```
 
 # Description
@@ -14,8 +14,6 @@ Here is what you need for Prebid integration with AdHash:
 3. Use the Publisher ID and Platform URL as parameters in params.
 
 Please note that a number of AdHash functionalities are not supported in the Prebid.js integration:
-* Cookie-less frequency and recency capping;
-* Audience segments;
 * Price floors and passback tags, as they are not needed in the Prebid.js setup;
 * Reservation for direct deals only, as bids are evaluated based on their price.
 
diff --git a/test/spec/modules/adhashBidAdapter_spec.js b/test/spec/modules/adhashBidAdapter_spec.js
index 40bf354c4d9..4ea525c59d5 100644
--- a/test/spec/modules/adhashBidAdapter_spec.js
+++ b/test/spec/modules/adhashBidAdapter_spec.js
@@ -60,6 +60,12 @@ describe('adhashBidAdapter', function () {
       bid.params.platformURL = 'https://';
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
+
+    it('should return false when bidderURL is present but not https://', function () {
+      const bid = { ...validBid };
+      bid.params.bidderURL = 'http://example.com/';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
   });
 
   describe('buildRequests', function () {
@@ -73,11 +79,11 @@ describe('adhashBidAdapter', function () {
     it('should build the request correctly', function () {
       const result = spec.buildRequests(
         [ bidRequest ],
-        { gdprConsent: { gdprApplies: true, consentString: 'example' }, refererInfo: { referer: 'http://example.com/' } }
+        { gdprConsent: { gdprApplies: true, consentString: 'example' }, refererInfo: { topmostLocation: 'https://example.com/path.html' } }
       );
       expect(result.length).to.equal(1);
       expect(result[0].method).to.equal('POST');
-      expect(result[0].url).to.equal('https://bidder.adhash.com/rtb?version=1.0&prebid=true&publisher=0xc3b09b27e9c6ef73957901aa729b9e69e5bbfbfb');
+      expect(result[0].url).to.equal('https://bidder.adhash.com/rtb?version=3.2&prebid=true&publisher=0xc3b09b27e9c6ef73957901aa729b9e69e5bbfbfb');
       expect(result[0].bidRequest).to.equal(bidRequest);
       expect(result[0].data).to.have.property('timezone');
       expect(result[0].data).to.have.property('location');
@@ -93,7 +99,7 @@ describe('adhashBidAdapter', function () {
       const result = spec.buildRequests([ bidRequest ], { gdprConsent: { gdprApplies: true, consentString: 'example' } });
       expect(result.length).to.equal(1);
       expect(result[0].method).to.equal('POST');
-      expect(result[0].url).to.equal('https://bidder.adhash.com/rtb?version=1.0&prebid=true&publisher=0xc3b09b27e9c6ef73957901aa729b9e69e5bbfbfb');
+      expect(result[0].url).to.equal('https://bidder.adhash.com/rtb?version=3.2&prebid=true&publisher=0xc3b09b27e9c6ef73957901aa729b9e69e5bbfbfb');
       expect(result[0].bidRequest).to.equal(bidRequest);
       expect(result[0].data).to.have.property('timezone');
       expect(result[0].data).to.have.property('location');
@@ -127,9 +133,15 @@ describe('adhashBidAdapter', function () {
         creatives: [{ costEUR: 1.234 }],
         advertiserDomains: 'adhash.com',
         badWords: [
-          ['onqjbeq1', 'full', 1],
-          ['onqjbeq2', 'partial', 1],
+          ['onqjbeq', 'full', 1],
+          ['onqjbeqo', 'partial', 1],
           ['tbbqjbeq', 'full', -1],
+          ['fgnegf', 'starts', 1],
+          ['raqf', 'ends', 1],
+          ['kkk[no]lll', 'regexp', 1],
+          ['дума', 'full', 1],
+          ['старт', 'starts', 1],
+          ['край', 'ends', 1],
         ],
         maxScore: 2
       }
@@ -155,42 +167,84 @@ describe('adhashBidAdapter', function () {
 
     it('should return empty array when there are bad words (full)', function () {
       bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
-        return 'example text badWord1 badWord1 example badWord1 text' + ' word'.repeat(493);
+        return 'example text badword badword example badword text' + ' word'.repeat(993);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there are bad words (full cyrillic)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text дума дума example дума text' + ' текст'.repeat(993);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
     });
 
     it('should return empty array when there are bad words (partial)', function () {
       bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
-        return 'example text partialBadWord2 badword2 example BadWord2text' + ' word'.repeat(494);
+        return 'example text partialbadwordb badwordb example badwordbtext' + ' word'.repeat(994);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there are bad words (starts)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text startsWith starts text startsAgain' + ' word'.repeat(994);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there are bad words (starts cyrillic)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text стартТекст старт text стартТекст' + ' дума'.repeat(994);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there are bad words (ends)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text wordEnds ends text anotherends' + ' word'.repeat(994);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there are bad words (ends cyrillic)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text ДругКрай край text ощеединкрай' + ' дума'.repeat(994);
+      });
+      expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there are bad words (regexp)', function () {
+      bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
+        return 'example text xxxayyy zzxxxAyyyzz text xxxbyyy' + ' word'.repeat(994);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(0);
     });
 
     it('should return non-empty array when there are not enough bad words (full)', function () {
       bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
-        return 'example text badWord1 badWord1 example text' + ' word'.repeat(494);
+        return 'example text badword badword example text' + ' word'.repeat(994);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
     });
 
     it('should return non-empty array when there are not enough bad words (partial)', function () {
       bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
-        return 'example text partialBadWord2 example' + ' word'.repeat(496);
+        return 'example text partialbadwordb example' + ' word'.repeat(996);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
     });
 
     it('should return non-empty array when there are no-bad word matches', function () {
       bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
-        return 'example text partialBadWord1 example text' + ' word'.repeat(495);
+        return 'example text partialbadword example text' + ' word'.repeat(995);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
     });
 
     it('should return non-empty array when there are bad words and good words', function () {
       bodyStub = sinon.stub(window.top.document.body, 'innerText').get(function() {
-        return 'example text badWord1 badWord1 example badWord1 goodWord goodWord ' + ' word'.repeat(492);
+        return 'example text badword badword example badword goodWord goodWord ' + ' word'.repeat(992);
       });
       expect(spec.interpretResponse(serverResponse, request).length).to.equal(1);
     });

From 6236e3f3b068c6ba3920115dd4a20df5e1385ebd Mon Sep 17 00:00:00 2001
From: Carlos Felix <carlos.felix@33across.com>
Date: Thu, 8 Dec 2022 08:09:35 -0600
Subject: [PATCH 509/569] Add source and version parameters to the 33across ID
 request (#9319)

---
 modules/33acrossIdSystem.js                | 3 +++
 test/spec/modules/33acrossIdSystem_spec.js | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/33acrossIdSystem.js b/modules/33acrossIdSystem.js
index 3763fee5124..5e07fe9523d 100644
--- a/modules/33acrossIdSystem.js
+++ b/modules/33acrossIdSystem.js
@@ -13,6 +13,7 @@ import { uspDataHandler } from '../src/adapterManager.js';
 const MODULE_NAME = '33acrossId';
 const API_URL = 'https://lexicon.33across.com/v1/envelope';
 const AJAX_TIMEOUT = 10000;
+const CALLER_NAME = 'pbjs';
 
 function getEnvelope(response) {
   if (!response.succeeded) {
@@ -36,6 +37,8 @@ function calculateQueryStringParams(pid, gdprConsentData) {
   const params = {
     pid,
     gdpr: Number(gdprApplies),
+    src: CALLER_NAME,
+    ver: '$prebid.version$'
   };
 
   if (uspString) {
diff --git a/test/spec/modules/33acrossIdSystem_spec.js b/test/spec/modules/33acrossIdSystem_spec.js
index 8198bd75381..765b320f925 100644
--- a/test/spec/modules/33acrossIdSystem_spec.js
+++ b/test/spec/modules/33acrossIdSystem_spec.js
@@ -43,7 +43,10 @@ describe('33acrossIdSystem', () => {
 
       expect(request.method).to.equal('GET');
       expect(request.withCredentials).to.be.true;
-      expect(request.url).to.contain('https://lexicon.33across.com/v1/envelope?pid=12345');
+
+      const regExp = new RegExp('https://lexicon.33across.com/v1/envelope\\?pid=12345&gdpr=\\d&src=pbjs&ver=$prebid.version$');
+
+      expect(request.url).to.match(regExp);
       expect(completeCallback.calledOnceWithExactly('foo')).to.be.true;
     });
 

From 1b4d83c112e157a3ed1702e5f068b85cf8cce401 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Thu, 8 Dec 2022 07:32:14 -0700
Subject: [PATCH 510/569] Prebid Core: ORTB 2.5 translation utilities (#9263)

* ORTB 2.5 spec definition

* ORTB 2.5 translation

* Only test translation of native reqs if FEATURES.NATIVE is set
---
 libraries/ortb2.5StrictTranslator/dsl.js      |  54 +++
 libraries/ortb2.5StrictTranslator/spec.js     |  81 ++++
 .../ortb2.5StrictTranslator/translator.js     |  37 ++
 libraries/ortb2.5Translator/translator.js     |  82 ++++
 test/spec/ortb2.5StrictTranslator/dsl_spec.js | 137 +++++++
 .../spec/ortb2.5StrictTranslator/spec_spec.js | 358 ++++++++++++++++++
 .../translator_spec.js                        |  16 +
 .../spec/ortb2.5Translator/translator_spec.js |  64 ++++
 8 files changed, 829 insertions(+)
 create mode 100644 libraries/ortb2.5StrictTranslator/dsl.js
 create mode 100644 libraries/ortb2.5StrictTranslator/spec.js
 create mode 100644 libraries/ortb2.5StrictTranslator/translator.js
 create mode 100644 libraries/ortb2.5Translator/translator.js
 create mode 100644 test/spec/ortb2.5StrictTranslator/dsl_spec.js
 create mode 100644 test/spec/ortb2.5StrictTranslator/spec_spec.js
 create mode 100644 test/spec/ortb2.5StrictTranslator/translator_spec.js
 create mode 100644 test/spec/ortb2.5Translator/translator_spec.js

diff --git a/libraries/ortb2.5StrictTranslator/dsl.js b/libraries/ortb2.5StrictTranslator/dsl.js
new file mode 100644
index 00000000000..8f9fc79feeb
--- /dev/null
+++ b/libraries/ortb2.5StrictTranslator/dsl.js
@@ -0,0 +1,54 @@
+export const ERR_TYPE = 0; // field has wrong type (only objects, enums, and arrays of objects or enums are checked)
+export const ERR_UNKNOWN_FIELD = 1; // field is not defined in ORTB 2.5 spec
+export const ERR_ENUM = 2; // field is an enum and its value is not one of those listed in the ORTB 2.5 spec
+
+// eslint-disable-next-line symbol-description
+export const extend = Symbol();
+
+export function Obj(primitiveFields, spec = {}) {
+  const scan = (path, parent, field, value, onError) => {
+    if (value == null || typeof value !== 'object') {
+      onError(ERR_TYPE, path, parent, field, value);
+      return;
+    }
+    Object.entries(value).forEach(([k, v]) => {
+      if (v == null) return;
+      const kpath = path == null ? k : `${path}.${k}`;
+      if (spec.hasOwnProperty(k)) {
+        spec[k](kpath, value, k, v, onError);
+        return;
+      }
+      if (k !== 'ext' && !primitiveFields.includes(k)) {
+        onError(ERR_UNKNOWN_FIELD, kpath, value, k, v);
+      }
+    });
+  };
+  scan[extend] = (extraPrimitives, specOverride = {}) =>
+    Obj(primitiveFields.concat(extraPrimitives), Object.assign({}, spec, specOverride));
+  return scan;
+}
+
+export const ID = Obj(['id']);
+export const Named = ID[extend](['name']);
+
+export function Arr(def) {
+  return (path, parent, field, value, onError) => {
+    if (!Array.isArray(value)) {
+      onError(ERR_TYPE, path, parent, field, value);
+    } else {
+      value.forEach((item, i) => def(`${path}.${i}`, value, i, item, onError));
+    }
+  };
+}
+
+export function IntEnum(min, max) {
+  return (path, parent, field, value, onError) => {
+    const errno = (() => {
+      if (typeof value !== 'number') return ERR_TYPE;
+      if (isNaN(value) || value > max || value < min) return ERR_ENUM;
+    })();
+    if (errno != null) {
+      onError(errno, path, parent, field, value);
+    }
+  };
+}
diff --git a/libraries/ortb2.5StrictTranslator/spec.js b/libraries/ortb2.5StrictTranslator/spec.js
new file mode 100644
index 00000000000..0ffb17a2e72
--- /dev/null
+++ b/libraries/ortb2.5StrictTranslator/spec.js
@@ -0,0 +1,81 @@
+import {Arr, extend, ID, IntEnum, Named, Obj} from './dsl.js';
+
+const CatDomain = Named[extend](['cat', 'domain']);
+const Segment = Named[extend](['value']);
+const Data = Named[extend]([], {
+  segment: Arr(Segment)
+});
+const Content = ID[extend](['episode', 'title', 'series', 'season', 'artist', 'genre', 'album', 'isrc', 'url', 'cat', 'contentrating', 'userrating', 'keywords', 'livestream', 'sourcerelationship', 'len', 'language', 'embeddable'], {
+  producer: CatDomain,
+  data: Arr(Data),
+  prodq: IntEnum(0, 3),
+  videoquality: IntEnum(0, 3),
+  context: IntEnum(1, 7),
+  qagmediarating: IntEnum(1, 3),
+});
+
+const Client = CatDomain[extend](['sectioncat', 'pagecat', 'privacypolicy', 'keywords'], {
+  publisher: CatDomain, content: Content,
+});
+const Site = Client[extend](['page', 'ref', 'search', 'mobile']);
+const App = Client[extend](['bundle', 'storeurl', 'ver', 'paid']);
+
+const Geo = Obj(['lat', 'lon', 'accuracy', 'lastfix', 'country', 'region', 'regionfips104', 'metro', 'city', 'zip', 'utcoffset'], {
+  type: IntEnum(1, 3),
+  ipservice: IntEnum(1, 4)
+});
+const Device = Obj(['ua', 'dnt', 'lmt', 'ip', 'ipv6', 'make', 'model', 'os', 'osv', 'hwv', 'h', 'w', 'ppi', 'pxratio', 'js', 'geofetch', 'flashver', 'language', 'carrier', 'mccmnc', 'ifa', 'didsha1', 'didmd5', 'dpidsha1', 'dpidmd5', 'macsha1', 'macmd5'], {
+  geo: Geo, devicetype: IntEnum(1, 7), connectiontype: IntEnum(0, 6)
+});
+const User = ID[extend](['buyeruid', 'yob', 'gender', 'keywords', 'customdata'], {
+  geo: Geo, data: Arr(Data),
+});
+
+const Floorable = ID[extend](['bidfloor', 'bidfloorcur']);
+const Deal = Floorable[extend](['at', 'wseat', 'wadomain']);
+const Pmp = Obj(['private_auction'], {
+  deals: Arr(Deal),
+});
+const Format = Obj(['w', 'h', 'wratio', 'hratio', 'wmin']);
+const MediaType = Obj(['mimes'], {
+  api: Arr(IntEnum(1, 6)), battr: Arr(IntEnum(1, 17))
+});
+const Banner = MediaType[extend](['id', 'w', 'h', 'wmax', 'hmax', 'hmin', 'wmin', 'topframe', 'vcm'], {
+  format: Arr(Format), btype: Arr(IntEnum(1, 4)), pos: IntEnum(0, 7), expdir: Arr(IntEnum(1, 5))
+});
+const Native = MediaType[extend](['request', 'ver']);
+const RichMediaType = MediaType[extend](['minduration', 'maxduration', 'startdelay', 'sequence', 'maxextended', 'minbitrate', 'maxbitrate'], {
+  protocols: Arr(IntEnum(1, 10)),
+  delivery: Arr(IntEnum(1, 3)),
+  companionad: Arr(Banner),
+  companiontype: Arr(IntEnum(1, 3)),
+});
+/*
+const Audio = RichMediaType[extend](['maxseq', 'stitched'], {
+  feed: IntEnum(1, 3), nvol: IntEnum(0, 4),
+});
+ */
+const Video = RichMediaType[extend](['w', 'h', 'skip', 'skipmin', 'skipafter', 'boxingallowed'], {
+  pos: IntEnum(0, 7),
+  protocol: IntEnum(1, 10),
+  placement: IntEnum(1, 5),
+  linearity: IntEnum(1, 2),
+  playbackmethod: Arr(IntEnum(1, 6)),
+  playbackend: IntEnum(1, 3),
+});
+const Metric = Obj(['type', 'value', 'vendor']);
+const Imp = (() => {
+  const spec = {
+    metric: Arr(Metric), banner: Banner, video: Video, pmp: Pmp,
+  };
+  if (FEATURES.NATIVE) {
+    spec.native = Native;
+  }
+  return Floorable[extend](['displaymanager', 'displaymanagerver', 'instl', 'tagid', 'clickbrowser', 'secure', 'iframebuster', 'exp'], spec);
+})();
+
+const Regs = Obj(['coppa']);
+const Source = Obj(['fd', 'tid', 'pchain']);
+export const BidRequest = ID[extend](['test', 'at', 'tmax', 'wseat', 'bseat', 'allimps', 'cur', 'wlang', 'bcat', 'badv', 'bapp'], {
+  imp: Arr(Imp), site: Site, app: App, device: Device, user: User, source: Source, regs: Regs
+});
diff --git a/libraries/ortb2.5StrictTranslator/translator.js b/libraries/ortb2.5StrictTranslator/translator.js
new file mode 100644
index 00000000000..c6f651e2476
--- /dev/null
+++ b/libraries/ortb2.5StrictTranslator/translator.js
@@ -0,0 +1,37 @@
+import {BidRequest} from './spec.js';
+import {logWarn} from '../../src/utils.js';
+import {toOrtb25} from '../ortb2.5Translator/translator.js';
+
+function deleteField(errno, path, obj, field, value) {
+  logWarn(`${path} is not valid ORTB 2.5, field will be removed from request:`, value);
+  Array.isArray(obj) ? obj.splice(field, 1) : delete obj[field];
+}
+
+/**
+ * Translates an ortb request to 2.5, and removes from the result any field that is:
+ *  - not defined in the 2.5 spec, or
+ *  - defined as an enum, but has a value that is not listed in the 2.5 spec.
+ *
+ * `ortb2` is modified in place and returned.
+ *
+ * Note that using this utility will cause your adapter to pull in an additional ~3KB after minification.
+ * If possible, consider making your endpoint tolerant to unrecognized or invalid fields instead.
+ *
+ *
+ * @param ortb2 ORTB request
+ * @param translator translation function. The default moves 2.x fields that have a known standard location in 2.5.
+ *                   See the `ortb2.5Translator` library.
+ * @param onError a function invoked once for each field that is not valid according to the 2.5 spec; it takes
+ *        (errno, path, obj, field, value), where:
+ *         - errno is an error code (defined in dsl.js)
+ *         - path is the JSON path of the offending field, for example `regs.gdpr`
+ *         - obj is the object containing the offending field, for example `ortb2.regs`
+ *         - field is the field name, for example `'gdpr'`
+ *         - value is `obj[field]`.
+ *        The default logs a warning and deletes the offending field.
+ */
+export function toOrtb25Strict(ortb2, translator = toOrtb25, onError = deleteField) {
+  ortb2 = translator(ortb2);
+  BidRequest(null, null, null, ortb2, onError);
+  return ortb2;
+}
diff --git a/libraries/ortb2.5Translator/translator.js b/libraries/ortb2.5Translator/translator.js
new file mode 100644
index 00000000000..1afad516ef0
--- /dev/null
+++ b/libraries/ortb2.5Translator/translator.js
@@ -0,0 +1,82 @@
+import {deepAccess, deepSetValue, logError} from '../../src/utils.js';
+
+export const EXT_PROMOTIONS = [
+  'source.schain',
+  'regs.gdpr',
+  'regs.us_privacy',
+  'regs.gpp',
+  'user.consent',
+  'user.eids'
+];
+
+export function splitPath(path) {
+  const parts = path.split('.');
+  const prefix = parts.slice(0, parts.length - 1).join('.');
+  const field = parts[parts.length - 1];
+  return [prefix, field];
+}
+
+/**
+ * @param sourcePath a JSON path such as `regs.us_privacy`
+ * @param dest {function(String, String): String} a function taking (prefix, field) and returning a destination path;
+ *             for example, ('regs', 'us_privacy') => 'regs.ext.us_privacy'
+ * @return {(function({}): (function(): void|undefined))|*} a function that takes an object and, if it contains
+ *        sourcePath, copies its contents to destinationPath, returning a function that deletes the original sourcePath.
+ */
+export function moveRule(sourcePath, dest = (prefix, field) => `${prefix}.ext.${field}`) {
+  const [prefix, field] = splitPath(sourcePath);
+  dest = dest(prefix, field);
+  return (ortb2) => {
+    const obj = deepAccess(ortb2, prefix);
+    if (obj?.[field] != null) {
+      deepSetValue(ortb2, dest, obj[field]);
+      return () => delete obj[field];
+    }
+  };
+}
+
+function kwarrayRule(section) {
+  // move 2.6 `kwarray` into 2.5 comma-separated `keywords`.
+  return (ortb2) => {
+    const kwarray = ortb2[section]?.kwarray;
+    if (kwarray != null) {
+      let kw = (ortb2[section].keywords || '').split(',');
+      if (Array.isArray(kwarray)) kw.push(...kwarray);
+      ortb2[section].keywords = kw.join(',');
+      return () => delete ortb2[section].kwarray;
+    }
+  };
+}
+
+export const DEFAULT_RULES = Object.freeze([
+  ...EXT_PROMOTIONS.map((f) => moveRule(f)),
+  ...['app', 'content', 'site', 'user'].map(kwarrayRule)
+]);
+
+/**
+ * Factory for ORTB 2.5 translation functions.
+ *
+ * @param deleteFields if true, the translation function will remove fields that have been translated (transferred somewhere else within the request)
+ * @param rules translation rules; an array of functions of the type returned by `moveRule`
+ * @return {function({}): {}} a translation function that takes an ORTB object, modifies it in place, and returns it.
+ */
+export function ortb25Translator(deleteFields = true, rules = DEFAULT_RULES) {
+  return function (ortb2) {
+    rules.forEach(f => {
+      try {
+        const deleter = f(ortb2);
+        if (typeof deleter === 'function' && deleteFields) deleter();
+      } catch (e) {
+        logError('Error translating request to ORTB 2.5', e);
+      }
+    })
+    return ortb2;
+  }
+}
+
+/**
+ * Translate an ortb request to version 2.5 by moving 2.6 (and later) fields that have a standardized 2.5 extension.
+ *
+ * The request is modified in place and returned.
+ */
+export const toOrtb25 = ortb25Translator();
diff --git a/test/spec/ortb2.5StrictTranslator/dsl_spec.js b/test/spec/ortb2.5StrictTranslator/dsl_spec.js
new file mode 100644
index 00000000000..c9b4575bcd2
--- /dev/null
+++ b/test/spec/ortb2.5StrictTranslator/dsl_spec.js
@@ -0,0 +1,137 @@
+import {Arr, ERR_ENUM, ERR_TYPE, ERR_UNKNOWN_FIELD, IntEnum, Obj} from '../../../libraries/ortb2.5StrictTranslator/dsl.js';
+import {deepClone} from '../../../src/utils.js';
+
+describe('DSL', () => {
+  const spec = (() => {
+    const inner = Obj(['p21', 'p22'], {
+      enum: IntEnum(10, 20),
+      enumArray: Arr(IntEnum(10, 20))
+    });
+    return Obj(['p11', 'p12'], {
+      inner,
+      innerArray: Arr(inner)
+    });
+  })();
+
+  let onError;
+
+  function scan(obj) {
+    spec(null, null, null, obj, onError);
+  }
+
+  beforeEach(() => {
+    onError = sinon.stub();
+  });
+
+  it('checks object type', () => {
+    scan(null);
+    sinon.assert.calledWith(onError, ERR_TYPE, null, null, null, null);
+  });
+  it('ignores known fields and ext', () => {
+    scan({p11: 1, p12: 2, ext: {e1: 1, e2: 2}});
+    sinon.assert.notCalled(onError);
+  });
+  it('detects unknown fields', () => {
+    const obj = {p11: 1, unk: 2};
+    scan(obj);
+    sinon.assert.calledOnce(onError);
+    sinon.assert.calledWith(onError, ERR_UNKNOWN_FIELD, 'unk', obj, 'unk', 2);
+  });
+  describe('when nested', () => {
+    describe('directly', () => {
+      it('detects unknown fields', () => {
+        const obj = {inner: {p21: 1, unk: 2}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_UNKNOWN_FIELD, 'inner.unk', obj.inner, 'unk', 2);
+      });
+      it('accepts enum values in range', () => {
+        scan({inner: {enum: 12}});
+        sinon.assert.notCalled(onError);
+      });
+      [Infinity, NaN, -Infinity].forEach(val => {
+        it(`does not accept ${val} in enum`, () => {
+          const obj = {inner: {enum: val}};
+          scan(obj);
+          sinon.assert.calledOnce(onError);
+          sinon.assert.calledWith(onError, ERR_ENUM, 'inner.enum', obj.inner, 'enum', val);
+        });
+      });
+      it('accepts arrays of enums that are in range', () => {
+        scan({inner: {enumArray: [12, 13]}});
+        sinon.assert.notCalled(onError);
+      })
+      it('detects enum values out of range', () => {
+        const obj = {inner: {enum: -1}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_ENUM, 'inner.enum', obj.inner, 'enum', -1);
+      });
+      it('detects enum values that are not numbers', () => {
+        const obj = {inner: {enum: 'err'}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_TYPE, 'inner.enum', obj.inner, 'enum', 'err');
+      })
+      it('detects arrays of enums that are out of range', () => {
+        const obj = {inner: {enumArray: [12, 13, -1, 14]}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_ENUM, 'inner.enumArray.2', obj.inner.enumArray, 2, -1);
+      });
+      it('detects when enum arrays are not arrays', () => {
+        const obj = {inner: {enumArray: 'err'}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_TYPE, 'inner.enumArray', obj.inner, 'enumArray', 'err');
+      });
+      it('detects items within enum arrays that are not numbers', () => {
+        const obj = {inner: {enumArray: [12, 'err', 13]}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_TYPE, 'inner.enumArray.1', obj.inner.enumArray, 1, 'err');
+      })
+    });
+    describe('into arrays', () => {
+      it('detects if inner array is not an array', () => {
+        const obj = {innerArray: 'err', inner: {p21: 1}};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_TYPE, 'innerArray', obj, 'innerArray', 'err');
+      });
+      it('detects when elements of inner array are not objects', () => {
+        const obj = {innerArray: [{p21: 1}, 'err', {ext: {r: 1}}]};
+        scan(obj);
+        sinon.assert.calledOnce(onError);
+        sinon.assert.calledWith(onError, ERR_TYPE, 'innerArray.1', obj.innerArray, 1, 'err');
+      });
+      const oos = {
+        innerArray: [
+          {p22: 2, unk: 3, enumArray: [-1, 12, 'err']},
+          {p21: 1, enum: -1, ext: {e: 1}},
+        ]
+      };
+      it('detects invalid properties within inner array', () => {
+        const obj = deepClone(oos);
+        scan(obj);
+        sinon.assert.calledWith(onError, ERR_UNKNOWN_FIELD, 'innerArray.0.unk', obj.innerArray[0], 'unk', 3);
+        sinon.assert.calledWith(onError, ERR_ENUM, 'innerArray.0.enumArray.0', obj.innerArray[0].enumArray, 0, -1);
+        sinon.assert.calledWith(onError, ERR_TYPE, 'innerArray.0.enumArray.2', obj.innerArray[0].enumArray, 2, 'err');
+        sinon.assert.calledWith(onError, ERR_ENUM, 'innerArray.1.enum', obj.innerArray[1], 'enum', -1);
+      });
+      it('can remove all invalid properties during scan', () => {
+        onError.callsFake((errno, path, obj, field) => {
+          Array.isArray(obj) ? obj.splice(field, 1) : delete obj[field];
+        });
+        const obj = deepClone(oos);
+        scan(obj);
+        expect(obj).to.eql({
+          innerArray: [
+            {p22: 2, enumArray: [12]},
+            {p21: 1, ext: {e: 1}}
+          ]
+        });
+      })
+    })
+  })
+});
diff --git a/test/spec/ortb2.5StrictTranslator/spec_spec.js b/test/spec/ortb2.5StrictTranslator/spec_spec.js
new file mode 100644
index 00000000000..a54b551bf61
--- /dev/null
+++ b/test/spec/ortb2.5StrictTranslator/spec_spec.js
@@ -0,0 +1,358 @@
+import {BidRequest} from '../../../libraries/ortb2.5StrictTranslator/spec.js';
+
+// sample requests taken from ORTB 2.5 spec: https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf
+const SAMPLE_REQUESTS = [
+  {
+    'id': '80ce30c53c16e6ede735f123ef6e32361bfc7b22',
+    'at': 1,
+    'cur': ['USD'],
+    'imp': [
+      {
+        'id': '1',
+        'bidfloor': 0.03,
+        'banner': {
+          'h': 250, 'w': 300, 'pos': 0
+        }
+      }
+    ],
+    'site': {
+      'id': '102855',
+      'cat': ['IAB3-1'],
+      'domain': 'www.foobar.com',
+      'page': 'http://www.foobar.com/1234.html ',
+      'publisher': {
+        'id': '8953',
+        'name': 'foobar.com',
+        'cat': ['IAB3-1'],
+        'domain': 'foobar.com'
+      }
+    },
+    'device': {
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.13 (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2',
+      'ip': '123.145.167.10'
+    },
+    'user': {
+      'id': '55816b39711f9b5acf3b90e313ed29e51665623f'
+    }
+  },
+  {
+    'id': '123456789316e6ede735f123ef6e32361bfc7b22',
+    'at': 2,
+    'cur': ['USD'],
+    'imp': [
+      {
+        'id': '1',
+        'bidfloor': 0.03,
+        'iframebuster': ['vendor1.com', 'vendor2.com'],
+        'banner': {
+          'h': 250,
+          'w': 300,
+          'pos': 0,
+          'battr': [13],
+          'expdir': [2, 4]
+        }
+      }
+    ],
+    'site': {
+      'id': '102855',
+      'cat': ['IAB3-1'],
+      'domain': 'www.foobar.com',
+      'page': 'http://www.foobar.com/1234.html',
+      'publisher': {
+        'id': '8953',
+        'name': 'foobar.com',
+        'cat': ['IAB3-1'],
+        'domain': 'foobar.com'
+      }
+    },
+    'device': {
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.13 (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2',
+      'ip': '123.145.167.10'
+    },
+    'user': {
+      'id': '55816b39711f9b5acf3b90e313ed29e51665623f',
+      'buyeruid': '545678765467876567898765678987654',
+      'data': [
+        {
+          'id': '6',
+          'name': 'Data Provider 1',
+          'segment': [
+            {
+              'id': '12341318394918', 'name': 'auto intenders'
+            },
+            {
+              'id': '1234131839491234', 'name': 'auto enthusiasts'
+            },
+            {
+              'id': '23423424',
+              'name': 'data-provider1-age',
+              'value': '30-40'
+            }
+          ]
+        }
+      ]
+    }
+  },
+  {
+    'id': 'IxexyLDIIk',
+    'at': 2,
+    'bcat': ['IAB25', 'IAB7-39', 'IAB8-18', 'IAB8-5', 'IAB9-9'],
+    'badv': ['apple.com', 'go-text.me', 'heywire.com'],
+    'imp': [
+      {
+        'id': '1',
+        'bidfloor': 0.5,
+        'instl': 0,
+        'tagid': 'agltb3B1Yi1pbmNyDQsSBFNpdGUY7fD0FAw',
+        'banner': {
+          'w': 728,
+          'h': 90,
+          'pos': 1,
+          'btype': [4],
+          'battr': [14],
+          'api': [3]
+        }
+      }
+    ],
+    'app': {
+      'id': 'agltb3B1Yi1pbmNyDAsSA0FwcBiJkfIUDA',
+      'name': 'Yahoo Weather',
+      'cat': ['IAB15', 'IAB15-10'],
+      'ver': '1.0.2',
+      'bundle': '12345',
+      'storeurl': 'https://itunes.apple.com/id628677149',
+      'publisher': {
+        'id': 'agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV',
+        'name': 'yahoo',
+        'domain': 'www.yahoo.com'
+      }
+    },
+    'device': {
+      'dnt': 0,
+      'ua': 'Mozilla/5.0 (iPhone; CPU iPhone OS 6_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3',
+      'ip': '123.145.167.189',
+      'ifa': 'AA000DFE74168477C70D291f574D344790E0BB11',
+      'carrier': 'VERIZON',
+      'language': 'en',
+      'make': 'Apple',
+      'model': 'iPhone',
+      'os': 'iOS',
+      'osv': '6.1',
+      'js': 1,
+      'connectiontype': 3,
+      'devicetype': 1,
+      'geo': {
+        'lat': 35.012345,
+        'lon': -115.12345,
+        'country': 'USA',
+        'metro': '803',
+        'region': 'CA',
+        'city': 'Los Angeles',
+        'zip': '90049'
+      }
+    },
+    'user': {
+      'id': 'ffffffd5135596709273b3a1a07e466ea2bf4fff',
+      'yob': 1984,
+      'gender': 'M'
+    }
+  },
+  {
+    'id': '1234567893',
+    'at': 2,
+    'tmax': 120,
+    'imp': [
+      {
+        'id': '1',
+        'bidfloor': 0.03,
+        'video': {
+          'w': 640,
+          'h': 480,
+          'pos': 1,
+          'startdelay': 0,
+          'minduration': 5,
+          'maxduration': 30,
+          'maxextended': 30,
+          'minbitrate': 300,
+          'maxbitrate': 1500,
+          'api': [1, 2],
+          'protocols': [2, 3],
+          'mimes': [
+            'video/x-flv',
+            'video/mp4',
+            'application/x-shockwave-flash',
+            'application/javascript'
+          ],
+          'linearity': 1,
+          'boxingallowed': 1,
+          'playbackmethod': [1, 3],
+          'delivery': [2],
+          'battr': [13, 14],
+          'companionad': [
+            {
+              'id': '1234567893-1',
+              'w': 300,
+              'h': 250,
+              'pos': 1,
+              'battr': [13, 14],
+              'expdir': [2, 4]
+            },
+            {
+              'id': '1234567893-2',
+              'w': 728,
+              'h': 90,
+              'pos': 1,
+              'battr': [13, 14]
+            }
+          ],
+          'companiontype': [1, 2]
+        }
+      }
+    ],
+    'site': {
+      'id': '1345135123',
+      'name': 'Site ABCD',
+      'domain': 'siteabcd.com',
+      'cat': ['IAB2-1', 'IAB2-2'],
+      'page': 'http://siteabcd.com/page.htm',
+      'ref': 'http://referringsite.com/referringpage.htm',
+      'privacypolicy': 1,
+      'publisher': {
+        'id': 'pub12345', 'name': 'Publisher A'
+      },
+      'content': {
+        'id': '1234567',
+        'series': 'All About Cars',
+        'season': '2',
+        'episode': 23,
+        'title': 'Car Show',
+        'cat': ['IAB2-2'],
+        'keywords': 'keyword-a,keyword-b,keyword-c'
+      }
+    },
+    'device': {
+      'ip': '64.124.253.1',
+      'ua': 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.16) Gecko/20110319 Firefox/3.6.16',
+      'os': 'OS X',
+      'flashver': '10.1',
+      'js': 1
+    },
+    'user': {
+      'id': '456789876567897654678987656789',
+      'buyeruid': '545678765467876567898765678987654',
+      'data': [
+        {
+          'id': '6',
+          'name': 'Data Provider 1',
+          'segment': [
+            {
+              'id': '12341318394918', 'name': 'auto intenders'
+            },
+            {
+              'id': '1234131839491234', 'name': 'auto enthusiasts'
+            }
+          ]
+        }
+      ]
+    }
+  },
+  {
+    'id': '80ce30c53c16e6ede735f123ef6e32361bfc7b22',
+    'at': 1,
+    'cur': ['USD'],
+    'imp': [
+      {
+        'id': '1',
+        'bidfloor': 0.03,
+        'banner': {
+          'h': 250, 'w': 300, 'pos': 0
+        },
+        'pmp': {
+          'private_auction': 1,
+          'deals': [
+            {
+              'id': 'AB-Agency1-0001',
+              'at': 1,
+              'bidfloor': 2.5,
+              'wseat': ['Agency1']
+            },
+            {
+              'id': 'XY-Agency2-0001',
+              'at': 2,
+              'bidfloor': 2,
+              'wseat': ['Agency2']
+            }
+          ]
+        }
+      }
+    ],
+    'site': {
+      'id': '102855',
+      'domain': 'www.foobar.com',
+      'cat': ['IAB3-1'],
+      'page': 'http://www.foobar.com/1234.html',
+      'publisher': {
+        'id': '8953',
+        'name': 'foobar.com',
+        'cat': ['IAB3-1'],
+        'domain': 'foobar.com'
+      }
+    },
+    'device': {
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.13 (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2',
+      'ip': '123.145.167.10'
+    },
+    'user': {
+      'id': '55816b39711f9b5acf3b90e313ed29e51665623f'
+    }
+  },
+];
+
+if (FEATURES.NATIVE) {
+  SAMPLE_REQUESTS.push({
+    'id': '80ce30c53c16e6ede735f123ef6e32361bfc7b22',
+    'at': 1,
+    'cur': ['USD'],
+    'imp': [
+      {
+        'id': '1',
+        'bidfloor': 0.03,
+        'native': {
+          'request': '{"native":{"ver":"1.0","assets":[ ... ]}}',
+          'ver': '1.0',
+          'api': [3],
+          'battr': [13, 14]
+        }
+      }
+    ],
+    'site': {
+      'id': '102855',
+      'cat': ['IAB3-1'],
+      'domain': 'www.foobar.com',
+      'page': 'http://www.foobar.com/1234.html ',
+      'publisher': {
+        'id': '8953',
+        'name': 'foobar.com',
+        'cat': ['IAB3-1'],
+        'domain': 'foobar.com'
+      }
+    },
+    'device': {
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.13 (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2',
+      'ip': '123.145.167.10'
+    },
+    'user': {
+      'id': '55816b39711f9b5acf3b90e313ed29e51665623f'
+    }
+  });
+}
+
+describe('BidRequest spec', () => {
+  SAMPLE_REQUESTS.forEach((req, i) => {
+    it(`accepts sample #${i}`, () => {
+      const onError = sinon.stub();
+      BidRequest(null, null, null, req, onError);
+      sinon.assert.notCalled(onError);
+    });
+  });
+});
diff --git a/test/spec/ortb2.5StrictTranslator/translator_spec.js b/test/spec/ortb2.5StrictTranslator/translator_spec.js
new file mode 100644
index 00000000000..4bda3d96235
--- /dev/null
+++ b/test/spec/ortb2.5StrictTranslator/translator_spec.js
@@ -0,0 +1,16 @@
+import {toOrtb25Strict} from '../../../libraries/ortb2.5StrictTranslator/translator.js';
+
+describe('toOrtb25Strict', () => {
+  let translator;
+  beforeEach(() => {
+    translator = sinon.stub().callsFake((o) => o);
+  })
+  it('uses provided translator', () => {
+    translator.reset();
+    translator.callsFake(() => ({id: 'test'}));
+    expect(toOrtb25Strict(null, translator)).to.eql({id: 'test'});
+  });
+  it('removes fields out of spec', () => {
+    expect(toOrtb25Strict({unk: 'field', imp: ['err', {}]}, translator)).to.eql({imp: [{}]});
+  });
+});
diff --git a/test/spec/ortb2.5Translator/translator_spec.js b/test/spec/ortb2.5Translator/translator_spec.js
new file mode 100644
index 00000000000..db20a8f59be
--- /dev/null
+++ b/test/spec/ortb2.5Translator/translator_spec.js
@@ -0,0 +1,64 @@
+import {EXT_PROMOTIONS, moveRule, splitPath, toOrtb25} from '../../../libraries/ortb2.5Translator/translator.js';
+import {deepAccess, deepClone, deepSetValue} from '../../../src/utils.js';
+
+describe('ORTB 2.5 translation', () => {
+  describe('moveRule', () => {
+    const rule = moveRule('f1.f2.f3', (prefix, field) => `${prefix}.m1.m2.${field}`);
+
+    function applyRule(rule, obj, del = true) {
+      obj = deepClone(obj);
+      const deleter = rule(obj);
+      if (typeof deleter === 'function' && del) {
+        deleter();
+      }
+      return obj;
+    }
+
+    it('returns undef when field is not present', () => {
+      expect(rule({})).to.eql(undefined);
+    });
+    it('can copy field', () => {
+      expect(applyRule(rule, {f1: {f2: {f3: 'value'}}}, false)).to.eql({
+        f1: {
+          f2: {
+            f3: 'value',
+            m1: {m2: {f3: 'value'}}
+          }
+        }
+      });
+    });
+    it('can move field', () => {
+      expect(applyRule(rule, {f1: {f2: {f3: 'value'}}}, true)).to.eql({f1: {f2: {m1: {m2: {f3: 'value'}}}}});
+    });
+  });
+  describe('toOrtb25', () => {
+    EXT_PROMOTIONS.forEach(path => {
+      const newPath = (() => {
+        const [prefix, field] = splitPath(path);
+        return `${prefix}.ext.${field}`;
+      })();
+
+      it(`moves ${path} to ${newPath}`, () => {
+        const obj = {};
+        deepSetValue(obj, path, 'val');
+        toOrtb25(obj);
+        expect(deepAccess(obj, path)).to.eql(undefined);
+        expect(deepAccess(obj, newPath)).to.eql('val');
+      });
+    });
+    it('moves kwarray into keywords', () => {
+      expect(toOrtb25({app: {keywords: 'k1,k2', kwarray: ['ka1', 'ka2']}})).to.eql({app: {keywords: 'k1,k2,ka1,ka2'}});
+    });
+    it('does not choke if kwarray is not an array', () => {
+      expect(toOrtb25({site: {keywords: 'k1,k2', kwarray: 'err'}})).to.eql({site: {keywords: 'k1,k2'}});
+    });
+    it('does not choke if keywords is not a string', () => {
+      expect(toOrtb25({user: {keywords: {}, kwarray: ['ka1', 'ka2']}})).to.eql({
+        user: {
+          keywords: {},
+          kwarray: ['ka1', 'ka2']
+        }
+      });
+    });
+  });
+});

From 4346aa82264a08c7f135fd2de4acb06285c1868e Mon Sep 17 00:00:00 2001
From: Jason Quaccia <jlquaccia@gmail.com>
Date: Thu, 8 Dec 2022 09:25:07 -0800
Subject: [PATCH 511/569] Prebid Core: Addition of Optional Category Targeting
 Key (#9268)

* addition of category optional targeting

* removed console log statements

* console.log statements for debugging

* updated tests

* formatting changes

* added pbs test
---
 src/auction.js                   | 12 ++++++++++-
 src/constants.json               |  3 ++-
 test/spec/auctionmanager_spec.js | 34 +++++++++++++++++++++++++++++++-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/auction.js b/src/auction.js
index 563eb85e788..87397b0dc15 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -828,6 +828,16 @@ export const getAdvertiserDomain = () => {
   }
 }
 
+/**
+ * This function returns a function to get the primary category id from bid response meta
+ * @returns {function}
+ */
+export const getPrimaryCatId = () => {
+  return (bid) => {
+    return (bid.meta && bid.meta.primaryCatId) ? bid.meta.primaryCatId : '';
+  }
+}
+
 // factory for key value objs
 function createKeyVal(key, value) {
   return {
@@ -853,6 +863,7 @@ function defaultAdserverTargeting() {
     createKeyVal(TARGETING_KEYS.SOURCE, 'source'),
     createKeyVal(TARGETING_KEYS.FORMAT, 'mediaType'),
     createKeyVal(TARGETING_KEYS.ADOMAIN, getAdvertiserDomain()),
+    createKeyVal(TARGETING_KEYS.ACAT, getPrimaryCatId()),
   ]
 }
 
@@ -865,7 +876,6 @@ function defaultAdserverTargeting() {
 export function getStandardBidderSettings(mediaType, bidderCode) {
   const TARGETING_KEYS = CONSTANTS.TARGETING_KEYS;
   const standardSettings = Object.assign({}, bidderSettings.settingsFor(null));
-
   if (!standardSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING]) {
     standardSettings[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] = defaultAdserverTargeting();
   }
diff --git a/src/constants.json b/src/constants.json
index 30ade5fccbe..e33d65f3fb1 100644
--- a/src/constants.json
+++ b/src/constants.json
@@ -76,7 +76,8 @@
     "UUID": "hb_uuid",
     "CACHE_ID": "hb_cache_id",
     "CACHE_HOST": "hb_cache_host",
-    "ADOMAIN": "hb_adomain"
+    "ADOMAIN": "hb_adomain",
+    "ACAT": "hb_acat"
   },
   "DEFAULT_TARGETING_KEYS": {
     "BIDDER": "hb_bidder",
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index 46350895050..e1ecf801aa3 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -186,7 +186,8 @@ describe('auctionmanager.js', function () {
       source: 'client',
       mediaType: 'banner',
       meta: {
-        advertiserDomains: ['adomain']
+        advertiserDomains: ['adomain'],
+        primaryCatId: 'IAB-test'
       }
     };
 
@@ -200,6 +201,7 @@ describe('auctionmanager.js', function () {
       expected[ CONSTANTS.TARGETING_KEYS.SOURCE ] = bid.source;
       expected[ CONSTANTS.TARGETING_KEYS.FORMAT ] = bid.mediaType;
       expected[ CONSTANTS.TARGETING_KEYS.ADOMAIN ] = bid.meta.advertiserDomains[0];
+      expected[ CONSTANTS.TARGETING_KEYS.ACAT ] = bid.meta.primaryCatId;
       if (bid.mediaType === 'video') {
         expected[ CONSTANTS.TARGETING_KEYS.UUID ] = bid.videoCacheKey;
         expected[ CONSTANTS.TARGETING_KEYS.CACHE_ID ] = bid.videoCacheKey;
@@ -290,6 +292,12 @@ describe('auctionmanager.js', function () {
               val: function (bidResponse) {
                 return bidResponse.meta.advertiserDomains[0];
               }
+            },
+            {
+              key: CONSTANTS.TARGETING_KEYS.ACAT,
+              val: function (bidResponse) {
+                return bidResponse.meta.primaryCatId;
+              }
             }
           ]
 
@@ -367,6 +375,12 @@ describe('auctionmanager.js', function () {
               val: function (bidResponse) {
                 return bidResponse.meta.advertiserDomains[0];
               }
+            },
+            {
+              key: CONSTANTS.TARGETING_KEYS.ACAT,
+              val: function (bidResponse) {
+                return bidResponse.meta.primaryCatId;
+              }
             }
           ]
 
@@ -455,6 +469,24 @@ describe('auctionmanager.js', function () {
       assert.deepEqual(response, expected);
     });
 
+    it('Should set targeting as expecting when pbs is enabled', function () {
+      config.setConfig({
+        s2sConfig: {
+          accountId: '1',
+          enabled: true,
+          defaultVendor: 'appnexus',
+          bidders: ['appnexus'],
+          timeout: 1000,
+          adapter: 'prebidServer'
+        }
+      });
+
+      $$PREBID_GLOBAL$$.bidderSettings = {};
+      let expected = getDefaultExpected(bid);
+      let response = getKeyValueTargetingPairs(bid.bidderCode, bid);
+      assert.deepEqual(response, expected);
+    });
+
     it('Custom bidCpmAdjustment for one bidder and inherit standard but doesn\'t use standard bidCpmAdjustment', function () {
       $$PREBID_GLOBAL$$.bidderSettings =
       {

From f5f276bb827d5b81b12b2c62e405bb11768690e5 Mon Sep 17 00:00:00 2001
From: ahmadlob <109217988+ahmadlob@users.noreply.github.com>
Date: Thu, 8 Dec 2022 19:54:43 +0200
Subject: [PATCH 512/569] Taboola Bid Adapter: Fixing Accepting Bid Floor
 Mechanism   (#9279)

* use-convention-for-bidfloor-extraction

* use-convention-for-bidfloor-extraction

* add-unit-tests
---
 modules/taboolaBidAdapter.js                | 27 ++++++++++----
 test/spec/modules/taboolaBidAdapter_spec.js | 39 +++++++++++++++++++++
 2 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/modules/taboolaBidAdapter.js b/modules/taboolaBidAdapter.js
index 9bd42651796..670d28ab64e 100644
--- a/modules/taboolaBidAdapter.js
+++ b/modules/taboolaBidAdapter.js
@@ -170,15 +170,28 @@ function getSiteProperties({publisherId, bcat = []}, refererInfo) {
 
 function getImps(validBidRequests) {
   return validBidRequests.map((bid, id) => {
-    const {tagId, bidfloor = null, bidfloorcur = CURRENCY} = bid.params;
-
-    return {
+    const {tagId} = bid.params;
+    const imp = {
       id: id + 1,
       banner: getBanners(bid),
-      tagid: tagId,
-      bidfloor,
-      bidfloorcur,
-    };
+      tagid: tagId
+    }
+    if (typeof bid.getFloor === 'function') {
+      const floorInfo = bid.getFloor({
+        currency: CURRENCY,
+        mediaType: BANNER,
+        size: '*'
+      });
+      if (typeof floorInfo === 'object' && floorInfo.currency === CURRENCY && !isNaN(parseFloat(floorInfo.floor))) {
+        imp.bidfloor = parseFloat(floorInfo.floor);
+        imp.bidfloorcur = CURRENCY;
+      }
+    } else {
+      const {bidfloor = null, bidfloorcur = CURRENCY} = bid.params;
+      imp.bidfloor = bidfloor;
+      imp.bidfloorcur = bidfloorcur;
+    }
+    return imp;
   });
 }
 
diff --git a/test/spec/modules/taboolaBidAdapter_spec.js b/test/spec/modules/taboolaBidAdapter_spec.js
index c0b16ac40fc..5bde75cd0b6 100644
--- a/test/spec/modules/taboolaBidAdapter_spec.js
+++ b/test/spec/modules/taboolaBidAdapter_spec.js
@@ -167,6 +167,45 @@ describe('Taboola Adapter', function () {
       expect(resData.imp[0].bidfloorcur).to.deep.equal('EUR');
     });
 
+    it('should pass bid floor', function () {
+      const bidRequest = {
+        ...defaultBidRequest,
+        params: {...commonBidRequest.params},
+        getFloor: function() {
+          return {
+            currency: 'USD',
+            floor: 2.7,
+          }
+        }
+      };
+      const res = spec.buildRequests([bidRequest], commonBidderRequest);
+      const resData = JSON.parse(res.data);
+      expect(resData.imp[0].bidfloor).to.deep.equal(2.7);
+      expect(resData.imp[0].bidfloorcur).to.deep.equal('USD');
+    });
+
+    it('should pass bid floor even if they is a bid floor param', function () {
+      const optionalParams = {
+        bidfloor: 0.25,
+        bidfloorcur: 'EUR'
+      };
+
+      const bidRequest = {
+        ...defaultBidRequest,
+        params: {...commonBidRequest.params, ...optionalParams},
+        getFloor: function() {
+          return {
+            currency: 'USD',
+            floor: 2.7,
+          }
+        }
+      };
+      const res = spec.buildRequests([bidRequest], commonBidderRequest);
+      const resData = JSON.parse(res.data);
+      expect(resData.imp[0].bidfloor).to.deep.equal(2.7);
+      expect(resData.imp[0].bidfloorcur).to.deep.equal('USD');
+    });
+
     it('should pass bidder timeout', function () {
       const bidderRequest = {
         ...commonBidderRequest,

From 69a0f6a2be7a9d8eea7c3d0e742b9284eef0bba8 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 8 Dec 2022 19:04:28 +0000
Subject: [PATCH 513/569] Prebid 7.28.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f73e700aa42..d6484617a3b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.28.0-pre",
+  "version": "7.28.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 7bbe18037b4..8d9b6a119df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.28.0-pre",
+  "version": "7.28.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From d4b449f19a3326a752b5d87df2ea9b05669bf1d5 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Thu, 8 Dec 2022 19:04:28 +0000
Subject: [PATCH 514/569] Increment version to 7.29.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d6484617a3b..006b8bcdcab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.28.0",
+  "version": "7.29.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 8d9b6a119df..5ee4cb728b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.28.0",
+  "version": "7.29.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From bf5b15f4e532bc6a519185c8520b3368139c2b31 Mon Sep 17 00:00:00 2001
From: Bill Newman <huddled.masses1650@gmail.com>
Date: Fri, 9 Dec 2022 12:58:53 +0200
Subject: [PATCH 515/569] Colossus Bid Adapter: update user sync (#9327)

* add video&native traffic colossus ssp

* Native obj validation

* Native obj validation #2

* Added size field in requests

* fixed test

* fix merge conflicts

* move to 3.0

* move to 3.0

* fix IE11 new URL issue

* fix IE11 new URL issue

* fix IE11 new URL issue

* https for 3.0

* add https test

* add ccp and schain features

* fix test

* sync with upstream, fix conflicts

* Update colossussspBidAdapter.js

remove commented code

* Update colossussspBidAdapter.js

lint fix

* identity extensions

* identity extensions

* fix

* fix

* fix

* fix

* fix

* add tests for user ids

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* add gdpr support

* add gdpr support

* id5id support

* Update colossussspBidAdapter.js

add bidfloor parameter

* Update colossussspBidAdapter.js

check bidfloor

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter_spec.js

* use floor module

* Revert "use floor module"

This reverts commit f0c5c248627567e669d8eed4f2bb9a26a857e2ad.

* use floor module

* update to 5v

* fix

* add uid2 and bidFloor support

* fix

* add pbadslot support

* fix conflicts

* add onBidWon

* refactor

* add test for onBidWon()

* fix

* add group_id

* Trigger circleci

* fix

* update user sync

* fix window.location

* fix test

* updates

* fix conflict

* fix

* updates

* remove traffic param

* add transactionId to request data for colossusssp adapter

* Send tid in placements array

* update user sync

* updated tests

* remove changes package-lock file

* fix

Co-authored-by: Vladislav Isaiko <vladis@smartyads.com>
Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>
Co-authored-by: Mykhailo Yaremchuk <m.yaremchuk@smartyads.com>
---
 modules/colossussspBidAdapter.js                | 2 +-
 test/spec/modules/colossussspBidAdapter_spec.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/colossussspBidAdapter.js b/modules/colossussspBidAdapter.js
index c1560680a6e..75e73ffda89 100644
--- a/modules/colossussspBidAdapter.js
+++ b/modules/colossussspBidAdapter.js
@@ -214,7 +214,7 @@ export const spec = {
   },
 
   getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
-    let syncType = syncOptions.iframeEnabled ? 'html' : 'hms.gif';
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
     let syncUrl = G_URL_SYNC + `/${syncType}?pbjs=1`;
     if (gdprConsent && gdprConsent.consentString) {
       if (typeof gdprConsent.gdprApplies === 'boolean') {
diff --git a/test/spec/modules/colossussspBidAdapter_spec.js b/test/spec/modules/colossussspBidAdapter_spec.js
index 8b06868390a..71e94f0da32 100644
--- a/test/spec/modules/colossussspBidAdapter_spec.js
+++ b/test/spec/modules/colossussspBidAdapter_spec.js
@@ -299,8 +299,8 @@ describe('ColossussspAdapter', function () {
       expect(userSync).to.be.an('array').with.lengthOf(1);
       expect(userSync[0].type).to.exist;
       expect(userSync[0].url).to.exist;
-      expect(userSync[0].type).to.be.equal('hms.gif');
-      expect(userSync[0].url).to.be.equal('https://sync.colossusssp.com/hms.gif?pbjs=1&gdpr=0&gdpr_consent=xxx&ccpa_consent=1YN-&coppa=0');
+      expect(userSync[0].type).to.be.equal('image');
+      expect(userSync[0].url).to.be.equal('https://sync.colossusssp.com/image?pbjs=1&gdpr=0&gdpr_consent=xxx&ccpa_consent=1YN-&coppa=0');
     });
   });
 });

From 374aa26d592edc6906e8dc1f780d5fe1b2708148 Mon Sep 17 00:00:00 2001
From: pm-azhar-mulla <75726247+pm-azhar-mulla@users.noreply.github.com>
Date: Tue, 13 Dec 2022 00:51:09 +0530
Subject: [PATCH 516/569] PubMatic Analytics Adapter:added parameters in logger
 call (#9328)

* Logging floor related params in loger

* Adding au and mt parameters in logger and tracker call

* Added extra check

Co-authored-by: pm-azhar-mulla <azhar@L1119.local>
Co-authored-by: pm-priyanka-deshmane <priyanka.deshmane@pubmatic.com>
---
 modules/pubmaticAnalyticsAdapter.js           | 43 ++++++++++++++-
 .../modules/pubmaticAnalyticsAdapter_spec.js  | 52 ++++++++++++++++++-
 2 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/modules/pubmaticAnalyticsAdapter.js b/modules/pubmaticAnalyticsAdapter.js
index c8dc7cef15d..cae94f6fe7b 100755
--- a/modules/pubmaticAnalyticsAdapter.js
+++ b/modules/pubmaticAnalyticsAdapter.js
@@ -30,6 +30,11 @@ const DEFAULT_PUBLISHER_ID = 0;
 const DEFAULT_PROFILE_ID = 0;
 const DEFAULT_PROFILE_VERSION_ID = 0;
 const enc = window.encodeURIComponent;
+const MEDIATYPE = {
+  BANNER: 0,
+  VIDEO: 1,
+  NATIVE: 2
+}
 
 /// /////////// VARIABLES //////////////
 let publisherId = DEFAULT_PUBLISHER_ID; // int: mandatory
@@ -89,6 +94,7 @@ function copyRequiredBidDetails(bid) {
     'status', () => NO_BID, // default a bid to NO_BID until response is recieved or bid is timed out
     'finalSource as source',
     'params',
+    'floorData',
     'adUnit', () => pick(bid, [
       'adUnitCode',
       'transactionId',
@@ -153,6 +159,7 @@ function parseBidResponse(bid) {
     'bidId',
     'mediaType',
     'params',
+    'floorData',
     'mi',
     'regexPattern', () => bid.regexPattern || undefined,
     'partnerImpId', // partner impression ID
@@ -243,17 +250,28 @@ function gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestBid) {
         'af': bid.bidResponse ? (bid.bidResponse.mediaType || undefined) : undefined,
         'ocpm': bid.bidResponse ? (bid.bidResponse.originalCpm || 0) : 0,
         'ocry': bid.bidResponse ? (bid.bidResponse.originalCurrency || CURRENCY_USD) : CURRENCY_USD,
-        'piid': bid.bidResponse ? (bid.bidResponse.partnerImpId || EMPTY_STRING) : EMPTY_STRING
+        'piid': bid.bidResponse ? (bid.bidResponse.partnerImpId || EMPTY_STRING) : EMPTY_STRING,
+        'frv': (s2sBidders.indexOf(bid.bidder) > -1) ? undefined : (bid.bidResponse ? (bid.bidResponse.floorData ? bid.bidResponse.floorData.floorRuleValue : undefined) : undefined)
       });
     });
     return partnerBids;
   }, [])
 }
 
+function getAdUnitAdFormats(adUnit) {
+  var af = adUnit ? Object.keys(adUnit.mediaTypes || {}).map(format => MEDIATYPE[format.toUpperCase()]) : [];
+  return af;
+}
+
+function getAdUnit(adUnits, adUnitId) {
+  return adUnits.filter(adUnit => (adUnit.divID && adUnit.divID == adUnitId) || (adUnit.code == adUnitId))[0];
+}
+
 function executeBidsLoggerCall(e, highestCpmBids) {
   let auctionId = e.auctionId;
   let referrer = config.getConfig('pageUrl') || cache.auctions[auctionId].referer || '';
   let auctionCache = cache.auctions[auctionId];
+  let floorData = auctionCache.floorData;
   let outputObj = { s: [] };
   let pixelURL = END_POINT_BID_LOGGER;
 
@@ -283,12 +301,21 @@ function executeBidsLoggerCall(e, highestCpmBids) {
     return 0;
   })();
 
+  if (floorData) {
+    outputObj['fmv'] = floorData.floorRequestData ? floorData.floorRequestData.modelVersion || undefined : undefined;
+    outputObj['ft'] = floorData.floorResponseData ? (floorData.floorResponseData.enforcements.enforceJS == false ? 0 : 1) : undefined;
+  }
+
   outputObj.s = Object.keys(auctionCache.adUnitCodes).reduce(function(slotsArray, adUnitId) {
     let adUnit = auctionCache.adUnitCodes[adUnitId];
+    let origAdUnit = getAdUnit(auctionCache.origAdUnits, adUnitId) || {};
     let slotObject = {
       'sn': adUnitId,
+      'au': origAdUnit.adUnitId || adUnitId,
+      'mt': getAdUnitAdFormats(origAdUnit),
       'sz': adUnit.dimensions.map(e => e[0] + 'x' + e[1]),
-      'ps': gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestCpmBids.filter(bid => bid.adUnitCode === adUnitId))
+      'ps': gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestCpmBids.filter(bid => bid.adUnitCode === adUnitId)),
+      'fskp': floorData ? (floorData.floorRequestData ? (floorData.floorRequestData.skipped == false ? 0 : 1) : undefined) : undefined,
     };
     slotsArray.push(slotObject);
     return slotsArray;
@@ -318,6 +345,7 @@ function executeBidWonLoggerCall(auctionId, adUnitId) {
   }
 
   const adapterName = getAdapterNameForAlias(winningBid.adapterCode || winningBid.bidder);
+  let origAdUnit = getAdUnit(cache.auctions[auctionId].origAdUnits, adUnitId) || {};
   let pixelURL = END_POINT_WIN_BID_LOGGER;
   pixelURL += 'pubid=' + publisherId;
   pixelURL += '&purl=' + enc(config.getConfig('pageUrl') || cache.auctions[auctionId].referer || '');
@@ -327,6 +355,7 @@ function executeBidWonLoggerCall(auctionId, adUnitId) {
   pixelURL += '&pid=' + enc(profileId);
   pixelURL += '&pdvid=' + enc(profileVersionId);
   pixelURL += '&slot=' + enc(adUnitId);
+  pixelURL += '&au=' + enc(origAdUnit.adUnitId || adUnitId);
   pixelURL += '&pn=' + enc(adapterName);
   pixelURL += '&bc=' + enc(winningBid.bidderCode || winningBid.bidder);
   pixelURL += '&en=' + enc(winningBid.bidResponse.bidPriceUSD);
@@ -358,6 +387,8 @@ function auctionInitHandler(args) {
     'bidderDonePendingCount', () => args.bidderRequests.length,
   ]);
   cacheEntry.adUnitCodes = {};
+  cacheEntry.floorData = {};
+  cacheEntry.origAdUnits = args.adUnits;
   cacheEntry.referer = args.bidderRequests[0].refererInfo.topmostLocation;
   cache.auctions[args.auctionId] = cacheEntry;
 }
@@ -372,6 +403,9 @@ function bidRequestedHandler(args) {
       };
     }
     cache.auctions[args.auctionId].adUnitCodes[bid.adUnitCode].bids[bid.bidId] = [copyRequiredBidDetails(bid)];
+    if (bid.floorData) {
+      cache.auctions[args.auctionId].floorData['floorRequestData'] = bid.floorData;
+    }
   })
 }
 
@@ -386,6 +420,11 @@ function bidResponseHandler(args) {
     bid = copyRequiredBidDetails(args);
     cache.auctions[args.auctionId].adUnitCodes[args.adUnitCode].bids[args.requestId].push(bid);
   }
+
+  if (args.floorData) {
+    cache.auctions[args.auctionId].floorData['floorResponseData'] = args.floorData;
+  }
+
   bid.adId = args.adId;
   bid.source = formatSource(bid.source || args.source);
   setBidStatus(bid, args);
diff --git a/test/spec/modules/pubmaticAnalyticsAdapter_spec.js b/test/spec/modules/pubmaticAnalyticsAdapter_spec.js
index fa4519c84e1..4ad048fef9a 100755
--- a/test/spec/modules/pubmaticAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubmaticAnalyticsAdapter_spec.js
@@ -68,6 +68,14 @@ const BID = {
     'hb_size': '640x480',
     'hb_source': 'server'
   },
+  'floorData': {
+    'cpmAfterAdjustments': 6.3,
+    'enforcements': {'enforceJS': true, 'enforcePBS': false, 'floorDeals': false, 'bidAdjustment': true},
+    'floorCurrency': 'USD',
+    'floorRule': 'banner',
+    'floorRuleValue': 1.1,
+    'floorValue': 1.1
+  },
   getStatusCode() {
     return 1;
   }
@@ -200,7 +208,18 @@ const MOCK = {
         'bidId': '3bd4ebb1c900e2',
         'seatBidId': 'aaaa-bbbb-cccc-dddd',
         'bidderRequestId': '1be65d7958826a',
-        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'floorData': {
+          'fetchStatus': 'success',
+          'floorMin': undefined,
+          'floorProvider': 'pubmatic',
+          'location': 'fetch',
+          'modelTimestamp': undefined,
+          'modelVersion': 'floorModelTest',
+          'modelWeight': undefined,
+          'skipRate': 0,
+          'skipped': false
+        }
       }
     ],
     'auctionStart': 1519149536560,
@@ -343,10 +362,13 @@ describe('pubmatic analytics adapter', function () {
       expect(data.orig).to.equal('www.test.com');
       expect(data.tst).to.equal(1519767016);
       expect(data.tgid).to.equal(15);
+      expect(data.fmv).to.equal('floorModelTest');
+      expect(data.ft).to.equal(1);
       expect(data.s).to.be.an('array');
       expect(data.s.length).to.equal(2);
       // slot 1
       expect(data.s[0].sn).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].fskp).to.equal(0);
       expect(data.s[0].sz).to.deep.equal(['640x480']);
       expect(data.s[0].ps).to.be.an('array');
       expect(data.s[0].ps.length).to.equal(1);
@@ -370,8 +392,10 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].af).to.equal('video');
       expect(data.s[0].ps[0].ocpm).to.equal(1.23);
       expect(data.s[0].ps[0].ocry).to.equal('USD');
+      expect(data.s[0].ps[0].frv).to.equal(undefined);
       // slot 2
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].fskp).to.equal(0);
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
@@ -397,6 +421,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal('banner');
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
 
       // tracker slot1
       let firstTracker = requests[0].url;
@@ -446,11 +471,14 @@ describe('pubmatic analytics adapter', function () {
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.pubid).to.equal('9999');
       expect(data.pid).to.equal('1111');
+      expect(data.fmv).to.equal('floorModelTest');
+      expect(data.ft).to.equal(1);
       expect(data.s).to.be.an('array');
       expect(data.s.length).to.equal(2);
       expect(data.tgid).to.equal(0);
       // slot 1
       expect(data.s[0].sn).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].fskp).to.equal(0);
       expect(data.s[0].sz).to.deep.equal(['640x480']);
       expect(data.s[0].ps).to.be.an('array');
       expect(data.s[0].ps.length).to.equal(1);
@@ -464,6 +492,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].af).to.equal('video');
       expect(data.s[0].ps[0].ocpm).to.equal(1.23);
       expect(data.s[0].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
       // tracker slot1
       let firstTracker = requests[0].url;
       expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
@@ -515,6 +544,8 @@ describe('pubmatic analytics adapter', function () {
       expect(data.pubid).to.equal('9999');
       expect(data.pid).to.equal('1111');
       expect(data.tgid).to.equal(0);// test group id should be between 0-15 else set to 0
+      expect(data.fmv).to.equal('floorModelTest');
+      expect(data.ft).to.equal(1);
       expect(data.s).to.be.an('array');
       expect(data.s.length).to.equal(2);
       // slot 1
@@ -563,6 +594,7 @@ describe('pubmatic analytics adapter', function () {
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.tgid).to.equal(0);// test group id should be an INT between 0-15 else set to 0
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].fskp).to.equal(0);
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
@@ -586,6 +618,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal(undefined);
       expect(data.s[1].ps[0].ocpm).to.equal(0);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
     });
 
     it('Logger: post-timeout check without bid response', function() {
@@ -643,6 +676,7 @@ describe('pubmatic analytics adapter', function () {
       let request = requests[0];
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].fskp).to.equal(0);
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
@@ -667,6 +701,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal('banner');
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
     });
 
     it('Logger: currency conversion check', function() {
@@ -748,6 +783,7 @@ describe('pubmatic analytics adapter', function () {
       expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].fskp).to.equal(0);
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
@@ -772,6 +808,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal('banner');
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
       expect(data.dvc).to.deep.equal({'plt': 2});
       // respective tracker slot
       let firstTracker = requests[1].url;
@@ -829,6 +866,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
       expect(data.dvc).to.deep.equal({'plt': 1});
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
       // respective tracker slot
       let firstTracker = requests[1].url;
       expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
@@ -856,6 +894,7 @@ describe('pubmatic analytics adapter', function () {
       expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].fskp).to.equal(0);
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
@@ -880,6 +919,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal('banner');
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
       // respective tracker slot
       let firstTracker = requests[1].url;
       expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
@@ -979,11 +1019,14 @@ describe('pubmatic analytics adapter', function () {
       expect(data.orig).to.equal('www.test.com');
       expect(data.tst).to.equal(1519767016);
       expect(data.tgid).to.equal(15);
+      expect(data.fmv).to.equal('floorModelTest');
+      expect(data.ft).to.equal(1);
       expect(data.s).to.be.an('array');
       expect(data.s.length).to.equal(2);
 
       // slot 1
       expect(data.s[0].sn).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].fskp).to.equal(0);
       expect(data.s[0].sz).to.deep.equal(['640x480']);
       expect(data.s[0].ps).to.be.an('array');
       expect(data.s[0].ps.length).to.equal(1);
@@ -1007,9 +1050,11 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].af).to.equal('video');
       expect(data.s[0].ps[0].ocpm).to.equal(1.23);
       expect(data.s[0].ps[0].ocry).to.equal('USD');
+      expect(data.s[0].ps[0].frv).to.equal(1.1);
 
       // slot 2
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].fskp).to.equal(0);
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
       expect(data.s[1].ps).to.be.an('array');
       expect(data.s[1].ps.length).to.equal(1);
@@ -1035,6 +1080,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal('banner');
       expect(data.s[1].ps[0].ocpm).to.equal(1.52);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
 
       // tracker slot1
       let firstTracker = requests[0].url;
@@ -1091,11 +1137,14 @@ describe('pubmatic analytics adapter', function () {
       expect(data.orig).to.equal('www.test.com');
       expect(data.tst).to.equal(1519767016);
       expect(data.tgid).to.equal(15);
+      expect(data.fmv).to.equal('floorModelTest');
+      expect(data.ft).to.equal(1);
       expect(data.s).to.be.an('array');
       expect(data.s.length).to.equal(2);
 
       // slot 1
       expect(data.s[0].sn).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].fskp).to.equal(0);
       expect(data.s[0].sz).to.deep.equal(['640x480']);
       expect(data.s[0].ps).to.be.an('array');
       expect(data.s[0].ps.length).to.equal(1);
@@ -1119,6 +1168,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].af).to.equal('video');
       expect(data.s[0].ps[0].ocpm).to.equal(1.23);
       expect(data.s[0].ps[0].ocry).to.equal('USD');
+      expect(data.s[0].ps[0].frv).to.equal(1.1);
 
       // slot 2
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');

From 05d32b281cd1d2d7c1fe49509b1503d59b9c8af2 Mon Sep 17 00:00:00 2001
From: Malkov Mikhail <mhlmlkv@gmail.com>
Date: Mon, 12 Dec 2022 22:59:03 +0300
Subject: [PATCH 517/569] Nextmillenium bid adapter: Collection of statistics
 data (#9265)

* changed name company

* changed name company in test

* Added processing of a new group_id parameter

* Added processing of a new group_id parameter

* changed check parameters

* fixed lint remarks

* added test

* fixed bug - lint

* changed test

* changed test - 2

* fixed bug - adapter

* added logic for getting ad impressions

* Collecting timeouts data

* Collecting resaponses and no_bids data

* changed a name function

* added event bidRequested

* added event bidRequested

* added function initialization events

* fixed bug

* save

* added tests

* Added processing of the disabledSendingStatisticData parameter, which disables sending statistics data

* changed the name of the variables
---
 modules/nextMillenniumBidAdapter.js           | 125 +++++++++++++++-
 .../modules/nextMillenniumBidAdapter_spec.js  | 133 ++++++++++++++++++
 2 files changed, 257 insertions(+), 1 deletion(-)

diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index 802a8ac25b0..cf732d343e5 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -14,6 +14,7 @@ import {
 
 import CONSTANTS from '../src/constants.json';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
 import * as events from '../src/events.js';
 
 import { registerBidder } from '../src/adapters/bidderFactory.js';
@@ -22,6 +23,7 @@ import { getRefererInfo } from '../src/refererDetection.js';
 const BIDDER_CODE = 'nextMillennium';
 const ENDPOINT = 'https://pbs.nextmillmedia.com/openrtb2/auction';
 const TEST_ENDPOINT = 'https://test.pbs.nextmillmedia.com/openrtb2/auction';
+const REPORT_ENDPOINT = 'https://report2.hb.brainlyads.com/statistics/metric';
 const SYNC_ENDPOINT = 'https://cookies.nextmillmedia.com/sync?';
 const TIME_TO_LIVE = 360;
 const VIDEO_PARAMS = [
@@ -29,11 +31,14 @@ const VIDEO_PARAMS = [
   'playbackmethod', 'protocols', 'startdelay'
 ];
 
+const sendingDataStatistic = initSendingDataStatistic();
+events.on(CONSTANTS.EVENTS.AUCTION_INIT, auctionInitHandler);
+
 const EXPIRENCE_WURL = 20 * 60000;
 const wurlMap = {};
+cleanWurl();
 
 events.on(CONSTANTS.EVENTS.BID_WON, bidWonHandler);
-cleanWurl();
 
 export const spec = {
   code: BIDDER_CODE,
@@ -135,6 +140,7 @@ export const spec = {
 
       const urlParameters = parseUrl(getWindowTop().location.href).search;
       const isTest = urlParameters['pbs'] && urlParameters['pbs'] === 'test';
+      const params = bid.params;
 
       requests.push({
         method: 'POST',
@@ -146,6 +152,7 @@ export const spec = {
         },
 
         bidId,
+        params,
         auctionId,
       });
     });
@@ -160,6 +167,7 @@ export const spec = {
     _each(response.seatbid, (resp) => {
       _each(resp.bid, (bid) => {
         const requestId = bidRequest.bidId;
+        const params = bidRequest.params;
         const auctionId = bidRequest.auctionId;
         const wurl = deepAccess(bid, 'ext.prebid.events.win');
         addWurl({auctionId, requestId, wurl});
@@ -168,6 +176,7 @@ export const spec = {
 
         const bidResponse = {
           requestId,
+          params,
           cpm: bid.price,
           width: bid.w,
           height: bid.h,
@@ -217,6 +226,41 @@ export const spec = {
 
     return pixels;
   },
+
+  getUrlPixelMetric(eventName, bid) {
+    const bidder = bid.bidder || bid.bidderCode;
+    if (bidder != BIDDER_CODE) return;
+
+    let params;
+    if (bid.params) {
+      params = Array.isArray(bid.params) ? bid.params : [bid.params];
+    } else {
+      if (Array.isArray(bid.bids)) params = bid.bids.map(bidI => bidI.params);
+    };
+
+    if (!params.length) return;
+
+    const placementIdsArray = [];
+    const groupIdsArray = [];
+    params.forEach(paramsI => {
+      if (paramsI.group_id) {
+        groupIdsArray.push(paramsI.group_id);
+      } else {
+        if (paramsI.placement_id) placementIdsArray.push(paramsI.placement_id);
+      };
+    });
+
+    const placementIds = (placementIdsArray.length && `&placements=${placementIdsArray.join(';')}`) || '';
+    const groupIds = (groupIdsArray.length && `&groups=${groupIdsArray.join(';')}`) || '';
+
+    if (!(groupIds || placementIds)) {
+      return;
+    };
+
+    const url = `${REPORT_ENDPOINT}?event=${eventName}&bidder=${bidder}&source=pbjs${groupIds}${placementIds}`;
+
+    return url;
+  },
 };
 
 function getAdEl(bid) {
@@ -338,6 +382,10 @@ function bidWonHandler(bid) {
   };
 }
 
+function auctionInitHandler() {
+  sendingDataStatistic.initEvents();
+}
+
 function cleanWurl() {
   const dateNow = Date.now();
   Object.keys(wurlMap).forEach(key => {
@@ -349,4 +397,79 @@ function cleanWurl() {
   setTimeout(cleanWurl, 60000);
 }
 
+function initSendingDataStatistic() {
+  class SendingDataStatistic {
+    eventNames = [
+      CONSTANTS.EVENTS.BID_TIMEOUT,
+      CONSTANTS.EVENTS.BID_RESPONSE,
+      CONSTANTS.EVENTS.BID_REQUESTED,
+      CONSTANTS.EVENTS.NO_BID,
+    ];
+
+    disabledSending = false;
+    enabledSending = false;
+    eventHendlers = {};
+
+    initEvents() {
+      this.disabledSending = !!config.getBidderConfig()?.nextMillennium?.disabledSendingStatisticData;
+      if (this.disabledSending) {
+        this.removeEvents();
+      } else {
+        this.createEvents();
+      };
+    }
+
+    createEvents() {
+      if (this.enabledSending) return;
+
+      this.enabledSending = true;
+      for (let eventName of this.eventNames) {
+        if (!this.eventHendlers[eventName]) {
+          this.eventHendlers[eventName] = this.eventHandler(eventName);
+        };
+
+        events.on(eventName, this.eventHendlers[eventName]);
+      };
+    }
+
+    removeEvents() {
+      if (!this.enabledSending) return;
+
+      this.enabledSending = false;
+      for (let eventName of this.eventNames) {
+        if (!this.eventHendlers[eventName]) continue;
+
+        events.off(eventName, this.eventHendlers[eventName]);
+      };
+    }
+
+    eventHandler(eventName) {
+      const eventHandlerFunc = this.getEventHandler(eventName);
+      if (eventName == CONSTANTS.EVENTS.BID_TIMEOUT) {
+        return bids => {
+          if (this.disabledSending || !Array.isArray(bids)) return;
+
+          for (let bid of bids) {
+            eventHandlerFunc(bid);
+          };
+        }
+      };
+
+      return eventHandlerFunc;
+    }
+
+    getEventHandler(eventName) {
+      return bid => {
+        if (this.disabledSending) return;
+
+        const url = spec.getUrlPixelMetric(eventName, bid);
+        if (!url) return;
+        triggerPixel(url);
+      };
+    }
+  };
+
+  return new SendingDataStatistic();
+}
+
 registerBidder(spec);
diff --git a/test/spec/modules/nextMillenniumBidAdapter_spec.js b/test/spec/modules/nextMillenniumBidAdapter_spec.js
index 2b5ae801489..3094c1349f7 100644
--- a/test/spec/modules/nextMillenniumBidAdapter_spec.js
+++ b/test/spec/modules/nextMillenniumBidAdapter_spec.js
@@ -276,4 +276,137 @@ describe('nextMillenniumBidAdapterTests', function() {
     expect(bid.height).to.equal(250);
     expect(bid.currency).to.equal('USD');
   });
+
+  it('Check function of getting URL for sending statistics data', function() {
+    const dataForTests = [
+      {
+        eventName: 'bidRequested',
+        bid: {
+          bidderCode: 'appnexus',
+          bids: [{bidder: 'appnexus', params: {}}],
+        },
+
+        expected: undefined,
+      },
+
+      {
+        eventName: 'bidRequested',
+        bid: {
+          bidderCode: 'appnexus',
+          bids: [{bidder: 'appnexus', params: {placement_id: '807'}}],
+        },
+
+        expected: undefined,
+      },
+
+      {
+        eventName: 'bidRequested',
+        bid: {
+          bidderCode: 'nextMillennium',
+          bids: [{bidder: 'nextMillennium', params: {placement_id: '807'}}],
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidRequested&bidder=nextMillennium&source=pbjs&placements=807',
+      },
+
+      {
+        eventName: 'bidRequested',
+        bid: {
+          bidderCode: 'nextMillennium',
+          bids: [
+            {bidder: 'nextMillennium', params: {placement_id: '807'}},
+            {bidder: 'nextMillennium', params: {placement_id: '111'}},
+          ],
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidRequested&bidder=nextMillennium&source=pbjs&placements=807;111',
+      },
+
+      {
+        eventName: 'bidRequested',
+        bid: {
+          bidderCode: 'nextMillennium',
+          bids: [{bidder: 'nextMillennium', params: {placement_id: '807', group_id: '123'}}],
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidRequested&bidder=nextMillennium&source=pbjs&groups=123',
+      },
+
+      {
+        eventName: 'bidRequested',
+        bid: {
+          bidderCode: 'nextMillennium',
+          bids: [
+            {bidder: 'nextMillennium', params: {placement_id: '807', group_id: '123'}},
+            {bidder: 'nextMillennium', params: {group_id: '456'}},
+            {bidder: 'nextMillennium', params: {placement_id: '222'}},
+          ],
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidRequested&bidder=nextMillennium&source=pbjs&groups=123;456&placements=222',
+      },
+
+      {
+        eventName: 'bidResponse',
+        bid: {
+          bidderCode: 'appnexus',
+        },
+
+        expected: undefined,
+      },
+
+      {
+        eventName: 'bidResponse',
+        bid: {
+          bidderCode: 'nextMillennium',
+          params: {placement_id: '807'},
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidResponse&bidder=nextMillennium&source=pbjs&placements=807',
+      },
+
+      {
+        eventName: 'noBid',
+        bid: {
+          bidder: 'appnexus',
+        },
+
+        expected: undefined,
+      },
+
+      {
+        eventName: 'noBid',
+        bid: {
+          bidder: 'nextMillennium',
+          params: {placement_id: '807'},
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=noBid&bidder=nextMillennium&source=pbjs&placements=807',
+      },
+
+      {
+        eventName: 'bidTimeout',
+        bid: {
+          bidder: 'appnexus',
+        },
+
+        expected: undefined,
+      },
+
+      {
+        eventName: 'bidTimeout',
+        bid: {
+          bidder: 'nextMillennium',
+          params: {placement_id: '807'},
+        },
+
+        expected: 'https://report2.hb.brainlyads.com/statistics/metric?event=bidTimeout&bidder=nextMillennium&source=pbjs&placements=807',
+      },
+    ];
+
+    for (let {eventName, bid, expected} of dataForTests) {
+      const url = spec.getUrlPixelMetric(eventName, bid);
+      expect(url).to.equal(expected);
+    };
+  })
 });

From c1a193a116086583054fff46af67d0dbb386277f Mon Sep 17 00:00:00 2001
From: Karim Mourra <karim@jwplayer.com>
Date: Mon, 12 Dec 2022 15:18:21 -0500
Subject: [PATCH 518/569] Video Module: Ad Queueing (#9226)

* adds queue coordinator

* tests module

* test setAdTag

* tests integration

* updates examples

* documents the event

* loads get queued always

* updates tests

* decouples register from init

* updates tests

* Revert "updates tests"

This reverts commit 1616dfad2bba34a10b3f20fb5680baea7ce11fa1.

* updates tests
---
 .../videoModule/jwplayer/bidMarkedAsUsed.html |   6 +-
 .../videoModule/jwplayer/eventListeners.html  |   7 +-
 .../jwplayer/gamAdServerMediation.html        |   6 +-
 .../videoModule/jwplayer/mediaMetadata.html   |   3 +-
 .../videoModule/jwplayer/playlist.html        |   3 +-
 .../videoModule/videojs/bidMarkedAsUsed.html  |   5 +-
 .../videoModule/videojs/eventListeners.html   |   4 +
 .../videojs/gamAdServerMediation.html         |   3 +-
 .../videoModule/videojs/playlist.html         |   4 +-
 .../constants/{enums.js => constants.js}      |   2 +
 libraries/video/constants/events.js           |   1 +
 libraries/video/shared/helpers.js             |   5 +
 libraries/video/shared/parentModule.js        |   1 -
 modules/jwplayerVideoProvider.js              |   2 +-
 modules/videoModule/adQueue.js                |  63 +++++++
 modules/videoModule/addingSubmodule.md        |   7 +
 modules/videoModule/coreVideo.js              |   6 +
 modules/videoModule/index.js                  |  35 ++--
 modules/videojsVideoProvider.js               |   2 +-
 test/spec/modules/videoModule/adQueue_spec.js | 172 ++++++++++++++++++
 test/spec/modules/videoModule/pbVideo_spec.js |  34 ++--
 .../videoModule/shared/parentModule_spec.js   |   1 -
 .../submodules/jwplayerVideoProvider_spec.js  |   2 +-
 23 files changed, 325 insertions(+), 49 deletions(-)
 rename libraries/video/constants/{enums.js => constants.js} (65%)
 create mode 100644 libraries/video/shared/helpers.js
 create mode 100644 modules/videoModule/adQueue.js
 create mode 100644 test/spec/modules/videoModule/adQueue_spec.js

diff --git a/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html b/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html
index 542cab4202e..044b4295e67 100644
--- a/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html
+++ b/integrationExamples/videoModule/jwplayer/bidMarkedAsUsed.html
@@ -76,10 +76,6 @@
           console.log('player setup failed: ', e);
         });
 
-        pbjs.onEvent('videoPlaybackRequest', (e) => {
-          pbjs.requestBids(adUnits);
-        });
-
         pbjs.onEvent('videoBidError', e => {
           console.log('An Ad Error came from a Bid: ', e);
         });
@@ -87,6 +83,8 @@
         pbjs.onEvent('videoBidImpression', e => {
           console.log('An Ad Impression came from a Bid: ', e);
         });
+
+        pbjs.requestBids(adUnits);
       });
     </script>
 </head>
diff --git a/integrationExamples/videoModule/jwplayer/eventListeners.html b/integrationExamples/videoModule/jwplayer/eventListeners.html
index b4f5aaa5443..0b43ff44d6c 100644
--- a/integrationExamples/videoModule/jwplayer/eventListeners.html
+++ b/integrationExamples/videoModule/jwplayer/eventListeners.html
@@ -87,7 +87,6 @@
 
         pbjs.onEvent('videoPlaybackRequest', (e) => {
           console.log('videos pb playbackRequest: ', e);
-          pbjs.requestBids(adUnits);
         });
 
         pbjs.onEvent('videoAutostartBlocked', (e) => {
@@ -222,6 +221,10 @@
           console.log('videos pb auction ad load attempt: ', e);
         });
 
+        pbjs.onEvent('videoAuctionAdLoadQueued', (e) => {
+          console.log('videos pb auction ad load queued: ', e);
+        });
+
         pbjs.onEvent('videoAuctionAdLoadAttempt', event => {
           console.log('The Video Module is attempting to load an ad into the player! \n', event);
         });
@@ -233,6 +236,8 @@
         pbjs.onEvent('videoBidError', event => {
           console.log('The ad error resulted from a bid! \n', event);
         });
+
+        pbjs.requestBids(adUnits);
       });
     </script>
 </head>
diff --git a/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html b/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html
index 4612d03f336..296a3265bd1 100644
--- a/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html
+++ b/integrationExamples/videoModule/jwplayer/gamAdServerMediation.html
@@ -94,10 +94,6 @@
           console.log('player setup failed: ', e);
         });
 
-        pbjs.onEvent('videoPlaybackRequest', (e) => {
-          pbjs.requestBids(adUnits);
-        });
-
         pbjs.onEvent('videoAdRequest', (e) => {
           console.log('videos pb ad request: ', e);
         });
@@ -109,6 +105,8 @@
         pbjs.onEvent('videoBidImpression', e => {
           console.log('An Ad Impression came from a Bid: ', e);
         });
+
+        pbjs.requestBids(adUnits);
       });
     </script>
 </head>
diff --git a/integrationExamples/videoModule/jwplayer/mediaMetadata.html b/integrationExamples/videoModule/jwplayer/mediaMetadata.html
index 97e35c4de0d..815f5c4d6d7 100644
--- a/integrationExamples/videoModule/jwplayer/mediaMetadata.html
+++ b/integrationExamples/videoModule/jwplayer/mediaMetadata.html
@@ -56,7 +56,6 @@
 
         pbjs.onEvent('videoSetupComplete', e => {
           console.log('player setup complete: ', e);
-          pbjs.requestBids(adUnits);
         });
 
         pbjs.onEvent('videoSetupFailed', e => {
@@ -66,6 +65,8 @@
         pbjs.onEvent('videoContentLoaded', (e) => {
           console.log('videos pb contentLoaded: ', e);
         });
+
+        pbjs.requestBids(adUnits);
       });
     </script>
 
diff --git a/integrationExamples/videoModule/jwplayer/playlist.html b/integrationExamples/videoModule/jwplayer/playlist.html
index eb9a9b12700..b77a1ec05fc 100644
--- a/integrationExamples/videoModule/jwplayer/playlist.html
+++ b/integrationExamples/videoModule/jwplayer/playlist.html
@@ -97,7 +97,6 @@
       // request a bid when media is loaded
       pbjs.onEvent('videoContentLoaded', (e) => {
         console.log('videos pb contentLoaded: ', e);
-        pbjs.requestBids(adUnits);
       });
 
       pbjs.onEvent('videoComplete', (e) => {
@@ -107,6 +106,8 @@
       pbjs.onEvent('videoPlaylistComplete', (e) => {
         console.log('videos pb playlistComplete: ', e);
       });
+
+      pbjs.requestBids(adUnits);
     });
   </script>
 
diff --git a/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html b/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html
index 3c21130e8f5..b645a58a4fc 100644
--- a/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html
+++ b/integrationExamples/videoModule/videojs/bidMarkedAsUsed.html
@@ -101,10 +101,6 @@
           console.log('player setup failed: ', e);
         });
 
-        pbjs.onEvent('videoContentLoaded', (e) => {
-          pbjs.requestBids(adUnits);
-        });
-
         pbjs.onEvent('videoBidError', e => {
           console.log('An Ad Error came from a Bid: ', e);
         });
@@ -113,6 +109,7 @@
           console.log('An Ad Impression came from a Bid: ', e);
         });
 
+        pbjs.requestBids(adUnits);
       });
     </script>
 </head>
diff --git a/integrationExamples/videoModule/videojs/eventListeners.html b/integrationExamples/videoModule/videojs/eventListeners.html
index 63de878715f..16edaf4da41 100644
--- a/integrationExamples/videoModule/videojs/eventListeners.html
+++ b/integrationExamples/videoModule/videojs/eventListeners.html
@@ -209,6 +209,10 @@
         console.log('videos pb auction ad load attempt: ', e);
       });
 
+      pbjs.onEvent('videoAuctionAdLoadQueued', (e) => {
+        console.log('videos pb auction ad load queued: ', e);
+      });
+
       pbjs.onEvent('videoAuctionAdLoadAbort', (e) => {
         console.log('videos pb auction ad load attempt: ', e);
       });
diff --git a/integrationExamples/videoModule/videojs/gamAdServerMediation.html b/integrationExamples/videoModule/videojs/gamAdServerMediation.html
index 72deba861bf..9efd77e9681 100644
--- a/integrationExamples/videoModule/videojs/gamAdServerMediation.html
+++ b/integrationExamples/videoModule/videojs/gamAdServerMediation.html
@@ -96,8 +96,6 @@
 
         pbjs.addAdUnits(adUnits);
 
-        pbjs.requestBids(adUnits);
-
         pbjs.onEvent('videoSetupComplete', e => {
           // Load media with its Metadata when the video player is done instantiating.
           videojs('player').loadMedia({
@@ -125,6 +123,7 @@
           console.log('An Ad Impression came from a Bid: ', e);
         });
 
+        pbjs.requestBids(adUnits);
       });
     </script>
 </head>
diff --git a/integrationExamples/videoModule/videojs/playlist.html b/integrationExamples/videoModule/videojs/playlist.html
index a9354e06c83..a9e3d1bc99b 100644
--- a/integrationExamples/videoModule/videojs/playlist.html
+++ b/integrationExamples/videoModule/videojs/playlist.html
@@ -126,15 +126,15 @@
         console.log('videos pb playlist: ', e);
       });
 
-      // request a bid when media is loaded
       pbjs.onEvent('videoContentLoaded', (e) => {
         console.log('videos pb contentLoaded: ', e);
-        pbjs.requestBids(adUnits);
       });
 
       pbjs.onEvent('videoComplete', (e) => {
         console.log('videos pb complete: ', e);
       });
+
+      pbjs.requestBids(adUnits);
     });
   </script>
 
diff --git a/libraries/video/constants/enums.js b/libraries/video/constants/constants.js
similarity index 65%
rename from libraries/video/constants/enums.js
rename to libraries/video/constants/constants.js
index b0755020580..55e3785ccc2 100644
--- a/libraries/video/constants/enums.js
+++ b/libraries/video/constants/constants.js
@@ -1,3 +1,5 @@
+export const videoKey = 'video';
+
 export const PLAYBACK_MODE = {
   VOD: 0,
   LIVE: 1,
diff --git a/libraries/video/constants/events.js b/libraries/video/constants/events.js
index 5be594b1b48..b7932adf621 100644
--- a/libraries/video/constants/events.js
+++ b/libraries/video/constants/events.js
@@ -52,6 +52,7 @@ export const allVideoEvents = [
 ];
 
 export const AUCTION_AD_LOAD_ATTEMPT = 'auctionAdLoadAttempt';
+export const AUCTION_AD_LOAD_QUEUED = 'auctionAdLoadQueued';
 export const AUCTION_AD_LOAD_ABORT = 'auctionAdLoadAbort';
 export const BID_IMPRESSION = 'bidImpression';
 export const BID_ERROR = 'bidError';
diff --git a/libraries/video/shared/helpers.js b/libraries/video/shared/helpers.js
new file mode 100644
index 00000000000..1b87f3bf1f3
--- /dev/null
+++ b/libraries/video/shared/helpers.js
@@ -0,0 +1,5 @@
+import { videoKey } from '../constants/constants.js'
+
+export function getExternalVideoEventName(eventName) {
+  return videoKey + eventName.replace(/^./, eventName[0].toUpperCase());
+}
diff --git a/libraries/video/shared/parentModule.js b/libraries/video/shared/parentModule.js
index e96113fd894..06c71ebd75b 100644
--- a/libraries/video/shared/parentModule.js
+++ b/libraries/video/shared/parentModule.js
@@ -72,7 +72,6 @@ export function SubmoduleBuilder(submoduleDirectory_, sharedUtils_) {
     }
 
     const submodule = submoduleFactory(config, sharedUtils);
-    submodule && submodule.init && submodule.init();
     return submodule;
   }
 
diff --git a/modules/jwplayerVideoProvider.js b/modules/jwplayerVideoProvider.js
index d606e8121a7..379d8063c42 100644
--- a/modules/jwplayerVideoProvider.js
+++ b/modules/jwplayerVideoProvider.js
@@ -7,7 +7,7 @@ import {
   AUTOSTART_BLOCKED, PLAY_ATTEMPT_FAILED, CONTENT_LOADED, PLAY, PAUSE, BUFFER, TIME, SEEK_START, SEEK_END, MUTE, VOLUME,
   RENDITION_UPDATE, ERROR, COMPLETE, PLAYLIST_COMPLETE, FULLSCREEN, PLAYER_RESIZE, VIEWABLE, CAST
 } from '../libraries/video/constants/events.js';
-import { PLAYBACK_MODE } from '../libraries/video/constants/enums.js';
+import { PLAYBACK_MODE } from '../libraries/video/constants/constants.js';
 import stateFactory from '../libraries/video/shared/state.js';
 import { JWPLAYER_VENDOR } from '../libraries/video/constants/vendorCodes.js';
 import { getEventHandler } from '../libraries/video/shared/eventHandler.js';
diff --git a/modules/videoModule/adQueue.js b/modules/videoModule/adQueue.js
new file mode 100644
index 00000000000..a6da3752f6e
--- /dev/null
+++ b/modules/videoModule/adQueue.js
@@ -0,0 +1,63 @@
+import { AD_BREAK_END, AUCTION_AD_LOAD_ATTEMPT, AUCTION_AD_LOAD_QUEUED, SETUP_COMPLETE } from '../../libraries/video/constants/events.js'
+import { getExternalVideoEventName } from '../../libraries/video/shared/helpers.js'
+
+export function AdQueueCoordinator(videoCore, pbEvents) {
+  const storage = {};
+
+  function registerProvider(divId) {
+    storage[divId] = [];
+    videoCore.onEvents([SETUP_COMPLETE], onSetupComplete, divId);
+  }
+
+  function queueAd(adTagUrl, divId, options) {
+    const queue = storage[divId];
+    if (queue) {
+      queue.push({adTagUrl, options});
+      triggerEvent(AUCTION_AD_LOAD_QUEUED, adTagUrl, options);
+    } else {
+      loadAd(divId, adTagUrl, options);
+    }
+  }
+
+  return {
+    registerProvider,
+    queueAd
+  };
+
+  function onSetupComplete(eventName, eventPayload) {
+    const divId = eventPayload.divId;
+    videoCore.offEvents([SETUP_COMPLETE], onSetupComplete, divId);
+    loadQueuedAd(divId);
+  }
+
+  function onAdBreakEnd(eventName, eventPayload) {
+    loadQueuedAd(eventPayload.divId);
+  }
+
+  function loadQueuedAd(divId) {
+    videoCore.offEvents([AD_BREAK_END], onAdBreakEnd, divId);
+    const adQueue = storage[divId];
+    if (!adQueue) {
+      return;
+    }
+
+    if (!adQueue.length) {
+      delete storage[divId];
+      return;
+    }
+
+    const queuedAd = adQueue.shift();
+    videoCore.onEvents([AD_BREAK_END], onAdBreakEnd, divId);
+    loadAd(divId, queuedAd.adTagUrl, queuedAd.options);
+  }
+
+  function loadAd(divId, adTagUrl, options) {
+    triggerEvent(AUCTION_AD_LOAD_ATTEMPT, adTagUrl, options);
+    videoCore.setAdTagUrl(adTagUrl, divId, options);
+  }
+
+  function triggerEvent(eventName, adTagUrl, options) {
+    const payload = Object.assign({ adTagUrl }, options);
+    pbEvents.emit(getExternalVideoEventName(eventName), payload);
+  }
+}
diff --git a/modules/videoModule/addingSubmodule.md b/modules/videoModule/addingSubmodule.md
index 874718be1a7..2f880fdef3a 100644
--- a/modules/videoModule/addingSubmodule.md
+++ b/modules/videoModule/addingSubmodule.md
@@ -481,6 +481,13 @@ No additional params.
 | adTagUrl | string | The URL for the ad tag associated with the given ad event |
 | adUnitCode | string | Unique identifier that was used when creating the ad unit. |
 
+###### AUCTION_AD_LOAD_QUEUED
+
+| argument name | type | description |
+| ------------- | ---- | ----------- |
+| adTagUrl | string | The URL for the ad tag associated with the given ad event |
+| adUnitCode | string | Unique identifier that was used when creating the ad unit. |
+
 ###### AUCTION_AD_LOAD_ABORT
 
 | argument name | type | description |
diff --git a/modules/videoModule/coreVideo.js b/modules/videoModule/coreVideo.js
index c06482b0b36..ce66acc2b02 100644
--- a/modules/videoModule/coreVideo.js
+++ b/modules/videoModule/coreVideo.js
@@ -127,6 +127,11 @@ export function VideoCore(parentModule_) {
     } catch (e) {}
   }
 
+  function initProvider(divId) {
+    const submodule = parentModule.getSubmodule(divId);
+    submodule && submodule.init && submodule.init();
+  }
+
   /**
    * @name VideoCore#getOrtbVideo
    * @summary Obtains the oRTB Video params for a player's current video session.
@@ -208,6 +213,7 @@ export function VideoCore(parentModule_) {
 
   return {
     registerProvider,
+    initProvider,
     getOrtbVideo,
     getOrtbContent,
     setAdTagUrl,
diff --git a/modules/videoModule/index.js b/modules/videoModule/index.js
index 33ce3248d91..fb3c621918d 100644
--- a/modules/videoModule/index.js
+++ b/modules/videoModule/index.js
@@ -5,23 +5,31 @@ import { mergeDeep } from '../../src/utils.js';
 import { getGlobal } from '../../src/prebidGlobal.js';
 import CONSTANTS from '../../src/constants.json';
 import {
-  videoEvents, AUCTION_AD_LOAD_ATTEMPT, AD_IMPRESSION, AD_ERROR, BID_IMPRESSION, BID_ERROR, AUCTION_AD_LOAD_ABORT
+  videoEvents,
+  AUCTION_AD_LOAD_ATTEMPT,
+  AD_IMPRESSION,
+  AD_ERROR,
+  BID_IMPRESSION,
+  BID_ERROR,
+  AUCTION_AD_LOAD_ABORT,
+  AUCTION_AD_LOAD_QUEUED
 } from '../../libraries/video/constants/events.js'
 import { PLACEMENT } from '../../libraries/video/constants/ortb.js';
+import { videoKey } from '../../libraries/video/constants/constants.js'
 import { videoCoreFactory } from './coreVideo.js';
 import { gamSubmoduleFactory } from './gamAdServerSubmodule.js';
 import { videoImpressionVerifierFactory } from './videoImpressionVerifier.js';
-
-const videoKey = 'video';
+import { AdQueueCoordinator } from './adQueue.js';
+import { getExternalVideoEventName } from '../../libraries/video/shared/helpers.js'
 
 const allVideoEvents = Object.keys(videoEvents).map(eventKey => videoEvents[eventKey]);
-events.addEvents(allVideoEvents.concat([AUCTION_AD_LOAD_ATTEMPT, AUCTION_AD_LOAD_ABORT, BID_IMPRESSION, BID_ERROR]).map(getExternalVideoEventName));
+events.addEvents(allVideoEvents.concat([AUCTION_AD_LOAD_ATTEMPT, AUCTION_AD_LOAD_QUEUED, AUCTION_AD_LOAD_ABORT, BID_IMPRESSION, BID_ERROR]).map(getExternalVideoEventName));
 
 /**
  * This module adds User Video support to prebid.js
  * @module modules/videoModule
  */
-export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvents_, gamAdServerFactory_, videoImpressionVerifierFactory_) {
+export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvents_, gamAdServerFactory_, videoImpressionVerifierFactory_, adQueueCoordinator_) {
   const videoCore = videoCore_;
   const getConfig = getConfig_;
   const pbGlobal = pbGlobal_;
@@ -29,6 +37,7 @@ export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvent
   const pbEvents = pbEvents_;
   const videoEvents = videoEvents_;
   const gamAdServerFactory = gamAdServerFactory_;
+  const adQueueCoordinator = adQueueCoordinator_;
   let gamSubmodule;
   let mainContentDivId;
   let contentEnrichmentEnabled = true;
@@ -40,10 +49,13 @@ export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvent
     videoImpressionVerifier = videoImpressionVerifierFactory(!!cache);
     getConfig(videoKey, ({ video }) => {
       video.providers.forEach(provider => {
+        const divId = provider.divId;
         videoCore.registerProvider(provider);
+        adQueueCoordinator.registerProvider(divId);
+        videoCore.initProvider(divId);
         videoCore.onEvents(videoEvents, (type, payload) => {
           pbEvents.emit(getExternalVideoEventName(type), payload);
-        }, provider.divId);
+        }, divId);
 
         const adServerConfig = provider.adServer;
         if (!gamSubmodule && adServerConfig) {
@@ -199,9 +211,7 @@ export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvent
 
   // options: adXml, winner, adUnitCode,
   function loadAdTag(adTagUrl, divId, options) {
-    const payload = Object.assign({ adTagUrl }, options);
-    pbEvents.emit(getExternalVideoEventName(AUCTION_AD_LOAD_ATTEMPT), payload);
-    videoCore.setAdTagUrl(adTagUrl, divId, options);
+    adQueueCoordinator.queueAd(adTagUrl, divId, options);
   }
 
   function triggerVideoBidEvent(eventName, adEventPayload) {
@@ -230,15 +240,12 @@ export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvent
 
 export function pbVideoFactory() {
   const videoCore = videoCoreFactory();
+  const adQueueCoordinator = AdQueueCoordinator(videoCore, events);
   const pbGlobal = getGlobal();
-  const pbVideo = PbVideo(videoCore, config.getConfig, pbGlobal, events, allVideoEvents, gamSubmoduleFactory, videoImpressionVerifierFactory);
+  const pbVideo = PbVideo(videoCore, config.getConfig, pbGlobal, events, allVideoEvents, gamSubmoduleFactory, videoImpressionVerifierFactory, adQueueCoordinator);
   pbVideo.init();
   pbGlobal.videoModule = pbVideo;
   return pbVideo;
 }
 
-function getExternalVideoEventName(eventName) {
-  return videoKey + eventName.replace(/^./, eventName[0].toUpperCase());
-}
-
 pbVideoFactory();
diff --git a/modules/videojsVideoProvider.js b/modules/videojsVideoProvider.js
index a142e0fbb84..cc17758bd72 100644
--- a/modules/videojsVideoProvider.js
+++ b/modules/videojsVideoProvider.js
@@ -11,7 +11,7 @@ import {
 import { VIDEO_JS_VENDOR } from '../libraries/video/constants/vendorCodes.js';
 import { submodule } from '../src/hook.js';
 import stateFactory from '../libraries/video/shared/state.js';
-import { PLAYBACK_MODE } from '../libraries/video/constants/enums.js';
+import { PLAYBACK_MODE } from '../libraries/video/constants/constants.js';
 import { getEventHandler } from '../libraries/video/shared/eventHandler.js';
 
 /*
diff --git a/test/spec/modules/videoModule/adQueue_spec.js b/test/spec/modules/videoModule/adQueue_spec.js
new file mode 100644
index 00000000000..4002e0b6dcc
--- /dev/null
+++ b/test/spec/modules/videoModule/adQueue_spec.js
@@ -0,0 +1,172 @@
+import { expect } from 'chai';
+import { AdQueueCoordinator } from '../../../../modules/videoModule/adQueue.js';
+import { AD_BREAK_END, SETUP_COMPLETE } from '../../../../libraries/video/constants/events.js'
+
+const testId = 'testId';
+describe('Ad Queue Coordinator', function () {
+  const mockVideoCoreFactory = function () {
+    return {
+      onEvents: sinon.spy(),
+      offEvents: sinon.spy(),
+      setAdTagUrl: sinon.spy(),
+    }
+  };
+
+  const mockEventsFactory = function () {
+    return {
+      emit: sinon.spy()
+    };
+  };
+
+  describe('Before Provider Setup Complete', function () {
+    it('should push ad to queue', function () {
+      const mockVideoCore = mockVideoCoreFactory();
+      const mockEvents = mockEventsFactory();
+      const coordinator = AdQueueCoordinator(mockVideoCore, mockEvents);
+      coordinator.registerProvider(testId);
+      coordinator.queueAd('testAdTag', testId, { param: {} });
+
+      expect(mockEvents.emit.calledOnce).to.be.true;
+      let emitArgs = mockEvents.emit.firstCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadQueued');
+      expect(mockVideoCore.setAdTagUrl.called).to.be.false;
+    });
+  });
+
+  describe('After Provider Setup Complete', function () {
+    it('should load from ad queue', function () {
+      const mockVideoCore = mockVideoCoreFactory();
+      const mockEvents = mockEventsFactory();
+      let setupComplete;
+      mockVideoCore.onEvents = function(events, callback, id) {
+        if (events[0] === SETUP_COMPLETE && id === testId) {
+          setupComplete = callback;
+        }
+      };
+      const coordinator = AdQueueCoordinator(mockVideoCore, mockEvents);
+      coordinator.registerProvider(testId);
+      coordinator.queueAd('testAdTag', testId, { param: {} });
+
+      expect(mockEvents.emit.calledOnce).to.be.true;
+      let emitArgs = mockEvents.emit.firstCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadQueued');
+
+      setupComplete('', { divId: testId });
+      expect(mockEvents.emit.calledTwice).to.be.true;
+      emitArgs = mockEvents.emit.secondCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadAttempt');
+      expect(mockVideoCore.setAdTagUrl.calledOnce).to.be.true;
+    });
+
+    it('should load ads without queueing', function () {
+      const mockVideoCore = mockVideoCoreFactory();
+      const mockEvents = mockEventsFactory();
+      let setupComplete;
+      mockVideoCore.onEvents = function(events, callback, id) {
+        if (events[0] === SETUP_COMPLETE && id === testId) {
+          setupComplete = callback;
+        }
+      };
+      const coordinator = AdQueueCoordinator(mockVideoCore, mockEvents);
+      coordinator.registerProvider(testId);
+
+      setupComplete('', { divId: testId });
+
+      coordinator.queueAd('testAdTag', testId, { param: {} });
+      expect(mockEvents.emit.calledOnce).to.be.true;
+      let emitArgs = mockEvents.emit.firstCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadAttempt');
+      expect(mockVideoCore.setAdTagUrl.calledOnce).to.be.true;
+    });
+  });
+
+  describe('On Ad Break End', function () {
+    it('should load from queue', function () {
+      const mockVideoCore = mockVideoCoreFactory();
+      const mockEvents = mockEventsFactory();
+      let setupComplete;
+      let adBreakEnd;
+
+      mockVideoCore.onEvents = function(events, callback, id) {
+        if (events[0] === SETUP_COMPLETE && id === testId) {
+          setupComplete = callback;
+        }
+
+        if (events[0] === AD_BREAK_END && id === testId) {
+          adBreakEnd = callback;
+        }
+      };
+
+      const coordinator = AdQueueCoordinator(mockVideoCore, mockEvents);
+      coordinator.registerProvider(testId);
+      coordinator.queueAd('testAdTag', testId);
+      coordinator.queueAd('testAdTag2', testId);
+      coordinator.queueAd('testAdTag3', testId);
+
+      mockEvents.emit.resetHistory();
+
+      setupComplete('', { divId: testId });
+
+      expect(mockEvents.emit.calledOnce).to.be.true;
+      let emitArgs = mockEvents.emit.firstCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadAttempt');
+      expect(mockVideoCore.setAdTagUrl.calledOnce).to.be.true;
+      let setAdTagArgs = mockVideoCore.setAdTagUrl.firstCall.args;
+      expect(setAdTagArgs[0]).to.be.equal('testAdTag');
+
+      adBreakEnd('', { divId: testId });
+
+      expect(mockEvents.emit.calledTwice).to.be.true;
+      emitArgs = mockEvents.emit.secondCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadAttempt');
+      expect(mockVideoCore.setAdTagUrl.calledTwice).to.be.true;
+      setAdTagArgs = mockVideoCore.setAdTagUrl.secondCall.args;
+      expect(setAdTagArgs[0]).to.be.equal('testAdTag2');
+
+      adBreakEnd('', { divId: testId });
+
+      expect(mockEvents.emit.calledThrice).to.be.true;
+      emitArgs = mockEvents.emit.thirdCall.args;
+      expect(emitArgs[0]).to.be.equal('videoAuctionAdLoadAttempt');
+      expect(mockVideoCore.setAdTagUrl.calledThrice).to.be.true;
+      setAdTagArgs = mockVideoCore.setAdTagUrl.thirdCall.args;
+      expect(setAdTagArgs[0]).to.be.equal('testAdTag3');
+
+      adBreakEnd('', { divId: testId });
+
+      expect(mockEvents.emit.calledThrice).to.be.true;
+      expect(mockVideoCore.setAdTagUrl.calledThrice).to.be.true;
+    });
+
+    it('should stop responding to AdBreakEnd when queue is empty', function () {
+      const mockVideoCore = mockVideoCoreFactory();
+      let setupComplete;
+      let adBreakEnd;
+
+      mockVideoCore.onEvents = function(events, callback, id) {
+        if (events[0] === SETUP_COMPLETE && id === testId) {
+          setupComplete = callback;
+        }
+
+        if (events[0] === AD_BREAK_END && id === testId) {
+          adBreakEnd = callback;
+        }
+      };
+
+      const coordinator = AdQueueCoordinator(mockVideoCore, mockEventsFactory());
+      coordinator.registerProvider(testId);
+      coordinator.queueAd('testAdTag', testId);
+      coordinator.queueAd('testAdTag2', testId);
+      coordinator.queueAd('testAdTag3', testId);
+
+      setupComplete('', { divId: testId });
+      adBreakEnd('', { divId: testId });
+      adBreakEnd('', { divId: testId });
+      expect(mockVideoCore.setAdTagUrl.calledThrice).to.be.true;
+      adBreakEnd('', { divId: testId });
+      expect(mockVideoCore.setAdTagUrl.calledThrice).to.be.true;
+      adBreakEnd('', { divId: testId });
+      expect(mockVideoCore.setAdTagUrl.calledThrice).to.be.true;
+    });
+  });
+});
diff --git a/test/spec/modules/videoModule/pbVideo_spec.js b/test/spec/modules/videoModule/pbVideo_spec.js
index cfd34ebd706..41780a007dd 100644
--- a/test/spec/modules/videoModule/pbVideo_spec.js
+++ b/test/spec/modules/videoModule/pbVideo_spec.js
@@ -14,12 +14,15 @@ let gamSubmoduleMock;
 let gamSubmoduleFactoryMock;
 let videoImpressionVerifierFactoryMock;
 let videoImpressionVerifierMock;
+let adQueueCoordinatorMock;
+let adQueueCoordinatorFactoryMock;
 
 function resetTestVars() {
   ortbVideoMock = {};
   ortbContentMock = {};
   videoCoreMock = {
     registerProvider: sinon.spy(),
+    initProvider: sinon.spy(),
     onEvents: sinon.spy(),
     getOrtbVideo: () => ortbVideoMock,
     getOrtbContent: () => ortbContentMock,
@@ -54,9 +57,16 @@ function resetTestVars() {
   };
 
   videoImpressionVerifierFactoryMock = () => videoImpressionVerifierMock;
+
+  adQueueCoordinatorMock = {
+    registerProvider: sinon.spy(),
+    queueAd: sinon.spy()
+  };
+
+  adQueueCoordinatorFactoryMock = () => adQueueCoordinatorMock;
 }
 
-let pbVideoFactory = (videoCore, getConfig, pbGlobal, pbEvents, videoEvents, gamSubmoduleFactory, videoImpressionVerifierFactory) => {
+let pbVideoFactory = (videoCore, getConfig, pbGlobal, pbEvents, videoEvents, gamSubmoduleFactory, videoImpressionVerifierFactory, adQueueCoordinator) => {
   const pbVideo = PbVideo(
     videoCore || videoCoreMock,
     getConfig || getConfigMock,
@@ -64,7 +74,8 @@ let pbVideoFactory = (videoCore, getConfig, pbGlobal, pbEvents, videoEvents, gam
     pbEvents || pbEventsMock,
     videoEvents || videoEventsMock,
     gamSubmoduleFactory || gamSubmoduleFactoryMock,
-    videoImpressionVerifierFactory || videoImpressionVerifierFactoryMock
+    videoImpressionVerifierFactory || videoImpressionVerifierFactoryMock,
+    adQueueCoordinator || adQueueCoordinatorMock
   );
   pbVideo.init();
   return pbVideo;
@@ -207,6 +218,7 @@ describe('Prebid Video', function () {
     beforeEach(() => {
       gamSubmoduleMock.getAdTagUrl.resetHistory();
       videoCoreMock.setAdTagUrl.resetHistory();
+      adQueueCoordinatorMock.queueAd.resetHistory();
     });
 
     let beforeBidRequestCallback;
@@ -250,10 +262,10 @@ describe('Prebid Video', function () {
       pbVideoFactory(null, getConfig, pbGlobal, pbEvents, null, gamSubmoduleFactory);
       beforeBidRequestCallback(() => {}, {});
       auctionEndCallback(auctionResults);
-      expect(videoCoreMock.setAdTagUrl.calledOnce).to.be.true;
-      expect(videoCoreMock.setAdTagUrl.args[0][0]).to.be.equal(expectedAdTag);
-      expect(videoCoreMock.setAdTagUrl.args[0][1]).to.be.equal(expectedDivId);
-      expect(videoCoreMock.setAdTagUrl.args[0][2]).to.have.property('adUnitCode', expectedAdUnitCode);
+      expect(adQueueCoordinatorMock.queueAd.calledOnce).to.be.true;
+      expect(adQueueCoordinatorMock.queueAd.args[0][0]).to.be.equal(expectedAdTag);
+      expect(adQueueCoordinatorMock.queueAd.args[0][1]).to.be.equal(expectedDivId);
+      expect(adQueueCoordinatorMock.queueAd.args[0][2]).to.have.property('adUnitCode', expectedAdUnitCode);
     });
 
     it('should load ad tag from highest bid when ad server is not configured', function () {
@@ -275,11 +287,11 @@ describe('Prebid Video', function () {
       pbVideoFactory(null, () => ({ providers: [] }), pbGlobal, pbEvents);
       beforeBidRequestCallback(() => {}, {});
       auctionEndCallback(auctionResults);
-      expect(videoCoreMock.setAdTagUrl.calledOnce).to.be.true;
-      expect(videoCoreMock.setAdTagUrl.args[0][0]).to.be.equal(expectedVastUrl);
-      expect(videoCoreMock.setAdTagUrl.args[0][1]).to.be.equal(expectedDivId);
-      expect(videoCoreMock.setAdTagUrl.args[0][2]).to.have.property('adUnitCode', expectedAdUnitCode);
-      expect(videoCoreMock.setAdTagUrl.args[0][2]).to.have.property('adXml', expectedVastXml);
+      expect(adQueueCoordinatorMock.queueAd.calledOnce).to.be.true;
+      expect(adQueueCoordinatorMock.queueAd.args[0][0]).to.be.equal(expectedVastUrl);
+      expect(adQueueCoordinatorMock.queueAd.args[0][1]).to.be.equal(expectedDivId);
+      expect(adQueueCoordinatorMock.queueAd.args[0][2]).to.have.property('adUnitCode', expectedAdUnitCode);
+      expect(adQueueCoordinatorMock.queueAd.args[0][2]).to.have.property('adXml', expectedVastXml);
     });
   });
 
diff --git a/test/spec/modules/videoModule/shared/parentModule_spec.js b/test/spec/modules/videoModule/shared/parentModule_spec.js
index 1e8e7fda380..e3e4cfb7f3f 100644
--- a/test/spec/modules/videoModule/shared/parentModule_spec.js
+++ b/test/spec/modules/videoModule/shared/parentModule_spec.js
@@ -62,7 +62,6 @@ describe('Submodule Builder', function () {
 
   it('should instantiate the submodule, when supported', function () {
     const submodule = submoduleBuilder.build(vendorCode2);
-    expect(initSpy.calledOnce).to.be.true;
     expect(submodule).to.be.equal(submodule2);
   });
 
diff --git a/test/spec/modules/videoModule/submodules/jwplayerVideoProvider_spec.js b/test/spec/modules/videoModule/submodules/jwplayerVideoProvider_spec.js
index 399c115b820..4377e989851 100644
--- a/test/spec/modules/videoModule/submodules/jwplayerVideoProvider_spec.js
+++ b/test/spec/modules/videoModule/submodules/jwplayerVideoProvider_spec.js
@@ -14,7 +14,7 @@ import {
   SETUP_COMPLETE, SETUP_FAILED, PLAY, AD_IMPRESSION, videoEvents
 } from 'libraries/video/constants/events.js';
 
-import { PLAYBACK_MODE } from 'libraries/video/constants/enums.js';
+import { PLAYBACK_MODE } from 'libraries/video/constants/constants.js';
 
 function getPlayerMock() {
   return makePlayerFactoryMock({

From 182f08e314cb1d7ab9a5fc6cf86ed0179684474b Mon Sep 17 00:00:00 2001
From: Mikael Lundin <mikael-lundin@users.noreply.github.com>
Date: Tue, 13 Dec 2022 16:06:14 +0100
Subject: [PATCH 519/569] Adnuntius Bid Adapter: native added (#9330)

* package lock fix.

* Add dimensions to prebid.

* Adnuntius Bid Adapter. Added native as a media type.
---
 modules/adnuntiusBidAdapter.js                |  41 +++++-
 test/spec/modules/adnuntiusBidAdapter_spec.js | 122 ++++++++++++++++++
 2 files changed, 160 insertions(+), 3 deletions(-)

diff --git a/modules/adnuntiusBidAdapter.js b/modules/adnuntiusBidAdapter.js
index 0ae8411c073..5ad5436e732 100644
--- a/modules/adnuntiusBidAdapter.js
+++ b/modules/adnuntiusBidAdapter.js
@@ -1,5 +1,5 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { BANNER, VIDEO, NATIVE } from '../src/mediaTypes.js';
 import { isStr, deepAccess, logInfo } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { getStorageManager } from '../src/storageManager.js';
@@ -8,6 +8,7 @@ const BIDDER_CODE = 'adnuntius';
 const ENDPOINT_URL = 'https://ads.adnuntius.delivery/i';
 const GVLID = 855;
 const DEFAULT_VAST_VERSION = 'vast4'
+const DEFAULT_NATIVE = 'native'
 
 const checkSegment = function (segment) {
   if (isStr(segment)) return segment;
@@ -27,6 +28,32 @@ const getSegmentsFromOrtb = function (ortb2) {
   return segments
 }
 
+function createNative(ad) {
+  const native = {};
+  const assets = ad.assets
+  native.title = ad.text.title.content;
+  native.image = {
+    url: assets.image.cdnId,
+    height: assets.image.height,
+    width: assets.image.width,
+  };
+  if (assets.icon) {
+    native.icon = {
+      url: assets.icon.cdnId,
+      height: assets.icon.height,
+      width: assets.icon.width,
+    };
+  }
+
+  native.sponsoredBy = ad.text.sponsoredBy?.content || '';
+  native.body = ad.text.body?.content || '';
+  native.cta = ad.text.cta?.content || '';
+  native.clickUrl = ad.destinationUrls.destination || '';
+  native.impressionTrackers = ad.impressionTrackingUrls || [ad.renderedPixel];
+
+  return native;
+}
+
 const handleMeta = function () {
   const storage = getStorageManager({ gvlid: GVLID, bidderCode: BIDDER_CODE })
   let adnMeta = null
@@ -46,7 +73,7 @@ const getUsi = function (meta, ortb2, bidderRequest) {
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
-  supportedMediaTypes: [BANNER, VIDEO],
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
   isBidRequestValid: function (bid) {
     return !!(bid.bidId || (bid.params.member && bid.params.invCode));
   },
@@ -82,6 +109,10 @@ export const spec = {
         network += '_video'
       }
 
+      if (bid.mediaTypes && bid.mediaTypes.native) {
+        network += '_native'
+      }
+
       bidRequests[network] = bidRequests[network] || [];
       bidRequests[network].push(bid);
 
@@ -99,6 +130,7 @@ export const spec = {
       const network = networkKeys[j];
       const networkRequest = [...request]
       if (network.indexOf('_video') > -1) { networkRequest.push('tt=' + DEFAULT_VAST_VERSION) }
+      if (network.indexOf('_native') > -1) { networkRequest.push('tt=' + DEFAULT_NATIVE) }
       requests.push({
         method: 'POST',
         url: ENDPOINT_URL + '?' + networkRequest.join('&'),
@@ -137,7 +169,10 @@ export const spec = {
 
         if (adUnit.vastXml) {
           adResponse[adUnit.targetId].vastXml = adUnit.vastXml
-          adResponse[adUnit.targetId].mediaType = 'video'
+          adResponse[adUnit.targetId].mediaType = VIDEO
+        } else if (ad.assets && ad.assets.image && ad.text && ad.text.title && ad.text.body && ad.destinationUrls && ad.destinationUrls.destination) {
+          adResponse[adUnit.targetId].native = createNative(ad);
+          adResponse[adUnit.targetId].mediaType = NATIVE;
         } else {
           adResponse[adUnit.targetId].ad = adUnit.html
         }
diff --git a/test/spec/modules/adnuntiusBidAdapter_spec.js b/test/spec/modules/adnuntiusBidAdapter_spec.js
index 2d5ea630f0f..ee585862800 100644
--- a/test/spec/modules/adnuntiusBidAdapter_spec.js
+++ b/test/spec/modules/adnuntiusBidAdapter_spec.js
@@ -71,6 +71,30 @@ describe('adnuntiusBidAdapter', function () {
     }
   ]
 
+  const nativeBidderRequest = [
+    {
+      bidId: '123',
+      bidder: 'adnuntius',
+      params: {
+        auId: '8b6bc',
+        network: 'adnuntius',
+      },
+      mediaTypes: {
+        native: {
+          title: {
+            required: true
+          },
+          image: {
+            required: true
+          },
+          body: {
+            required: true
+          }
+        }
+      },
+    }
+  ]
+
   const singleBidRequest = {
     bid: [
       {
@@ -83,6 +107,10 @@ describe('adnuntiusBidAdapter', function () {
     bid: videoBidderRequest
   }
 
+  const nativeBidRequest = {
+    bid: nativeBidderRequest
+  }
+
   const serverResponse = {
     body: {
       'adUnits': [
@@ -209,6 +237,83 @@ describe('adnuntiusBidAdapter', function () {
       ]
     }
   }
+  const serverNativeResponse = {
+    body: {
+      'adUnits': [
+        {
+          'auId': '000000000008b6bc',
+          'targetId': '123',
+          'html': '<h1>hi!</h1>',
+          'matchedAdCount': 1,
+          'responseId': 'adn-rsp-1460129238',
+          'ads': [
+            {
+              'destinationUrlEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fc%2F52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN%3Fct%3D2501%26r%3Dhttp%253A%252F%252Fgoogle.com',
+              'assets': {
+                'image': {
+                  'cdnId': 'https://assets.adnuntius.com/K9rfXC6wJvgVuy4Fbt5P8oEEGXme9ZaP8BNDzz3OMGQ.jpg',
+                  'width': '300',
+                  'height': '250'
+                }
+              },
+              'text': {
+                'body': {
+                  'content': 'Testing Native ad from Adnuntius',
+                  'length': '32',
+                  'minLength': '0',
+                  'maxLength': '100'
+                },
+                'title': {
+                  'content': 'Native Ad',
+                  'length': '9',
+                  'minLength': '5',
+                  'maxLength': '100'
+                }
+              },
+              'clickUrl': 'https://delivery.adnuntius.com/c/52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'urls': {
+                'destination': 'https://delivery.adnuntius.com/c/52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN?ct=2501&r=http%3A%2F%2Fgoogle.com'
+              },
+              'urlsEsc': {
+                'destination': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fc%2F52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN%3Fct%3D2501%26r%3Dhttp%253A%252F%252Fgoogle.com'
+              },
+              'destinationUrls': {
+                'destination': 'http://google.com'
+              },
+              'cpm': { 'amount': 5.0, 'currency': 'NOK' },
+              'bid': { 'amount': 0.005, 'currency': 'NOK' },
+              'cost': { 'amount': 0.005, 'currency': 'NOK' },
+              'impressionTrackingUrls': [],
+              'impressionTrackingUrlsEsc': [],
+              'adId': 'adn-id-1347343135',
+              'selectedColumn': '0',
+              'selectedColumnPosition': '0',
+              'renderedPixel': 'https://delivery.adnuntius.com/b/52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN.html',
+              'renderedPixelEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fb%2F52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN.html',
+              'visibleUrl': 'https://delivery.adnuntius.com/s?rt=52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'visibleUrlEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fs%3Frt%3D52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'viewUrl': 'https://delivery.adnuntius.com/v?rt=52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'viewUrlEsc': 'https%3A%2F%2Fdelivery.adnuntius.com%2Fv%3Frt%3D52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'rt': '52AHNuxCqxB_Y9ZP9ERWkMBPCOha4zuV3aKn5cog5jsAAAAQCtjQz9kbGWD4nuZy3q6HaHGLB4-k_fySWECIOOmHKY6iokgHNFH-U57ew_-1QHlKnFr2NT8y4QK1oU5HxnDLbYPz-GmQ3C2JyxLGpKmIb-P-3bm7HYPEreNjPdhjRG51A8NGuc4huUhns7nEUejHuOjOHE5sV1zfYxCRWRx9wPDN9EUCC7KN',
+              'creativeWidth': '980',
+              'creativeHeight': '120',
+              'creativeId': 'wgkq587vgtpchsx1',
+              'lineItemId': 'scyjdyv3mzgdsnpf',
+              'layoutId': 'sw6gtws2rdj1kwby',
+              'layoutName': 'Responsive image'
+            },
+
+          ]
+        },
+        {
+          'auId': '000000000008b6bc',
+          'targetId': '456',
+          'matchedAdCount': 0,
+          'responseId': 'adn-rsp-1460129238',
+        }
+      ]
+    }
+  }
 
   describe('inherited functions', function () {
     it('exists and is a function', function () {
@@ -426,4 +531,21 @@ describe('adnuntiusBidAdapter', function () {
       expect(interpretedResponse[0].vastXml).to.equal(serverVideoResponse.body.adUnits[0].vastXml);
     });
   });
+  describe('interpretNativeResponse', function () {
+    it('should return valid response when passed valid server response', function () {
+      const interpretedResponse = spec.interpretResponse(serverNativeResponse, nativeBidRequest);
+      const ad = serverNativeResponse.body.adUnits[0].ads[0]
+      expect(interpretedResponse).to.have.lengthOf(1);
+      expect(interpretedResponse[0].cpm).to.equal(ad.cpm.amount);
+      expect(interpretedResponse[0].width).to.equal(Number(ad.creativeWidth));
+      expect(interpretedResponse[0].height).to.equal(Number(ad.creativeHeight));
+      expect(interpretedResponse[0].creativeId).to.equal(ad.creativeId);
+      expect(interpretedResponse[0].currency).to.equal(ad.bid.currency);
+      expect(interpretedResponse[0].netRevenue).to.equal(false);
+      expect(interpretedResponse[0].meta).to.have.property('advertiserDomains');
+      expect(interpretedResponse[0].meta.advertiserDomains).to.have.lengthOf(1);
+      expect(interpretedResponse[0].meta.advertiserDomains[0]).to.equal('google.com');
+      expect(interpretedResponse[0].native.body).to.equal(serverNativeResponse.body.adUnits[0].ads[0].text.body.content);
+    });
+  });
 });

From d646c55ced9f8ee6f596df1cd717e72b1c0ebcd7 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 13 Dec 2022 12:53:41 -0700
Subject: [PATCH 520/569] Prebid core: enrich FPD by default (#9205)

* Move rootDomain

* Move FPD enrichments to core

* Remove fpdEnrichments module

* Cleanup

* Add `site`, `device`, and coppa enrichments

* FPD enrichments: GDPR

* FPD enrichments: USP

* Enrich FPD from requestBids

* Fix typo in package.json
---
 libraries/ortbConverter/processors/default.js |  38 +--
 modules/.submodules.json                      |   1 -
 modules/consentManagement.js                  |  22 +-
 modules/consentManagementUsp.js               |  16 +-
 modules/enrichmentFpdModule.js                | 192 +-----------
 modules/userId/index.js                       |  56 +---
 src/fpd/enrichment.js                         |  94 ++++++
 src/fpd/rootDomain.js                         |  57 ++++
 src/prebid.js                                 |   8 +-
 test/helpers/fpd.js                           |  71 +++++
 test/spec/fpd/enrichment_spec.js              | 213 +++++++++++++
 test/spec/fpd/gdpr_spec.js                    |  47 +++
 test/spec/fpd/rootDomain_spec.js              |  61 ++++
 test/spec/fpd/usp_spec.js                     |  36 +++
 test/spec/modules/enrichmentFpdModule_spec.js | 159 ----------
 test/spec/modules/fpdModule_spec.js           | 288 +-----------------
 .../modules/improvedigitalBidAdapter_spec.js  |  28 +-
 test/spec/modules/openxOrtbBidAdapter_spec.js |  35 ++-
 .../modules/prebidServerBidAdapter_spec.js    |  76 +++--
 test/spec/modules/userId_spec.js              |  41 ---
 .../ortbConverter/default_processors_spec.js  |  61 ----
 test/spec/ortbConverter/gdpr_spec.js          |  31 +-
 test/spec/ortbConverter/usp_spec.js           |  15 -
 test/spec/unit/pbjs_api_spec.js               |  70 +++--
 24 files changed, 751 insertions(+), 965 deletions(-)
 create mode 100644 src/fpd/enrichment.js
 create mode 100644 src/fpd/rootDomain.js
 create mode 100644 test/helpers/fpd.js
 create mode 100644 test/spec/fpd/enrichment_spec.js
 create mode 100644 test/spec/fpd/gdpr_spec.js
 create mode 100644 test/spec/fpd/rootDomain_spec.js
 create mode 100644 test/spec/fpd/usp_spec.js
 delete mode 100644 test/spec/ortbConverter/default_processors_spec.js
 delete mode 100644 test/spec/ortbConverter/usp_spec.js

diff --git a/libraries/ortbConverter/processors/default.js b/libraries/ortbConverter/processors/default.js
index 70acb7c9953..8d44de00fa2 100644
--- a/libraries/ortbConverter/processors/default.js
+++ b/libraries/ortbConverter/processors/default.js
@@ -1,4 +1,4 @@
-import {deepSetValue, getDefinedParams, getDNT, mergeDeep} from '../../../src/utils.js';
+import {deepSetValue, mergeDeep} from '../../../src/utils.js';
 import {bannerResponseProcessor, fillBannerImp} from './banner.js';
 import {fillVideoImp, fillVideoResponse} from './video.js';
 import {setResponseMediaType} from './mediaType.js';
@@ -20,14 +20,6 @@ export const DEFAULT_PROCESSORS = {
     appFpd: fpdFromTopLevelConfig('app'),
     siteFpd: fpdFromTopLevelConfig('site'),
     deviceFpd: fpdFromTopLevelConfig('device'),
-    device: {
-      // sets device w / h / ua / language
-      fn: setDevice
-    },
-    site: {
-      // sets site.domain, page, and ref from refererInfo
-      fn: setSite
-    },
     props: {
       // sets request properties id, tmax, test, source.tid
       fn(ortbRequest, bidderRequest) {
@@ -41,15 +33,7 @@ export const DEFAULT_PROCESSORS = {
         }
         deepSetValue(ortbRequest, 'source.tid', ortbRequest.source?.tid || bidderRequest.auctionId);
       }
-    },
-    coppa: {
-      fn(ortbRequest) {
-        const coppa = config.getConfig('coppa');
-        if (typeof coppa === 'boolean') {
-          deepSetValue(ortbRequest, 'regs.coppa', coppa ? 1 : 0);
-        }
-      }
-    },
+    }
   },
   [IMP]: {
     fpd: {
@@ -144,24 +128,8 @@ function fpdFromTopLevelConfig(prop) {
     fn(ortbRequest) {
       const data = config.getConfig(prop);
       if (typeof data === 'object') {
-        ortbRequest[prop] = data;
+        ortbRequest[prop] = mergeDeep({}, ortbRequest[prop], data);
       }
     }
   }
 }
-
-export function setDevice(ortbRequest) {
-  ortbRequest.device = Object.assign({
-    w: window.innerWidth,
-    h: window.innerHeight,
-    dnt: getDNT() ? 1 : 0,
-    ua: window.navigator.userAgent,
-    language: window.navigator.language.split('-').shift()
-  }, ortbRequest.device);
-}
-
-export function setSite(ortbRequest, bidderRequest) {
-  if (bidderRequest.refererInfo) {
-    ortbRequest.site = Object.assign(getDefinedParams(bidderRequest.refererInfo, ['page', 'domain', 'ref']), ortbRequest.site);
-  }
-}
diff --git a/modules/.submodules.json b/modules/.submodules.json
index f8c30459e1e..c3016914f1b 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -76,7 +76,6 @@
       "zeusPrimeRtdProvider"
     ],
     "fpdModule": [
-      "enrichmentFpdModule",
       "validationFpdModule",
       "topicsFpdModule"
     ],
diff --git a/modules/consentManagement.js b/modules/consentManagement.js
index 95d622e55e4..6ca12010c74 100644
--- a/modules/consentManagement.js
+++ b/modules/consentManagement.js
@@ -10,6 +10,7 @@ import {gdprDataHandler} from '../src/adapterManager.js';
 import {includes} from '../src/polyfill.js';
 import {timedAuctionHook} from '../src/utils/perfMetrics.js';
 import {registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
+import {enrichFPD} from '../src/fpd/enrichment.js';
 
 const DEFAULT_CMP = 'iab';
 const DEFAULT_CONSENT_TIMEOUT = 10000;
@@ -356,22 +357,27 @@ export function setConsentConfig(config) {
 }
 config.getConfig('consentManagement', config => setConsentConfig(config.consentManagement));
 
-export function setOrtbGdpr(ortbRequest, bidderRequest) {
-  const consent = bidderRequest.gdprConsent;
-  if (consent) {
-    if (typeof consent.gdprApplies === 'boolean') {
-      deepSetValue(ortbRequest, 'regs.ext.gdpr', consent.gdprApplies ? 1 : 0);
+export function enrichFPDHook(next, fpd) {
+  return next(fpd.then(ortb2 => {
+    const consent = gdprDataHandler.getConsentData();
+    if (consent) {
+      if (typeof consent.gdprApplies === 'boolean') {
+        deepSetValue(ortb2, 'regs.ext.gdpr', consent.gdprApplies ? 1 : 0);
+      }
+      deepSetValue(ortb2, 'user.ext.consent', consent.consentString);
     }
-    deepSetValue(ortbRequest, 'user.ext.consent', consent.consentString);
-  }
+    return ortb2;
+  }));
 }
 
+enrichFPD.before(enrichFPDHook);
+
 export function setOrtbAdditionalConsent(ortbRequest, bidderRequest) {
+  // this is not a standardized name for addtlConsent, so keep this as an ORTB library processor rather than an FPD enrichment
   const addtl = bidderRequest.gdprConsent?.addtlConsent;
   if (addtl && typeof addtl === 'string') {
     deepSetValue(ortbRequest, 'user.ext.ConsentedProvidersSettings.consented_providers', addtl);
   }
 }
 
-registerOrtbProcessor({type: REQUEST, name: 'gdpr', fn: setOrtbGdpr});
 registerOrtbProcessor({type: REQUEST, name: 'gdprAddtlConsent', fn: setOrtbAdditionalConsent})
diff --git a/modules/consentManagementUsp.js b/modules/consentManagementUsp.js
index 805c796312c..0a99ec4a913 100644
--- a/modules/consentManagementUsp.js
+++ b/modules/consentManagementUsp.js
@@ -7,9 +7,9 @@
 import {deepSetValue, isFn, isNumber, isPlainObject, isStr, logError, logInfo, logWarn} from '../src/utils.js';
 import {config} from '../src/config.js';
 import adapterManager, {uspDataHandler} from '../src/adapterManager.js';
-import {registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js';
 import {timedAuctionHook} from '../src/utils/perfMetrics.js';
 import {getHook} from '../src/hook.js';
+import {enrichFPD} from '../src/fpd/enrichment.js';
 
 const DEFAULT_CONSENT_API = 'iab';
 const DEFAULT_CONSENT_TIMEOUT = 50;
@@ -323,10 +323,14 @@ config.getConfig('consentManagement', config => setConsentConfig(config.consentM
 
 getHook('requestBids').before(requestBidsHook, 50);
 
-export function setOrtbUsp(ortbRequest, bidderRequest) {
-  if (bidderRequest.uspConsent) {
-    deepSetValue(ortbRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
-  }
+export function enrichFPDHook(next, fpd) {
+  return next(fpd.then(ortb2 => {
+    const consent = uspDataHandler.getConsentData();
+    if (consent) {
+      deepSetValue(ortb2, 'regs.ext.us_privacy', consent)
+    }
+    return ortb2;
+  }))
 }
 
-registerOrtbProcessor({type: REQUEST, name: 'usp', fn: setOrtbUsp});
+enrichFPD.before(enrichFPDHook);
diff --git a/modules/enrichmentFpdModule.js b/modules/enrichmentFpdModule.js
index a4d7c06d0fb..59d5d326109 100644
--- a/modules/enrichmentFpdModule.js
+++ b/modules/enrichmentFpdModule.js
@@ -1,190 +1,2 @@
-
-/**
- * This module sets default values and validates ortb2 first part data
- * @module modules/firstPartyData
- */
-import { timestamp, mergeDeep } from '../src/utils.js';
-import { submodule } from '../src/hook.js';
-import {getRefererInfo, parseDomain} from '../src/refererDetection.js';
-import { getCoreStorageManager } from '../src/storageManager.js';
-import {GreedyPromise} from '../src/utils/promise.js';
-import {getHighEntropySUA, getLowEntropySUA} from '../libraries/fpd/sua.js';
-
-let ortb2;
-let win = (window === window.top) ? window : window.top;
-export const coreStorage = getCoreStorageManager('enrichmentFpd');
-
-export const sua = {he: getHighEntropySUA, le: getLowEntropySUA};
-
-/**
-  * Find the root domain
-  * @param {string|undefined} fullDomain
-  * @return {string}
-*/
-export function findRootDomain(fullDomain = window.location.hostname) {
-  if (!coreStorage.cookiesAreEnabled()) {
-    return fullDomain;
-  }
-
-  const domainParts = fullDomain.split('.');
-  if (domainParts.length == 2) {
-    return fullDomain;
-  }
-  let rootDomain;
-  let continueSearching;
-  let startIndex = -2;
-  const TEST_COOKIE_NAME = `_rdc${Date.now()}`;
-  const TEST_COOKIE_VALUE = 'writeable';
-  do {
-    rootDomain = domainParts.slice(startIndex).join('.');
-    let expirationDate = new Date(timestamp() + 10 * 1000).toUTCString();
-
-    // Write a test cookie
-    coreStorage.setCookie(
-      TEST_COOKIE_NAME,
-      TEST_COOKIE_VALUE,
-      expirationDate,
-      'Lax',
-      rootDomain,
-      undefined
-    );
-
-    // See if the write was successful
-    const value = coreStorage.getCookie(TEST_COOKIE_NAME, undefined);
-    if (value === TEST_COOKIE_VALUE) {
-      continueSearching = false;
-      // Delete our test cookie
-      coreStorage.setCookie(
-        TEST_COOKIE_NAME,
-        '',
-        'Thu, 01 Jan 1970 00:00:01 GMT',
-        undefined,
-        rootDomain,
-        undefined
-      );
-    } else {
-      startIndex += -1;
-      continueSearching = Math.abs(startIndex) <= domainParts.length;
-    }
-  } while (continueSearching);
-  return rootDomain;
-}
-
-/**
- * Checks for referer and if exists merges into ortb2 global data
- */
-function setReferer() {
-  if (getRefererInfo().ref) mergeDeep(ortb2, { site: { ref: getRefererInfo().ref } });
-}
-
-/**
- * Checks for canonical url and if exists merges into ortb2 global data
- */
-function setPage() {
-  if (getRefererInfo().page) mergeDeep(ortb2, { site: { page: getRefererInfo().page } });
-}
-
-/**
- * Checks for canonical url and if exists retrieves domain and merges into ortb2 global data
- */
-function setDomain() {
-  const domain = parseDomain(getRefererInfo().page, {noLeadingWww: true});
-  if (domain) {
-    mergeDeep(ortb2, { site: { domain: domain } });
-    mergeDeep(ortb2, { site: { publisher: { domain: findRootDomain(domain) } } });
-  };
-}
-
-/**
- * Checks for screen/device width and height and sets dimensions
- */
-function setDimensions() {
-  let width;
-  let height;
-
-  try {
-    width = win.innerWidth || win.document.documentElement.clientWidth || win.document.body.clientWidth;
-    height = win.innerHeight || win.document.documentElement.clientHeight || win.document.body.clientHeight;
-  } catch (e) {
-    width = window.innerWidth || window.document.documentElement.clientWidth || window.document.body.clientWidth;
-    height = window.innerHeight || window.document.documentElement.clientHeight || window.document.body.clientHeight;
-  }
-
-  mergeDeep(ortb2, { device: { w: width, h: height } });
-}
-
-/**
- * Scans page for meta keywords, and if exists, merges into site.keywords
- */
-function setKeywords() {
-  let keywords;
-
-  try {
-    keywords = win.document.querySelector("meta[name='keywords']");
-  } catch (e) {
-    keywords = window.document.querySelector("meta[name='keywords']");
-  }
-
-  if (keywords && keywords.content) mergeDeep(ortb2, { site: { keywords: keywords.content.replace(/\s/g, '') } });
-}
-
-function setDeviceSua(hints) {
-  let data = Array.isArray(hints) && hints.length === 0
-    ? GreedyPromise.resolve(sua.le())
-    : sua.he(hints);
-  return data.then((sua) => {
-    if (sua != null) {
-      mergeDeep(ortb2, {device: {sua}});
-    }
-  })
-}
-
-/**
- * Checks the Global Privacy Control status, and if exists and is true, merges into regs.ext.gpc
- */
-function setGpc() {
-  const gpcValue = navigator.globalPrivacyControl;
-  if (gpcValue) {
-    mergeDeep(ortb2, { regs: { ext: { gpc: 1 } } })
-  }
-}
-
-/**
- * Resets modules global ortb2 data
- */
-export const resetEnrichments = () => { ortb2 = null };
-
-function runEnrichments(fpdConf) {
-  setReferer();
-  setPage();
-  setDomain();
-  setDimensions();
-  setKeywords();
-  setGpc();
-  return setDeviceSua(fpdConf.uaHints).then(() => ortb2);
-}
-
-export function processFpd(fpdConf, {global}) {
-  if (fpdConf.skipEnrichments) {
-    return {global};
-  } else {
-    let ready;
-    if (ortb2 == null) {
-      ortb2 = {};
-      ready = runEnrichments(fpdConf);
-    } else {
-      ready = GreedyPromise.resolve();
-    }
-    return ready.then(() => ({
-      global: mergeDeep({}, ortb2, global)
-    }))
-  }
-}
-/** @type {firstPartyDataSubmodule} */
-export const enrichmentsSubmodule = {
-  name: 'enrichments',
-  queue: 2,
-  processFpd
-}
-
-submodule('firstPartyData', enrichmentsSubmodule)
+// Logic from this module was moved into core since approx. 7.27
+// TODO: remove this in v8
diff --git a/modules/userId/index.js b/modules/userId/index.js
index fe47ac5c16d..82ebaf2b14e 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -148,7 +148,6 @@ import {
   logError,
   logInfo,
   logWarn,
-  timestamp,
   isEmpty, deepSetValue
 } from '../../src/utils.js';
 import {getPPID as coreGetPPID} from '../../src/adserver.js';
@@ -156,6 +155,7 @@ import {defer, GreedyPromise} from '../../src/utils/promise.js';
 import {hasPurpose1Consent} from '../../src/utils/gpdr.js';
 import {registerOrtbProcessor, REQUEST} from '../../src/pbjsORTB.js';
 import {newMetrics, timedAuctionHook, useMetrics} from '../../src/utils/perfMetrics.js';
+import {findRootDomain} from '../../src/fpd/rootDomain.js';
 
 const MODULE_NAME = 'User ID';
 const COOKIE = 'cookie';
@@ -385,60 +385,6 @@ function storedConsentDataMatchesConsentData(storedConsentData, consentData) {
   );
 }
 
-/**
-   * Find the root domain
-   * @param {string|undefined} fullDomain
-   * @return {string}
-   */
-export function findRootDomain(fullDomain = window.location.hostname) {
-  if (!coreStorage.cookiesAreEnabled()) {
-    return fullDomain;
-  }
-
-  const domainParts = fullDomain.split('.');
-  if (domainParts.length == 2) {
-    return fullDomain;
-  }
-  let rootDomain;
-  let continueSearching;
-  let startIndex = -2;
-  const TEST_COOKIE_NAME = `_rdc${Date.now()}`;
-  const TEST_COOKIE_VALUE = 'writeable';
-  do {
-    rootDomain = domainParts.slice(startIndex).join('.');
-    let expirationDate = new Date(timestamp() + 10 * 1000).toUTCString();
-
-    // Write a test cookie
-    coreStorage.setCookie(
-      TEST_COOKIE_NAME,
-      TEST_COOKIE_VALUE,
-      expirationDate,
-      'Lax',
-      rootDomain,
-      undefined
-    );
-
-    // See if the write was successful
-    const value = coreStorage.getCookie(TEST_COOKIE_NAME, undefined);
-    if (value === TEST_COOKIE_VALUE) {
-      continueSearching = false;
-      // Delete our test cookie
-      coreStorage.setCookie(
-        TEST_COOKIE_NAME,
-        '',
-        'Thu, 01 Jan 1970 00:00:01 GMT',
-        undefined,
-        rootDomain,
-        undefined
-      );
-    } else {
-      startIndex += -1;
-      continueSearching = Math.abs(startIndex) <= domainParts.length;
-    }
-  } while (continueSearching);
-  return rootDomain;
-}
-
 /**
  * @param {SubmoduleContainer[]} submodules
  * @param {function} cb - callback for after processing is done.
diff --git a/src/fpd/enrichment.js b/src/fpd/enrichment.js
new file mode 100644
index 00000000000..fc50a057378
--- /dev/null
+++ b/src/fpd/enrichment.js
@@ -0,0 +1,94 @@
+import {hook} from '../hook.js';
+import {getRefererInfo, parseDomain} from '../refererDetection.js';
+import {findRootDomain} from './rootDomain.js';
+import {deepSetValue, getDefinedParams, getDNT, getWindowSelf, getWindowTop, mergeDeep} from '../utils.js';
+import {config} from '../config.js';
+import {getHighEntropySUA, getLowEntropySUA} from '../../libraries/fpd/sua.js';
+import {GreedyPromise} from '../utils/promise.js';
+
+export const dep = {
+  getRefererInfo,
+  findRootDomain,
+  getWindowTop,
+  getWindowSelf,
+  getHighEntropySUA,
+  getLowEntropySUA,
+};
+
+/**
+ * Enrich an ortb2 object with first party data.
+ * @param {Promise[{}]} fpd: a promise to an ortb2 object.
+ * @returns: {Promise[{}]}: a promise to an enriched ortb2 object.
+ */
+export const enrichFPD = hook('sync', (fpd) => {
+  return GreedyPromise.all([fpd, getSUA().catch(() => null)])
+    .then(([ortb2, sua]) => {
+      Object.entries(ENRICHMENTS).forEach(([section, getEnrichments]) => {
+        const data = getEnrichments();
+        if (data && Object.keys(data).length > 0) {
+          ortb2[section] = mergeDeep({}, data, ortb2[section]);
+        }
+      });
+      if (sua) {
+        deepSetValue(ortb2, 'device.sua', Object.assign({}, sua, ortb2.device.sua));
+      }
+      return ortb2;
+    });
+});
+
+function winFallback(fn) {
+  try {
+    return fn(dep.getWindowTop());
+  } catch (e) {
+    return fn(dep.getWindowSelf());
+  }
+}
+
+function getSUA() {
+  const hints = config.getConfig('firstPartyData.uaHints');
+  return Array.isArray(hints) && hints.length === 0
+    ? GreedyPromise.resolve(dep.getLowEntropySUA())
+    : dep.getHighEntropySUA(hints);
+}
+
+const ENRICHMENTS = {
+  site() {
+    const ri = dep.getRefererInfo();
+    const domain = parseDomain(ri.page, {noLeadingWww: true});
+    const keywords = winFallback((win) => win.document.querySelector('meta[name=\'keywords\']'))
+      ?.content?.replace?.(/\s/g, '');
+    return (site => getDefinedParams(site, Object.keys(site)))({
+      page: ri.page,
+      ref: ri.ref,
+      domain,
+      keywords,
+      publisher: {
+        domain: dep.findRootDomain(domain)
+      }
+    });
+  },
+  device() {
+    return winFallback((win) => {
+      const w = win.innerWidth || win.document.documentElement.clientWidth || win.document.body.clientWidth;
+      const h = win.innerHeight || win.document.documentElement.clientHeight || win.document.body.clientHeight;
+      return {
+        w,
+        h,
+        dnt: getDNT() ? 1 : 0,
+        ua: win.navigator.userAgent,
+        language: win.navigator.language.split('-').shift(),
+      };
+    })
+  },
+  regs() {
+    const regs = {};
+    if (winFallback((win) => win.navigator.globalPrivacyControl)) {
+      deepSetValue(regs, 'ext.gpc', 1);
+    }
+    const coppa = config.getConfig('coppa');
+    if (typeof coppa === 'boolean') {
+      regs.coppa = coppa ? 1 : 0;
+    }
+    return regs;
+  }
+};
diff --git a/src/fpd/rootDomain.js b/src/fpd/rootDomain.js
new file mode 100644
index 00000000000..4095613672f
--- /dev/null
+++ b/src/fpd/rootDomain.js
@@ -0,0 +1,57 @@
+import {memoize, timestamp} from '../utils.js';
+import {getCoreStorageManager} from '../storageManager.js';
+
+export const coreStorage = getCoreStorageManager();
+
+/**
+ * Find the root domain by testing for the topmost domain that will allow setting cookies.
+ */
+
+export const findRootDomain = memoize(function findRootDomain(fullDomain = window.location.host) {
+  if (!coreStorage.cookiesAreEnabled()) {
+    return fullDomain;
+  }
+
+  const domainParts = fullDomain.split('.');
+  if (domainParts.length === 2) {
+    return fullDomain;
+  }
+  let rootDomain;
+  let continueSearching;
+  let startIndex = -2;
+  const TEST_COOKIE_NAME = `_rdc${Date.now()}`;
+  const TEST_COOKIE_VALUE = 'writeable';
+  do {
+    rootDomain = domainParts.slice(startIndex).join('.');
+    let expirationDate = new Date(timestamp() + 10 * 1000).toUTCString();
+
+    // Write a test cookie
+    coreStorage.setCookie(
+      TEST_COOKIE_NAME,
+      TEST_COOKIE_VALUE,
+      expirationDate,
+      'Lax',
+      rootDomain,
+      undefined
+    );
+
+    // See if the write was successful
+    const value = coreStorage.getCookie(TEST_COOKIE_NAME, undefined);
+    if (value === TEST_COOKIE_VALUE) {
+      continueSearching = false;
+      // Delete our test cookie
+      coreStorage.setCookie(
+        TEST_COOKIE_NAME,
+        '',
+        'Thu, 01 Jan 1970 00:00:01 GMT',
+        undefined,
+        rootDomain,
+        undefined
+      );
+    } else {
+      startIndex += -1;
+      continueSearching = Math.abs(startIndex) <= domainParts.length;
+    }
+  } while (continueSearching);
+  return rootDomain;
+});
diff --git a/src/prebid.js b/src/prebid.js
index 06429b13a72..f30b4ea9bbe 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -49,7 +49,8 @@ import {default as adapterManager, gdprDataHandler, getS2SBidderSet, uspDataHand
 import CONSTANTS from './constants.json';
 import * as events from './events.js';
 import {newMetrics, useMetrics} from './utils/perfMetrics.js';
-import {defer} from './utils/promise.js';
+import {defer, GreedyPromise} from './utils/promise.js';
+import {enrichFPD} from './fpd/enrichment.js';
 
 const $$PREBID_GLOBAL$$ = getGlobal();
 const { triggerUserSyncs } = userSync;
@@ -631,7 +632,10 @@ $$PREBID_GLOBAL$$.requestBids = (function() {
       global: mergeDeep({}, config.getAnyConfig('ortb2') || {}, ortb2 || {}),
       bidder: Object.fromEntries(Object.entries(config.getBidderConfig()).map(([bidder, cfg]) => [bidder, cfg.ortb2]).filter(([_, ortb2]) => ortb2 != null))
     }
-    return startAuction({bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ttlBuffer, ortb2Fragments, metrics, defer});
+    return enrichFPD(GreedyPromise.resolve(ortb2Fragments.global)).then(global => {
+      ortb2Fragments.global = global;
+      return startAuction({bidsBackHandler, timeout: cbTimeout, adUnits, adUnitCodes, labels, auctionId, ttlBuffer, ortb2Fragments, metrics, defer});
+    })
   }, 'requestBids');
 
   return wrapHook(delegate, function requestBids(req = {}) {
diff --git a/test/helpers/fpd.js b/test/helpers/fpd.js
new file mode 100644
index 00000000000..89755f26541
--- /dev/null
+++ b/test/helpers/fpd.js
@@ -0,0 +1,71 @@
+import {dep, enrichFPD} from 'src/fpd/enrichment.js';
+import {GreedyPromise} from '../../src/utils/promise.js';
+import {deepClone} from '../../src/utils.js';
+import {gdprDataHandler, uspDataHandler} from '../../src/adapterManager.js';
+
+export function mockFpdEnrichments(sandbox, overrides = {}) {
+  overrides = Object.assign({}, {
+    // override window getters, required for ChromeHeadless, apparently it sees window.self !== window
+    getWindowTop() {
+      return window
+    },
+    getWindowSelf() {
+      return window
+    },
+    getHighEntropySUA() {
+      return GreedyPromise.resolve()
+    }
+  }, overrides)
+  Object.entries(overrides)
+    .filter(([k]) => dep[k])
+    .forEach(([k, v]) => {
+      sandbox.stub(dep, k).callsFake(v);
+    });
+  Object.entries({
+    gdprConsent: gdprDataHandler,
+    uspConsent: uspDataHandler,
+  }).forEach(([ovKey, handler]) => {
+    const v = overrides[ovKey];
+    if (v) {
+      sandbox.stub(handler, 'getConsentData').callsFake(v);
+    }
+  })
+}
+
+export function addFPDEnrichments(ortb2 = {}, overrides) {
+  const sandbox = sinon.sandbox.create();
+  mockFpdEnrichments(sandbox, overrides)
+  return enrichFPD(GreedyPromise.resolve(deepClone(ortb2))).finally(() => sandbox.restore());
+}
+
+export const syncAddFPDEnrichments = synchronize(addFPDEnrichments);
+
+export function addFPDToBidderRequest(bidderRequest, overrides) {
+  overrides = Object.assign({}, {
+    getRefererInfo() {
+      return bidderRequest.refererInfo || {};
+    },
+    gdprConsent() {
+      return bidderRequest.gdprConsent;
+    },
+    uspConsent() {
+      return bidderRequest.uspConsent;
+    }
+  }, overrides);
+  return addFPDEnrichments(bidderRequest.ortb2 || {}, overrides).then(ortb2 => {
+    return {
+      ...bidderRequest,
+      ortb2
+    }
+  });
+}
+
+export const syncAddFPDToBidderRequest = synchronize(addFPDToBidderRequest);
+
+function synchronize(fn) {
+  return function () {
+    let result;
+    fn.apply(this, arguments).then(res => { result = res });
+    return result;
+  }
+}
diff --git a/test/spec/fpd/enrichment_spec.js b/test/spec/fpd/enrichment_spec.js
new file mode 100644
index 00000000000..3363e1867d3
--- /dev/null
+++ b/test/spec/fpd/enrichment_spec.js
@@ -0,0 +1,213 @@
+import {dep, enrichFPD} from '../../../src/fpd/enrichment.js';
+import {hook} from '../../../src/hook.js';
+import {expect} from 'chai/index.mjs';
+import {config} from 'src/config.js';
+
+describe('FPD enrichment', () => {
+  let sandbox;
+  before(() => {
+    hook.ready();
+  });
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+  });
+  afterEach(() => {
+    sandbox.restore();
+    config.resetConfig();
+  });
+
+  function fpd(ortb2 = {}) {
+    return enrichFPD(Promise.resolve(ortb2));
+  }
+
+  function mockWindow() {
+    return {
+      innerHeight: 1,
+      innerWidth: 1,
+      navigator: {
+        language: ''
+      },
+      document: {
+        querySelector: sinon.stub()
+      }
+    };
+  }
+
+  function testWindows(getWindow, fn) {
+    Object.entries({
+      'top': ['getWindowTop', 'getWindowSelf'],
+      'self': ['getWindowSelf', 'getWindowTop']
+    }).forEach(([t, [winWorks, winThrows]]) => {
+      describe(`using window.${t}`, () => {
+        beforeEach(() => {
+          sandbox.stub(dep, winWorks).callsFake(getWindow);
+          sandbox.stub(dep, winThrows).throws(new Error());
+        });
+        fn();
+      });
+    });
+  }
+
+  describe('site', () => {
+    it('sets page, ref, domain, and publisher.domain', () => {
+      const refererInfo = {
+        page: 'www.example.com',
+        ref: 'referrer.com'
+      };
+      sandbox.stub(dep, 'getRefererInfo').callsFake(() => refererInfo);
+      sandbox.stub(dep, 'findRootDomain').callsFake((dom) => `publisher.${dom}`);
+      return fpd().then(ortb2 => {
+        sinon.assert.match(ortb2.site, {
+          page: 'www.example.com',
+          domain: 'example.com',
+          ref: 'referrer.com',
+          publisher: {
+            domain: 'publisher.example.com'
+          }
+        });
+      });
+    });
+
+    describe('keywords', () => {
+      let metaTag;
+      beforeEach(() => {
+        metaTag = document.createElement('meta');
+        metaTag.name = 'keywords';
+        metaTag.content = 'kw1, kw2';
+        document.head.appendChild(metaTag);
+      });
+      afterEach(() => {
+        document.head.removeChild(metaTag);
+      });
+
+      testWindows(() => window, () => {
+        it(`sets kewwords from meta tag`, () => {
+          return fpd().then(ortb2 => {
+            expect(ortb2.site.keywords).to.eql('kw1,kw2');
+          });
+        });
+      });
+    });
+
+    it('should not set keywords if meta tag is not present', () => {
+      return fpd().then(ortb2 => {
+        expect(ortb2.site.hasOwnProperty('keywords')).to.be.false;
+      });
+    });
+
+    it('respects pub-provided fpd', () => {
+      return fpd({
+        site: {
+          publisher: {
+            domain: 'pub.com'
+          }
+        }
+      }).then(ortb2 => {
+        expect(ortb2.site.publisher.domain).to.eql('pub.com');
+      });
+    });
+  });
+
+  describe('device', () => {
+    let win;
+    beforeEach(() => {
+      win = mockWindow();
+    });
+    testWindows(() => win, () => {
+      it('sets w/h', () => {
+        win.innerHeight = 123;
+        win.innerWidth = 321;
+        return fpd().then(ortb2 => {
+          sinon.assert.match(ortb2.device, {
+            w: 321,
+            h: 123,
+          });
+        });
+      });
+
+      it('sets ua', () => {
+        win.navigator.userAgent = 'mock-ua';
+        return fpd().then(ortb2 => {
+          expect(ortb2.device.ua).to.eql('mock-ua');
+        })
+      });
+
+      it('sets language', () => {
+        win.navigator.language = 'lang-ignored';
+        return fpd().then(ortb2 => {
+          expect(ortb2.device.language).to.eql('lang');
+        })
+      });
+    });
+  });
+
+  describe('regs', () => {
+    describe('gpc', () => {
+      let win;
+      beforeEach(() => {
+        win = mockWindow();
+      });
+      testWindows(() => win, () => {
+        it('is set if globalPrivacyControl is set', () => {
+          win.navigator.globalPrivacyControl = true;
+          return fpd().then(ortb2 => {
+            expect(ortb2.regs.ext.gpc).to.eql(1);
+          });
+        });
+
+        it('is not set otherwise', () => {
+          return fpd().then(ortb2 => {
+            expect(ortb2.regs?.ext?.gpc).to.not.exist;
+          })
+        })
+      });
+    })
+    describe('coppa', () => {
+      [[true, 1], [false, 0]].forEach(([cfgVal, regVal]) => {
+        it(`is set to ${regVal} if config = ${cfgVal}`, () => {
+          config.setConfig({coppa: cfgVal});
+          return fpd().then(ortb2 => {
+            expect(ortb2.regs.coppa).to.eql(regVal);
+          })
+        });
+      })
+
+      it('is not set if not configured', () => {
+        return fpd().then(ortb2 => {
+          expect(ortb2.regs?.coppa).to.not.exist;
+        })
+      })
+    });
+  });
+
+  describe('sua', () => {
+    it('does not set device.sua if resolved sua is null', () => {
+      sandbox.stub(dep, 'getHighEntropySUA').returns(Promise.resolve())
+      return fpd().then(ortb2 => {
+        expect(ortb2.device.sua).to.not.exist;
+      })
+    });
+    it('uses low entropy values if uaHints is []', () => {
+      sandbox.stub(dep, 'getLowEntropySUA').callsFake(() => ({mock: 'sua'}));
+      config.setConfig({
+        firstPartyData: {
+          uaHints: [],
+        }
+      })
+      return fpd().then(ortb2 => {
+        expect(ortb2.device.sua).to.eql({mock: 'sua'});
+      })
+    });
+    it('uses high entropy values otherwise', () => {
+      sandbox.stub(dep, 'getHighEntropySUA').callsFake((hints) => Promise.resolve({hints}));
+      config.setConfig({
+        firstPartyData: {
+          uaHints: ['h1', 'h2']
+        }
+      });
+      return fpd().then(ortb2 => {
+        expect(ortb2.device.sua).to.eql({hints: ['h1', 'h2']})
+      })
+    });
+  });
+});
diff --git a/test/spec/fpd/gdpr_spec.js b/test/spec/fpd/gdpr_spec.js
new file mode 100644
index 00000000000..8fc04815112
--- /dev/null
+++ b/test/spec/fpd/gdpr_spec.js
@@ -0,0 +1,47 @@
+import {gdprDataHandler} from '../../../src/adapterManager.js';
+import {enrichFPDHook} from '../../../modules/consentManagement.js';
+
+describe('GDPR FPD enrichment', () => {
+  let sandbox, consent;
+  beforeEach(() => {
+    consent = null;
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(gdprDataHandler, 'getConsentData').callsFake(() => consent);
+  });
+  afterEach(() => {
+    sandbox.restore();
+  })
+
+  function callHook() {
+    let result;
+    enrichFPDHook((res) => { result = res }, Promise.resolve({}));
+    return result;
+  }
+
+  it('sets gdpr properties from gdprDataHandler', () => {
+    consent = {gdprApplies: true, consentString: 'consent'};
+    return callHook().then(ortb2 => {
+      expect(ortb2.regs.ext.gdpr).to.eql(1);
+      expect(ortb2.user.ext.consent).to.eql('consent');
+    })
+  });
+
+  it('does not set it if missing', () => {
+    return callHook().then((ortb2) => {
+      expect(ortb2).to.eql({});
+    })
+  });
+
+  it('sets user.ext.consent, but not regs.ext.gdpr, if gpdrApplies is not a boolean', () => {
+    consent = {consentString: 'mock-consent'};
+    return callHook().then(ortb2 => {
+      expect(ortb2).to.eql({
+        user: {
+          ext: {
+            consent: 'mock-consent'
+          }
+        }
+      })
+    })
+  });
+});
diff --git a/test/spec/fpd/rootDomain_spec.js b/test/spec/fpd/rootDomain_spec.js
new file mode 100644
index 00000000000..008ef749edc
--- /dev/null
+++ b/test/spec/fpd/rootDomain_spec.js
@@ -0,0 +1,61 @@
+import {expect} from 'chai/index.js';
+import {findRootDomain, coreStorage} from 'src/fpd/rootDomain.js';
+
+describe('findRootDomain', function () {
+  let sandbox, cookies, rejectDomain;
+
+  beforeEach(function () {
+    findRootDomain.clear();
+    cookies = {};
+    rejectDomain = '';
+    sandbox = sinon.createSandbox();
+    sandbox.stub(coreStorage, 'cookiesAreEnabled').returns(true);
+    sandbox.stub(coreStorage, 'setCookie').callsFake((cookie, value, expiration, sameSite, domain) => {
+      if (rejectDomain !== domain) {
+        if (new Date(expiration) <= Date.now()) {
+          delete cookies[cookie];
+        } else {
+          cookies[cookie] = value;
+        }
+      }
+    })
+    sandbox.stub(coreStorage, 'getCookie').callsFake((cookie) => {
+      return cookies[cookie]
+    });
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+  });
+
+  after(() => {
+    findRootDomain.clear();
+  })
+
+  it('should just find the root domain', function () {
+    rejectDomain = 'co.uk';
+    var domain = findRootDomain('sub.realdomain.co.uk');
+    expect(domain).to.be.eq('realdomain.co.uk');
+    expect(cookies).to.eql({});
+  });
+
+  it('should find the full domain when no subdomain is present', function () {
+    rejectDomain = 'co.uk';
+    var domain = findRootDomain('realdomain.co.uk');
+    expect(domain).to.be.eq('realdomain.co.uk');
+    expect(cookies).to.eql({});
+  });
+
+  it('should return domain as-is if cookies are disabled', () => {
+    coreStorage.cookiesAreEnabled.returns(false);
+    expect(findRootDomain('sub.example.com')).to.eql('sub.example.com');
+    sinon.assert.notCalled(coreStorage.setCookie);
+  });
+
+  it('should memoize default value', () => {
+    const domain = findRootDomain();
+    expect(domain.length > 0).to.be.true;
+    expect(findRootDomain()).to.eql(domain);
+    sinon.assert.calledOnce(coreStorage.getCookie);
+  });
+});
diff --git a/test/spec/fpd/usp_spec.js b/test/spec/fpd/usp_spec.js
new file mode 100644
index 00000000000..f616b086ffa
--- /dev/null
+++ b/test/spec/fpd/usp_spec.js
@@ -0,0 +1,36 @@
+import {enrichFPDHook} from '../../../modules/consentManagementUsp.js';
+import {uspDataHandler} from '../../../src/adapterManager.js';
+
+describe('FPD enrichment USP', () => {
+  let sandbox, consent;
+  beforeEach(() => {
+    consent = null;
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(uspDataHandler, 'getConsentData').callsFake(() => consent);
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  function callHook() {
+    let result;
+    enrichFPDHook((res) => {
+      result = res;
+    }, Promise.resolve({}));
+    return result;
+  }
+
+  it('sets regs.ext.us_privacy from uspDataHandler', () => {
+    consent = '1NN';
+    return callHook().then(ortb2 => {
+      expect(ortb2.regs.ext.us_privacy).to.eql('1NN');
+    })
+  });
+
+  it('does not set if missing', () => {
+    return callHook().then(ortb2 => {
+      expect(ortb2).to.eql({});
+    })
+  });
+});
diff --git a/test/spec/modules/enrichmentFpdModule_spec.js b/test/spec/modules/enrichmentFpdModule_spec.js
index 38853f1528c..e69de29bb2d 100644
--- a/test/spec/modules/enrichmentFpdModule_spec.js
+++ b/test/spec/modules/enrichmentFpdModule_spec.js
@@ -1,159 +0,0 @@
-import { expect } from 'chai';
-import {config} from 'src/config.js';
-import { getRefererInfo } from 'src/refererDetection.js';
-import {processFpd, coreStorage, resetEnrichments} from 'modules/enrichmentFpdModule.js';
-import * as enrichmentModule from 'modules/enrichmentFpdModule.js';
-import {GreedyPromise} from '../../../src/utils/promise.js';
-
-describe('the first party data enrichment module', function() {
-  let width;
-  let widthStub;
-  let height;
-  let heightStub;
-  let querySelectorStub;
-  let coreStorageStub;
-  let canonical;
-  let keywords;
-  let lowEntropySuaStub;
-  let highEntropySuaStub;
-
-  before(function() {
-    canonical = document.createElement('link');
-    canonical.rel = 'canonical';
-    keywords = document.createElement('meta');
-    keywords.name = 'keywords';
-  });
-
-  beforeEach(function() {
-    resetEnrichments();
-    querySelectorStub = sinon.stub(window.top.document, 'querySelector');
-    querySelectorStub.withArgs("link[rel='canonical']").returns(canonical);
-    querySelectorStub.withArgs("meta[name='keywords']").returns(keywords);
-    widthStub = sinon.stub(window.top, 'innerWidth').get(function() {
-      return width;
-    });
-    heightStub = sinon.stub(window.top, 'innerHeight').get(function() {
-      return height;
-    });
-    coreStorageStub = sinon.stub(coreStorage, 'getCookie');
-    coreStorageStub
-      .onFirstCall()
-      .returns(null) // co.uk
-      .onSecondCall()
-      .returns('writeable'); // domain.co.uk
-    lowEntropySuaStub = sinon.stub(enrichmentModule.sua, 'le').callsFake(() => null);
-    highEntropySuaStub = sinon.stub(enrichmentModule.sua, 'he').callsFake(() => GreedyPromise.resolve());
-  });
-
-  afterEach(function() {
-    widthStub.restore();
-    heightStub.restore();
-    querySelectorStub.restore();
-    coreStorageStub.restore();
-    canonical = document.createElement('link');
-    canonical.rel = 'canonical';
-    keywords = document.createElement('meta');
-    keywords.name = 'keywords';
-    lowEntropySuaStub.restore();
-    highEntropySuaStub.restore();
-  });
-
-  function syncProcessFpd(fpdConf, ortb2Fragments) {
-    let result;
-    processFpd(fpdConf, ortb2Fragments).then((res) => { result = res; });
-    return result;
-  };
-
-  it('adds ref and device values', function() {
-    width = 800;
-    height = 500;
-
-    let validated = syncProcessFpd({}, {}).global;
-
-    const {ref, page, domain} = getRefererInfo();
-    expect(validated.site.ref).to.equal(ref || undefined);
-    expect(validated.site.page).to.equal(page || undefined)
-    expect(validated.site.domain).to.equal(domain || undefined)
-    expect(validated.device).to.deep.equal({ w: 800, h: 500 });
-    expect(validated.site.keywords).to.be.undefined;
-  });
-
-  it('adds page domain values if pageUrl url exists', function() {
-    config.setConfig({'pageUrl': 'https://www.subdomain.domain.co.uk/path?query=12345'});
-    width = 800;
-    height = 500;
-
-    let validated = syncProcessFpd({}, {}).global;
-
-    expect(validated.site.ref).to.equal(getRefererInfo().ref || undefined);
-    expect(validated.site.page).to.equal('https://www.subdomain.domain.co.uk/path?query=12345');
-    expect(validated.site.domain).to.equal('subdomain.domain.co.uk');
-    expect(validated.site.publisher.domain).to.equal('domain.co.uk');
-    expect(validated.device).to.deep.equal({ w: 800, h: 500 });
-    expect(validated.site.keywords).to.be.undefined;
-  });
-
-  it('adds keyword value if keyword meta content exists', function() {
-    width = 800;
-    height = 500;
-    keywords.content = 'value1,value2,value3';
-
-    let validated = syncProcessFpd({}, {}).global;
-
-    expect(validated.site.keywords).to.equal('value1,value2,value3');
-  });
-
-  it('does not overwrite existing data from getConfig ortb2', function() {
-    width = 800;
-    height = 500;
-
-    let validated = syncProcessFpd({}, {global: {device: {w: 1200, h: 700}, site: {ref: 'https://someUrl.com', page: 'test.com'}}}).global;
-
-    expect(validated.site.ref).to.equal('https://someUrl.com');
-    expect(validated.site.page).to.equal('test.com');
-    expect(validated.device).to.deep.equal({ w: 1200, h: 700 });
-    expect(validated.site.keywords).to.be.undefined;
-  });
-
-  it('does not run enrichments again on the second call', () => {
-    width = 1;
-    height = 2;
-    const first = syncProcessFpd({}, {}).global;
-    width = 3;
-    const second = syncProcessFpd({}, {}).global;
-    expect(first).to.eql(second);
-  });
-
-  describe('device.sua', () => {
-    it('does not set device.sua if resolved sua is null', () => {
-      const sua = syncProcessFpd({}, {}).global.device?.sua;
-      expect(sua).to.not.exist;
-    });
-    it('uses low entropy values if uaHints is []', () => {
-      lowEntropySuaStub.callsFake(() => ({mock: 'sua'}));
-      const sua = syncProcessFpd({uaHints: []}, {}).global.device.sua;
-      expect(sua).to.eql({mock: 'sua'});
-    });
-    it('uses high entropy values otherwise', () => {
-      highEntropySuaStub.callsFake((hints) => GreedyPromise.resolve({hints}));
-      const sua = syncProcessFpd({uaHints: ['h1', 'h2']}, {}).global.device.sua;
-      expect(sua).to.eql({hints: ['h1', 'h2']});
-    })
-  })
-
-  it('should store a reference to gpc witin ortb2.regs.ext if it has been enabled', function() {
-    let validated;
-    width = 800;
-    height = 500;
-
-    validated = syncProcessFpd({}, {}).global;
-    expect(validated.regs).to.equal(undefined);
-
-    resetEnrichments();
-
-    const globalPrivacyControlStub = sinon.stub(window, 'navigator').value({globalPrivacyControl: true});
-    validated = syncProcessFpd({}, {}).global;
-    expect(validated.regs.ext.gpc).to.equal(1);
-    globalPrivacyControlStub.restore();
-  });
-});
diff --git a/test/spec/modules/fpdModule_spec.js b/test/spec/modules/fpdModule_spec.js
index 7d41fbb55e1..4536b304f9d 100644
--- a/test/spec/modules/fpdModule_spec.js
+++ b/test/spec/modules/fpdModule_spec.js
@@ -1,16 +1,14 @@
 import {expect} from 'chai';
 import {config} from 'src/config.js';
-import {getRefererInfo} from 'src/refererDetection.js';
-import {processFpd, registerSubmodules, startAuctionHook, reset} from 'modules/fpdModule/index.js';
-import * as enrichmentModule from 'modules/enrichmentFpdModule.js';
-import * as validationModule from 'modules/validationFpdModule/index.js';
-import {resetEnrichments} from 'modules/enrichmentFpdModule.js';
-import {GreedyPromise} from '../../../src/utils/promise.js';
+import {registerSubmodules, reset, startAuctionHook} from 'modules/fpdModule/index.js';
 
 describe('the first party data module', function () {
   afterEach(function () {
     config.resetConfig();
   });
+  after(() => {
+    reset();
+  })
 
   describe('startAuctionHook', () => {
     const mockFpd = {
@@ -50,282 +48,4 @@ describe('the first party data module', function () {
       });
     });
   });
-
-  describe('first party data intitializing', function () {
-    let width;
-    let widthStub;
-    let height;
-    let heightStub;
-    let querySelectorStub;
-    let canonical;
-    let keywords;
-    let lowEntropySuaStub;
-    let highEntropySuaStub;
-
-    before(function() {
-      reset();
-      registerSubmodules(enrichmentModule);
-      registerSubmodules(validationModule);
-
-      canonical = document.createElement('link');
-      canonical.rel = 'canonical';
-      keywords = document.createElement('meta');
-      keywords.name = 'keywords';
-    });
-
-    beforeEach(function() {
-      resetEnrichments();
-      querySelectorStub = sinon.stub(window.top.document, 'querySelector');
-      querySelectorStub.withArgs("link[rel='canonical']").returns(canonical);
-      querySelectorStub.withArgs("meta[name='keywords']").returns(keywords);
-      widthStub = sinon.stub(window.top, 'innerWidth').get(function () {
-        return width;
-      });
-      heightStub = sinon.stub(window.top, 'innerHeight').get(function () {
-        return height;
-      });
-      lowEntropySuaStub = sinon.stub(enrichmentModule.sua, 'le').callsFake(() => null);
-      highEntropySuaStub = sinon.stub(enrichmentModule.sua, 'he').callsFake(() => GreedyPromise.resolve());
-    });
-
-    afterEach(function() {
-      widthStub.restore();
-      heightStub.restore();
-      querySelectorStub.restore();
-      canonical = document.createElement('link');
-      canonical.rel = 'canonical';
-      keywords = document.createElement('meta');
-      keywords.name = 'keywords';
-      lowEntropySuaStub.restore();
-      highEntropySuaStub.restore();
-    });
-
-    it('filters ortb2 data that is set', function () {
-      const global = {
-        user: {
-          data: {},
-          gender: 'f',
-          age: 45
-        },
-        site: {
-          content: {
-            data: [{
-              segment: {
-                test: 1
-              },
-              name: 'foo'
-            }, {
-              segment: [{
-                id: 'test'
-              }, {
-                id: 3
-              }],
-              name: 'bar'
-            }]
-          }
-        },
-        device: {
-          w: 1,
-          h: 1
-        }
-      };
-
-      config.setConfig({'pageUrl': 'https://www.domain.com/path?query=12345'});
-      width = 1120;
-      height = 750;
-
-      return processFpd({global}).then(({global: validated}) => {
-        expect(validated.site.ref).to.equal(getRefererInfo().ref || undefined);
-        expect(validated.site.page).to.equal('https://www.domain.com/path?query=12345');
-        expect(validated.site.domain).to.equal('domain.com');
-        expect(validated.site.content.data).to.deep.equal([{segment: [{id: 'test'}], name: 'bar'}]);
-        expect(validated.user.data).to.be.undefined;
-        expect(validated.device).to.deep.to.equal({w: 1, h: 1});
-        expect(validated.site.keywords).to.be.undefined;
-      });
-    });
-
-    it('should not overwrite existing data with default settings', function () {
-      const global = {
-        site: {
-          ref: 'https://referer.com'
-        }
-      };
-
-      return processFpd({global}).then(({global: validated}) => {
-        expect(validated.site.ref).to.equal('https://referer.com');
-      });
-    });
-
-    it('should allow overwrite default data with setConfig', function () {
-      const global = {
-        site: {
-          ref: 'https://referer.com'
-        }
-      };
-
-      return processFpd({global}).then(({global: validated}) => {
-        expect(validated.site.ref).to.equal('https://referer.com');
-      });
-    });
-
-    it('should filter all data', function () {
-      let global = {
-        imp: [],
-        site: {
-          name: 123,
-          domain: 456,
-          page: 789,
-          ref: 987,
-          keywords: ['keywords'],
-          search: 654,
-          cat: 'cat',
-          sectioncat: 'sectioncat',
-          pagecat: 'pagecat',
-          content: {
-            data: [{
-              name: 1,
-              segment: []
-            }]
-          }
-        },
-        user: {
-          yob: 'twenty',
-          gender: 0,
-          keywords: ['foobar'],
-          data: ['test']
-        },
-        device: [800, 450],
-        cur: {
-          adServerCurrency: 'USD'
-        }
-      };
-      config.setConfig({'firstPartyData': {skipEnrichments: true}});
-      return processFpd({global}).then(({global: validated}) => {
-        expect(validated).to.deep.equal({});
-      });
-    });
-
-    it('should add enrichments but not alter any arbitrary ortb2 data', function () {
-      let global = {
-        site: {
-          ext: {
-            data: {
-              inventory: ['value1']
-            }
-          }
-        },
-        user: {
-          ext: {
-            data: {
-              visitor: ['value2']
-            }
-          }
-        },
-        cur: ['USD']
-      };
-      return processFpd({global}).then(({global: validated}) => {
-        expect(validated.site.ref).to.equal(getRefererInfo().referer);
-        expect(validated.site.ext.data).to.deep.equal({inventory: ['value1']});
-        expect(validated.user.ext.data).to.deep.equal({visitor: ['value2']});
-        expect(validated.cur).to.deep.equal(['USD']);
-      })
-    });
-
-    it('should filter bidderConfig data', function () {
-      let bidder = {
-        bidderA: {
-          site: {
-            keywords: 'other',
-            ref: 'https://domain.com'
-          },
-          user: {
-            keywords: 'test',
-            data: [{
-              segment: [{id: 4}],
-              name: 't'
-            }]
-          }
-        }
-      };
-
-      return processFpd({bidder}).then(({bidder: validated}) => {
-        expect(validated.bidderA).to.not.be.undefined;
-        expect(validated.bidderA.user.data).to.be.undefined;
-        expect(validated.bidderA.user.keywords).to.equal('test');
-        expect(validated.bidderA.site.keywords).to.equal('other');
-        expect(validated.bidderA.site.ref).to.equal('https://domain.com');
-      })
-    });
-
-    it('should not filter bidderConfig data as it is valid', function () {
-      let bidder = {
-        bidderA: {
-          site: {
-            keywords: 'other',
-            ref: 'https://domain.com'
-          },
-          user: {
-            keywords: 'test',
-            data: [{
-              segment: [{id: 'data1_id'}],
-              name: 'data1'
-            }]
-          }
-        }
-      };
-
-      return processFpd({bidder}).then(({bidder: validated}) => {
-        expect(validated.bidderA).to.not.be.undefined;
-        expect(validated.bidderA.user.data).to.deep.equal([{segment: [{id: 'data1_id'}], name: 'data1'}]);
-        expect(validated.bidderA.user.keywords).to.equal('test');
-        expect(validated.bidderA.site.keywords).to.equal('other');
-        expect(validated.bidderA.site.ref).to.equal('https://domain.com');
-      });
-    });
-
-    it('should not set default values if skipEnrichments is turned on', function () {
-      config.setConfig({'firstPartyData': {skipEnrichments: true}});
-
-      let global = {
-        site: {
-          keywords: 'other'
-        },
-        user: {
-          keywords: 'test',
-          data: [{
-            segment: [{id: 'data1_id'}],
-            name: 'data1'
-          }]
-        }
-      };
-
-      return processFpd({global}).then(({global: validated}) => {
-        expect(validated.device).to.be.undefined;
-        expect(validated.site.ref).to.be.undefined;
-        expect(validated.site.page).to.be.undefined;
-        expect(validated.site.domain).to.be.undefined;
-      });
-    });
-
-    it('should not validate ortb2 data if skipValidations is turned on', function () {
-      config.setConfig({'firstPartyData': {skipValidations: true}});
-
-      let global = {
-        site: {
-          keywords: 'other'
-        },
-        user: {
-          keywords: 'test',
-          data: [{
-            segment: [{id: 'nonfiltered'}]
-          }]
-        }
-      };
-
-      return processFpd({global}).then(({global: validated}) => {
-        expect(validated.user.data).to.deep.equal([{segment: [{id: 'nonfiltered'}]}]);
-      });
-    });
-  });
 });
diff --git a/test/spec/modules/improvedigitalBidAdapter_spec.js b/test/spec/modules/improvedigitalBidAdapter_spec.js
index b3b01dc93b5..400b9145e0b 100644
--- a/test/spec/modules/improvedigitalBidAdapter_spec.js
+++ b/test/spec/modules/improvedigitalBidAdapter_spec.js
@@ -15,6 +15,8 @@ import 'modules/consentManagementUsp.js';
 import 'modules/schain.js';
 import {decorateAdUnitsWithNativeParams, toLegacyResponse} from '../../../src/native.js';
 import {createEidsArray} from '../../../modules/userId/eids.js';
+import {syncAddFPDToBidderRequest} from '../../helpers/fpd.js';
+import {hook} from '../../../src/hook.js';
 
 describe('Improve Digital Adapter Tests', function () {
   const METHOD = 'POST';
@@ -168,6 +170,10 @@ describe('Improve Digital Adapter Tests', function () {
     return bidRequests;
   }
 
+  before(() => {
+    hook.ready();
+  });
+
   describe('isBidRequestValid', function () {
     it('should return false when no bid', function () {
       expect(spec.isBidRequestValid()).to.equal(false);
@@ -220,7 +226,7 @@ describe('Improve Digital Adapter Tests', function () {
     it('should make a well-formed request objects', function () {
       getConfigStub = sinon.stub(config, 'getConfig');
       getConfigStub.withArgs('improvedigital.usePrebidSizes').returns(true);
-      const request = spec.buildRequests([simpleBidRequest], bidderRequest)[0];
+      const request = spec.buildRequests([simpleBidRequest], syncAddFPDToBidderRequest(bidderRequest))[0];
       expect(request).to.be.an('object');
       expect(request.method).to.equal(METHOD);
       expect(request.url).to.equal(AD_SERVER_URL);
@@ -390,7 +396,7 @@ describe('Improve Digital Adapter Tests', function () {
 
     it('should add GDPR consent string', function () {
       const bidRequest = Object.assign({}, simpleBidRequest);
-      const payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequestGdpr)[0].data);
+      const payload = JSON.parse(spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(bidderRequestGdpr))[0].data);
       expect(payload.regs.ext.gdpr).to.exist.and.to.equal(1);
       expect(payload.user.ext.consent).to.equal('CONSENT');
       expect(payload.user.ext.ConsentedProvidersSettings).to.not.exist;
@@ -401,13 +407,13 @@ describe('Improve Digital Adapter Tests', function () {
       const bidderRequestGdprEmptyAddtl = deepClone(bidderRequestGdpr);
       bidderRequestGdprEmptyAddtl.gdprConsent.addtlConsent = '1~';
       const bidRequest = Object.assign({}, simpleBidRequest);
-      const payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequestGdprEmptyAddtl)[0].data);
+      const payload = JSON.parse(spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(bidderRequestGdprEmptyAddtl))[0].data);
       expect(payload.user.ext.consented_providers_settings).to.not.exist;
     });
 
     it('should add ConsentedProvidersSettings when extend mode enabled', function () {
       const bidRequest = deepClone(extendBidRequest);
-      const payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequestGdpr)[0].data);
+      const payload = JSON.parse(spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(bidderRequestGdpr))[0].data);
       expect(payload.regs.ext.gdpr).to.exist.and.to.equal(1);
       expect(payload.user.ext.consent).to.equal('CONSENT');
       expect(payload.user.ext.ConsentedProvidersSettings.consented_providers).to.exist.and.to.equal('1~1.35.41.101');
@@ -416,7 +422,7 @@ describe('Improve Digital Adapter Tests', function () {
 
     it('should add CCPA consent string', function () {
       const bidRequest = Object.assign({}, simpleBidRequest);
-      const request = spec.buildRequests([bidRequest], {...bidderRequest, ...{ uspConsent: '1YYY' }});
+      const request = spec.buildRequests([bidRequest], syncAddFPDToBidderRequest({...bidderRequest, ...{ uspConsent: '1YYY' }}));
       const payload = JSON.parse(request[0].data);
       expect(payload.regs.ext.us_privacy).to.equal('1YYY');
     });
@@ -425,17 +431,17 @@ describe('Improve Digital Adapter Tests', function () {
       getConfigStub = sinon.stub(config, 'getConfig');
       getConfigStub.withArgs('coppa').returns(true);
       let bidRequest = Object.assign({}, simpleBidRequest);
-      let payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequestGdpr)[0].data);
+      let payload = JSON.parse(spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(bidderRequestGdpr))[0].data);
       expect(payload.regs.coppa).to.equal(1);
       getConfigStub.withArgs('coppa').returns(false);
       bidRequest = Object.assign({}, simpleBidRequest);
-      payload = JSON.parse(spec.buildRequests([bidRequest], bidderRequestGdpr)[0].data);
+      payload = JSON.parse(spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(bidderRequestGdpr))[0].data);
       expect(payload.regs.coppa).to.equal(0);
     });
 
     it('should add referrer', function () {
       const bidRequest = Object.assign({}, simpleBidRequest);
-      const request = spec.buildRequests([bidRequest], bidderRequestReferrer)[0];
+      const request = spec.buildRequests([bidRequest], syncAddFPDToBidderRequest(bidderRequestReferrer))[0];
       const payload = JSON.parse(request.data);
       expect(payload.site.page).to.equal('https://blah.com/test.html');
     });
@@ -678,21 +684,21 @@ describe('Improve Digital Adapter Tests', function () {
         page: 'https://improveditigal.com/',
         domain: 'improveditigal.com'
       });
-      let request = spec.buildRequests([simpleBidRequest], bidderRequestReferrer)[0];
+      let request = spec.buildRequests([simpleBidRequest], syncAddFPDToBidderRequest(bidderRequestReferrer))[0];
       let payload = JSON.parse(request.data);
       expect(payload.site.content).does.exist.and.equal('XYZ');
       expect(payload.site.page).does.exist.and.equal('https://improveditigal.com/');
       expect(payload.site.domain).does.exist.and.equal('improveditigal.com');
       getConfigStub.reset();
 
-      request = spec.buildRequests([simpleBidRequest], bidderRequestReferrer)[0];
+      request = spec.buildRequests([simpleBidRequest], syncAddFPDToBidderRequest(bidderRequestReferrer))[0];
       payload = JSON.parse(request.data);
       expect(payload.site.content).does.not.exist;
       expect(payload.site.page).does.exist.and.equal('https://blah.com/test.html');
       expect(payload.site.domain).does.exist.and.equal('blah.com');
 
       const ortb2 = {site: {content: 'ZZZ'}};
-      request = spec.buildRequests([simpleBidRequest], {...bidderRequestReferrer, ortb2})[0];
+      request = spec.buildRequests([simpleBidRequest], syncAddFPDToBidderRequest({...bidderRequestReferrer, ortb2}))[0];
       payload = JSON.parse(request.data);
       expect(payload.site.content).does.exist.and.equal('ZZZ');
       expect(payload.site.page).does.exist.and.equal('https://blah.com/test.html');
diff --git a/test/spec/modules/openxOrtbBidAdapter_spec.js b/test/spec/modules/openxOrtbBidAdapter_spec.js
index 09e76d6ca7a..be6427f607b 100644
--- a/test/spec/modules/openxOrtbBidAdapter_spec.js
+++ b/test/spec/modules/openxOrtbBidAdapter_spec.js
@@ -14,10 +14,16 @@ import 'modules/consentManagement.js';
 import 'modules/consentManagementUsp.js';
 import 'modules/schain.js';
 import {deepClone} from 'src/utils.js';
+import {syncAddFPDToBidderRequest} from '../../helpers/fpd.js';
+import {hook} from '../../../src/hook.js';
 
 const DEFAULT_SYNC = SYNC_URL + '?ph=' + DEFAULT_PH;
 
 describe('OpenxRtbAdapter', function () {
+  before(() => {
+    hook.ready();
+  });
+
   const adapter = newBidder(spec);
 
   describe('inherited functions', function () {
@@ -634,14 +640,14 @@ describe('OpenxRtbAdapter', function () {
           });
 
           it('should send a signal to specify that US Privacy applies to this request', function () {
-            const request = spec.buildRequests(bidRequests, bidderRequest);
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
             expect(request[0].data.regs.ext.us_privacy).to.equal('1YYN');
             expect(request[1].data.regs.ext.us_privacy).to.equal('1YYN');
           });
 
           it('should not send the regs object, when consent string is undefined', function () {
             delete bidderRequest.uspConsent;
-            const request = spec.buildRequests(bidRequests, bidderRequest);
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
             expect(request[0].data.regs?.us_privacy).to.not.exist;
           });
         });
@@ -676,21 +682,21 @@ describe('OpenxRtbAdapter', function () {
 
           it('should send a signal to specify that GDPR applies to this request', function () {
             bidderRequest.bids = bidRequests;
-            const request = spec.buildRequests(bidRequests, bidderRequest);
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
             expect(request[0].data.regs.ext.gdpr).to.equal(1);
             expect(request[1].data.regs.ext.gdpr).to.equal(1);
           });
 
           it('should send the consent string', function () {
             bidderRequest.bids = bidRequests;
-            const request = spec.buildRequests(bidRequests, bidderRequest);
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
             expect(request[0].data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
             expect(request[1].data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
           });
 
           it('should send the addtlConsent string', function () {
             bidderRequest.bids = bidRequests;
-            const request = spec.buildRequests(bidRequests, bidderRequest);
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
             expect(request[0].data.user.ext.ConsentedProvidersSettings.consented_providers).to.equal(bidderRequest.gdprConsent.addtlConsent);
             expect(request[1].data.user.ext.ConsentedProvidersSettings.consented_providers).to.equal(bidderRequest.gdprConsent.addtlConsent);
           });
@@ -698,7 +704,7 @@ describe('OpenxRtbAdapter', function () {
           it('should send a signal to specify that GDPR does not apply to this request', function () {
             bidderRequest.gdprConsent.gdprApplies = false;
             bidderRequest.bids = bidRequests;
-            const request = spec.buildRequests(bidRequests, bidderRequest);
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
             expect(request[0].data.regs.ext.gdpr).to.equal(0);
             expect(request[1].data.regs.ext.gdpr).to.equal(0);
           });
@@ -707,7 +713,7 @@ describe('OpenxRtbAdapter', function () {
             'but can send consent data, ', function () {
             delete bidderRequest.gdprConsent.gdprApplies;
             bidderRequest.bids = bidRequests;
-            const request = spec.buildRequests(bidRequests, bidderRequest);
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
             expect(request[0].data.regs?.ext?.gdpr).to.not.be.ok;
             expect(request[0].data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
             expect(request[1].data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
@@ -716,7 +722,7 @@ describe('OpenxRtbAdapter', function () {
           it('when consent string is undefined, should not send the consent string, ', function () {
             delete bidderRequest.gdprConsent.consentString;
             bidderRequest.bids = bidRequests;
-            const request = spec.buildRequests(bidRequests, bidderRequest);
+            const request = spec.buildRequests(bidRequests, syncAddFPDToBidderRequest(bidderRequest));
             expect(request[0].data.imp[0].ext.consent).to.equal(undefined);
             expect(request[1].data.imp[0].ext.consent).to.equal(undefined);
           });
@@ -725,7 +731,7 @@ describe('OpenxRtbAdapter', function () {
 
       context('coppa', function() {
         it('when there are no coppa param settings, should not send a coppa flag', function () {
-          const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+          const request = spec.buildRequests(bidRequestsWithMediaTypes, syncAddFPDToBidderRequest(mockBidderRequest));
           expect(request[0].data.regs?.coppa).to.be.not.ok;
         });
 
@@ -738,7 +744,7 @@ describe('OpenxRtbAdapter', function () {
             return utils.deepAccess(mockConfig, key);
           });
 
-          const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+          const request = spec.buildRequests(bidRequestsWithMediaTypes, syncAddFPDToBidderRequest(mockBidderRequest));
           expect(request[0].data.regs.coppa).to.equal(1);
         });
 
@@ -760,21 +766,21 @@ describe('OpenxRtbAdapter', function () {
         it('when there is a do not track, should send a dnt', function () {
           doNotTrackStub.returns(1);
 
-          const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+          const request = spec.buildRequests(bidRequestsWithMediaTypes, syncAddFPDToBidderRequest(mockBidderRequest));
           expect(request[0].data.device.dnt).to.equal(1);
         });
 
         it('when there is not do not track, don\'t send dnt', function () {
           doNotTrackStub.returns(0);
 
-          const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+          const request = spec.buildRequests(bidRequestsWithMediaTypes, syncAddFPDToBidderRequest(mockBidderRequest));
           expect(request[0].data.device.dnt).to.equal(0);
         });
 
         it('when there is no defined do not track, don\'t send dnt', function () {
           doNotTrackStub.returns(null);
 
-          const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+          const request = spec.buildRequests(bidRequestsWithMediaTypes, syncAddFPDToBidderRequest(mockBidderRequest));
           expect(request[0].data.device.dnt).to.equal(0);
         });
       });
@@ -1503,5 +1509,4 @@ describe('OpenxRtbAdapter', function () {
       });
     });
   });
-})
-;
+});
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index f5f77e61056..9da242381be 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -1,4 +1,4 @@
-import { expect } from 'chai';
+import {expect} from 'chai';
 import {
   PrebidServer as Adapter,
   resetSyncedStatus,
@@ -7,31 +7,30 @@ import {
 } from 'modules/prebidServerBidAdapter/index.js';
 import adapterManager from 'src/adapterManager.js';
 import * as utils from 'src/utils.js';
-import { ajax } from 'src/ajax.js';
-import { config } from 'src/config.js';
+import {deepAccess, deepClone} from 'src/utils.js';
+import {ajax} from 'src/ajax.js';
+import {config} from 'src/config.js';
 import * as events from 'src/events.js';
 import CONSTANTS from 'src/constants.json';
-import { server } from 'test/mocks/xhr.js';
-import { createEidsArray } from 'modules/userId/eids.js';
-import { deepAccess, deepClone } from 'src/utils.js';
-import 'modules/appnexusBidAdapter.js' // appnexus alias test
-import 'modules/rubiconBidAdapter.js' // rubicon alias test
-import 'src/prebid.js' // $$PREBID_GLOBAL$$.aliasBidder test
-import 'modules/currency.js' // adServerCurrency test
-// also load modules that register ORTB processors
-import 'modules/currency.js';
+import {server} from 'test/mocks/xhr.js';
+import {createEidsArray} from 'modules/userId/eids.js';
+import 'modules/appnexusBidAdapter.js'; // appnexus alias test
+import 'modules/rubiconBidAdapter.js'; // rubicon alias test
+import 'src/prebid.js'; // $$PREBID_GLOBAL$$.aliasBidder test
+import 'modules/currency.js'; // adServerCurrency test
 import 'modules/userId/index.js';
 import 'modules/multibid/index.js';
 import 'modules/priceFloors.js';
 import 'modules/consentManagement.js';
 import 'modules/consentManagementUsp.js';
 import 'modules/schain.js';
-import { hook } from '../../../src/hook.js';
-import { decorateAdUnitsWithNativeParams } from '../../../src/native.js';
-import { auctionManager } from '../../../src/auctionManager.js';
-import { stubAuctionIndex } from '../../helpers/indexStub.js';
-import { registerBidder } from 'src/adapters/bidderFactory.js';
+import {hook} from '../../../src/hook.js';
+import {decorateAdUnitsWithNativeParams} from '../../../src/native.js';
+import {auctionManager} from '../../../src/auctionManager.js';
+import {stubAuctionIndex} from '../../helpers/indexStub.js';
+import {registerBidder} from 'src/adapters/bidderFactory.js';
 import {getGlobal} from '../../../src/prebidGlobal.js';
+import {syncAddFPDEnrichments, syncAddFPDToBidderRequest} from '../../helpers/fpd.js';
 
 let CONFIG = {
   accountId: '1',
@@ -544,6 +543,16 @@ const RESPONSE_OPENRTB_NATIVE = {
   ]
 };
 
+function addFpdEnrichmentsToS2SRequest(s2sReq, bidderRequests) {
+  return {
+    ...s2sReq,
+    ortb2Fragments: {
+      ...(s2sReq.ortb2Fragments || {}),
+      global: syncAddFPDToBidderRequest({...(bidderRequests?.[0] || {}), ortb2: s2sReq.ortb2Fragments?.global || {}}).ortb2
+    }
+  }
+}
+
 describe('S2S Adapter', function () {
   let adapter,
     addBidResponse = sinon.spy(),
@@ -766,7 +775,7 @@ describe('S2S Adapter', function () {
         let gdprBidRequest = utils.deepClone(BID_REQUESTS);
         gdprBidRequest[0].gdprConsent = mockConsent();
 
-        adapter.callBids(REQUEST, gdprBidRequest, addBidResponse, done, ajax);
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, gdprBidRequest), gdprBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.regs.ext.gdpr).is.equal(1);
@@ -775,7 +784,7 @@ describe('S2S Adapter', function () {
         config.resetConfig();
         config.setConfig({ s2sConfig: CONFIG });
 
-        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
         requestBid = JSON.parse(server.requests[1].requestBody);
 
         expect(requestBid.regs).to.not.exist;
@@ -791,7 +800,7 @@ describe('S2S Adapter', function () {
           addtlConsent: 'superduperconsent',
         });
 
-        adapter.callBids(REQUEST, gdprBidRequest, addBidResponse, done, ajax);
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, gdprBidRequest), gdprBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.regs.ext.gdpr).is.equal(1);
@@ -877,13 +886,13 @@ describe('S2S Adapter', function () {
         $$PREBID_GLOBAL$$.requestBids.removeAll();
       });
 
-      it('is added to ortb2 request when in bidRequest', function () {
+      it('is added to ortb2 request when in FPD', function () {
         config.setConfig({ s2sConfig: CONFIG });
 
         let uspBidRequest = utils.deepClone(BID_REQUESTS);
         uspBidRequest[0].uspConsent = '1NYN';
 
-        adapter.callBids(REQUEST, uspBidRequest, addBidResponse, done, ajax);
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, uspBidRequest), uspBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.regs.ext.us_privacy).is.equal('1NYN');
@@ -891,7 +900,7 @@ describe('S2S Adapter', function () {
         config.resetConfig();
         config.setConfig({ s2sConfig: CONFIG });
 
-        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
         requestBid = JSON.parse(server.requests[1].requestBody);
 
         expect(requestBid.regs).to.not.exist;
@@ -929,7 +938,7 @@ describe('S2S Adapter', function () {
         consentBidRequest[0].uspConsent = '1NYN';
         consentBidRequest[0].gdprConsent = mockConsent();
 
-        adapter.callBids(REQUEST, consentBidRequest, addBidResponse, done, ajax);
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, consentBidRequest), consentBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.regs.ext.us_privacy).is.equal('1NYN');
@@ -977,7 +986,7 @@ describe('S2S Adapter', function () {
       };
 
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
       sinon.assert.match(requestBid.device, {
         ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC',
@@ -1004,7 +1013,7 @@ describe('S2S Adapter', function () {
       };
 
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
       sinon.assert.match(requestBid.device, {
         ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC',
@@ -1367,7 +1376,7 @@ describe('S2S Adapter', function () {
           };
 
           config.setConfig(_config);
-          adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+          adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
           const requestBid = JSON.parse(server.requests[0].requestBody);
           sinon.assert.match(requestBid.device, {
             w: window.innerWidth,
@@ -1474,7 +1483,7 @@ describe('S2S Adapter', function () {
       };
 
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.site).to.exist.and.to.be.a('object');
       expect(requestBid.site.publisher).to.exist.and.to.be.a('object');
@@ -1491,6 +1500,7 @@ describe('S2S Adapter', function () {
         content: {
           language: 'en'
         },
+        domain: 'mytestpage.com',
         page: 'http://mytestpage.com'
       });
     });
@@ -1815,7 +1825,7 @@ describe('S2S Adapter', function () {
           device: device
         });
 
-        adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
+        adapter.callBids(addFpdEnrichmentsToS2SRequest(s2sBidRequest, BID_REQUESTS), BID_REQUESTS, addBidResponse, done, ajax);
 
         const requestBid = JSON.parse(server.requests[0].requestBody);
         expect(requestBid.site).to.exist.and.to.be.a('object');
@@ -2343,7 +2353,11 @@ describe('S2S Adapter', function () {
       }));
       const commonContextExpected = utils.mergeDeep({
         'page': 'http://mytestpage.com',
-        'publisher': { 'id': '1' }
+        'domain': 'mytestpage.com',
+        'publisher': {
+          'id': '1',
+          'domain': 'mytestpage.com'
+        }
       }, commonSite);
 
       const ortb2Fragments = {
@@ -2351,7 +2365,7 @@ describe('S2S Adapter', function () {
         bidder: Object.fromEntries(allowedBidders.map(bidder => [bidder, {site, user, bcat, badv}]))
       };
 
-      adapter.callBids({...s2sBidRequest, ortb2Fragments}, bidRequests, addBidResponse, done, ajax);
+      adapter.callBids(addFpdEnrichmentsToS2SRequest({...s2sBidRequest, ortb2Fragments}, bidRequests), bidRequests, addBidResponse, done, ajax);
       const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
       expect(parsedRequestBody.ext.prebid.bidderconfig).to.deep.equal(expected);
       expect(parsedRequestBody.site).to.deep.equal(commonContextExpected);
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index f4abcc4b9f6..99e0681e547 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -2768,47 +2768,6 @@ describe('User ID', function () {
         })
       })
     });
-
-    describe('findRootDomain', function () {
-      let sandbox;
-
-      beforeEach(function () {
-        init(config);
-        setSubmoduleRegistry([sharedIdSystemSubmodule]);
-        config.setConfig({
-          userSync: {
-            syncDelay: 0,
-            userIds: [
-              {
-                name: 'pubCommonId',
-                value: { pubcid: '11111' },
-              },
-            ],
-          },
-        });
-        sandbox = sinon.createSandbox();
-        sandbox
-          .stub(coreStorage, 'getCookie')
-          .onFirstCall()
-          .returns(null) // .co.uk
-          .onSecondCall()
-          .returns('writeable'); // realdomain.co.uk;
-      });
-
-      afterEach(function () {
-        sandbox.restore();
-      });
-
-      it('should just find the root domain', function () {
-        var domain = findRootDomain('sub.realdomain.co.uk');
-        expect(domain).to.be.eq('realdomain.co.uk');
-      });
-
-      it('should find the full domain when no subdomain is present', function () {
-        var domain = findRootDomain('realdomain.co.uk');
-        expect(domain).to.be.eq('realdomain.co.uk');
-      });
-    });
   });
 
   describe('handles config with ESP configuration in user sync object', function() {
diff --git a/test/spec/ortbConverter/default_processors_spec.js b/test/spec/ortbConverter/default_processors_spec.js
deleted file mode 100644
index 28a35390b86..00000000000
--- a/test/spec/ortbConverter/default_processors_spec.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import {setDevice, setSite} from '../../../libraries/ortbConverter/processors/default.js';
-
-describe('setDevice', () => {
-  it('sets device.w,  h, dnt, language, ua', () => {
-    const req = {};
-    setDevice(req);
-    ['h', 'w', 'dnt', 'language', 'ua'].forEach(prop => expect(req.device[prop]).to.exist)
-  });
-
-  it('does not override FPD', () => {
-    const req = {
-      device: {
-        w: 'w',
-        h: 'h',
-        ext: {}
-      }
-    };
-    setDevice(req);
-    sinon.assert.match(req.device, {
-      w: 'w',
-      h: 'h',
-      ext: {}
-    })
-  });
-});
-
-describe('setSite', () => {
-  const refererInfo = {
-    page: 'page.com',
-    ref: 'ref.com',
-    domain: 'domain.com'
-  };
-
-  it('sets site, domain, ref from refererInfo', () => {
-    const req = {
-      site: {
-        ext: {}
-      }
-    };
-    setSite(req, {refererInfo});
-    sinon.assert.match(req.site, refererInfo);
-    expect(req.site.ext).to.eql({});
-  });
-
-  it('does not override FPD', () => {
-    const req = {
-      site: {
-        ref: 'other ref'
-      }
-    }
-    setSite(req, {refererInfo});
-    expect(req.site.ref).to.eql('other ref');
-    ['domain', 'page'].forEach(prop => expect(req.site[prop]).to.eql(refererInfo[prop]));
-  });
-
-  it('does not set null properties from refererInfo', () => {
-    const req = {};
-    setSite(req, {refererInfo: {...refererInfo, ref: null}});
-    expect(req.site.ref).to.not.exist;
-  });
-});
diff --git a/test/spec/ortbConverter/gdpr_spec.js b/test/spec/ortbConverter/gdpr_spec.js
index 9851d7603b4..78fd1830438 100644
--- a/test/spec/ortbConverter/gdpr_spec.js
+++ b/test/spec/ortbConverter/gdpr_spec.js
@@ -1,33 +1,4 @@
-import {setOrtbAdditionalConsent, setOrtbGdpr} from '../../../modules/consentManagement.js';
-
-describe('pbjs - ortb gpdr', () => {
-  it('sets gdpr properties from bidderRequest', () => {
-    const req = {};
-    setOrtbGdpr(req, {gdprConsent: {gdprApplies: true, consentString: 'consent'}});
-    expect(req.regs.ext.gdpr).to.eql(1);
-    expect(req.user.ext.consent).to.eql('consent');
-  });
-
-  it('does not set it if missing', () => {
-    const req = {};
-    setOrtbGdpr(req, {});
-    expect(req).to.eql({});
-  });
-
-  it('sets user.ext.consent, but not regs.ext.gdpr, if gpdrApplies is not a boolean', () => {
-    const req = {};
-    setOrtbGdpr(req, {
-      gdprConsent: {consentString: 'mock-consent'}
-    });
-    expect(req).to.eql({
-      user: {
-        ext: {
-          consent: 'mock-consent'
-        }
-      }
-    })
-  });
-});
+import {setOrtbAdditionalConsent} from '../../../modules/consentManagement.js';
 
 describe('pbjs -> ortb addtlConsent', () => {
   it('sets ConsentedProvidersSettings', () => {
diff --git a/test/spec/ortbConverter/usp_spec.js b/test/spec/ortbConverter/usp_spec.js
deleted file mode 100644
index 01ff689cd97..00000000000
--- a/test/spec/ortbConverter/usp_spec.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import {setOrtbUsp} from '../../../modules/consentManagementUsp.js';
-
-describe('pbjs - ortb usp', () => {
-  it('sets regs.ext.us_privacy from bidderRequest', () => {
-    const req = {};
-    setOrtbUsp(req, {uspConsent: '1NN'});
-    expect(req.regs.ext.us_privacy).to.eql('1NN');
-  });
-
-  it('does not set if missing', () => {
-    const req = {};
-    setOrtbUsp(req, {});
-    expect(req).to.eql({});
-  });
-})
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index 8e3314bd954..9d8ea70e200 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -23,6 +23,8 @@ import $$PREBID_GLOBAL$$ from 'src/prebid.js';
 import {resetAuctionState} from 'src/auction.js';
 import {stubAuctionIndex} from '../../helpers/indexStub.js';
 import {createBid} from '../../../src/bidfactory.js';
+import {enrichFPD} from '../../../src/fpd/enrichment.js';
+import {mockFpdEnrichments} from '../../helpers/fpd.js';
 var assert = require('chai').assert;
 var expect = require('chai').expect;
 
@@ -195,7 +197,7 @@ window.apntag = {
 }
 
 describe('Unit: Prebid Module', function () {
-  let bidExpiryStub
+  let bidExpiryStub, sandbox;
 
   before(() => {
     hook.ready();
@@ -205,12 +207,15 @@ describe('Unit: Prebid Module', function () {
   });
 
   beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+    mockFpdEnrichments(sandbox);
     bidExpiryStub = sinon.stub(filters, 'isBidNotExpired').callsFake(() => true);
     configObj.setConfig({ useBidCache: true });
     resetAuctionState();
   });
 
   afterEach(function() {
+    sandbox.restore();
     $$PREBID_GLOBAL$$.adUnits = [];
     bidExpiryStub.restore();
     configObj.setConfig({ useBidCache: false });
@@ -1749,39 +1754,62 @@ describe('Unit: Prebid Module', function () {
         configObj.resetConfig();
       });
 
-      it('passing global and auction-level FPD as ortb2Fragments.global', () => {
-        configObj.setConfig({
-          ortb2: {
+      describe('with FPD', () => {
+        let globalFPD, auctionFPD, mergedFPD;
+        beforeEach(() => {
+          globalFPD = {
             'k1': 'v1',
             'k2': {
               'k3': 'v3',
               'k4': 'v4'
             }
-          }
-        });
-        $$PREBID_GLOBAL$$.requestBids({
-          ortb2: {
+          };
+          auctionFPD = {
             'k5': 'v5',
             'k2': {
               'k3': 'override',
               'k7': 'v7'
             }
-          }
-        });
-        sinon.assert.calledWith(startAuctionStub, sinon.match({
-          ortb2Fragments: {
-            global: {
-              'k1': 'v1',
-              'k5': 'v5',
-              'k2': {
-                'k3': 'override',
-                'k4': 'v4',
-                'k7': 'v7'
-              }
+          };
+          mergedFPD = {
+            'k1': 'v1',
+            'k5': 'v5',
+            'k2': {
+              'k3': 'override',
+              'k4': 'v4',
+              'k7': 'v7'
             }
+          };
+        });
+
+        it('merged from setConfig and requestBids', () => {
+          configObj.setConfig({ortb2: globalFPD});
+          $$PREBID_GLOBAL$$.requestBids({ortb2: auctionFPD});
+          sinon.assert.calledWith(startAuctionStub, sinon.match({
+            ortb2Fragments: {global: mergedFPD}
+          }));
+        });
+
+        it('enriched through enrichFPD', () => {
+          function enrich(next, fpd) {
+            next.bail(fpd.then(ortb2 => {
+              ortb2.enrich = true;
+              return ortb2;
+            }))
           }
-        }))
+          enrichFPD.before(enrich);
+          try {
+            configObj.setConfig({ortb2: globalFPD});
+            $$PREBID_GLOBAL$$.requestBids({ortb2: auctionFPD});
+            sinon.assert.calledWith(startAuctionStub, sinon.match({
+              ortb2Fragments: {global: {...mergedFPD, enrich: true}}
+            }));
+          } finally {
+            enrichFPD.getHooks({hook: enrich}).remove();
+          }
+        })
       });
+
       it('passing bidder-specific FPD as ortb2Fragments.bidder', () => {
         configObj.setBidderConfig({
           bidders: ['bidderA', 'bidderC'],

From 747f1430f33f69ca683198ae7ca8c10473ff7ce9 Mon Sep 17 00:00:00 2001
From: Zeeshan Rasool <zshnr@zshnr.com>
Date: Tue, 13 Dec 2022 19:59:40 +0000
Subject: [PATCH 521/569] Permutive RTD Module: add support for new ssp
 standard cohorts (#9236)

* add logic to parse and pass ssp data to appnexus

* simplify shouldSetConfig condition

* Write SSP cohorts into p_standard targeting (+ bug fixes)

* fix tests

* Simplify

* add logic to parse and pass ssp data to appnexus

* simplify shouldSetConfig condition

* Write SSP cohorts into p_standard targeting (+ bug fixes)

* fix tests

* Simplify

* use new key for auction kw cohorts

* Push SSP cohorts to SSPs via ORTB2

* Add tests and fix bugs

* Update tests

* update example with _pssps

* Remove custom `appnexusAuctionKeywords` and use user.keywords in ortb2 config

* Fix linting issues

Co-authored-by: Paulius Imbrasas <paulius@permutive.com>
---
 .../gpt/permutiveRtdProvider_example.html     |   3 +-
 modules/permutiveRtdProvider.js               |  61 ++++++++--
 .../spec/modules/permutiveRtdProvider_spec.js | 113 ++++++++++++++++--
 3 files changed, 156 insertions(+), 21 deletions(-)

diff --git a/integrationExamples/gpt/permutiveRtdProvider_example.html b/integrationExamples/gpt/permutiveRtdProvider_example.html
index 118cc678726..554f2081c6d 100644
--- a/integrationExamples/gpt/permutiveRtdProvider_example.html
+++ b/integrationExamples/gpt/permutiveRtdProvider_example.html
@@ -15,7 +15,8 @@
                 _papns: ['appnexus1', 'appnexus2'],
                 _psegs: ['1234', '1000001', '1000002'],
                 _ppam: ['ppam1', 'ppam2'],
-                _pcrprs: ['pcrprs1', 'pcrprs2']
+                _pcrprs: ['pcrprs1', 'pcrprs2'],
+                _pssps: { ssps: ['appnexus', 'some other'], cohorts: ['abcd', 'efgh', 'ijkl'] },
               }
 
               for (let key in data) {
diff --git a/modules/permutiveRtdProvider.js b/modules/permutiveRtdProvider.js
index c11d1c12436..d62834cfcfc 100644
--- a/modules/permutiveRtdProvider.js
+++ b/modules/permutiveRtdProvider.js
@@ -14,6 +14,7 @@ import {includes} from '../src/polyfill.js';
 const MODULE_NAME = 'permutive'
 
 export const PERMUTIVE_SUBMODULE_CONFIG_KEY = 'permutive-prebid-rtd'
+export const PERMUTIVE_STANDARD_AUD_KEYWORD = 'p_standard_aud'
 
 export const storage = getStorageManager({gvlid: null, moduleName: MODULE_NAME})
 
@@ -118,9 +119,21 @@ export function setBidderRtb (bidderOrtb2, customModuleConfig) {
   const transformationConfigs = deepAccess(moduleConfig, 'params.transformations') || []
   const segmentData = getSegments(maxSegs)
 
-  acBidders.forEach(function (bidder) {
+  const ssps = segmentData?.ssp?.ssps ?? []
+  const sspCohorts = segmentData?.ssp?.cohorts ?? []
+
+  const bidders = new Set([...acBidders, ...ssps])
+  bidders.forEach(function (bidder) {
     const currConfig = { ortb2: bidderOrtb2[bidder] || {} }
-    const nextConfig = updateOrtbConfig(currConfig, segmentData.ac, transformationConfigs) // ORTB2 uses the `ac` segment IDs
+
+    const isAcBidder = acBidders.indexOf(bidder) > -1
+    const isSspBidder = ssps.indexOf(bidder) > -1
+
+    let cohorts = []
+    if (isAcBidder) cohorts = segmentData.ac
+    if (isSspBidder) cohorts = [...new Set([...cohorts, ...sspCohorts])].slice(0, maxSegs)
+
+    const nextConfig = updateOrtbConfig(currConfig, cohorts, sspCohorts, transformationConfigs)
     bidderOrtb2[bidder] = nextConfig.ortb2;
   })
 }
@@ -131,9 +144,10 @@ export function setBidderRtb (bidderOrtb2, customModuleConfig) {
  * @param {Object[]} transformationConfigs - array of objects with `id` and `config` properties, used to determine
  *                                           the transformations on user data to include the ORTB2 object
  * @param {string[]} segmentIDs - Permutive segment IDs
+ * @param {string[]} sspSegmentIDs - Permutive SSP segment IDs
  * @return {Object} Merged ortb2 object
  */
-function updateOrtbConfig (currConfig, segmentIDs, transformationConfigs) {
+function updateOrtbConfig (currConfig, segmentIDs, sspSegmentIDs, transformationConfigs) {
   const name = 'permutive.com'
 
   const permutiveUserData = {
@@ -154,6 +168,12 @@ function updateOrtbConfig (currConfig, segmentIDs, transformationConfigs) {
 
   deepSetValue(ortbConfig, 'ortb2.user.data', updatedUserData)
 
+  // As of writing this, only used for AppNexus/Xandr in place of appnexusAuctionKeywords in config
+  const currentUserKeywords = deepAccess(ortbConfig, 'ortb2.user.keywords') || ''
+  const keywords = sspSegmentIDs.map(segment => `${PERMUTIVE_STANDARD_AUD_KEYWORD}=${segment}`).join(',')
+  const updatedUserKeywords = (currentUserKeywords === '') ? keywords : `${currentUserKeywords},${keywords}`
+  deepSetValue(ortbConfig, 'ortb2.user.keywords', updatedUserKeywords)
+
   return ortbConfig
 }
 
@@ -222,10 +242,19 @@ function getCustomBidderFn (moduleConfig, bidder) {
  * @return {Object} Bidder function
  */
 function getDefaultBidderFn (bidder) {
+  const isPStandardTargetingEnabled = (data, acEnabled) => {
+    return (acEnabled && data.ac && data.ac.length) || (data.ssp && data.ssp.cohorts.length)
+  }
+  const pStandardTargeting = (data, acEnabled) => {
+    const ac = (acEnabled) ? (data.ac ?? []) : []
+    const ssp = data?.ssp?.cohorts ?? []
+    return [...new Set([...ac, ...ssp])]
+  }
   const bidderMap = {
     appnexus: function (bid, data, acEnabled) {
-      if (acEnabled && data.ac && data.ac.length) {
-        deepSetValue(bid, 'params.keywords.p_standard', data.ac)
+      if (isPStandardTargetingEnabled(data, acEnabled)) {
+        const segments = pStandardTargeting(data, acEnabled)
+        deepSetValue(bid, 'params.keywords.p_standard', segments)
       }
       if (data.appnexus && data.appnexus.length) {
         deepSetValue(bid, 'params.keywords.permutive', data.appnexus)
@@ -234,19 +263,20 @@ function getDefaultBidderFn (bidder) {
       return bid
     },
     rubicon: function (bid, data, acEnabled) {
-      if (acEnabled && data.ac && data.ac.length) {
-        deepSetValue(bid, 'params.visitor.p_standard', data.ac)
+      if (isPStandardTargetingEnabled(data, acEnabled)) {
+        const segments = pStandardTargeting(data, acEnabled)
+        deepSetValue(bid, 'params.visitor.p_standard', segments)
       }
       if (data.rubicon && data.rubicon.length) {
-        const rubiconCohorts = deepAccess(bid, 'params.video') ? data.rubicon.map(String) : data.rubicon
-        deepSetValue(bid, 'params.visitor.permutive', rubiconCohorts)
+        deepSetValue(bid, 'params.visitor.permutive', data.rubicon.map(String))
       }
 
       return bid
     },
     ozone: function (bid, data, acEnabled) {
-      if (acEnabled && data.ac && data.ac.length) {
-        deepSetValue(bid, 'params.customData.0.targeting.p_standard', data.ac)
+      if (isPStandardTargetingEnabled(data, acEnabled)) {
+        const segments = pStandardTargeting(data, acEnabled)
+        deepSetValue(bid, 'params.customData.0.targeting.p_standard', segments)
       }
 
       return bid
@@ -290,10 +320,17 @@ export function getSegments (maxSegs) {
     rubicon: readSegments('_prubicons'),
     appnexus: readSegments('_papns'),
     gam: readSegments('_pdfps'),
+    ssp: readSegments('_pssps'),
   }
 
   for (const bidder in segments) {
-    segments[bidder] = segments[bidder].slice(0, maxSegs)
+    if (bidder === 'ssp') {
+      if (segments[bidder].cohorts && Array.isArray(segments[bidder].cohorts)) {
+        segments[bidder].cohorts = segments[bidder].cohorts.slice(0, maxSegs)
+      }
+    } else {
+      segments[bidder] = segments[bidder].slice(0, maxSegs)
+    }
   }
 
   return segments
diff --git a/test/spec/modules/permutiveRtdProvider_spec.js b/test/spec/modules/permutiveRtdProvider_spec.js
index 3f104ee1e2e..5030e662ea9 100644
--- a/test/spec/modules/permutiveRtdProvider_spec.js
+++ b/test/spec/modules/permutiveRtdProvider_spec.js
@@ -242,6 +242,42 @@ describe('permutiveRtdProvider', function () {
       })
     })
     it('should not overwrite ortb2 config', function () {
+      const moduleConfig = getConfig()
+      const acBidders = moduleConfig.params.acBidders
+      const sampleOrtbConfig = {
+        site: {
+          name: 'example'
+        },
+        user: {
+          data: [
+            {
+              name: 'www.dataprovider1.com',
+              ext: { taxonomyname: 'iab_audience_taxonomy' },
+              segment: [{ id: '687' }, { id: '123' }]
+            }
+          ]
+        }
+      }
+
+      const bidderConfig = Object.fromEntries(acBidders.map(bidder => [bidder, sampleOrtbConfig]))
+
+      const transformedUserData = {
+        name: 'transformation',
+        ext: { test: true },
+        segment: [1, 2, 3]
+      }
+
+      setBidderRtb(bidderConfig, moduleConfig, {
+        // TODO: this argument is unused, is the test still valid / needed?
+        testTransformation: userData => transformedUserData
+      })
+
+      acBidders.forEach(bidder => {
+        expect(bidderConfig[bidder].site.name).to.equal(sampleOrtbConfig.site.name)
+        expect(bidderConfig[bidder].user.data).to.deep.include.members([sampleOrtbConfig.user.data[0]])
+      })
+    })
+    it('should update user.keywords and not override existing values', function () {
       const moduleConfig = getConfig()
       const acBidders = moduleConfig.params.acBidders
       const sampleOrtbConfig = {
@@ -275,9 +311,64 @@ describe('permutiveRtdProvider', function () {
 
       acBidders.forEach(bidder => {
         expect(bidderConfig[bidder].site.name).to.equal(sampleOrtbConfig.site.name)
-        expect(bidderConfig[bidder].user.keywords).to.equal(sampleOrtbConfig.user.keywords)
         expect(bidderConfig[bidder].user.data).to.deep.include.members([sampleOrtbConfig.user.data[0]])
+        expect(bidderConfig[bidder].user.keywords).to.deep.equal('a,b,p_standard_aud=123,p_standard_aud=abc')
+      })
+    })
+    it('should merge ortb2 correctly for ac and ssps', function () {
+      setLocalStorage({
+        '_ppam': [],
+        '_psegs': [],
+        '_pcrprs': ['abc', 'def', 'xyz'],
+        '_pssps': {
+          ssps: ['foo', 'bar'],
+          cohorts: ['xyz', 'uvw'],
+        }
       })
+      const moduleConfig = {
+        name: 'permutive',
+        waitForIt: true,
+        params: {
+          acBidders: ['foo', 'other'],
+          maxSegs: 30
+        }
+      }
+      const bidderConfig = {};
+
+      setBidderRtb(bidderConfig, moduleConfig)
+
+      // include both ac and ssp cohorts, as foo is both in ac bidders and ssps
+      const expectedFooTargetingData = [
+        { id: 'abc' },
+        { id: 'def' },
+        { id: 'xyz' },
+        { id: 'uvw' },
+      ]
+      expect(bidderConfig['foo'].user.data).to.deep.include.members([{
+        name: 'permutive.com',
+        segment: expectedFooTargetingData
+      }])
+
+      // don't include ac targeting as it's not in ac bidders
+      const expectedBarTargetingData = [
+        { id: 'xyz' },
+        { id: 'uvw' },
+      ]
+      expect(bidderConfig['bar'].user.data).to.deep.include.members([{
+        name: 'permutive.com',
+        segment: expectedBarTargetingData
+      }])
+
+      // only include ac targeting as this ssp is not in ssps list
+      const expectedOtherTargetingData = [
+        { id: 'abc' },
+        { id: 'def' },
+        { id: 'xyz' },
+      ]
+      expect(bidderConfig['other'].user.data).to.deep.include.members([{
+        name: 'permutive.com',
+        segment: expectedOtherTargetingData
+      }])
     })
   })
 
@@ -291,7 +382,11 @@ describe('permutiveRtdProvider', function () {
       const segments = getSegments(max)
 
       for (const key in segments) {
-        expect(segments[key]).to.have.length(max)
+        if (key === 'ssp') {
+          expect(segments[key].cohorts).to.have.length(max)
+        } else {
+          expect(segments[key]).to.have.length(max)
+        }
       }
     })
   })
@@ -311,7 +406,7 @@ describe('permutiveRtdProvider', function () {
 
             if (bidder === 'appnexus') {
               expect(deepAccess(params, 'keywords.permutive')).to.eql(data.appnexus)
-              expect(deepAccess(params, 'keywords.p_standard')).to.eql(data.ac)
+              expect(deepAccess(params, 'keywords.p_standard')).to.eql(data.ac.concat(data.ssp.cohorts))
             }
           })
         })
@@ -332,7 +427,7 @@ describe('permutiveRtdProvider', function () {
 
             if (bidder === 'rubicon') {
               expect(deepAccess(params, 'visitor.permutive')).to.eql(data.rubicon)
-              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac)
+              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac.concat(data.ssp.cohorts))
             }
           })
         })
@@ -363,7 +458,7 @@ describe('permutiveRtdProvider', function () {
                 deepAccess(params, 'visitor.permutive'),
                 'Should map all targeting values to a string',
               ).to.eql(data.rubicon.map(String))
-              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac)
+              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac.concat(data.ssp.cohorts))
             }
           })
         })
@@ -383,7 +478,7 @@ describe('permutiveRtdProvider', function () {
             const { bidder, params } = bid
 
             if (bidder === 'ozone') {
-              expect(deepAccess(params, 'customData.0.targeting.p_standard')).to.eql(data.ac)
+              expect(deepAccess(params, 'customData.0.targeting.p_standard')).to.eql(data.ac.concat(data.ssp.cohorts))
             }
           })
         })
@@ -417,7 +512,7 @@ describe('permutiveRtdProvider', function () {
 
             if (bidder === 'rubicon') {
               expect(deepAccess(params, 'visitor.permutive')).to.eql(data.gam)
-              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac)
+              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac.concat(data.ssp.cohorts))
             }
           })
         })
@@ -555,6 +650,7 @@ function transformedTargeting (data = getTargetingData()) {
     appnexus: data._papns,
     rubicon: data._prubicons,
     gam: data._pdfps,
+    ssp: data._pssps,
   }
 }
 
@@ -565,7 +661,8 @@ function getTargetingData () {
     _papns: ['appnexus1', 'appnexus2'],
     _psegs: ['1234', '1000001', '1000002'],
     _ppam: ['ppam1', 'ppam2'],
-    _pcrprs: ['pcrprs1', 'pcrprs2']
+    _pcrprs: ['pcrprs1', 'pcrprs2', 'dup'],
+    _pssps: { ssps: ['xyz', 'abc', 'dup'], cohorts: ['123', 'abc'] }
   }
 }
 

From dc7e77f7c11928ff0c966badfe2a17b8ea18b880 Mon Sep 17 00:00:00 2001
From: jxdeveloper1 <71084096+jxdeveloper1@users.noreply.github.com>
Date: Wed, 14 Dec 2022 05:11:42 +0800
Subject: [PATCH 522/569] Jixie Bid Adapter: Add read jxtoko cookie (#9331)

* Adapter does not seem capable of supporting advertiserDomains #6650
added response comment and some trivial code.

* removed a blank line at the end of file
added a space behind the // in comments

* in response to comment from reviewer. add the aspect of advertiserdomain in unit tests

* added the code to get the keywords from the meta tags if available.

* added some cookie fetching
---
 modules/jixieBidAdapter.js                | 2 ++
 test/spec/modules/jixieBidAdapter_spec.js | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/modules/jixieBidAdapter.js b/modules/jixieBidAdapter.js
index f6f58883990..5eeab197f3a 100644
--- a/modules/jixieBidAdapter.js
+++ b/modules/jixieBidAdapter.js
@@ -56,6 +56,8 @@ function fetchIds_() {
     if (tmp) ret.client_id_ls = tmp;
     tmp = storage.getDataFromLocalStorage('_jxxs');
     if (tmp) ret.session_id_ls = tmp;
+    tmp = storage.getCookie('_jxtoko');
+    if (tmp) ret.jxtoko_id = tmp;
   } catch (error) {}
   return ret;
 }
diff --git a/test/spec/modules/jixieBidAdapter_spec.js b/test/spec/modules/jixieBidAdapter_spec.js
index 0c999f1cd51..c354de3c3ac 100644
--- a/test/spec/modules/jixieBidAdapter_spec.js
+++ b/test/spec/modules/jixieBidAdapter_spec.js
@@ -71,6 +71,7 @@ describe('jixie Adapter', function () {
 
     const clientIdTest1_ = '1aba6a40-f711-11e9-868c-53a2ae972xxx';
     const sessionIdTest1_ = '1594782644-1aba6a40-f711-11e9-868c-53a2ae972xxx';
+    const jxtokoTest1_ = 'eyJJRCI6ImFiYyJ9';
 
     // to serve as the object that prebid will call jixie buildRequest with: (param2)
     const bidderRequest_ = {
@@ -198,6 +199,9 @@ describe('jixie Adapter', function () {
       // get the interceptors ready:
       let getCookieStub = sinon.stub(storage, 'getCookie');
       let getLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+      getCookieStub
+        .withArgs('_jxtoko')
+        .returns(jxtokoTest1_);
       getCookieStub
         .withArgs('_jxx')
         .returns(clientIdTest1_);
@@ -227,6 +231,7 @@ describe('jixie Adapter', function () {
       expect(payload).to.have.property('client_id_ls', clientIdTest1_);
       expect(payload).to.have.property('session_id_c', sessionIdTest1_);
       expect(payload).to.have.property('session_id_ls', sessionIdTest1_);
+      expect(payload).to.have.property('jxtoko_id', jxtokoTest1_);
       expect(payload).to.have.property('device', device_);
       expect(payload).to.have.property('domain', domain_);
       expect(payload).to.have.property('pageurl', pageurl_);

From 1b1c2a828614a45fab50e1b2c3e3373b269e0ccd Mon Sep 17 00:00:00 2001
From: Olivier <osazos@adagio.io>
Date: Wed, 14 Dec 2022 11:38:15 +0100
Subject: [PATCH 523/569] AdagioBidAdapter: add missing try-catch (#9338)

---
 modules/adagioBidAdapter.js | 75 ++++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index 8dcd95f933b..4f86a914982 100644
--- a/modules/adagioBidAdapter.js
+++ b/modules/adagioBidAdapter.js
@@ -761,46 +761,51 @@ function getSlotPosition(adUnitElementId) {
     position.x = Math.round(sfGeom.t);
     position.y = Math.round(sfGeom.l);
   } else if (canAccessTopWindow()) {
-    // window.top based computing
-    const wt = getWindowTop();
-    const d = wt.document;
+    try {
+      // window.top based computing
+      const wt = getWindowTop();
+      const d = wt.document;
 
-    let domElement;
+      let domElement;
 
-    if (inIframe() === true) {
-      const ws = getWindowSelf();
-      const currentElement = ws.document.getElementById(adUnitElementId);
-      domElement = internal.getElementFromTopWindow(currentElement, ws);
-    } else {
-      domElement = wt.document.getElementById(adUnitElementId);
-    }
+      if (inIframe() === true) {
+        const ws = getWindowSelf();
+        const currentElement = ws.document.getElementById(adUnitElementId);
+        domElement = internal.getElementFromTopWindow(currentElement, ws);
+      } else {
+        domElement = wt.document.getElementById(adUnitElementId);
+      }
 
-    if (!domElement) {
-      return '';
-    }
+      if (!domElement) {
+        return '';
+      }
 
-    let box = domElement.getBoundingClientRect();
-
-    const docEl = d.documentElement;
-    const body = d.body;
-    const clientTop = d.clientTop || body.clientTop || 0;
-    const clientLeft = d.clientLeft || body.clientLeft || 0;
-    const scrollTop = wt.pageYOffset || docEl.scrollTop || body.scrollTop;
-    const scrollLeft = wt.pageXOffset || docEl.scrollLeft || body.scrollLeft;
-
-    const elComputedStyle = wt.getComputedStyle(domElement, null);
-    const elComputedDisplay = elComputedStyle.display || 'block';
-    const mustDisplayElement = elComputedDisplay === 'none';
-
-    if (mustDisplayElement) {
-      domElement.style = domElement.style || {};
-      const originalDisplay = domElement.style.display;
-      domElement.style.display = 'block';
-      box = domElement.getBoundingClientRect();
-      domElement.style.display = originalDisplay || null;
+      let box = domElement.getBoundingClientRect();
+
+      const docEl = d.documentElement;
+      const body = d.body;
+      const clientTop = d.clientTop || body.clientTop || 0;
+      const clientLeft = d.clientLeft || body.clientLeft || 0;
+      const scrollTop = wt.pageYOffset || docEl.scrollTop || body.scrollTop;
+      const scrollLeft = wt.pageXOffset || docEl.scrollLeft || body.scrollLeft;
+
+      const elComputedStyle = wt.getComputedStyle(domElement, null);
+      const elComputedDisplay = elComputedStyle.display || 'block';
+      const mustDisplayElement = elComputedDisplay === 'none';
+
+      if (mustDisplayElement) {
+        domElement.style = domElement.style || {};
+        const originalDisplay = domElement.style.display;
+        domElement.style.display = 'block';
+        box = domElement.getBoundingClientRect();
+        domElement.style.display = originalDisplay || null;
+      }
+      position.x = Math.round(box.left + scrollLeft - clientLeft);
+      position.y = Math.round(box.top + scrollTop - clientTop);
+    } catch (err) {
+      logError(LOG_PREFIX, err);
+      return '';
     }
-    position.x = Math.round(box.left + scrollLeft - clientLeft);
-    position.y = Math.round(box.top + scrollTop - clientTop);
   } else {
     return '';
   }

From 9abfb3d2ba3ed0160f3beaea394f438bd2fca99a Mon Sep 17 00:00:00 2001
From: Steffen Anders <steffen.anders@adup-tech.com>
Date: Wed, 14 Dec 2022 13:24:11 +0100
Subject: [PATCH 524/569] AdUp Technology bid adapter: optimize floor price
 detection (#9332)

---
 modules/aduptechBidAdapter.js                |  90 ++++++++-----
 test/spec/modules/aduptechBidAdapter_spec.js | 131 ++++++++++++++-----
 2 files changed, 159 insertions(+), 62 deletions(-)

diff --git a/modules/aduptechBidAdapter.js b/modules/aduptechBidAdapter.js
index 5d8b69af77f..c39d9e14f17 100644
--- a/modules/aduptechBidAdapter.js
+++ b/modules/aduptechBidAdapter.js
@@ -1,4 +1,4 @@
-import {deepAccess, getAdUnitSizes} from '../src/utils.js';
+import {getAdUnitSizes, isArray, isBoolean, isEmpty, isFn, isPlainObject} from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, NATIVE} from '../src/mediaTypes.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
@@ -23,7 +23,7 @@ export const internal = {
     if (bidderRequest && bidderRequest.gdprConsent) {
       return {
         consentString: bidderRequest.gdprConsent.consentString,
-        consentRequired: (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : true
+        consentRequired: (isBoolean(bidderRequest.gdprConsent.gdprApplies)) ? bidderRequest.gdprConsent.gdprApplies : true
       };
     }
 
@@ -60,8 +60,26 @@ export const internal = {
    */
   extractBannerConfig: (bidRequest) => {
     const sizes = getAdUnitSizes(bidRequest);
-    if (Array.isArray(sizes) && sizes.length > 0) {
-      return { sizes: sizes };
+    if (isArray(sizes) && !isEmpty(sizes)) {
+      const banner = { sizes: sizes };
+
+      // try to add floor for each banner size
+      banner.sizes.forEach(size => {
+        const floor = internal.getFloor(bidRequest, { mediaType: BANNER, size });
+        if (floor) {
+          size.push(floor.floor);
+          size.push(floor.currency);
+        }
+      });
+
+      // try to add default floor for banner
+      const floor = internal.getFloor(bidRequest, { mediaType: BANNER, size: '*' });
+      if (floor) {
+        banner.floorPrice = floor.floor;
+        banner.floorCurrency = floor.currency;
+      }
+
+      return banner;
     }
 
     return null;
@@ -74,8 +92,17 @@ export const internal = {
    * @returns {null|Object.<string, *>}
    */
   extractNativeConfig: (bidRequest) => {
-    if (bidRequest && deepAccess(bidRequest, 'mediaTypes.native')) {
-      return bidRequest.mediaTypes.native;
+    if (bidRequest?.mediaTypes?.native) {
+      const native = bidRequest.mediaTypes.native;
+
+      // try to add default floor for native
+      const floor = internal.getFloor(bidRequest, { mediaType: NATIVE, size: '*' });
+      if (floor) {
+        native.floorPrice = floor.floor;
+        native.floorCurrency = floor.currency;
+      }
+
+      return native;
     }
 
     return null;
@@ -96,27 +123,25 @@ export const internal = {
   },
 
   /**
-   * Extracts the floor price params from given bidRequest
+   * Try to get floor information via bidRequest.getFloor()
    *
    * @param {BidRequest} bidRequest
-   * @returns {undefined|float}
+   * @param {Object<string, *>} options
+   * @returns {null|Object.<string, *>}
    */
-  extractFloorPrice: (bidRequest) => {
-    let floorPrice;
-    if (bidRequest && bidRequest.params && bidRequest.params.floor) {
-      // if there is a manual floorPrice set
-      floorPrice = !isNaN(parseInt(bidRequest.params.floor)) ? bidRequest.params.floor : undefined;
-    }
-    if (typeof bidRequest.getFloor === 'function') {
-      // use prebid floor module
-      let floorInfo;
-      try {
-        floorInfo = bidRequest.getFloor();
-      } catch (e) {}
-      floorPrice = typeof floorInfo === 'object' && !isNaN(parseInt(floorInfo.floor)) ? floorInfo.floor : floorPrice;
+  getFloor: (bidRequest, options) => {
+    if (!isFn(bidRequest?.getFloor)) {
+      return null;
     }
 
-    return floorPrice;
+    try {
+      const floor = bidRequest.getFloor(options);
+      if (isPlainObject(floor) && !isNaN(floor.floor)) {
+        return floor;
+      }
+    } catch {}
+
+    return null;
   },
 
   /**
@@ -128,11 +153,11 @@ export const internal = {
   groupBidRequestsByPublisher: (bidRequests) => {
     const groupedBidRequests = {};
 
-    if (!bidRequests || bidRequests.length === 0) {
+    if (!bidRequests || isEmpty(bidRequests)) {
       return groupedBidRequests;
     }
 
-    bidRequests.forEach((bidRequest) => {
+    bidRequests.forEach(bidRequest => {
       const publisher = internal.extractParams(bidRequest).publisher;
       if (!publisher) {
         return;
@@ -205,7 +230,7 @@ export const spec = {
     const requests = [];
 
     // stop here on invalid or empty data
-    if (!bidderRequest || !validBidRequests || validBidRequests.length === 0) {
+    if (!bidderRequest || !validBidRequests || isEmpty(validBidRequests)) {
       return requests;
     }
 
@@ -237,7 +262,7 @@ export const spec = {
       }
 
       // handle multiple bids per request
-      groupedBidRequests[publisher].forEach((bidRequest) => {
+      groupedBidRequests[publisher].forEach(bidRequest => {
         const bid = {
           bidId: bidRequest.bidId,
           transactionId: bidRequest.transactionId,
@@ -257,10 +282,11 @@ export const spec = {
           bid.native = nativeConfig;
         }
 
-        // add floor price
-        const floorPrice = internal.extractFloorPrice(bidRequest);
-        if (floorPrice) {
-          bid.floorPrice = floorPrice;
+        // try to add default floor
+        const floor = internal.getFloor(bidRequest, { mediaType: '*', size: '*' });
+        if (floor) {
+          bid.floorPrice = floor.floor;
+          bid.floorCurrency = floor.currency;
         }
 
         request.data.imp.push(bid);
@@ -282,12 +308,12 @@ export const spec = {
     const bidResponses = [];
 
     // stop here on invalid or empty data
-    if (!response || !deepAccess(response, 'body.bids') || response.body.bids.length === 0) {
+    if (!response?.body?.bids || isEmpty(response.body.bids)) {
       return bidResponses;
     }
 
     // parse multiple bids per response
-    response.body.bids.forEach((bid) => {
+    response.body.bids.forEach(bid => {
       if (!bid || !bid.bid || !bid.creative) {
         return;
       }
diff --git a/test/spec/modules/aduptechBidAdapter_spec.js b/test/spec/modules/aduptechBidAdapter_spec.js
index bbc4e554f7e..8dbdbbfeab5 100644
--- a/test/spec/modules/aduptechBidAdapter_spec.js
+++ b/test/spec/modules/aduptechBidAdapter_spec.js
@@ -182,6 +182,54 @@ describe('AduptechBidAdapter', () => {
       });
     });
 
+    describe('getFloor', () => {
+      let bidRequest;
+
+      beforeEach(() => {
+        bidRequest = {
+          getFloor: sinon.stub()
+        };
+      });
+
+      it('should handle empty or invalid bidRequest', () => {
+        expect(internal.getFloor(null)).to.be.null;
+        expect(internal.getFloor({})).to.be.null;
+        expect(internal.getFloor({ getFloor: 'foo' })).to.be.null;
+      });
+
+      it('should detect floor via getFloor()', () => {
+        const result = {
+          floor: 1.11,
+          currency: 'USD'
+        };
+
+        const options = {
+          mediaType: BANNER,
+          size: '*'
+        }
+
+        bidRequest.getFloor.returns(result);
+
+        expect(internal.getFloor(bidRequest, options)).to.deep.equal(result);
+        expect(bidRequest.getFloor.calledOnceWith(options)).to.be.true;
+      });
+
+      it('should handle empty, invalid or faulty getFloor() results', () => {
+        bidRequest.getFloor
+          .onCall(0).returns({})
+          .onCall(1).returns({ floor: 'foo' })
+          .onCall(2).returns('bar')
+          .onCall(3).throws(new Error('baz'));
+
+        expect(internal.getFloor(bidRequest, {})).to.be.null;
+        expect(internal.getFloor(bidRequest, {})).to.be.null;
+        expect(internal.getFloor(bidRequest, {})).to.be.null;
+        expect(internal.getFloor(bidRequest, {})).to.be.null;
+
+        expect(bidRequest.getFloor.callCount).to.equal(4);
+      });
+    });
+
     describe('groupBidRequestsByPublisher', () => {
       it('should handle empty bidRequests', () => {
         expect(internal.groupBidRequestsByPublisher(null)).to.deep.equal({});
@@ -541,34 +589,35 @@ describe('AduptechBidAdapter', () => {
           }
         };
 
-        const getFloorResponse = {
-          currency: 'USD',
-          floor: '1.23'
-        };
-
-        const validBidRequests = [
-          {
-            bidId: 'bidId1',
-            adUnitCode: 'adUnitCode1',
-            transactionId: 'transactionId1',
-            mediaTypes: {
-              banner: {
-                sizes: [[100, 200], [300, 400]]
-              }
-            },
-            params: {
-              publisher: 'publisher1',
-              placement: 'placement1'
+        const bidRequest = {
+          bidId: 'bidId1',
+          adUnitCode: 'adUnitCode1',
+          transactionId: 'transactionId1',
+          mediaTypes: {
+            banner: {
+              sizes: [[100, 200], [300, 400]]
             },
-            getFloor: () => {
-              return getFloorResponse
+            native: {
+              image: {
+                required: true
+              },
             }
-          }
-        ];
+          },
+          params: {
+            publisher: 'publisher1',
+            placement: 'placement1'
+          },
+          getFloor: sinon.stub()
+            .onCall(0).returns({ floor: 1.11, currency: 'USD' })
+            .onCall(1).returns({ floor: 2.22, currency: 'EUR' })
+            .onCall(2).returns({ floor: 3.33, currency: 'USD' })
+            .onCall(3).returns({ floor: 4.44, currency: 'GBP' })
+            .onCall(4).returns({ floor: 5.55, currency: 'EUR' })
+        };
 
-        expect(spec.buildRequests(validBidRequests, bidderRequest)).to.deep.equal([
+        expect(spec.buildRequests([bidRequest], bidderRequest)).to.deep.equal([
           {
-            url: internal.buildEndpointUrl(validBidRequests[0].params.publisher),
+            url: internal.buildEndpointUrl(bidRequest.params.publisher),
             method: ENDPOINT_METHOD,
             data: {
               auctionId: bidderRequest.auctionId,
@@ -580,17 +629,39 @@ describe('AduptechBidAdapter', () => {
               },
               imp: [
                 {
-                  bidId: validBidRequests[0].bidId,
-                  transactionId: validBidRequests[0].transactionId,
-                  adUnitCode: validBidRequests[0].adUnitCode,
-                  params: validBidRequests[0].params,
-                  banner: validBidRequests[0].mediaTypes.banner,
-                  floorPrice: getFloorResponse.floor
+                  bidId: bidRequest.bidId,
+                  transactionId: bidRequest.transactionId,
+                  adUnitCode: bidRequest.adUnitCode,
+                  params: bidRequest.params,
+                  banner: {
+                    sizes: [
+                      [100, 200, 1.11, 'USD'],
+                      [300, 400, 2.22, 'EUR'],
+                    ],
+                    floorPrice: 3.33,
+                    floorCurrency: 'USD'
+                  },
+                  native: {
+                    image: {
+                      required: true
+                    },
+                    floorPrice: 4.44,
+                    floorCurrency: 'GBP'
+                  },
+                  floorPrice: 5.55,
+                  floorCurrency: 'EUR'
                 }
               ]
             }
           }
         ]);
+
+        expect(bidRequest.getFloor.callCount).to.equal(5);
+        expect(bidRequest.getFloor.getCall(0).calledWith({ mediaType: BANNER, size: bidRequest.mediaTypes.banner.sizes[0] })).to.be.true;
+        expect(bidRequest.getFloor.getCall(1).calledWith({ mediaType: BANNER, size: bidRequest.mediaTypes.banner.sizes[1] })).to.be.true;
+        expect(bidRequest.getFloor.getCall(2).calledWith({ mediaType: BANNER, size: '*' })).to.be.true;
+        expect(bidRequest.getFloor.getCall(3).calledWith({ mediaType: NATIVE, size: '*' })).to.be.true;
+        expect(bidRequest.getFloor.getCall(4).calledWith({ mediaType: '*', size: '*' })).to.be.true;
       });
     });
 

From 9f11a94397a6b90550dd2dd9456e66a70d773644 Mon Sep 17 00:00:00 2001
From: Mikhail Ivanchenko <mihail.ivanchenko@nextmillennium.io>
Date: Wed, 14 Dec 2022 16:13:00 +0300
Subject: [PATCH 525/569] nextMillenniumBidAdapter: improve getUserSyncs
 function (#9313)

* add video support

* improve userSync url

* improve userSync url

* Add tests for a new cases

* use deepAccess instead of instanceof
---
 modules/nextMillenniumBidAdapter.js           | 45 +++++++---
 .../modules/nextMillenniumBidAdapter_spec.js  | 83 +++++++++++--------
 2 files changed, 79 insertions(+), 49 deletions(-)

diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index cf732d343e5..b5d0e15d078 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -1,4 +1,5 @@
 import {
+  isArray,
   _each,
   createTrackPixelHtml,
   deepAccess,
@@ -24,7 +25,6 @@ const BIDDER_CODE = 'nextMillennium';
 const ENDPOINT = 'https://pbs.nextmillmedia.com/openrtb2/auction';
 const TEST_ENDPOINT = 'https://test.pbs.nextmillmedia.com/openrtb2/auction';
 const REPORT_ENDPOINT = 'https://report2.hb.brainlyads.com/statistics/metric';
-const SYNC_ENDPOINT = 'https://cookies.nextmillmedia.com/sync?';
 const TIME_TO_LIVE = 360;
 const VIDEO_PARAMS = [
   'api', 'linearity', 'maxduration', 'mimes', 'minduration', 'placement',
@@ -208,20 +208,27 @@ export const spec = {
 
   getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
     const pixels = [];
-    let syncUrl = SYNC_ENDPOINT;
 
-    if (gdprConsent && gdprConsent.gdprApplies) {
-      syncUrl += 'gdpr=1&gdpr_consent=' + gdprConsent.consentString;
-    }
-    if (uspConsent) {
-      syncUrl += 'us_privacy=' + uspConsent;
-    }
+    if (isArray(responses)) {
+      responses.forEach(response => {
+        if (syncOptions.pixelEnabled) {
+          deepAccess(response, 'body.ext.sync.image', []).forEach(imgUrl => {
+            pixels.push({
+              type: 'image',
+              url: replaceUsersyncMacros(imgUrl, gdprConsent, uspConsent)
+            });
+          })
+        }
 
-    if (syncOptions.iframeEnabled) {
-      pixels.push({type: 'iframe', url: syncUrl + 'type=iframe'});
-    }
-    if (syncOptions.pixelEnabled) {
-      pixels.push({type: 'image', url: syncUrl + 'type=image'});
+        if (syncOptions.iframeEnabled) {
+          deepAccess(response, 'body.ext.sync.iframe', []).forEach(iframeUrl => {
+            pixels.push({
+              type: 'iframe',
+              url: replaceUsersyncMacros(iframeUrl, gdprConsent, uspConsent)
+            });
+          })
+        }
+      })
     }
 
     return pixels;
@@ -263,6 +270,18 @@ export const spec = {
   },
 };
 
+function replaceUsersyncMacros(url, gdprConsent, uspConsent) {
+  const { consentString, gdprApplies } = gdprConsent;
+
+  return url.replace(
+    '{{.GDPR}}', Number(gdprApplies)
+  ).replace(
+    '{{.GDPRConsent}}', consentString
+  ).replace(
+    '{{.USPrivacy}}', uspConsent
+  );
+};
+
 function getAdEl(bid) {
   // best way I could think of to get El, is by matching adUnitCode to google slots...
   const slot = window.googletag && window.googletag.pubads && window.googletag.pubads().getSlots().find(slot => slot.getAdUnitPath() === bid.adUnitCode);
diff --git a/test/spec/modules/nextMillenniumBidAdapter_spec.js b/test/spec/modules/nextMillenniumBidAdapter_spec.js
index 3094c1349f7..90f0d8ae15c 100644
--- a/test/spec/modules/nextMillenniumBidAdapter_spec.js
+++ b/test/spec/modules/nextMillenniumBidAdapter_spec.js
@@ -28,6 +28,34 @@ describe('nextMillenniumBidAdapterTests', function() {
     }
   ];
 
+  const serverResponse = {
+    body: {
+      id: 'f7b3d2da-e762-410c-b069-424f92c4c4b2',
+      seatbid: [
+        {
+          bid: [
+            {
+              id: '7457329903666272789',
+              price: 0.5,
+              adm: 'Hello! It\'s a test ad!',
+              adid: '96846035',
+              adomain: ['test.addomain.com'],
+              w: 300,
+              h: 250
+            }
+          ]
+        }
+      ],
+      cur: 'USD',
+      ext: {
+        sync: {
+          image: ['urlA'],
+          iframe: ['urlB'],
+        }
+      }
+    }
+  };
+
   const bidRequestDataGI = [
     {
       adUnitCode: 'test-banner-gi',
@@ -96,6 +124,24 @@ describe('nextMillenniumBidAdapterTests', function() {
     expect(JSON.parse(request[0].data).regs.ext.gdpr).to.equal(1);
   });
 
+  it('Test getUserSyncs function', function () {
+    const syncOptions = {
+      'iframeEnabled': false,
+      'pixelEnabled': true
+    }
+    let userSync = spec.getUserSyncs(syncOptions, [serverResponse], bidRequestData[0].gdprConsent, bidRequestData[0].uspConsent);
+    expect(userSync).to.be.an('array').with.lengthOf(1);
+    expect(userSync[0].type).to.equal('image');
+    expect(userSync[0].url).to.equal('urlA');
+
+    syncOptions.iframeEnabled = true;
+    syncOptions.pixelEnabled = false;
+    userSync = spec.getUserSyncs(syncOptions, [serverResponse], bidRequestData[0].gdprConsent, bidRequestData[0].uspConsent);
+    expect(userSync).to.be.an('array').with.lengthOf(1);
+    expect(userSync[0].type).to.equal('iframe');
+    expect(userSync[0].url).to.equal('urlB');
+  });
+
   it('Request params check without GDPR Consent', function () {
     delete bidRequestData[0].gdprConsent
     const request = spec.buildRequests(bidRequestData, bidRequestData[0]);
@@ -137,51 +183,16 @@ describe('nextMillenniumBidAdapterTests', function() {
   it('Check if imp object was added', function() {
     const request = spec.buildRequests(bidRequestData)
     expect(JSON.parse(request[0].data).imp).to.be.an('array')
-  })
+  });
 
   it('Check if imp prebid stored id is correct', function() {
     const request = spec.buildRequests(bidRequestData)
     const requestData = JSON.parse(request[0].data);
     const storedReqId = requestData.ext.prebid.storedrequest.id;
     expect(requestData.imp[0].ext.prebid.storedrequest.id).to.equal(storedReqId)
-  })
-
-  it('Test getUserSyncs function', function () {
-    const syncOptions = {
-      'iframeEnabled': false,
-      'pixelEnabled': true
-    }
-    const userSync = spec.getUserSyncs(syncOptions);
-    expect(userSync).to.be.an('array').with.lengthOf(1);
-    expect(userSync[0].type).to.exist;
-    expect(userSync[0].url).to.exist;
-    expect(userSync[0].type).to.be.equal('image');
-    expect(userSync[0].url).to.be.equal('https://cookies.nextmillmedia.com/sync?type=image');
   });
 
   it('validate_response_params', function() {
-    const serverResponse = {
-      body: {
-        id: 'f7b3d2da-e762-410c-b069-424f92c4c4b2',
-        seatbid: [
-          {
-            bid: [
-              {
-                id: '7457329903666272789',
-                price: 0.5,
-                adm: 'Hello! It\'s a test ad!',
-                adid: '96846035',
-                adomain: ['test.addomain.com'],
-                w: 300,
-                h: 250
-              }
-            ]
-          }
-        ],
-        cur: 'USD'
-      }
-    };
-
     let bids = spec.interpretResponse(serverResponse, bidRequestData[0]);
     expect(bids).to.have.lengthOf(1);
 

From 14bdd9d36957bf59e87b965cc871deae2ac24929 Mon Sep 17 00:00:00 2001
From: Lionell Pack <lionellpack@gmail.com>
Date: Thu, 15 Dec 2022 08:58:31 +1100
Subject: [PATCH 526/569] Uid2 module: major implementation change (#9264)

* Complete the UID2 integration.

Update docs.
Add tests.

* Removed some unnecessary code in uid2IdSystem.uid2IdSystem.

Improved log messages.
Pass through configured baseUrl.
Tidied up some in-progress code problems.
Added a timer mock to track and clear timers at the end of each test, to prevent interference.
Improved testing code and fixed some bugs.

* Move cookie cleanup into the after so it doesn't leave a mess behind for subsequent tests.

Allow specifying multiple --file options when running/watching tests.

* Provide an additional mock object for some test environments which don't provide crypto.subtle.

* Improve some documentation for the UID2 module.

* Improved UID2 module logging when debug flag is enabled.

* Added tests around the api base url config for UID2.

Added the new UID2 config to the example.

* Update integration example to attempt a token refresh (it will fail due to not being a valid token).

* Refactor to avoid duplicating cookie read code.

Add a test for the case when the id value is provided directly in config without making use of the new token refresh system.

* Fix an incorrect log call.

Co-authored-by: Lionell Pack <lionell.pack@thetradedesk.com>
---
 integrationExamples/gpt/userId_example.html |  12 +-
 karma.conf.maker.js                         |   2 +-
 modules/uid2IdSystem.js                     | 248 ++++++++++++++--
 modules/uid2IdSystem.md                     |  34 ++-
 test/mocks/timers.js                        |  84 ++++++
 test/spec/modules/uid2IdSystem_spec.js      | 310 ++++++++++++++++++++
 6 files changed, 655 insertions(+), 35 deletions(-)
 create mode 100644 test/mocks/timers.js
 create mode 100644 test/spec/modules/uid2IdSystem_spec.js

diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html
index 5a6c80c4adf..4f94c73c281 100644
--- a/integrationExamples/gpt/userId_example.html
+++ b/integrationExamples/gpt/userId_example.html
@@ -249,7 +249,17 @@
               }
             },
             {
-              "name": "uid2"
+              "name": "uid2",
+              "params": {
+                "uid2Token": {
+                  "advertising_token": "example token",
+                  "refresh_token": "aslkdjaslkjdaslkhj",
+                  "identity_expires": Date.now() + 60*1000,
+                  "refresh_from": Date.now() - 10*1000,
+                  "refresh_expires": Date.now() + 12*60*60*1000,
+                  "refresh_response_key": null
+                }
+              }
             }
             ,
             {
diff --git a/karma.conf.maker.js b/karma.conf.maker.js
index b20f73d74bc..692db7755e8 100644
--- a/karma.conf.maker.js
+++ b/karma.conf.maker.js
@@ -110,7 +110,7 @@ module.exports = function(codeCoverage, browserstack, watchMode, file, disableFe
   var webpackConfig = newWebpackConfig(codeCoverage, disableFeatures);
   var plugins = newPluginsArray(browserstack);
 
-  var files = file ? ['test/test_deps.js', file] : ['test/test_index.js'];
+  var files = file ? ['test/test_deps.js', file].flatMap(f => f) : ['test/test_index.js'];
   // This file opens the /debug.html tab automatically.
   // It has no real value unless you're running --watch, and intend to do some debugging in the browser.
   if (watchMode) {
diff --git a/modules/uid2IdSystem.js b/modules/uid2IdSystem.js
index 23656639532..9fd75f12591 100644
--- a/modules/uid2IdSystem.js
+++ b/modules/uid2IdSystem.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 /**
  * This module adds uid2 ID support to the User ID module
  * The {@link module:modules/userId} module is required.
@@ -10,48 +11,142 @@ import {submodule} from '../src/hook.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const MODULE_NAME = 'uid2';
+const MODULE_REVISION = `1.0`;
+const PREBID_VERSION = '$prebid.version$';
+const UID2_CLIENT_ID = `PrebidJS-${PREBID_VERSION}-UID2Module-${MODULE_REVISION}`;
 const GVLID = 887;
 const LOG_PRE_FIX = 'UID2: ';
 const ADVERTISING_COOKIE = '__uid2_advertising_token';
 
-function readCookie() {
-  return storage.cookiesAreEnabled() ? storage.getCookie(ADVERTISING_COOKIE) : null;
+// eslint-disable-next-line no-unused-vars
+const UID2_TEST_URL = 'https://operator-integ.uidapi.com';
+const UID2_PROD_URL = 'https://prod.uidapi.com';
+const UID2_BASE_URL = UID2_PROD_URL;
+
+function getStorage() {
+  return getStorageManager({gvlid: GVLID, moduleName: MODULE_NAME});
+}
+
+function createLogInfo(prefix) {
+  return function (...strings) {
+    logInfo(prefix + ' ', ...strings);
+  }
 }
+export const storage = getStorage();
+const _logInfo = createLogInfo(LOG_PRE_FIX);
 
 function readFromLocalStorage() {
   return storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(ADVERTISING_COOKIE) : null;
 }
 
-function getStorage() {
-  return getStorageManager({gvlid: GVLID, moduleName: MODULE_NAME});
+function readModuleCookie() {
+  const cookie = readCookie(ADVERTISING_COOKIE);
+  if (cookie && cookie.includes('{')) {
+    return JSON.parse(cookie);
+  }
+  return cookie;
 }
 
-const storage = getStorage();
+function readJsonCookie(cookieName) {
+  return JSON.parse(readCookie(cookieName));
+}
 
-const _logInfo = createLogInfo(LOG_PRE_FIX);
+function readCookie(cookieName) {
+  const cookie = storage.cookiesAreEnabled() ? storage.getCookie(cookieName) : null;
+  if (!cookie) {
+    _logInfo(`Attempted to read UID2 from cookie '${cookieName}' but it was empty`);
+    return null;
+  };
+  _logInfo(`Read UID2 from cookie '${cookieName}'`);
+  return cookie;
+}
 
-function createLogInfo(prefix) {
-  return function (...strings) {
-    logInfo(prefix + ' ', ...strings);
+function storeValue(value) {
+  if (storage.cookiesAreEnabled()) {
+    storage.setCookie(ADVERTISING_COOKIE, JSON.stringify(value), Date.now() + 60 * 60 * 24 * 1000);
+  } else if (storage.localStorageIsEnabled()) {
+    storage.setLocalStorage(ADVERTISING_COOKIE, value);
   }
 }
 
-/**
- * Encode the id
- * @param value
- * @returns {string|*}
- */
-function encodeId(value) {
-  const result = {};
-  if (value) {
-    const bidIds = {
-      id: value
+function isValidIdentity(identity) {
+  return !!(typeof identity === 'object' && identity !== null && identity.advertising_token && identity.identity_expires && identity.refresh_from && identity.refresh_token && identity.refresh_expires);
+}
+
+// This is extracted from an in-progress API client. Once it's available via NPM, this class should be replaced with the NPM package.
+class Uid2ApiClient {
+  constructor(opts) {
+    this._baseUrl = opts.baseUrl ? opts.baseUrl : UID2_BASE_URL;
+    this._clientVersion = UID2_CLIENT_ID;
+  }
+  createArrayBuffer(text) {
+    const arrayBuffer = new Uint8Array(text.length);
+    for (let i = 0; i < text.length; i++) {
+      arrayBuffer[i] = text.charCodeAt(i);
     }
-    result.uid2 = bidIds;
-    _logInfo('Decoded value ' + JSON.stringify(result));
-    return result;
+    return arrayBuffer;
+  }
+  hasStatusResponse(response) {
+    return typeof (response) === 'object' && response && response.status;
+  }
+  isValidRefreshResponse(response) {
+    return this.hasStatusResponse(response) && (
+      response.status === 'optout' || response.status === 'expired_token' || (response.status === 'success' && response.body && isValidIdentity(response.body))
+    );
+  }
+  ResponseToRefreshResult(response) {
+    if (this.isValidRefreshResponse(response)) {
+      if (response.status === 'success') { return { status: response.status, identity: response.body }; }
+      return response;
+    } else { return "Response didn't contain a valid status"; }
+  }
+  callRefreshApi(refreshDetails) {
+    const url = this._baseUrl + '/v2/token/refresh';
+    const req = new XMLHttpRequest();
+    req.overrideMimeType('text/plain');
+    req.open('POST', url, true);
+    req.setRequestHeader('X-UID2-Client-Version', this._clientVersion);
+    let resolvePromise;
+    let rejectPromise;
+    const promise = new Promise((resolve, reject) => {
+      resolvePromise = resolve;
+      rejectPromise = reject;
+    });
+    req.onreadystatechange = () => {
+      if (req.readyState !== req.DONE) { return; }
+      try {
+        if (!refreshDetails.refresh_response_key || req.status !== 200) {
+          _logInfo('Error status OR no response decryption key available, assuming unencrypted JSON');
+          const response = JSON.parse(req.responseText);
+          const result = this.ResponseToRefreshResult(response);
+          if (typeof result === 'string') { rejectPromise(result); } else { resolvePromise(result); }
+        } else {
+          _logInfo('Decrypting refresh API response');
+          const encodeResp = this.createArrayBuffer(atob(req.responseText));
+          window.crypto.subtle.importKey('raw', this.createArrayBuffer(atob(refreshDetails.refresh_response_key)), { name: 'AES-GCM' }, false, ['decrypt']).then((key) => {
+            _logInfo('Imported decryption key')
+            // returns the symmetric key
+            window.crypto.subtle.decrypt({
+              name: 'AES-GCM',
+              iv: encodeResp.slice(0, 12),
+              tagLength: 128, // The tagLength you used to encrypt (if any)
+            }, key, encodeResp.slice(12)).then((decrypted) => {
+              const decryptedResponse = String.fromCharCode(...new Uint8Array(decrypted));
+              _logInfo('Decrypted to:', decryptedResponse);
+              const response = JSON.parse(decryptedResponse);
+              const result = this.ResponseToRefreshResult(response);
+              if (typeof result === 'string') { rejectPromise(result); } else { resolvePromise(result); }
+            }, (reason) => console.warn(`Call to UID2 API failed`, reason));
+          }, (reason) => console.warn(`Call to UID2 API failed`, reason));
+        }
+      } catch (err) {
+        rejectPromise(err);
+      }
+    };
+    _logInfo('Sending refresh request', req);
+    req.send(refreshDetails.refresh_token);
+    return promise;
   }
-  return undefined;
 }
 
 /** @type {Submodule} */
@@ -71,27 +166,118 @@ export const uid2IdSubmodule = {
    * decode the stored id value for passing to bid requests
    * @function
    * @param {string} value
-   * @returns {{uid2:{ id: string }} or undefined if value doesn't exists
+   * @returns {{uid2:{ id: string } }} or undefined if value doesn't exists
    */
   decode(value) {
-    return (value) ? encodeId(value) : undefined;
+    const result = decodeImpl(value);
+    _logInfo('UID2 decode returned', result);
+    return result;
   },
 
   /**
    * performs action to obtain id and return a value.
    * @function
-   * @param {SubmoduleConfig} [config]
+   * @param {SubmoduleConfig} [configparams]
    * @param {ConsentData|undefined} consentData
    * @returns {uid2Id}
    */
   getId(config, consentData) {
-    _logInfo('Creating UID 2.0');
-    let value = readCookie() || readFromLocalStorage();
-    _logInfo('The advertising token: ' + value);
-    return {id: value}
+    const result = getIdImpl(config, consentData);
+    _logInfo(`UID2 getId returned`, result);
+    return result;
   },
-
 };
 
+function refreshTokenAndStore(baseUrl, token) {
+  _logInfo('UID2 base url provided: ', baseUrl);
+  const client = new Uid2ApiClient({baseUrl});
+  return client.callRefreshApi(token).then((response) => {
+    _logInfo('Refresh endpoint responded with:', response);
+    const tokens = {
+      originalToken: token,
+      latestToken: response.identity,
+    };
+    storeValue(tokens);
+    return tokens;
+  });
+}
+
+function decodeImpl(value) {
+  if (typeof value === 'string') {
+    _logInfo('Found an old-style ID from an earlier version of the module. Refresh is unavailable for this token.');
+    const result = { uid2: { id: value } };
+    return result;
+  }
+  if (Date.now() < value.latestToken.identity_expires) {
+    return { uid2: { id: value.latestToken.advertising_token } };
+  }
+  return null;
+}
+
+function getIdImpl(config, consentData) {
+  let suppliedToken = null;
+  const uid2BaseUrl = config?.params?.uid2ApiBase ?? UID2_BASE_URL;
+  if (config && config.params) {
+    if (config.params.uid2Token) {
+      suppliedToken = config.params.uid2Token;
+      _logInfo('Read token from params', suppliedToken);
+    } else if (config.params.uid2ServerCookie) {
+      suppliedToken = readJsonCookie(config.params.uid2ServerCookie);
+      _logInfo('Read token from server-supplied cookie', suppliedToken);
+    }
+  }
+  let storedTokens = readModuleCookie() || readFromLocalStorage();
+  _logInfo('Loaded module-stored tokens:', storedTokens);
+
+  if (storedTokens && typeof storedTokens === 'string') {
+    // Legacy value stored, this must be from an old integration. If no token supplied, just use the legacy value.
+
+    if (!suppliedToken) {
+      _logInfo('Returning legacy cookie value.');
+      return { id: storedTokens };
+    }
+    // Otherwise, ignore the legacy value - it should get over-written later anyway.
+    _logInfo('Discarding superseded legacy cookie.');
+    storedTokens = null;
+  }
+
+  if (suppliedToken && storedTokens) {
+    if (storedTokens.originalToken?.advertising_token !== suppliedToken.advertising_token) {
+      _logInfo('Server supplied new token - ignoring stored value.', storedTokens.originalToken?.advertising_token, suppliedToken.advertising_token);
+      // Stored token wasn't originally sourced from the provided token - ignore the stored value. A new user has logged in?
+      storedTokens = null;
+    }
+  }
+  // At this point, any legacy values or superseded stored tokens have been nulled out.
+  const useSuppliedToken = !(storedTokens?.latestToken) || (suppliedToken && suppliedToken.identity_expires > storedTokens.latestToken.identity_expires);
+  const newestAvailableToken = useSuppliedToken ? suppliedToken : storedTokens.latestToken;
+  _logInfo('UID2 module selected latest token', useSuppliedToken, newestAvailableToken);
+  if (!newestAvailableToken || Date.now() > newestAvailableToken.refresh_expires) {
+    _logInfo('Newest available token is expired and not refreshable.');
+    return { id: null };
+  }
+  if (Date.now() > newestAvailableToken.identity_expires) {
+    const promise = refreshTokenAndStore(uid2BaseUrl, newestAvailableToken);
+    _logInfo('Token is expired but can be refreshed, attempting refresh.');
+    return { callback: (cb) => {
+      promise.then((result) => {
+        _logInfo('Refresh reponded, passing the updated token on.', result);
+        cb(result);
+      });
+    } };
+  }
+  // If should refresh (but don't need to), refresh in the background.
+  if (Date.now() > newestAvailableToken.refresh_from) {
+    _logInfo(`Refreshing token in background with low priority.`);
+    refreshTokenAndStore(uid2BaseUrl, newestAvailableToken);
+  }
+  const tokens = {
+    originalToken: suppliedToken ?? storedTokens?.originalToken,
+    latestToken: newestAvailableToken,
+  };
+  storeValue(tokens);
+  return { id: tokens };
+}
+
 // Register submodule for userId
 submodule('userId', uid2IdSubmodule);
diff --git a/modules/uid2IdSystem.md b/modules/uid2IdSystem.md
index fa596b17584..82ff1b3cb68 100644
--- a/modules/uid2IdSystem.md
+++ b/modules/uid2IdSystem.md
@@ -6,11 +6,23 @@ UID 2.0 ID Module.
 
 Individual params may be set for the UID 2.0 Submodule. At least one identifier must be set in the params.
 
+The module will handle refreshing the token periodically and storing the updated token using the Prebid.js storage manager. If you provide an expired identity and the module has a valid identity which was refreshed from the identity you provide, it will use the refreshed identity. The module stores the original token used for refreshing the token, and it will use the refreshed tokens as long as the original token matches the one supplied.
+
 ```
 pbjs.setConfig({
     userSync: {
         userIds: [{
-            name: 'uid2'
+            name: 'uid2',
+            params: {
+                // Either:
+                uid2ServerCookie: 'your_UID2_server_set_cookie_name'
+                // Or:
+                uid2Token: {
+                    'advertising_token': '...',
+                    'refresh_token': '...',
+                    // etc. - see the Sample Token below for contents of this object
+                }
+            }
         }]
     }
 });
@@ -18,7 +30,25 @@ pbjs.setConfig({
 ## Parameter Descriptions for the `usersync` Configuration Section
 The below parameters apply only to the UID 2.0 User ID Module integration.
 
+You should supply either `uid2Token` or `uid2ServerCookie`.
+
+If you provide `uid2Token`, the value should be a JavaScript/JSON object with the decrypted `body` payload response from a call to either `/token/generate` or `/token/refresh`.
+
+If you provide `uid2ServerCookie`, the module will expect that same JSON object to be stored in the cookie - i.e. it will pass the cookie value to `JSON.parse` and expect to receive an object containing similar to what you see in the `Sample token` section below.
+
+The module will make calls to the `/token/refresh` endpoint to update the token it stores internally, so bids may contain an updated token.
+
+If neither of `uid2Token` or `uid2ServerCookie` are supplied, and the module has stored a token using the Prebid.js storage system (typically in a cookie named `__uid2_advertising_token`), it will use that token. This cookie is internal to the module and should not be set directly.
+
+If a new token is supplied which does not match the original token used to generate any refreshed tokens, all stored tokens will be discarded and the new token used instead (refreshed if necessary).
+
+### Sample token
+
+`{`<br />&nbsp;&nbsp;`"advertising_token": "...",`<br />&nbsp;&nbsp;`"refresh_token": "...",`<br />&nbsp;&nbsp;`"identity_expires": 1633643601000,`<br />&nbsp;&nbsp;`"refresh_from": 1633643001000,`<br />&nbsp;&nbsp;`"refresh_expires": 1636322000000,`<br />&nbsp;&nbsp;`"refresh_response_key": "wR5t6HKMfJ2r4J7fEGX9Gw=="`<br />`}`
+
 | Param under userSync.userIds[] | Scope | Type | Description | Example |
 | --- | --- | --- | --- | --- |
 | name | Required | String | ID value for the UID20 module - `"uid2"` | `"uid2"` |
-| value | Optional | Object | Used only if the page has a separate mechanism for storing the UID 2.0 ID. The value is an object containing the values to be sent to the adapters. In this scenario, no URL is called and nothing is added to local storage | `{"uid2": { "id": "eb33b0cb-8d35-4722-b9c0-1a31d4064888"}}` |
+| params.uid2Token | Optional | Object | The initial UID2 token. This should be `body` element of the decrypted response from a call to the `/token/generate` or `/token/refresh` endpoint. | See the sample token above. |
+| params.uid2ServerCookie | Optional | String | The name of a cookie which holds the initial UID2 token, set by the server. The cookie should contain JSON in the same format as the alternative uid2Token param. **If uid2Token is supplied, this param is ignored.** | See the sample token above. |
+| params.uid2ApiBase | Optional | String | Overrides the default UID2 API endpoint. | `https://prod.uidapi.com` _(default)_ |
diff --git a/test/mocks/timers.js b/test/mocks/timers.js
new file mode 100644
index 00000000000..6efd798c881
--- /dev/null
+++ b/test/mocks/timers.js
@@ -0,0 +1,84 @@
+/*
+ * Provides wrappers for timers to allow easy cancelling and/or awaiting of outstanding timers.
+ * This helps avoid functionality leaking from one test to the next.
+ */
+
+let wrappersActive = false;
+
+export function configureTimerInterceptors(debugLog = function() {}, generateStackTraces = false) {
+  if (wrappersActive) throw new Error(`Timer wrappers are already in place.`);
+  wrappersActive = true;
+  let theseWrappersActive = true;
+
+  let originalSetTimeout = setTimeout, originalSetInterval = setInterval, originalClearTimeout = clearTimeout, originalClearInterval = clearInterval;
+
+  let timerId = -1;
+  let timers = [];
+
+  const waitOnTimersResolves = [];
+  function checkWaits() {
+    if (timers.length === 0) waitOnTimersResolves.forEach((r) => r());
+  }
+  const waitAllActiveTimers = () => timers.length === 0 ? Promise.resolve() : new Promise((resolve) => waitOnTimersResolves.push(resolve));
+  const clearAllActiveTimers = () => timers.forEach((timer) => timer.type === 'timeout' ? clearTimeout(timer.handle) : clearInterval(timer.handle));
+
+  const generateInterceptor = (type, originalFunctionWrapper) => (fn, delay, ...args) => {
+    timerId++;
+    debugLog(`Setting wrapped timeout ${timerId} for ${delay ?? 0}`);
+    const info = { timerId, type };
+    if (generateStackTraces) {
+      try {
+        throw new Error();
+      } catch (ex) {
+        info.stack = ex.stack;
+      }
+    }
+    info.handle = originalFunctionWrapper(info, fn, delay, ...args);
+    timers.push(info);
+    return info.handle;
+  };
+  const setTimeoutInterceptor = generateInterceptor('timeout', (info, fn, delay, ...args) => originalSetTimeout(() => {
+    try {
+      debugLog(`Running timeout ${info.timerId}`);
+      fn(...args);
+    } finally {
+      const infoIndex = timers.indexOf(info);
+      if (infoIndex > -1) timers.splice(infoIndex, 1);
+      checkWaits();
+    }
+  }, delay));
+
+  const setIntervalInterceptor = generateInterceptor('interval', (info, fn, interval, ...args) => originalSetInterval(() => {
+    debugLog(`Running interval ${info.timerId}`);
+    fn(...args);
+  }, interval));
+
+  const generateClearInterceptor = (type, originalClearFunction) => (handle) => {
+    originalClearFunction(handle);
+    const infoIndex = timers.findIndex((i) => i.handle === handle && i.type === type);
+    if (infoIndex > -1) timers.splice(infoIndex, 1);
+    checkWaits();
+  }
+  const clearTimeoutInterceptor = generateClearInterceptor('timeout', originalClearTimeout);
+  const clearIntervalInterceptor = generateClearInterceptor('interval', originalClearInterval);
+
+  setTimeout = setTimeoutInterceptor;
+  setInterval = setIntervalInterceptor;
+  clearTimeout = clearTimeoutInterceptor;
+  clearInterval = clearIntervalInterceptor;
+
+  return {
+    waitAllActiveTimers,
+    clearAllActiveTimers,
+    timers,
+    restore: () => {
+      if (theseWrappersActive) {
+        theseWrappersActive = false;
+        setTimeout = originalSetTimeout;
+        setInterval = originalSetInterval;
+        clearTimeout = originalClearTimeout;
+        clearInterval = originalClearInterval;
+      }
+    }
+  }
+}
diff --git a/test/spec/modules/uid2IdSystem_spec.js b/test/spec/modules/uid2IdSystem_spec.js
new file mode 100644
index 00000000000..b33e8cda501
--- /dev/null
+++ b/test/spec/modules/uid2IdSystem_spec.js
@@ -0,0 +1,310 @@
+import {coreStorage, init, setSubmoduleRegistry, requestBidsHook} from 'modules/userId/index.js';
+import {config} from 'src/config.js';
+import * as utils from 'src/utils.js';
+import { uid2IdSubmodule } from 'modules/uid2IdSystem.js';
+import 'src/prebid.js';
+import { getGlobal } from 'src/prebidGlobal.js';
+import { server } from 'test/mocks/xhr.js';
+import { configureTimerInterceptors } from 'test/mocks/timers.js';
+import {hook} from 'src/hook.js';
+import {uninstall as uninstallGdprEnforcement} from 'modules/gdprEnforcement.js';
+
+let expect = require('chai').expect;
+
+const clearTimersAfterEachTest = true;
+const debugOutput = () => {};
+
+const expireCookieDate = 'Thu, 01 Jan 1970 00:00:01 GMT';
+const msIn12Hours = 60 * 60 * 12 * 1000;
+const moduleCookieName = '__uid2_advertising_token';
+const publisherCookieName = '__UID2_SERVER_COOKIE';
+const auctionDelayMs = 10;
+const legacyConfigParams = null;
+const serverCookieConfigParams = { uid2ServerCookie: publisherCookieName }
+const getFutureCookieExpiry = () => new Date(Date.now() + msIn12Hours).toUTCString();
+const setPublisherCookie = (token) => coreStorage.setCookie(publisherCookieName, JSON.stringify(token), getFutureCookieExpiry());
+
+const makePrebidIdentityContainer = (token) => ({uid2: {id: token}});
+const makePrebidConfig = (params = null, extraSettings = {}, debug = false) => ({
+  userSync: { auctionDelay: auctionDelayMs, userIds: [{name: 'uid2', params}] }, debug, ...extraSettings
+});
+
+const initialToken = `initial-advertising-token`;
+const legacyToken = 'legacy-advertising-token';
+const refreshedToken = 'refreshed-advertising-token';
+const makeUid2Token = (token = initialToken, shouldRefresh = false, expired = false) => ({
+  advertising_token: token,
+  refresh_token: 'fake-refresh-token',
+  identity_expires: expired ? Date.now() - 1000 : Date.now() + 60 * 60 * 1000,
+  refresh_from: shouldRefresh ? Date.now() - 1000 : Date.now() + 60 * 1000,
+  refresh_expires: Date.now() + 24 * 60 * 60 * 1000, // 24 hours
+  refresh_response_key: 'wR5t6HKMfJ2r4J7fEGX9Gw==',
+});
+const expectInitialToken = (bid) => expect(bid?.userId ?? {}).to.deep.include(makePrebidIdentityContainer(initialToken));
+const expectRefreshedToken = (bid) => expect(bid?.userId ?? {}).to.deep.include(makePrebidIdentityContainer(refreshedToken));
+const expectNoIdentity = (bid) => expect(bid).to.not.haveOwnProperty('userId');
+const expectGlobalToHaveRefreshedIdentity = () => expect(getGlobal().getUserIds()).to.deep.include(makePrebidIdentityContainer(refreshedToken));
+const expectGlobalToHaveNoUid2 = () => expect(getGlobal().getUserIds()).to.not.haveOwnProperty('uid2');
+const expectLegacyToken = (bid) => expect(bid.userId).to.deep.include(makePrebidIdentityContainer(legacyToken));
+const expectNoLegacyToken = (bid) => expect(bid.userId).to.not.deep.include(makePrebidIdentityContainer(legacyToken));
+const expectModuleCookieEmptyOrMissing = () => expect(coreStorage.getCookie(moduleCookieName)).to.be.null;
+const expectModuleCookieToContain = (initialIdentity, latestIdentity) => {
+  const cookie = JSON.parse(coreStorage.getCookie(moduleCookieName));
+  if (initialIdentity) expect(cookie.originalToken.advertising_token).to.equal(initialIdentity);
+  if (latestIdentity) expect(cookie.latestToken.advertising_token).to.equal(latestIdentity);
+}
+
+const apiUrl = 'https://prod.uidapi.com/v2/token/refresh';
+const headers = { 'Content-Type': 'application/json' };
+const makeSuccessResponseBody = () => btoa(JSON.stringify({ status: 'success', body: { ...makeUid2Token(), advertising_token: refreshedToken } }));
+const configureUid2Response = (httpStatus, response) => server.respondWith('POST', apiUrl, (xhr) => xhr.respond(httpStatus, headers, response));
+const configureUid2ApiSuccessResponse = () => configureUid2Response(200, makeSuccessResponseBody());
+const configureUid2ApiFailResponse = () => configureUid2Response(500, 'Error');
+
+const respondAfterDelay = (delay) => new Promise((resolve) => setTimeout(() => {
+  server.respond();
+  setTimeout(() => resolve());
+}, delay));
+
+const runAuction = async () => {
+  const adUnits = [{
+    code: 'adUnit-code',
+    mediaTypes: {banner: {}, native: {}},
+    sizes: [[300, 200], [300, 600]],
+    bids: [{bidder: 'sampleBidder', params: {placementId: 'banner-only-bidder'}}]
+  }];
+  return new Promise(function(resolve) {
+    requestBidsHook(function() {
+      resolve(adUnits[0].bids[0]);
+    }, {adUnits});
+  });
+}
+
+// Runs the provided test twice - once with a successful API mock, once with one which returns a server error
+const testApiSuccessAndFailure = (act, testDescription, failTestDescription, only = false) => {
+  const testFn = only ? it.only : it;
+  testFn(`API responds successfully: ${testDescription}`, async function() {
+    configureUid2ApiSuccessResponse();
+    await act(true);
+  });
+  testFn(`API responds with an error: ${failTestDescription ?? testDescription}`, async function() {
+    configureUid2ApiFailResponse();
+    await act(false);
+  });
+}
+describe(`UID2 module`, function () {
+  let suiteSandbox, testSandbox, timerSpy, fullTestTitle, restoreSubtleToUndefined = false;
+  before(function () {
+    timerSpy = configureTimerInterceptors(debugOutput);
+    hook.ready();
+    uninstallGdprEnforcement();
+
+    suiteSandbox = sinon.sandbox.create();
+    // I'm unable to find an authoritative source, but apparently subtle isn't available in some test stacks for security reasons.
+    // I've confirmed it's available in Firefox since v34 (it seems to be unavailable on BrowserStack in Firefox v106).
+    if (typeof window.crypto.subtle === 'undefined') {
+      restoreSubtleToUndefined = true;
+      window.crypto.subtle = { importKey: () => {}, decrypt: () => {} };
+    }
+    suiteSandbox.stub(window.crypto.subtle, 'importKey').callsFake(() => Promise.resolve());
+    suiteSandbox.stub(window.crypto.subtle, 'decrypt').callsFake((settings, key, data) => Promise.resolve(new Uint8Array([...settings.iv, ...data])));
+  });
+
+  after(function () {
+    suiteSandbox.restore();
+    timerSpy.restore();
+    if (restoreSubtleToUndefined) window.crypto.subtle = undefined;
+  });
+
+  const getFullTestTitle = (test) => `${test.parent.title ? getFullTestTitle(test.parent) + ' | ' : ''}${test.title}`;
+  beforeEach(function () {
+    debugOutput(`----------------- START TEST ------------------`);
+    fullTestTitle = getFullTestTitle(this.test.ctx.currentTest);
+    debugOutput(fullTestTitle);
+    testSandbox = sinon.sandbox.create();
+    testSandbox.stub(utils, 'logWarn');
+
+    init(config);
+    setSubmoduleRegistry([uid2IdSubmodule]);
+  });
+
+  afterEach(async function() {
+    $$PREBID_GLOBAL$$.requestBids.removeAll();
+    config.resetConfig();
+    testSandbox.restore();
+    if (timerSpy.timers.length > 0) {
+      if (clearTimersAfterEachTest) {
+        debugOutput(`Cancelling ${timerSpy.timers.length} still-active timers.`);
+        timerSpy.clearAllActiveTimers();
+      } else {
+        debugOutput(`Waiting on ${timerSpy.timers.length} still-active timers...`, timerSpy.timers);
+        await timerSpy.waitAllActiveTimers();
+      }
+    }
+    coreStorage.setCookie(moduleCookieName, '', expireCookieDate);
+    coreStorage.setCookie(publisherCookieName, '', expireCookieDate);
+
+    debugOutput('----------------- END TEST ------------------');
+  });
+
+  describe('Configuration', function() {
+    it('When no baseUrl is provided in config, the module calls the production endpoint', function() {
+      const uid2Token = makeUid2Token(initialToken, true, true);
+      config.setConfig(makePrebidConfig({uid2Token}));
+      expect(server.requests[0]?.url).to.have.string('https://prod.uidapi.com/');
+    });
+
+    it('When a baseUrl is provided in config, the module calls the provided endpoint', function() {
+      const uid2Token = makeUid2Token(initialToken, true, true);
+      config.setConfig(makePrebidConfig({uid2Token, uid2ApiBase: 'https://operator-integ.uidapi.com'}));
+      expect(server.requests[0]?.url).to.have.string('https://operator-integ.uidapi.com/');
+    });
+  });
+
+  it('When a legacy value is provided directly in configuration, it is passed on', async function() {
+    const valueConfig = makePrebidConfig();
+    valueConfig.userSync.userIds[0].value = {uid2: {id: legacyToken}}
+    config.setConfig(valueConfig);
+    const bid = await runAuction();
+
+    expectLegacyToken(bid);
+  });
+
+  // These tests cover 'legacy' cookies - i.e. cookies set with just the uid2 advertising token, which was how some previous integrations worked.
+  // Some users might still have this cookie, and the module should use that token if a newer one isn't provided.
+  // This should cover older integrations where the server is setting this legacy cookie and expecting the module to pass it on.
+  describe('When a legacy cookie exists', function () {
+    // Creates a test which sets the legacy cookie, configures the UID2 module with provided params, runs an
+    const createLegacyTest = function(params, bidAssertions) {
+      return async function() {
+        coreStorage.setCookie(moduleCookieName, legacyToken, getFutureCookieExpiry());
+        config.setConfig(makePrebidConfig(params));
+
+        const bid = await runAuction();
+        bidAssertions.forEach(function(assertion) { assertion(bid); });
+      }
+    };
+
+    it('and a legacy config is used, it should provide the legacy cookie',
+      createLegacyTest(legacyConfigParams, [expectLegacyToken]));
+    it('and a server cookie config is used without a valid server cookie, it should provide the legacy cookie',
+      createLegacyTest(serverCookieConfigParams, [expectLegacyToken]));
+    it('and a server cookie is used with a valid server cookie, it should provide the server cookie',
+      async function() { setPublisherCookie(makeUid2Token()); await createLegacyTest(serverCookieConfigParams, [expectInitialToken, expectNoLegacyToken])(); });
+    it('and a token is provided in config, it should provide the config token',
+      createLegacyTest({uid2Token: makeUid2Token()}, [expectInitialToken, expectNoLegacyToken]));
+  });
+
+  // This setup runs all of the functional tests with both types of config - the full token response in params, or a server cookie with the cookie name provided
+  let scenarios = [
+    {
+      name: 'Token provided in config call',
+      setConfig: (token, extraConfig = {}) => config.setConfig(makePrebidConfig({uid2Token: token}, extraConfig)),
+    },
+    {
+      name: 'Token provided in server-set cookie',
+      setConfig: (token, extraConfig) => {
+        setPublisherCookie(token);
+        config.setConfig(makePrebidConfig(serverCookieConfigParams, extraConfig));
+      },
+    }
+  ]
+
+  scenarios.forEach(function(scenario) {
+    describe(scenario.name, function() {
+      describe(`When an expired token which can be refreshed is provided`, function() {
+        describe('When the refresh is available in time', function() {
+          testApiSuccessAndFailure(async function(apiSucceeds) {
+            scenario.setConfig(makeUid2Token(initialToken, true, true));
+            respondAfterDelay(auctionDelayMs / 10);
+            const bid = await runAuction();
+
+            if (apiSucceeds) expectRefreshedToken(bid);
+            else expectNoIdentity(bid);
+          }, 'it should be used in the auction', 'the auction should have no uid2');
+
+          testApiSuccessAndFailure(async function(apiSucceeds) {
+            scenario.setConfig(makeUid2Token(initialToken, true, true));
+            respondAfterDelay(auctionDelayMs / 10);
+
+            await runAuction();
+            if (apiSucceeds) {
+              expectModuleCookieToContain(initialToken, refreshedToken);
+            } else {
+              expectModuleCookieEmptyOrMissing();
+            }
+          }, 'the refreshed token should be stored in the module cookie', 'the module cookie should not be set');
+        });
+        describe(`when the response doesn't arrive before the auction timer`, function() {
+          testApiSuccessAndFailure(async function() {
+            scenario.setConfig(makeUid2Token(initialToken, true, true));
+            const bid = await runAuction();
+            expectNoIdentity(bid);
+          }, 'it should run the auction');
+
+          testApiSuccessAndFailure(async function(apiSucceeds) {
+            scenario.setConfig(makeUid2Token(initialToken, true, true));
+            const promise = respondAfterDelay(auctionDelayMs * 2);
+
+            const bid = await runAuction();
+            expectNoIdentity(bid);
+            expectGlobalToHaveNoUid2();
+            await promise;
+            if (apiSucceeds) expectGlobalToHaveRefreshedIdentity();
+            else expectGlobalToHaveNoUid2();
+          }, 'it should update the userId after the auction', 'there should be no global identity');
+        })
+        describe('and there is a refreshed token in the module cookie', function() {
+          it('the refreshed value from the cookie is used', async function() {
+            const initialIdentity = makeUid2Token(initialToken, true, true);
+            const refreshedIdentity = makeUid2Token(refreshedToken);
+            const moduleCookie = {originalToken: initialIdentity, latestToken: refreshedIdentity};
+            coreStorage.setCookie(moduleCookieName, JSON.stringify(moduleCookie), getFutureCookieExpiry());
+            scenario.setConfig(initialIdentity);
+
+            const bid = await runAuction();
+            expectRefreshedToken(bid);
+          });
+        })
+      });
+
+      describe(`When a current token is provided`, function() {
+        beforeEach(function() {
+          scenario.setConfig(makeUid2Token());
+        });
+
+        it('it should use the token in the auction', async function() {
+          const bid = await runAuction();
+          expectInitialToken(bid);
+        });
+      });
+
+      describe(`When a current token which should be refreshed is provided, and the auction is set to run immediately`, function() {
+        beforeEach(function() {
+          scenario.setConfig(makeUid2Token(initialToken, true), {auctionDelay: 0, syncDelay: 1});
+        });
+        testApiSuccessAndFailure(async function() {
+          respondAfterDelay(10);
+          const bid = await runAuction();
+          expectInitialToken(bid);
+        }, 'it should not be refreshed before the auction runs');
+
+        testApiSuccessAndFailure(async function(success) {
+          const promise = respondAfterDelay(1);
+          await runAuction();
+          await promise;
+          if (success) {
+            expectModuleCookieToContain(initialToken, refreshedToken);
+          } else {
+            expectModuleCookieToContain(initialToken, initialToken);
+          }
+        }, 'the refreshed token should be stored in the module cookie after the auction runs', 'the module cookie should only have the original token');
+
+        it('it should use the current token in the auction', async function() {
+          const bid = await runAuction();
+          expectInitialToken(bid);
+        });
+      });
+    });
+  });
+});

From bc68d77cf85409c5f9f2c184a7e10bef2169d348 Mon Sep 17 00:00:00 2001
From: GlobalsunHB <119595168+GlobalsunHB@users.noreply.github.com>
Date: Thu, 15 Dec 2022 15:22:55 +0200
Subject: [PATCH 527/569] Globalsun Bid Adapter: Initial Release (#9307)

* init new adapter Globalsun

* kick off integration tests

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/globalsunBidAdapter.js                | 212 ++++++++++
 modules/globalsunBidAdapter.md                |  79 ++++
 test/spec/modules/globalsunBidAdapter_spec.js | 398 ++++++++++++++++++
 3 files changed, 689 insertions(+)
 create mode 100644 modules/globalsunBidAdapter.js
 create mode 100644 modules/globalsunBidAdapter.md
 create mode 100644 test/spec/modules/globalsunBidAdapter_spec.js

diff --git a/modules/globalsunBidAdapter.js b/modules/globalsunBidAdapter.js
new file mode 100644
index 00000000000..ae3407bbbdd
--- /dev/null
+++ b/modules/globalsunBidAdapter.js
@@ -0,0 +1,212 @@
+import { isFn, deepAccess, logMessage, logError } from '../src/utils.js';
+import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
+
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'globalsun';
+const AD_URL = 'https://endpoint.globalsun.io/pbjs';
+const SYNC_URL = 'https://cs.globalsun.io';
+
+function isBidResponseValid(bid) {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
+    return false;
+  }
+
+  switch (bid.mediaType) {
+    case BANNER:
+      return Boolean(bid.width && bid.height && bid.ad);
+    case VIDEO:
+      return Boolean(bid.vastUrl || bid.vastXml);
+    case NATIVE:
+      return Boolean(bid.native && bid.native.impressionTrackers && bid.native.impressionTrackers.length);
+    default:
+      return false;
+  }
+}
+
+function getPlacementReqData(bid) {
+  const { params, bidId, mediaTypes } = bid;
+  const schain = bid.schain || {};
+  const { placementId, endpointId } = params;
+  const bidfloor = getBidFloor(bid);
+
+  const placement = {
+    bidId,
+    schain,
+    bidfloor
+  };
+
+  if (placementId) {
+    placement.placementId = placementId;
+    placement.type = 'publisher';
+  } else if (endpointId) {
+    placement.endpointId = endpointId;
+    placement.type = 'network';
+  }
+
+  if (mediaTypes && mediaTypes[BANNER]) {
+    placement.adFormat = BANNER;
+    placement.sizes = mediaTypes[BANNER].sizes;
+  } else if (mediaTypes && mediaTypes[VIDEO]) {
+    placement.adFormat = VIDEO;
+    placement.playerSize = mediaTypes[VIDEO].playerSize;
+    placement.minduration = mediaTypes[VIDEO].minduration;
+    placement.maxduration = mediaTypes[VIDEO].maxduration;
+    placement.mimes = mediaTypes[VIDEO].mimes;
+    placement.protocols = mediaTypes[VIDEO].protocols;
+    placement.startdelay = mediaTypes[VIDEO].startdelay;
+    placement.placement = mediaTypes[VIDEO].placement;
+    placement.skip = mediaTypes[VIDEO].skip;
+    placement.skipafter = mediaTypes[VIDEO].skipafter;
+    placement.minbitrate = mediaTypes[VIDEO].minbitrate;
+    placement.maxbitrate = mediaTypes[VIDEO].maxbitrate;
+    placement.delivery = mediaTypes[VIDEO].delivery;
+    placement.playbackmethod = mediaTypes[VIDEO].playbackmethod;
+    placement.api = mediaTypes[VIDEO].api;
+    placement.linearity = mediaTypes[VIDEO].linearity;
+  } else if (mediaTypes && mediaTypes[NATIVE]) {
+    placement.native = mediaTypes[NATIVE];
+    placement.adFormat = NATIVE;
+  }
+
+  return placement;
+}
+
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return deepAccess(bid, 'params.bidfloor', 0);
+  }
+
+  try {
+    const bidFloor = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*',
+    });
+    return bidFloor.floor;
+  } catch (err) {
+    logError(err);
+    return 0;
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: (bid = {}) => {
+    const { params, bidId, mediaTypes } = bid;
+    let valid = Boolean(bidId && params && (params.placementId || params.endpointId));
+
+    if (mediaTypes && mediaTypes[BANNER]) {
+      valid = valid && Boolean(mediaTypes[BANNER] && mediaTypes[BANNER].sizes);
+    } else if (mediaTypes && mediaTypes[VIDEO]) {
+      valid = valid && Boolean(mediaTypes[VIDEO] && mediaTypes[VIDEO].playerSize);
+    } else if (mediaTypes && mediaTypes[NATIVE]) {
+      valid = valid && Boolean(mediaTypes[NATIVE]);
+    } else {
+      valid = false;
+    }
+    return valid;
+  },
+
+  buildRequests: (validBidRequests = [], bidderRequest = {}) => {
+    // convert Native ORTB definition to old-style prebid native definition
+    validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
+
+    let deviceWidth = 0;
+    let deviceHeight = 0;
+
+    let winLocation;
+    try {
+      const winTop = window.top;
+      deviceWidth = winTop.screen.width;
+      deviceHeight = winTop.screen.height;
+      winLocation = winTop.location;
+    } catch (e) {
+      logMessage(e);
+      winLocation = window.location;
+    }
+
+    const refferUrl = bidderRequest.refererInfo && bidderRequest.refererInfo.page;
+    let refferLocation;
+    try {
+      refferLocation = refferUrl && new URL(refferUrl);
+    } catch (e) {
+      logMessage(e);
+    }
+    // TODO: does the fallback make sense here?
+    let location = refferLocation || winLocation;
+    const language = (navigator && navigator.language) ? navigator.language.split('-')[0] : '';
+    const host = location.host;
+    const page = location.pathname;
+    const secure = location.protocol === 'https:' ? 1 : 0;
+    const placements = [];
+    const request = {
+      deviceWidth,
+      deviceHeight,
+      language,
+      secure,
+      host,
+      page,
+      placements,
+      coppa: config.getConfig('coppa') === true ? 1 : 0,
+      ccpa: bidderRequest.uspConsent || undefined,
+      gdpr: bidderRequest.gdprConsent || undefined,
+      tmax: config.getConfig('bidderTimeout')
+    };
+
+    const len = validBidRequests.length;
+    for (let i = 0; i < len; i++) {
+      const bid = validBidRequests[i];
+      placements.push(getPlacementReqData(bid));
+    }
+
+    return {
+      method: 'POST',
+      url: AD_URL,
+      data: request
+    };
+  },
+
+  interpretResponse: (serverResponse) => {
+    let response = [];
+    for (let i = 0; i < serverResponse.body.length; i++) {
+      let resItem = serverResponse.body[i];
+      if (isBidResponseValid(resItem)) {
+        const advertiserDomains = resItem.adomain && resItem.adomain.length ? resItem.adomain : [];
+        resItem.meta = { ...resItem.meta, advertiserDomains };
+
+        response.push(resItem);
+      }
+    }
+    return response;
+  },
+
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let syncType = syncOptions.iframeEnabled ? 'iframe' : 'image';
+    let syncUrl = SYNC_URL + `/${syncType}?pbjs=1`;
+    if (gdprConsent && gdprConsent.consentString) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        syncUrl += `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        syncUrl += `&gdpr=0&gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+    if (uspConsent && uspConsent.consentString) {
+      syncUrl += `&ccpa_consent=${uspConsent.consentString}`;
+    }
+
+    const coppa = config.getConfig('coppa') ? 1 : 0;
+    syncUrl += `&coppa=${coppa}`;
+
+    return [{
+      type: syncType,
+      url: syncUrl
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/globalsunBidAdapter.md b/modules/globalsunBidAdapter.md
new file mode 100644
index 00000000000..07c3ce32155
--- /dev/null
+++ b/modules/globalsunBidAdapter.md
@@ -0,0 +1,79 @@
+# Overview
+
+```
+Module Name: Globalsun Bidder Adapter
+Module Type: Globalsun Bidder Adapter
+Maintainer: prebid@globalsun.io
+```
+
+# Description
+
+Connects to Globalsun exchange for bids.
+Globalsun bid adapter supports Banner, Video (instream and outstream) and Native.
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [ [300, 250], [320, 50] ],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'globalsun',
+                            params: {
+                                placementId: 'testBanner',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [ [640, 480] ],
+                            context: 'instream',
+                            minduration: 5,
+                            maxduration: 60,
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'globalsun',
+                            params: {
+                                placementId: 'testVideo',
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'globalsun',
+                            params: {
+                                placementId: 'testNative',
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/test/spec/modules/globalsunBidAdapter_spec.js b/test/spec/modules/globalsunBidAdapter_spec.js
new file mode 100644
index 00000000000..3795f3038a7
--- /dev/null
+++ b/test/spec/modules/globalsunBidAdapter_spec.js
@@ -0,0 +1,398 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/globalsunBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+import { getUniqueIdentifierStr } from '../../../src/utils.js';
+
+const bidder = 'globalsun'
+
+describe('GlobalsunBidAdapter', function () {
+  const bids = [
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [BANNER]: {
+          sizes: [[300, 250]]
+        }
+      },
+      params: {
+        placementId: 'testBanner',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [VIDEO]: {
+          playerSize: [[300, 300]],
+          minduration: 5,
+          maxduration: 60
+        }
+      },
+      params: {
+        placementId: 'testVideo',
+      }
+    },
+    {
+      bidId: getUniqueIdentifierStr(),
+      bidder: bidder,
+      mediaTypes: {
+        [NATIVE]: {
+          native: {
+            title: {
+              required: true
+            },
+            body: {
+              required: true
+            },
+            icon: {
+              required: true,
+              size: [64, 64]
+            }
+          }
+        }
+      },
+      params: {
+        placementId: 'testNative',
+      }
+    }
+  ];
+
+  const invalidBid = {
+    bidId: getUniqueIdentifierStr(),
+    bidder: bidder,
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+
+    }
+  }
+
+  const bidderRequest = {
+    uspConsent: '1---',
+    gdprConsent: 'COvFyGBOvFyGBAbAAAENAPCAAOAAAAAAAAAAAEEUACCKAAA.IFoEUQQgAIQwgIwQABAEAAAAOIAACAIAAAAQAIAgEAACEAAAAAgAQBAAAAAAAGBAAgAAAAAAAFAAECAAAgAAQARAEQAAAAAJAAIAAgAAAYQEAAAQmAgBC3ZAYzUw',
+    refererInfo: {
+      referer: 'https://test.com'
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true if there are bidId, params and key parameters present', function () {
+      expect(spec.isBidRequestValid(bids[0])).to.be.true;
+    });
+    it('Should return false if at least one of parameters is not present', function () {
+      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', function () {
+    let serverRequest = spec.buildRequests(bids, bidderRequest);
+
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+
+    it('Returns POST method', function () {
+      expect(serverRequest.method).to.equal('POST');
+    });
+
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://endpoint.globalsun.io/pbjs');
+    });
+
+    it('Returns general data valid', function () {
+      let data = serverRequest.data;
+      expect(data).to.be.an('object');
+      expect(data).to.have.all.keys('deviceWidth',
+        'deviceHeight',
+        'language',
+        'secure',
+        'host',
+        'page',
+        'placements',
+        'coppa',
+        'ccpa',
+        'gdpr',
+        'tmax'
+      );
+      expect(data.deviceWidth).to.be.a('number');
+      expect(data.deviceHeight).to.be.a('number');
+      expect(data.language).to.be.a('string');
+      expect(data.secure).to.be.within(0, 1);
+      expect(data.host).to.be.a('string');
+      expect(data.page).to.be.a('string');
+      expect(data.coppa).to.be.a('number');
+      expect(data.gdpr).to.be.a('string');
+      expect(data.ccpa).to.be.a('string');
+      expect(data.tmax).to.be.a('number');
+      expect(data.placements).to.have.lengthOf(3);
+    });
+
+    it('Returns valid placements', function () {
+      const { placements } = serverRequest.data;
+      for (let i = 0, len = placements.length; i < len; i++) {
+        const placement = placements[i];
+        expect(placement.placementId).to.be.oneOf(['testBanner', 'testVideo', 'testNative']);
+        expect(placement.adFormat).to.be.oneOf([BANNER, VIDEO, NATIVE]);
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.schain).to.be.an('object');
+        expect(placement.bidfloor).to.exist.and.to.equal(0);
+        expect(placement.type).to.exist.and.to.equal('publisher');
+
+        if (placement.adFormat === BANNER) {
+          expect(placement.sizes).to.be.an('array');
+        }
+        switch (placement.adFormat) {
+          case BANNER:
+            expect(placement.sizes).to.be.an('array');
+            break;
+          case VIDEO:
+            expect(placement.playerSize).to.be.an('array');
+            expect(placement.minduration).to.be.an('number');
+            expect(placement.maxduration).to.be.an('number');
+            break;
+          case NATIVE:
+            expect(placement.native).to.be.an('object');
+            break;
+        }
+      }
+    });
+
+    it('Returns data with gdprConsent and without uspConsent', function () {
+      delete bidderRequest.uspConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.gdpr).to.exist;
+      expect(data.gdpr).to.be.a('string');
+      expect(data.gdpr).to.equal(bidderRequest.gdprConsent);
+      expect(data.ccpa).to.not.exist;
+      delete bidderRequest.gdprConsent;
+    });
+
+    it('Returns data with uspConsent and without gdprConsent', function () {
+      bidderRequest.uspConsent = '1---';
+      delete bidderRequest.gdprConsent;
+      serverRequest = spec.buildRequests(bids, bidderRequest);
+      let data = serverRequest.data;
+      expect(data.ccpa).to.exist;
+      expect(data.ccpa).to.be.a('string');
+      expect(data.ccpa).to.equal(bidderRequest.uspConsent);
+      expect(data.gdpr).to.not.exist;
+    });
+
+    it('Returns empty data if no valid requests are passed', function () {
+      serverRequest = spec.buildRequests([], bidderRequest);
+      let data = serverRequest.data;
+      expect(data.placements).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let bannerResponses = spec.interpretResponse(banner);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal(banner.body[0].requestId);
+      expect(dataItem.cpm).to.equal(banner.body[0].cpm);
+      expect(dataItem.width).to.equal(banner.body[0].width);
+      expect(dataItem.height).to.equal(banner.body[0].height);
+      expect(dataItem.ad).to.equal(banner.body[0].ad);
+      expect(dataItem.ttl).to.equal(banner.body[0].ttl);
+      expect(dataItem.creativeId).to.equal(banner.body[0].creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal(banner.body[0].currency);
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret video response', function () {
+      const video = {
+        body: [{
+          vastUrl: 'test.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let videoResponses = spec.interpretResponse(video);
+      expect(videoResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = videoResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'vastUrl', 'ttl', 'creativeId',
+        'netRevenue', 'currency', 'dealId', 'mediaType', 'meta');
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.5);
+      expect(dataItem.vastUrl).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should interpret native response', function () {
+      const native = {
+        body: [{
+          mediaType: 'native',
+          native: {
+            clickUrl: 'test.com',
+            title: 'Test',
+            image: 'test.com',
+            impressionTrackers: ['test.com'],
+          },
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['google.com'],
+            advertiserId: 1234
+          }
+        }]
+      };
+      let nativeResponses = spec.interpretResponse(native);
+      expect(nativeResponses).to.be.an('array').that.is.not.empty;
+
+      let dataItem = nativeResponses[0];
+      expect(dataItem).to.have.keys('requestId', 'cpm', 'ttl', 'creativeId', 'netRevenue', 'currency', 'mediaType', 'native', 'meta');
+      expect(dataItem.native).to.have.keys('clickUrl', 'impressionTrackers', 'title', 'image')
+      expect(dataItem.requestId).to.equal('23fhj33i987f');
+      expect(dataItem.cpm).to.equal(0.4);
+      expect(dataItem.native.clickUrl).to.equal('test.com');
+      expect(dataItem.native.title).to.equal('Test');
+      expect(dataItem.native.image).to.equal('test.com');
+      expect(dataItem.native.impressionTrackers).to.be.an('array').that.is.not.empty;
+      expect(dataItem.native.impressionTrackers[0]).to.equal('test.com');
+      expect(dataItem.ttl).to.equal(120);
+      expect(dataItem.creativeId).to.equal('2');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.meta).to.be.an('object').that.has.any.key('advertiserDomains');
+    });
+    it('Should return an empty array if invalid banner response is passed', function () {
+      const invBanner = {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+
+      let serverResponses = spec.interpretResponse(invBanner);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid video response is passed', function () {
+      const invVideo = {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invVideo);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid native response is passed', function () {
+      const invNative = {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'test.com',
+          title: 'Test',
+          impressionTrackers: ['test.com'],
+          ttl: 120,
+          requestId: '23fhj33i987f',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invNative);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+    it('Should return an empty array if invalid response is passed', function () {
+      const invalid = {
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      let serverResponses = spec.interpretResponse(invalid);
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function() {
+    it('Should return array of objects with proper sync config , include GDPR', function() {
+      const syncData = spec.getUserSyncs({}, {}, {
+        consentString: 'ALL',
+        gdprApplies: true,
+      }, {});
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.globalsun.io/image?pbjs=1&gdpr=1&gdpr_consent=ALL&coppa=0')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1---'
+      });
+      expect(syncData).to.be.an('array').which.is.not.empty;
+      expect(syncData[0]).to.be.an('object')
+      expect(syncData[0].type).to.be.a('string')
+      expect(syncData[0].type).to.equal('image')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://cs.globalsun.io/image?pbjs=1&ccpa_consent=1---&coppa=0')
+    });
+  });
+});

From 77ba4ece1dce547c3ca824d43b79e6529c843aa6 Mon Sep 17 00:00:00 2001
From: Nitin Nimbalkar <96475150+nitin0610@users.noreply.github.com>
Date: Fri, 16 Dec 2022 02:50:27 +0530
Subject: [PATCH 528/569] Topics module: Initial Topics iframe implementation
 (#8947)

* Topics: Initial Topics iframe implementation

* Topics API: LINT errors solved

* Added Empty Topics Check

* Topics: Storage Map logic and added message listener secure check

* Topics: Iframe implementation for bidders

* Added topics_iframe html in example for reference

* Added Pubmatic Topic iframe URL

* Added Pubmatic Topic iframe URL- Removed comment

* Topics Module: Consent management logic added

* Topics Module: Added Device Access check

* Topics Module: Unit test cases added and minor changes

* Topics Module: Array.find used instead of array.some and variable name changed

* Topics IFrame Implementation: Purpose present check is handled
---
 integrationExamples/gpt/topics_frame.html |  43 +++++
 modules/topicsFpdModule.js                | 183 +++++++++++++++++++++-
 test/spec/modules/topicsFpdModule_spec.js | 178 ++++++++++++++++++++-
 3 files changed, 401 insertions(+), 3 deletions(-)
 create mode 100644 integrationExamples/gpt/topics_frame.html

diff --git a/integrationExamples/gpt/topics_frame.html b/integrationExamples/gpt/topics_frame.html
new file mode 100644
index 00000000000..7a12b030a6a
--- /dev/null
+++ b/integrationExamples/gpt/topics_frame.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Topics demo</title>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="favicon.ico" rel="shortcut icon">
+    <script>
+      async function getTopics() {
+        try {
+          if ('browsingTopics' in document && document.featurePolicy.allowsFeature('browsing-topics')) {
+            const topics = await document.browsingTopics();
+            console.log('Called iframe:', window.location.hostname, topics, '\nNumber of topics: ', topics.length);
+            return Promise.resolve(topics);
+          } else {
+            console.log('document.browsingTopics() not supported');
+          }
+
+        } catch (error) {
+          console.log('Error:', error);
+        }
+      }
+
+      document.addEventListener('DOMContentLoaded', async function () {
+        const topics = await getTopics()
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+        const message = JSON.stringify({
+          segment: {
+            domain: window.location.hostname,
+            topics,
+            bidder: params.get("bidder")
+          },
+          date: Date.now(),
+        });
+        window.parent.postMessage(message, '*');
+      });
+    </script>
+  </head>
+  <body>
+  </body>
+</html>
\ No newline at end of file
diff --git a/modules/topicsFpdModule.js b/modules/topicsFpdModule.js
index dbd1d3e90e9..f5a3c0a2c70 100644
--- a/modules/topicsFpdModule.js
+++ b/modules/topicsFpdModule.js
@@ -1,8 +1,31 @@
-import {logError, logWarn, mergeDeep} from '../src/utils.js';
+import {logError, logWarn, mergeDeep, isEmpty, safeJSONParse, logInfo, hasDeviceAccess} from '../src/utils.js';
 import {getRefererInfo} from '../src/refererDetection.js';
 import {submodule} from '../src/hook.js';
 import {GreedyPromise} from '../src/utils/promise.js';
+import {config} from '../src/config.js';
+import {getCoreStorageManager} from '../src/storageManager.js';
+import {includes} from '../src/polyfill.js';
+import {gdprDataHandler} from '../src/adapterManager.js';
 
+const MODULE_NAME = 'topicsFpd';
+const DEFAULT_EXPIRATION_DAYS = 21;
+const TCF_REQUIRED_PURPOSES = ['1', '2', '3', '4'];
+let HAS_GDPR_CONSENT = true;
+let LOAD_TOPICS_INITIALISE = false;
+const HAS_DEVICE_ACCESS = hasDeviceAccess();
+
+const bidderIframeList = {
+  maxTopicCaller: 1,
+  bidders: [{
+    bidder: 'pubmatic',
+    iframeURL: 'https://ads.pubmatic.com/AdServer/js/topics/topics_frame.html'
+  }]
+}
+export const coreStorage = getCoreStorageManager(MODULE_NAME);
+export const topicStorageName = 'prebid:topics';
+export const lastUpdated = 'lastUpdated';
+
+const iframeLoadedURL = [];
 const TAXONOMIES = {
   // map from topic taxonomyVersion to IAB segment taxonomy
   '1': 600
@@ -17,6 +40,20 @@ function partitionBy(field, items) {
   }, {});
 }
 
+/**
+ * function to get list of loaded Iframes calling Topics API
+ */
+function getLoadedIframeURL() {
+  return iframeLoadedURL;
+}
+
+/**
+ * function to set/push iframe in the list which is loaded to called topics API.
+ */
+function setLoadedIframeURL(url) {
+  return iframeLoadedURL.push(url);
+}
+
 export function getTopicsData(name, topics, taxonomies = TAXONOMIES) {
   return Object.entries(partitionBy('taxonomyVersion', topics))
     .filter(([taxonomyVersion]) => {
@@ -61,7 +98,12 @@ export function getTopics(doc = document) {
 const topicsData = getTopics().then((topics) => getTopicsData(getRefererInfo().domain, topics));
 
 export function processFpd(config, {global}, {data = topicsData} = {}) {
+  if (!LOAD_TOPICS_INITIALISE) {
+    loadTopicsForBidders();
+    LOAD_TOPICS_INITIALISE = true;
+  }
   return data.then((data) => {
+    data = [].concat(data, getCachedTopics()); // Add cached data in FPD data.
     if (data.length) {
       mergeDeep(global, {
         user: {
@@ -73,6 +115,145 @@ export function processFpd(config, {global}, {data = topicsData} = {}) {
   });
 }
 
+/**
+ * function to fetch the cached topic data from storage for bidders and return it
+ */
+export function getCachedTopics() {
+  let cachedTopicData = [];
+  if (!HAS_GDPR_CONSENT || !HAS_DEVICE_ACCESS) {
+    return cachedTopicData;
+  }
+  const topics = config.getConfig('userSync.topics') || bidderIframeList;
+  const bidderList = topics.bidders || [];
+  let storedSegments = new Map(safeJSONParse(coreStorage.getDataFromLocalStorage(topicStorageName)));
+  storedSegments && storedSegments.forEach((value, cachedBidder) => {
+    // Check bidder exist in config for cached bidder data and then only retrieve the cached data
+    let bidderConfigObj = bidderList.find(({bidder}) => cachedBidder == bidder)
+    if (bidderConfigObj) {
+      if (!isCachedDataExpired(value[lastUpdated], bidderConfigObj?.expiry || DEFAULT_EXPIRATION_DAYS)) {
+        Object.keys(value).forEach((segData) => {
+          segData != lastUpdated && cachedTopicData.push(value[segData]);
+        })
+      } else {
+        // delete the specific bidder map from the store and store the updated maps
+        storedSegments.delete(cachedBidder);
+        coreStorage.setDataInLocalStorage(topicStorageName, JSON.stringify([...storedSegments]));
+      }
+    }
+  });
+  return cachedTopicData;
+}
+
+/**
+ * Recieve messages from iframe loaded for bidders to fetch topic
+ * @param {MessageEvent} evt
+ */
+export function receiveMessage(evt) {
+  if (evt && evt.data) {
+    try {
+      let data = safeJSONParse(evt.data);
+      if (includes(getLoadedIframeURL(), evt.origin) && data && data.segment && !isEmpty(data.segment.topics)) {
+        const {domain, topics, bidder} = data.segment;
+        const iframeTopicsData = getTopicsData(domain, topics)[0];
+        iframeTopicsData && storeInLocalStorage(bidder, iframeTopicsData);
+      }
+    } catch (err) { }
+  }
+}
+
+/**
+Function to store Topics data recieved from iframe in storage(name: "prebid:topics")
+* @param {Topics} topics
+*/
+export function storeInLocalStorage(bidder, topics) {
+  const storedSegments = new Map(safeJSONParse(coreStorage.getDataFromLocalStorage(topicStorageName)));
+  if (storedSegments.has(bidder)) {
+    storedSegments.get(bidder)[topics['ext']['segclass']] = topics;
+    storedSegments.get(bidder)[lastUpdated] = new Date().getTime();
+    storedSegments.set(bidder, storedSegments.get(bidder));
+  } else {
+    storedSegments.set(bidder, {[topics.ext.segclass]: topics, [lastUpdated]: new Date().getTime()})
+  }
+  coreStorage.setDataInLocalStorage(topicStorageName, JSON.stringify([...storedSegments]));
+}
+
+function isCachedDataExpired(storedTime, cacheTime) {
+  const _MS_PER_DAY = 1000 * 60 * 60 * 24;
+  const currentTime = new Date().getTime();
+  const daysDifference = Math.ceil((currentTime - storedTime) / _MS_PER_DAY);
+  return daysDifference > cacheTime;
+}
+
+/**
+* Function to get random bidders based on count passed with array of bidders
+**/
+function getRandomBidders(arr, count) {
+  return ([...arr].sort(() => 0.5 - Math.random())).slice(0, count)
+}
+
+/**
+ * function to add listener for message receiving from IFRAME
+ */
+function listenMessagesFromTopicIframe() {
+  window.addEventListener('message', receiveMessage, false);
+}
+
+function checkTCFv2(vendorData, requiredPurposes = TCF_REQUIRED_PURPOSES) {
+  const {gdprApplies, purpose} = vendorData;
+  if (!gdprApplies || !purpose) {
+    return true;
+  }
+  return requiredPurposes.map((purposeNo) => {
+    const purposeConsent = purpose.consents ? purpose.consents[purposeNo] : false;
+    if (purposeConsent) {
+      return true;
+    }
+    return false;
+  }).reduce((a, b) => a && b, true);
+}
+
+export function hasGDPRConsent() {
+  // Check for GDPR consent for purpose 1,2,3,4 and return false if consent has not been given
+  const gdprConsent = gdprDataHandler.getConsentData();
+  const hasGdpr = (gdprConsent && typeof gdprConsent.gdprApplies === 'boolean' && gdprConsent.gdprApplies) ? 1 : 0;
+  const gdprConsentString = hasGdpr ? gdprConsent.consentString : '';
+  if (hasGdpr) {
+    if ((!gdprConsentString || gdprConsentString === '') || !gdprConsent.vendorData) {
+      return false;
+    }
+    return checkTCFv2(gdprConsent.vendorData);
+  }
+  return true;
+}
+
+/**
+ * function to load the iframes of the bidder to load the topics data
+ */
+function loadTopicsForBidders() {
+  HAS_GDPR_CONSENT = hasGDPRConsent();
+  if (!HAS_GDPR_CONSENT || !HAS_DEVICE_ACCESS) {
+    logInfo('Topics Module : Consent string is required to fetch the topics from third party domains.');
+    return;
+  }
+  const topics = config.getConfig('userSync.topics') || bidderIframeList;
+  if (topics) {
+    listenMessagesFromTopicIframe();
+    const randomBidders = getRandomBidders(topics.bidders || [], topics.maxTopicCaller || 1)
+    randomBidders && randomBidders.forEach(({ bidder, iframeURL }) => {
+      if (bidder && iframeURL) {
+        let ifrm = document.createElement('iframe');
+        ifrm.name = 'ifrm_'.concat(bidder);
+        ifrm.src = ''.concat(iframeURL, '?bidder=').concat(bidder);
+        ifrm.style.display = 'none';
+        setLoadedIframeURL(new URL(iframeURL).origin);
+        iframeURL && window.document.documentElement.appendChild(ifrm);
+      }
+    })
+  } else {
+    logWarn(`Topics config not defined under userSync Object`);
+  }
+}
+
 submodule('firstPartyData', {
   name: 'topics',
   queue: 1,
diff --git a/test/spec/modules/topicsFpdModule_spec.js b/test/spec/modules/topicsFpdModule_spec.js
index 3781768497b..69e7cc16ca8 100644
--- a/test/spec/modules/topicsFpdModule_spec.js
+++ b/test/spec/modules/topicsFpdModule_spec.js
@@ -1,5 +1,7 @@
-import {getTopics, getTopicsData, processFpd} from '../../../modules/topicsFpdModule.js';
-import {deepClone} from '../../../src/utils.js';
+import {getTopics, getTopicsData, processFpd, hasGDPRConsent, getCachedTopics, receiveMessage, topicStorageName} from '../../../modules/topicsFpdModule.js';
+import {deepClone, safeJSONParse} from '../../../src/utils.js';
+import {gdprDataHandler} from 'src/adapterManager.js';
+import {getCoreStorageManager} from 'src/storageManager.js';
 
 describe('getTopicsData', () => {
   function makeTopic(topic, modelv, taxv = '1') {
@@ -237,3 +239,175 @@ describe('processFpd', () => {
       });
   });
 });
+
+describe('Topics Module GDPR consent check', () => {
+  let gdprDataHdlrStub;
+  beforeEach(() => {
+    gdprDataHdlrStub = sinon.stub(gdprDataHandler, 'getConsentData');
+  })
+
+  afterEach(() => {
+    gdprDataHdlrStub.restore();
+  });
+
+  it('should return false when GDPR is applied but consent string is not present', () => {
+    const consentString = '';
+    const consentConfig = {
+      consentString: consentString,
+      gdprApplies: true,
+      vendorData: {}
+    };
+    gdprDataHdlrStub.returns(consentConfig);
+    expect(hasGDPRConsent()).to.equal(false);
+  });
+
+  it("should return true when GDPR doesn't apply", () => {
+    const consentString = 'CPi8wgAPi8wgAADABBENCrCsAP_AAH_AAAAAISNB7D==';
+    const consentConfig = {
+      consentString: consentString,
+      gdprApplies: false,
+      vendorData: {}
+    };
+
+    gdprDataHdlrStub.returns(consentConfig);
+    expect(hasGDPRConsent()).to.equal(true);
+  });
+
+  it('should return true when GDPR is applied and purpose consent is true for all purpose[1,2,3,4]', () => {
+    const consentString = 'CPi8wgAPi8wgAADABBENCrCsAP_AAH_AAAAAISNB7D==';
+    const consentConfig = {
+      consentString: consentString,
+      gdprApplies: true,
+      vendorData: {
+        metadata: consentString,
+        gdprApplies: true,
+        purpose: {
+          consents: {
+            1: true,
+            2: true,
+            3: true,
+            4: true
+          }
+        }
+      }
+    };
+
+    gdprDataHdlrStub.returns(consentConfig);
+    expect(hasGDPRConsent()).to.equal(true);
+  });
+
+  it('should return false when GDPR is applied and purpose consent is false for one of the purpose[1,2,3,4]', () => {
+    const consentString = 'CPi8wgAPi8wgAADABBENCrCsAP_AAH_AAAAAISNB7D==';
+    const consentConfig = {
+      consentString: consentString,
+      gdprApplies: true,
+      vendorData: {
+        metadata: consentString,
+        gdprApplies: true,
+        purpose: {
+          consents: {
+            1: true,
+            2: true,
+            3: true,
+            4: false
+          }
+        }
+      }
+    };
+
+    gdprDataHdlrStub.returns(consentConfig);
+    expect(hasGDPRConsent()).to.equal(false);
+  });
+});
+
+describe('getCachedTopics()', () => {
+  const storage = getCoreStorageManager('topicsFpd');
+  const expected = [{
+    ext: {
+      segtax: 600,
+      segclass: '2206021246'
+    },
+    segment: [{
+      'id': '243'
+    }, {
+      'id': '265'
+    }],
+    name: 'ads.pubmatic.com'
+  }];
+  const consentString = 'CPi8wgAPi8wgAADABBENCrCsAP_AAH_AAAAAISNB7D==';
+  const consentConfig = {
+    consentString: consentString,
+    gdprApplies: true,
+    vendorData: {
+      metadata: consentString,
+      gdprApplies: true,
+      purpose: {
+        consents: {
+          1: true,
+          2: true,
+          3: true,
+          4: true
+        }
+      }
+    }
+  };
+  const mockData = [
+    {
+      name: 'domain',
+      segment: [{id: 123}]
+    },
+    {
+      name: 'domain',
+      segment: [{id: 321}],
+    }
+  ];
+
+  const evt = {
+    data: '{"segment":{"domain":"ads.pubmatic.com","topics":[{"configVersion":"chrome.1","modelVersion":"2206021246","taxonomyVersion":"1","topic":165,"version":"chrome.1:1:2206021246"}],"bidder":"pubmatic"},"date":1669743901858}',
+    origin: 'https://ads.pubmatic.com'
+  }
+
+  let gdprDataHdlrStub;
+  beforeEach(() => {
+    gdprDataHdlrStub = sinon.stub(gdprDataHandler, 'getConsentData');
+  });
+
+  afterEach(() => {
+    storage.removeDataFromLocalStorage(topicStorageName);
+    gdprDataHdlrStub.restore();
+  });
+
+  it('should return segments for bidder if GDPR consent is true and there is cached segments stored which is not expired', () => {
+    let storedSegments = '[["pubmatic",{"2206021246":{"ext":{"segtax":600,"segclass":"2206021246"},"segment":[{"id":"243"},{"id":"265"}],"name":"ads.pubmatic.com"},"lastUpdated":1669719242027}]]';
+    storage.setDataInLocalStorage(topicStorageName, storedSegments);
+    gdprDataHdlrStub.returns(consentConfig);
+    assert.deepEqual(getCachedTopics(), expected);
+  });
+
+  it('should return empty segments for bidder if GDPR consent is true and there is cached segments stored which is expired', () => {
+    let storedSegments = '[["pubmatic",{"2206021246":{"ext":{"segtax":600,"segclass":"2206021246"},"segment":[{"id":"243"},{"id":"265"}],"name":"ads.pubmatic.com"},"lastUpdated":1659719242027}]]';
+    storage.setDataInLocalStorage(topicStorageName, storedSegments);
+    gdprDataHdlrStub.returns(consentConfig);
+    assert.deepEqual(getCachedTopics(), []);
+  });
+
+  it('should stored segments if receiveMessage event is triggerred with segment data', () => {
+    return processFpd({}, {global: {}}, {data: Promise.resolve(mockData)})
+      .then(({global}) => {
+        receiveMessage(evt)
+        let segments = new Map(safeJSONParse(storage.getDataFromLocalStorage(topicStorageName)));
+        expect(segments.has('pubmatic')).to.equal(true);
+      });
+  });
+
+  it('should update stored segments if receiveMessage event is triggerred with segment data', () => {
+    let storedSegments = '[["pubmatic",{"2206021246":{"ext":{"segtax":600,"segclass":"2206021246"},"segment":[{"id":"243"},{"id":"265"}],"name":"ads.pubmatic.com"},"lastUpdated":1669719242027}]]';
+    storage.setDataInLocalStorage(topicStorageName, storedSegments);
+    return processFpd({}, {global: {}}, {data: Promise.resolve(mockData)})
+      .then(({global}) => {
+        receiveMessage(evt);
+        let segments = new Map(safeJSONParse(storage.getDataFromLocalStorage(topicStorageName)));
+        expect(segments.get('pubmatic')[2206021246].segment.length).to.equal(1);
+      });
+  });
+})

From bd4a6703b43f25168865ef6eea18efbabb9bda8f Mon Sep 17 00:00:00 2001
From: jsfledd <jsfledd@users.noreply.github.com>
Date: Fri, 16 Dec 2022 03:35:56 -0800
Subject: [PATCH 529/569] Nativo Bid Adapter: added ntv_url qs param value
 validation (#9334)

* Initial nativoBidAdapter document creation (js, md and spec)

* Fulling working prebid using nativoBidAdapter. Support for GDPR and CCPA in user syncs.

* Added defult size settings based on the largest ad unit. Added response body validation. Added consent to request url qs params.

* Changed bidder endpoint url

* Changed double quotes to single quotes.

* Reverted package-json.lock to remove modifications from PR

* Added optional bidder param 'url' so the ad server can force- match an existing placement

* Lint fix. Added space after if.

* Added new QS param to send various adUnit data to adapter endpopint

* Updated unit test for new QS param

* Added qs param to keep track of ad unit refreshes

* Updated bidMap key default value

* Updated refresh increment logic

* Refactored spread operator for IE11 support

* Updated isBidRequestValid check

* Refactored Object.enties to use Object.keys to fix CircleCI testing errors

* Updated bid mapping key creation to prioritize ad unit code over placementId

* Added filtering by ad, advertiser and campaign.

* Merged master

* Added more robust bidDataMap with multiple key access

* Deduped filer values

* Rolled back package.json

* Duped upstream/master's package.lock file ... not sure how it got changed in the first place

* Small refactor of filterData length check. Removed comparison with 0 since a length value of 0 is already falsy.

* Added bid sizes to request

* Fixed function name in spec. Added unit tests.

* Added priceFloor module support

* Added protection agains empty url parameter

* Changed ntv_url QS param to use referrer.location instead of referrer.page

* Removed testing 'only' flag

* Added ntv_url QS param value validation
---
 modules/nativoBidAdapter.js                | 56 +++++++++++----
 test/spec/modules/nativoBidAdapter_spec.js | 84 ++++++++++++++++++++++
 2 files changed, 128 insertions(+), 12 deletions(-)

diff --git a/modules/nativoBidAdapter.js b/modules/nativoBidAdapter.js
index 7eb37ea8b82..a92168492d0 100644
--- a/modules/nativoBidAdapter.js
+++ b/modules/nativoBidAdapter.js
@@ -140,13 +140,9 @@ export const spec = {
     const floorPriceData = {}
     let placementId, pageUrl
     validBidRequests.forEach((bidRequest) => {
-      pageUrl = deepAccess(
-        bidRequest,
-        'params.url',
-      )
-      if (pageUrl == undefined || pageUrl === '') {
-        pageUrl = bidderRequest.refererInfo.location
-      }
+      pageUrl =
+        getPageUrlFromBidRequest(bidRequest) ||
+        bidderRequest.refererInfo.location
 
       placementId = deepAccess(bidRequest, 'params.placementId')
 
@@ -380,10 +376,12 @@ export const spec = {
         return syncs
       }
 
-      body =
-        typeof response.body === 'string'
-          ? JSON.parse(response.body)
-          : response.body
+      try {
+        body =
+          typeof response.body === 'string'
+            ? JSON.parse(response.body)
+            : response.body
+      } catch (err) { return }
 
       // Make sure we have valid content
       if (!body || !body.seatbid || body.seatbid.length === 0) return
@@ -465,7 +463,7 @@ export function parseFloorPriceData(bidRequest) {
     // Setup price floor data per media type
     let mediaTypeData = bidMediaTypes[mediaType]
     let mediaTypeFloorPriceData = {}
-    let mediaTypeSizes = mediaTypeData.sizes || mediaTypeData.playerSize || [];
+    let mediaTypeSizes = mediaTypeData.sizes || mediaTypeData.playerSize || []
     // Step through each size of the media type so we can get floor data for each size per media type
     mediaTypeSizes.forEach((size) => {
       // Get floor price data per the getFloor method and respective media type / size combination
@@ -634,3 +632,37 @@ function appendFilterData(filter, filterData) {
     filterData.forEach((ad) => filter.add(ad))
   }
 }
+
+export function getPageUrlFromBidRequest(bidRequest) {
+  let paramPageUrl = deepAccess(bidRequest, 'params.url')
+
+  if (paramPageUrl == undefined) return
+
+  if (hasProtocol(paramPageUrl)) return paramPageUrl
+
+  paramPageUrl = addProtocol(paramPageUrl)
+
+  try {
+    const url = new URL(paramPageUrl)
+    return url.href
+  } catch (err) {}
+}
+
+export function hasProtocol(url) {
+  const protocolRegexp = /^http[s]?\:/
+  return protocolRegexp.test(url)
+}
+
+export function addProtocol(url) {
+  if (hasProtocol(url)) {
+    return url
+  }
+
+  let protocolPrefix = 'https:'
+
+  if (url.indexOf('//') !== 0) {
+    protocolPrefix += '//'
+  }
+
+  return `${protocolPrefix}${url}`
+}
diff --git a/test/spec/modules/nativoBidAdapter_spec.js b/test/spec/modules/nativoBidAdapter_spec.js
index 4cd4c92281b..4d70e6f7071 100644
--- a/test/spec/modules/nativoBidAdapter_spec.js
+++ b/test/spec/modules/nativoBidAdapter_spec.js
@@ -5,6 +5,9 @@ import {
   getMediaWildcardPrices,
   sizeToString,
   parseFloorPriceData,
+  getPageUrlFromBidRequest,
+  hasProtocol,
+  addProtocol,
 } from '../../../modules/nativoBidAdapter'
 
 describe('bidDataMap', function () {
@@ -647,3 +650,84 @@ describe('parseFloorPriceData', () => {
     })
   })
 })
+
+describe('hasProtocol', () => {
+  it('https://www.testpage.com', () => {
+    expect(hasProtocol('https://www.testpage.com')).to.be.true
+  })
+  it('http://www.testpage.com', () => {
+    expect(hasProtocol('http://www.testpage.com')).to.be.true
+  })
+  it('//www.testpage.com', () => {
+    expect(hasProtocol('//www.testpage.com')).to.be.false
+  })
+  it('www.testpage.com', () => {
+    expect(hasProtocol('www.testpage.com')).to.be.false
+  })
+  it('httpsgsjhgflih', () => {
+    expect(hasProtocol('httpsgsjhgflih')).to.be.false
+  })
+})
+
+describe('addProtocol', () => {
+  it('www.testpage.com', () => {
+    expect(addProtocol('www.testpage.com')).to.be.equal('https://www.testpage.com')
+  })
+  it('//www.testpage.com', () => {
+    expect(addProtocol('//www.testpage.com')).to.be.equal('https://www.testpage.com')
+  })
+  it('http://www.testpage.com', () => {
+    expect(addProtocol('http://www.testpage.com')).to.be.equal('http://www.testpage.com')
+  })
+  it('https://www.testpage.com', () => {
+    expect(addProtocol('https://www.testpage.com')).to.be.equal('https://www.testpage.com')
+  })
+})
+
+describe('getPageUrlFromBidRequest', () => {
+  const bidRequest = {}
+
+  beforeEach(() => {
+    bidRequest.params = {}
+  })
+
+  it('Returns undefined for no url param', () => {
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).to.be.undefined
+  })
+
+  it('@testUrl', () => {
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).to.be.undefined
+  })
+
+  it('https://www.testpage.com', () => {
+    bidRequest.params.url = 'https://www.testpage.com'
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).not.to.be.undefined
+  })
+
+  it('https://www.testpage.com/test/path', () => {
+    bidRequest.params.url = 'https://www.testpage.com/test/path'
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).not.to.be.undefined
+  })
+
+  it('www.testpage.com', () => {
+    bidRequest.params.url = 'www.testpage.com'
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).not.to.be.undefined
+  })
+
+  it('http://www.testpage.com', () => {
+    bidRequest.params.url = 'http://www.testpage.com'
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).not.to.be.undefined
+  })
+
+  it('//www.testpage.com', () => {
+    bidRequest.params.url = '//www.testpage.com'
+    const url = getPageUrlFromBidRequest(bidRequest)
+    expect(url).not.to.be.undefined
+  })
+})

From 75d0c737d6493f49f19cdb9c1cccc0fee30cee15 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Fri, 16 Dec 2022 15:01:38 +0000
Subject: [PATCH 530/569] Prebid 7.29.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 006b8bcdcab..f5bf3feb080 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.29.0-pre",
+  "version": "7.29.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 5ee4cb728b1..acda15c2d0e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.29.0-pre",
+  "version": "7.29.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 37259fc9d8fead5e9d0783202f31f96e32c49e2d Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Fri, 16 Dec 2022 15:01:38 +0000
Subject: [PATCH 531/569] Increment version to 7.30.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f5bf3feb080..c903795e59d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.29.0",
+  "version": "7.30.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index acda15c2d0e..490303874f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.29.0",
+  "version": "7.30.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From a531b20b5d6a72ab9e299c1d73a2e9cf959a5abd Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Mon, 19 Dec 2022 15:01:09 -0700
Subject: [PATCH 532/569] Build system: set up `hook` for tests (#9350)

---
 karma.conf.maker.js       | 2 +-
 test/helpers/hookSetup.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 test/helpers/hookSetup.js

diff --git a/karma.conf.maker.js b/karma.conf.maker.js
index 692db7755e8..e05d5b08afd 100644
--- a/karma.conf.maker.js
+++ b/karma.conf.maker.js
@@ -110,7 +110,7 @@ module.exports = function(codeCoverage, browserstack, watchMode, file, disableFe
   var webpackConfig = newWebpackConfig(codeCoverage, disableFeatures);
   var plugins = newPluginsArray(browserstack);
 
-  var files = file ? ['test/test_deps.js', file].flatMap(f => f) : ['test/test_index.js'];
+  var files = file ? ['test/test_deps.js', file, 'test/helpers/hookSetup.js'].flatMap(f => f) : ['test/test_index.js'];
   // This file opens the /debug.html tab automatically.
   // It has no real value unless you're running --watch, and intend to do some debugging in the browser.
   if (watchMode) {
diff --git a/test/helpers/hookSetup.js b/test/helpers/hookSetup.js
new file mode 100644
index 00000000000..2de35bb1dd4
--- /dev/null
+++ b/test/helpers/hookSetup.js
@@ -0,0 +1,5 @@
+import {hook} from '../../src/hook.js';
+
+before(() => {
+  hook.ready();
+});

From 33d6acd784eee9c632396841b94694d191095784 Mon Sep 17 00:00:00 2001
From: Vic R <103455651+victorlassomarketing@users.noreply.github.com>
Date: Mon, 19 Dec 2022 14:03:34 -0800
Subject: [PATCH 533/569] add encoding for device param (#9352)

---
 modules/lassoBidAdapter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/lassoBidAdapter.js b/modules/lassoBidAdapter.js
index fafaa4dd9dc..ad25cbe1e85 100644
--- a/modules/lassoBidAdapter.js
+++ b/modules/lassoBidAdapter.js
@@ -40,14 +40,14 @@ export const spec = {
         auctionId: bidRequest.auctionId,
         bidId: bidRequest.bidId,
         transactionId: bidRequest.transactionId,
-        device: JSON.stringify(getDeviceData()),
+        device: encodeURIComponent(JSON.stringify(getDeviceData())),
         sizes,
         aimXR,
         uid: '$UID',
         params: JSON.stringify(bidRequest.params),
         crumbs: JSON.stringify(bidRequest.crumbs),
         prebidVersion: '$prebid.version$',
-        version: 2,
+        version: 3,
         coppa: config.getConfig('coppa') == true ? 1 : 0,
         ccpa: bidderRequest.uspConsent || undefined
       }

From 40450ab7b30fd983356d00c7369acf0c53711380 Mon Sep 17 00:00:00 2001
From: onetag-dev <38786435+onetag-dev@users.noreply.github.com>
Date: Tue, 20 Dec 2022 00:11:00 +0100
Subject: [PATCH 534/569] OneTag Bid Adapter: add use of refererInfo Prebid
 object and Network API (#9306)

* OneTag Bid Adapter: add use of refererInfo Prebid object and Network Information API

* Replace refererInfo.location with refererInfo.page

Co-authored-by: federico <f.liccione@onetag.com>
---
 modules/onetagBidAdapter.js                | 49 +++++++++-----------
 test/spec/modules/onetagBidAdapter_spec.js | 52 ++++++++++++----------
 2 files changed, 49 insertions(+), 52 deletions(-)

diff --git a/modules/onetagBidAdapter.js b/modules/onetagBidAdapter.js
index 40ef6d596be..b5217e77cd6 100644
--- a/modules/onetagBidAdapter.js
+++ b/modules/onetagBidAdapter.js
@@ -3,7 +3,7 @@
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { INSTREAM, OUTSTREAM } from '../src/video.js';
 import { Renderer } from '../src/Renderer.js';
-import {find} from '../src/polyfill.js';
+import { find } from '../src/polyfill.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { deepClone, logError, deepAccess } from '../src/utils.js';
@@ -13,7 +13,7 @@ const USER_SYNC_ENDPOINT = 'https://onetag-sys.com/usync/';
 const BIDDER_CODE = 'onetag';
 const GVLID = 241;
 
-const storage = getStorageManager({gvlid: GVLID, bidderCode: BIDDER_CODE});
+const storage = getStorageManager({ gvlid: GVLID, bidderCode: BIDDER_CODE });
 
 /**
  * Determines whether or not the given bid request is valid.
@@ -53,7 +53,7 @@ export function isValid(type, bid) {
 function buildRequests(validBidRequests, bidderRequest) {
   const payload = {
     bids: requestsToBids(validBidRequests),
-    ...getPageInfo()
+    ...getPageInfo(bidderRequest)
   };
   if (bidderRequest && bidderRequest.gdprConsent) {
     payload.gdprConsent = {
@@ -74,7 +74,10 @@ function buildRequests(validBidRequests, bidderRequest) {
     if (storage.hasLocalStorage()) {
       payload.onetagSid = storage.getDataFromLocalStorage('onetag_sid');
     }
-  } catch (e) {}
+  } catch (e) { }
+  const connection = navigator.connection || navigator.webkitConnection;
+  payload.networkConnectionType = (connection && connection.type) ? connection.type : null;
+  payload.networkEffectiveConnectionType = (connection && connection.effectiveType) ? connection.effectiveType : null;
   return {
     method: 'POST',
     url: ENDPOINT,
@@ -112,7 +115,7 @@ function interpretResponse(serverResponse, bidderRequest) {
     if (bid.mediaType === BANNER) {
       responseBid.ad = bid.ad;
     } else if (bid.mediaType === VIDEO) {
-      const {context, adUnitCode} = find(requestData.bids, (item) =>
+      const { context, adUnitCode } = find(requestData.bids, (item) =>
         item.bidId === bid.requestId &&
         item.type === VIDEO
       );
@@ -141,7 +144,7 @@ function createRenderer(bid, rendererOptions = {}) {
     loaded: false
   });
   try {
-    renderer.setRender(({renderer, width, height, vastXml, adUnitCode}) => {
+    renderer.setRender(({ renderer, width, height, vastXml, adUnitCode }) => {
       renderer.push(() => {
         window.onetag.Player.init({
           ...bid,
@@ -162,7 +165,6 @@ function createRenderer(bid, rendererOptions = {}) {
 function getFrameNesting() {
   let topmostFrame = window;
   let parent = window.parent;
-  let currentFrameNesting = 0;
   try {
     while (topmostFrame !== topmostFrame.parent) {
       parent = topmostFrame.parent;
@@ -170,13 +172,8 @@ function getFrameNesting() {
       parent.location.href;
       topmostFrame = topmostFrame.parent;
     }
-  } catch (e) {
-    currentFrameNesting = parent === topmostFrame.top ? 1 : 2;
-  }
-  return {
-    topmostFrame,
-    currentFrameNesting
-  }
+  } catch (e) { }
+  return topmostFrame;
 }
 
 function getDocumentVisibility(window) {
@@ -197,21 +194,15 @@ function getDocumentVisibility(window) {
 
 /**
  * Returns information about the page needed by the server in an object to be converted in JSON
- * @returns {{location: *, referrer: (*|string), masked: *, wWidth: (*|Number), wHeight: (*|Number), sWidth, sHeight, date: string, timeOffset: number}}
+ * @returns {{location: *, referrer: (*|string), stack: (*|Array.<String>), numIframes: (*|Number), wWidth: (*|Number), wHeight: (*|Number), sWidth, sHeight, date: string, timeOffset: number}}
  */
-function getPageInfo() {
-  const { topmostFrame, currentFrameNesting } = getFrameNesting();
+function getPageInfo(bidderRequest) {
+  const topmostFrame = getFrameNesting();
   return {
-    location: topmostFrame.location.href,
-    referrer:
-      topmostFrame.document.referrer !== ''
-        ? topmostFrame.document.referrer
-        : null,
-    ancestorOrigin:
-      window.location.ancestorOrigins && window.location.ancestorOrigins.length > 0
-        ? window.location.ancestorOrigins[window.location.ancestorOrigins.length - 1]
-        : null,
-    masked: currentFrameNesting,
+    location: deepAccess(bidderRequest, 'refererInfo.page', null),
+    referrer: deepAccess(bidderRequest, 'refererInfo.ref', null),
+    stack: deepAccess(bidderRequest, 'refererInfo.stack', []),
+    numIframes: deepAccess(bidderRequest, 'refererInfo.numIframes', 0),
     wWidth: topmostFrame.innerWidth,
     wHeight: topmostFrame.innerHeight,
     oWidth: topmostFrame.outerWidth,
@@ -230,7 +221,7 @@ function getPageInfo() {
     timing: getTiming(),
     version: {
       prebid: '$prebid.version$',
-      adapter: '1.1.0'
+      adapter: '1.1.1'
     }
   };
 }
@@ -344,7 +335,7 @@ function getSizes(sizes) {
   const ret = [];
   for (let i = 0; i < sizes.length; i++) {
     const size = sizes[i];
-    ret.push({width: size[0], height: size[1]})
+    ret.push({ width: size[0], height: size[1] })
   }
   return ret;
 }
diff --git a/test/spec/modules/onetagBidAdapter_spec.js b/test/spec/modules/onetagBidAdapter_spec.js
index 2dc0a43bbb0..71e897c7f9e 100644
--- a/test/spec/modules/onetagBidAdapter_spec.js
+++ b/test/spec/modules/onetagBidAdapter_spec.js
@@ -1,8 +1,8 @@
 import { spec, isValid, hasTypeVideo, isSchainValid } from 'modules/onetagBidAdapter.js';
 import { expect } from 'chai';
-import {find} from 'src/polyfill.js';
+import { find } from 'src/polyfill.js';
 import { BANNER, VIDEO } from 'src/mediaTypes.js';
-import {INSTREAM, OUTSTREAM} from 'src/video.js';
+import { INSTREAM, OUTSTREAM } from 'src/video.js';
 
 describe('onetag', function () {
   function createBid() {
@@ -122,14 +122,14 @@ describe('onetag', function () {
       it('Should return true when correct multi format bid is passed', function () {
         expect(spec.isBidRequestValid(createMultiFormatBid())).to.be.true;
       });
-      it('Should split multi format bid into two single format bid with same bidId', function() {
-        const bids = JSON.parse(spec.buildRequests([ createMultiFormatBid() ]).data).bids;
+      it('Should split multi format bid into two single format bid with same bidId', function () {
+        const bids = JSON.parse(spec.buildRequests([createMultiFormatBid()]).data).bids;
         expect(bids.length).to.equal(2);
         expect(bids[0].bidId).to.equal(bids[1].bidId);
       });
-      it('Should retrieve correct request bid when extracting video request data', function() {
+      it('Should retrieve correct request bid when extracting video request data', function () {
         const requestBid = createMultiFormatBid();
-        const multiFormatRequest = spec.buildRequests([ requestBid ]);
+        const multiFormatRequest = spec.buildRequests([requestBid]);
         const serverResponse = {
           body: {
             bids: [
@@ -173,24 +173,30 @@ describe('onetag', function () {
       const data = JSON.parse(d);
       it('Should contain all keys', function () {
         expect(data).to.be.an('object');
-        expect(data).to.include.all.keys('location', 'referrer', 'masked', 'sHeight', 'sWidth', 'docHeight', 'wHeight', 'wWidth', 'oHeight', 'oWidth', 'aWidth', 'aHeight', 'sLeft', 'sTop', 'hLength', 'bids', 'docHidden', 'xOffset', 'yOffset', 'timing', 'version');
-        expect(data.location).to.be.a('string');
-        expect(data.masked).to.be.oneOf([0, 1, 2]);
+        expect(data).to.include.all.keys('location', 'referrer', 'stack', 'numIframes', 'sHeight', 'sWidth', 'docHeight', 'wHeight', 'wWidth', 'oHeight', 'oWidth', 'aWidth', 'aHeight', 'sLeft', 'sTop', 'hLength', 'bids', 'docHidden', 'xOffset', 'yOffset', 'networkConnectionType', 'networkEffectiveConnectionType', 'timing', 'version');
+        expect(data.location).to.satisfy(function (value) {
+          return value === null || typeof value === 'string';
+        });
         expect(data.referrer).to.satisfy(referrer => referrer === null || typeof referrer === 'string');
+        expect(data.stack).to.be.an('array');
+        expect(data.numIframes).to.be.a('number');
         expect(data.sHeight).to.be.a('number');
         expect(data.sWidth).to.be.a('number');
         expect(data.wWidth).to.be.a('number');
         expect(data.wHeight).to.be.a('number');
         expect(data.oHeight).to.be.a('number');
         expect(data.oWidth).to.be.a('number');
-        expect(data.ancestorOrigin).to.satisfy(function (value) {
-          return value === null || typeof value === 'string';
-        });
         expect(data.aWidth).to.be.a('number');
         expect(data.aHeight).to.be.a('number');
         expect(data.sLeft).to.be.a('number');
         expect(data.sTop).to.be.a('number');
         expect(data.hLength).to.be.a('number');
+        expect(data.networkConnectionType).to.satisfy(function (value) {
+          return value === null || typeof value === 'string'
+        });
+        expect(data.networkEffectiveConnectionType).to.satisfy(function (value) {
+          return value === null || typeof value === 'string'
+        });
         expect(data.bids).to.be.an('array');
         expect(data.version).to.have.all.keys('prebid', 'adapter');
         const bids = data['bids'];
@@ -231,14 +237,14 @@ describe('onetag', function () {
           expect(bid.pubId).to.be.a('string');
         }
       });
-    } catch (e) {}
+    } catch (e) { }
     it('Returns empty data if no valid requests are passed', function () {
       serverRequest = spec.buildRequests([]);
       let dataString = serverRequest.data;
       try {
         let dataObj = JSON.parse(dataString);
         expect(dataObj.bids).to.be.an('array').that.is.empty;
-      } catch (e) {}
+      } catch (e) { }
     });
     it('should send GDPR consent data', function () {
       let consentString = 'consentString';
@@ -287,7 +293,7 @@ describe('onetag', function () {
         let dataItem = interpretedResponse[i];
         expect(dataItem).to.include.all.keys('requestId', 'cpm', 'width', 'height', 'ttl', 'creativeId', 'netRevenue', 'currency', 'meta', 'dealId');
         if (dataItem.meta.mediaType === VIDEO) {
-          const {context} = find(requestData.bids, (item) => item.bidId === dataItem.requestId);
+          const { context } = find(requestData.bids, (item) => item.bidId === dataItem.requestId);
           if (context === INSTREAM) {
             expect(dataItem).to.include.all.keys('videoCacheKey', 'vastUrl');
             expect(dataItem.vastUrl).to.be.a('string');
@@ -321,7 +327,7 @@ describe('onetag', function () {
   describe('getUserSyncs', function () {
     const sync_endpoint = 'https://onetag-sys.com/usync/';
     it('Returns an iframe if iframeEnabled is true', function () {
-      const syncs = spec.getUserSyncs({iframeEnabled: true});
+      const syncs = spec.getUserSyncs({ iframeEnabled: true });
       expect(syncs).to.be.an('array');
       expect(syncs.length).to.equal(1);
       expect(syncs[0].type).to.equal('iframe');
@@ -383,16 +389,16 @@ describe('onetag', function () {
       expect(isSchainValid(undefined)).to.be.false;
     });
     it('Should return false when schain is missing nodes key', function () {
-      const schain = {'otherKey': 'otherValue'};
+      const schain = { 'otherKey': 'otherValue' };
       expect(isSchainValid(schain)).to.be.false;
     });
     it('Should return false when schain is missing one of the required SupplyChainNode attribute', function () {
-      const missingAsiNode = {'sid': '00001', 'hp': 1};
-      const missingSidNode = {'asi': 'indirectseller.com', 'hp': 1};
-      const missingHpNode = {'asi': 'indirectseller.com', 'sid': '00001'};
-      expect(isSchainValid({'config': {'nodes': [missingAsiNode]}})).to.be.false;
-      expect(isSchainValid({'config': {'nodes': [missingSidNode]}})).to.be.false;
-      expect(isSchainValid({'config': {'nodes': [missingHpNode]}})).to.be.false;
+      const missingAsiNode = { 'sid': '00001', 'hp': 1 };
+      const missingSidNode = { 'asi': 'indirectseller.com', 'hp': 1 };
+      const missingHpNode = { 'asi': 'indirectseller.com', 'sid': '00001' };
+      expect(isSchainValid({ 'config': { 'nodes': [missingAsiNode] } })).to.be.false;
+      expect(isSchainValid({ 'config': { 'nodes': [missingSidNode] } })).to.be.false;
+      expect(isSchainValid({ 'config': { 'nodes': [missingHpNode] } })).to.be.false;
     });
     it('Should return true when schain contains all required attributes', function () {
       const validSchain = {

From c56d78a2cca3ef46a2cb7a33fec40b35545d8b0a Mon Sep 17 00:00:00 2001
From: TheMediaGrid <44166371+TheMediaGrid@users.noreply.github.com>
Date: Tue, 20 Dec 2022 16:11:56 +0300
Subject: [PATCH 535/569] TheMediaGrid: fix tmax value (#9339)

---
 modules/gridBidAdapter.js                |  3 +--
 test/spec/modules/gridBidAdapter_spec.js | 18 ------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index b300c5c58c0..aa6c0ab668f 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -94,8 +94,7 @@ export const spec = {
     let {bidderRequestId, auctionId, gdprConsent, uspConsent, timeout, refererInfo} = bidderRequest || {};
 
     const referer = refererInfo ? encodeURIComponent(refererInfo.page) : '';
-    const bidderTimeout = config.getConfig('bidderTimeout') || timeout;
-    const tmax = timeout ? Math.min(bidderTimeout, timeout) : bidderTimeout;
+    const tmax = timeout || config.getConfig('bidderTimeout');
     const imp = [];
     const bidsMap = {};
     const requests = [];
diff --git a/test/spec/modules/gridBidAdapter_spec.js b/test/spec/modules/gridBidAdapter_spec.js
index 4b93c287fee..d411f33ab50 100644
--- a/test/spec/modules/gridBidAdapter_spec.js
+++ b/test/spec/modules/gridBidAdapter_spec.js
@@ -840,24 +840,6 @@ describe('TheMediaGrid Adapter', function () {
       expect(payload.site.content.id).to.equal(contentId);
     });
 
-    it('should be right tmax when timeout in config is less then timeout in bidderRequest', function() {
-      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
-        arg => arg === 'bidderTimeout' ? 2000 : null);
-      const [request] = spec.buildRequests([bidRequests[0]], bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload.tmax).to.equal(2000);
-      getConfigStub.restore();
-    });
-    it('should be right tmax when timeout in bidderRequest is less then timeout in config', function() {
-      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
-        arg => arg === 'bidderTimeout' ? 5000 : null);
-      const [request] = spec.buildRequests([bidRequests[0]], bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload.tmax).to.equal(3000);
-      getConfigStub.restore();
-    });
     it('should contain regs.coppa if coppa is true in config', function () {
       const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
         arg => arg === 'coppa' ? true : null);

From 5950984cf2aebdc1ea0f18c14ee057ddd79f1df7 Mon Sep 17 00:00:00 2001
From: geoffray-viously <95097046+geoffray-viously@users.noreply.github.com>
Date: Wed, 21 Dec 2022 06:32:14 +0100
Subject: [PATCH 536/569] Viously Bid Adapter : New Adapter (#9076)

* Add viously Bid Adapter

* Mod: viously documentation

* MR fixes
---
 modules/viouslyBidAdapter.js                | 209 +++++++++++
 modules/viouslyBidAdapter.md                |  35 ++
 test/spec/modules/ViouslyBidAdapter_spec.js | 378 ++++++++++++++++++++
 3 files changed, 622 insertions(+)
 create mode 100644 modules/viouslyBidAdapter.js
 create mode 100644 modules/viouslyBidAdapter.md
 create mode 100644 test/spec/modules/ViouslyBidAdapter_spec.js

diff --git a/modules/viouslyBidAdapter.js b/modules/viouslyBidAdapter.js
new file mode 100644
index 00000000000..f18c9c7b3db
--- /dev/null
+++ b/modules/viouslyBidAdapter.js
@@ -0,0 +1,209 @@
+import { deepAccess, logError, parseUrl, parseSizesInput, triggerPixel } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { VIDEO } from '../src/mediaTypes.js';
+import find from 'core-js-pure/features/array/find.js'; // eslint-disable-line prebid/validate-imports
+
+const BIDDER_CODE = 'viously';
+// const GVLID = 1028;
+const CURRENCY = 'EUR';
+const TTL = 60;
+const HTTP_METHOD = 'POST';
+const REQUEST_URL = 'https://bidder.viously.com/bid';
+const REQUIRED_VIDEO_PARAMS = ['context', 'playbackmethod', 'playerSize'];
+const REQUIRED_VIOUSLY_PARAMS = ['pid'];
+
+export const spec = {
+  code: BIDDER_CODE,
+  // gvlid: GVLID,
+  supportedMediaTypes: [VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid.
+   *
+   * @param {BidRequest} bid The bid params to validate.
+   * @return boolean True if this is a valid bid, and false otherwise.
+   */
+  isBidRequestValid: function(bid) {
+    let videoParams = deepAccess(bid, 'mediaTypes.video');
+
+    if (!bid.params) {
+      logError('The bid params are missing');
+      return false;
+    }
+
+    if (!videoParams) {
+      logError('The placement must be of video type');
+      return false;
+    }
+
+    /**
+     * VIDEO checks
+     */
+
+    let areParamsValid = true;
+
+    REQUIRED_VIDEO_PARAMS.forEach(function(videoParam) {
+      if (typeof videoParams[videoParam] === 'undefined') {
+        logError('mediaTypes.video.' + videoParam + ' must be set for video placement.');
+        areParamsValid = false;
+      }
+    });
+
+    if (parseSizesInput(videoParams.playerSize).length === 0) {
+      logError('mediaTypes.video.playerSize must be set for video placement at the right format.');
+      return false;
+    }
+
+    /**
+     * Viously checks
+     */
+
+    REQUIRED_VIOUSLY_PARAMS.forEach(function(viouslyParam) {
+      if (typeof bid.params[viouslyParam] === 'undefined') {
+        logError('The ' + viouslyParam + ' is missing.');
+        areParamsValid = false;
+      }
+    });
+
+    if (!areParamsValid) {
+      return false;
+    }
+
+    return true;
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let payload = {};
+
+    /** Viously Publisher ID */
+    if (validBidRequests[0].params.pid) {
+      payload.pid = validBidRequests[0].params.pid;
+    }
+
+    // Referer Info
+    if (config.getConfig('pageUrl')) {
+      let parsedUrl = parseUrl(config.getConfig('pageUrl'));
+
+      payload.domain = parsedUrl.hostname;
+      payload.page_domain = config.getConfig('pageUrl');
+    } else if (bidderRequest && bidderRequest.refererInfo) {
+      let parsedUrl = parseUrl(bidderRequest.refererInfo.page);
+
+      payload.domain = parsedUrl.hostname;
+      payload.page_domain = bidderRequest.refererInfo.page;
+    }
+    if (payload.domain) {
+      /** Make sur that the scheme is not part of the domain */
+      payload.domain = payload.domain.replace(/(^\w+:|^)\/\//, '');
+      payload.domain = payload.domain.replace(/\/$/, '');
+    }
+
+    // Handle GDPR
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      payload.gdpr = bidderRequest.gdprConsent.gdprApplies;
+      payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
+      if (bidderRequest.gdprConsent.addtlConsent && bidderRequest.gdprConsent.addtlConsent.indexOf('~') !== -1) {
+        payload.addtl_consent = bidderRequest.gdprConsent.addtlConsent;
+      }
+    }
+
+    // US Privacy
+    if (bidderRequest && bidderRequest.uspConsent) {
+      payload.us_privacy = bidderRequest.uspConsent;
+    }
+
+    // Schain
+    if (validBidRequests[0].schain) {
+      payload.schain = validBidRequests[0].schain;
+    }
+    // Currency
+    payload.currency_code = CURRENCY;
+
+    // User IDs
+    if (validBidRequests[0].userIdAsEids) {
+      payload.users_uid = validBidRequests[0].userIdAsEids;
+    }
+
+    // Placements
+    payload.placements = validBidRequests.map(bidRequest => {
+      let request = {
+        id: bidRequest.adUnitCode,
+        bid_id: bidRequest.bidId
+      };
+
+      request.video_params = {
+        context: deepAccess(bidRequest, 'mediaTypes.video.context'),
+        playbackmethod: deepAccess(bidRequest, 'mediaTypes.video.playbackmethod'),
+        size: parseSizesInput(deepAccess(bidRequest, 'mediaTypes.video.playerSize'))
+      };
+
+      return request;
+    });
+
+    return {
+      method: HTTP_METHOD,
+      url: validBidRequests[0].params.endpoint ? validBidRequests[0].params.endpoint : REQUEST_URL,
+      data: payload
+    };
+  },
+
+  interpretResponse: function(serverResponse, requests) {
+    const bidResponses = [];
+    const responseBody = serverResponse.body;
+
+    if (responseBody.ads && responseBody.ads.length > 0) {
+      responseBody.ads.forEach(function(bidResponse) {
+        if (bidResponse.bid) {
+          let bidRequest = find(requests.data.placements, bid => bid.bid_id === bidResponse.bid_id);
+
+          if (bidRequest) {
+            let sizes = bidResponse.size.split('x');
+
+            const bid = {
+              requestId: bidRequest.bid_id,
+              id: bidResponse.id,
+              cpm: bidResponse.cpm,
+              width: sizes[0],
+              height: sizes[1],
+              creativeId: bidResponse.creative_id || '',
+              currency: CURRENCY,
+              netRevenue: true,
+              ttl: TTL,
+              mediaType: 'video',
+              meta: {},
+              // Tracking data
+              nurl: bidResponse.nurl ? bidResponse.nurl : []
+            };
+
+            if (bidResponse.ad_url) {
+              bid.vastUrl = bidResponse.ad_url;
+            } else {
+              bid.vastXml = bidResponse.ad;
+            }
+
+            bidResponses.push(bid);
+          }
+        }
+      });
+    }
+
+    return bidResponses;
+  },
+
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {},
+
+  onTimeout: function(timeoutData) {},
+
+  onBidWon: function(bid) {
+    if (bid && bid.nurl && bid.nurl.length > 0) {
+      bid.nurl.forEach(function(winUrl) {
+        triggerPixel(winUrl, null);
+      });
+    }
+  },
+
+  onSetTargeting: function(bid) {}
+};
+
+registerBidder(spec);
diff --git a/modules/viouslyBidAdapter.md b/modules/viouslyBidAdapter.md
new file mode 100644
index 00000000000..0d15525cc72
--- /dev/null
+++ b/modules/viouslyBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+```
+Module Name: Viously Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@viously.com
+```
+
+# Description
+
+Module that connects to Viously's demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                video: {
+                    playerSize: [640, 360],
+                    context: 'instream',
+                    playbackmethod: [1, 2, 3, 4, 5, 6]
+                }
+            },
+            bids: [
+                {
+                    bidder: 'viously',
+                    params: {
+                        pid: '20d30b78-43ec-11ed-b878-0242ac120002'
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/test/spec/modules/ViouslyBidAdapter_spec.js b/test/spec/modules/ViouslyBidAdapter_spec.js
new file mode 100644
index 00000000000..612c5f87138
--- /dev/null
+++ b/test/spec/modules/ViouslyBidAdapter_spec.js
@@ -0,0 +1,378 @@
+import {expect} from 'chai';
+
+import { deepClone, mergeDeep } from 'src/utils';
+import { createEidsArray } from 'modules/userId/eids.js';
+
+import {spec as adapter} from 'modules/viouslyBidAdapter';
+
+import sinon from 'sinon';
+import { config } from 'src/config.js';
+
+const CURRENCY = 'EUR';
+const TTL = 60;
+const HTTP_METHOD = 'POST';
+const REQUEST_URL = 'https://bidder.viously.com/bid';
+
+const VALID_BID_VIDEO = {
+  bidder: 'viously',
+  bidId: '5e6f7g8h',
+  adUnitCode: 'id-5678',
+  params: {
+    pid: '123e4567-e89b-12d3-a456-426614174001'
+  },
+  mediaTypes: {
+    video: {
+      playerSize: [640, 360],
+      context: 'instream',
+      playbackmethod: [1, 2, 3, 4]
+    }
+  }
+};
+
+const VALID_REQUEST_VIDEO = {
+  method: HTTP_METHOD,
+  url: REQUEST_URL,
+  data: {
+    pid: '123e4567-e89b-12d3-a456-426614174001',
+    currency_code: CURRENCY,
+    placements: [
+      {
+        id: 'id-5678',
+        bid_id: '5e6f7g8h',
+        video_params: {
+          context: 'instream',
+          playbackmethod: [1, 2, 3, 4],
+          size: ['640x360']
+        }
+      }
+    ]
+  }
+};
+
+const VALID_GDPR = {
+  gdprApplies: true,
+  apiVersion: 2,
+  consentString: 'abcdefgh',
+  addtlConsent: '1~12345678',
+  vendorData: {
+    purpose: {
+      consents: {
+        1: true
+      }
+    }
+  }
+};
+const US_PRIVACY = '1YNN';
+
+describe('ViouslyAdapter', function () {
+  describe('isBidRequestValid', function () {
+    describe('Check method return', function () {
+      it('should return true', function () {
+        expect(adapter.isBidRequestValid(VALID_BID_VIDEO)).to.equal(true);
+      });
+
+      it('should return false because the pid is missing', function () {
+        let wrongBid = deepClone(VALID_BID_VIDEO);
+        delete wrongBid.params.pid;
+
+        expect(adapter.isBidRequestValid(wrongBid)).to.equal(false);
+      });
+
+      it('should return false because the video context parameter is missing', function () {
+        let wrongBid = deepClone(VALID_BID_VIDEO);
+
+        delete wrongBid.mediaTypes.video.context;
+        expect(adapter.isBidRequestValid(wrongBid)).to.equal(false);
+      });
+    });
+  });
+
+  describe('buildRequests', function () {
+    describe('Check method return', function () {
+      it('should return the right formatted video requests', function() {
+        expect(adapter.buildRequests([VALID_BID_VIDEO])).to.deep.equal(VALID_REQUEST_VIDEO);
+      });
+
+      it('should return the right formatted request with the referer info', function() {
+        let bidderRequest = {
+          refererInfo: {
+            page: 'https://www.example.com/test'
+          }
+        };
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO), {
+          data: {
+            domain: 'www.example.com',
+            page_domain: 'https://www.example.com/test'
+          }
+        });
+
+        expect(adapter.buildRequests([VALID_BID_VIDEO], bidderRequest)).to.deep.equal(requests);
+      });
+
+      it('should return the right formatted request with the referer info from config', function() {
+        /** Mock the config.getConfig method */
+        sinon.stub(config, 'getConfig')
+          .withArgs('pageUrl')
+          .returns('https://www.example.com/page');
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO), {
+          data: {
+            domain: 'www.example.com',
+            page_domain: 'https://www.example.com/page'
+          }
+        });
+
+        expect(adapter.buildRequests([VALID_BID_VIDEO])).to.deep.equal(requests);
+
+        config.getConfig.restore();
+      });
+
+      it('should return the right formatted request with GDPR Consent info', function() {
+        let bidderRequest = {
+          gdprConsent: VALID_GDPR
+        };
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO), {
+          data: {
+            gdpr: true,
+            gdpr_consent: 'abcdefgh',
+            addtl_consent: '1~12345678'
+          }
+        });
+
+        expect(adapter.buildRequests([VALID_BID_VIDEO], bidderRequest)).to.deep.equal(requests);
+      });
+
+      it('should return the right formatted request with US Privacy info', function() {
+        let bidderRequest = {
+          uspConsent: US_PRIVACY
+        };
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO), {
+          data: {
+            us_privacy: US_PRIVACY
+          }
+        });
+
+        expect(adapter.buildRequests([VALID_BID_VIDEO], bidderRequest)).to.deep.equal(requests);
+      });
+
+      // TODO: Supply chain
+      it('should return the right formatted request with Supply Chain info', function() {
+        let schain = {
+          'ver': '1.0',
+          'complete': 1,
+          'nodes': [
+            {
+              'asi': 'test1.com',
+              'sid': '00001',
+              'hp': 1
+            },
+            {
+              'asi': 'test2-2.com',
+              'sid': '00002',
+              'hp': 2
+            }
+          ]
+        };
+
+        let bid = mergeDeep(deepClone(VALID_BID_VIDEO), {
+          schain: schain
+        });
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO), {
+          data: {
+            schain: schain
+          }
+        });
+
+        expect(adapter.buildRequests([bid])).to.deep.equal(requests);
+      });
+
+      it('should return the right formatted request with User Ids info', function() {
+        let userIds = {
+          idl_env: '1234-5678-9012-3456', // Liveramp
+          netId: 'testnetid123', // NetId
+          IDP: 'userIDP000', // IDP
+          fabrickId: 'fabrickId9000', // FabrickId
+          uid2: { id: 'testuid2' } // UID 2.0
+        };
+
+        let bid = mergeDeep(deepClone(VALID_BID_VIDEO), {
+          userIds: userIds
+        }, {
+          userIdAsEids: createEidsArray(userIds)
+        });
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO), {
+          data: {
+            users_uid: createEidsArray(userIds)
+          }
+        });
+
+        expect(adapter.buildRequests([bid])).to.deep.equal(requests);
+      });
+
+      it('should return the right formatted request with endpint test', function() {
+        let endpoint = 'https://bid-test.viously.com/prebid';
+
+        let bid = mergeDeep(deepClone(VALID_BID_VIDEO), {
+          params: {
+            endpoint: endpoint
+          }
+        });
+
+        let requests = mergeDeep(deepClone(VALID_REQUEST_VIDEO));
+
+        requests.url = endpoint;
+
+        expect(adapter.buildRequests([bid])).to.deep.equal(requests);
+      });
+
+      // TODO: Floor
+    });
+  });
+
+  describe('interpretResponse', function() {
+    describe('Check method return', function () {
+      it('should return the right formatted response', function() {
+        let response = {
+          body: {
+            ads: [
+              {
+                bid: false,
+                id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-0',
+                bid_id: '1234'
+              },
+              {
+                bid: true,
+                creative_id: '2468',
+                id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-1',
+                bid_id: '5678',
+                cpm: 8,
+                ad: 'vast xml',
+                ad_url: 'http://www.example.com/vast',
+                type: 'video',
+                size: '640x480',
+                nurl: [
+                  'win.domain.com'
+                ]
+              },
+              {
+                bid: true,
+                creative_id: '1469',
+                id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-3',
+                bid_id: '2570',
+                cpm: 4,
+                ad: 'vast xml',
+                type: 'video',
+                size: '640x480',
+              }
+            ]
+          }
+        };
+        let requests = {
+          data: {
+            placements: [
+              {
+                id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-0',
+                bid_id: '1234'
+              },
+              {
+                id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-1',
+                bid_id: '5678'
+              },
+              {
+                id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-3',
+                bid_id: '2570'
+              }
+            ]
+          }
+        };
+
+        let formattedReponse = [
+          {
+            requestId: '5678',
+            id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-1',
+            cpm: 8,
+            width: '640',
+            height: '480',
+            creativeId: '2468',
+            currency: CURRENCY,
+            netRevenue: true,
+            ttl: TTL,
+            mediaType: 'video',
+            meta: {},
+            vastUrl: 'http://www.example.com/vast',
+            nurl: [
+              'win.domain.com'
+            ]
+          },
+          {
+            requestId: '2570',
+            id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-3',
+            cpm: 4,
+            width: '640',
+            height: '480',
+            creativeId: '1469',
+            currency: CURRENCY,
+            netRevenue: true,
+            ttl: TTL,
+            mediaType: 'video',
+            meta: {},
+            vastXml: 'vast xml',
+            nurl: []
+          }
+        ];
+
+        expect(adapter.interpretResponse(response, requests)).to.deep.equal(formattedReponse);
+      });
+    });
+  });
+
+  describe('onBidWon', function() {
+    describe('Check methods succeed', function () {
+      it('should not throw error', function() {
+        let bids = [
+          {
+            requestId: '5678',
+            id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-1',
+            cpm: 8,
+            width: '640',
+            height: '480',
+            creativeId: '2468',
+            currency: CURRENCY,
+            netRevenue: true,
+            ttl: TTL,
+            mediaType: 'video',
+            meta: {},
+            vastUrl: 'http://www.example.com/vast',
+            nurl: [
+              'win.domain.com'
+            ]
+          },
+          {
+            requestId: '2570',
+            id: 'id-0157324f-bee4-5390-a14c-47a7da3eb73c-3',
+            cpm: 4,
+            width: '640',
+            height: '480',
+            creativeId: '1469',
+            currency: CURRENCY,
+            netRevenue: true,
+            ttl: TTL,
+            mediaType: 'video',
+            meta: {},
+            vastXml: 'vast xml',
+            nurl: []
+          }
+        ];
+
+        bids.forEach(function(bid) {
+          expect(adapter.onBidWon.bind(adapter, bid)).to.not.throw();
+        });
+      });
+    });
+  });
+});

From 681e2c7fa81fca27f39df81c56f8d162e1815fd2 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 20 Dec 2022 23:09:19 -0700
Subject: [PATCH 537/569] Topics FPD module: fix tests (#9354)

---
 test/spec/modules/topicsFpdModule_spec.js | 63 +++++++++++++++--------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/test/spec/modules/topicsFpdModule_spec.js b/test/spec/modules/topicsFpdModule_spec.js
index 69e7cc16ca8..958489f2728 100644
--- a/test/spec/modules/topicsFpdModule_spec.js
+++ b/test/spec/modules/topicsFpdModule_spec.js
@@ -1,4 +1,12 @@
-import {getTopics, getTopicsData, processFpd, hasGDPRConsent, getCachedTopics, receiveMessage, topicStorageName} from '../../../modules/topicsFpdModule.js';
+import {
+  getTopics,
+  getTopicsData,
+  processFpd,
+  hasGDPRConsent,
+  getCachedTopics,
+  receiveMessage,
+  topicStorageName
+} from '../../../modules/topicsFpdModule.js';
 import {deepClone, safeJSONParse} from '../../../src/utils.js';
 import {gdprDataHandler} from 'src/adapterManager.js';
 import {getCoreStorageManager} from 'src/storageManager.js';
@@ -9,14 +17,14 @@ describe('getTopicsData', () => {
       topic,
       taxonomyVersion: taxv,
       modelVersion: modelv
-    }
+    };
   }
 
   function byTaxClass(segments) {
     return segments.reduce((memo, segment) => {
       memo[`${segment.ext.segtax}:${segment.ext.segclass}`] = segment;
       return memo;
-    }, {})
+    }, {});
   }
 
   [
@@ -146,16 +154,16 @@ describe('getTopicsData', () => {
         Object.entries(byTaxClass(actual)).forEach(([key, datum]) => {
           sinon.assert.match(datum, expected[key]);
           expect(datum.name).to.equal('mockName');
-        })
+        });
       });
 
       it('should not set name if null', () => {
         getTopicsData(null, topics).forEach((data) => {
           expect(data.hasOwnProperty('name')).to.be.false;
-        })
-      })
-    })
-  })
+        });
+      });
+    });
+  });
 });
 
 describe('getTopics', () => {
@@ -169,11 +177,13 @@ describe('getTopics', () => {
     'document that throws on featurePolicy': {
       browsingTopics: sinon.stub(),
       get featurePolicy() {
-        throw new Error()
+        throw new Error();
       }
     },
     'document that throws on browsingTopics': {
-      browsingTopics: sinon.stub().callsFake(() => { throw new Error(); }),
+      browsingTopics: sinon.stub().callsFake(() => {
+        throw new Error();
+      }),
       featurePolicy: {
         allowsFeature: sinon.stub().returns(true)
       }
@@ -183,11 +193,11 @@ describe('getTopics', () => {
       return getTopics(doc).then((topics) => {
         expect(topics).to.eql([]);
       });
-    })
+    });
   });
 
   it('should call `document.browsingTopics` when allowed', () => {
-    const topics = ['t1', 't2']
+    const topics = ['t1', 't2'];
     return getTopics({
       browsingTopics: sinon.stub().returns(Promise.resolve(topics)),
       featurePolicy: {
@@ -195,9 +205,9 @@ describe('getTopics', () => {
       }
     }).then((actual) => {
       expect(actual).to.eql(topics);
-    })
-  })
-})
+    });
+  });
+});
 
 describe('processFpd', () => {
   const mockData = [
@@ -244,7 +254,7 @@ describe('Topics Module GDPR consent check', () => {
   let gdprDataHdlrStub;
   beforeEach(() => {
     gdprDataHdlrStub = sinon.stub(gdprDataHandler, 'getConsentData');
-  })
+  });
 
   afterEach(() => {
     gdprDataHdlrStub.restore();
@@ -261,7 +271,7 @@ describe('Topics Module GDPR consent check', () => {
     expect(hasGDPRConsent()).to.equal(false);
   });
 
-  it("should return true when GDPR doesn't apply", () => {
+  it('should return true when GDPR doesn\'t apply', () => {
     const consentString = 'CPi8wgAPi8wgAADABBENCrCsAP_AAH_AAAAAISNB7D==';
     const consentConfig = {
       consentString: consentString,
@@ -365,7 +375,7 @@ describe('getCachedTopics()', () => {
   const evt = {
     data: '{"segment":{"domain":"ads.pubmatic.com","topics":[{"configVersion":"chrome.1","modelVersion":"2206021246","taxonomyVersion":"1","topic":165,"version":"chrome.1:1:2206021246"}],"bidder":"pubmatic"},"date":1669743901858}',
     origin: 'https://ads.pubmatic.com'
-  }
+  };
 
   let gdprDataHdlrStub;
   beforeEach(() => {
@@ -378,14 +388,23 @@ describe('getCachedTopics()', () => {
   });
 
   it('should return segments for bidder if GDPR consent is true and there is cached segments stored which is not expired', () => {
-    let storedSegments = '[["pubmatic",{"2206021246":{"ext":{"segtax":600,"segclass":"2206021246"},"segment":[{"id":"243"},{"id":"265"}],"name":"ads.pubmatic.com"},"lastUpdated":1669719242027}]]';
+    const storedSegments = JSON.stringify(
+      [['pubmatic', {
+        '2206021246': {
+          'ext': {'segtax': 600, 'segclass': '2206021246'},
+          'segment': [{'id': '243'}, {'id': '265'}],
+          'name': 'ads.pubmatic.com'
+        },
+        'lastUpdated': new Date().getTime()
+      }]]
+    );
     storage.setDataInLocalStorage(topicStorageName, storedSegments);
     gdprDataHdlrStub.returns(consentConfig);
     assert.deepEqual(getCachedTopics(), expected);
   });
 
   it('should return empty segments for bidder if GDPR consent is true and there is cached segments stored which is expired', () => {
-    let storedSegments = '[["pubmatic",{"2206021246":{"ext":{"segtax":600,"segclass":"2206021246"},"segment":[{"id":"243"},{"id":"265"}],"name":"ads.pubmatic.com"},"lastUpdated":1659719242027}]]';
+    let storedSegments = '[["pubmatic",{"2206021246":{"ext":{"segtax":600,"segclass":"2206021246"},"segment":[{"id":"243"},{"id":"265"}],"name":"ads.pubmatic.com"},"lastUpdated":10}]]';
     storage.setDataInLocalStorage(topicStorageName, storedSegments);
     gdprDataHdlrStub.returns(consentConfig);
     assert.deepEqual(getCachedTopics(), []);
@@ -394,7 +413,7 @@ describe('getCachedTopics()', () => {
   it('should stored segments if receiveMessage event is triggerred with segment data', () => {
     return processFpd({}, {global: {}}, {data: Promise.resolve(mockData)})
       .then(({global}) => {
-        receiveMessage(evt)
+        receiveMessage(evt);
         let segments = new Map(safeJSONParse(storage.getDataFromLocalStorage(topicStorageName)));
         expect(segments.has('pubmatic')).to.equal(true);
       });
@@ -410,4 +429,4 @@ describe('getCachedTopics()', () => {
         expect(segments.get('pubmatic')[2206021246].segment.length).to.equal(1);
       });
   });
-})
+});

From 77647180e5fc3c8058adcf5d642499ad3146b495 Mon Sep 17 00:00:00 2001
From: mjaworskiccx <50406214+mjaworskiccx@users.noreply.github.com>
Date: Wed, 21 Dec 2022 16:39:56 +0100
Subject: [PATCH 538/569] Ccx Bid Adapter: Add GVLID param (#9359)

* adomain support

* adomain support

* adomain support

* adomain support

* adomain support

* video params

* docs changes

* Clickonometrics adapter update

* Revert "Revert "Clickonometrics Bid Adapter : add gvlid (#9198)" (#9216)"

This reverts commit 6d114e83725b403fadd889202b449de225db7275.
---
 modules/ccxBidAdapter.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/ccxBidAdapter.js b/modules/ccxBidAdapter.js
index 7c6b0411023..efdb8992669 100644
--- a/modules/ccxBidAdapter.js
+++ b/modules/ccxBidAdapter.js
@@ -5,6 +5,7 @@ import {getStorageManager} from '../src/storageManager.js';
 const BIDDER_CODE = 'ccx'
 const storage = getStorageManager({bidderCode: BIDDER_CODE});
 const BID_URL = 'https://delivery.clickonometrics.pl/ortb/prebid/bid'
+const GVLID = 773;
 const SUPPORTED_VIDEO_PROTOCOLS = [2, 3, 5, 6]
 const SUPPORTED_VIDEO_MIMES = ['video/mp4', 'video/x-flv']
 const SUPPORTED_VIDEO_PLAYBACK_METHODS = [1, 2, 3, 4]
@@ -19,8 +20,7 @@ function _getDeviceObj () {
 
 function _getSiteObj (bidderRequest) {
   let site = {}
-  // TODO: does the fallback to window.location make sense?
-  let url = bidderRequest?.refererInfo?.page || window.location.href
+  let url = bidderRequest?.refererInfo?.page
   if (url.length > 0) {
     url = url.split('?')[0]
   }
@@ -140,6 +140,7 @@ function _buildResponse (bid, currency, ttl) {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: ['banner', 'video'],
 
   isBidRequestValid: function (bid) {

From 51c984e7088a7bdf13da4c36c988938711f0089a Mon Sep 17 00:00:00 2001
From: Patrick McCann <patmmccann@gmail.com>
Date: Wed, 21 Dec 2022 11:52:06 -0500
Subject: [PATCH 539/569] Revert "Ccx Bid Adapter: Add GVLID param (#9359)"
 (#9363)

This reverts commit 77647180e5fc3c8058adcf5d642499ad3146b495.

Co-authored-by: Demetrio Girardi <demetrio.girardi@gmail.com>
---
 modules/ccxBidAdapter.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/ccxBidAdapter.js b/modules/ccxBidAdapter.js
index efdb8992669..7c6b0411023 100644
--- a/modules/ccxBidAdapter.js
+++ b/modules/ccxBidAdapter.js
@@ -5,7 +5,6 @@ import {getStorageManager} from '../src/storageManager.js';
 const BIDDER_CODE = 'ccx'
 const storage = getStorageManager({bidderCode: BIDDER_CODE});
 const BID_URL = 'https://delivery.clickonometrics.pl/ortb/prebid/bid'
-const GVLID = 773;
 const SUPPORTED_VIDEO_PROTOCOLS = [2, 3, 5, 6]
 const SUPPORTED_VIDEO_MIMES = ['video/mp4', 'video/x-flv']
 const SUPPORTED_VIDEO_PLAYBACK_METHODS = [1, 2, 3, 4]
@@ -20,7 +19,8 @@ function _getDeviceObj () {
 
 function _getSiteObj (bidderRequest) {
   let site = {}
-  let url = bidderRequest?.refererInfo?.page
+  // TODO: does the fallback to window.location make sense?
+  let url = bidderRequest?.refererInfo?.page || window.location.href
   if (url.length > 0) {
     url = url.split('?')[0]
   }
@@ -140,7 +140,6 @@ function _buildResponse (bid, currency, ttl) {
 
 export const spec = {
   code: BIDDER_CODE,
-  gvlid: GVLID,
   supportedMediaTypes: ['banner', 'video'],
 
   isBidRequestValid: function (bid) {

From e2cfc185345b5f552d18d50cba8c880b4a9ecae7 Mon Sep 17 00:00:00 2001
From: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com>
Date: Wed, 21 Dec 2022 12:33:22 -0500
Subject: [PATCH 540/569] GPP consent module: phase one release (#9321)

* GPP consent module phase 1

* various updates and added test pages

* revise calling CMP, remove provisionalConsent, remove cmpDisplayStatus check, update pbs usersync

* change callback check to be more strict

* update logic on adding gpp data to ortb2

* update gpp metadata
---
 .../gpt/gpp_us_hello_world.html               | 124 ++++
 .../gpt/gpp_us_hello_world_iframe.html        |  12 +
 .../gpp_us_hello_world_iframe_subpage.html    | 140 +++++
 modules/appnexusBidAdapter.js                 |  25 +-
 modules/bidViewability.js                     |   7 +-
 modules/consentManagement.js                  |   8 +-
 modules/consentManagementGpp.js               | 386 ++++++++++++
 modules/dfpAdServerVideo.js                   |   7 +-
 modules/prebidServerBidAdapter/index.js       |  27 +-
 modules/rtdModule/index.js                    |   3 +-
 src/adapterManager.js                         |  21 +-
 src/adapters/bidderFactory.js                 |  10 +-
 src/consentHandler.js                         |  11 +
 src/prebid.js                                 |   3 +-
 test/spec/modules/appnexusBidAdapter_spec.js  |  46 ++
 .../spec/modules/consentManagementGpp_spec.js | 577 ++++++++++++++++++
 16 files changed, 1374 insertions(+), 33 deletions(-)
 create mode 100644 integrationExamples/gpt/gpp_us_hello_world.html
 create mode 100644 integrationExamples/gpt/gpp_us_hello_world_iframe.html
 create mode 100644 integrationExamples/gpt/gpp_us_hello_world_iframe_subpage.html
 create mode 100644 modules/consentManagementGpp.js
 create mode 100644 test/spec/modules/consentManagementGpp_spec.js

diff --git a/integrationExamples/gpt/gpp_us_hello_world.html b/integrationExamples/gpt/gpp_us_hello_world.html
new file mode 100644
index 00000000000..28be86127fc
--- /dev/null
+++ b/integrationExamples/gpt/gpp_us_hello_world.html
@@ -0,0 +1,124 @@
+<!--
+  This page calls a single bidder for a single ad slot. It can be considered a "hello world" example for using
+  Prebid with the Google Publisher Tag.
+  It also makes a good test page for new adapter PR submissions. Simply set your server's Bid Params object in the
+  bids array inside the adUnits, and it will use your adapter to load an ad.
+  NOTE that many ad servers won't send back an ad if the URL is localhost... so you might need to
+  set an alias in your /etc/hosts file so that you can load this page from a different domain.
+-->
+
+<html>
+
+<head>
+    <script type="text/javascript" data-cmp-ab="1" src="https://cdn.consentmanager.net/delivery/semiautomatic.js" 
+    data-cmp-cdid="599af61faf55" data-cmp-host="delivery.consentmanager.net" data-cmp-cdn="cdn.consentmanager.net" data-cmp-codesrc="1"></script>
+
+
+  <script async src="../../build/dev/prebid.js"></script>
+  <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+  <script>
+    var FAILSAFE_TIMEOUT = 3300;
+    var PREBID_TIMEOUT = 1000;
+
+    var adUnits = [{
+      code: 'div-gpt-ad-1460505748561-0',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 600]],
+        }
+      },
+      // Replace this object to test a new Adapter!
+      bids: [{
+        bidder: 'appnexus',
+        params: {
+          placementId: 13144370
+        }
+      }]
+
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+  </script>
+
+  <script>
+    var googletag = googletag || {};
+    googletag.cmd = googletag.cmd || [];
+    googletag.cmd.push(function () {
+      googletag.pubads().disableInitialLoad();
+    });
+
+    pbjs.que.push(function () {
+      pbjs.addAdUnits(adUnits);
+      pbjs.setConfig({
+        userSync: {
+          filterSettings: {
+            iframe: {
+              bidders: ['appnexus'],
+              filter: 'include'
+            }
+          }
+        }
+      })
+      pbjs.setConfig({
+        consentManagement: {
+          gpp: {
+            cmpApi: 'iab',
+            timeout: 5000
+          },
+          usp: {
+            cmpApi: 'static',
+            consentData: {
+              getUSPData: {
+                uspString: '1YYY'
+              }
+            }
+          }
+        }
+      })
+      pbjs.requestBids({
+        bidsBackHandler: sendAdserverRequest,
+        timeout: PREBID_TIMEOUT
+      });
+    });
+
+    function sendAdserverRequest() {
+      if (pbjs.adserverRequestSent) return;
+      pbjs.adserverRequestSent = true;
+      googletag.cmd.push(function () {
+        pbjs.que.push(function () {
+          pbjs.setTargetingForGPTAsync();
+          googletag.pubads().refresh();
+        });
+      });
+    }
+
+    setTimeout(function () {
+      sendAdserverRequest();
+    }, FAILSAFE_TIMEOUT);
+
+  </script>
+
+  <script>
+    googletag.cmd.push(function () {
+      googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
+
+      googletag.pubads().enableSingleRequest();
+      googletag.enableServices();
+    });
+  </script>
+</head>
+
+<body>
+  <h2>Prebid.js Test</h2>
+  <h5>Div-1</h5>
+  <!-- <button onclick="googletag.cmd.push(function () {googletag.pubads().refresh();});">Refresh GAM</button> -->
+  <div id='div-gpt-ad-1460505748561-0'>
+    <script type='text/javascript'>
+      googletag.cmd.push(function () { googletag.display('div-gpt-ad-1460505748561-0'); });
+    </script>
+  </div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/integrationExamples/gpt/gpp_us_hello_world_iframe.html b/integrationExamples/gpt/gpp_us_hello_world_iframe.html
new file mode 100644
index 00000000000..c0a62f9d72e
--- /dev/null
+++ b/integrationExamples/gpt/gpp_us_hello_world_iframe.html
@@ -0,0 +1,12 @@
+<!-- start a locally ran server under a different port than 9999 and run gulp serve.
+  load this page from the local server to properly replicate loading prebid.js within a 3rd party iframe -->
+<html>
+<head>
+  <script type="text/javascript" data-cmp-ab="1" src="https://cdn.consentmanager.net/delivery/autoblocking/599af61faf55.js" 
+      data-cmp-host="delivery.consentmanager.net" data-cmp-cdn="cdn.consentmanager.net" data-cmp-codesrc="1"></script>
+</head>
+<body>
+  <iframe style="width: 100%; height: 100%;" src="http://test.localhost:9999/integrationExamples/gpt/gpp_us_hello_world_iframe_subpage.html"></iframe>
+</body>
+</html>
+
diff --git a/integrationExamples/gpt/gpp_us_hello_world_iframe_subpage.html b/integrationExamples/gpt/gpp_us_hello_world_iframe_subpage.html
new file mode 100644
index 00000000000..8c2096d614d
--- /dev/null
+++ b/integrationExamples/gpt/gpp_us_hello_world_iframe_subpage.html
@@ -0,0 +1,140 @@
+<!--
+  This page calls a single bidder for a single ad slot. It can be considered a "hello world" example for using
+  Prebid with the Google Publisher Tag.
+  It also makes a good test page for new adapter PR submissions. Simply set your server's Bid Params object in the
+  bids array inside the adUnits, and it will use your adapter to load an ad.
+  NOTE that many ad servers won't send back an ad if the URL is localhost... so you might need to
+  set an alias in your /etc/hosts file so that you can load this page from a different domain.
+-->
+
+<html>
+
+<head>
+  <script async src="../../build/dev/prebid.js"></script>
+  <script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
+  <script>
+    var FAILSAFE_TIMEOUT = 3300;
+    var PREBID_TIMEOUT = 1000;
+
+    var adUnits = [{
+      code: 'div-gpt-ad-1460505748561-0',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250], [300, 600]],
+        }
+      },
+      // Replace this object to test a new Adapter!
+      bids: [{
+        bidder: 'appnexus',
+        params: {
+          placementId: 13144370
+        }
+      }]
+
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+  </script>
+
+  <script>
+    var googletag = googletag || {};
+    googletag.cmd = googletag.cmd || [];
+    googletag.cmd.push(function () {
+      googletag.pubads().disableInitialLoad();
+    });
+
+    pbjs.que.push(function () {
+      pbjs.addAdUnits(adUnits);
+      pbjs.setConfig({
+        userSync: {
+          filterSettings: {
+            iframe: {
+              bidders: ['appnexus'],
+              filter: 'include'
+            }
+          }
+        }
+      })
+      pbjs.setConfig({
+        debug: true,
+        consentManagement: {
+          gpp: {
+            cmpApi: 'iab',
+            timeout: 5000
+          },
+          usp: {
+            cmpApi: 'static',
+            consentData: {
+              getUSPData: {
+                uspString: '1YYY'
+              }
+            }
+          }
+        }
+      })
+      pbjs.requestBids({
+        bidsBackHandler: sendAdserverRequest,
+        timeout: PREBID_TIMEOUT
+      });
+    });
+
+    function sendAdserverRequest() {
+      if (pbjs.adserverRequestSent) return;
+      pbjs.adserverRequestSent = true;
+      googletag.cmd.push(function () {
+        pbjs.que.push(function () {
+          pbjs.setTargetingForGPTAsync();
+          googletag.pubads().refresh();
+        });
+      });
+    }
+
+    // setTimeout(function () {
+    //   sendAdserverRequest();
+    // }, FAILSAFE_TIMEOUT);
+
+  </script>
+
+  <script>
+    googletag.cmd.push(function () {
+      googletag.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0').addService(googletag.pubads());
+
+      googletag.pubads().enableSingleRequest();
+      googletag.enableServices();
+    });
+  </script>
+</head>
+
+<body>
+  <h2>Prebid.js Test</h2>
+  <h5>Div-1</h5>
+  <!-- <button onclick="pbjs.que.push(function() {pbjs.setConfig({
+    consentManagement: {
+      gpp: {
+        cmpApi: 'iab',
+        timeout: 5000
+      },
+      usp: {
+        cmpApi: 'static',
+        consentData: {
+          getUSPData: {
+            uspString: '1YYY'
+          }
+        }
+      }
+    }
+  });
+  pbjs.requestBids({
+    bidsBackHandler: sendAdserverRequest,
+    timeout: PREBID_TIMEOUT
+  });})">Start Auction</button> -->
+  <div id='div-gpt-ad-1460505748561-0'>
+    <script type='text/javascript'>
+      googletag.cmd.push(function () { googletag.display('div-gpt-ad-1460505748561-0'); });
+    </script>
+  </div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index 77ffe0f6b94..919831b8515 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -304,6 +304,18 @@ export const spec = {
       payload.us_privacy = bidderRequest.uspConsent;
     }
 
+    if (bidderRequest?.gppConsent) {
+      payload.privacy = {
+        gpp: bidderRequest.gppConsent.gppString,
+        gpp_sid: bidderRequest.gppConsent.applicableSections
+      }
+    } else if (bidderRequest?.ortb2?.regs?.gpp) {
+      payload.privacy = {
+        gpp: bidderRequest.ortb2.regs.gpp,
+        gpp_sid: bidderRequest.ortb2.regs.gpp_sid
+      }
+    }
+
     if (bidderRequest && bidderRequest.refererInfo) {
       let refererinfo = {
         // TODO: are these the correct referer values?
@@ -424,8 +436,17 @@ export const spec = {
     }
   },
 
-  getUserSyncs: function (syncOptions, responses, gdprConsent) {
-    if (syncOptions.iframeEnabled && hasPurpose1Consent(gdprConsent)) {
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent, gppConsent) {
+    function checkGppStatus(gppConsent) {
+      // this is a temporary measure to supress usersync in US-based GPP regions
+      // this logic will be revised when proper signals (akin to purpose1 from TCF2) can be determined for US GPP
+      if (gppConsent && Array.isArray(gppConsent.applicableSections)) {
+        return gppConsent.applicableSections.every(sec => typeof sec === 'number' && sec <= 5);
+      }
+      return true;
+    }
+
+    if (syncOptions.iframeEnabled && hasPurpose1Consent(gdprConsent) && checkGppStatus(gppConsent)) {
       return [{
         type: 'iframe',
         url: 'https://acdn.adnxs.com/dmp/async_usersync.html'
diff --git a/modules/bidViewability.js b/modules/bidViewability.js
index 362401e6d1c..a5cab99b1a7 100644
--- a/modules/bidViewability.js
+++ b/modules/bidViewability.js
@@ -7,7 +7,7 @@ import * as events from '../src/events.js';
 import CONSTANTS from '../src/constants.json';
 import {isFn, logWarn, triggerPixel} from '../src/utils.js';
 import {getGlobal} from '../src/prebidGlobal.js';
-import adapterManager, {gdprDataHandler, uspDataHandler} from '../src/adapterManager.js';
+import adapterManager, {gdprDataHandler, uspDataHandler, gppDataHandler} from '../src/adapterManager.js';
 import {find} from '../src/polyfill.js';
 
 const MODULE_NAME = 'bidViewability';
@@ -44,6 +44,11 @@ export let fireViewabilityPixels = (globalModuleConfig, bid) => {
     const uspConsent = uspDataHandler.getConsentData();
     if (uspConsent) { queryParams.us_privacy = uspConsent; }
 
+    const gppConsent = gppDataHandler.getConsentData();
+    if (gppConsent) {
+      // TODO - need to know what to set here for queryParams...
+    }
+
     bid[BID_VURL_ARRAY].forEach(url => {
       // add '?' if not present in URL
       if (Object.keys(queryParams).length > 0 && url.indexOf('?') === -1) {
diff --git a/modules/consentManagement.js b/modules/consentManagement.js
index 6ca12010c74..217ceecb1c4 100644
--- a/modules/consentManagement.js
+++ b/modules/consentManagement.js
@@ -94,7 +94,7 @@ function lookupIabConsent({onSuccess, onError}) {
   const { cmpFrame, cmpFunction } = findCMP();
 
   if (!cmpFrame) {
-    return onError('CMP not found.');
+    return onError('TCF2 CMP not found.');
   }
   // to collect the consent information from the user, we perform two calls to the CMP in parallel:
   // first to collect the user's consent choices represented in an encoded string (via getConsentData)
@@ -314,11 +314,11 @@ export function resetConsentData() {
  * @param {{cmp:string, timeout:number, allowAuctionWithoutConsent:boolean, defaultGdprScope:boolean}} config required; consentManagement module config settings; cmp (string), timeout (int), allowAuctionWithoutConsent (boolean)
  */
 export function setConsentConfig(config) {
-  // if `config.gdpr` or `config.usp` exist, assume new config format.
+  // if `config.gdpr`, `config.usp` or `config.gpp` exist, assume new config format.
   // else for backward compatability, just use `config`
-  config = config && (config.gdpr || config.usp ? config.gdpr : config);
+  config = config && (config.gdpr || config.usp || config.gpp ? config.gdpr : config);
   if (!config || typeof config !== 'object') {
-    logWarn('consentManagement config not defined, exiting consent manager');
+    logWarn('consentManagement (gdpr) config not defined, exiting consent manager');
     return;
   }
   if (isStr(config.cmpApi)) {
diff --git a/modules/consentManagementGpp.js b/modules/consentManagementGpp.js
new file mode 100644
index 00000000000..8a9c3f999f0
--- /dev/null
+++ b/modules/consentManagementGpp.js
@@ -0,0 +1,386 @@
+/**
+ * This module adds GPP consentManagement support to prebid.js.  It interacts with
+ * supported CMPs (Consent Management Platforms) to grab the user's consent information
+ * and make it available for any GPP supported adapters to read/pass this information to
+ * their system and for various other features/modules in Prebid.js.
+ */
+import {deepSetValue, isNumber, isPlainObject, isStr, logError, logInfo, logWarn} from '../src/utils.js';
+import {config} from '../src/config.js';
+import {gppDataHandler} from '../src/adapterManager.js';
+import {includes} from '../src/polyfill.js';
+import {timedAuctionHook} from '../src/utils/perfMetrics.js';
+import { enrichFPD } from '../src/fpd/enrichment.js';
+
+const DEFAULT_CMP = 'iab';
+const DEFAULT_CONSENT_TIMEOUT = 10000;
+const CMP_VERSION = 1;
+
+export let userCMP;
+export let consentTimeout;
+export let staticConsentData;
+
+let consentData;
+let addedConsentHook = false;
+
+// add new CMPs here, with their dedicated lookup function
+const cmpCallMap = {
+  'iab': lookupIabConsent,
+  'static': lookupStaticConsentData
+};
+
+/**
+ * This function checks the state of the IAB gppData's applicableSection field (to ensure it's populated and has a valid value).
+ * section === 0 represents a CMP's default value when CMP is loading, it shoud not be used a real user's section.
+ *
+ * TODO --- The initial version of the GPP CMP API spec used this naming convention, but it was later changed as an update to the spec.
+ * CMPs should adjust their logic to use the new format (applicableSecctions), but that may not be the case with the initial release.
+ * Added support just in case for this transition period, can likely be removed at a later date...
+ * @param gppData represents the IAB gppData object
+ * @returns true|false
+ */
+function checkApplicableSectionIsReady(gppData) {
+  return gppData && Array.isArray(gppData.applicableSection) && gppData.applicableSection.length > 0 && gppData.applicableSection[0] !== 0;
+}
+
+/**
+ * This function checks the state of the IAB gppData's applicableSections field (to ensure it's populated and has a valid value).
+ * section === 0 represents a CMP's default value when CMP is loading, it shoud not be used a real user's section.
+ * @param gppData represents the IAB gppData object
+ * @returns true|false
+ */
+function checkApplicableSectionsIsReady(gppData) {
+  return gppData && Array.isArray(gppData.applicableSections) && gppData.applicableSections.length > 0 && gppData.applicableSections[0] !== 0;
+}
+
+/**
+ * This function reads the consent string from the config to obtain the consent information of the user.
+ * @param {function({})} onSuccess acts as a success callback when the value is read from config; pass along consentObject from CMP
+ */
+function lookupStaticConsentData({onSuccess, onError}) {
+  processCmpData(staticConsentData, {onSuccess, onError});
+}
+
+/**
+ * This function handles interacting with an IAB compliant CMP to obtain the consent information of the user.
+ * Given the async nature of the CMP's API, we pass in acting success/error callback functions to exit this function
+ * based on the appropriate result.
+ * @param {function({})} onSuccess acts as a success callback when CMP returns a value; pass along consentObjectfrom CMP
+ * @param {function(string, ...{}?)} cmpError acts as an error callback while interacting with CMP; pass along an error message (string) and any extra error arguments (purely for logging)
+ */
+function lookupIabConsent({onSuccess, onError}) {
+  const cmpApiName = '__gpp';
+  const cmpCallbacks = {};
+  let registeredPostMessageResponseListener = false;
+
+  function findCMP() {
+    let f = window;
+    let cmpFrame;
+    let cmpDirectAccess = false;
+    while (true) {
+      try {
+        if (typeof f[cmpApiName] === 'function') {
+          cmpFrame = f;
+          cmpDirectAccess = true;
+          break;
+        }
+      } catch (e) {}
+
+      // need separate try/catch blocks due to the exception errors thrown when trying to check for a frame that doesn't exist in 3rd party env
+      try {
+        if (f.frames['__gppLocator']) {
+          cmpFrame = f;
+          break;
+        }
+      } catch (e) {}
+
+      if (f === window.top) break;
+      f = f.parent;
+    }
+
+    return {
+      cmpFrame,
+      cmpDirectAccess
+    };
+  }
+
+  const {cmpFrame, cmpDirectAccess} = findCMP();
+
+  if (!cmpFrame) {
+    return onError('GPP CMP not found.');
+  }
+
+  const invokeCMP = (cmpDirectAccess) ? invokeCMPDirect : invokeCMPFrame;
+
+  function invokeCMPDirect({command, callback, parameter, version = CMP_VERSION}, resultCb) {
+    if (typeof resultCb === 'function') {
+      resultCb(cmpFrame[cmpApiName](command, callback, parameter, version));
+    } else {
+      cmpFrame[cmpApiName](command, callback, parameter, version);
+    }
+  }
+
+  function invokeCMPFrame({command, callback, parameter, version = CMP_VERSION}, resultCb) {
+    const callName = `${cmpApiName}Call`;
+    if (!registeredPostMessageResponseListener) {
+      // when we get the return message, call the stashed callback;
+      window.addEventListener('message', readPostMessageResponse, false);
+      registeredPostMessageResponseListener = true;
+    }
+
+    // call CMP via postMessage
+    const callId = Math.random().toString();
+    const msg = {
+      [callName]: {
+        command: command,
+        parameter,
+        version,
+        callId: callId
+      }
+    };
+
+    // TODO? - add logic to check if random was already used in the same session, and roll another if so?
+    cmpCallbacks[callId] = (typeof callback === 'function') ? callback : resultCb;
+    cmpFrame.postMessage(msg, '*');
+
+    function readPostMessageResponse(event) {
+      const cmpDataPkgName = `${cmpApiName}Return`;
+      const json = (typeof event.data === 'string' && event.data.includes(cmpDataPkgName)) ? JSON.parse(event.data) : event.data;
+      if (json[cmpDataPkgName] && json[cmpDataPkgName].callId) {
+        const payload = json[cmpDataPkgName];
+
+        if (cmpCallbacks.hasOwnProperty(payload.callId)) {
+          cmpCallbacks[payload.callId](payload.returnValue);
+        }
+      }
+    }
+  }
+
+  const startupMsg = (cmpDirectAccess) ? 'Detected GPP CMP API is directly accessible, calling it now...'
+    : 'Detected GPP CMP is outside the current iframe where Prebid.js is located, calling it now...';
+  logInfo(startupMsg);
+
+  invokeCMP({
+    command: 'addEventListener',
+    callback: function (evt) {
+      if (evt) {
+        logInfo(`Received a ${(cmpDirectAccess ? 'direct' : 'postmsg')} response from GPP CMP for event`, evt);
+        if (evt.eventName === 'sectionChange' || evt.pingData.cmpStatus === 'loaded') {
+          invokeCMP({command: 'getGPPData'}, function (gppData) {
+            logInfo(`Received a ${cmpDirectAccess ? 'direct' : 'postmsg'} response from GPP CMP for getGPPData`, gppData);
+            processCmpData(gppData, {onSuccess, onError});
+          });
+        } else if (evt.pingData.cmpStatus === 'error') {
+          onError('CMP returned with a cmpStatus:error response.  Please check CMP setup.');
+        }
+      }
+    }
+  });
+}
+
+/**
+ * Look up consent data and store it in the `consentData` global as well as `adapterManager.js`' gdprDataHandler.
+ *
+ * @param cb A callback that takes: a boolean that is true if the auction should be canceled; an error message and extra
+ * error arguments that will be undefined if there's no error.
+ */
+function loadConsentData(cb) {
+  let isDone = false;
+  let timer = null;
+
+  function done(consentData, shouldCancelAuction, errMsg, ...extraArgs) {
+    if (timer != null) {
+      clearTimeout(timer);
+    }
+    isDone = true;
+    gppDataHandler.setConsentData(consentData);
+    if (typeof cb === 'function') {
+      cb(shouldCancelAuction, errMsg, ...extraArgs);
+    }
+  }
+
+  if (!includes(Object.keys(cmpCallMap), userCMP)) {
+    done(null, false, `GPP CMP framework (${userCMP}) is not a supported framework.  Aborting consentManagement module and resuming auction.`);
+    return;
+  }
+
+  const callbacks = {
+    onSuccess: (data) => done(data, false),
+    onError: function (msg, ...extraArgs) {
+      done(null, true, msg, ...extraArgs);
+    }
+  }
+  cmpCallMap[userCMP](callbacks);
+
+  if (!isDone) {
+    const onTimeout = () => {
+      const continueToAuction = (data) => {
+        done(data, false, 'GPP CMP did not load, continuing auction...');
+      }
+      processCmpData(consentData, {
+        onSuccess: continueToAuction,
+        onError: () => continueToAuction(storeConsentData(undefined))
+      })
+    }
+    if (consentTimeout === 0) {
+      onTimeout();
+    } else {
+      timer = setTimeout(onTimeout, consentTimeout);
+    }
+  }
+}
+
+/**
+ * Like `loadConsentData`, but cache and re-use previously loaded data.
+ * @param cb
+ */
+function loadIfMissing(cb) {
+  if (consentData) {
+    logInfo('User consent information already known.  Pulling internally stored information...');
+    // eslint-disable-next-line standard/no-callback-literal
+    cb(false);
+  } else {
+    loadConsentData(cb);
+  }
+}
+
+/**
+ * If consentManagement module is enabled (ie included in setConfig), this hook function will attempt to fetch the
+ * user's encoded consent string from the supported CMP.  Once obtained, the module will store this
+ * data as part of a gppConsent object which gets transferred to adapterManager's gppDataHandler object.
+ * This information is later added into the bidRequest object for any supported adapters to read/pass along to their system.
+ * @param {object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
+ * @param {function} fn required; The next function in the chain, used by hook.js
+ */
+export const requestBidsHook = timedAuctionHook('gpp', function requestBidsHook(fn, reqBidsConfigObj) {
+  loadIfMissing(function (shouldCancelAuction, errMsg, ...extraArgs) {
+    if (errMsg) {
+      let log = logWarn;
+      if (shouldCancelAuction) {
+        log = logError;
+        errMsg = `${errMsg} Canceling auction as per consentManagement config.`;
+      }
+      log(errMsg, ...extraArgs);
+    }
+
+    if (shouldCancelAuction) {
+      fn.stopTiming();
+      if (typeof reqBidsConfigObj.bidsBackHandler === 'function') {
+        reqBidsConfigObj.bidsBackHandler();
+      } else {
+        logError('Error executing bidsBackHandler');
+      }
+    } else {
+      fn.call(this, reqBidsConfigObj);
+    }
+  });
+});
+
+/**
+ * This function checks the consent data provided by CMP to ensure it's in an expected state.
+ * If it's bad, we call `onError`
+ * If it's good, then we store the value and call `onSuccess`
+ */
+function processCmpData(consentObject, {onSuccess, onError}) {
+  function checkData() {
+    const gppString = consentObject && consentObject.gppString;
+    const gppSection = (checkApplicableSectionsIsReady(consentObject)) ? consentObject.applicableSections
+      : (checkApplicableSectionIsReady(consentObject)) ? consentObject.applicableSection : [];
+
+    return !!(
+      (!Array.isArray(gppSection)) ||
+      (Array.isArray(gppSection) && (!gppString || !isStr(gppString)))
+    );
+  }
+
+  if (checkData()) {
+    onError(`CMP returned unexpected value during lookup process.`, consentObject);
+  } else {
+    onSuccess(storeConsentData(consentObject));
+  }
+}
+
+/**
+ * Stores CMP data locally in module to make information available in adaptermanager.js for later in the auction
+ * @param {object} cmpConsentObject required; an object representing user's consent choices (can be undefined in certain use-cases for this function only)
+ */
+function storeConsentData(cmpConsentObject) {
+  consentData = {
+    gppString: (cmpConsentObject) ? cmpConsentObject.gppString : undefined,
+
+    fullGppData: (cmpConsentObject) || undefined,
+  };
+  consentData.applicableSections = (checkApplicableSectionsIsReady(cmpConsentObject)) ? cmpConsentObject.applicableSections
+    : (checkApplicableSectionIsReady(cmpConsentObject)) ? cmpConsentObject.applicableSection : [];
+  consentData.apiVersion = CMP_VERSION;
+  return consentData;
+}
+
+/**
+ * Simply resets the module's consentData variable back to undefined, mainly for testing purposes
+ */
+export function resetConsentData() {
+  consentData = undefined;
+  userCMP = undefined;
+  consentTimeout = undefined;
+  gppDataHandler.reset();
+}
+
+/**
+ * A configuration function that initializes some module variables, as well as add a hook into the requestBids function
+ * @param {{cmp:string, timeout:number, allowAuctionWithoutConsent:boolean, defaultGdprScope:boolean}} config required; consentManagement module config settings; cmp (string), timeout (int), allowAuctionWithoutConsent (boolean)
+ */
+export function setConsentConfig(config) {
+  config = config && config.gpp;
+  if (!config || typeof config !== 'object') {
+    logWarn('consentManagement.gpp config not defined, exiting consent manager module');
+    return;
+  }
+
+  if (isStr(config.cmpApi)) {
+    userCMP = config.cmpApi;
+  } else {
+    userCMP = DEFAULT_CMP;
+    logInfo(`consentManagement.gpp config did not specify cmp.  Using system default setting (${DEFAULT_CMP}).`);
+  }
+
+  if (isNumber(config.timeout)) {
+    consentTimeout = config.timeout;
+  } else {
+    consentTimeout = DEFAULT_CONSENT_TIMEOUT;
+    logInfo(`consentManagement.gpp config did not specify timeout.  Using system default setting (${DEFAULT_CONSENT_TIMEOUT}).`);
+  }
+
+  if (userCMP === 'static') {
+    if (isPlainObject(config.consentData)) {
+      staticConsentData = config.consentData;
+      consentTimeout = 0;
+    } else {
+      logError(`consentManagement.gpp config with cmpApi: 'static' did not specify consentData. No consents will be available to adapters.`);
+    }
+  }
+
+  logInfo('consentManagement.gpp module has been activated...');
+
+  if (!addedConsentHook) {
+    $$PREBID_GLOBAL$$.requestBids.before(requestBidsHook, 50);
+  }
+  addedConsentHook = true;
+  gppDataHandler.enable();
+  loadConsentData(); // immediately look up consent data to make it available without requiring an auction
+}
+config.getConfig('consentManagement', config => setConsentConfig(config.consentManagement));
+
+export function enrichFPDHook(next, fpd) {
+  return next(fpd.then(ortb2 => {
+    const consent = gppDataHandler.getConsentData();
+    if (consent) {
+      if (Array.isArray(consent.applicableSections)) {
+        deepSetValue(ortb2, 'regs.gpp_sid', consent.applicableSections);
+      }
+      deepSetValue(ortb2, 'regs.gpp', consent.gppString);
+    }
+    return ortb2;
+  }));
+}
+
+enrichFPD.before(enrichFPDHook);
diff --git a/modules/dfpAdServerVideo.js b/modules/dfpAdServerVideo.js
index 072715b4bd6..71c9c7aa341 100644
--- a/modules/dfpAdServerVideo.js
+++ b/modules/dfpAdServerVideo.js
@@ -8,7 +8,7 @@ import { deepAccess, isEmpty, logError, parseSizesInput, formatQS, parseUrl, bui
 import { config } from '../src/config.js';
 import { getHook, submodule } from '../src/hook.js';
 import { auctionManager } from '../src/auctionManager.js';
-import { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js';
+import { gdprDataHandler, uspDataHandler, gppDataHandler } from '../src/adapterManager.js';
 import * as events from '../src/events.js';
 import CONSTANTS from '../src/constants.json';
 import {getPPID} from '../src/adserver.js';
@@ -119,6 +119,11 @@ export function buildDfpVideoUrl(options) {
   const uspConsent = uspDataHandler.getConsentData();
   if (uspConsent) { queryParams.us_privacy = uspConsent; }
 
+  const gppConsent = gppDataHandler.getConsentData();
+  if (gppConsent) {
+    // TODO - need to know what to set here for queryParams...
+  }
+
   if (!queryParams.ppid) {
     const ppid = getPPID();
     if (ppid != null) {
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 072c280aecf..b609d1a54ec 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -216,7 +216,7 @@ export function resetSyncedStatus() {
 /**
  * @param  {Array} bidderCodes list of bidders to request user syncs for.
  */
-function queueSync(bidderCodes, gdprConsent, uspConsent, s2sConfig) {
+function queueSync(bidderCodes, gdprConsent, uspConsent, gppConsent, s2sConfig) {
   if (_s2sConfigs.length === _syncCount) {
     return;
   }
@@ -246,6 +246,15 @@ function queueSync(bidderCodes, gdprConsent, uspConsent, s2sConfig) {
     payload.us_privacy = uspConsent;
   }
 
+  if (gppConsent) {
+    // proposing the following formatting, can adjust if needed...
+    // update - leaving this param as an array, since it's part of a POST payload where the [] characters shouldn't matter too much
+    payload.gpp_sid = gppConsent.applicableSections
+    // should we add check if applicableSections was not equal to -1 (where user was out of scope)?
+    //   this would be similar to what was done above for TCF
+    payload.gpp = gppConsent.gppString;
+  }
+
   if (typeof s2sConfig.coopSync === 'boolean') {
     payload.coopSync = s2sConfig.coopSync;
   }
@@ -330,7 +339,7 @@ function doBidderSync(type, url, bidder, done, timeout) {
  *
  * @param {Array} bidders a list of bidder names
  */
-function doClientSideSyncs(bidders, gdprConsent, uspConsent) {
+function doClientSideSyncs(bidders, gdprConsent, uspConsent, gppConsent) {
   bidders.forEach(bidder => {
     let clientAdapter = adapterManager.getBidAdapter(bidder);
     if (clientAdapter && clientAdapter.registerSyncs) {
@@ -341,7 +350,8 @@ function doClientSideSyncs(bidders, gdprConsent, uspConsent) {
           clientAdapter,
           [],
           gdprConsent,
-          uspConsent
+          uspConsent,
+          gppConsent
         )
       );
     }
@@ -411,12 +421,13 @@ function getMatchingConsentUrl(urlProp, gdprConsent) {
 }
 
 function getConsentData(bidRequests) {
-  let gdprConsent, uspConsent;
+  let gdprConsent, uspConsent, gppConsent;
   if (Array.isArray(bidRequests) && bidRequests.length > 0) {
     gdprConsent = bidRequests[0].gdprConsent;
     uspConsent = bidRequests[0].uspConsent;
+    gppConsent = bidRequests[0].gppConsent;
   }
-  return { gdprConsent, uspConsent };
+  return { gdprConsent, uspConsent, gppConsent };
 }
 
 /**
@@ -433,7 +444,7 @@ export function PrebidServer() {
     done = adapterMetrics.startTiming('total').stopBefore(done);
     bidRequests.forEach(req => useMetrics(req.metrics).join(adapterMetrics, {continuePropagation: false}));
 
-    let { gdprConsent, uspConsent } = getConsentData(bidRequests);
+    let { gdprConsent, uspConsent, gppConsent } = getConsentData(bidRequests);
 
     if (Array.isArray(_s2sConfigs)) {
       if (s2sBidRequest.s2sConfig && s2sBidRequest.s2sConfig.syncEndpoint && getMatchingConsentUrl(s2sBidRequest.s2sConfig.syncEndpoint, gdprConsent)) {
@@ -441,7 +452,7 @@ export function PrebidServer() {
           .map(bidder => adapterManager.aliasRegistry[bidder] || bidder)
           .filter((bidder, index, array) => (array.indexOf(bidder) === index));
 
-        queueSync(syncBidders, gdprConsent, uspConsent, s2sBidRequest.s2sConfig);
+        queueSync(syncBidders, gdprConsent, uspConsent, gppConsent, s2sBidRequest.s2sConfig);
       }
 
       processPBSRequest(s2sBidRequest, bidRequests, ajax, {
@@ -450,7 +461,7 @@ export function PrebidServer() {
             bidRequests.forEach(bidderRequest => events.emit(CONSTANTS.EVENTS.BIDDER_DONE, bidderRequest));
           }
           done();
-          doClientSideSyncs(requestedBidders, gdprConsent, uspConsent);
+          doClientSideSyncs(requestedBidders, gdprConsent, uspConsent, gppConsent);
         },
         onError: done,
         onBid: function ({adUnit, bid}) {
diff --git a/modules/rtdModule/index.js b/modules/rtdModule/index.js
index 876da8dda37..05594c63132 100644
--- a/modules/rtdModule/index.js
+++ b/modules/rtdModule/index.js
@@ -163,7 +163,7 @@ import {getHook, module} from '../../src/hook.js';
 import {logError, logInfo, logWarn} from '../../src/utils.js';
 import * as events from '../../src/events.js';
 import CONSTANTS from '../../src/constants.json';
-import adapterManager, {gdprDataHandler, uspDataHandler} from '../../src/adapterManager.js';
+import adapterManager, {gdprDataHandler, uspDataHandler, gppDataHandler} from '../../src/adapterManager.js';
 import {find} from '../../src/polyfill.js';
 import {timedAuctionHook} from '../../src/utils/perfMetrics.js';
 
@@ -246,6 +246,7 @@ function getConsentData() {
   return {
     gdpr: gdprDataHandler.getConsentData(),
     usp: uspDataHandler.getConsentData(),
+    gpp: gppDataHandler.getConsentData(),
     coppa: !!(config.getConfig('coppa'))
   }
 }
diff --git a/src/adapterManager.js b/src/adapterManager.js
index eb6a74a82a4..f4f9e59fb84 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -31,7 +31,7 @@ import {hook} from './hook.js';
 import {find, includes} from './polyfill.js';
 import {adunitCounter} from './adUnits.js';
 import {getRefererInfo} from './refererDetection.js';
-import {GdprConsentHandler, UspConsentHandler} from './consentHandler.js';
+import {GdprConsentHandler, UspConsentHandler, GppConsentHandler} from './consentHandler.js';
 import * as events from './events.js';
 import CONSTANTS from './constants.json';
 import {useMetrics} from './utils/perfMetrics.js';
@@ -161,6 +161,7 @@ function getAdUnitCopyForClientAdapters(adUnits) {
 
 export let gdprDataHandler = new GdprConsentHandler();
 export let uspDataHandler = new UspConsentHandler();
+export let gppDataHandler = new GppConsentHandler();
 
 export let coppaDataHandler = {
   getCoppa: function() {
@@ -309,17 +310,17 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
     }
   });
 
-  if (gdprDataHandler.getConsentData()) {
-    bidRequests.forEach(bidRequest => {
+  bidRequests.forEach(bidRequest => {
+    if (gdprDataHandler.getConsentData()) {
       bidRequest['gdprConsent'] = gdprDataHandler.getConsentData();
-    });
-  }
-
-  if (uspDataHandler.getConsentData()) {
-    bidRequests.forEach(bidRequest => {
+    }
+    if (uspDataHandler.getConsentData()) {
       bidRequest['uspConsent'] = uspDataHandler.getConsentData();
-    });
-  }
+    }
+    if (gppDataHandler.getConsentData()) {
+      bidRequest['gppConsent'] = gppDataHandler.getConsentData();
+    }
+  });
 
   bidRequests.forEach(bidRequest => {
     config.runWithBidder(bidRequest.bidderCode, () => {
diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
index 7e66b849783..55c84e57062 100644
--- a/src/adapters/bidderFactory.js
+++ b/src/adapters/bidderFactory.js
@@ -214,7 +214,7 @@ export function newBidder(spec) {
         done();
         config.runWithBidder(spec.code, () => {
           events.emit(CONSTANTS.EVENTS.BIDDER_DONE, bidderRequest);
-          registerSyncs(responses, bidderRequest.gdprConsent, bidderRequest.uspConsent);
+          registerSyncs(responses, bidderRequest.gdprConsent, bidderRequest.uspConsent, bidderRequest.gppConsent);
         });
       }
 
@@ -295,8 +295,8 @@ export function newBidder(spec) {
     return false;
   }
 
-  function registerSyncs(responses, gdprConsent, uspConsent) {
-    registerSyncInner(spec, responses, gdprConsent, uspConsent);
+  function registerSyncs(responses, gdprConsent, uspConsent, gppConsent) {
+    registerSyncInner(spec, responses, gdprConsent, uspConsent, gppConsent);
   }
 
   function filterAndWarn(bid) {
@@ -448,14 +448,14 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
   })
 }, 'processBidderRequests')
 
-export const registerSyncInner = hook('async', function(spec, responses, gdprConsent, uspConsent) {
+export const registerSyncInner = hook('async', function(spec, responses, gdprConsent, uspConsent, gppConsent) {
   const aliasSyncEnabled = config.getConfig('userSync.aliasSyncEnabled');
   if (spec.getUserSyncs && (aliasSyncEnabled || !adapterManager.aliasRegistry[spec.code])) {
     let filterConfig = config.getConfig('userSync.filterSettings');
     let syncs = spec.getUserSyncs({
       iframeEnabled: !!(filterConfig && (filterConfig.iframe || filterConfig.all)),
       pixelEnabled: !!(filterConfig && (filterConfig.image || filterConfig.all)),
-    }, responses, gdprConsent, uspConsent);
+    }, responses, gdprConsent, uspConsent, gppConsent);
     if (syncs) {
       if (!Array.isArray(syncs)) {
         syncs = [syncs];
diff --git a/src/consentHandler.js b/src/consentHandler.js
index 01470a4b38c..b1b2a04c043 100644
--- a/src/consentHandler.js
+++ b/src/consentHandler.js
@@ -107,3 +107,14 @@ export class GdprConsentHandler extends ConsentHandler {
     }
   }
 }
+
+export class GppConsentHandler extends ConsentHandler {
+  getConsentMeta() {
+    const consentData = this.getConsentData();
+    if (consentData && this.generatedTime) {
+      return {
+        generatedAt: this.generatedTime,
+      }
+    }
+  }
+}
diff --git a/src/prebid.js b/src/prebid.js
index f30b4ea9bbe..a4abceb01d5 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -45,7 +45,7 @@ import {executeRenderer, isRendererRequired} from './Renderer.js';
 import {createBid} from './bidfactory.js';
 import {storageCallbacks} from './storageManager.js';
 import {emitAdRenderFail, emitAdRenderSucceeded} from './adRendering.js';
-import {default as adapterManager, gdprDataHandler, getS2SBidderSet, uspDataHandler} from './adapterManager.js';
+import {default as adapterManager, gdprDataHandler, getS2SBidderSet, gppDataHandler, uspDataHandler} from './adapterManager.js';
 import CONSTANTS from './constants.json';
 import * as events from './events.js';
 import {newMetrics, useMetrics} from './utils/perfMetrics.js';
@@ -336,6 +336,7 @@ function getConsentMetadata() {
   return {
     gdpr: gdprDataHandler.getConsentMeta(),
     usp: uspDataHandler.getConsentMeta(),
+    gpp: gppDataHandler.getConsentMeta(),
     coppa: !!(config.getConfig('coppa'))
   }
 }
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 5cd189da9a1..1ab8feceaeb 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -985,6 +985,52 @@ describe('AppNexusAdapter', function () {
       expect(payload.us_privacy).to.exist.and.to.equal(consentString);
     });
 
+    it('should add gpp information to the request via bidderRequest.gppConsent', function () {
+      let consentString = 'abc1234';
+      let bidderRequest = {
+        'bidderCode': 'appnexus',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'gppConsent': {
+          'gppString': consentString,
+          'applicableSections': [8]
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.privacy).to.exist;
+      expect(payload.privacy.gpp).to.equal(consentString);
+      expect(payload.privacy.gpp_sid).to.deep.equal([8]);
+    });
+
+    it('should add gpp information to the request via bidderRequest.ortb2.regs', function () {
+      let consentString = 'abc1234';
+      let bidderRequest = {
+        'bidderCode': 'appnexus',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'ortb2': {
+          'regs': {
+            'gpp': consentString,
+            'gpp_sid': [7]
+          }
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.privacy).to.exist;
+      expect(payload.privacy.gpp).to.equal(consentString);
+      expect(payload.privacy.gpp_sid).to.deep.equal([7]);
+    });
+
     it('supports sending hybrid mobile app parameters', function () {
       let appRequest = Object.assign({},
         bidRequests[0],
diff --git a/test/spec/modules/consentManagementGpp_spec.js b/test/spec/modules/consentManagementGpp_spec.js
new file mode 100644
index 00000000000..1170f418caf
--- /dev/null
+++ b/test/spec/modules/consentManagementGpp_spec.js
@@ -0,0 +1,577 @@
+import { setConsentConfig, requestBidsHook, resetConsentData, userCMP, consentTimeout, staticConsentData } from 'modules/consentManagementGpp.js';
+import { gppDataHandler } from 'src/adapterManager.js';
+import * as utils from 'src/utils.js';
+import { config } from 'src/config.js';
+import 'src/prebid.js';
+
+let expect = require('chai').expect;
+
+describe('consentManagementGpp', function () {
+  describe('setConsentConfig tests:', function () {
+    describe('empty setConsentConfig value', function () {
+      beforeEach(function () {
+        sinon.stub(utils, 'logInfo');
+        sinon.stub(utils, 'logWarn');
+      });
+
+      afterEach(function () {
+        utils.logInfo.restore();
+        utils.logWarn.restore();
+        config.resetConfig();
+        resetConsentData();
+      });
+
+      it('should use system default values', function () {
+        setConsentConfig({
+          gpp: {}
+        });
+        expect(userCMP).to.be.equal('iab');
+        expect(consentTimeout).to.be.equal(10000);
+        sinon.assert.callCount(utils.logInfo, 3);
+      });
+
+      it('should exit consent manager if config is not an object', function () {
+        setConsentConfig('');
+        expect(userCMP).to.be.undefined;
+        sinon.assert.calledOnce(utils.logWarn);
+      });
+
+      it('should exit consentManagement module if config is "undefined"', function () {
+        setConsentConfig(undefined);
+        expect(userCMP).to.be.undefined;
+        sinon.assert.calledOnce(utils.logWarn);
+      });
+
+      it('should not produce any consent metadata', function () {
+        setConsentConfig(undefined)
+        let consentMetadata = gppDataHandler.getConsentMeta();
+        expect(consentMetadata).to.be.undefined;
+        sinon.assert.calledOnce(utils.logWarn);
+      })
+
+      it('should immediately look up consent data', () => {
+        setConsentConfig({
+          gpp: {
+            cmpApi: 'invalid'
+          }
+        });
+        expect(gppDataHandler.ready).to.be.true;
+      })
+    });
+
+    describe('valid setConsentConfig value', function () {
+      afterEach(function () {
+        config.resetConfig();
+      });
+
+      it('results in all user settings overriding system defaults', function () {
+        let allConfig = {
+          gpp: {
+            cmpApi: 'iab',
+            timeout: 7500
+          }
+        };
+
+        setConsentConfig(allConfig);
+        expect(userCMP).to.be.equal('iab');
+        expect(consentTimeout).to.be.equal(7500);
+      });
+
+      it('should recognize config.gpp, with default cmpApi and timeout', function () {
+        setConsentConfig({
+          gpp: {}
+        });
+
+        expect(userCMP).to.be.equal('iab');
+        expect(consentTimeout).to.be.equal(10000);
+      });
+
+      it('should enable gppDataHandler', () => {
+        setConsentConfig({
+          gpp: {}
+        });
+        expect(gppDataHandler.enabled).to.be.true;
+      });
+    });
+
+    describe('static consent string setConsentConfig value', () => {
+      afterEach(() => {
+        config.resetConfig();
+      });
+
+      it('results in user settings overriding system defaults for v2 spec', () => {
+        let staticConfig = {
+          gpp: {
+            cmpApi: 'static',
+            timeout: 7500,
+            consentData: {
+              applicableSections: [7],
+              gppString: 'ABCDEFG1234',
+              gppVersion: 1,
+              sectionId: 3,
+              sectionList: []
+            }
+          }
+        };
+
+        setConsentConfig(staticConfig);
+        expect(userCMP).to.be.equal('static');
+        expect(consentTimeout).to.be.equal(0); // should always return without a timeout when config is used
+        const consent = gppDataHandler.getConsentData();
+        expect(consent.gppString).to.eql(staticConfig.gpp.consentData.gppString);
+        expect(consent.fullGppData).to.eql(staticConfig.gpp.consentData);
+        expect(staticConsentData).to.be.equal(staticConfig.gpp.consentData);
+      });
+    });
+  });
+
+  describe('requestBidsHook tests:', function () {
+    let goodConfig = {
+      gpp: {
+        cmpApi: 'iab',
+        timeout: 7500,
+      }
+    };
+
+    const staticConfig = {
+      gpp: {
+        cmpApi: 'static',
+        timeout: 7500,
+        consentData: {
+          gppString: 'abc12345',
+          applicableSections: [7]
+        }
+      }
+    }
+
+    let didHookReturn;
+
+    beforeEach(resetConsentData);
+    after(resetConsentData);
+
+    describe('error checks:', function () {
+      beforeEach(function () {
+        didHookReturn = false;
+        sinon.stub(utils, 'logWarn');
+        sinon.stub(utils, 'logError');
+      });
+
+      afterEach(function () {
+        utils.logWarn.restore();
+        utils.logError.restore();
+        config.resetConfig();
+      });
+
+      it('should throw a warning and return to hooked function when an unknown CMP framework ID is used', function () {
+        let badCMPConfig = {
+          gpp: {
+            cmpApi: 'bad'
+          }
+        };
+        setConsentConfig(badCMPConfig);
+        expect(userCMP).to.be.equal(badCMPConfig.gpp.cmpApi);
+
+        requestBidsHook(() => {
+          didHookReturn = true;
+        }, {});
+        let consent = gppDataHandler.getConsentData();
+
+        sinon.assert.calledOnce(utils.logWarn);
+        expect(didHookReturn).to.be.true;
+        expect(consent).to.be.null;
+      });
+
+      it('should call gppDataHandler.setConsentData() when unknown CMP api is used', () => {
+        setConsentConfig({
+          gpp: {
+            cmpApi: 'invalid'
+          }
+        });
+        let hookRan = false;
+        requestBidsHook(() => {
+          hookRan = true;
+        }, {});
+        expect(hookRan).to.be.true;
+        expect(gppDataHandler.ready).to.be.true;
+      })
+
+      it('should throw proper errors when CMP is not found', function () {
+        setConsentConfig(goodConfig);
+
+        requestBidsHook(() => {
+          didHookReturn = true;
+        }, {});
+        let consent = gppDataHandler.getConsentData();
+        // throw 2 errors; one for no bidsBackHandler and for CMP not being found (this is an error due to gdpr config)
+        sinon.assert.calledTwice(utils.logError);
+        expect(didHookReturn).to.be.false;
+        expect(consent).to.be.null;
+        expect(gppDataHandler.ready).to.be.true;
+      });
+
+      it('should not trip when adUnits have no size', () => {
+        setConsentConfig(staticConfig);
+        let ran = false;
+        requestBidsHook(() => {
+          ran = true;
+        }, {
+          adUnits: [{
+            code: 'test',
+            mediaTypes: {
+              video: {}
+            }
+          }]
+        });
+        return gppDataHandler.promise.then(() => {
+          expect(ran).to.be.true;
+        });
+      });
+
+      it('should continue the auction immediately, without consent data, if timeout is 0', (done) => {
+        setConsentConfig({
+          gpp: {
+            cmpApi: 'iab',
+            timeout: 0
+          }
+        });
+        window.__gpp = function () {};
+        try {
+          requestBidsHook(() => {
+            const consent = gppDataHandler.getConsentData();
+            expect(consent.applicableSections).to.deep.equal([]);
+            expect(consent.gppString).to.be.undefined;
+            done();
+          }, {})
+        } finally {
+          delete window.__gpp;
+        }
+      });
+    });
+
+    describe('already known consentData:', function () {
+      let cmpStub = sinon.stub();
+
+      function mockCMP(cmpResponse) {
+        return function (...args) {
+          if (args[0] === 'addEventListener') {
+            args[1](({
+              eventName: 'sectionChange'
+            }));
+          } else if (args[0] === 'getGPPData') {
+            return cmpResponse;
+          }
+        }
+      }
+
+      beforeEach(function () {
+        didHookReturn = false;
+        window.__gpp = function () {};
+      });
+
+      afterEach(function () {
+        config.resetConfig();
+        cmpStub.restore();
+        delete window.__gpp;
+        resetConsentData();
+      });
+
+      it('should bypass CMP and simply use previously stored consentData', function () {
+        let testConsentData = {
+          applicableSections: [7],
+          gppString: 'xyz',
+        };
+
+        cmpStub = sinon.stub(window, '__gpp').callsFake(mockCMP(testConsentData));
+        setConsentConfig(goodConfig);
+        requestBidsHook(() => {}, {});
+        cmpStub.reset();
+
+        requestBidsHook(() => {
+          didHookReturn = true;
+        }, {});
+        let consent = gppDataHandler.getConsentData();
+
+        expect(didHookReturn).to.be.true;
+        expect(consent.gppString).to.equal(testConsentData.gppString);
+        expect(consent.applicableSections).to.deep.equal(testConsentData.applicableSections);
+        sinon.assert.notCalled(cmpStub);
+      });
+    });
+
+    describe('iframe tests', function () {
+      let cmpPostMessageCb = () => {};
+      let stringifyResponse;
+
+      function createIFrameMarker(frameName) {
+        let ifr = document.createElement('iframe');
+        ifr.width = 0;
+        ifr.height = 0;
+        ifr.name = frameName;
+        document.body.appendChild(ifr);
+        return ifr;
+      }
+
+      function creatCmpMessageHandler(prefix, returnEvtValue, returnGPPValue) {
+        return function (event) {
+          if (event && event.data) {
+            let data = event.data;
+            if (data[`${prefix}Call`]) {
+              let callId = data[`${prefix}Call`].callId;
+              let response;
+              if (data[`${prefix}Call`].command === 'addEventListener') {
+                response = {
+                  [`${prefix}Return`]: {
+                    callId,
+                    returnValue: returnEvtValue,
+                    success: true
+                  }
+                }
+              } else if (data[`${prefix}Call`].command === 'getGPPData') {
+                response = {
+                  [`${prefix}Return`]: {
+                    callId,
+                    returnValue: returnGPPValue,
+                    success: true
+                  }
+                }
+              }
+              event.source.postMessage(stringifyResponse ? JSON.stringify(response) : response, '*');
+            }
+          }
+        }
+      }
+
+      function testIFramedPage(testName, messageFormatString, tarConsentString, tarSections) {
+        it(`should return the consent string from a postmessage + addEventListener response - ${testName}`, (done) => {
+          stringifyResponse = messageFormatString;
+          setConsentConfig(goodConfig);
+          requestBidsHook(() => {
+            let consent = gppDataHandler.getConsentData();
+            sinon.assert.notCalled(utils.logError);
+            expect(consent.gppString).to.equal(tarConsentString);
+            expect(consent.applicableSections).to.deep.equal(tarSections);
+            done();
+          }, {});
+        });
+      }
+
+      beforeEach(function () {
+        sinon.stub(utils, 'logError');
+        sinon.stub(utils, 'logWarn');
+      });
+
+      afterEach(function () {
+        utils.logError.restore();
+        utils.logWarn.restore();
+        config.resetConfig();
+        resetConsentData();
+      });
+
+      describe('v2 CMP workflow for iframe pages:', function () {
+        stringifyResponse = false;
+        let ifr2 = null;
+
+        beforeEach(function () {
+          ifr2 = createIFrameMarker('__gppLocator');
+          cmpPostMessageCb = creatCmpMessageHandler('__gpp', {
+            eventName: 'sectionChange'
+          }, {
+            gppString: 'abc12345234',
+            applicableSections: [7]
+          });
+          window.addEventListener('message', cmpPostMessageCb, false);
+        });
+
+        afterEach(function () {
+          delete window.__gpp; // deletes the local copy made by the postMessage CMP call function
+          document.body.removeChild(ifr2);
+          window.removeEventListener('message', cmpPostMessageCb);
+        });
+
+        testIFramedPage('with/JSON response', false, 'abc12345234', [7]);
+        testIFramedPage('with/String response', true, 'abc12345234', [7]);
+      });
+    });
+
+    describe('direct calls to CMP API tests', function () {
+      let cmpStub = sinon.stub();
+
+      beforeEach(function () {
+        didHookReturn = false;
+        sinon.stub(utils, 'logError');
+        sinon.stub(utils, 'logWarn');
+      });
+
+      afterEach(function () {
+        config.resetConfig();
+        cmpStub.restore();
+        utils.logError.restore();
+        utils.logWarn.restore();
+        resetConsentData();
+      });
+
+      describe('v2 CMP workflow for normal pages:', function () {
+        beforeEach(function () {
+          window.__gpp = function () {};
+        });
+
+        afterEach(function () {
+          delete window.__gpp;
+        });
+
+        it('performs lookup check and stores consentData for a valid existing user', function () {
+          let testConsentData = {
+            gppString: 'abc12345234',
+            applicableSections: [7]
+          };
+          cmpStub = sinon.stub(window, '__gpp').callsFake((...args) => {
+            if (args[0] === 'addEventListener') {
+              args[1]({
+                eventName: 'sectionChange'
+              });
+            } else if (args[0] === 'getGPPData') {
+              return testConsentData;
+            }
+          });
+
+          setConsentConfig(goodConfig);
+
+          requestBidsHook(() => {
+            didHookReturn = true;
+          }, {});
+          let consent = gppDataHandler.getConsentData();
+          sinon.assert.notCalled(utils.logError);
+          expect(didHookReturn).to.be.true;
+          expect(consent.gppString).to.equal(testConsentData.gppString);
+          expect(consent.applicableSections).to.deep.equal(testConsentData.applicableSections);
+        });
+
+        it('produces gdpr metadata', function () {
+          let testConsentData = {
+            gppString: 'abc12345234',
+            applicableSections: [7]
+          };
+          cmpStub = sinon.stub(window, '__gpp').callsFake((...args) => {
+            if (args[0] === 'addEventListener') {
+              args[1]({
+                eventName: 'sectionChange'
+              });
+            } else if (args[0] === 'getGPPData') {
+              return testConsentData;
+            }
+          });
+
+          setConsentConfig(goodConfig);
+
+          requestBidsHook(() => {
+            didHookReturn = true;
+          }, {});
+          let consentMeta = gppDataHandler.getConsentMeta();
+          sinon.assert.notCalled(utils.logError);
+          expect(consentMeta.generatedAt).to.be.above(1644367751709);
+        });
+
+        it('throws an error when processCmpData check fails + does not call requestBids callback', function () {
+          let testConsentData = {};
+          let bidsBackHandlerReturn = false;
+
+          cmpStub = sinon.stub(window, '__gpp').callsFake((...args) => {
+            if (args[0] === 'addEventListener') {
+              args[1]({
+                eventName: 'sectionChange'
+              });
+            } else if (args[0] === 'getGPPData') {
+              return testConsentData;
+            }
+          });
+
+          setConsentConfig(goodConfig);
+
+          sinon.assert.notCalled(utils.logWarn);
+          sinon.assert.notCalled(utils.logError);
+
+          [utils.logWarn, utils.logError].forEach((stub) => stub.reset());
+
+          requestBidsHook(() => {
+            didHookReturn = true;
+          }, {
+            bidsBackHandler: () => bidsBackHandlerReturn = true
+          });
+          let consent = gppDataHandler.getConsentData();
+
+          sinon.assert.calledOnce(utils.logError);
+          sinon.assert.notCalled(utils.logWarn);
+          expect(didHookReturn).to.be.false;
+          expect(bidsBackHandlerReturn).to.be.true;
+          expect(consent).to.be.null;
+          expect(gppDataHandler.ready).to.be.true;
+        });
+
+        describe('when proper consent is not available', () => {
+          let gppStub;
+
+          function runAuction() {
+            setConsentConfig({
+              gpp: {
+                cmpApi: 'iab',
+                timeout: 10,
+              }
+            });
+            return new Promise((resolve, reject) => {
+              requestBidsHook(() => {
+                didHookReturn = true;
+              }, {});
+              setTimeout(() => didHookReturn ? resolve() : reject(new Error('Auction did not run')), 20);
+            })
+          }
+
+          function mockGppCmp(gppdata) {
+            gppStub.callsFake((api, cb) => {
+              if (api === 'addEventListener') {
+                // eslint-disable-next-line standard/no-callback-literal
+                cb({
+                  pingData: {
+                    cmpStatus: 'loaded'
+                  }
+                }, true);
+              }
+              if (api === 'getGPPData') {
+                return gppdata;
+              }
+            });
+          }
+
+          beforeEach(() => {
+            gppStub = sinon.stub(window, '__gpp');
+          });
+
+          afterEach(() => {
+            gppStub.restore();
+          })
+
+          it('should continue auction with null consent when CMP is unresponsive', () => {
+            return runAuction().then(() => {
+              const consent = gppDataHandler.getConsentData();
+              expect(consent.applicableSections).to.deep.equal([]);
+              expect(consent.gppString).to.be.undefined;
+              expect(gppDataHandler.ready).to.be.true;
+            });
+          });
+
+          it('should use consent provided by events other than sectionChange', () => {
+            mockGppCmp({
+              gppString: 'mock-consent-string',
+              applicableSections: [7]
+            });
+            return runAuction().then(() => {
+              const consent = gppDataHandler.getConsentData();
+              expect(consent.applicableSections).to.deep.equal([7]);
+              expect(consent.gppString).to.equal('mock-consent-string');
+              expect(gppDataHandler.ready).to.be.true;
+            });
+          });
+        });
+      });
+    });
+  });
+});

From b4688316e76d69590c5da46dbec5b47cedea04f4 Mon Sep 17 00:00:00 2001
From: Andrew Slagle <42588549+spotxslagle@users.noreply.github.com>
Date: Wed, 21 Dec 2022 10:53:05 -0700
Subject: [PATCH 541/569] Magnite Analytics Adapter :  data deletion function
 (#9351)

* add onDeletionRequest functionality to Magnite adapter

* Magnite add onDataDeletionRequest unit testing
---
 modules/magniteAnalyticsAdapter.js            | 10 +++-
 .../modules/magniteAnalyticsAdapter_spec.js   | 50 +++++++++++++------
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/modules/magniteAnalyticsAdapter.js b/modules/magniteAnalyticsAdapter.js
index 99f384e9eff..c6911897e84 100644
--- a/modules/magniteAnalyticsAdapter.js
+++ b/modules/magniteAnalyticsAdapter.js
@@ -643,7 +643,15 @@ magniteAdapter.disableAnalytics = function () {
   accountId = undefined;
   resetConfs();
   magniteAdapter.originDisableAnalytics();
-}
+};
+
+magniteAdapter.onDataDeletionRequest = function () {
+  if (storage.localStorageIsEnabled()) {
+    storage.removeDataFromLocalStorage(COOKIE_NAME);
+  } else {
+    throw Error('Unable to access local storage, no data deleted');
+  }
+};
 
 magniteAdapter.MODULE_INITIALIZED_TIME = Date.now();
 magniteAdapter.referrerHostname = '';
diff --git a/test/spec/modules/magniteAnalyticsAdapter_spec.js b/test/spec/modules/magniteAnalyticsAdapter_spec.js
index 69fd7794ced..3606b4b4550 100644
--- a/test/spec/modules/magniteAnalyticsAdapter_spec.js
+++ b/test/spec/modules/magniteAnalyticsAdapter_spec.js
@@ -306,7 +306,7 @@ const ANALYTICS_MESSAGE = {
 describe('magnite analytics adapter', function () {
   let sandbox;
   let clock;
-  let getDataFromLocalStorageStub, setDataInLocalStorageStub, localStorageIsEnabledStub;
+  let getDataFromLocalStorageStub, setDataInLocalStorageStub, localStorageIsEnabledStub, removeDataFromLocalStorageStub;
   let gptSlot0;
   let gptSlotRenderEnded0;
   beforeEach(function () {
@@ -325,6 +325,7 @@ describe('magnite analytics adapter', function () {
     getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
     setDataInLocalStorageStub = sinon.stub(storage, 'setDataInLocalStorage');
     localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+    removeDataFromLocalStorageStub = sinon.stub(storage, 'removeDataFromLocalStorage')
     sandbox = sinon.sandbox.create();
 
     localStorageIsEnabledStub.returns(true);
@@ -355,6 +356,7 @@ describe('magnite analytics adapter', function () {
     getDataFromLocalStorageStub.restore();
     setDataInLocalStorageStub.restore();
     localStorageIsEnabledStub.restore();
+    removeDataFromLocalStorageStub.restore();
     magniteAdapter.disableAnalytics();
   });
 
@@ -1932,19 +1934,21 @@ describe('magnite analytics adapter', function () {
     });
   });
 
-  it('getHostNameFromReferer correctly grabs hostname from an input URL', function () {
-    let inputUrl = 'https://www.prebid.org/some/path?pbjs_debug=true';
-    expect(getHostNameFromReferer(inputUrl)).to.equal('www.prebid.org');
-    inputUrl = 'https://www.prebid.com/some/path?pbjs_debug=true';
-    expect(getHostNameFromReferer(inputUrl)).to.equal('www.prebid.com');
-    inputUrl = 'https://prebid.org/some/path?pbjs_debug=true';
-    expect(getHostNameFromReferer(inputUrl)).to.equal('prebid.org');
-    inputUrl = 'http://xn--p8j9a0d9c9a.xn--q9jyb4c/';
-    expect(typeof getHostNameFromReferer(inputUrl)).to.equal('string');
-
-    // not non-UTF char's in query / path which break if noDecodeWholeURL not set
-    inputUrl = 'https://prebid.org/search_results/%95x%8Em%92%CA/?category=000';
-    expect(getHostNameFromReferer(inputUrl)).to.equal('prebid.org');
+  describe('getHostNameFromReferer', () => {
+    it('correctly grabs hostname from an input URL', function () {
+      let inputUrl = 'https://www.prebid.org/some/path?pbjs_debug=true';
+      expect(getHostNameFromReferer(inputUrl)).to.equal('www.prebid.org');
+      inputUrl = 'https://www.prebid.com/some/path?pbjs_debug=true';
+      expect(getHostNameFromReferer(inputUrl)).to.equal('www.prebid.com');
+      inputUrl = 'https://prebid.org/some/path?pbjs_debug=true';
+      expect(getHostNameFromReferer(inputUrl)).to.equal('prebid.org');
+      inputUrl = 'http://xn--p8j9a0d9c9a.xn--q9jyb4c/';
+      expect(typeof getHostNameFromReferer(inputUrl)).to.equal('string');
+
+      // not non-UTF char's in query / path which break if noDecodeWholeURL not set
+      inputUrl = 'https://prebid.org/search_results/%95x%8Em%92%CA/?category=000';
+      expect(getHostNameFromReferer(inputUrl)).to.equal('prebid.org');
+    });
   });
 
   describe(`handle currency conversions`, () => {
@@ -1985,4 +1989,22 @@ describe('magnite analytics adapter', function () {
       expect(bidResponseObj.bidPriceUSD).to.equal(0);
     });
   });
+
+  describe('onDataDeletionRequest', () => {
+    it('attempts to delete the magnite cookie when local storage is enabled', () => {
+      magniteAdapter.onDataDeletionRequest();
+
+      expect(removeDataFromLocalStorageStub.getCall(0).args[0]).to.equal('mgniSession');
+    });
+
+    it('throws an error if it cannot access the cookie', (done) => {
+      localStorageIsEnabledStub.returns(false);
+      try {
+        magniteAdapter.onDataDeletionRequest();
+      } catch (error) {
+        expect(error.message).to.equal('Unable to access local storage, no data deleted');
+        done();
+      }
+    })
+  });
 });

From d5746c39c437b5e04505cdd75bdef3791eb28566 Mon Sep 17 00:00:00 2001
From: Bill Newman <huddled.masses1650@gmail.com>
Date: Wed, 21 Dec 2022 19:56:48 +0200
Subject: [PATCH 542/569] Colosuss Bid Adapter: add support First Party Data
 (#9340)

* add video&native traffic colossus ssp

* Native obj validation

* Native obj validation #2

* Added size field in requests

* fixed test

* fix merge conflicts

* move to 3.0

* move to 3.0

* fix IE11 new URL issue

* fix IE11 new URL issue

* fix IE11 new URL issue

* https for 3.0

* add https test

* add ccp and schain features

* fix test

* sync with upstream, fix conflicts

* Update colossussspBidAdapter.js

remove commented code

* Update colossussspBidAdapter.js

lint fix

* identity extensions

* identity extensions

* fix

* fix

* fix

* fix

* fix

* add tests for user ids

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* add gdpr support

* add gdpr support

* id5id support

* Update colossussspBidAdapter.js

add bidfloor parameter

* Update colossussspBidAdapter.js

check bidfloor

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter.js

* Update colossussspBidAdapter_spec.js

* use floor module

* Revert "use floor module"

This reverts commit f0c5c248627567e669d8eed4f2bb9a26a857e2ad.

* use floor module

* update to 5v

* fix

* add uid2 and bidFloor support

* fix

* add pbadslot support

* fix conflicts

* add onBidWon

* refactor

* add test for onBidWon()

* fix

* add group_id

* Trigger circleci

* fix

* update user sync

* fix window.location

* fix test

* updates

* fix conflict

* fix

* updates

* remove traffic param

* add transactionId to request data for colossusssp adapter

* Send tid in placements array

* update user sync

* updated tests

* remove changes package-lock file

* fix

* add First Party Data

Co-authored-by: Vladislav Isaiko <vladis@smartyads.com>
Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>
Co-authored-by: Mykhailo Yaremchuk <m.yaremchuk@smartyads.com>
---
 modules/colossussspBidAdapter.js              |  8 ++
 .../modules/colossussspBidAdapter_spec.js     | 91 ++++++++++++++++++-
 2 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/modules/colossussspBidAdapter.js b/modules/colossussspBidAdapter.js
index 75e73ffda89..082fb0ac4db 100644
--- a/modules/colossussspBidAdapter.js
+++ b/modules/colossussspBidAdapter.js
@@ -87,6 +87,11 @@ export const spec = {
       logMessage(e);
     }
 
+    const firstPartyData = bidderRequest.ortb2 || {};
+    const userObj = firstPartyData.user;
+    const siteObj = firstPartyData.site;
+    const appObj = firstPartyData.app;
+
     // TODO: does the fallback to window.location make sense?
     const location = refferLocation || winLocation;
     let placements = [];
@@ -97,6 +102,9 @@ export const spec = {
       secure: location.protocol === 'https:' ? 1 : 0,
       host: location.host,
       page: location.pathname,
+      userObj,
+      siteObj,
+      appObj,
       placements: placements
     };
 
diff --git a/test/spec/modules/colossussspBidAdapter_spec.js b/test/spec/modules/colossussspBidAdapter_spec.js
index 71e94f0da32..adb9137d892 100644
--- a/test/spec/modules/colossussspBidAdapter_spec.js
+++ b/test/spec/modules/colossussspBidAdapter_spec.js
@@ -56,6 +56,93 @@ describe('ColossussspAdapter', function () {
       referer: 'http://www.example.com',
       reachedTop: true,
     },
+    ortb2: {
+      app: {
+        name: 'myappname',
+        keywords: 'power tools, drills',
+        content: {
+          data: [
+            {
+              name: 'www.dataprovider1.com',
+              ext: {
+                segtax: 6
+              },
+              segment: [
+                {
+                  id: '687'
+                },
+                {
+                  id: '123'
+                }
+              ]
+            },
+            {
+              name: 'www.dataprovider1.com',
+              ext: {
+                segtax: 7
+              },
+              segment: [
+                {
+                  id: '456'
+                },
+                {
+                  id: '789'
+                }
+              ]
+            }
+          ]
+        }
+      },
+      site: {
+        name: 'example',
+        domain: 'page.example.com',
+        cat: ['IAB2'],
+        sectioncat: ['IAB2-2'],
+        pagecat: ['IAB2-2'],
+        page: 'https://page.example.com/here.html',
+        ref: 'https://ref.example.com',
+        keywords: 'power tools, drills',
+        search: 'drill',
+        content: {
+          userrating: '4',
+          data: [{
+            name: 'www.dataprovider1.com',
+            ext: {
+              segtax: 7,
+              cids: ['iris_c73g5jq96mwso4d8']
+            },
+            segment: [
+              { id: '687' },
+              { id: '123' }
+            ]
+          }]
+        },
+        ext: {
+          data: {
+            pageType: 'article',
+            category: 'repair'
+          }
+        }
+      },
+      user: {
+        yob: 1985,
+        gender: 'm',
+        keywords: 'a,b',
+        data: [{
+          name: 'dataprovider.com',
+          ext: { segtax: 4 },
+          segment: [
+            { id: '1' }
+          ]
+        }],
+        ext: {
+          data: {
+            registered: true,
+            interests: ['cars']
+          }
+        }
+      }
+    },
     bids: [bid]
   }
 
@@ -91,7 +178,7 @@ describe('ColossussspAdapter', function () {
     it('Returns valid data if array of bids is valid', function () {
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements', 'ccpa', 'gdpr_consent', 'gdpr_require');
+      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements', 'ccpa', 'gdpr_consent', 'gdpr_require', 'userObj', 'siteObj', 'appObj');
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
       expect(data.language).to.be.a('string');
@@ -132,7 +219,7 @@ describe('ColossussspAdapter', function () {
 
       let data = serverRequest.data;
       expect(data).to.be.an('object');
-      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements', 'ccpa', 'gdpr_consent', 'gdpr_require');
+      expect(data).to.have.all.keys('deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements', 'ccpa', 'gdpr_consent', 'gdpr_require', 'userObj', 'siteObj', 'appObj');
       expect(data.deviceWidth).to.be.a('number');
       expect(data.deviceHeight).to.be.a('number');
       expect(data.language).to.be.a('string');

From 9c3abaea97f282e9e62f3a5b80bcfdbaefc7cb88 Mon Sep 17 00:00:00 2001
From: mjaworskiccx <50406214+mjaworskiccx@users.noreply.github.com>
Date: Thu, 22 Dec 2022 20:10:49 +0100
Subject: [PATCH 543/569] Clickonometrics Bid Adapter: gvlid (#9367)

* adomain support

* adomain support

* adomain support

* adomain support

* adomain support

* video params

* docs changes

* Clickonometrics adapter update

* Revert "Revert "Clickonometrics Bid Adapter : add gvlid (#9198)" (#9216)"

This reverts commit 6d114e83725b403fadd889202b449de225db7275.

* Test fix
---
 modules/ccxBidAdapter.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/ccxBidAdapter.js b/modules/ccxBidAdapter.js
index 7c6b0411023..28f3fe3a166 100644
--- a/modules/ccxBidAdapter.js
+++ b/modules/ccxBidAdapter.js
@@ -5,6 +5,7 @@ import {getStorageManager} from '../src/storageManager.js';
 const BIDDER_CODE = 'ccx'
 const storage = getStorageManager({bidderCode: BIDDER_CODE});
 const BID_URL = 'https://delivery.clickonometrics.pl/ortb/prebid/bid'
+const GVLID = 773;
 const SUPPORTED_VIDEO_PROTOCOLS = [2, 3, 5, 6]
 const SUPPORTED_VIDEO_MIMES = ['video/mp4', 'video/x-flv']
 const SUPPORTED_VIDEO_PLAYBACK_METHODS = [1, 2, 3, 4]
@@ -19,8 +20,7 @@ function _getDeviceObj () {
 
 function _getSiteObj (bidderRequest) {
   let site = {}
-  // TODO: does the fallback to window.location make sense?
-  let url = bidderRequest?.refererInfo?.page || window.location.href
+  let url = bidderRequest?.refererInfo?.page || ''
   if (url.length > 0) {
     url = url.split('?')[0]
   }
@@ -140,6 +140,7 @@ function _buildResponse (bid, currency, ttl) {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: ['banner', 'video'],
 
   isBidRequestValid: function (bid) {

From e5bcdaa059a3ad675ff3e3dae78423bb558f498e Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Fri, 23 Dec 2022 17:14:37 +0000
Subject: [PATCH 544/569] Prebid 7.30.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c903795e59d..51491f04fbe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.30.0-pre",
+  "version": "7.30.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 490303874f7..6ffdac7d3a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.30.0-pre",
+  "version": "7.30.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 4e45ba34c76ad03b417942320c376749c9f96b44 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Fri, 23 Dec 2022 17:14:37 +0000
Subject: [PATCH 545/569] Increment version to 7.31.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 51491f04fbe..7de32ef7102 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.30.0",
+  "version": "7.31.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 6ffdac7d3a6..f96909cc6b4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.30.0",
+  "version": "7.31.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From 684691bb69263fcdda1d31b3fabe3db859e609b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Dec 2022 09:29:25 -0500
Subject: [PATCH 546/569] Bump parse-url from 7.0.2 to 8.1.0 (#9372)

Bumps [parse-url](https://github.com/IonicaBizau/parse-url) from 7.0.2 to 8.1.0.
- [Release notes](https://github.com/IonicaBizau/parse-url/releases)
- [Commits](https://github.com/IonicaBizau/parse-url/compare/7.0.2...8.1.0)

---
updated-dependencies:
- dependency-name: parse-url
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 84 ++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 45 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7de32ef7102..2b703493403 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "prebid.js",
-      "version": "7.28.0-pre",
+      "version": "7.31.0-pre",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/core": "^7.16.7",
@@ -8534,9 +8534,9 @@
       }
     },
     "node_modules/documentation": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/documentation/-/documentation-14.0.0.tgz",
-      "integrity": "sha512-4AwFzdiseEdtqR0KKLrruIQ5fvh7n5epg47P0ZyOidA5Fes5am+6xjqkDECHPwcv4pxJ6zITaHwzCoGblP0+JQ==",
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/documentation/-/documentation-14.0.1.tgz",
+      "integrity": "sha512-Y/brACCE3sNnDJPFiWlhXrqGY+NelLYVZShLGse5bT1KdohP4JkPf5T2KNq1YWhIEbDYl/1tebRLC0WYbPQxVw==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.18.10",
@@ -8548,7 +8548,7 @@
         "chokidar": "^3.5.3",
         "diff": "^5.1.0",
         "doctrine-temporary-fork": "2.1.0",
-        "git-url-parse": "^12.0.0",
+        "git-url-parse": "^13.1.0",
         "github-slugger": "1.4.0",
         "glob": "^8.0.3",
         "globals-docs": "^2.4.1",
@@ -11261,22 +11261,22 @@
       }
     },
     "node_modules/git-up": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/git-up/-/git-up-6.0.0.tgz",
-      "integrity": "sha512-6RUFSNd1c/D0xtGnyWN2sxza2bZtZ/EmI9448n6rCZruFwV/ezeEn2fJP7XnUQGwf0RAtd/mmUCbtH6JPYA2SA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/git-up/-/git-up-7.0.0.tgz",
+      "integrity": "sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==",
       "dev": true,
       "dependencies": {
         "is-ssh": "^1.4.0",
-        "parse-url": "^7.0.2"
+        "parse-url": "^8.1.0"
       }
     },
     "node_modules/git-url-parse": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-12.0.0.tgz",
-      "integrity": "sha512-I6LMWsxV87vysX1WfsoglXsXg6GjQRKq7+Dgiseo+h0skmp5Hp2rzmcEIRQot9CPA+uzU7x1x7jZdqvTFGnB+Q==",
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.0.tgz",
+      "integrity": "sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==",
       "dev": true,
       "dependencies": {
-        "git-up": "^6.0.0"
+        "git-up": "^7.0.0"
       }
     },
     "node_modules/github-slugger": {
@@ -19420,24 +19420,21 @@
       }
     },
     "node_modules/parse-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-5.0.0.tgz",
-      "integrity": "sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz",
+      "integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==",
       "dev": true,
       "dependencies": {
         "protocols": "^2.0.0"
       }
     },
     "node_modules/parse-url": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-7.0.2.tgz",
-      "integrity": "sha512-PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz",
+      "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==",
       "dev": true,
       "dependencies": {
-        "is-ssh": "^1.4.0",
-        "normalize-url": "^6.1.0",
-        "parse-path": "^5.0.0",
-        "protocols": "^2.0.1"
+        "parse-path": "^7.0.0"
       }
     },
     "node_modules/parseurl": {
@@ -31782,9 +31779,9 @@
       }
     },
     "documentation": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/documentation/-/documentation-14.0.0.tgz",
-      "integrity": "sha512-4AwFzdiseEdtqR0KKLrruIQ5fvh7n5epg47P0ZyOidA5Fes5am+6xjqkDECHPwcv4pxJ6zITaHwzCoGblP0+JQ==",
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/documentation/-/documentation-14.0.1.tgz",
+      "integrity": "sha512-Y/brACCE3sNnDJPFiWlhXrqGY+NelLYVZShLGse5bT1KdohP4JkPf5T2KNq1YWhIEbDYl/1tebRLC0WYbPQxVw==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.18.10",
@@ -31797,7 +31794,7 @@
         "chokidar": "^3.5.3",
         "diff": "^5.1.0",
         "doctrine-temporary-fork": "2.1.0",
-        "git-url-parse": "^12.0.0",
+        "git-url-parse": "^13.1.0",
         "github-slugger": "1.4.0",
         "glob": "^8.0.3",
         "globals-docs": "^2.4.1",
@@ -33988,22 +33985,22 @@
       }
     },
     "git-up": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/git-up/-/git-up-6.0.0.tgz",
-      "integrity": "sha512-6RUFSNd1c/D0xtGnyWN2sxza2bZtZ/EmI9448n6rCZruFwV/ezeEn2fJP7XnUQGwf0RAtd/mmUCbtH6JPYA2SA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/git-up/-/git-up-7.0.0.tgz",
+      "integrity": "sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==",
       "dev": true,
       "requires": {
         "is-ssh": "^1.4.0",
-        "parse-url": "^7.0.2"
+        "parse-url": "^8.1.0"
       }
     },
     "git-url-parse": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-12.0.0.tgz",
-      "integrity": "sha512-I6LMWsxV87vysX1WfsoglXsXg6GjQRKq7+Dgiseo+h0skmp5Hp2rzmcEIRQot9CPA+uzU7x1x7jZdqvTFGnB+Q==",
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.0.tgz",
+      "integrity": "sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==",
       "dev": true,
       "requires": {
-        "git-up": "^6.0.0"
+        "git-up": "^7.0.0"
       }
     },
     "github-slugger": {
@@ -40244,24 +40241,21 @@
       "dev": true
     },
     "parse-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-5.0.0.tgz",
-      "integrity": "sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz",
+      "integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==",
       "dev": true,
       "requires": {
         "protocols": "^2.0.0"
       }
     },
     "parse-url": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-7.0.2.tgz",
-      "integrity": "sha512-PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz",
+      "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==",
       "dev": true,
       "requires": {
-        "is-ssh": "^1.4.0",
-        "normalize-url": "^6.1.0",
-        "parse-path": "^5.0.0",
-        "protocols": "^2.0.1"
+        "parse-path": "^7.0.0"
       }
     },
     "parseurl": {

From a5ea3097aacb6052a030220bdf87131d4ae5d59b Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Mon, 26 Dec 2022 07:34:57 -0700
Subject: [PATCH 547/569] Prebid core: filter adUnits (by `adUnitCodes`) before
 sending them to RTD and FPD modules (#9355)

---
 src/prebid.js                   | 15 +++++++--------
 test/spec/unit/pbjs_api_spec.js | 11 +++++++++++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/prebid.js b/src/prebid.js
index a4abceb01d5..3fb131fb02c 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -629,6 +629,13 @@ $$PREBID_GLOBAL$$.requestBids = (function() {
     events.emit(REQUEST_BIDS);
     const cbTimeout = timeout || config.getConfig('bidderTimeout');
     logInfo('Invoking $$PREBID_GLOBAL$$.requestBids', arguments);
+    if (adUnitCodes && adUnitCodes.length) {
+      // if specific adUnitCodes supplied filter adUnits for those codes
+      adUnits = adUnits.filter(unit => includes(adUnitCodes, unit.code));
+    } else {
+      // otherwise derive adUnitCodes from adUnits
+      adUnitCodes = adUnits && adUnits.map(unit => unit.code);
+    }
     const ortb2Fragments = {
       global: mergeDeep({}, config.getAnyConfig('ortb2') || {}, ortb2 || {}),
       bidder: Object.fromEntries(Object.entries(config.getBidderConfig()).map(([bidder, cfg]) => [bidder, cfg.ortb2]).filter(([_, ortb2]) => ortb2 != null))
@@ -661,14 +668,6 @@ export const startAuction = hook('async', function ({ bidsBackHandler, timeout:
   const s2sBidders = getS2SBidderSet(config.getConfig('s2sConfig') || []);
   adUnits = useMetrics(metrics).measureTime('requestBids.validate', () => checkAdUnitSetup(adUnits));
 
-  if (adUnitCodes && adUnitCodes.length) {
-    // if specific adUnitCodes supplied filter adUnits for those codes
-    adUnits = adUnits.filter(unit => includes(adUnitCodes, unit.code));
-  } else {
-    // otherwise derive adUnitCodes from adUnits
-    adUnitCodes = adUnits && adUnits.map(unit => unit.code);
-  }
-
   function auctionDone(bids, timedOut, auctionId) {
     if (typeof bidsBackHandler === 'function') {
       try {
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index 9d8ea70e200..ae9ea09908a 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -1810,6 +1810,16 @@ describe('Unit: Prebid Module', function () {
         })
       });
 
+      it('filtering adUnits by adUnitCodes', () => {
+        $$PREBID_GLOBAL$$.requestBids({
+          adUnits: [{code: 'one'}, {code: 'two'}],
+          adUnitCodes: 'two'
+        });
+        sinon.assert.calledWith(startAuctionStub, sinon.match({
+          adUnits: [{code: 'two'}]
+        }));
+      });
+
       it('passing bidder-specific FPD as ortb2Fragments.bidder', () => {
         configObj.setBidderConfig({
           bidders: ['bidderA', 'bidderC'],
@@ -1869,6 +1879,7 @@ describe('Unit: Prebid Module', function () {
           mediaTypes: {banner: {sizes: [[300, 250]]}},
           bids: [{bidder: 'bd'}]
         }],
+        adUnitCodes: ['au'],
         ortb2Fragments
       });
       sinon.assert.calledWith(newAuctionStub, sinon.match({

From fdab2f10459bb81fb61d4441a1c64ff749791d6b Mon Sep 17 00:00:00 2001
From: Jason Quaccia <jlquaccia@gmail.com>
Date: Mon, 26 Dec 2022 06:36:12 -0800
Subject: [PATCH 548/569] Prebid Server: Include adUnitCode in PBS Adapter
 Requests (#9337)

* changes

* added support to pass adunitcode to pbs

* updated comment

* removed console log statements

* addressed feedback
---
 .../pbsExtensions/processors/adUnitCode.js    | 13 +++++++++++
 libraries/pbsExtensions/processors/pbs.js     |  5 ++++
 .../prebidServerBidAdapter/ortbConverter.js   |  1 +
 .../pbsExtensions/adUnitCode_spec.js          | 23 +++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 libraries/pbsExtensions/processors/adUnitCode.js
 create mode 100644 test/spec/ortbConverter/pbsExtensions/adUnitCode_spec.js

diff --git a/libraries/pbsExtensions/processors/adUnitCode.js b/libraries/pbsExtensions/processors/adUnitCode.js
new file mode 100644
index 00000000000..f936e0f662f
--- /dev/null
+++ b/libraries/pbsExtensions/processors/adUnitCode.js
@@ -0,0 +1,13 @@
+import {deepSetValue} from '../../../src/utils.js';
+
+export function setImpAdUnitCode(imp, bidRequest) {
+  const adUnitCode = bidRequest.adUnitCode;
+
+  if (adUnitCode) {
+    deepSetValue(
+      imp,
+      `ext.prebid.adunitcode`,
+      adUnitCode
+    );
+  }
+}
diff --git a/libraries/pbsExtensions/processors/pbs.js b/libraries/pbsExtensions/processors/pbs.js
index 56a2a391c76..0ed2d12fad8 100644
--- a/libraries/pbsExtensions/processors/pbs.js
+++ b/libraries/pbsExtensions/processors/pbs.js
@@ -3,6 +3,7 @@ import {deepAccess, isPlainObject, isStr, mergeDeep} from '../../../src/utils.js
 import {extPrebidMediaType} from './mediaType.js';
 import {setRequestExtPrebidAliases} from './aliases.js';
 import {setImpBidParams} from './params.js';
+import {setImpAdUnitCode} from './adUnitCode.js';
 import {setRequestExtPrebid, setRequestExtPrebidChannel} from './requestExtPrebid.js';
 import {setBidResponseVideoCache} from './video.js';
 
@@ -26,6 +27,10 @@ export const PBS_PROCESSORS = {
       // sets bid ext.prebid.bidder.[bidderCode] with bidRequest.params, passed through transformBidParams if necessary
       fn: setImpBidParams
     },
+    adUnitCode: {
+      // sets bid ext.prebid.adunitcode
+      fn: setImpAdUnitCode
+    }
   },
   [BID_RESPONSE]: {
     mediaType: {
diff --git a/modules/prebidServerBidAdapter/ortbConverter.js b/modules/prebidServerBidAdapter/ortbConverter.js
index 0aee261c25d..83335f81bc2 100644
--- a/modules/prebidServerBidAdapter/ortbConverter.js
+++ b/modules/prebidServerBidAdapter/ortbConverter.js
@@ -246,6 +246,7 @@ export function buildPBSRequest(s2sBidRequest, bidderRequests, adUnits, requeste
     impIds.add(impId)
     proxyBidRequests.push({
       ...adUnit,
+      adUnitCode: adUnit.code,
       ...getDefinedParams(actualBidRequests.values().next().value || {}, ['userId', 'userIdAsEids', 'schain']),
       pbsData: {impId, actualBidRequests, adUnit}
     });
diff --git a/test/spec/ortbConverter/pbsExtensions/adUnitCode_spec.js b/test/spec/ortbConverter/pbsExtensions/adUnitCode_spec.js
new file mode 100644
index 00000000000..e17f9e856b0
--- /dev/null
+++ b/test/spec/ortbConverter/pbsExtensions/adUnitCode_spec.js
@@ -0,0 +1,23 @@
+import {setImpAdUnitCode} from '../../../../libraries/pbsExtensions/processors/adUnitCode.js';
+
+describe('pbjs -> ortb adunit code to imp[].ext.prebid.adunitcode', () => {
+  function setImp(bidRequest) {
+    const imp = {};
+    setImpAdUnitCode(imp, bidRequest);
+    return imp;
+  }
+
+  it('it sets adunitcode in ext.prebid.adunitcode when adUnitCode is present', () => {
+    expect(setImp({bidder: 'mockBidder', adUnitCode: 'mockAdUnit'})).to.eql({
+      'ext': {
+        'prebid': {
+          'adunitcode': 'mockAdUnit'
+        }
+      }
+    })
+  });
+
+  it('does not set adunitcode in ext.prebid.adunitcode if adUnit is undefined', () => {
+    expect(setImp({bidder: 'mockBidder'})).to.eql({});
+  });
+});

From 5a424e4b992aabad0d5ffa0b87d66fc078790f5e Mon Sep 17 00:00:00 2001
From: couchcrew-thomas <mail@feedad.com>
Date: Mon, 26 Dec 2022 15:47:35 +0100
Subject: [PATCH 549/569] Feedad Bid Adapter: fixed usersync parsing (#9353)

* added file scaffold

* added isBidRequestValid implementation

* added local prototype of ad integration

* added implementation for placement ID validation

* fixed video context filter

* applied lint to feedad bid adapter

* added unit test for bid request validation

* added buildRequest unit test

* added unit tests for timeout and bid won callbacks

* updated bid request to FeedAd API

* added parsing of feedad api bid response

* added transmisison of tracking events to FeedAd Api

* code cleanup

* updated feedad unit tests for buildRequest method

* added unit tests for event tracking implementation

* added unit test for interpretResponse method

* added adapter documentation

* added dedicated feedad example page

* updated feedad adapter to use live system

* updated FeedAd adapter placement ID regex

* removed groups from FeedAd adapter placement ID regex

* removed dedicated feedad example page

* updated imports in FeedAd adapter file to use relative paths

* updated FeedAd adapter unit test to use sinon.useFakeXMLHttpRequest()

* added GDPR fields to the FeedAd bid request

* removed video from supported media types of the FeedAd adapter

* increased version code of FeedAd adapter to 1.0.2

* removed unnecessary check of bidder request

* fixed unit test testing for old FeedAd version

* removed video media type example from documentation file

* added gvlid to FeedAd adapter

* added decoration parameter to adapter documentation

* added pass through of additional bid parameters

* added user syncs to FeedAd bid adapter

* increased FeedAd bid adapter version

* lint pass over FeedAd bid adapter

* fixed parsing of user syncs from server response

* increased FeedAd bid adapter version

* fixed version code in test file
---
 modules/feedadBidAdapter.js                | 14 ++++--
 test/spec/modules/feedadBidAdapter_spec.js | 51 ++++++++++++++++------
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/modules/feedadBidAdapter.js b/modules/feedadBidAdapter.js
index 0ab6def38ae..ef2e57c553f 100644
--- a/modules/feedadBidAdapter.js
+++ b/modules/feedadBidAdapter.js
@@ -7,7 +7,7 @@ import {ajax} from '../src/ajax.js';
  * Version of the FeedAd bid adapter
  * @type {string}
  */
-const VERSION = '1.0.3';
+const VERSION = '1.0.4';
 
 /**
  * @typedef {object} FeedAdApiBidRequest
@@ -294,12 +294,20 @@ function trackingHandlerFactory(klass) {
 /**
  * Reads the user syncs off the server responses and converts them into Prebid.JS format
  * @param {SyncOptions} syncOptions
- * @param {FeedAdApiBidResponse[]} serverResponses
+ * @param {ServerResponse[]} serverResponses
  * @param gdprConsent
  * @param uspConsent
  */
 function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
-  return serverResponses.map(response => response.ext)
+  return serverResponses.map(response => {
+    // validate response format
+    const ext = deepAccess(response, 'body.ext', []);
+    if (ext == null) {
+      return null;
+    }
+    return ext;
+  })
+    .filter(ext => ext != null)
     .flatMap(extension => {
       // extract user syncs from extension
       const pixels = syncOptions.pixelEnabled && extension.pixels ? extension.pixels : [];
diff --git a/test/spec/modules/feedadBidAdapter_spec.js b/test/spec/modules/feedadBidAdapter_spec.js
index 6db0b88a9bf..6aed670a563 100644
--- a/test/spec/modules/feedadBidAdapter_spec.js
+++ b/test/spec/modules/feedadBidAdapter_spec.js
@@ -358,14 +358,20 @@ describe('FeedAdAdapter', function () {
     const pixelSync2 = {type: 'image', url: 'the pixel url 2'};
     const iFrameSync1 = {type: 'iframe', url: 'the iFrame url 1'};
     const iFrameSync2 = {type: 'iframe', url: 'the iFrame url 2'};
+    const mockServerResponse = (content) => {
+      if (!(content instanceof Array)) {
+        content = [content];
+      }
+      return content.map(it => ({body: it}));
+    };
 
     it('should pass through the syncs out of the extension fields of the server response', function () {
-      const serverResponse = [{
+      const serverResponse = mockServerResponse([{
         ext: {
           pixels: [pixelSync1, pixelSync2],
           iframes: [iFrameSync1, iFrameSync2],
         }
-      }];
+      }]);
       const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse)
       expect(result).to.deep.equal([
         pixelSync1,
@@ -376,7 +382,7 @@ describe('FeedAdAdapter', function () {
     });
 
     it('should concat the syncs of all responses', function () {
-      const serverResponse = [{
+      const serverResponse = mockServerResponse([{
         ext: {
           pixels: [pixelSync1],
           iframes: [iFrameSync2],
@@ -391,7 +397,7 @@ describe('FeedAdAdapter', function () {
         ext: {
           pixels: [pixelSync2],
         }
-      }];
+      }]);
       const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse);
       expect(result).to.deep.equal([
         pixelSync1,
@@ -402,7 +408,7 @@ describe('FeedAdAdapter', function () {
     });
 
     it('should filter out duplicates', function () {
-      const serverResponse = [{
+      const serverResponse = mockServerResponse([{
         ext: {
           pixels: [pixelSync1, pixelSync1],
           iframes: [iFrameSync2, iFrameSync2],
@@ -411,7 +417,7 @@ describe('FeedAdAdapter', function () {
         ext: {
           iframes: [iFrameSync2, iFrameSync2],
         }
-      }];
+      }]);
       const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse);
       expect(result).to.deep.equal([
         pixelSync1,
@@ -420,12 +426,12 @@ describe('FeedAdAdapter', function () {
     });
 
     it('should not include iFrame syncs if the option is disabled', function () {
-      const serverResponse = [{
+      const serverResponse = mockServerResponse([{
         ext: {
           pixels: [pixelSync1, pixelSync2],
           iframes: [iFrameSync1, iFrameSync2],
         }
-      }];
+      }]);
       const result = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: true}, serverResponse);
       expect(result).to.deep.equal([
         pixelSync1,
@@ -434,12 +440,12 @@ describe('FeedAdAdapter', function () {
     });
 
     it('should not include pixel syncs if the option is disabled', function () {
-      const serverResponse = [{
+      const serverResponse = mockServerResponse([{
         ext: {
           pixels: [pixelSync1, pixelSync2],
           iframes: [iFrameSync1, iFrameSync2],
         }
-      }];
+      }]);
       const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: false}, serverResponse);
       expect(result).to.deep.equal([
         iFrameSync1,
@@ -448,15 +454,34 @@ describe('FeedAdAdapter', function () {
     });
 
     it('should not include any syncs if the sync options are disabled or missing', function () {
-      const serverResponse = [{
+      const serverResponse = mockServerResponse([{
         ext: {
           pixels: [pixelSync1, pixelSync2],
           iframes: [iFrameSync1, iFrameSync2],
         }
-      }];
+      }]);
       const result = spec.getUserSyncs({iframeEnabled: false, pixelEnabled: false}, serverResponse);
       expect(result).to.deep.equal([]);
     });
+
+    it('should handle empty responses', function () {
+      const serverResponse = mockServerResponse([]);
+      const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, serverResponse)
+      expect(result).to.deep.equal([]);
+    });
+
+    it('should not throw if the server response is weird', function () {
+      const responses = [
+        mockServerResponse(null),
+        mockServerResponse('null'),
+        mockServerResponse(1234),
+        mockServerResponse({}),
+        mockServerResponse([{}, 123]),
+      ];
+      responses.forEach(it => {
+        expect(() => spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, it)).not.to.throw;
+      });
+    });
   });
 
   describe('event tracking calls', function () {
@@ -592,7 +617,7 @@ describe('FeedAdAdapter', function () {
             prebid_bid_id: bidId,
             prebid_transaction_id: transactionId,
             referer,
-            sdk_version: '1.0.3'
+            sdk_version: '1.0.4'
           };
           subject(data);
           expect(server.requests.length).to.equal(1);

From f794bce175d49bab6da6435d41335fb2fbf45c9c Mon Sep 17 00:00:00 2001
From: vishal-dw <109065778+vishal-dw@users.noreply.github.com>
Date: Mon, 26 Dec 2022 14:49:46 +0000
Subject: [PATCH 550/569]  Datawrkz adapter: Using bidRequest.getFloor() method
 for bid floor (#9366)

* New Bid Adapter: datawrkz

* New Bid Adapter: datawrkz. Test case formatting

* New Bid Adatpter: datawrkz - updated import statements

* Datawrkz adapter: Using bidRequest.getFloor() method for bid floor
---
 modules/datawrkzBidAdapter.js | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/modules/datawrkzBidAdapter.js b/modules/datawrkzBidAdapter.js
index 71870d6437d..193a1723403 100644
--- a/modules/datawrkzBidAdapter.js
+++ b/modules/datawrkzBidAdapter.js
@@ -1,4 +1,4 @@
-import { deepAccess, getBidIdParameter, isArray, getUniqueIdentifierStr, contains } from '../src/utils.js';
+import { deepAccess, getBidIdParameter, isArray, getUniqueIdentifierStr, contains, isFn, isPlainObject } from '../src/utils.js';
 import { config } from '../src/config.js';
 import { Renderer } from '../src/Renderer.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
@@ -84,7 +84,7 @@ export const spec = {
 
 /* Generate bid request for banner adunit */
 function buildBannerRequest(bidRequest, bidderRequest) {
-  let bidFloor = Number(getBidIdParameter('bidfloor', bidRequest.params));
+  let bidFloor = getBidFloor(bidRequest);
 
   let adW = 0;
   let adH = 0;
@@ -135,7 +135,7 @@ function buildNativeRequest(bidRequest, bidderRequest) {
   let counter = 0;
   let assets = [];
 
-  let bidFloor = Number(getBidIdParameter('bidfloor', bidRequest.params));
+  let bidFloor = getBidFloor(bidRequest);
 
   let title = deepAccess(bidRequest, 'mediaTypes.native.title');
   if (title && title.len) {
@@ -196,7 +196,7 @@ function buildNativeRequest(bidRequest, bidderRequest) {
 
 /* Generate bid request for video adunit */
 function buildVideoRequest(bidRequest, bidderRequest) {
-  let bidFloor = Number(getBidIdParameter('bidfloor', bidRequest.params));
+  let bidFloor = getBidFloor(bidRequest);
 
   let sizeObj = getVideoAdUnitSize(bidRequest);
 
@@ -414,6 +414,7 @@ function buildBannerResponse(bidRequest, bidResponse) {
       }
       let bidSizes = (deepAccess(bidRequest, 'mediaTypes.banner.sizes')) ? deepAccess(bidRequest, 'mediaTypes.banner.sizes') : bidRequest.sizes;
       bidResponse.requestId = bidRequest.bidId;
+      bidResponse.auctionId = bidRequest.auctionId;
       bidResponse.transactionId = bidRequest.transactionId;
       bidResponse.placementCode = placementCode;
       bidResponse.cpm = responseCPM;
@@ -455,6 +456,7 @@ function buildNativeResponse(bidRequest, response) {
         return;
       }
       bidResponse.requestId = bidRequest.bidId;
+      bidResponse.auctionId = bidRequest.auctionId;
       bidResponse.transactionId = bidRequest.transactionId;
       bidResponse.placementCode = placementCode;
       bidResponse.cpm = responseCPM;
@@ -507,6 +509,7 @@ function buildVideoResponse(bidRequest, response) {
       let context = bidRequest.mediaTypes.video.context;
 
       bidResponse.requestId = bidRequest.bidId;
+      bidResponse.auctionId = bidRequest.auctionId;
       bidResponse.transactionId = bidRequest.transactionId;
       bidResponse.placementCode = placementCode;
       bidResponse.cpm = responseCPM;
@@ -630,4 +633,21 @@ function getNativeAssestObj(obj, assets) {
   }
 }
 
+// BUILD REQUESTS: BIDFLOORS
+function getBidFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return (bid.params.bidfloor) ? bid.params.bidfloor : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
 registerBidder(spec);

From b6f9b2effb5c9a51eacc1398f69c5001ab87a14e Mon Sep 17 00:00:00 2001
From: Denis Logachov <denis@adkernel.com>
Date: Mon, 26 Dec 2022 22:35:09 +0200
Subject: [PATCH 551/569] Adkernel Bid Adapter: bidbuddy.co.in alias (#9375)

---
 modules/adkernelBidAdapter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index b0449418a87..5736c7c19ba 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -97,7 +97,8 @@ export const spec = {
     {code: 'motionspots'},
     {code: 'sonic_twist'},
     {code: 'displayioads'},
-    {code: 'rtbdemand_com'}
+    {code: 'rtbdemand_com'},
+    {code: 'bidbuddy'}
   ],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 

From 86ed8f0057fa3cb611f3fc0855244d5981d0a2b0 Mon Sep 17 00:00:00 2001
From: denys-berzoy-confiant
 <50574764+denys-berzoy-confiant@users.noreply.github.com>
Date: Tue, 27 Dec 2022 05:58:33 +0300
Subject: [PATCH 552/569] Confiant RTD Module : initial release (#9325)

* Confiant's RTD Provider Module

* Confiant RTD Module:
- updated script injection code to current standard
- added Confiant as an exclusion to load external JS

* Confiant RTD Provider:
- additional param for enabling BillingEvent added
- docs updated
- outdated unit test removed

Co-authored-by: Patrick McCann <patmmccann@gmail.com>
---
 modules/.submodules.json                      |   1 +
 modules/confiantRtdProvider.js                | 128 ++++++++++++++++++
 modules/confiantRtdProvider.md                |  45 ++++++
 src/adloader.js                               |   3 +-
 test/spec/modules/confiantRtdProvider_spec.js | 107 +++++++++++++++
 5 files changed, 283 insertions(+), 1 deletion(-)
 create mode 100644 modules/confiantRtdProvider.js
 create mode 100644 modules/confiantRtdProvider.md
 create mode 100644 test/spec/modules/confiantRtdProvider_spec.js

diff --git a/modules/.submodules.json b/modules/.submodules.json
index c3016914f1b..deeee91e247 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -58,6 +58,7 @@
       "blueconicRtdProvider",
       "browsiRtdProvider",
       "captifyRtdProvider",
+      "confiantRtdProvider",
       "dgkeywordRtdProvider",
       "geoedgeRtdProvider",
       "hadronRtdProvider",
diff --git a/modules/confiantRtdProvider.js b/modules/confiantRtdProvider.js
new file mode 100644
index 00000000000..4a524b92d75
--- /dev/null
+++ b/modules/confiantRtdProvider.js
@@ -0,0 +1,128 @@
+/**
+ * This module provides comprehensive detection of security, quality, and privacy threats by Confiant Inc,
+ * the industry leader in real-time detecting and blocking of bad ads
+ *
+ * The {@link module:modules/realTimeData} module is required
+ * The module will inject a Confiant Inc. script into the page to monitor ad impressions
+ * @module modules/cleanioRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+import { submodule } from '../src/hook.js';
+import { logError, generateUUID } from '../src/utils.js';
+import { loadExternalScript } from '../src/adloader.js';
+import * as events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
+
+/**
+ * Injects the Confiant Inc. configuration script into the page, based on proprtyId provided
+ * @param {string} propertyId
+ */
+function injectConfigScript(propertyId) {
+  const scriptSrc = `https://cdn.confiant-integrations.net/${propertyId}/gpt_and_prebid/config.js`;
+
+  loadExternalScript(scriptSrc, 'confiant', () => {});
+}
+
+/**
+ * Set up page with Confiant integration
+ * @param {Object} config
+ */
+function setupPage(config) {
+  const propertyId = config?.params?.propertyId;
+  if (!propertyId) {
+    logError('Confiant pbjs module: no propertyId provided');
+    return false;
+  }
+
+  const confiant = window.confiant || Object.create(null);
+  confiant[propertyId] = confiant[propertyId] || Object.create(null);
+  confiant[propertyId].clientSettings = confiant[propertyId].clientSettings || Object.create(null);
+  confiant[propertyId].clientSettings.isMGBL = true;
+  confiant[propertyId].clientSettings.prebidExcludeBidders = config?.params?.prebidExcludeBidders;
+  confiant[propertyId].clientSettings.prebidNameSpace = config?.params?.prebidNameSpace;
+
+  if (config?.params?.shouldEmitBillableEvent) {
+    if (window.frames['cnftComm']) {
+      subscribeToConfiantCommFrame(window);
+    } else {
+      setUpMutationObserver();
+    }
+  }
+
+  injectConfigScript(propertyId);
+  return true;
+}
+
+/**
+ * Subscribe to window's message events to report Billable events
+ * @param {Window} targetWindow window instance to subscribe to
+ */
+function subscribeToConfiantCommFrame(targetWindow) {
+  targetWindow.addEventListener('message', reportBillableEvents);
+}
+
+let mutationObserver;
+/**
+ * Set up mutation observer to subscribe to Confiant's communication channel ASAP
+ */
+function setUpMutationObserver() {
+  mutationObserver = new MutationObserver((mutations) => {
+    mutations.forEach((mutation) => {
+      mutation.addedNodes.forEach((addedNode) => {
+        if (addedNode.nodeName === 'IFRAME' && addedNode.name === 'cnftComm' && !addedNode.pbjsModuleSubscribed) {
+          addedNode.pbjsModuleSubscribed = true;
+          mutationObserver.disconnect();
+          mutationObserver = null;
+          const iframeWindow = addedNode.contentWindow;
+          subscribeToConfiantCommFrame(iframeWindow);
+        }
+      });
+    });
+  });
+  mutationObserver.observe(document.head, { childList: true, subtree: true });
+}
+
+/**
+ * Emit billable event when Confiant integration reports that it has monitored an impression
+ */
+function reportBillableEvents (e) {
+  events.emit(CONSTANTS.EVENTS.BILLABLE_EVENT, {
+    auctionId: e.data.auctionId,
+    billingId: generateUUID(),
+    transactionId: e.data.transactionId,
+    type: 'impression',
+    vendor: 'confiant'
+  });
+}
+
+/**
+ * Confiant submodule registration
+ */
+function registerConfiantSubmodule() {
+  submodule('realTimeData', {
+    name: 'confiant',
+    init: (config) => {
+      try {
+        return setupPage(config);
+      } catch (err) {
+        logError(err.message);
+        if (mutationObserver) {
+          mutationObserver.disconnect();
+        }
+        return false;
+      }
+    }
+  });
+}
+
+registerConfiantSubmodule();
+
+export default {
+  injectConfigScript,
+  setupPage,
+  subscribeToConfiantCommFrame,
+  setUpMutationObserver,
+  reportBillableEvents,
+  registerConfiantSubmodule
+};
diff --git a/modules/confiantRtdProvider.md b/modules/confiantRtdProvider.md
new file mode 100644
index 00000000000..e92c0aabcba
--- /dev/null
+++ b/modules/confiantRtdProvider.md
@@ -0,0 +1,45 @@
+# Overview
+
+```
+Module Name: Confiant Inc. Rtd provider
+Module Type: Rtd Provider
+Maintainer: 
+```
+
+Confiant’s module provides comprehensive detection of security, quality, and privacy threats across your ad stack.
+Confiant is the industry leader in real-time detecting and blocking of bad ads when it comes to protecting your users and brand reputation.
+
+To start using this module, please contact [Confiant](https://www.confiant.com/contact) to get an account and customer key.
+
+
+# Integration
+
+1) Build Prebid bundle with Confiant module included:
+
+
+```
+gulp build --modules=confiantRtdProvider,...
+```
+
+2) Include the resulting bundle on your page.
+
+# Configuration
+
+Configuration of Confiant module is plain simple:
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: 'confiant',
+            params: {
+                // so please get in touch with us so we could help you to set up the module with proper parameters
+                propertyId: '', // required, string param, obtained from Confiant Inc.
+                prebidExcludeBidders: '', // optional, comma separated list of bidders to exclude from Confiant's prebid.js integration
+                prebidNameSpace: '', // optional, string param, namespace for prebid.js integration
+                shouldEmitBillableEvent: false, // optional, boolean param, upon being set to true enables firing of the BillableEvent upon Confiant's impression scanning
+            }
+        }]
+    }
+});
+```
diff --git a/src/adloader.js b/src/adloader.js
index 64408683e9f..01a77971b93 100644
--- a/src/adloader.js
+++ b/src/adloader.js
@@ -20,7 +20,8 @@ const _approvedLoadExternalJSList = [
   'hadron',
   'medianet',
   'improvedigital',
-  'aaxBlockmeter'
+  'aaxBlockmeter',
+  'confiant'
 ]
 
 /**
diff --git a/test/spec/modules/confiantRtdProvider_spec.js b/test/spec/modules/confiantRtdProvider_spec.js
new file mode 100644
index 00000000000..987aca2e020
--- /dev/null
+++ b/test/spec/modules/confiantRtdProvider_spec.js
@@ -0,0 +1,107 @@
+import * as utils from '../../../src/utils.js';
+import * as hook from '../../../src/hook.js'
+import * as events from '../../../src/events.js';
+import CONSTANTS from '../../../src/constants.json';
+
+import confiantModule from '../../../modules/confiantRtdProvider.js';
+
+const {
+  injectConfigScript,
+  setupPage,
+  subscribeToConfiantCommFrame,
+  registerConfiantSubmodule
+} = confiantModule;
+
+describe('Confiant RTD module', function () {
+  describe('setupPage()', function() {
+    it('should return false if propertId is not present in config', function() {
+      expect(setupPage({})).to.be.false;
+      expect(setupPage({ params: {} })).to.be.false;
+      expect(setupPage({ params: { propertyId: '' } })).to.be.false;
+    });
+
+    it('should return true if expected parameters are present', function() {
+      expect(setupPage({ params: { propertyId: 'clientId' } })).to.be.true;
+    });
+  });
+
+  describe('Module initialization', function() {
+    let insertElementStub;
+    beforeEach(function() {
+      insertElementStub = sinon.stub(utils, 'insertElement');
+    });
+    afterEach(function() {
+      utils.insertElement.restore();
+    });
+
+    it('should subscribe to rovided Window object', function () {
+      const mockWindow = { addEventListener: sinon.spy() };
+
+      subscribeToConfiantCommFrame(mockWindow);
+
+      sinon.assert.calledOnce(mockWindow.addEventListener);
+    });
+
+    it('should fire BillableEvent as a result for message in comm window', function() {
+      let listenerCallback;
+      const mockWindow = { addEventListener: (a, cb) => (listenerCallback = cb) };
+      let billableEventsCounter = 0;
+
+      events.on(CONSTANTS.EVENTS.BILLABLE_EVENT, (e) => {
+        if (e.vendor === 'confiant') {
+          billableEventsCounter++;
+          expect(e.type).to.equal('impression');
+          expect(e.billingId).to.be.a('number');
+          expect(e.auctionId).to.equal('auctionId');
+          expect(e.transactionId).to.equal('transactionId');
+        }
+      });
+
+      subscribeToConfiantCommFrame(mockWindow);
+      listenerCallback({
+        data: {
+          auctionId: 'auctionId',
+          transactionId: 'transactionId'
+        }
+      });
+      listenerCallback({
+        data: {
+          auctionId: 'auctionId',
+          transactionId: 'transactionId'
+        }
+      });
+
+      expect(billableEventsCounter).to.equal(2);
+    });
+  });
+
+  describe('Sumbodule execution', function() {
+    let submoduleStub;
+    let insertElementStub;
+    beforeEach(function () {
+      submoduleStub = sinon.stub(hook, 'submodule');
+      insertElementStub = sinon.stub(utils, 'insertElement');
+    });
+    afterEach(function () {
+      utils.insertElement.restore();
+      submoduleStub.restore();
+    });
+
+    function initModule() {
+      registerConfiantSubmodule();
+
+      expect(submoduleStub.calledOnceWith('realTimeData')).to.equal(true);
+
+      const registeredSubmoduleDefinition = submoduleStub.getCall(0).args[1];
+      expect(registeredSubmoduleDefinition).to.be.an('object');
+      expect(registeredSubmoduleDefinition).to.have.own.property('name', 'confiant');
+      expect(registeredSubmoduleDefinition).to.have.own.property('init').that.is.a('function');
+
+      return registeredSubmoduleDefinition;
+    }
+
+    it('should register Confiant submodule', function () {
+      initModule();
+    });
+  });
+});

From 10cf68607b0e6a646fb5c16b67defa8710811941 Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Wed, 28 Dec 2022 17:11:36 +0000
Subject: [PATCH 553/569] Prebid 7.31.0 release

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2b703493403..c2405970bde 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.31.0-pre",
+  "version": "7.31.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index f96909cc6b4..52138286c36 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.31.0-pre",
+  "version": "7.31.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From e13592697d17a110e6e94ecc6b2c907cb89eb45c Mon Sep 17 00:00:00 2001
From: "Prebid.js automated release" <prebidjs-release@prebid.org>
Date: Wed, 28 Dec 2022 17:11:36 +0000
Subject: [PATCH 554/569] Increment version to 7.32.0-pre

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c2405970bde..4bfd2cea1f7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.31.0",
+  "version": "7.32.0-pre",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 52138286c36..10da88d1c6f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.31.0",
+  "version": "7.32.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

From ff98601bdc868c98627ba023e2907f1611eec6c5 Mon Sep 17 00:00:00 2001
From: denys-berzoy-confiant
 <50574764+denys-berzoy-confiant@users.noreply.github.com>
Date: Wed, 28 Dec 2022 23:38:46 +0300
Subject: [PATCH 555/569] Confiant RTD Provider: (#9382)

- fix comment line
---
 modules/confiantRtdProvider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/confiantRtdProvider.js b/modules/confiantRtdProvider.js
index 4a524b92d75..2c13ad87d75 100644
--- a/modules/confiantRtdProvider.js
+++ b/modules/confiantRtdProvider.js
@@ -4,7 +4,7 @@
  *
  * The {@link module:modules/realTimeData} module is required
  * The module will inject a Confiant Inc. script into the page to monitor ad impressions
- * @module modules/cleanioRtdProvider
+ * @module modules/confiantRtdProvider
  * @requires module:modules/realTimeData
  */
 

From 0caca74e57de50daf23854cbeccdd57ecac7a621 Mon Sep 17 00:00:00 2001
From: inna <innayare@gmail.com>
Date: Thu, 29 Dec 2022 15:39:33 +0200
Subject: [PATCH 556/569] Rise Bid Adapter: added isWrapper parameter to
 adapter request (#9329)

* add Rise adapter

* fixes

* change param isOrg to org

* Rise adapter

* change email for rise

* fix circle failed

* bump

* bump

* bump

* remove space

* Upgrade Rise adapter to 5.0

* added isWrapper param

* addes is_wrapper parameter to documentation

* added is_wrapper to test

* removed isWrapper

Co-authored-by: Noam Tzuberi <noam.tzuberi@ironsrc.com>
Co-authored-by: noamtzu <noamtzu@gmail.com>
Co-authored-by: Noam Tzuberi <noamtzu@users.noreply.github.com>
Co-authored-by: Laslo Chechur <laslo.chechur@ironsrc.com>
Co-authored-by: OronW <41260031+OronW@users.noreply.github.com>
Co-authored-by: lasloche <62240785+lasloche@users.noreply.github.com>
---
 modules/riseBidAdapter.js                | 3 ++-
 modules/riseBidAdapter.md                | 2 ++
 test/spec/modules/riseBidAdapter_spec.js | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/riseBidAdapter.js b/modules/riseBidAdapter.js
index 4325a699a3b..0c4d6148f2b 100644
--- a/modules/riseBidAdapter.js
+++ b/modules/riseBidAdapter.js
@@ -400,7 +400,8 @@ function generateGeneralParams(generalObject, bidderRequest) {
     dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
     device_type: getDeviceType(navigator.userAgent),
     ua: navigator.userAgent,
-    session_id: getBidIdParameter('auctionId', generalObject),
+    is_wrapper: !!generalBidParams.isWrapper,
+    session_id: generalBidParams.sessionId || getBidIdParameter('auctionId', generalObject),
     tmax: timeout
   };
 
diff --git a/modules/riseBidAdapter.md b/modules/riseBidAdapter.md
index 9dab3ec2a30..f0837cb5508 100644
--- a/modules/riseBidAdapter.md
+++ b/modules/riseBidAdapter.md
@@ -25,6 +25,8 @@ The adapter supports Video(instream).
 | `placementId` | optional | String |  A unique placement identifier  | "12345678"
 | `testMode` | optional | Boolean |  This activates the test mode  | false
 | `rtbDomain` | optional | String |  Sets the seller end point  | "www.test.com"
+| `is_wrapper` | private | Boolean |  Please don't use unless your account manager asked you to  | false
+
 
 # Test Parameters
 ```javascript
diff --git a/test/spec/modules/riseBidAdapter_spec.js b/test/spec/modules/riseBidAdapter_spec.js
index 37100073407..4fa4ff354ec 100644
--- a/test/spec/modules/riseBidAdapter_spec.js
+++ b/test/spec/modules/riseBidAdapter_spec.js
@@ -116,6 +116,13 @@ describe('riseAdapter', function () {
       expect(request.data.bids[0].placementId).to.equal(placementId);
     });
 
+    it('sends the is_wrapper parameter to ENDPOINT via POST', function() {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.params).to.be.an('object');
+      expect(request.data.params).to.have.property('is_wrapper');
+      expect(request.data.params.is_wrapper).to.equal(false);
+    });
+
     it('sends bid request to ENDPOINT via POST', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.url).to.equal(ENDPOINT);

From 0b1ba0cecf0d7dd796a0a661c0ecb8f582f55a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Udi=20Talias=20=E2=9A=9B=EF=B8=8F?= <udi.talias@gmail.com>
Date: Thu, 29 Dec 2022 20:12:48 +0200
Subject: [PATCH 557/569] Added video media type support (#9326)

---
 modules/kueezRtbBidAdapter.js                |  29 +++-
 test/spec/modules/kueezRtbBidAdapter_spec.js | 171 ++++++++++++++++---
 2 files changed, 168 insertions(+), 32 deletions(-)

diff --git a/modules/kueezRtbBidAdapter.js b/modules/kueezRtbBidAdapter.js
index 1ee3b7331cb..4b0e5055328 100644
--- a/modules/kueezRtbBidAdapter.js
+++ b/modules/kueezRtbBidAdapter.js
@@ -1,6 +1,6 @@
 import { _each, deepAccess, parseSizesInput, parseUrl, uniques, isFn } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } from '../src/mediaTypes.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const GVLID = 1165;
@@ -55,7 +55,7 @@ function isBidRequestValid(bid) {
 }
 
 function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
-  const { params, bidId, userId, adUnitCode, schain } = bid;
+  const { params, bidId, userId, adUnitCode, schain, mediaTypes } = bid;
   let { bidFloor, ext } = params;
   const hashUrl = hashCode(topWindowUrl);
   const uniqueDealId = getUniqueDealId(hashUrl);
@@ -89,7 +89,8 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
     bidderVersion: BIDDER_VERSION,
     prebidVersion: '$prebid.version$',
     res: `${screen.width}x${screen.height}`,
-    schain: schain
+    schain: schain,
+    mediaTypes: mediaTypes
   };
 
   appendUserIdsToRequestPayload(data, userId);
@@ -167,11 +168,12 @@ function interpretResponse(serverResponse, request) {
 
   try {
     results.forEach(result => {
-      const { creativeId, ad, price, exp, width, height, currency, advertiserDomains } = result;
+      const { creativeId, ad, price, exp, width, height, currency, advertiserDomains, mediaType = BANNER } = result;
       if (!ad || !price) {
         return;
       }
-      output.push({
+
+      const response = {
         requestId: bidId,
         cpm: price,
         width: width,
@@ -180,11 +182,22 @@ function interpretResponse(serverResponse, request) {
         currency: currency || CURRENCY,
         netRevenue: true,
         ttl: exp || TTL_SECONDS,
-        ad: ad,
         meta: {
           advertiserDomains: advertiserDomains || []
         }
-      })
+      };
+
+      if (mediaType === BANNER) {
+        Object.assign(response, {
+          ad: ad,
+        });
+      } else {
+        Object.assign(response, {
+          vastXml: ad,
+          mediaType: VIDEO
+        });
+      }
+      output.push(response);
     });
     return output;
   } catch (e) {
@@ -268,7 +281,7 @@ export const spec = {
   code: BIDDER_CODE,
   version: BIDDER_VERSION,
   gvlid: GVLID,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid,
   buildRequests,
   interpretResponse,
diff --git a/test/spec/modules/kueezRtbBidAdapter_spec.js b/test/spec/modules/kueezRtbBidAdapter_spec.js
index f9b2cd41a43..30b2a46cefb 100644
--- a/test/spec/modules/kueezRtbBidAdapter_spec.js
+++ b/test/spec/modules/kueezRtbBidAdapter_spec.js
@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import { expect } from 'chai';
 import {
   spec as adapter,
   SUPPORTED_ID_SYSTEMS,
@@ -13,8 +13,9 @@ import {
   getUniqueDealId,
 } from 'modules/kueezRtbBidAdapter.js';
 import * as utils from 'src/utils.js';
-import {version} from 'package.json';
-import {useFakeTimers} from 'sinon';
+import { version } from 'package.json';
+import { useFakeTimers } from 'sinon';
+import { BANNER, VIDEO } from '../../../src/mediaTypes';
 
 const SUB_DOMAIN = 'exchange';
 
@@ -36,9 +37,42 @@ const BID = {
   'sizes': [[300, 250], [300, 600]],
   'bidderRequestId': '1fdb5ff1b6eaa7',
   'requestId': 'b0777d85-d061-450e-9bc7-260dd54bbb7a',
-  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc'
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'mediaTypes': [BANNER]
 };
 
+const VIDEO_BID = {
+  'bidId': '2d52001cabd527',
+  'adUnitCode': '63550ad1ff6642d368cba59dh5884270560',
+  'bidderRequestId': '12a8ae9ada9c13',
+  'transactionId': '56e184c6-bde9-497b-b9b9-cf47a61381ee',
+  'schain': 'a0819c69-005b-41ed-af06-1be1e0aefefc',
+  'params': {
+    'subDomain': SUB_DOMAIN,
+    'cId': '635509f7ff6642d368cb9837',
+    'pId': '59ac17c192832d0011283fe3',
+    'bidFloor': 0.1
+  },
+  'sizes': [[545, 307]],
+  'mediaTypes': {
+    'video': {
+      'playerSize': [[545, 307]],
+      'context': 'instream',
+      'mimes': [
+        'video/mp4',
+        'application/javascript'
+      ],
+      'protocols': [2, 3, 5, 6],
+      'maxduration': 60,
+      'minduration': 0,
+      'startdelay': 0,
+      'linearity': 1,
+      'api': [2],
+      'placement': 1
+    }
+  }
+}
+
 const BIDDER_REQUEST = {
   'gdprConsent': {
     'consentString': 'consent_string',
@@ -73,6 +107,23 @@ const SERVER_RESPONSE = {
   }
 };
 
+const VIDEO_SERVER_RESPONSE = {
+  body: {
+    'cid': '635509f7ff6642d368cb9837',
+    'results': [{
+      'ad': '<VAST version=\"3.0\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"></VAST>',
+      'advertiserDomains': ['kueezrtb.com'],
+      'exp': 60,
+      'width': 545,
+      'height': 307,
+      'mediaType': 'video',
+      'creativeId': '12610997325162499419',
+      'price': 2,
+      'cookies': []
+    }]
+  }
+};
+
 const REQUEST = {
   data: {
     width: 300,
@@ -83,7 +134,7 @@ const REQUEST = {
 
 function getTopWindowQueryParams() {
   try {
-    const parsedUrl = utils.parseUrl(window.top.document.URL, {decodeSearchAsString: true});
+    const parsedUrl = utils.parseUrl(window.top.document.URL, { decodeSearchAsString: true });
     return parsedUrl.search;
   } catch (e) {
     return '';
@@ -111,6 +162,11 @@ describe('KueezRtbBidAdapter', function () {
     it('exists and is a string', function () {
       expect(adapter.code).to.exist.and.to.be.a('string');
     });
+
+    it('exists and contains media types', function () {
+      expect(adapter.supportedMediaTypes).to.exist.and.to.be.an('array').with.length(2);
+      expect(adapter.supportedMediaTypes).to.contain.members([BANNER, VIDEO]);
+    });
   });
 
   describe('validate bid requests', function () {
@@ -155,7 +211,53 @@ describe('KueezRtbBidAdapter', function () {
       sandbox.stub(Date, 'now').returns(1000);
     });
 
-    it('should build request for each size', function () {
+    it('should build video request', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
+      const requests = adapter.buildRequests([VIDEO_BID], BIDDER_REQUEST);
+      expect(requests).to.have.length(1);
+      expect(requests[0]).to.deep.equal({
+        method: 'POST',
+        url: `${createDomain(SUB_DOMAIN)}/prebid/multi/635509f7ff6642d368cb9837`,
+        data: {
+          adUnitCode: '63550ad1ff6642d368cba59dh5884270560',
+          bidFloor: 0.1,
+          bidId: '2d52001cabd527',
+          bidderVersion: adapter.version,
+          cb: 1000,
+          gdpr: 1,
+          gdprConsent: 'consent_string',
+          usPrivacy: 'consent_string',
+          prebidVersion: version,
+          publisherId: '59ac17c192832d0011283fe3',
+          url: 'https%3A%2F%2Fwww.greatsite.com',
+          referrer: 'https://www.somereferrer.com',
+          res: `${window.top.screen.width}x${window.top.screen.height}`,
+          schain: VIDEO_BID.schain,
+          sizes: ['545x307'],
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
+          uqs: getTopWindowQueryParams(),
+          mediaTypes: {
+            video: {
+              api: [2],
+              context: 'instream',
+              linearity: 1,
+              maxduration: 60,
+              mimes: [
+                'video/mp4',
+                'application/javascript'
+              ],
+              minduration: 0,
+              placement: 1,
+              playerSize: [[545, 307]],
+              protocols: [2, 3, 5, 6],
+              startdelay: 0
+            }
+          }
+        }
+      });
+    });
+
+    it('should build banner request for each size', function () {
       const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.page);
       const requests = adapter.buildRequests([BID], BIDDER_REQUEST);
       expect(requests).to.have.length(1);
@@ -179,6 +281,7 @@ describe('KueezRtbBidAdapter', function () {
           prebidVersion: version,
           schain: BID.schain,
           res: `${window.top.screen.width}x${window.top.screen.height}`,
+          mediaTypes: [BANNER],
           uqs: getTopWindowQueryParams(),
           'ext.param1': 'loremipsum',
           'ext.param2': 'dolorsitamet',
@@ -193,7 +296,7 @@ describe('KueezRtbBidAdapter', function () {
   });
   describe('getUserSyncs', function () {
     it('should have valid user sync with iframeEnabled', function () {
-      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
+      const result = adapter.getUserSyncs({ iframeEnabled: true }, [SERVER_RESPONSE]);
 
       expect(result).to.deep.equal([{
         type: 'iframe',
@@ -202,7 +305,7 @@ describe('KueezRtbBidAdapter', function () {
     });
 
     it('should have valid user sync with cid on response', function () {
-      const result = adapter.getUserSyncs({iframeEnabled: true}, [SERVER_RESPONSE]);
+      const result = adapter.getUserSyncs({ iframeEnabled: true }, [SERVER_RESPONSE]);
       expect(result).to.deep.equal([{
         type: 'iframe',
         url: 'https://sync.kueezrtb.com/api/sync/iframe/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy='
@@ -210,7 +313,7 @@ describe('KueezRtbBidAdapter', function () {
     });
 
     it('should have valid user sync with pixelEnabled', function () {
-      const result = adapter.getUserSyncs({pixelEnabled: true}, [SERVER_RESPONSE]);
+      const result = adapter.getUserSyncs({ pixelEnabled: true }, [SERVER_RESPONSE]);
 
       expect(result).to.deep.equal([{
         'url': 'https://sync.kueezrtb.com/api/sync/image/?cid=testcid123&gdpr=0&gdpr_consent=&us_privacy=',
@@ -226,16 +329,16 @@ describe('KueezRtbBidAdapter', function () {
     });
 
     it('should return empty array when there is no ad', function () {
-      const responses = adapter.interpretResponse({price: 1, ad: ''});
+      const responses = adapter.interpretResponse({ price: 1, ad: '' });
       expect(responses).to.be.empty;
     });
 
     it('should return empty array when there is no price', function () {
-      const responses = adapter.interpretResponse({price: null, ad: 'great ad'});
+      const responses = adapter.interpretResponse({ price: null, ad: 'great ad' });
       expect(responses).to.be.empty;
     });
 
-    it('should return an array of interpreted responses', function () {
+    it('should return an array of interpreted banner responses', function () {
       const responses = adapter.interpretResponse(SERVER_RESPONSE, REQUEST);
       expect(responses).to.have.length(1);
       expect(responses[0]).to.deep.equal({
@@ -254,6 +357,26 @@ describe('KueezRtbBidAdapter', function () {
       });
     });
 
+    it('should return an array of interpreted video responses', function () {
+      const responses = adapter.interpretResponse(VIDEO_SERVER_RESPONSE, REQUEST);
+      expect(responses).to.have.length(1);
+      expect(responses[0]).to.deep.equal({
+        requestId: '2d52001cabd527',
+        cpm: 2,
+        width: 545,
+        height: 307,
+        mediaType: 'video',
+        creativeId: '12610997325162499419',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 60,
+        vastXml: '<VAST version=\"3.0\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"></VAST>',
+        meta: {
+          advertiserDomains: ['kueezrtb.com']
+        }
+      });
+    });
+
     it('should take default TTL', function () {
       const serverResponse = utils.deepClone(SERVER_RESPONSE);
       delete serverResponse.body.results[0].exp;
@@ -271,11 +394,11 @@ describe('KueezRtbBidAdapter', function () {
       const userId = (function () {
         switch (idSystemProvider) {
           case 'lipb':
-            return {lipbid: id};
+            return { lipbid: id };
           case 'parrableId':
-            return {eid: id};
+            return { eid: id };
           case 'id5id':
-            return {uid: id};
+            return { uid: id };
           default:
             return id;
         }
@@ -294,18 +417,18 @@ describe('KueezRtbBidAdapter', function () {
 
   describe('alternate param names extractors', function () {
     it('should return undefined when param not supported', function () {
-      const cid = extractCID({'c_id': '1'});
-      const pid = extractPID({'p_id': '1'});
-      const subDomain = extractSubDomain({'sub_domain': 'prebid'});
+      const cid = extractCID({ 'c_id': '1' });
+      const pid = extractPID({ 'p_id': '1' });
+      const subDomain = extractSubDomain({ 'sub_domain': 'prebid' });
       expect(cid).to.be.undefined;
       expect(pid).to.be.undefined;
       expect(subDomain).to.be.undefined;
     });
 
     it('should return value when param supported', function () {
-      const cid = extractCID({'cID': '1'});
-      const pid = extractPID({'Pid': '2'});
-      const subDomain = extractSubDomain({'subDOMAIN': 'prebid'});
+      const cid = extractCID({ 'cID': '1' });
+      const pid = extractPID({ 'Pid': '2' });
+      const subDomain = extractSubDomain({ 'subDOMAIN': 'prebid' });
       expect(cid).to.be.equal('1');
       expect(pid).to.be.equal('2');
       expect(subDomain).to.be.equal('prebid');
@@ -365,7 +488,7 @@ describe('KueezRtbBidAdapter', function () {
         now
       });
       setStorageItem('myKey', 2020);
-      const {value, created} = getStorageItem('myKey');
+      const { value, created } = getStorageItem('myKey');
       expect(created).to.be.equal(now);
       expect(value).to.be.equal(2020);
       expect(typeof value).to.be.equal('number');
@@ -381,8 +504,8 @@ describe('KueezRtbBidAdapter', function () {
     });
 
     it('should parse JSON value', function () {
-      const data = JSON.stringify({event: 'send'});
-      const {event} = tryParseJSON(data);
+      const data = JSON.stringify({ event: 'send' });
+      const { event } = tryParseJSON(data);
       expect(event).to.be.equal('send');
     });
 

From 57555bc4a0b916bd32dbcdf5030d3ead20a103d1 Mon Sep 17 00:00:00 2001
From: "Adserver.Online" <61009237+adserver-online@users.noreply.github.com>
Date: Tue, 3 Jan 2023 17:22:48 +0200
Subject: [PATCH 558/569] Aso Bid Adapter: add bcmint alias (#9387)

* Add bcmint alias

* kick off tests

Co-authored-by: dev <dev@adsrv.org>
Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/asoBidAdapter.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/asoBidAdapter.js b/modules/asoBidAdapter.js
index 83b182e4ca5..39c42f193b2 100644
--- a/modules/asoBidAdapter.js
+++ b/modules/asoBidAdapter.js
@@ -10,11 +10,11 @@ import {
   parseSizesInput,
   tryAppendQueryString
 } from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {config} from '../src/config.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
-import {Renderer} from '../src/Renderer.js';
-import {parseDomain} from '../src/refererDetection.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { Renderer } from '../src/Renderer.js';
+import { parseDomain } from '../src/refererDetection.js';
 
 const BIDDER_CODE = 'aso';
 const DEFAULT_SERVER_URL = 'https://srv.aso1.net';
@@ -27,6 +27,9 @@ export const spec = {
 
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
+  aliases: [
+    {code: 'bcmint'}
+  ],
 
   isBidRequestValid: bid => {
     return !!bid.params && !!bid.params.zone;

From ccc9bba348275e941d39ea32284d4983cbcc20d2 Mon Sep 17 00:00:00 2001
From: Giovanni Sollazzo <gs@aidem.com>
Date: Tue, 3 Jan 2023 17:02:37 +0100
Subject: [PATCH 559/569] AIDEM Bid Adapter: added wpar and placementId param
 (#9377)

* AIDEM Bid Adapter

* Added _spec.js

* update

* Fix Navigator in _spec.js

* Removed timeout handler.

* Added publisherId as required bidder params

* moved publisherId into site publisher object

* Added wpar to environment

* Added placementId parameter

* added unit tests for the wpar environment object

Co-authored-by: darkstar <canazza@wazabit.it>
Co-authored-by: AndreaC <67786179+darkstarac@users.noreply.github.com>
---
 modules/aidemBidAdapter.js                |  4 ++++
 modules/aidemBidAdapter.md                |  1 +
 test/spec/modules/aidemBidAdapter_spec.js | 12 ++++++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/aidemBidAdapter.js b/modules/aidemBidAdapter.js
index 41bf680db1c..081a0324ddb 100644
--- a/modules/aidemBidAdapter.js
+++ b/modules/aidemBidAdapter.js
@@ -220,6 +220,8 @@ function setPrebidImpressionObject(bidRequests, payload) {
     deepSetValue(impressionObject, 'id', bidRequest.bidId);
     // Transaction id
     deepSetValue(impressionObject, 'tid', deepAccess(bidRequest, 'transactionId'));
+    // Placement id
+    deepSetValue(impressionObject, 'tagid', deepAccess(bidRequest, 'params.placementId', null));
     // Publisher id
     deepSetValue(payload, 'site.publisher.id', deepAccess(bidRequest, 'params.publisherId'));
     // Site id
@@ -265,6 +267,8 @@ function setPrebidRequestEnvironment(payload) {
   deepSetValue(payload, 'environment.inp.jp', window.JSON.parse.name === 'parse' && typeof window.JSON.parse.prototype === 'undefined');
   deepSetValue(payload, 'environment.inp.ofe', window.Object.fromEntries.name === 'fromEntries' && typeof window.Object.fromEntries.prototype === 'undefined');
   deepSetValue(payload, 'environment.inp.oa', window.Object.assign.name === 'assign' && typeof window.Object.assign.prototype === 'undefined');
+  deepSetValue(payload, 'environment.wpar.innerWidth', window.innerWidth);
+  deepSetValue(payload, 'environment.wpar.innerHeight', window.innerHeight);
 }
 
 function setPrebidImpressionObjectFloor(bidRequest, impressionObject) {
diff --git a/modules/aidemBidAdapter.md b/modules/aidemBidAdapter.md
index a5beca97d10..342a264da01 100644
--- a/modules/aidemBidAdapter.md
+++ b/modules/aidemBidAdapter.md
@@ -18,6 +18,7 @@ This module is GDPR and CCPA compliant, and no 3rd party userIds are allowed.
 |---------------|----------|---------------------|---------------|----------|
 | `siteId`      | required | Unique site ID      | `'ABCDEF'`    | `String` |
 | `publisherId` | required | Unique publisher ID | `'ABCDEF'`    | `String` |
+| `placementId` | optional | Unique publisher tag ID | `'ABCDEF'`    | `String` |
 
 
 ### Banner Bid Params
diff --git a/test/spec/modules/aidemBidAdapter_spec.js b/test/spec/modules/aidemBidAdapter_spec.js
index 472b226ab8a..71edfcf82fb 100644
--- a/test/spec/modules/aidemBidAdapter_spec.js
+++ b/test/spec/modules/aidemBidAdapter_spec.js
@@ -385,7 +385,7 @@ describe('Aidem adapter', () => {
       expect(payload.imp).to.be.a('array').that.has.lengthOf(DEFAULT_VALID_BANNER_REQUESTS.length)
 
       expect(payload.imp[0]).to.be.a('object').that.has.all.keys(
-        'banner', 'id', 'mediatype', 'imp_ext', 'tid'
+        'banner', 'id', 'mediatype', 'imp_ext', 'tid', 'tagid'
       )
       expect(payload.imp[0].banner).to.be.a('object').that.has.all.keys(
         'format', 'topframe'
@@ -401,7 +401,7 @@ describe('Aidem adapter', () => {
       expect(payload.imp).to.be.a('array').that.has.lengthOf(DEFAULT_VALID_VIDEO_REQUESTS.length)
 
       expect(payload.imp[0]).to.be.a('object').that.has.all.keys(
-        'video', 'id', 'mediatype', 'imp_ext', 'tid'
+        'video', 'id', 'mediatype', 'imp_ext', 'tid', 'tagid'
       )
       expect(payload.imp[0].video).to.be.a('object').that.has.all.keys(
         'format', 'mimes', 'minDuration', 'maxDuration', 'protocols'
@@ -421,6 +421,14 @@ describe('Aidem adapter', () => {
         'value', 'currency'
       )
     });
+
+    it('should hav wpar keys in environment object', function () {
+      const requests = spec.buildRequests(DEFAULT_VALID_VIDEO_REQUESTS, VALID_BIDDER_REQUEST);
+      const payload = JSON.parse(requests.data)
+      expect(payload).to.have.property('environment')
+      expect(payload.environment).to.be.a('object').that.have.property('wpar')
+      expect(payload.environment.wpar).to.be.a('object').that.has.keys('innerWidth', 'innerHeight')
+    });
   })
 
   describe('interpretResponse', () => {

From a2172d9aa3b56e8992460e796760843cb9fa947c Mon Sep 17 00:00:00 2001
From: ahmadlob <109217988+ahmadlob@users.noreply.github.com>
Date: Tue, 3 Jan 2023 18:54:25 +0200
Subject: [PATCH 560/569] Taboola Bid Adapter: onBidWon, userSyncs, gpp support
 and FPD  (#9376)

* on-bid-won

* support-fpd

* support-fpd

* support-fpd

* support-fpd

* support-fpd

* support-fpd

* implement-get-user-sync

* implement-get-user-sync

* implement-get-user-sync

* implement-get-user-sync

* implement-get-user-sync

* implement-get-user-sync

* implement-get-user-sync

* implement-get-user-sync

* implement-get-user-sync

* position-pagetype
---
 modules/taboolaBidAdapter.js                |  62 ++++++++--
 test/spec/modules/taboolaBidAdapter_spec.js | 124 +++++++++++++++++++-
 2 files changed, 172 insertions(+), 14 deletions(-)

diff --git a/modules/taboolaBidAdapter.js b/modules/taboolaBidAdapter.js
index 670d28ab64e..85adfc31ca5 100644
--- a/modules/taboolaBidAdapter.js
+++ b/modules/taboolaBidAdapter.js
@@ -3,13 +3,15 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER} from '../src/mediaTypes.js';
 import {config} from '../src/config.js';
-import {getWindowSelf} from '../src/utils.js'
+import {getWindowSelf, replaceAuctionPrice} from '../src/utils.js'
 import {getStorageManager} from '../src/storageManager.js';
+import { ajax } from '../src/ajax.js';
 
 const BIDDER_CODE = 'taboola';
 const GVLID = 42;
 const CURRENCY = 'USD';
 export const END_POINT_URL = 'https://display.bidder.taboola.com/OpenRTB/TaboolaHB/auction';
+export const USER_SYNC_IMG_URL = 'https://trc.taboola.com/sg/prebidJS/1/cm';
 const USER_ID = 'user-id';
 const STORAGE_KEY = `taboola global:${USER_ID}`;
 const COOKIE_KEY = 'trc_cookie_storage';
@@ -81,7 +83,7 @@ export const spec = {
     const [bidRequest] = validBidRequests;
     const {refererInfo, gdprConsent = {}, uspConsent} = bidderRequest;
     const {publisherId} = bidRequest.params;
-    const site = getSiteProperties(bidRequest.params, refererInfo);
+    const site = getSiteProperties(bidRequest.params, refererInfo, bidderRequest.ortb2);
     const device = {ua: navigator.userAgent};
     const imps = getImps(validBidRequests);
     const user = {
@@ -102,24 +104,32 @@ export const spec = {
       regs.ext.us_privacy = uspConsent;
     }
 
+    if (bidderRequest.ortb2?.regs?.gpp) {
+      regs.ext.gpp = bidderRequest.ortb2.regs.gpp;
+      regs.ext.gpp_sid = bidderRequest.ortb2.regs.gpp_sid;
+    }
+
     if (config.getConfig('coppa')) {
       regs.coppa = 1;
     }
 
     const ortb2 = bidderRequest.ortb2 || {
+      bcat: [],
       badv: [],
-      bcat: []
+      wlang: []
     };
 
     const request = {
       id: bidderRequest.auctionId,
       imp: imps,
       site,
+      pageType: ortb2?.ext?.data?.pageType || ortb2?.ext?.data?.section || bidRequest.params.pageType,
       device,
       source: {fd: 1},
       tmax: bidderRequest.timeout,
-      bcat: ortb2.bcat,
-      badv: ortb2.badv,
+      bcat: ortb2.bcat || bidRequest.params.bcat || [],
+      badv: ortb2.badv || bidRequest.params.badv || [],
+      wlang: ortb2.wlang || bidRequest.params.wlang || [],
       user,
       regs
     };
@@ -149,16 +159,45 @@ export const spec = {
 
     return bidResponses.map((bidResponse) => getBid(bids, currency, bidResponse)).filter(Boolean);
   },
+  onBidWon: (bid) => {
+    if (bid.nurl) {
+      const resolvedNurl = replaceAuctionPrice(bid.nurl, bid.originalCpm);
+      ajax(resolvedNurl);
+    }
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent, gppConsent) {
+    const syncs = []
+    const queryParams = [];
+    if (gdprConsent) {
+      queryParams.push(`gdpr=${Number(gdprConsent.gdprApplies && 1)}&gdpr_consent=${encodeURIComponent(gdprConsent.consentString || '')}`);
+    }
+
+    if (uspConsent) {
+      queryParams.push('us_privacy=' + encodeURIComponent(uspConsent));
+    }
+
+    if (gppConsent) {
+      queryParams.push('gpp=' + encodeURIComponent(gppConsent));
+    }
+
+    if (syncOptions.pixelEnabled) {
+      syncs.push({
+        type: 'image',
+        url: USER_SYNC_IMG_URL + (queryParams.length ? '?' + queryParams.join('&') : '')
+      });
+    }
+    return syncs;
+  },
 };
 
-function getSiteProperties({publisherId, bcat = []}, refererInfo) {
+function getSiteProperties({publisherId}, refererInfo, ortb2) {
   const {getPageUrl, getReferrer} = internal;
   return {
     id: publisherId,
     name: publisherId,
-    domain: refererInfo?.domain || window.location?.host,
-    page: getPageUrl(refererInfo),
-    ref: getReferrer(refererInfo),
+    domain: ortb2?.site?.domain || refererInfo?.domain || window.location?.host,
+    page: ortb2?.site?.page || getPageUrl(refererInfo),
+    ref: ortb2?.site?.ref || getReferrer(refererInfo),
     publisher: {
       id: publisherId
     },
@@ -170,11 +209,12 @@ function getSiteProperties({publisherId, bcat = []}, refererInfo) {
 
 function getImps(validBidRequests) {
   return validBidRequests.map((bid, id) => {
-    const {tagId} = bid.params;
+    const {tagId, position} = bid.params;
     const imp = {
       id: id + 1,
       banner: getBanners(bid),
-      tagid: tagId
+      tagid: tagId,
+      position: position
     }
     if (typeof bid.getFloor === 'function') {
       const floorInfo = bid.getFloor({
diff --git a/test/spec/modules/taboolaBidAdapter_spec.js b/test/spec/modules/taboolaBidAdapter_spec.js
index 5bde75cd0b6..a3a765d28cf 100644
--- a/test/spec/modules/taboolaBidAdapter_spec.js
+++ b/test/spec/modules/taboolaBidAdapter_spec.js
@@ -2,6 +2,7 @@ import {expect} from 'chai';
 import {spec, internal, END_POINT_URL, userData} from 'modules/taboolaBidAdapter.js';
 import {config} from '../../../src/config'
 import * as utils from '../../../src/utils'
+import {server} from '../../mocks/xhr'
 
 describe('Taboola Adapter', function () {
   let hasLocalStorage, cookiesAreEnabled, getDataFromLocalStorage, localStorageIsEnabled, getCookie, commonBidRequest;
@@ -91,6 +92,31 @@ describe('Taboola Adapter', function () {
     })
   })
 
+  describe('onBidWon', function () {
+    it('onBidWon exist as a function', () => {
+      expect(spec.onBidWon).to.exist.and.to.be.a('function');
+    });
+
+    it('should resolve price macro in nurl', function () {
+      const nurl = 'http://win.example.com/${AUCTION_PRICE}';
+      const bid = {
+        requestId: 1,
+        cpm: 2,
+        originalCpm: 3.4,
+        creativeId: 1,
+        ttl: 60,
+        netRevenue: true,
+        mediaType: 'banner',
+        ad: '...',
+        width: 300,
+        height: 250,
+        nurl: nurl
+      }
+      spec.onBidWon(bid);
+      expect(server.requests[0].url).to.equals('http://win.example.com/3.4')
+    });
+  });
+
   describe('buildRequests', function () {
     const defaultBidRequest = {
       ...createBidRequest(),
@@ -137,6 +163,7 @@ describe('Taboola Adapter', function () {
         'source': {'fd': 1},
         'bcat': [],
         'badv': [],
+        'wlang': [],
         'user': {
           'buyeruid': 0,
           'ext': {},
@@ -184,7 +211,7 @@ describe('Taboola Adapter', function () {
       expect(resData.imp[0].bidfloorcur).to.deep.equal('USD');
     });
 
-    it('should pass bid floor even if they is a bid floor param', function () {
+    it('should pass bid floor even if it is a bid floor param', function () {
       const optionalParams = {
         bidfloor: 0.25,
         bidfloorcur: 'EUR'
@@ -206,6 +233,21 @@ describe('Taboola Adapter', function () {
       expect(resData.imp[0].bidfloorcur).to.deep.equal('USD');
     });
 
+    it('should pass impression position', function () {
+      const optionalParams = {
+        position: 2
+      };
+
+      const bidRequest = {
+        ...defaultBidRequest,
+        params: {...commonBidRequest.params, ...optionalParams}
+      };
+
+      const res = spec.buildRequests([bidRequest], commonBidderRequest);
+      const resData = JSON.parse(res.data);
+      expect(resData.imp[0].position).to.deep.equal(2);
+    });
+
     it('should pass bidder timeout', function () {
       const bidderRequest = {
         ...commonBidderRequest,
@@ -216,6 +258,40 @@ describe('Taboola Adapter', function () {
       expect(resData.tmax).to.equal(500);
     });
 
+    describe('first party data', function () {
+      it('should parse first party data', function () {
+        const bidderRequest = {
+          ...commonBidderRequest,
+          ortb2: {
+            bcat: ['EX1', 'EX2', 'EX3'],
+            badv: ['site.com'],
+            wlang: ['de'],
+          }
+        }
+        const res = spec.buildRequests([defaultBidRequest], bidderRequest);
+        const resData = JSON.parse(res.data);
+        expect(resData.bcat).to.deep.equal(bidderRequest.ortb2.bcat)
+        expect(resData.badv).to.deep.equal(bidderRequest.ortb2.badv)
+        expect(resData.wlang).to.deep.equal(bidderRequest.ortb2.wlang)
+      });
+
+      it('should pass pageType if exists in ortb2', function () {
+        const bidderRequest = {
+          ...commonBidderRequest,
+          ortb2: {
+            ext: {
+              data: {
+                pageType: 'news'
+              }
+            }
+          }
+        }
+        const res = spec.buildRequests([defaultBidRequest], bidderRequest);
+        const resData = JSON.parse(res.data);
+        expect(resData.pageType).to.deep.equal(bidderRequest.ortb2.ext.data.pageType);
+      });
+    });
+
     describe('handle privacy segments when building request', function () {
       it('should pass GDPR consent', function () {
         const bidderRequest = {
@@ -234,6 +310,20 @@ describe('Taboola Adapter', function () {
         expect(resData.regs.ext.gdpr).to.equal(1)
       });
 
+      it('should pass GPP consent if exist in ortb2', function () {
+        const ortb2 = {
+          regs: {
+            gpp: 'testGpp',
+            gpp_sid: [1, 2, 3]
+          }
+        }
+
+        const res = spec.buildRequests([defaultBidRequest], {...commonBidderRequest, ortb2})
+        const resData = JSON.parse(res.data)
+        expect(resData.regs.ext.gpp).to.equal('testGpp')
+        expect(resData.regs.ext.gpp_sid).to.deep.equal([1, 2, 3])
+      });
+
       it('should pass us privacy consent', function () {
         const bidderRequest = {
           refererInfo: {
@@ -552,8 +642,36 @@ describe('Taboola Adapter', function () {
     });
   })
 
-  describe('userData', function () {
-    // todo: add UT for getUserSyncs
+  describe('getUserSyncs', function () {
+    const usersyncUrl = 'https://trc.taboola.com/sg/prebidJS/1/cm';
+
+    it('should not return user sync if pixelEnabled is false', function () {
+      const res = spec.getUserSyncs({pixelEnabled: false});
+      expect(res).to.be.an('array').that.is.empty;
+    });
+
+    it('should return user sync if pixelEnabled is true', function () {
+      const res = spec.getUserSyncs({pixelEnabled: true});
+      expect(res).to.deep.equal([{type: 'image', url: usersyncUrl}]);
+    });
+
+    it('should pass consent tokens values', function() {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: true, consentString: 'GDPR_CONSENT'}, 'USP_CONSENT')).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=GDPR_CONSENT&us_privacy=USP_CONSENT`
+      }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: false, consentString: undefined}, undefined)).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=0&gdpr_consent=`
+      }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, {gdprApplies: false, consentString: undefined}, undefined)).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?gdpr=0&gdpr_consent=`
+      }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined, 'USP_CONSENT')).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?us_privacy=USP_CONSENT`
+      }]);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, {}, undefined, 'USP_CONSENT', 'GPP_STRING')).to.deep.equal([{
+        type: 'image', url: `${usersyncUrl}?us_privacy=USP_CONSENT&gpp=GPP_STRING`
+      }]);
+    });
   })
 
   describe('internal functions', function () {

From 348ba1da17739175f64c02120ab99cfe853aa49d Mon Sep 17 00:00:00 2001
From: nkloeber <100145701+nkloeber@users.noreply.github.com>
Date: Tue, 3 Jan 2023 18:11:12 +0100
Subject: [PATCH 561/569] Yieldlab Bid Adapter: read and pass UserIdsAsEids
 atype information (#9370)

* YieldlabBidAdapter read atype information from UserIdsAsEids and pass it as query parameter (atypes={idprovider}:{atype},{idprovider2}:{atype2},...)

* Update type hint and add semi colons

Co-authored-by: Christoph Kipping <29540638+kippsterr@users.noreply.github.com>
---
 modules/yieldlabBidAdapter.js                | 16 ++++++++++++++++
 test/spec/modules/yieldlabBidAdapter_spec.js | 12 +++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/modules/yieldlabBidAdapter.js b/modules/yieldlabBidAdapter.js
index 88e1494d416..6e4f6644140 100644
--- a/modules/yieldlabBidAdapter.js
+++ b/modules/yieldlabBidAdapter.js
@@ -62,6 +62,7 @@ export const spec = {
       }
       if (bid.userIdAsEids && Array.isArray(bid.userIdAsEids)) {
         query.ids = createUserIdString(bid.userIdAsEids)
+        query.atypes = createUserIdAtypesString(bid.userIdAsEids)
       }
       if (bid.params.customParams && isPlainObject(bid.params.customParams)) {
         for (const prop in bid.params.customParams) {
@@ -303,6 +304,21 @@ function createUserIdString(eids) {
   return str.join(',')
 }
 
+/**
+ * Creates a string from an array of eids with ID provider and atype if atype exists
+ * @param {Array.<{source: String, uids: Array.<{id: String, atype: Number, ext: Object}>}>} eids
+ * @returns {String} idprovider:atype,idprovider2:atype2,...
+ */
+function createUserIdAtypesString(eids) {
+  const str = [];
+  for (let i = 0; i < eids.length; i++) {
+    if (eids[i].uids[0].atype) {
+      str.push(eids[i].source + ':' + eids[i].uids[0].atype);
+    }
+  }
+  return str.join(',');
+}
+
 /**
  * Creates a querystring out of an object with key-values
  * @param {Object} obj
diff --git a/test/spec/modules/yieldlabBidAdapter_spec.js b/test/spec/modules/yieldlabBidAdapter_spec.js
index 5df0e93d34e..07d42df1319 100644
--- a/test/spec/modules/yieldlabBidAdapter_spec.js
+++ b/test/spec/modules/yieldlabBidAdapter_spec.js
@@ -45,6 +45,12 @@ const DEFAULT_REQUEST = () => ({
       id: 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
       atype: 1
     }]
+  }, {
+    source: 'digitrust.de',
+    uids: [{
+      id: 'd8aa10fa-d86c-451d-aad8-5f16162a9e64',
+      atype: 2
+    }]
   }],
   schain: {
     ver: '1.0',
@@ -271,7 +277,11 @@ describe('yieldlabBidAdapter', () => {
       })
 
       it('passes userids to bid request', () => {
-        expect(request.url).to.include('ids=netid.de%3AfH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg')
+        expect(request.url).to.include('ids=netid.de%3AfH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg%2Cdigitrust.de%3Ad8aa10fa-d86c-451d-aad8-5f16162a9e64')
+      })
+
+      it('passes atype to bid request', () => {
+        expect(request.url).to.include('atypes=netid.de%3A1%2Cdigitrust.de%3A2')
       })
 
       it('passes extra params to bid request', () => {

From 1960ed811bd923a445aece06b20f06e11589bf1d Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Tue, 3 Jan 2023 12:54:41 -0700
Subject: [PATCH 562/569] Medianet RTD module: fix `getTargetingData` to
 retrieve correct adUnits (#9392)

---
 modules/medianetRtdProvider.js                | 8 ++++----
 test/spec/modules/medianetRtdProvider_spec.js | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/medianetRtdProvider.js b/modules/medianetRtdProvider.js
index 3e01d0e5631..5a159b39081 100644
--- a/modules/medianetRtdProvider.js
+++ b/modules/medianetRtdProvider.js
@@ -59,14 +59,14 @@ function onAuctionInitEvent(auctionInit) {
   }, SOURCE));
 }
 
-function getTargetingData(adUnitCode) {
-  const adUnits = getAdUnits(undefined, adUnitCode);
+function getTargetingData(adUnitCodes, config, consent, auction) {
+  const adUnits = getAdUnits(auction.adUnits, adUnitCodes);
   let targetingData = {};
   if (window.mnjs.loaded && isFn(window.mnjs.getTargetingData)) {
-    targetingData = window.mnjs.getTargetingData(adUnitCode, adUnits, SOURCE) || {};
+    targetingData = window.mnjs.getTargetingData(adUnitCodes, adUnits, SOURCE) || {};
   }
   const targeting = {};
-  adUnitCode.forEach(adUnitCode => {
+  adUnitCodes.forEach(adUnitCode => {
     targeting[adUnitCode] = targeting[adUnitCode] || {};
     targetingData[adUnitCode] = targetingData[adUnitCode] || {};
     targeting[adUnitCode] = {
diff --git a/test/spec/modules/medianetRtdProvider_spec.js b/test/spec/modules/medianetRtdProvider_spec.js
index 7d73ecd5d44..f9d4ef7c2cf 100644
--- a/test/spec/modules/medianetRtdProvider_spec.js
+++ b/test/spec/modules/medianetRtdProvider_spec.js
@@ -66,12 +66,12 @@ describe('medianet realtime module', function () {
   describe('getTargeting should work correctly', function () {
     it('should return empty if not loaded', function () {
       window.mnjs.loaded = false;
-      assert.deepEqual(medianetRTD.medianetRtdModule.getTargetingData([]), {});
+      assert.deepEqual(medianetRTD.medianetRtdModule.getTargetingData([], {}, {}, {}), {});
     });
 
     it('should return ad unit codes when ad units are present', function () {
       const adUnitCodes = ['code1', 'code2'];
-      assert.deepEqual(medianetRTD.medianetRtdModule.getTargetingData(adUnitCodes), {
+      assert.deepEqual(medianetRTD.medianetRtdModule.getTargetingData(adUnitCodes, {}, {}, {}), {
         code1: {'mnadc': 'code1'},
         code2: {'mnadc': 'code2'},
       });
@@ -79,7 +79,7 @@ describe('medianet realtime module', function () {
 
     it('should call mnjs.getTargetingData if loaded', function () {
       window.mnjs.loaded = true;
-      medianetRTD.medianetRtdModule.getTargetingData([]);
+      medianetRTD.medianetRtdModule.getTargetingData([], {}, {}, {});
       assert.equal(getTargetingDataSpy.called, true);
     });
   });

From febd71b40884ebc23dfb448f8a7096168eaffdcb Mon Sep 17 00:00:00 2001
From: Krzysztof Desput <dowlander@gmail.com>
Date: Wed, 4 Jan 2023 11:20:42 +0100
Subject: [PATCH 563/569] Holid Bid Adapter: initial release  (#9371)

* Holid bid adapter

* Adjust test to various device sizes

* Include first party data from ortb2 object

* Remove trailing spaces in test
---
 modules/holidBidAdapter.js                | 170 ++++++++++++++++++++++
 modules/holidBidAdapter.md                |  36 +++++
 test/spec/modules/holidBidAdapter_spec.js | 165 +++++++++++++++++++++
 3 files changed, 371 insertions(+)
 create mode 100644 modules/holidBidAdapter.js
 create mode 100644 modules/holidBidAdapter.md
 create mode 100644 test/spec/modules/holidBidAdapter_spec.js

diff --git a/modules/holidBidAdapter.js b/modules/holidBidAdapter.js
new file mode 100644
index 00000000000..be5a7a044c3
--- /dev/null
+++ b/modules/holidBidAdapter.js
@@ -0,0 +1,170 @@
+import {
+  deepAccess,
+  getBidIdParameter,
+  isStr,
+  logMessage,
+  triggerPixel,
+} from '../src/utils.js'
+import * as events from '../src/events.js'
+import CONSTANTS from '../src/constants.json'
+import { BANNER } from '../src/mediaTypes.js'
+
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+
+const BIDDER_CODE = 'holid'
+const GVLID = 1177
+const ENDPOINT = 'https://helloworld.holid.io/openrtb2/auction'
+const COOKIE_SYNC_ENDPOINT = 'https://null.holid.io/sync.html'
+const TIME_TO_LIVE = 300
+let wurlMap = {}
+
+events.on(CONSTANTS.EVENTS.BID_WON, bidWonHandler)
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bid) {
+    return !!bid.params.adUnitID
+  },
+
+  buildRequests: function (validBidRequests, _bidderRequest) {
+    return validBidRequests.map((bid) => {
+      const requestData = {
+        ...bid.ortb2,
+        id: bid.auctionId,
+        imp: [getImp(bid)],
+      }
+
+      return {
+        method: 'POST',
+        url: ENDPOINT,
+        data: JSON.stringify(requestData),
+        bidId: bid.bidId,
+      }
+    })
+  },
+
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bidResponses = []
+
+    if (!serverResponse.body.seatbid) {
+      return []
+    }
+
+    serverResponse.body.seatbid.map((response) => {
+      response.bid.map((bid) => {
+        const requestId = bidRequest.bidId
+        const auctionId = bidRequest.auctionId
+        const wurl = deepAccess(bid, 'ext.prebid.events.win')
+        const bidResponse = {
+          requestId,
+          cpm: bid.price,
+          width: bid.w,
+          height: bid.h,
+          ad: bid.adm,
+          creativeId: bid.crid,
+          currency: serverResponse.body.cur,
+          netRevenue: true,
+          ttl: TIME_TO_LIVE,
+        }
+
+        addWurl({ auctionId, requestId, wurl })
+
+        bidResponses.push(bidResponse)
+      })
+    })
+
+    return bidResponses
+  },
+
+  getUserSyncs(optionsType, serverResponse, gdprConsent, uspConsent) {
+    if (!serverResponse || serverResponse.length === 0) {
+      return []
+    }
+
+    const syncs = []
+
+    if (optionsType.iframeEnabled) {
+      const queryParams = []
+
+      queryParams.push('bidders=' + getBidders(serverResponse))
+      queryParams.push('gdpr=' + +gdprConsent.gdprApplies)
+      queryParams.push('gdpr_consent=' + gdprConsent.consentString)
+      queryParams.push('usp_consent=' + (uspConsent || ''))
+
+      let strQueryParams = queryParams.join('&')
+
+      if (strQueryParams.length > 0) {
+        strQueryParams = '?' + strQueryParams
+      }
+
+      syncs.push({
+        type: 'iframe',
+        url: COOKIE_SYNC_ENDPOINT + strQueryParams + '&type=iframe',
+      })
+
+      return syncs
+    }
+  },
+}
+
+function getImp(bid) {
+  const imp = {
+    ext: {
+      prebid: {
+        storedrequest: {
+          id: getBidIdParameter('adUnitID', bid.params),
+        },
+      },
+    },
+  }
+  const sizes =
+    bid.sizes && !Array.isArray(bid.sizes[0]) ? [bid.sizes] : bid.sizes
+
+  if (deepAccess(bid, 'mediaTypes.banner')) {
+    imp.banner = {
+      format: sizes.map((size) => {
+        return { w: size[0], h: size[1] }
+      }),
+    }
+  }
+
+  return imp
+}
+
+function getBidders(serverResponse) {
+  const bidders = serverResponse
+    .map((res) => Object.keys(res.body.ext.responsetimemillis))
+    .flat(1)
+
+  return encodeURIComponent(JSON.stringify([...new Set(bidders)]))
+}
+
+function addWurl(auctionId, adId, wurl) {
+  if ([auctionId, adId].every(isStr)) {
+    wurlMap[`${auctionId}${adId}`] = wurl
+  }
+}
+
+function removeWurl(auctionId, adId) {
+  delete wurlMap[`${auctionId}${adId}`]
+}
+
+function getWurl(auctionId, adId) {
+  if ([auctionId, adId].every(isStr)) {
+    return wurlMap[`${auctionId}${adId}`]
+  }
+}
+
+function bidWonHandler(bid) {
+  const wurl = getWurl(bid.auctionId, bid.adId)
+  if (wurl) {
+    logMessage(`Invoking image pixel for wurl on BID_WIN: "${wurl}"`)
+    triggerPixel(wurl)
+    removeWurl(bid.auctionId, bid.adId)
+  }
+}
+
+registerBidder(spec)
diff --git a/modules/holidBidAdapter.md b/modules/holidBidAdapter.md
new file mode 100644
index 00000000000..1d83918c00a
--- /dev/null
+++ b/modules/holidBidAdapter.md
@@ -0,0 +1,36 @@
+# Overview
+
+```
+Module Name: Holid Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: richard@holid.se
+```
+
+# Description
+
+Currently module supports only banner mediaType.
+
+# Test Parameters
+
+## Sample Banner Ad Unit
+
+```js
+var adUnits = [
+  {
+    code: 'bannerAdUnit',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      },
+    },
+    bids: [
+      {
+        bidder: 'holid',
+        params: {
+          adUnitID: '12345',
+        },
+      },
+    ],
+  },
+]
+```
diff --git a/test/spec/modules/holidBidAdapter_spec.js b/test/spec/modules/holidBidAdapter_spec.js
new file mode 100644
index 00000000000..e18a5ac58f4
--- /dev/null
+++ b/test/spec/modules/holidBidAdapter_spec.js
@@ -0,0 +1,165 @@
+import { expect } from 'chai'
+import { spec } from 'modules/holidBidAdapter.js'
+
+describe('holidBidAdapterTests', () => {
+  const bidRequestData = {
+    bidder: 'holid',
+    adUnitCode: 'test-div',
+    bidId: 'bid-id',
+    auctionId: 'test-id',
+    params: { adUnitID: '12345' },
+    mediaTypes: { banner: {} },
+    sizes: [[300, 250]],
+    ortb2: {
+      site: {
+        publisher: {
+          domain: 'https://foo.bar',
+        }
+      },
+      regs: {
+        gdpr: 1,
+      },
+      user: {
+        ext: {
+          consent: 'G4ll0p1ng_Un1c0rn5',
+        }
+      },
+      device: {
+        h: 410,
+        w: 1860,
+      }
+    }
+  }
+
+  describe('isBidRequestValid', () => {
+    const bid = JSON.parse(JSON.stringify(bidRequestData))
+
+    it('should return true', () => {
+      expect(spec.isBidRequestValid(bid)).to.equal(true)
+    })
+
+    it('should return false when required params are not passed', () => {
+      const bid = JSON.parse(JSON.stringify(bidRequestData))
+      delete bid.params.adUnitID
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+    })
+  })
+
+  describe('buildRequests', () => {
+    const bid = JSON.parse(JSON.stringify(bidRequestData))
+    const request = spec.buildRequests([bid], bid)
+    const payload = JSON.parse(request[0].data)
+
+    it('should include ext in imp', () => {
+      expect(payload.imp[0].ext).to.exist
+      expect(payload.imp[0].ext).to.deep.equal({
+        prebid: { storedrequest: { id: '12345' } },
+      })
+    })
+
+    it('should include banner format in imp', () => {
+      expect(payload.imp[0].banner).to.exist
+      expect(payload.imp[0].banner).to.deep.equal({
+        format: [{ w: 300, h: 250 }],
+      })
+    })
+
+    it('should include ortb2 first party data', () => {
+      expect(payload.device.w).to.equal(1860)
+      expect(payload.device.h).to.equal(410)
+      expect(payload.user.ext.consent).to.equal('G4ll0p1ng_Un1c0rn5')
+      expect(payload.regs.gdpr).to.equal(1)
+    })
+  })
+
+  describe('interpretResponse', () => {
+    const serverResponse = {
+      body: {
+        id: 'test-id',
+        cur: 'USD',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: 'testbidid',
+                price: 0.4,
+                adm: 'test-ad',
+                adid: 789456,
+                crid: 1234,
+                w: 300,
+                h: 250,
+              },
+            ],
+          },
+        ],
+      },
+    }
+
+    const interpretedResponse = spec.interpretResponse(
+      serverResponse,
+      bidRequestData
+    )
+
+    it('should interpret response', () => {
+      expect(interpretedResponse[0].requestId).to.equal(bidRequestData.bidId)
+      expect(interpretedResponse[0].cpm).to.equal(
+        serverResponse.body.seatbid[0].bid[0].price
+      )
+      expect(interpretedResponse[0].ad).to.equal(
+        serverResponse.body.seatbid[0].bid[0].adm
+      )
+      expect(interpretedResponse[0].creativeId).to.equal(
+        serverResponse.body.seatbid[0].bid[0].crid
+      )
+      expect(interpretedResponse[0].width).to.equal(
+        serverResponse.body.seatbid[0].bid[0].w
+      )
+      expect(interpretedResponse[0].height).to.equal(
+        serverResponse.body.seatbid[0].bid[0].h
+      )
+      expect(interpretedResponse[0].currency).to.equal(serverResponse.body.cur)
+    })
+  })
+
+  describe('getUserSyncs', () => {
+    it('should return user sync', () => {
+      const optionsType = {
+        iframeEnabled: true,
+        pixelEnabled: true,
+      }
+      const serverResponse = [
+        {
+          body: {
+            ext: {
+              responsetimemillis: {
+                'test seat 1': 2,
+                'test seat 2': 1,
+              },
+            },
+          },
+        },
+      ]
+      const gdprConsent = {
+        gdprApplies: 1,
+        consentString: 'dkj49Sjmfjuj34as:12jaf90123hufabidfy9u23brfpoig',
+      }
+      const uspConsent = 'mkjvbiniwot4827obfoy8sdg8203gb'
+      const expectedUserSyncs = [
+        {
+          type: 'iframe',
+          url: 'https://null.holid.io/sync.html?bidders=%5B%22test%20seat%201%22%2C%22test%20seat%202%22%5D&gdpr=1&gdpr_consent=dkj49Sjmfjuj34as:12jaf90123hufabidfy9u23brfpoig&usp_consent=mkjvbiniwot4827obfoy8sdg8203gb&type=iframe',
+        },
+      ]
+
+      const userSyncs = spec.getUserSyncs(
+        optionsType,
+        serverResponse,
+        gdprConsent,
+        uspConsent
+      )
+
+      expect(userSyncs).to.deep.equal(expectedUserSyncs)
+    })
+  })
+})

From 1238d30cc986d3ac9c378329dc4e7f4bb37a9da7 Mon Sep 17 00:00:00 2001
From: Torsten <torsten.dunkel@goldbach.com>
Date: Thu, 5 Jan 2023 12:16:41 +0100
Subject: [PATCH 564/569] Appnexus Bid Adapter : add video data from the
 request to the bid response (#9396)

* Appnexus adapter: add video data from the request to the bid response

* kick off tests

* remove change

Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
---
 modules/appnexusBidAdapter.js                | 1 +
 test/spec/modules/appnexusBidAdapter_spec.js | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index 919831b8515..7465ab15780 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -731,6 +731,7 @@ function newBid(serverBid, rtbBid, bidderRequest) {
       displayUrl: nativeAd.displayurl,
       clickTrackers: nativeAd.link.click_trackers,
       impressionTrackers: nativeAd.impression_trackers,
+      video: nativeAd.video,
       javascriptTrackers: jsTrackers
     };
     if (nativeAd.main_img) {
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 1ab8feceaeb..bae2417c278 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -1630,7 +1630,10 @@ describe('AppNexusAdapter', function () {
           'phone': '1234567890',
           'address': '28 W 23rd St, New York, NY 10010',
           'privacy_link': 'https://appnexus.com/?url=privacy_url',
-          'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=;css_selector=.pb-click;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>'
+          'javascriptTrackers': '<script type=\'text/javascript\' async=\'true\' src=\'https://cdn.adnxs.com/v/s/152/trk.js#v;vk=appnexus.com-omid;tv=native1-18h;dom_id=;css_selector=.pb-click;st=0;d=1x1;vc=iab;vid_ccr=1;tag_id=13232354;cb=https%3A%2F%2Fams1-ib.adnxs.com%2Fvevent%3Freferrer%3Dhttps253A%252F%252Ftestpages-pmahe.tp.adnxs.net%252F01_basic_single%26e%3DwqT_3QLNB6DNAwAAAwDWAAUBCLfl_-MFEMStk8u3lPTjRxih88aF0fq_2QsqNgkAAAECCCRAEQEHEAAAJEAZEQkAIREJACkRCQAxEQmoMOLRpwY47UhA7UhIAlCDy74uWJzxW2AAaM26dXjzjwWAAQGKAQNVU0SSAQEG8FCYAQGgAQGoAQGwAQC4AQHAAQTIAQLQAQDYAQDgAQDwAQCKAjt1ZignYScsIDI1Mjk4ODUsIDE1NTE4ODkwNzkpO3VmKCdyJywgOTc0OTQ0MDM2HgDwjZIC8QEha0RXaXBnajgtTHdLRUlQTHZpNFlBQ0NjOFZzd0FEZ0FRQVJJN1VoUTR0R25CbGdBWU1rR2FBQndMSGlrTDRBQlVvZ0JwQy1RQVFHWUFRR2dBUUdvQVFPd0FRQzVBZk90YXFRQUFDUkF3UUh6cldxa0FBQWtRTWtCbWo4dDA1ZU84VF9aQVFBQUEBAyRQQV80QUVBOVFFAQ4sQW1BSUFvQUlBdFFJBRAAdg0IeHdBSUF5QUlBNEFJQTZBSUEtQUlBZ0FNQm1BTUJxQVAFzIh1Z01KUVUxVE1UbzBNekl3NEFPVENBLi6aAmEhUXcxdGNRagUoEfQkblBGYklBUW9BRAl8AEEBqAREbzJEABRRSk1JU1EBGwRBQQGsAFURDAxBQUFXHQzwWNgCAOACrZhI6gIzaHR0cDovL3Rlc3RwYWdlcy1wbWFoZS50cC5hZG54cy5uZXQvMDFfYmFzaWNfc2luZ2xl8gITCg9DVVNUT01fTU9ERUxfSUQSAPICGgoWMhYAPExFQUZfTkFNRRIA8gIeCho2HQAIQVNUAT7wnElGSUVEEgCAAwCIAwGQAwCYAxegAwGqAwDAA-CoAcgDANgD8ao-4AMA6AMA-AMBgAQAkgQNL3V0L3YzL3ByZWJpZJgEAKIECjEwLjIuMTIuMzioBIqpB7IEDggAEAEYACAAKAAwADgCuAQAwAQAyAQA0gQOOTMyNSNBTVMxOjQzMjDaBAIIAeAEAfAEg8u-LogFAZgFAKAF______8BAxgBwAUAyQUABQEU8D_SBQkJBQt8AAAA2AUB4AUB8AWZ9CH6BQQIABAAkAYBmAYAuAYAwQYBITAAAPA_yAYA2gYWChAAOgEAGBAAGADgBgw.%26s%3D971dce9d49b6bee447c8a58774fb30b40fe98171;ts=1551889079;cet=0;cecb=\'></script>',
+          'video': {
+            'content': '<?xml version=\"1.0\"></xml>'
+          }
         };
         let bidderRequest = {
           bids: [{
@@ -1644,6 +1647,7 @@ describe('AppNexusAdapter', function () {
         expect(result[0].native.body).to.equal('Cool description great stuff');
         expect(result[0].native.cta).to.equal('Do it');
         expect(result[0].native.image.url).to.equal('https://cdn.adnxs.com/img.png');
+        expect(result[0].native.video.content).to.equal('<?xml version=\"1.0\"></xml>');
       });
     }
 

From 978926d8e318985c04d5c5cc79851a32efb5ffc7 Mon Sep 17 00:00:00 2001
From: Olivier <osazos@adagio.io>
Date: Thu, 5 Jan 2023 17:22:43 +0100
Subject: [PATCH 565/569] AdagioBidAdapter: Remove some params (#9398)

---
 modules/adagioBidAdapter.js                |  4 ---
 modules/adagioBidAdapter.md                | 26 +++----------------
 test/spec/modules/adagioBidAdapter_spec.js | 29 +---------------------
 3 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index 4f86a914982..12fd50c6636 100644
--- a/modules/adagioBidAdapter.js
+++ b/modules/adagioBidAdapter.js
@@ -669,10 +669,8 @@ function autoFillParams(bid) {
   }
 
   // extra params
-  setExtraParam(bid, 'environment');
   setExtraParam(bid, 'pagetype');
   setExtraParam(bid, 'category');
-  setExtraParam(bid, 'subcategory');
 }
 
 function getPageDimensions() {
@@ -1094,8 +1092,6 @@ export const spec = {
               bidObj.placement = bidReq.params.placement;
               bidObj.pagetype = bidReq.params.pagetype;
               bidObj.category = bidReq.params.category;
-              bidObj.subcategory = bidReq.params.subcategory;
-              bidObj.environment = bidReq.params.environment;
             }
             bidResponses.push(bidObj);
           });
diff --git a/modules/adagioBidAdapter.md b/modules/adagioBidAdapter.md
index 9b48caa8233..b804a72fea9 100644
--- a/modules/adagioBidAdapter.md
+++ b/modules/adagioBidAdapter.md
@@ -17,12 +17,10 @@ Below, the list of Adagio params and where they can be set.
 | Param name | Global config | AdUnit config |
 | ---------- | ------------- | ------------- |
 | siteId | x |
-| organizationId (obsolete) | | x
-| site (obsolete) | | x
+| organizationId * | | x
+| site * | | x
 | pagetype | x | x
-| environment | x | x
 | category | x | x
-| subcategory | x | x
 | useAdUnitCodeAsAdUnitElementId | x | x
 | useAdUnitCodeAsPlacement | x | x
 | placement | | x
@@ -31,6 +29,8 @@ Below, the list of Adagio params and where they can be set.
 | video | | x
 | native | | x
 
+_* These params are deprecated in favor the Global configuration setup, see below._
+
 ### Global configuration
 
 The global configuration is used to store params once instead of duplicate them to each adUnit. The values will be used as "params" in the ad-request.
@@ -49,9 +49,7 @@ pbjs.setConfig({
     // - underscores `_`
     // Also, each param can have at most 50 unique active values (case-insensitive).
     pagetype: 'article', // Highly recommended. The pagetype describes what kind of content will be present in the page.
-    environment: 'mobile', // Recommended. Environment where the page is displayed.
     category: 'sport', // Recommended. Category of the content displayed in the page.
-    subcategory: 'handball', // Optional. Subcategory of the content displayed in the page.
     useAdUnitCodeAsAdUnitElementId: false, // Optional. Use it by-pass adUnitElementId and use the adUnit code as value
     useAdUnitCodeAsPlacement: false, // Optional. Use it to by-pass placement and use the adUnit code as value
   },
@@ -62,9 +60,7 @@ pbjs.setConfig({
 
 Adagio will use FPD data as fallback for the params below:
 - pagetype
-- environment
 - category
-- subcategory
 
 If the FPD value is an array, the 1st value of this array will be used.
 
@@ -107,9 +103,7 @@ var adUnits = [
     debug: true,
     adagio: {
       pagetype: 'article',
-      environment: 'mobile',
       category: 'sport',
-      subcategory: 'handball',
       useAdUnitCodeAsAdUnitElementId: false,
       useAdUnitCodeAsPlacement: false,
     }
@@ -208,12 +202,6 @@ var adUnits = [
             return bidResponse.site;
           }
         },
-        {
-          key: "environment",
-          val: function (bidResponse) {
-            return bidResponse.environment;
-          }
-        },
         {
           key: "placement",
           val: function (bidResponse) {
@@ -231,12 +219,6 @@ var adUnits = [
           val: function (bidResponse) {
             return bidResponse.category;
           }
-        },
-        {
-          key: "subcategory",
-          val: function (bidResponse) {
-            return bidResponse.subcategory;
-          }
         }
       ]
     }
diff --git a/test/spec/modules/adagioBidAdapter_spec.js b/test/spec/modules/adagioBidAdapter_spec.js
index 436d481c4a1..8abdc621922 100644
--- a/test/spec/modules/adagioBidAdapter_spec.js
+++ b/test/spec/modules/adagioBidAdapter_spec.js
@@ -149,10 +149,8 @@ describe('Adagio bid adapter', () => {
         site: {
           ext: {
             data: {
-              environment: 'desktop',
               pagetype: 'abc',
-              category: ['cat1', 'cat2', 'cat3'],
-              subcategory: []
+              category: ['cat1', 'cat2', 'cat3']
             }
           }
         }
@@ -167,17 +165,11 @@ describe('Adagio bid adapter', () => {
         return utils.deepAccess(config, key);
       });
 
-      setExtraParam(bid, 'environment');
-      expect(bid.params.environment).to.equal('desktop');
-
       setExtraParam(bid, 'pagetype')
       expect(bid.params.pagetype).to.equal('article');
 
       setExtraParam(bid, 'category');
       expect(bid.params.category).to.equal('cat1'); // Only the first value is kept
-
-      setExtraParam(bid, 'subcategory');
-      expect(bid.params.subcategory).to.be.undefined;
     });
 
     it('should use the adUnit param unit if defined', function() {
@@ -784,8 +776,6 @@ describe('Adagio bid adapter', () => {
             adUnitElementId: 'gpt-adunit-code',
             pagetype: 'ARTICLE',
             category: 'NEWS',
-            subcategory: 'SPORT',
-            environment: 'desktop',
             supportIObs: true
           },
           adUnitCode: 'adunit-code',
@@ -833,8 +823,6 @@ describe('Adagio bid adapter', () => {
         site: 'SITE-NAME',
         pagetype: 'ARTICLE',
         category: 'NEWS',
-        subcategory: 'SPORT',
-        environment: 'desktop',
         aDomain: ['advertiser.com'],
         mediaType: 'banner',
         meta: {
@@ -868,8 +856,6 @@ describe('Adagio bid adapter', () => {
         site: 'SITE-NAME',
         pagetype: 'ARTICLE',
         category: 'NEWS',
-        subcategory: 'SPORT',
-        environment: 'desktop',
         aDomain: ['advertiser.com'],
         mediaType: 'banner',
         meta: {
@@ -1392,19 +1378,6 @@ describe('Adagio bid adapter', () => {
   });
 
   describe.skip('optional params auto detection', function() {
-    it('should auto detect environment', function() {
-      const getDeviceStub = sandbox.stub(_features, 'getDevice');
-
-      getDeviceStub.returns(5);
-      expect(adagio.autoDetectEnvironment()).to.eq('tablet');
-
-      getDeviceStub.returns(4);
-      expect(adagio.autoDetectEnvironment()).to.eq('mobile');
-
-      getDeviceStub.returns(2);
-      expect(adagio.autoDetectEnvironment()).to.eq('desktop');
-    });
-
     it('should auto detect adUnitElementId when GPT is used', function() {
       sandbox.stub(utils, 'getGptSlotInfoForAdUnitCode').withArgs('banner').returns({divId: 'gpt-banner'});
       expect(adagio.autoDetectAdUnitElementId('banner')).to.eq('gpt-banner');

From 408221b84507cb130de9ef647f021f5f75d05070 Mon Sep 17 00:00:00 2001
From: couchcrew-thomas <mail@feedad.com>
Date: Thu, 5 Jan 2023 17:34:58 +0100
Subject: [PATCH 566/569] Feedad Bid Adapter: added new bid request parameters
 (#9397)

* added file scaffold

* added isBidRequestValid implementation

* added local prototype of ad integration

* added implementation for placement ID validation

* fixed video context filter

* applied lint to feedad bid adapter

* added unit test for bid request validation

* added buildRequest unit test

* added unit tests for timeout and bid won callbacks

* updated bid request to FeedAd API

* added parsing of feedad api bid response

* added transmisison of tracking events to FeedAd Api

* code cleanup

* updated feedad unit tests for buildRequest method

* added unit tests for event tracking implementation

* added unit test for interpretResponse method

* added adapter documentation

* added dedicated feedad example page

* updated feedad adapter to use live system

* updated FeedAd adapter placement ID regex

* removed groups from FeedAd adapter placement ID regex

* removed dedicated feedad example page

* updated imports in FeedAd adapter file to use relative paths

* updated FeedAd adapter unit test to use sinon.useFakeXMLHttpRequest()

* added GDPR fields to the FeedAd bid request

* removed video from supported media types of the FeedAd adapter

* increased version code of FeedAd adapter to 1.0.2

* removed unnecessary check of bidder request

* fixed unit test testing for old FeedAd version

* removed video media type example from documentation file

* added gvlid to FeedAd adapter

* added decoration parameter to adapter documentation

* added pass through of additional bid parameters

* added user syncs to FeedAd bid adapter

* increased FeedAd bid adapter version

* lint pass over FeedAd bid adapter

* fixed parsing of user syncs from server response

* increased FeedAd bid adapter version

* fixed version code in test file

* added adapter and prebid version to bid request parameters

* removed TODO item

* added missing test case for user syncs

* increased adapter version to 1.0.5
---
 modules/feedadBidAdapter.js                | 12 ++++++-----
 test/spec/modules/feedadBidAdapter_spec.js | 24 +++++++++++++++++++++-
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/modules/feedadBidAdapter.js b/modules/feedadBidAdapter.js
index ef2e57c553f..7b684efab3c 100644
--- a/modules/feedadBidAdapter.js
+++ b/modules/feedadBidAdapter.js
@@ -7,7 +7,7 @@ import {ajax} from '../src/ajax.js';
  * Version of the FeedAd bid adapter
  * @type {string}
  */
-const VERSION = '1.0.4';
+const VERSION = '1.0.5';
 
 /**
  * @typedef {object} FeedAdApiBidRequest
@@ -16,7 +16,8 @@ const VERSION = '1.0.4';
  * @property {number} ad_type
  * @property {string} client_token
  * @property {string} placement_id
- * @property {string} sdk_version
+ * @property {string} prebid_adapter_version
+ * @property {string} prebid_sdk_version
  * @property {boolean} app_hybrid
  *
  * @property {string} [app_bundle_id]
@@ -181,7 +182,8 @@ function createApiBidRParams(request) {
     ad_type: 0,
     client_token: request.params.clientToken,
     placement_id: request.params.placementId,
-    sdk_version: `prebid_${VERSION}`,
+    prebid_adapter_version: VERSION,
+    prebid_sdk_version: '$prebid.version$',
     app_hybrid: false,
   });
 }
@@ -207,7 +209,6 @@ function buildRequests(validBidRequests, bidderRequest) {
     })
   });
   data.bids.forEach(bid => BID_METADATA[bid.bidId] = {
-    // TODO: is 'page' the right value here?
     referer: data.refererInfo.page,
     transactionId: bid.transactionId
   });
@@ -266,7 +267,8 @@ function createTrackingParams(data, klass) {
     prebid_bid_id: bidId,
     prebid_transaction_id: transactionId,
     referer,
-    sdk_version: VERSION
+    prebid_adapter_version: VERSION,
+    prebid_sdk_version: '$prebid.version$',
   };
 }
 
diff --git a/test/spec/modules/feedadBidAdapter_spec.js b/test/spec/modules/feedadBidAdapter_spec.js
index 6aed670a563..8cbd6907890 100644
--- a/test/spec/modules/feedadBidAdapter_spec.js
+++ b/test/spec/modules/feedadBidAdapter_spec.js
@@ -4,6 +4,7 @@ import {BANNER, NATIVE, VIDEO} from '../../../src/mediaTypes.js';
 import {server} from 'test/mocks/xhr.js';
 
 const CODE = 'feedad';
+const EXPECTED_ADAPTER_VERSION = '1.0.5';
 
 describe('FeedAdAdapter', function () {
   describe('Public API', function () {
@@ -300,6 +301,20 @@ describe('FeedAdAdapter', function () {
       expect(result.data.gdprApplies).to.equal(request.gdprConsent.gdprApplies);
       expect(result.data.consentIabTcf).to.equal(request.gdprConsent.consentString);
     });
+    it('should include adapter and prebid version', function () {
+      let bid = {
+        code: 'feedad',
+        mediaTypes: {
+          banner: {
+            sizes: [[320, 250]]
+          }
+        },
+        params: {clientToken: 'clientToken', placementId: 'placement-id'}
+      };
+      let result = spec.buildRequests([bid], bidderRequest);
+      expect(result.data.bids[0].params.prebid_adapter_version).to.equal(EXPECTED_ADAPTER_VERSION);
+      expect(result.data.bids[0].params.prebid_sdk_version).to.equal('$prebid.version$');
+    });
   });
 
   describe('interpretResponse', function () {
@@ -482,6 +497,12 @@ describe('FeedAdAdapter', function () {
         expect(() => spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, it)).not.to.throw;
       });
     });
+
+    it('should return empty array if the body extension is null', function () {
+      const response = mockServerResponse({ext: null});
+      const result = spec.getUserSyncs({iframeEnabled: true, pixelEnabled: true}, response);
+      expect(result).to.deep.equal([]);
+    });
   });
 
   describe('event tracking calls', function () {
@@ -617,7 +638,8 @@ describe('FeedAdAdapter', function () {
             prebid_bid_id: bidId,
             prebid_transaction_id: transactionId,
             referer,
-            sdk_version: '1.0.4'
+            prebid_adapter_version: EXPECTED_ADAPTER_VERSION,
+            prebid_sdk_version: '$prebid.version$',
           };
           subject(data);
           expect(server.requests.length).to.equal(1);

From 768c1d3c59e855db01d6135efab220cbdc749b39 Mon Sep 17 00:00:00 2001
From: Christoph <29540638+kippsterr@users.noreply.github.com>
Date: Fri, 6 Jan 2023 13:07:51 +0100
Subject: [PATCH 567/569] Yieldlab Bid Adapter: code style updates (#9386)

* Consistently add trailing comma and semicolons everywhere

* Use shorthand object property function definition

* Fix typo and update type hint
---
 modules/yieldlabBidAdapter.js                | 270 ++++----
 test/spec/modules/yieldlabBidAdapter_spec.js | 610 +++++++++----------
 2 files changed, 440 insertions(+), 440 deletions(-)

diff --git a/modules/yieldlabBidAdapter.js b/modules/yieldlabBidAdapter.js
index 6e4f6644140..cadeb9c1300 100644
--- a/modules/yieldlabBidAdapter.js
+++ b/modules/yieldlabBidAdapter.js
@@ -1,17 +1,17 @@
-import { _each, deepAccess, isArray, isFn, isPlainObject, timestamp } from '../src/utils.js'
-import { registerBidder } from '../src/adapters/bidderFactory.js'
-import { find } from '../src/polyfill.js'
-import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js'
-import { Renderer } from '../src/Renderer.js'
+import { _each, deepAccess, isArray, isFn, isPlainObject, timestamp } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { find } from '../src/polyfill.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { Renderer } from '../src/Renderer.js';
 import { convertOrtbRequestToProprietaryNative } from '../src/native.js';
 
-const ENDPOINT = 'https://ad.yieldlab.net'
-const BIDDER_CODE = 'yieldlab'
-const BID_RESPONSE_TTL_SEC = 300
-const CURRENCY_CODE = 'EUR'
-const OUTSTREAMPLAYER_URL = 'https://ad.adition.com/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event'
-const GVLID = 70
-const DIMENSION_SIGN = 'x'
+const ENDPOINT = 'https://ad.yieldlab.net';
+const BIDDER_CODE = 'yieldlab';
+const BID_RESPONSE_TTL_SEC = 300;
+const CURRENCY_CODE = 'EUR';
+const OUTSTREAMPLAYER_URL = 'https://ad.adition.com/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event';
+const GVLID = 70;
+const DIMENSION_SIGN = 'x';
 
 export const spec = {
   code: BIDDER_CODE,
@@ -22,11 +22,11 @@ export const spec = {
    * @param {object} bid
    * @returns {boolean}
    */
-  isBidRequestValid: function (bid) {
+  isBidRequestValid(bid) {
     if (bid && bid.params && bid.params.adslotId && bid.params.supplyId) {
-      return true
+      return true;
     }
-    return false
+    return false;
   },
 
   /**
@@ -35,85 +35,85 @@ export const spec = {
    * @param [bidderRequest]
    * @returns {ServerRequest|ServerRequest[]}
    */
-  buildRequests: function (validBidRequests, bidderRequest) {
+  buildRequests(validBidRequests, bidderRequest) {
     // convert Native ORTB definition to old-style prebid native definition
     validBidRequests = convertOrtbRequestToProprietaryNative(validBidRequests);
 
-    const adslotIds = []
+    const adslotIds = [];
     const adslotSizes = [];
     const adslotFloors = [];
-    const timestamp = Date.now()
+    const timestamp = Date.now();
     const query = {
       ts: timestamp,
-      json: true
-    }
+      json: true,
+    };
 
     _each(validBidRequests, function (bid) {
-      adslotIds.push(bid.params.adslotId)
-      const sizes = extractSizes(bid)
+      adslotIds.push(bid.params.adslotId);
+      const sizes = extractSizes(bid);
       if (sizes.length > 0) {
-        adslotSizes.push(bid.params.adslotId + ':' + sizes.join('|'))
+        adslotSizes.push(bid.params.adslotId + ':' + sizes.join('|'));
       }
       if (bid.params.extId) {
         query.id = bid.params.extId;
       }
       if (bid.params.targeting) {
-        query.t = createTargetingString(bid.params.targeting)
+        query.t = createTargetingString(bid.params.targeting);
       }
       if (bid.userIdAsEids && Array.isArray(bid.userIdAsEids)) {
-        query.ids = createUserIdString(bid.userIdAsEids)
-        query.atypes = createUserIdAtypesString(bid.userIdAsEids)
+        query.ids = createUserIdString(bid.userIdAsEids);
+        query.atypes = createUserIdAtypesString(bid.userIdAsEids);
       }
       if (bid.params.customParams && isPlainObject(bid.params.customParams)) {
         for (const prop in bid.params.customParams) {
-          query[prop] = bid.params.customParams[prop]
+          query[prop] = bid.params.customParams[prop];
         }
       }
       if (bid.schain && isPlainObject(bid.schain) && Array.isArray(bid.schain.nodes)) {
-        query.schain = createSchainString(bid.schain)
+        query.schain = createSchainString(bid.schain);
       }
 
-      const iabContent = getContentObject(bid)
+      const iabContent = getContentObject(bid);
       if (iabContent) {
-        query.iab_content = createIabContentString(iabContent)
+        query.iab_content = createIabContentString(iabContent);
       }
-      const floor = getBidFloor(bid, sizes)
+      const floor = getBidFloor(bid, sizes);
       if (floor) {
         adslotFloors.push(bid.params.adslotId + ':' + floor);
       }
-    })
+    });
 
     if (bidderRequest) {
       if (bidderRequest.refererInfo && bidderRequest.refererInfo.page) {
         // TODO: is 'page' the right value here?
-        query.pubref = bidderRequest.refererInfo.page
+        query.pubref = bidderRequest.refererInfo.page;
       }
 
       if (bidderRequest.gdprConsent) {
-        query.gdpr = (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : true
+        query.gdpr = (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : true;
         if (query.gdpr) {
-          query.consent = bidderRequest.gdprConsent.consentString
+          query.consent = bidderRequest.gdprConsent.consentString;
         }
       }
     }
 
-    const adslots = adslotIds.join(',')
+    const adslots = adslotIds.join(',');
     if (adslotSizes.length > 0) {
-      query.sizes = adslotSizes.join(',')
+      query.sizes = adslotSizes.join(',');
     }
 
     if (adslotFloors.length > 0) {
-      query.floor = adslotFloors.join(',')
+      query.floor = adslotFloors.join(',');
     }
 
-    const queryString = createQueryString(query)
+    const queryString = createQueryString(query);
 
     return {
       method: 'GET',
       url: `${ENDPOINT}/yp/${adslots}?${queryString}`,
       validBidRequests: validBidRequests,
-      queryParams: query
-    }
+      queryParams: query,
+    };
   },
 
   /**
@@ -122,29 +122,29 @@ export const spec = {
    * @param {BidRequest} originalBidRequest
    * @returns {Bid[]}
    */
-  interpretResponse: function (serverResponse, originalBidRequest) {
-    const bidResponses = []
-    const timestamp = Date.now()
-    const reqParams = originalBidRequest.queryParams
+  interpretResponse(serverResponse, originalBidRequest) {
+    const bidResponses = [];
+    const timestamp = Date.now();
+    const reqParams = originalBidRequest.queryParams;
 
     originalBidRequest.validBidRequests.forEach(function (bidRequest) {
       if (!serverResponse.body) {
-        return
+        return;
       }
 
       const matchedBid = find(serverResponse.body, function (bidResponse) {
-        return bidRequest.params.adslotId == bidResponse.id
-      })
+        return bidRequest.params.adslotId == bidResponse.id;
+      });
 
       if (matchedBid) {
-        const adUnitSize = bidRequest.sizes.length === 2 && !isArray(bidRequest.sizes[0]) ? bidRequest.sizes : bidRequest.sizes[0]
-        const adSize = bidRequest.params.adSize !== undefined ? parseSize(bidRequest.params.adSize) : (matchedBid.adsize !== undefined) ? parseSize(matchedBid.adsize) : adUnitSize
-        const extId = bidRequest.params.extId !== undefined ? '&id=' + bidRequest.params.extId : ''
-        const adType = matchedBid.adtype !== undefined ? matchedBid.adtype : ''
-        const gdprApplies = reqParams.gdpr ? '&gdpr=' + reqParams.gdpr : ''
-        const gdprConsent = reqParams.consent ? '&consent=' + reqParams.consent : ''
-        const pvId = matchedBid.pvid !== undefined ? '&pvid=' + matchedBid.pvid : ''
-        const iabContent = reqParams.iab_content ? '&iab_content=' + reqParams.iab_content : ''
+        const adUnitSize = bidRequest.sizes.length === 2 && !isArray(bidRequest.sizes[0]) ? bidRequest.sizes : bidRequest.sizes[0];
+        const adSize = bidRequest.params.adSize !== undefined ? parseSize(bidRequest.params.adSize) : (matchedBid.adsize !== undefined) ? parseSize(matchedBid.adsize) : adUnitSize;
+        const extId = bidRequest.params.extId !== undefined ? '&id=' + bidRequest.params.extId : '';
+        const adType = matchedBid.adtype !== undefined ? matchedBid.adtype : '';
+        const gdprApplies = reqParams.gdpr ? '&gdpr=' + reqParams.gdpr : '';
+        const gdprConsent = reqParams.consent ? '&consent=' + reqParams.consent : '';
+        const pvId = matchedBid.pvid !== undefined ? '&pvid=' + matchedBid.pvid : '';
+        const iabContent = reqParams.iab_content ? '&iab_content=' + reqParams.iab_content : '';
 
         const bidResponse = {
           requestId: bidRequest.bidId,
@@ -159,38 +159,38 @@ export const spec = {
           referrer: '',
           ad: `<script src="${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}${pvId}${iabContent}"></script>`,
           meta: {
-            advertiserDomains: (matchedBid.advertiser) ? matchedBid.advertiser : 'n/a'
-          }
-        }
+            advertiserDomains: (matchedBid.advertiser) ? matchedBid.advertiser : 'n/a',
+          },
+        };
 
         if (isVideo(bidRequest, adType)) {
-          const playersize = getPlayerSize(bidRequest)
+          const playersize = getPlayerSize(bidRequest);
           if (playersize) {
-            bidResponse.width = playersize[0]
-            bidResponse.height = playersize[1]
+            bidResponse.width = playersize[0];
+            bidResponse.height = playersize[1];
           }
-          bidResponse.mediaType = VIDEO
-          bidResponse.vastUrl = `${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}${pvId}${iabContent}`
+          bidResponse.mediaType = VIDEO;
+          bidResponse.vastUrl = `${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}${pvId}${iabContent}`;
           if (isOutstream(bidRequest)) {
             const renderer = Renderer.install({
               id: bidRequest.bidId,
               url: OUTSTREAMPLAYER_URL,
-              loaded: false
-            })
-            renderer.setRender(outstreamRender)
-            bidResponse.renderer = renderer
+              loaded: false,
+            });
+            renderer.setRender(outstreamRender);
+            bidResponse.renderer = renderer;
           }
         }
 
         if (isNative(bidRequest, adType)) {
           // there may be publishers still rely on it
-          const url = `${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}${pvId}`
-          bidResponse.adUrl = url
-          bidResponse.mediaType = NATIVE
-          const nativeImageAssetObj = find(matchedBid.native.assets, e => e.id === 2)
+          const url = `${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}${pvId}`;
+          bidResponse.adUrl = url;
+          bidResponse.mediaType = NATIVE;
+          const nativeImageAssetObj = find(matchedBid.native.assets, e => e.id === 2);
           const nativeImageAsset = nativeImageAssetObj ? nativeImageAssetObj.img : { url: '', w: 0, h: 0 };
-          const nativeTitleAsset = find(matchedBid.native.assets, e => e.id === 1)
-          const nativeBodyAsset = find(matchedBid.native.assets, e => e.id === 3)
+          const nativeTitleAsset = find(matchedBid.native.assets, e => e.id === 1);
+          const nativeBodyAsset = find(matchedBid.native.assets, e => e.id === 3);
           bidResponse.native = {
             title: nativeTitleAsset ? nativeTitleAsset.title.text : '',
             body: nativeBodyAsset ? nativeBodyAsset.data.value : '',
@@ -204,10 +204,10 @@ export const spec = {
           };
         }
 
-        bidResponses.push(bidResponse)
+        bidResponses.push(bidResponse);
       }
-    })
-    return bidResponses
+    });
+    return bidResponses;
   },
 
   /**
@@ -219,13 +219,13 @@ export const spec = {
    * @param {string} uspConsent Is the US Privacy Consent string.
    * @return {UserSync[]} The user syncs which should be dropped.
    */
-  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
+  getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
     const syncs = [];
 
     if (syncOptions.iframeEnabled) {
       const params = [];
       params.push(`ts=${timestamp()}`);
-      params.push(`type=h`)
+      params.push(`type=h`);
       if (gdprConsent && (typeof gdprConsent.gdprApplies === 'boolean')) {
         params.push(`gdpr=${Number(gdprConsent.gdprApplies)}`);
       }
@@ -234,12 +234,12 @@ export const spec = {
       }
       syncs.push({
         type: 'iframe',
-        url: `${ENDPOINT}/d/6846326/766/2x2?${params.join('&')}`
+        url: `${ENDPOINT}/d/6846326/766/2x2?${params.join('&')}`,
       });
     }
 
     return syncs;
-  }
+  },
 };
 
 /**
@@ -249,7 +249,7 @@ export const spec = {
  * @returns {Boolean}
  */
 function isVideo(format, adtype) {
-  return deepAccess(format, 'mediaTypes.video') && adtype.toLowerCase() === 'video'
+  return deepAccess(format, 'mediaTypes.video') && adtype.toLowerCase() === 'video';
 }
 
 /**
@@ -259,7 +259,7 @@ function isVideo(format, adtype) {
  * @returns {Boolean}
  */
 function isNative(format, adtype) {
-  return deepAccess(format, 'mediaTypes.native') && adtype.toLowerCase() === 'native'
+  return deepAccess(format, 'mediaTypes.native') && adtype.toLowerCase() === 'native';
 }
 
 /**
@@ -268,8 +268,8 @@ function isNative(format, adtype) {
  * @returns {Boolean}
  */
 function isOutstream(format) {
-  const context = deepAccess(format, 'mediaTypes.video.context')
-  return (context === 'outstream')
+  const context = deepAccess(format, 'mediaTypes.video.context');
+  return (context === 'outstream');
 }
 
 /**
@@ -278,30 +278,30 @@ function isOutstream(format) {
  * @returns {Array}
  */
 function getPlayerSize(format) {
-  const playerSize = deepAccess(format, 'mediaTypes.video.playerSize')
-  return (playerSize && isArray(playerSize[0])) ? playerSize[0] : playerSize
+  const playerSize = deepAccess(format, 'mediaTypes.video.playerSize');
+  return (playerSize && isArray(playerSize[0])) ? playerSize[0] : playerSize;
 }
 
 /**
- * Expands a 'WxH' string as a 2-element [W, H] array
+ * Expands a 'WxH' string to a 2-element [W, H] array
  * @param {String} size
  * @returns {Array}
  */
 function parseSize(size) {
-  return size.split(DIMENSION_SIGN).map(Number)
+  return size.split(DIMENSION_SIGN).map(Number);
 }
 
 /**
  * Creates a string out of an array of eids with source and uid
- * @param {Array} eids
+ * @param {Array.<{source: String, uids: Array.<{id: String, atype: Number, ext: Object}>}>} eids
  * @returns {String}
  */
 function createUserIdString(eids) {
-  const str = []
+  const str = [];
   for (let i = 0; i < eids.length; i++) {
-    str.push(eids[i].source + ':' + eids[i].uids[0].id)
+    str.push(eids[i].source + ':' + eids[i].uids[0].id);
   }
-  return str.join(',')
+  return str.join(',');
 }
 
 /**
@@ -325,18 +325,18 @@ function createUserIdAtypesString(eids) {
  * @returns {String}
  */
 function createQueryString(obj) {
-  const str = []
+  const str = [];
   for (const p in obj) {
     if (obj.hasOwnProperty(p)) {
-      const val = obj[p]
+      const val = obj[p];
       if (p !== 'schain' && p !== 'iab_content') {
-        str.push(encodeURIComponent(p) + '=' + encodeURIComponent(val))
+        str.push(encodeURIComponent(p) + '=' + encodeURIComponent(val));
       } else {
-        str.push(p + '=' + val)
+        str.push(p + '=' + val);
       }
     }
   }
-  return str.join('&')
+  return str.join('&');
 }
 
 /**
@@ -345,15 +345,15 @@ function createQueryString(obj) {
  * @returns {String}
  */
 function createTargetingString(obj) {
-  const str = []
+  const str = [];
   for (const p in obj) {
     if (obj.hasOwnProperty(p)) {
-      const key = p
-      const val = obj[p]
-      str.push(key + '=' + val)
+      const key = p;
+      const val = obj[p];
+      str.push(key + '=' + val);
     }
   }
-  return str.join('&')
+  return str.join('&');
 }
 
 /**
@@ -362,13 +362,13 @@ function createTargetingString(obj) {
  * @returns {String}
  */
 function createSchainString(schain) {
-  const ver = schain.ver || ''
-  const complete = (schain.complete === 1 || schain.complete === 0) ? schain.complete : ''
-  const keys = ['asi', 'sid', 'hp', 'rid', 'name', 'domain', 'ext']
+  const ver = schain.ver || '';
+  const complete = (schain.complete === 1 || schain.complete === 0) ? schain.complete : '';
+  const keys = ['asi', 'sid', 'hp', 'rid', 'name', 'domain', 'ext'];
   const nodesString = schain.nodes.reduce((acc, node) => {
-    return acc += `!${keys.map(key => node[key] ? encodeURIComponentWithBangIncluded(node[key]) : '').join(',')}`
-  }, '')
-  return `${ver},${complete}${nodesString}`
+    return acc += `!${keys.map(key => node[key] ? encodeURIComponentWithBangIncluded(node[key]) : '').join(',')}`;
+  }, '');
+  return `${ver},${complete}${nodesString}`;
 }
 
 /**
@@ -380,15 +380,15 @@ function createSchainString(schain) {
  */
 function getContentObject(bid) {
   if (bid.params.iabContent && isPlainObject(bid.params.iabContent)) {
-    return bid.params.iabContent
+    return bid.params.iabContent;
   }
 
   const globalContent = deepAccess(bid, 'ortb2.site') ? deepAccess(bid, 'ortb2.site.content')
-    : deepAccess(bid, 'ortb2.app.content')
+    : deepAccess(bid, 'ortb2.app.content');
   if (globalContent && isPlainObject(globalContent)) {
-    return globalContent
+    return globalContent;
   }
-  return undefined
+  return undefined;
 }
 
 /**
@@ -401,15 +401,15 @@ function getContentObject(bid) {
  * @returns {String}
  */
 function createIabContentString(iabContent) {
-  const arrKeys = ['keywords', 'cat']
-  const str = []
+  const arrKeys = ['keywords', 'cat'];
+  const str = [];
   const transformObjToParam = (obj = {}, extraKey = '') => {
     for (const key in obj) {
       if ((arrKeys.indexOf(key) !== -1 && Array.isArray(obj[key]))) {
         // Array of defined keyword which have to be joined into one value from "key: [value1, value2, value3]" to "key:value1|value2|value3"
-        str.push(''.concat(key, ':', obj[key].map(node => encodeURIComponent(node)).join('|')))
+        str.push(''.concat(key, ':', obj[key].map(node => encodeURIComponent(node)).join('|')));
       } else if (typeof obj[key] !== 'object') {
-        str.push(''.concat(extraKey + key, ':', encodeURIComponent(obj[key])))
+        str.push(''.concat(extraKey + key, ':', encodeURIComponent(obj[key])));
       } else {
         // Object has to be further flattened
         transformObjToParam(obj[key], ''.concat(extraKey, key, '.'));
@@ -417,7 +417,7 @@ function createIabContentString(iabContent) {
     }
     return str.join(',');
   };
-  return encodeURIComponent(transformObjToParam(iabContent))
+  return encodeURIComponent(transformObjToParam(iabContent));
 }
 
 /**
@@ -426,7 +426,7 @@ function createIabContentString(iabContent) {
  * @returns {String}
  */
 function encodeURIComponentWithBangIncluded(str) {
-  return encodeURIComponent(str).replace(/!/g, '%21')
+  return encodeURIComponent(str).replace(/!/g, '%21');
 }
 
 /**
@@ -435,11 +435,11 @@ function encodeURIComponentWithBangIncluded(str) {
  */
 function outstreamRender(bid) {
   bid.renderer.push(() => {
-    window.ma_width = bid.width
-    window.ma_height = bid.height
-    window.ma_vastUrl = bid.vastUrl
-    window.ma_container = bid.adUnitCode
-    window.document.dispatchEvent(new Event('ma-start-event'))
+    window.ma_width = bid.width;
+    window.ma_height = bid.height;
+    window.ma_vastUrl = bid.vastUrl;
+    window.ma_container = bid.adUnitCode;
+    window.document.dispatchEvent(new Event('ma-start-event'));
   });
 }
 
@@ -450,33 +450,33 @@ function outstreamRender(bid) {
  * @returns {string[]}
  */
 function extractSizes(bid) {
-  const { mediaTypes } = bid // see https://docs.prebid.org/dev-docs/adunit-reference.html#examples
-  const sizes = []
+  const { mediaTypes } = bid; // see https://docs.prebid.org/dev-docs/adunit-reference.html#examples
+  const sizes = [];
 
   if (isPlainObject(mediaTypes)) {
-    const { [BANNER]: bannerType } = mediaTypes
+    const { [BANNER]: bannerType } = mediaTypes;
 
     // only applies for multi size Adslots -> BANNER
     if (bannerType && isArray(bannerType.sizes)) {
       if (isArray(bannerType.sizes[0])) { // multiple sizes given
-        sizes.push(bannerType.sizes)
+        sizes.push(bannerType.sizes);
       } else { // just one size provided as array -> wrap to uniformly flatten later
-        sizes.push([bannerType.sizes])
+        sizes.push([bannerType.sizes]);
       }
     }
     // The bid top level field `sizes` is deprecated and should not be used anymore. Keeping it for compatibility.
   } else if (isArray(bid.sizes)) {
     if (isArray(bid.sizes[0])) {
-      sizes.push(bid.sizes)
+      sizes.push(bid.sizes);
     } else {
-      sizes.push([bid.sizes])
+      sizes.push([bid.sizes]);
     }
   }
 
   /** @type {Set<string>} */
-  const deduplicatedSizeStrings = new Set(sizes.flat().map(([width, height]) => width + DIMENSION_SIGN + height))
+  const deduplicatedSizeStrings = new Set(sizes.flat().map(([width, height]) => width + DIMENSION_SIGN + height));
 
-  return Array.from(deduplicatedSizeStrings)
+  return Array.from(deduplicatedSizeStrings);
 }
 
 /**
@@ -497,7 +497,7 @@ function getBidFloor(bid, sizes) {
   const floor = bid.getFloor({
     currency: CURRENCY_CODE,
     mediaType: mediaType !== undefined && spec.supportedMediaTypes.includes(mediaType) ? mediaType : '*',
-    size: sizes.length !== 1 ? '*' : sizes[0].split(DIMENSION_SIGN)
+    size: sizes.length !== 1 ? '*' : sizes[0].split(DIMENSION_SIGN),
   });
   if (floor.currency === CURRENCY_CODE) {
     return (floor.floor * 100).toFixed(0);
@@ -505,4 +505,4 @@ function getBidFloor(bid, sizes) {
   return undefined;
 }
 
-registerBidder(spec)
+registerBidder(spec);
diff --git a/test/spec/modules/yieldlabBidAdapter_spec.js b/test/spec/modules/yieldlabBidAdapter_spec.js
index 07d42df1319..e5151cf789c 100644
--- a/test/spec/modules/yieldlabBidAdapter_spec.js
+++ b/test/spec/modules/yieldlabBidAdapter_spec.js
@@ -1,7 +1,7 @@
 import { config } from 'src/config.js';
-import { expect } from 'chai'
-import { spec } from 'modules/yieldlabBidAdapter.js'
-import { newBidder } from 'src/adapters/bidderFactory.js'
+import { expect } from 'chai';
+import { spec } from 'modules/yieldlabBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
 
 const DEFAULT_REQUEST = () => ({
   bidder: 'yieldlab',
@@ -11,11 +11,11 @@ const DEFAULT_REQUEST = () => ({
     targeting: {
       key1: 'value1',
       key2: 'value2',
-      notDoubleEncoded: 'value3,value4'
+      notDoubleEncoded: 'value3,value4',
     },
     customParams: {
       extraParam: true,
-      foo: 'bar'
+      foo: 'bar',
     },
     extId: 'abc',
     iabContent: {
@@ -31,8 +31,8 @@ const DEFAULT_REQUEST = () => ({
       cat: ['cat1', 'cat2,ppp', 'cat3|||//'],
       context: '7',
       keywords: ['k1,', 'k2..'],
-      live: '0'
-    }
+      live: '0',
+    },
   },
   bidderRequestId: '143346cf0f1731',
   auctionId: '2e41f65424c87c',
@@ -43,14 +43,14 @@ const DEFAULT_REQUEST = () => ({
     source: 'netid.de',
     uids: [{
       id: 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
-      atype: 1
-    }]
+      atype: 1,
+    }],
   }, {
     source: 'digitrust.de',
     uids: [{
       id: 'd8aa10fa-d86c-451d-aad8-5f16162a9e64',
-      atype: 2
-    }]
+      atype: 2,
+    }],
   }],
   schain: {
     ver: '1.0',
@@ -59,32 +59,32 @@ const DEFAULT_REQUEST = () => ({
       {
         asi: 'indirectseller.com',
         sid: '1',
-        hp: 1
+        hp: 1,
       },
       {
         asi: 'indirectseller2.com',
         name: 'indirectseller2 name with comma , and bang !',
         sid: '2',
-        hp: 1
-      }
-    ]
-  }
-})
+        hp: 1,
+      },
+    ],
+  },
+});
 
 const VIDEO_REQUEST = () => Object.assign(DEFAULT_REQUEST(), {
   mediaTypes: {
     video: {
       playerSize: [[640, 480]],
-      context: 'instream'
-    }
-  }
-})
+      context: 'instream',
+    },
+  },
+});
 
 const NATIVE_REQUEST = () => Object.assign(DEFAULT_REQUEST(), {
   mediaTypes: {
-    native: {}
-  }
-})
+    native: {},
+  },
+});
 
 const IAB_REQUEST = () => Object.assign(DEFAULT_REQUEST(), {
   params: {
@@ -119,7 +119,7 @@ const IAB_REQUEST = () => Object.assign(DEFAULT_REQUEST(), {
         name: 'bar',
         cattax: 532,
         cat: [1, 'foo', true],
-        domain: 'producer.test'
+        domain: 'producer.test',
       },
       data: {
         id: 'foo',
@@ -129,8 +129,8 @@ const IAB_REQUEST = () => Object.assign(DEFAULT_REQUEST(), {
           value: 'bar',
           ext: {
             foo: {
-              bar: 'bar'
-            }
+              bar: 'bar',
+            },
           },
         }, {
           name: 'foo2',
@@ -139,27 +139,27 @@ const IAB_REQUEST = () => Object.assign(DEFAULT_REQUEST(), {
             test: {
               nums: {
                 int: 123,
-                float: 123.123
+                float: 123.123,
               },
               bool: true,
-              string: 'foo2'
-            }
-          }
+              string: 'foo2',
+            },
+          },
         }],
       },
       network: {
         id: 'foo',
         name: 'bar',
-        domain: 'network.test'
+        domain: 'network.test',
       },
       channel: {
         id: 'bar',
         name: 'foo',
-        domain: 'channel.test'
-      }
-    }
-  }
-})
+        domain: 'channel.test',
+      },
+    },
+  },
+});
 
 const RESPONSE = {
   advertiser: 'yieldlab',
@@ -169,173 +169,173 @@ const RESPONSE = {
   price: 1,
   pid: 2222,
   adsize: '728x90',
-  adtype: 'BANNER'
-}
+  adtype: 'BANNER',
+};
 
 const NATIVE_RESPONSE = Object.assign({}, RESPONSE, {
   adtype: 'NATIVE',
   native: {
     link: {
-      url: 'https://www.yieldlab.de'
+      url: 'https://www.yieldlab.de',
     },
     assets: [
       {
         id: 1,
         title: {
-          text: 'This is a great headline'
-        }
+          text: 'This is a great headline',
+        },
       },
       {
         id: 2,
         img: {
           url: 'https://localhost:8080/yl-logo100x100.jpg',
           w: 100,
-          h: 100
-        }
+          h: 100,
+        },
       },
       {
         id: 3,
         data: {
-          value: 'Native body value'
-        }
-      }
+          value: 'Native body value',
+        },
+      },
     ],
     imptrackers: [
       'http://localhost:8080/ve?d=ODE9ZSY2MTI1MjAzNjMzMzYxPXN0JjA0NWUwZDk0NTY5Yi05M2FiLWUwZTQtOWFjNy1hYWY0MzFiZj1kaXQmMj12',
       'http://localhost:8080/md/1111/9efa4e76-2030-4f04-bb9f-322541f8d611?mdata=false&pvid=false&ids=x:1',
-      'http://localhost:8080/imp?s=13216&d=2171514&a=12548955&ts=1633363025216&tid=fb134faa-7ca9-4e0e-ba39-b96549d0e540&l=0'
-    ]
-  }
-})
+      'http://localhost:8080/imp?s=13216&d=2171514&a=12548955&ts=1633363025216&tid=fb134faa-7ca9-4e0e-ba39-b96549d0e540&l=0',
+    ],
+  },
+});
 
 const VIDEO_RESPONSE = Object.assign({}, RESPONSE, {
-  adtype: 'VIDEO'
-})
+  adtype: 'VIDEO',
+});
 
 const PVID_RESPONSE = Object.assign({}, VIDEO_RESPONSE, {
-  pvid: '43513f11-55a0-4a83-94e5-0ebc08f54a2c'
-})
+  pvid: '43513f11-55a0-4a83-94e5-0ebc08f54a2c',
+});
 
 const REQPARAMS = {
   json: true,
-  ts: 1234567890
-}
+  ts: 1234567890,
+};
 
 const REQPARAMS_GDPR = Object.assign({}, REQPARAMS, {
   gdpr: true,
-  consent: 'BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA'
-})
+  consent: 'BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA',
+});
 
 const REQPARAMS_IAB_CONTENT = Object.assign({}, REQPARAMS, {
-  iab_content: 'id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0'
-})
+  iab_content: 'id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0',
+});
 
 describe('yieldlabBidAdapter', () => {
   describe('instantiation from spec', () => {
     it('is working properly', () => {
-      const yieldlabBidAdapter = newBidder(spec)
-      expect(yieldlabBidAdapter.callBids).to.exist.and.to.be.a('function')
-    })
-  })
+      const yieldlabBidAdapter = newBidder(spec);
+      expect(yieldlabBidAdapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
 
   describe('isBidRequestValid', () => {
     it('should return true when all required parameters are found', () => {
       const request = {
         params: {
           adslotId: '1111',
-          supplyId: '2222'
-        }
-      }
-      expect(spec.isBidRequestValid(request)).to.equal(true)
-    })
+          supplyId: '2222',
+        },
+      };
+      expect(spec.isBidRequestValid(request)).to.equal(true);
+    });
 
     it('should return false when required parameters are missing', () => {
-      expect(spec.isBidRequestValid({})).to.equal(false)
-    })
-  })
+      expect(spec.isBidRequestValid({})).to.equal(false);
+    });
+  });
 
   describe('buildRequests', () => {
-    const bidRequests = [DEFAULT_REQUEST()]
+    const bidRequests = [DEFAULT_REQUEST()];
 
     describe('default functionality', () => {
-      let request
+      let request;
 
       before(() => {
-        request = spec.buildRequests(bidRequests)
-      })
+        request = spec.buildRequests(bidRequests);
+      });
 
       it('sends bid request to ENDPOINT via GET', () => {
-        expect(request.method).to.equal('GET')
-      })
+        expect(request.method).to.equal('GET');
+      });
 
       it('returns a list of valid requests', () => {
-        expect(request.validBidRequests).to.eql(bidRequests)
-      })
+        expect(request.validBidRequests).to.eql(bidRequests);
+      });
 
       it('passes single-encoded targeting to bid request', () => {
-        expect(request.url).to.include('t=key1%3Dvalue1%26key2%3Dvalue2%26notDoubleEncoded%3Dvalue3%2Cvalue4')
-      })
+        expect(request.url).to.include('t=key1%3Dvalue1%26key2%3Dvalue2%26notDoubleEncoded%3Dvalue3%2Cvalue4');
+      });
 
       it('passes userids to bid request', () => {
-        expect(request.url).to.include('ids=netid.de%3AfH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg%2Cdigitrust.de%3Ad8aa10fa-d86c-451d-aad8-5f16162a9e64')
-      })
+        expect(request.url).to.include('ids=netid.de%3AfH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg%2Cdigitrust.de%3Ad8aa10fa-d86c-451d-aad8-5f16162a9e64');
+      });
 
       it('passes atype to bid request', () => {
-        expect(request.url).to.include('atypes=netid.de%3A1%2Cdigitrust.de%3A2')
-      })
+        expect(request.url).to.include('atypes=netid.de%3A1%2Cdigitrust.de%3A2');
+      });
 
       it('passes extra params to bid request', () => {
-        expect(request.url).to.include('extraParam=true&foo=bar')
-      })
+        expect(request.url).to.include('extraParam=true&foo=bar');
+      });
 
       it('passes unencoded schain string to bid request', () => {
-        expect(request.url).to.include('schain=1.0,1!indirectseller.com,1,1,,,,!indirectseller2.com,2,1,,indirectseller2%20name%20with%20comma%20%2C%20and%20bang%20%21,,')
-      })
+        expect(request.url).to.include('schain=1.0,1!indirectseller.com,1,1,,,,!indirectseller2.com,2,1,,indirectseller2%20name%20with%20comma%20%2C%20and%20bang%20%21,,');
+      });
 
       it('passes iab_content string to bid request', () => {
-        expect(request.url).to.include('iab_content=id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0')
-      })
+        expect(request.url).to.include('iab_content=id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0');
+      });
 
       it('passes correct size to bid request', () => {
-        expect(request.url).to.include('728x90')
-      })
+        expect(request.url).to.include('728x90');
+      });
 
       it('passes external id to bid request', () => {
-        expect(request.url).to.include('id=abc')
-      })
-    })
+        expect(request.url).to.include('id=abc');
+      });
+    });
 
     describe('iab_content handling', () => {
       const siteConfig = {
         ortb2: {
           site: {
             content: {
-              id: 'id_from_config'
-            }
-          }
-        }
-      }
+              id: 'id_from_config',
+            },
+          },
+        },
+      };
 
       beforeEach(() => {
-        config.setConfig(siteConfig)
-      })
+        config.setConfig(siteConfig);
+      });
 
       afterEach(() => {
-        config.resetConfig()
-      })
+        config.resetConfig();
+      });
 
       it('generates iab_content string from bidder params', () => {
-        const request = spec.buildRequests(bidRequests)
-        expect(request.url).to.include('iab_content=id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0')
-      })
+        const request = spec.buildRequests(bidRequests);
+        expect(request.url).to.include('iab_content=id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0');
+      });
 
       it('generates iab_content string from first party data if not provided in bidder params', () => {
-        const requestWithoutIabContent = DEFAULT_REQUEST()
-        delete requestWithoutIabContent.params.iabContent
+        const requestWithoutIabContent = DEFAULT_REQUEST();
+        delete requestWithoutIabContent.params.iabContent;
 
-        const request = spec.buildRequests([{...requestWithoutIabContent, ...siteConfig}])
-        expect(request.url).to.include('iab_content=id%3Aid_from_config')
-      })
+        const request = spec.buildRequests([{...requestWithoutIabContent, ...siteConfig}]);
+        expect(request.url).to.include('iab_content=id%3Aid_from_config');
+      });
 
       it('flattens the iabContent, encodes the values, joins the keywords into one value, and than encodes the iab_content request param ', () => {
         const expectedIabContentValue = encodeURIComponent(
@@ -382,18 +382,18 @@ describe('yieldlabBidAdapter', () => {
           'channel.id:bar,' +
           'channel.name:foo,' +
           'channel.domain:channel.test'
-        )
-        const request = spec.buildRequests([IAB_REQUEST()], REQPARAMS)
-        expect(request.url).to.include('iab_content=' + expectedIabContentValue)
-      })
-    })
+        );
+        const request = spec.buildRequests([IAB_REQUEST()], REQPARAMS);
+        expect(request.url).to.include('iab_content=' + expectedIabContentValue);
+      });
+    });
 
     it('passes unencoded schain string to bid request when complete == 0', () => {
-      const schainRequest = DEFAULT_REQUEST()
+      const schainRequest = DEFAULT_REQUEST();
       schainRequest.schain.complete = 0; //
-      const request = spec.buildRequests([schainRequest])
-      expect(request.url).to.include('schain=1.0,0!indirectseller.com,1,1,,,,!indirectseller2.com,2,1,,indirectseller2%20name%20with%20comma%20%2C%20and%20bang%20%21,,')
-    })
+      const request = spec.buildRequests([schainRequest]);
+      expect(request.url).to.include('schain=1.0,0!indirectseller.com,1,1,,,,!indirectseller2.com,2,1,,indirectseller2%20name%20with%20comma%20%2C%20and%20bang%20%21,,');
+    });
 
     it('passes encoded referer to bid request', () => {
       const refererRequest = spec.buildRequests(bidRequests, {
@@ -402,123 +402,123 @@ describe('yieldlabBidAdapter', () => {
           numIframes: 0,
           reachedTop: true,
           page: 'https://www.yieldlab.de/test?with=querystring',
-          stack: ['https://www.yieldlab.de/test?with=querystring']
-        }
-      })
+          stack: ['https://www.yieldlab.de/test?with=querystring'],
+        },
+      });
 
-      expect(refererRequest.url).to.include('pubref=https%3A%2F%2Fwww.yieldlab.de%2Ftest%3Fwith%3Dquerystring')
-    })
+      expect(refererRequest.url).to.include('pubref=https%3A%2F%2Fwww.yieldlab.de%2Ftest%3Fwith%3Dquerystring');
+    });
 
     it('passes gdpr flag and consent if present', () => {
       const gdprRequest = spec.buildRequests(bidRequests, {
         gdprConsent: {
           consentString: 'BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA',
-          gdprApplies: true
-        }
-      })
+          gdprApplies: true,
+        },
+      });
 
-      expect(gdprRequest.url).to.include('consent=BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA')
-      expect(gdprRequest.url).to.include('gdpr=true')
-    })
+      expect(gdprRequest.url).to.include('consent=BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA');
+      expect(gdprRequest.url).to.include('gdpr=true');
+    });
 
     describe('sizes handling', () => {
       it('passes correct size to bid request for mediaType banner', () => {
         const bannerRequest = DEFAULT_REQUEST();
         bannerRequest.mediaTypes = {
           banner: {
-            sizes: [[123, 456]]
-          }
-        }
+            sizes: [[123, 456]],
+          },
+        };
 
         // when mediaTypes is present it has precedence over the sizes field (728, 90)
-        let request = spec.buildRequests([bannerRequest], REQPARAMS)
-        expect(request.url).to.include('sizes')
-        expect(request.url).to.include('123x456')
-
-        bannerRequest.mediaTypes.banner.sizes = [123, 456]
-        request = spec.buildRequests([bannerRequest], REQPARAMS)
-        expect(request.url).to.include('123x456')
-
-        bannerRequest.mediaTypes.banner.sizes = [[123, 456], [320, 240]]
-        request = spec.buildRequests([bannerRequest], REQPARAMS)
-        expect(request.url).to.include('123x456')
-        expect(request.url).to.include('320x240')
-      })
+        let request = spec.buildRequests([bannerRequest], REQPARAMS);
+        expect(request.url).to.include('sizes');
+        expect(request.url).to.include('123x456');
+
+        bannerRequest.mediaTypes.banner.sizes = [123, 456];
+        request = spec.buildRequests([bannerRequest], REQPARAMS);
+        expect(request.url).to.include('123x456');
+
+        bannerRequest.mediaTypes.banner.sizes = [[123, 456], [320, 240]];
+        request = spec.buildRequests([bannerRequest], REQPARAMS);
+        expect(request.url).to.include('123x456');
+        expect(request.url).to.include('320x240');
+      });
 
       it('passes correct sizes to bid request when mediaType is not present', () => {
         // information is taken from the top level sizes field
         const sizesRequest = DEFAULT_REQUEST();
 
-        let request = spec.buildRequests([sizesRequest], REQPARAMS)
-        expect(request.url).to.include('sizes')
-        expect(request.url).to.include('728x90')
+        let request = spec.buildRequests([sizesRequest], REQPARAMS);
+        expect(request.url).to.include('sizes');
+        expect(request.url).to.include('728x90');
 
-        sizesRequest.sizes = [[728, 90]]
-        request = spec.buildRequests([sizesRequest], REQPARAMS)
-        expect(request.url).to.include('728x90')
+        sizesRequest.sizes = [[728, 90]];
+        request = spec.buildRequests([sizesRequest], REQPARAMS);
+        expect(request.url).to.include('728x90');
 
-        sizesRequest.sizes = [[728, 90], [320, 240]]
-        request = spec.buildRequests([sizesRequest], REQPARAMS)
-        expect(request.url).to.include('728x90')
-      })
+        sizesRequest.sizes = [[728, 90], [320, 240]];
+        request = spec.buildRequests([sizesRequest], REQPARAMS);
+        expect(request.url).to.include('728x90');
+      });
 
       it('does not pass the sizes parameter for mediaType video', () => {
         const videoRequest = VIDEO_REQUEST();
 
-        let request = spec.buildRequests([videoRequest], REQPARAMS)
-        expect(request.url).to.not.include('sizes')
-      })
+        let request = spec.buildRequests([videoRequest], REQPARAMS);
+        expect(request.url).to.not.include('sizes');
+      });
 
       it('does not pass the sizes parameter for mediaType native', () => {
         const nativeRequest = NATIVE_REQUEST();
 
-        let request = spec.buildRequests([nativeRequest], REQPARAMS)
-        expect(request.url).to.not.include('sizes')
-      })
-    })
-  })
+        let request = spec.buildRequests([nativeRequest], REQPARAMS);
+        expect(request.url).to.not.include('sizes');
+      });
+    });
+  });
 
   describe('interpretResponse', () => {
-    let bidRequest
+    let bidRequest;
 
     before(() => {
-      bidRequest = DEFAULT_REQUEST()
-    })
+      bidRequest = DEFAULT_REQUEST();
+    });
 
     it('handles nobid responses', () => {
-      expect(spec.interpretResponse({body: {}}, {validBidRequests: []}).length).to.equal(0)
-      expect(spec.interpretResponse({body: []}, {validBidRequests: []}).length).to.equal(0)
-    })
+      expect(spec.interpretResponse({body: {}}, {validBidRequests: []}).length).to.equal(0);
+      expect(spec.interpretResponse({body: []}, {validBidRequests: []}).length).to.equal(0);
+    });
 
     it('should get correct bid response', () => {
-      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [bidRequest], queryParams: REQPARAMS})
-
-      expect(result[0].requestId).to.equal('2d925f27f5079f')
-      expect(result[0].cpm).to.equal(0.01)
-      expect(result[0].width).to.equal(728)
-      expect(result[0].height).to.equal(90)
-      expect(result[0].creativeId).to.equal('1111')
-      expect(result[0].dealId).to.equal(2222)
-      expect(result[0].currency).to.equal('EUR')
-      expect(result[0].netRevenue).to.equal(false)
-      expect(result[0].ttl).to.equal(300)
-      expect(result[0].referrer).to.equal('')
-      expect(result[0].meta.advertiserDomains).to.equal('yieldlab')
-      expect(result[0].ad).to.include('<script src="https://ad.yieldlab.net/d/1111/2222/?ts=')
-      expect(result[0].ad).to.include('&id=abc')
-    })
+      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [bidRequest], queryParams: REQPARAMS});
+
+      expect(result[0].requestId).to.equal('2d925f27f5079f');
+      expect(result[0].cpm).to.equal(0.01);
+      expect(result[0].width).to.equal(728);
+      expect(result[0].height).to.equal(90);
+      expect(result[0].creativeId).to.equal('1111');
+      expect(result[0].dealId).to.equal(2222);
+      expect(result[0].currency).to.equal('EUR');
+      expect(result[0].netRevenue).to.equal(false);
+      expect(result[0].ttl).to.equal(300);
+      expect(result[0].referrer).to.equal('');
+      expect(result[0].meta.advertiserDomains).to.equal('yieldlab');
+      expect(result[0].ad).to.include('<script src="https://ad.yieldlab.net/d/1111/2222/?ts=');
+      expect(result[0].ad).to.include('&id=abc');
+    });
 
     it('should append gdpr parameters to adtag', () => {
-      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [bidRequest], queryParams: REQPARAMS_GDPR})
+      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [bidRequest], queryParams: REQPARAMS_GDPR});
 
-      expect(result[0].ad).to.include('&gdpr=true')
-      expect(result[0].ad).to.include('&consent=BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA')
-    })
+      expect(result[0].ad).to.include('&gdpr=true');
+      expect(result[0].ad).to.include('&consent=BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA');
+    });
 
     it('should append iab_content to adtag', () => {
-      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [bidRequest], queryParams: REQPARAMS_IAB_CONTENT})
-      expect(result[0].ad).to.include('&iab_content=id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0')
-    })
+      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [bidRequest], queryParams: REQPARAMS_IAB_CONTENT});
+      expect(result[0].ad).to.include('&iab_content=id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0');
+    });
 
     it('should get correct bid response when passing more than one size', () => {
       const REQUEST2 = Object.assign(DEFAULT_REQUEST(), {
@@ -526,115 +526,115 @@ describe('yieldlabBidAdapter', () => {
           [800, 250],
           [728, 90],
           [970, 90],
-        ]
-      })
-      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [REQUEST2], queryParams: REQPARAMS})
-
-      expect(result[0].requestId).to.equal('2d925f27f5079f')
-      expect(result[0].cpm).to.equal(0.01)
-      expect(result[0].width).to.equal(728)
-      expect(result[0].height).to.equal(90)
-      expect(result[0].creativeId).to.equal('1111')
-      expect(result[0].dealId).to.equal(2222)
-      expect(result[0].currency).to.equal('EUR')
-      expect(result[0].netRevenue).to.equal(false)
-      expect(result[0].ttl).to.equal(300)
-      expect(result[0].referrer).to.equal('')
-      expect(result[0].meta.advertiserDomains).to.equal('yieldlab')
-      expect(result[0].ad).to.include('<script src="https://ad.yieldlab.net/d/1111/2222/?ts=')
-      expect(result[0].ad).to.include('&id=abc')
-    })
+        ],
+      });
+      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [REQUEST2], queryParams: REQPARAMS});
+
+      expect(result[0].requestId).to.equal('2d925f27f5079f');
+      expect(result[0].cpm).to.equal(0.01);
+      expect(result[0].width).to.equal(728);
+      expect(result[0].height).to.equal(90);
+      expect(result[0].creativeId).to.equal('1111');
+      expect(result[0].dealId).to.equal(2222);
+      expect(result[0].currency).to.equal('EUR');
+      expect(result[0].netRevenue).to.equal(false);
+      expect(result[0].ttl).to.equal(300);
+      expect(result[0].referrer).to.equal('');
+      expect(result[0].meta.advertiserDomains).to.equal('yieldlab');
+      expect(result[0].ad).to.include('<script src="https://ad.yieldlab.net/d/1111/2222/?ts=');
+      expect(result[0].ad).to.include('&id=abc');
+    });
 
     it('should add vastUrl when type is video', () => {
-      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [VIDEO_REQUEST()], queryParams: REQPARAMS})
+      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [VIDEO_REQUEST()], queryParams: REQPARAMS});
 
-      expect(result[0].requestId).to.equal('2d925f27f5079f')
-      expect(result[0].cpm).to.equal(0.01)
-      expect(result[0].mediaType).to.equal('video')
-      expect(result[0].vastUrl).to.include('https://ad.yieldlab.net/d/1111/2222/?ts=')
-      expect(result[0].vastUrl).to.include('&id=abc')
-    })
+      expect(result[0].requestId).to.equal('2d925f27f5079f');
+      expect(result[0].cpm).to.equal(0.01);
+      expect(result[0].mediaType).to.equal('video');
+      expect(result[0].vastUrl).to.include('https://ad.yieldlab.net/d/1111/2222/?ts=');
+      expect(result[0].vastUrl).to.include('&id=abc');
+    });
 
     it('should add adUrl and native assets when type is Native', () => {
-      const result = spec.interpretResponse({body: [NATIVE_RESPONSE]}, {validBidRequests: [NATIVE_REQUEST()], queryParams: REQPARAMS})
-
-      expect(result[0].requestId).to.equal('2d925f27f5079f')
-      expect(result[0].cpm).to.equal(0.01)
-      expect(result[0].mediaType).to.equal('native')
-      expect(result[0].adUrl).to.include('https://ad.yieldlab.net/d/1111/2222/?ts=')
-      expect(result[0].native.title).to.equal('This is a great headline')
-      expect(result[0].native.body).to.equal('Native body value')
-      expect(result[0].native.image.url).to.equal('https://localhost:8080/yl-logo100x100.jpg')
-      expect(result[0].native.image.width).to.equal(100)
-      expect(result[0].native.image.height).to.equal(100)
-      expect(result[0].native.clickUrl).to.equal('https://www.yieldlab.de')
-      expect(result[0].native.impressionTrackers.length).to.equal(3)
-    })
+      const result = spec.interpretResponse({body: [NATIVE_RESPONSE]}, {validBidRequests: [NATIVE_REQUEST()], queryParams: REQPARAMS});
+
+      expect(result[0].requestId).to.equal('2d925f27f5079f');
+      expect(result[0].cpm).to.equal(0.01);
+      expect(result[0].mediaType).to.equal('native');
+      expect(result[0].adUrl).to.include('https://ad.yieldlab.net/d/1111/2222/?ts=');
+      expect(result[0].native.title).to.equal('This is a great headline');
+      expect(result[0].native.body).to.equal('Native body value');
+      expect(result[0].native.image.url).to.equal('https://localhost:8080/yl-logo100x100.jpg');
+      expect(result[0].native.image.width).to.equal(100);
+      expect(result[0].native.image.height).to.equal(100);
+      expect(result[0].native.clickUrl).to.equal('https://www.yieldlab.de');
+      expect(result[0].native.impressionTrackers.length).to.equal(3);
+    });
 
     it('should add adUrl and default native assets when type is Native', () => {
       const NATIVE_RESPONSE_2 = Object.assign({}, NATIVE_RESPONSE, {
         native: {
           link: {
-            url: 'https://www.yieldlab.de'
+            url: 'https://www.yieldlab.de',
           },
           assets: [],
-          imptrackers: []
-        }
-      })
-      const result = spec.interpretResponse({body: [NATIVE_RESPONSE_2]}, {validBidRequests: [NATIVE_REQUEST()], queryParams: REQPARAMS})
-
-      expect(result[0].requestId).to.equal('2d925f27f5079f')
-      expect(result[0].cpm).to.equal(0.01)
-      expect(result[0].mediaType).to.equal('native')
-      expect(result[0].adUrl).to.include('https://ad.yieldlab.net/d/1111/2222/?ts=')
-      expect(result[0].native.title).to.equal('')
-      expect(result[0].native.body).to.equal('')
-      expect(result[0].native.image.url).to.equal('')
-      expect(result[0].native.image.width).to.equal(0)
-      expect(result[0].native.image.height).to.equal(0)
-    })
+          imptrackers: [],
+        },
+      });
+      const result = spec.interpretResponse({body: [NATIVE_RESPONSE_2]}, {validBidRequests: [NATIVE_REQUEST()], queryParams: REQPARAMS});
+
+      expect(result[0].requestId).to.equal('2d925f27f5079f');
+      expect(result[0].cpm).to.equal(0.01);
+      expect(result[0].mediaType).to.equal('native');
+      expect(result[0].adUrl).to.include('https://ad.yieldlab.net/d/1111/2222/?ts=');
+      expect(result[0].native.title).to.equal('');
+      expect(result[0].native.body).to.equal('');
+      expect(result[0].native.image.url).to.equal('');
+      expect(result[0].native.image.width).to.equal(0);
+      expect(result[0].native.image.height).to.equal(0);
+    });
 
     it('should append gdpr parameters to vastUrl', () => {
-      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [VIDEO_REQUEST()], queryParams: REQPARAMS_GDPR})
+      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [VIDEO_REQUEST()], queryParams: REQPARAMS_GDPR});
 
-      expect(result[0].vastUrl).to.include('&gdpr=true')
-      expect(result[0].vastUrl).to.include('&consent=BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA')
-    })
+      expect(result[0].vastUrl).to.include('&gdpr=true');
+      expect(result[0].vastUrl).to.include('&consent=BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA');
+    });
 
     it('should add renderer if outstream context', () => {
       const OUTSTREAM_REQUEST = Object.assign(DEFAULT_REQUEST(), {
         mediaTypes: {
           video: {
             playerSize: [[640, 480]],
-            context: 'outstream'
-          }
-        }
-      })
-      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [OUTSTREAM_REQUEST], queryParams: REQPARAMS})
-
-      expect(result[0].renderer.id).to.equal('2d925f27f5079f')
-      expect(result[0].renderer.url).to.equal('https://ad.adition.com/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event')
-      expect(result[0].width).to.equal(640)
-      expect(result[0].height).to.equal(480)
-    })
+            context: 'outstream',
+          },
+        },
+      });
+      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [OUTSTREAM_REQUEST], queryParams: REQPARAMS});
+
+      expect(result[0].renderer.id).to.equal('2d925f27f5079f');
+      expect(result[0].renderer.url).to.equal('https://ad.adition.com/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event');
+      expect(result[0].width).to.equal(640);
+      expect(result[0].height).to.equal(480);
+    });
 
     it('should add pvid to adtag urls when present', () => {
-      const result = spec.interpretResponse({body: [PVID_RESPONSE]}, {validBidRequests: [VIDEO_REQUEST()], queryParams: REQPARAMS})
+      const result = spec.interpretResponse({body: [PVID_RESPONSE]}, {validBidRequests: [VIDEO_REQUEST()], queryParams: REQPARAMS});
 
-      expect(result[0].ad).to.include('&pvid=43513f11-55a0-4a83-94e5-0ebc08f54a2c')
-      expect(result[0].vastUrl).to.include('&pvid=43513f11-55a0-4a83-94e5-0ebc08f54a2c')
-    })
+      expect(result[0].ad).to.include('&pvid=43513f11-55a0-4a83-94e5-0ebc08f54a2c');
+      expect(result[0].vastUrl).to.include('&pvid=43513f11-55a0-4a83-94e5-0ebc08f54a2c');
+    });
 
     it('should append iab_content to vastUrl', () => {
-      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [VIDEO_REQUEST()], queryParams: REQPARAMS_IAB_CONTENT})
-      expect(result[0].vastUrl).to.include('&iab_content=id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0')
-    })
-  })
+      const result = spec.interpretResponse({body: [VIDEO_RESPONSE]}, {validBidRequests: [VIDEO_REQUEST()], queryParams: REQPARAMS_IAB_CONTENT});
+      expect(result[0].vastUrl).to.include('&iab_content=id%3Afoo_id%2Cepisode%3A99%2Ctitle%3Afoo_title%252Cbar_title%2Cseries%3Afoo_series%2Cseason%3As1%2Cartist%3Afoo%2520bar%2Cgenre%3Abaz%2Cisrc%3ACC-XXX-YY-NNNNN%2Curl%3Ahttp%253A%252F%252Ffoo_url.de%2Ccat%3Acat1%7Ccat2%252Cppp%7Ccat3%257C%257C%257C%252F%252F%2Ccontext%3A7%2Ckeywords%3Ak1%252C%7Ck2..%2Clive%3A0');
+    });
+  });
 
   describe('getUserSyncs', () => {
     const syncOptions = {
       iframeEnabled: true,
-      pixelEnabled: false
+      pixelEnabled: false,
     };
     const expectedUrlSnippets = ['https://ad.yieldlab.net/d/6846326/766/2x2?', 'ts=', 'type=h'];
 
@@ -642,9 +642,9 @@ describe('yieldlabBidAdapter', () => {
       const bidRequest = {
         gdprConsent: {
           consentString: 'BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA',
-          gdprApplies: true
+          gdprApplies: true,
         },
-        uspConsent: '1YYY'
+        uspConsent: '1YYY',
       };
       const sync = spec.getUserSyncs(syncOptions, [], bidRequest.gdprConsent, bidRequest.uspConsent);
       expect(expectedUrlSnippets.every(urlSnippet => sync[0].url.includes(urlSnippet)));
@@ -657,8 +657,8 @@ describe('yieldlabBidAdapter', () => {
 
     it('should return user sync even without gdprApplies in gdprConsent', () => {
       const gdprConsent = {
-        consentString: 'BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA'
-      }
+        consentString: 'BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA',
+      };
       const sync = spec.getUserSyncs(syncOptions, [], gdprConsent, undefined);
       expect(expectedUrlSnippets.every(urlSnippet => sync[0].url.includes(urlSnippet)));
       expect(sync[0].url).to.have.string('gdpr_consent=' + gdprConsent.consentString);
@@ -672,64 +672,64 @@ describe('yieldlabBidAdapter', () => {
     const getFloor = () => {
       return {
         currency: currency,
-        floor: floor
-      }
-    }
+        floor: floor,
+      };
+    };
 
     it('should add valid bid floor in the format floor={adslotId}:{floorPriceInCents}[, ...]', () => {
       bidRequest = Object.assign(DEFAULT_REQUEST(), {
         getFloor: () => {
           return {
             currency: 'EUR',
-            floor: 1.33
-          }
+            floor: 1.33,
+          };
         }});
       bidRequest2 = Object.assign(DEFAULT_REQUEST(), {
         params: {
-          adslotId: 2222
+          adslotId: 2222,
         },
         getFloor: () => {
           return {
             currency: 'EUR',
-            floor: 2.99
-          }
-        }
+            floor: 2.99,
+          };
+        },
       });
-      const result = spec.buildRequests([bidRequest, bidRequest2], REQPARAMS)
-      expect(result).to.have.nested.property('queryParams.floor', '1111:133,2222:299')
+      const result = spec.buildRequests([bidRequest, bidRequest2], REQPARAMS);
+      expect(result).to.have.nested.property('queryParams.floor', '1111:133,2222:299');
     });
 
     it('should round the floor price up', () => {
       currency = 'EUR';
       floor = 0.745;
-      bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor})
-      const result = spec.buildRequests([bidRequest], REQPARAMS)
-      expect(result).to.have.nested.property('queryParams.floor', '1111:75')
+      bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor});
+      const result = spec.buildRequests([bidRequest], REQPARAMS);
+      expect(result).to.have.nested.property('queryParams.floor', '1111:75');
     });
 
     it('should round the floor price down', () => {
       currency = 'EUR';
       floor = 0.034;
-      bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor})
-      const result = spec.buildRequests([bidRequest], REQPARAMS)
-      expect(result).to.have.nested.property('queryParams.floor', '1111:3')
+      bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor});
+      const result = spec.buildRequests([bidRequest], REQPARAMS);
+      expect(result).to.have.nested.property('queryParams.floor', '1111:3');
     });
 
     it('should not add empty bid floor', () => {
       bidRequest = Object.assign(DEFAULT_REQUEST(), {
         getFloor: () => {
           return {};
-        }})
-      const result = spec.buildRequests([bidRequest], REQPARAMS)
-      expect(result).not.to.have.nested.property('queryParams.floor')
+        }});
+      const result = spec.buildRequests([bidRequest], REQPARAMS);
+      expect(result).not.to.have.nested.property('queryParams.floor');
     });
 
     it('should not add bid floor when currency is not matching', () => {
       currency = 'USD';
       floor = 1.33;
-      bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor})
-      const result = spec.buildRequests([bidRequest], REQPARAMS)
-      expect(result).not.to.have.nested.property('queryParams.floor')
+      bidRequest = Object.assign(DEFAULT_REQUEST(), {getFloor});
+      const result = spec.buildRequests([bidRequest], REQPARAMS);
+      expect(result).not.to.have.nested.property('queryParams.floor');
     });
   });
-})
+});

From 005d2779d1be516e856a9ecd2e777d1fb59c00fd Mon Sep 17 00:00:00 2001
From: radubarbos <raduiquest79@gmail.com>
Date: Fri, 6 Jan 2023 19:20:02 +0200
Subject: [PATCH 568/569] GPP support for the yahoo connect id module. (#9399)

Co-authored-by: dumitrubarbos <dumitru-radu.barbos@yahooinc.com>
---
 modules/connectIdSystem.js                | 16 +++++++++++++++-
 test/spec/modules/connectIdSystem_spec.js | 22 +++++++++++++++++-----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/modules/connectIdSystem.js b/modules/connectIdSystem.js
index 24ef8ad0af5..38c9c00b0ed 100644
--- a/modules/connectIdSystem.js
+++ b/modules/connectIdSystem.js
@@ -66,6 +66,11 @@ export const connectIdSubmodule = {
       us_privacy: consentData && consentData.uspConsent ? consentData.uspConsent : ''
     };
 
+    if (connectIdSubmodule.isUnderGPPJurisdiction(consentData)) {
+      data.gpp = consentData.gppConsent.gppString;
+      data.gpp_sid = encodeURIComponent(consentData.gppConsent.applicableSections.join(','));
+    }
+
     INPUT_PARAM_KEYS.forEach(key => {
       if (typeof params[key] != 'undefined') {
         data[key] = params[key];
@@ -98,7 +103,7 @@ export const connectIdSubmodule = {
   },
 
   /**
-   * Utility function that returns a boolean flag indicating if the opporunity
+   * Utility function that returns a boolean flag indicating if the opportunity
    * is subject to GDPR
    * @returns {Boolean}
    */
@@ -106,6 +111,15 @@ export const connectIdSubmodule = {
     return !!(consentData && consentData.gdpr && consentData.gdpr.gdprApplies);
   },
 
+  /**
+   * Utility function that returns a boolean flag indicating if the opportunity
+   * is subject to GPP jurisdiction.
+   * @returns {Boolean}
+   */
+  isUnderGPPJurisdiction(consentData) {
+    return !!(consentData && consentData.gppConsent && consentData.gppConsent.gppString);
+  },
+
   /**
    * Utility function that returns a boolean flag indicating if the user
    * has opeted out via the Yahoo easy-opt-out mechanism.
diff --git a/test/spec/modules/connectIdSystem_spec.js b/test/spec/modules/connectIdSystem_spec.js
index b2193f350ce..52639c39baf 100644
--- a/test/spec/modules/connectIdSystem_spec.js
+++ b/test/spec/modules/connectIdSystem_spec.js
@@ -31,7 +31,11 @@ describe('Yahoo ConnectID Submodule', () => {
           gdprApplies: 1,
           consentString: 'GDPR_CONSENT_STRING'
         },
-        uspConsent: 'USP_CONSENT_STRING'
+        uspConsent: 'USP_CONSENT_STRING',
+        gppConsent: {
+          gppString: 'header~section6~section7',
+          applicableSections: [6, 7]
+        }
       };
     });
 
@@ -157,7 +161,9 @@ describe('Yahoo ConnectID Submodule', () => {
         '1p': '0',
         gdpr: '1',
         gdpr_consent: consentData.gdpr.consentString,
-        us_privacy: consentData.uspConsent
+        us_privacy: consentData.uspConsent,
+        gpp: consentData.gppConsent.gppString,
+        gpp_sid: '6%2C7'
       };
       const requestQueryParams = parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
 
@@ -178,7 +184,9 @@ describe('Yahoo ConnectID Submodule', () => {
         '1p': '0',
         gdpr: '1',
         gdpr_consent: consentData.gdpr.consentString,
-        us_privacy: consentData.uspConsent
+        us_privacy: consentData.uspConsent,
+        gpp: consentData.gppConsent.gppString,
+        gpp_sid: '6%2C7'
       };
       const requestQueryParams = parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
 
@@ -201,7 +209,9 @@ describe('Yahoo ConnectID Submodule', () => {
         '1p': '0',
         gdpr: '1',
         gdpr_consent: consentData.gdpr.consentString,
-        us_privacy: consentData.uspConsent
+        us_privacy: consentData.uspConsent,
+        gpp: consentData.gppConsent.gppString,
+        gpp_sid: '6%2C7'
       };
       const requestQueryParams = parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
 
@@ -221,7 +231,9 @@ describe('Yahoo ConnectID Submodule', () => {
         '1p': '0',
         gdpr: '1',
         gdpr_consent: consentData.gdpr.consentString,
-        us_privacy: consentData.uspConsent
+        us_privacy: consentData.uspConsent,
+        gpp: consentData.gppConsent.gppString,
+        gpp_sid: '6%2C7'
       };
       const requestQueryParams = parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
 

From f5a4078d894596f51c85b34d185c0187260d53ad Mon Sep 17 00:00:00 2001
From: radubarbos <raduiquest79@gmail.com>
Date: Sun, 8 Jan 2023 18:12:47 +0200
Subject: [PATCH 569/569] yahoospp bidder& aol bidder: GPP Support in bid
 requests (#9345)

* GPP support for the yahoospp bidder and legacy aol bidder.

* GPP support for the yahoospp bidder and legacy aol bidder.

* GPP support for the yahoo connect id module - review comments.

* GPP support for the yahoo connect id module - review comments.

* GPP support for the yahoo connect id module - review comments.

Co-authored-by: dumitrubarbos <dumitru-radu.barbos@yahooinc.com>
---
 modules/aolBidAdapter.js                     | 12 +++++++++++
 modules/yahoosspBidAdapter.js                |  5 +++++
 test/spec/modules/aolBidAdapter_spec.js      | 22 ++++++++++++++++++++
 test/spec/modules/yahoosspBidAdapter_spec.js | 17 ++++++++++++++-
 4 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/modules/aolBidAdapter.js b/modules/aolBidAdapter.js
index d38c373ff1f..6b471ac6de2 100644
--- a/modules/aolBidAdapter.js
+++ b/modules/aolBidAdapter.js
@@ -159,6 +159,13 @@ export const spec = {
     if (bidderRequest) {
       consentData.gdpr = bidderRequest.gdprConsent;
       consentData.uspConsent = bidderRequest.uspConsent;
+      consentData.gppConsent = bidderRequest.gppConsent;
+      if (!consentData.gppConsent && bidderRequest.ortb2?.regs?.gpp) {
+        consentData.gppConsent = {
+          gppString: bidderRequest.ortb2.regs.gpp,
+          applicableSections: bidderRequest.ortb2.regs.gpp_sid
+        }
+      }
     }
 
     return bids.map(bid => {
@@ -373,6 +380,11 @@ export const spec = {
       params.us_privacy = consentData.uspConsent;
     }
 
+    if (consentData.gppConsent && consentData.gppConsent.gppString) {
+      params.gpp = consentData.gppConsent.gppString;
+      params.gpp_sid = consentData.gppConsent.applicableSections;
+    }
+
     return params;
   },
   parsePixelItems(pixels) {
diff --git a/modules/yahoosspBidAdapter.js b/modules/yahoosspBidAdapter.js
index 8f9ede4fccc..9dd635a990f 100644
--- a/modules/yahoosspBidAdapter.js
+++ b/modules/yahoosspBidAdapter.js
@@ -279,6 +279,11 @@ function generateOpenRtbObject(bidderRequest, bid) {
       outBoundBidRequest.site.id = bid.params.dcn;
     };
 
+    if (bidderRequest.ortb2?.regs?.gpp) {
+      outBoundBidRequest.regs.ext.gpp = bidderRequest.ortb2.regs.gpp;
+      outBoundBidRequest.regs.ext.gpp_sid = bidderRequest.ortb2.regs.gpp_sid
+    };
+
     if (bidderRequest.ortb2) {
       outBoundBidRequest = appendFirstPartyData(outBoundBidRequest, bid);
     };
diff --git a/test/spec/modules/aolBidAdapter_spec.js b/test/spec/modules/aolBidAdapter_spec.js
index 57ce37145f4..471c76f55cf 100644
--- a/test/spec/modules/aolBidAdapter_spec.js
+++ b/test/spec/modules/aolBidAdapter_spec.js
@@ -488,6 +488,20 @@ describe('AolAdapter', function () {
         expect(request.url).to.contain(NEXAGE_URL + 'dcn=2c9d2b50015c5ce9db6aeeed8b9500d6&pos=header');
       });
 
+      it('should return One Mobile url with configured GPP data', function () {
+        let bidRequest = createCustomBidRequest({
+          params: getNexageGetBidParams()
+        });
+        bidRequest.ortb2 = {
+          regs: {
+            gpp: 'testgpp',
+            gpp_sid: [8]
+          }
+        }
+        let [request] = spec.buildRequests(bidRequest.bids, bidRequest);
+        expect(request.url).to.contain('gpp=testgpp&gpp_sid=8');
+      });
+
       it('should return One Mobile url with cmd=bid option', function () {
         let bidRequest = createCustomBidRequest({
           params: getNexageGetBidParams()
@@ -794,6 +808,14 @@ describe('AolAdapter', function () {
         'euconsent=test-consent;gdpr=1;us_privacy=test-usp-consent;');
     });
 
+    it('should return formatted gpp privacy params when formatConsentData returns GPP data', function () {
+      formatConsentDataStub.returns({
+        gpp: 'gppstring',
+        gpp_sid: [6, 7]
+      });
+      expect(spec.formatMarketplaceDynamicParams()).to.be.equal('gpp=gppstring;gpp_sid=6%2C7;');
+    });
+
     it('should return formatted params when formatKeyValues returns data', function () {
       formatKeyValuesStub.returns({
         param1: 'val1',
diff --git a/test/spec/modules/yahoosspBidAdapter_spec.js b/test/spec/modules/yahoosspBidAdapter_spec.js
index 32bc94b73fa..01583ac30dc 100644
--- a/test/spec/modules/yahoosspBidAdapter_spec.js
+++ b/test/spec/modules/yahoosspBidAdapter_spec.js
@@ -3,6 +3,7 @@ import { config } from 'src/config.js';
 import { BANNER, VIDEO } from 'src/mediaTypes.js';
 import { spec } from 'modules/yahoosspBidAdapter.js';
 import {createEidsArray} from '../../../modules/userId/eids';
+import {deepClone} from '../../../src/utils';
 
 const DEFAULT_BID_ID = '84ab500420319d';
 const DEFAULT_BID_DCN = '2093845709823475';
@@ -713,7 +714,7 @@ describe('YahooSSP Bid Adapter:', () => {
     });
   });
 
-  describe('GDPR & Consent:', () => {
+  describe('GDPR & Consent & GPP:', () => {
     it('should return request objects that do not send cookies if purpose 1 consent is not provided', () => {
       const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
       bidderRequest.gdprConsent = {
@@ -731,6 +732,20 @@ describe('YahooSSP Bid Adapter:', () => {
       const options = spec.buildRequests(validBidRequests, bidderRequest)[0].options;
       expect(options.withCredentials).to.be.false;
     });
+
+    it('adds the ortb2 gpp consent info to the request', function () {
+      const { validBidRequests, bidderRequest } = generateBuildRequestMock({});
+      const ortb2 = {
+        regs: {
+          gpp: 'somegppstring',
+          gpp_sid: [6, 7]
+        }
+      };
+      let clonedBidderRequest = {...bidderRequest, ortb2};
+      const data = spec.buildRequests(validBidRequests, clonedBidderRequest)[0].data;
+      expect(data.regs.ext.gpp).to.equal('somegppstring');
+      expect(data.regs.ext.gpp_sid).to.eql([6, 7]);
+    });
   });
 
   describe('Endpoint & Impression Request Mode:', () => {